reingineer compat layer

not totally sure whether that's actually better

1 files changed, 13 insertions, 15 deletions

diff --git a/alf/alfcompat.h b/alf/alfcompat.h
index 98a2abc..b0a43ec 100644
--- a/alf/alfcompat.h
+++ b/alf/alfcompat.h
@@ -8,18 +8,6 @@
 #endif
 
 typedef LRESULT (CALLBACK *ALF_COMPAT_SUBCLASSPROC)(HWND,UINT,WPARAM,LPARAM,UINT_PTR,DWORD_PTR);
-typedef struct {
-    BOOL (WINAPI *SetWindowSubclass)(HWND, ALF_COMPAT_SUBCLASSPROC, UINT_PTR, DWORD_PTR);
-    LRESULT (WINAPI *DefSubclassProc)(HWND, UINT, WPARAM, LPARAM);
-    BOOL (WINAPI *RemoveWindowSubclass)(HWND, ALF_COMPAT_SUBCLASSPROC, UINT_PTR);
-    int (WINAPI *GetSystemMetricsForDpi)(int,  UINT);
-    BOOL (WINAPI *IsAppThemed)(void);
-    UINT (WINAPI *GetDpiForWindow)(HWND);
-    BOOL (WINAPI *SystemParametersInfoForDpi)(UINT,UINT,PVOID,UINT,UINT);
-    BOOL (WINAPI *AdjustWindowRectExForDpi)(LPRECT,DWORD,BOOL,DWORD,UINT);
-    ULONG (WINAPI *UuidCreate)(UUID *);
-} ALFCompatFunctions;
-
 
 typedef struct {
     UINT    cbSize;
@@ -50,8 +38,18 @@ ALF_SizeOf_NONCLIENTMETRICS(void)
     }
 }
 
-ALFCompatFunctions *
-ALF_CreateCompatFuncTable(void);
-
 long
 ALF_GetAveCharWidth(HDC hdc);
+
+void
+ALF_UniqueCounterValue(LONG_PTR *pCounterId, LONG_PTR *pCounterValue);
+
+
+extern BOOL (WINAPI *ALF_Compat_IsAppThemed)(void);
+extern UINT (WINAPI *ALF_Compat_GetDpiForWindow)(HWND);
+extern BOOL (WINAPI *ALF_Compat_AdjustWindowRectExForDpi)(LPRECT,DWORD,BOOL,DWORD,UINT);
+extern int (WINAPI *ALF_Compat_GetSystemMetricsForDpi)(int,  UINT);
+extern BOOL (WINAPI *ALF_Compat_SetWindowSubclass)(HWND, ALF_COMPAT_SUBCLASSPROC, UINT_PTR, DWORD_PTR);
+extern LRESULT (WINAPI *ALF_Compat_DefSubclassProc)(HWND, UINT, WPARAM, LPARAM);
+extern BOOL (WINAPI *ALF_Compat_RemoveWindowSubclass)(HWND, ALF_COMPAT_SUBCLASSPROC, UINT_PTR);
+extern BOOL (WINAPI *ALF_Compat_SystemParametersInfoForDpi)(UINT,UINT,PVOID,UINT,UINT);