Changeset 22088 for branches/swt/src

Timestamp:

Mar 10, 2015, 9:03:11 AM (11 years ago)

Author:

rousseau

Message:

Mark kernel32 and user32 as built from the swt-branch

To prevent testing against an already loaded stock kernel32,
local tests and the swt-os2-demo check for odin32swt() to be exported.
Also, the AboutBox shows this is an experimental build based upon the
swt-branch.

Location:

branches/swt/src

Files:

• kernel32/initterm.cpp (modified) (1 diff)
• kernel32/kernel32.def (modified) (2 diffs)
• kernel32/kernel32dbg.def (modified) (2 diffs)
• user32/win32wbasenonclient.cpp (modified) (1 diff)

branches/swt/src/kernel32/initterm.cpp

@@ -71 +71 @@
 char    szModName[ 256 ] = "";
 
+/// Exported dummy function to indicate swt-branch -- to be removed later.
+BOOL WINAPI odin32swt() {
+    return TRUE;
+}
+
 static ULONG DLL_InitKernel32_internal(ULONG hModule)
 {

branches/swt/src/kernel32/kernel32.def

@@ -6 +6 @@
 CODE SHARED LOADONCALL
 
-DESCRIPTION 'Odin32 System DLL - Kernel32'
+DESCRIPTION 'Odin32 System DLL - Kernel32 (rel)'
 
 ;
@@ -173 +173 @@
      RestoreThunkLock           = "_RestoreThunkLock@4"           @49
      _ConfirmWin16Lock          = "__ConfirmWin16Lock@0"          @96
+
+    odin32swt                   = "_odin32swt@0"         @4000
 
      AddAtomA                   = "_AddAtomA@4"                    @50

branches/swt/src/kernel32/kernel32dbg.def

@@ -6 +6 @@
 CODE SHARED LOADONCALL
 
-DESCRIPTION 'Odin32 System DLL - Kernel32'
+DESCRIPTION 'Odin32 System DLL - Kernel32 (dbg)'
 
 ;
@@ -174 +174 @@
      RestoreThunkLock           = "_DbgRestoreThunkLock@4"           @49
      _ConfirmWin16Lock          = "_Dbg_ConfirmWin16Lock@0"          @96
+
+    odin32swt                   = "_odin32swt@0"         @4000
 
      AddAtomA                   = "_DbgAddAtomA@4"                    @50

branches/swt/src/user32/win32wbasenonclient.cpp

@@ -1413 +1413 @@
                 *(VOID **)&ShellAboutA = (VOID *)GetProcAddress(hShell32, "ShellAboutA");
             }
-            ShellAboutA(Win32Hwnd,"Odin","Odin Beta -- [swt branch] -- **experimental**",0);
+#ifdef DEBUG
+            ShellAboutA(Win32Hwnd,"Odin","Odin Beta -- [swt branch] - **experimental** - (dbg-bld)",0);
+#else
+            ShellAboutA(Win32Hwnd,"Odin","Odin Beta -- [swt branch] - **experimental** - (rel-bld)",0);
+#endif
         }
 #ifdef DEBUG