commit ac7efef3b5696c6bd74fac83271cbea31684485c
author Alexandre Julliard <julliard@winehq.org> Mon Nov 27 21:54:01 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Nov 27 21:54:01 2000 +0000
tree 754a9a05e0e8355b66aab21bd5aab1fbf653f057
parent cb45438be29b1eb0c02d1fa4ee66c358193f2d29

Changed GetProcAddress16 and 16-bit resource functions to take normal
pointers instead of SEGPTRs.
Removed WIN16_GetTempDrive.

windows/win.c

diff --git a/windows/win.c b/windows/win.c
index 33fff0a..57c458e 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -904,23 +904,17 @@
         if (cs->hMenu) SetMenu(hwnd, cs->hMenu);
         else
         {
-#if 0  /* FIXME: should check if classPtr->menuNameW can be used as is */
-            if (classPtr->menuNameA)
-                cs->hMenu = HIWORD(classPtr->menuNameA) ?
-                       LoadMenu(cs->hInstance,SEGPTR_GET(classPtr->menuNameA)):
-                       LoadMenu(cs->hInstance,(SEGPTR)classPtr->menuNameA);
-#else
-	    SEGPTR menuName = (SEGPTR)GetClassLong16( hwnd, GCL_MENUNAME );
+            /* FIXME: should check if classPtr->menuNameW can be used as is */
+            LPCSTR menuName = (LPCSTR)GetClassLongA( hwnd, GCL_MENUNAME );
             if (menuName)
             {
                 if (HIWORD(cs->hInstance))
-                    cs->hMenu = LoadMenuA(cs->hInstance,PTR_SEG_TO_LIN(menuName));
+                    cs->hMenu = LoadMenuA(cs->hInstance,menuName);
                 else
                     cs->hMenu = LoadMenu16(cs->hInstance,menuName);
 
                 if (cs->hMenu) SetMenu( hwnd, cs->hMenu );
             }
-#endif
         }
     }
     else wndPtr->wIDmenu = (UINT)cs->hMenu;
@@ -3286,7 +3280,7 @@
         return 0L;
     }
 
-    hBummer = LoadCursor16(0, IDC_BUMMER16);
+    hBummer = LoadCursorA(0, IDC_BUMMERA);
 
     if( !hBummer || !wndPtr )
     {