Changeset 3872 for trunk/src/kernel32/KERNEL32.CPP

Timestamp:

Jul 20, 2000, 8:07:00 PM (25 years ago)

Author:

sandervl

Message:

Always try to allocate an executable image at it's preferred address

File:

• trunk/src/kernel32/KERNEL32.CPP (modified) (4 diffs)

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.49 2000-07-06 21:18:38 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.50 2000-07-20 18:06:58 sandervl Exp $ */
 
 /*
@@ -707 +707 @@
 
 
-ODINFUNCTION4(BOOL,    GetStringTypeW,
-              DWORD,   dwInfoType,
-              LPCWSTR, lpSrcStr,
-              int,     cchSrc,
-              LPWORD,  lpCharType)
-{
-  return GetStringTypeExW(0,
-                          dwInfoType,
-                          lpSrcStr,
-                          cchSrc,
-                          lpCharType);
-}
-
 
 ODINFUNCTION5(BOOL,    GetStringTypeExW,
@@ -771 +758 @@
 }
 
-//******************************************************************************
-//NOTE: This has one parameter more than the W version! (@#$@#$)
-//******************************************************************************
-ODINFUNCTION5(BOOL,    GetStringTypeA,
-              LCID,    locale,
+ODINFUNCTION4(BOOL,    GetStringTypeW,
               DWORD,   dwInfoType,
-              LPCSTR,  lpSrcStr,
+              LPCWSTR, lpSrcStr,
               int,     cchSrc,
               LPWORD,  lpCharType)
 {
-  return GetStringTypeExA(locale,
+  return ODIN_GetStringTypeExW(0,
                           dwInfoType,
                           lpSrcStr,
@@ -854 +837 @@
 }
 
+//******************************************************************************
+//NOTE: This has one parameter more than the W version! (@#$@#$)
+//******************************************************************************
+ODINFUNCTION5(BOOL,    GetStringTypeA,
+              LCID,    locale,
+              DWORD,   dwInfoType,
+              LPCSTR,  lpSrcStr,
+              int,     cchSrc,
+              LPWORD,  lpCharType)
+{
+  return ODIN_GetStringTypeExA(locale,
+                          dwInfoType,
+                          lpSrcStr,
+                          cchSrc,
+                          lpCharType);
+}
 
 //******************************************************************************