remove ALF_BuildUniqueName in favor of wsprintf

4 files changed, 2 insertions, 42 deletions

diff --git a/alf/alf.cpp b/alf/alf.cpp
index 32d5cc7..de23784 100644
--- a/alf/alf.cpp
+++ b/alf/alf.cpp
@@ -105,40 +105,6 @@ ALF_Free(const void *p)
 }
 
 void
-ALF_BuildUniqueName(TCHAR *buf, const TCHAR *prefix, ULONG_PTR uniquifier)
-{
-    int prefixlen = lstrlen(prefix);
-    CopyMemory(buf, prefix, (SIZE_T)prefixlen * sizeof(*prefix));
-
-    int numlen = sizeof(LONG_PTR)*2;
-    int i = numlen - 1;
-    while (i >= 0) {
-        buf[prefixlen + i] = TEXT("0123456789ABCDEF")[uniquifier & 0xf];
-        uniquifier >>= 4;
-        i--;
-    }
-
-    buf[prefixlen + numlen] = 0;
-}
-
-void
-ALF_BuildUniqueNameW(WCHAR *buf, const WCHAR *prefix, ULONG_PTR uniquifier)
-{
-    int prefixlen = lstrlenW(prefix);
-    CopyMemory(buf, prefix, (SIZE_T)prefixlen * sizeof(*prefix));
-
-    int numlen = sizeof(LONG_PTR)*2;
-    int i = numlen - 1;
-    while (i >= 0) {
-        buf[prefixlen + i] = L"0123456789ABCDEF"[uniquifier & 0xf];
-        uniquifier >>= 4;
-        i--;
-    }
-
-    buf[prefixlen + numlen] = 0;
-}
-
-void
 ALF_DestroyWindow(HWND win)
 {
     DestroyWindow(win);
diff --git a/alf/alfcontrol.cpp b/alf/alfcontrol.cpp
index a630fa7..9f1954c 100644
--- a/alf/alfcontrol.cpp
+++ b/alf/alfcontrol.cpp
@@ -21,7 +21,7 @@ ALF_RegisterControlClass(void)
     WNDCLASS cls;
     ZeroMemory(&cls, sizeof(cls));
 
-    ALF_BuildUniqueName(_alf_controlClass, TEXT("ALFControl."), (ULONG_PTR)&_alf_controlClass[0]);
+    wsprintf(_alf_controlClass, TEXT("ALFControl.%p"), (ULONG_PTR)&_alf_controlClass[0]);
 
     cls.style = CS_DBLCLKS;
     cls.hInstance = ALF_HINSTANCE;
diff --git a/alf/alfpriv.h b/alf/alfpriv.h
index eb3c358..0c5cc25 100644
--- a/alf/alfpriv.h
+++ b/alf/alfpriv.h
@@ -29,12 +29,6 @@ ALF_RegisterControlClass(void);
 HWND
 ALF_CreatePanelWindow(HWND parent, WORD id);
 
-void
-ALF_BuildUniqueName(TCHAR *buf, const TCHAR *prefix, ULONG_PTR uniquifier);
-
-void
-ALF_BuildUniqueNameW(WCHAR *buf, const WCHAR *prefix, ULONG_PTR uniquifier);
-
 // TODO: think about making it public
 BOOL
 ALF_ShouldMessageBubble(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
diff --git a/alf/alfwindow.cpp b/alf/alfwindow.cpp
index a464080..f59e784 100644
--- a/alf/alfwindow.cpp
+++ b/alf/alfwindow.cpp
@@ -375,7 +375,7 @@ ALF_RegisterWindowClass(void)
     WNDCLASS cls;
     ZeroMemory(&cls, sizeof(cls));
 
-    ALF_BuildUniqueName(_alf_windowClass, TEXT("ALFWindow."), (ULONG_PTR)&_alf_windowClass[0]);
+    wsprintf(_alf_windowClass, TEXT("ALFWindow.%p"), (ULONG_PTR)&_alf_windowClass[0]);
 
     cls.style = 0;
     cls.hInstance = ALF_HINSTANCE;