Changeset 336 for trunk/src

Timestamp:

Jul 19, 1999, 1:50:04 PM (26 years ago)

Author:

sandervl

Message:

Menus are displayed now

Location:

trunk/src/user32/new

Files:

• loadres.cpp (modified) (4 diffs)
• makefile (modified) (2 diffs)
• win32wnd.cpp (modified) (4 diffs)

trunk/src/user32/new/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.1 1999-07-14 08:35:34 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.2 1999-07-19 11:50:04 sandervl Exp $ */
 
 /*
@@ -201 +201 @@
  HMENU rc;
 
+#if 1
+    rc = (HMENU)FindResourceA(hinst, lpszMenu, RT_MENUA);
+#else
     if((int)lpszMenu >> 16 != 0) {//convert string name identifier to numeric id
          dprintf(("lpszMenu %s\n", lpszMenu));
@@ -209 +212 @@
 
     rc = O32_LoadMenu(hinst, lpszMenu);
-
+#endif
     dprintf(("LoadMenuA (%X) returned %d\n", hinst, rc));
+    return(rc);
+}
+//******************************************************************************
+//******************************************************************************
+HMENU WIN32API LoadMenuW(HINSTANCE hinst, LPCWSTR lpszMenu)
+{
+ HMENU rc;
+
+#if 1
+    rc = (HMENU)FindResourceW(hinst, lpszMenu, RT_MENUW);
+#else
+ char  *astring = NULL;
+    if((int)lpszMenu >> 16 != 0) {//convert string name identifier to numeric id
+         astring = UnicodeToAsciiString((LPWSTR)lpszMenu);
+
+         dprintf(("lpszMenu %s\n", astring));
+         lpszMenu = (LPWSTR)ConvertNameId(hinst, (char *)astring);
+    }
+    else dprintf(("lpszMenu %d\n", (int)lpszMenu));
+
+    rc  = O32_LoadMenu(hinst, (char *)lpszMenu);
+    if(astring)
+        FreeAsciiString(astring);
+#endif
+    dprintf(("LoadMenuW (%X) returned %d\n", hinst, rc));
     return(rc);
 }
@@ -236 +264 @@
     return 0;
 //    return O32_LoadMenuIndirect(arg1);
-}
-//******************************************************************************
-//******************************************************************************
-HMENU WIN32API LoadMenuW(HINSTANCE hinst, LPCWSTR lpszMenu)
-{
- char  *astring = NULL;
- HMENU rc;
-
-    if((int)lpszMenu >> 16 != 0) {//convert string name identifier to numeric id
-         astring = UnicodeToAsciiString((LPWSTR)lpszMenu);
-
-         dprintf(("lpszMenu %s\n", astring));
-         lpszMenu = (LPWSTR)ConvertNameId(hinst, (char *)astring);
-    }
-    else dprintf(("lpszMenu %d\n", (int)lpszMenu));
-
-    rc  = O32_LoadMenu(hinst, (char *)lpszMenu);
-    if(astring)
-        FreeAsciiString(astring);
-
-    dprintf(("LoadMenuA (%X) returned %d\n", hinst, rc));
-    return(rc);
 }
 //******************************************************************************

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.11 1999-07-18 20:41:12 cbratschi Exp $
+# $Id: makefile,v 1.12 1999-07-19 11:50:04 sandervl Exp $
 
 #
@@ -37 +37 @@
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
+$(TARGET).dll: $(OBJS) $(TARGET).def $(TARGET).res
         $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
               $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/gdi32.lib $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/libuls.lib
+        rc $(TARGET).res $(TARGET).dll
         $(CP) $@ $(PDWIN32_BIN)
 
+$(TARGET).res:
+        rc -r user32.rc user32.res
 
 $(TARGET).lib: $(TARGET)exp.def

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.13 1999-07-18 18:04:30 sandervl Exp $ */
+/* $Id: win32wnd.cpp,v 1.14 1999-07-19 11:50:04 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -29 +29 @@
 #include <oslibutil.h>
 #include <oslibgdi.h>
+#include <winres.h>
 
 #define HAS_DLGFRAME(style,exStyle) \
@@ -1032 +1033 @@
 BOOL Win32Window::SetMenu(ULONG hMenu)
 {
- PVOID menutemplate;
-
+ PVOID          menutemplate;
+ Win32Resource *winres = (Win32Resource *)hMenu;
+
+#if 1
+    if(winres == NULL) {
+        dprintf(("Win32Window:: Win32Resource *winres == 0"));
+        return FALSE;
+    }
+    menutemplate = winres->lockOS2Resource();
+    if(menutemplate == NULL)
+    {
+        dprintf(("Win32Window::SetMenu menutemplate == 0"));
+        return FALSE;
+    }
+    OS2HwndMenu = OSLibWinCreateMenu(OS2HwndFrame, menutemplate);
+    if(OS2HwndMenu == 0) {
+        dprintf(("Win32Window::SetMenu OS2HwndMenu == 0"));
+        return FALSE;
+    }
+    return TRUE;
+#else
    if(HMHandleTranslateToOS2(hMenu, (PULONG)&menutemplate) == NO_ERROR)
    {
@@ -1044 +1064 @@
    dprintf(("Win32Window::SetMenu unknown hMenu (%x)", hMenu));
    return FALSE;
+#endif
 }
 //******************************************************************************