Changeset 4467 for trunk/src

Timestamp:

Oct 9, 2000, 7:47:22 PM (25 years ago)

Author:

sandervl

Message:

compilation fix + IsValidLocale fix

Location:

trunk/src/kernel32

Files:

• conbuffer.cpp (modified) (3 diffs)
• ole2nls.cpp (modified) (3 diffs)

trunk/src/kernel32/conbuffer.cpp

@@ -1 @@
-/* $Id: conbuffer.cpp,v 1.11 2000-10-09 02:22:57 phaller Exp $ */
+/* $Id: conbuffer.cpp,v 1.12 2000-10-09 17:47:21 sandervl Exp $ */
 
 /*
@@ -2624 +2624 @@
 
                                 /* calculate pointer to start of screen line */
-    pszTarget = pConsoleBuffer->ppszLine[ulWriteY] + psrctDestRect->Left << 1;
+    pszTarget = pConsoleBuffer->ppszLine[ulWriteY] + ((int)psrctDestRect->Left << 1);
 
     for (ulX = 0,
@@ -2730 +2730 @@
 
                                 /* calculate pointer to start of screen line */
-    pszTarget = pConsoleBuffer->ppszLine[ulWriteY] + psrctDestRect->Left << 1;
+    pszTarget = pConsoleBuffer->ppszLine[ulWriteY] + ((int)psrctDestRect->Left << 1);
 
     for (ulX = 0,

trunk/src/kernel32/ole2nls.cpp

@@ -1 @@
-/* $Id: ole2nls.cpp,v 1.5 2000-10-08 14:01:01 sandervl Exp $ */
+/* $Id: ole2nls.cpp,v 1.6 2000-10-09 17:47:22 sandervl Exp $ */
 
 /*
@@ -698 +698 @@
 BOOL WINAPI IsValidLocale(LCID lcid,DWORD flags)
 {
+#ifdef __WIN32OS2__
+    //SvL/MN: code below doesn't work -> winhlp32 complains about different language helpfiles
+    dprintf(("KERNEL32: IsValidLocale, always returns TRUE\n"));
+    return TRUE;
+#else
     /* check if language is registered in the kernel32 resources */
     if(!FindResourceExW(GetModuleHandleA("KERNEL32"), RT_STRINGW, (LPCWSTR)LOCALE_ILANGUAGE, LOWORD(lcid)))
@@ -703 +708 @@
     else
         return TRUE;
+#endif
 }