Win64 patch 9/13

Ge van Geldorp ge at gse.nl
Mon Jun 19 13:03:45 CDT 2006


Changelog:
  Ge van Geldorp <ge at gse.nl>
  - GWL_HINSTANCE is not defined on Win64, hInstance is documented as not
    required in CreateWindowEx calls

Index: programs/wordpad/wordpad.c
===================================================================
RCS file: /home/wine/wine/programs/wordpad/wordpad.c,v
retrieving revision 1.1
diff -u -r1.1 wordpad.c
--- programs/wordpad/wordpad.c	14 Feb 2006 16:48:40 -0000	1.1
+++ programs/wordpad/wordpad.c	19 Jun 2006 17:34:48 -0000
@@ -74,7 +74,7 @@
 static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
     HWND hEditorWnd, hToolBarWnd, hReBarWnd;
-    HINSTANCE hInstance = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE);
+    HINSTANCE hInstance;
     HANDLE hDLL;
     TBADDBITMAP ab;
     int nStdBitmaps = 0;
@@ -83,6 +83,11 @@
 
     CreateStatusWindow(CCS_NODIVIDER|WS_CHILD|WS_VISIBLE, "RichEdit text", hWnd, IDC_STATUSBAR);
 
+#ifdef _WIN64
+    hInstance = 0;
+#else /* _WIN64 */
+    hInstance = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE);
+#endif /* _WIN64 */
     hReBarWnd = CreateWindowEx(WS_EX_TOOLWINDOW, REBARCLASSNAME, NULL,
       CCS_NODIVIDER|WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN|RBS_VARHEIGHT|CCS_TOP,
       CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, hWnd, (HMENU)IDC_REBAR, hInstance, NULL);



More information about the wine-patches mailing list