Rob Shearman : ddraw: Don't use typeof as it's not portable.

Alexandre Julliard julliard at winehq.org
Wed Feb 27 08:03:08 CST 2008


Module: wine
Branch: master
Commit: f2b77031c31580531a356342c3c008c0bb4bc3b6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f2b77031c31580531a356342c3c008c0bb4bc3b6

Author: Rob Shearman <rob at codeweavers.com>
Date:   Tue Feb 26 11:12:50 2008 +0000

ddraw: Don't use typeof as it's not portable.

---

 dlls/ddraw/regsvr.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ddraw/regsvr.c b/dlls/ddraw/regsvr.c
index eea2985..d851454 100644
--- a/dlls/ddraw/regsvr.c
+++ b/dlls/ddraw/regsvr.c
@@ -34,8 +34,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
-static typeof(RegDeleteTreeW) * pRegDeleteTreeW;
-static typeof(RegDeleteTreeA) * pRegDeleteTreeA;
+static LSTATUS (WINAPI *pRegDeleteTreeW)(HKEY,LPCWSTR);
+static LSTATUS (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR);
 
 /*
  * Near the bottom of this file are the exported DllRegisterServer and
@@ -433,8 +433,8 @@ HRESULT WINAPI DllUnregisterServer(void)
 
     HMODULE advapi32 = GetModuleHandleA("advapi32");
     if (!advapi32) return E_FAIL;
-    pRegDeleteTreeA = (typeof(RegDeleteTreeA)*) GetProcAddress(advapi32, "RegDeleteTreeA");
-    pRegDeleteTreeW = (typeof(RegDeleteTreeW)*) GetProcAddress(advapi32, "RegDeleteTreeW");
+    pRegDeleteTreeA = (void *) GetProcAddress(advapi32, "RegDeleteTreeA");
+    pRegDeleteTreeW = (void *) GetProcAddress(advapi32, "RegDeleteTreeW");
     if (!pRegDeleteTreeA || !pRegDeleteTreeW) return E_FAIL;
 
     TRACE("\n");




More information about the wine-cvs mailing list