fixed definition of DESKTOPENUMPROC

svn path=/trunk/; revision=5673

diff --git a/reactos/include/ascii.h b/reactos/include/ascii.h
index ccaa92a..b01ff81 100644 (file)
--- a/reactos/include/ascii.h
+++ b/reactos/include/ascii.h
@@ -1125,7 +1125,7 @@ WINBOOL
 STDCALL
 EnumDesktopsA(
     HWINSTA hwinsta,
-    DESKTOPENUMPROC lpEnumFunc,
+    DESKTOPENUMPROCA lpEnumFunc,
     LPARAM lParam);
 
 HWINSTA

diff --git a/reactos/include/base.h b/reactos/include/base.h
index d0899a4..2c26838 100644 (file)
--- a/reactos/include/base.h
+++ b/reactos/include/base.h
@@ -407,7 +407,8 @@ typedef WINBOOL CALLBACK (*ENUMRESNAMEPROCA) (HANDLE, LPCSTR, LPSTR, LONG);
 typedef WINBOOL CALLBACK (*ENUMRESNAMEPROCW) (HANDLE, LPCWSTR, LPWSTR, LONG);
 typedef WINBOOL CALLBACK (*ENUMRESLANGPROCA) (HANDLE, LPCSTR, LPCSTR, WORD, LONG);
 typedef WINBOOL CALLBACK (*ENUMRESLANGPROCW) (HANDLE, LPCWSTR, LPCWSTR, WORD, LONG);
-typedef FARPROC DESKTOPENUMPROC;
+typedef WINBOOL CALLBACK (*DESKTOPENUMPROCA) (LPSTR,  LPARAM);
+typedef WINBOOL CALLBACK (*DESKTOPENUMPROCW) (LPWSTR, LPARAM);
 typedef WINBOOL CALLBACK (*ENUMWINDOWSPROC) (HWND, LPARAM);
 typedef WINBOOL CALLBACK (*ENUMWINDOWSTATIONPROCA) (LPSTR, LPARAM);
 typedef WINBOOL CALLBACK (*ENUMWINDOWSTATIONPROCW) (LPWSTR, LPARAM);
@@ -454,6 +455,7 @@ typedef WINBOOL CALLBACK (*PFNPROCESSPOLICIESW) (HWND, LPCWSTR, LPCWSTR, LPCWSTR
 #define ENUMRESTYPEPROC ENUMRESTYPEPROCW
 #define ENUMRESNAMEPROC ENUMRESNAMEPROCW
 #define ENUMRESLANGPROC ENUMRESLANGPROCW
+#define DESKTOPENUMPROC DESKTOPENUMPROCW
 #define ENUMWINDOWSTATIONPROC ENUMWINDOWSTATIONPROCW
 #define PROPENUMPROCEX PROPENUMPROCEXW
 #define PROPENUMPROC PROPENUMPROCW
@@ -471,6 +473,7 @@ typedef WINBOOL CALLBACK (*PFNPROCESSPOLICIESW) (HWND, LPCWSTR, LPCWSTR, LPCWSTR
 #define ENUMRESTYPEPROC ENUMRESTYPEPROCA
 #define ENUMRESNAMEPROC ENUMRESNAMEPROCA
 #define ENUMRESLANGPROC ENUMRESLANGPROCA
+#define DESKTOPENUMPROC DESKTOPENUMPROCA
 #define ENUMWINDOWSTATIONPROC ENUMWINDOWSTATIONPROCA
 #define PROPENUMPROCEX PROPENUMPROCEXA
 #define PROPENUMPROC PROPENUMPROCA

diff --git a/reactos/include/unicode.h b/reactos/include/unicode.h
index 21830a6..46700da 100644 (file)
--- a/reactos/include/unicode.h
+++ b/reactos/include/unicode.h
@@ -1126,7 +1126,7 @@ WINBOOL
 STDCALL
 EnumDesktopsW(
     HWINSTA hwinsta,
-    DESKTOPENUMPROC lpEnumFunc,
+    DESKTOPENUMPROCW lpEnumFunc,
     LPARAM lParam);
 
 HWINSTA

diff --git a/reactos/lib/user32/misc/desktop.c b/reactos/lib/user32/misc/desktop.c
index 81be9eb..2e954c6 100644 (file)
--- a/reactos/lib/user32/misc/desktop.c
+++ b/reactos/lib/user32/misc/desktop.c
@@ -1,4 +1,4 @@
-/* $Id: desktop.c,v 1.24 2003/08/14 20:25:52 royce Exp $
+/* $Id: desktop.c,v 1.25 2003/08/19 15:18:26 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -198,7 +198,7 @@ WINBOOL
 STDCALL
 EnumDesktopsA(
   HWINSTA hwinsta,
-  DESKTOPENUMPROC lpEnumFunc,
+  DESKTOPENUMPROCA lpEnumFunc,
   LPARAM lParam)
 {
   UNIMPLEMENTED;
@@ -213,7 +213,7 @@ WINBOOL
 STDCALL
 EnumDesktopsW(
   HWINSTA hwinsta,
-  DESKTOPENUMPROC lpEnumFunc,
+  DESKTOPENUMPROCW lpEnumFunc,
   LPARAM lParam)
 {
   UNIMPLEMENTED;