Changeset 4575 for trunk/src/kernel32/winres.cpp

Timestamp:

Nov 9, 2000, 7:18:11 PM (25 years ago)

Author:

sandervl

Message:

removed unused code + GetLocaleInfoW fix

File:

• trunk/src/kernel32/winres.cpp (modified) (5 diffs)

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.27 2000-05-28 16:45:14 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.28 2000-11-09 18:18:11 sandervl Exp $ */
 
 /*
@@ -57 +57 @@
 
   switch((int)restype) {
-    case NTRT_NEWBITMAP:
-    case NTRT_BITMAP:
-        return ConvertBitmap((WINBITMAPINFOHEADER *)resdata, ressize, (PULONG)&cvtressize);
-
     case NTRT_CURSOR:
         return ConvertCursor((CursorComponent *)resdata, ressize, &cvtressize);
@@ -66 +62 @@
     case NTRT_GROUP_CURSOR:
         return ConvertCursorGroup((CursorHeader *)resdata, ressize, module);
-
-    case NTRT_GROUP_ICON:
-        return ConvertIconGroup((IconHeader *)resdata, ressize, module);
-
-    case NTRT_ICON:
-        return ConvertIcon((WINBITMAPINFOHEADER *)resdata, ressize, &cvtressize);
-
-    case NTRT_ACCELERATORS:
-        return ConvertAccelerator((WINACCEL *)resdata, ressize);
 
     case NTRT_NEWMENU:
@@ -96 +83 @@
 //******************************************************************************
 //******************************************************************************
+PVOID WIN32API ConvertCursorToOS2(LPVOID lpWinResData)
+{
+ int ressize, cvtressize;
+ 
+  ressize = QueryConvertedCursorSize((CursorComponent *)lpWinResData, 0);
+
+  return ConvertCursor((CursorComponent *)lpWinResData, ressize, &cvtressize);
+}
+//******************************************************************************
+//******************************************************************************
+VOID WIN32API FreeOS2Resource(LPVOID lpResource)
+{
+  free(lpResource);
+}
+//******************************************************************************
+//******************************************************************************
 ULONG WIN32API QueryConvertedResourceSize(HINSTANCE hInstance, LPSTR restype, HRSRC hResource)
 {
@@ -113 +116 @@
 
   switch((int)restype) {
-    case NTRT_NEWBITMAP:
-    case NTRT_BITMAP:
-        return QueryConvertedBitmapSize((WINBITMAPINFOHEADER *)resdata, ressize);
-
     case NTRT_CURSOR:
         return QueryConvertedCursorSize((CursorComponent *)resdata, ressize);
-
-    case NTRT_ICON:
-        return QueryConvertedIconSize((WINBITMAPINFOHEADER *)resdata, ressize);
 
     case NTRT_GROUP_ICON: