[PATCH] Fix return types of GetThreadDesktop and OpenDesktopA

Sami Aario sami.aario at surfeu.fi
Mon Apr 5 16:02:05 CDT 2004


Hi,

The NOTES section in the comments for GetThreadDesktop and
OpenDesktopA say their return values should be HDESK. I checked
MSDN and this is the case. I'm guessing these functions were stubbed
before Wine had a HDESK type, and they can be fixed now. Am I
right?

Changelog:
Fix return types of GetThreadDesktop and OpenDesktopA.
-------------- next part --------------
Index: dlls/user/misc.c
===================================================================
RCS file: /home/wine/wine/dlls/user/misc.c,v
retrieving revision 1.14
diff -u -r1.14 misc.c
--- dlls/user/misc.c	1 Apr 2004 02:12:41 -0000	1.14
+++ dlls/user/misc.c	5 Apr 2004 20:48:50 -0000
@@ -105,9 +105,6 @@
 /******************************************************************************
  * GetThreadDesktop [USER32.@]  Returns handle to desktop
  *
- * NOTES
- *    Docs say the return value is HDESK
- *
  * PARAMS
  *    dwThreadId [I] Thread identifier
  *
@@ -115,7 +112,7 @@
  *    Success: Handle to desktop associated with specified thread
  *    Failure: NULL
  */
-DWORD WINAPI GetThreadDesktop( DWORD dwThreadId )
+HDESK WINAPI GetThreadDesktop( DWORD dwThreadId )
 {
     FIXME("(%lx): stub\n",dwThreadId);
     return 1;
@@ -186,12 +183,9 @@
 /******************************************************************************
  * OpenDesktopA [USER32.@]
  *
- * NOTES
- *    Return type should be HDESK
- *
  *    Not supported on Win9x - returns NULL and calls SetLastError.
  */
-HANDLE WINAPI OpenDesktopA( LPCSTR lpszDesktop, DWORD dwFlags,
+HDESK WINAPI OpenDesktopA( LPCSTR lpszDesktop, DWORD dwFlags,
                                 BOOL fInherit, DWORD dwDesiredAccess )
 {
     FIXME("(%s,%lx,%i,%lx): stub\n",debugstr_a(lpszDesktop),dwFlags,


More information about the wine-patches mailing list