Finish ole32 separation

Dmitry Timoshkov dmitry at baikal.ru
Wed Jun 27 10:20:00 CDT 2001


Hello.

Changelog:
    Dmitry Timoshkov <dmitry at codeweavers.com>
    Finish ole32 separation.

diff -u cvs/hq/wine/dlls/ole32/compobj.c wine/dlls/ole32/compobj.c
--- cvs/hq/wine/dlls/ole32/compobj.c	Sun Jun 24 08:24:16 2001
+++ wine/dlls/ole32/compobj.c	Wed Jun 27 14:55:40 2001
@@ -931,6 +931,21 @@
     return 0;
 }
 
+/******************************************************************************
+ *      CoFileTimeToDosDateTime [COMPOBJ.30]
+ */
+BOOL16 WINAPI CoFileTimeToDosDateTime16(const FILETIME *ft, LPWORD lpDosDate, LPWORD lpDosTime)
+{
+    return FileTimeToDosDateTime(ft, lpDosDate, lpDosTime);
+}
+
+/******************************************************************************
+ *      CoDosDateTimeToFileTime [COMPOBJ.31]
+ */
+BOOL16 WINAPI CoDosDateTimeToFileTime16(WORD wDosDate, WORD wDosTime, FILETIME *ft)
+{
+    return DosDateTimeToFileTime(wDosDate, wDosTime, ft);
+}
 
 /***
  * COM_GetRegisteredClassObject
diff -u cvs/hq/wine/dlls/ole32/compobj.spec wine/dlls/ole32/compobj.spec
--- cvs/hq/wine/dlls/ole32/compobj.spec	Sun Nov 12 03:45:56 2000
+++ wine/dlls/ole32/compobj.spec	Wed Jun 27 14:56:02 2001
@@ -31,8 +31,8 @@
 27 pascal CoRegisterMessageFilter(ptr ptr) CoRegisterMessageFilter16
 28 stub COISHANDLERCONNECTED
 29 stub SHRADDREF
-30 pascal CoFileTimeToDosDateTime(ptr ptr ptr) FileTimeToDosDateTime
-31 pascal CoDosDateTimeToFileTime(word word ptr) DosDateTimeToFileTime
+30 pascal16 CoFileTimeToDosDateTime(ptr ptr ptr) CoFileTimeToDosDateTime16
+31 pascal16 CoDosDateTimeToFileTime(word word ptr) CoDosDateTimeToFileTime16
 32 stub COMARSHALHRESULT
 33 stub COUNMARSHALHRESULT
 34 pascal CoGetCurrentProcess() CoGetCurrentProcess
diff -u cvs/hq/wine/dlls/ole32/ole2nls.c wine/dlls/ole32/ole2nls.c
--- cvs/hq/wine/dlls/ole32/ole2nls.c	Sun Jun 24 08:24:16 2001
+++ wine/dlls/ole32/ole2nls.c	Wed Jun 27 14:44:38 2001
@@ -45,6 +45,47 @@
 	return GetStringTypeExA(locale,dwInfoType,src,cchSrc,chartype);
 }
 
+/******************************************************************************
+ *		GetUserDefaultLCID	[OLE2NLS.1]
+ */
+LCID WINAPI GetUserDefaultLCID16(void)
+{
+    return GetUserDefaultLCID();
+}
+
+/******************************************************************************
+ *		GetSystemDefaultLCID	[OLE2NLS.2]
+ */
+LCID WINAPI GetSystemDefaultLCID16(void)
+{
+    return GetSystemDefaultLCID();
+}
+
+/******************************************************************************
+ *		GetUserDefaultLangID	[OLE2NLS.3]
+ */
+LANGID WINAPI GetUserDefaultLangID16(void)
+{
+    return GetUserDefaultLangID();
+}
+
+/******************************************************************************
+ *		GetSystemDefaultLangID	[OLE2NLS.4]
+ */
+LANGID WINAPI GetSystemDefaultLangID16(void)
+{
+    return GetSystemDefaultLangID();
+}
+
+/******************************************************************************
+ *		LCMapStringA	[OLE2NLS.6]
+ */
+INT16 LCMapString16(LCID lcid, DWORD mapflags, LPCSTR srcstr, INT16 srclen,
+		    LPSTR dststr, INT16 dstlen)
+{
+    return LCMapStringA(lcid, mapflags, srcstr, srclen, dststr, dstlen);
+}
+
 /***********************************************************************
  *           CompareString16       (OLE2NLS.8)
  */
diff -u cvs/hq/wine/dlls/ole32/ole2nls.spec wine/dlls/ole32/ole2nls.spec
--- cvs/hq/wine/dlls/ole32/ole2nls.spec	Fri Jul 28 00:07:20 2000
+++ wine/dlls/ole32/ole2nls.spec	Wed Jun 27 14:44:00 2001
@@ -2,12 +2,12 @@
 type	win16
 owner	ole32
 
-1 pascal GetUserDefaultLCID()      GetUserDefaultLCID
-2 pascal GetSystemDefaultLCID()    GetSystemDefaultLCID
-3 pascal GetUserDefaultLangID()    GetUserDefaultLangID
-4 pascal GetSystemDefaultLangID()  GetSystemDefaultLangID
+1 pascal GetUserDefaultLCID() GetUserDefaultLCID16
+2 pascal GetSystemDefaultLCID() GetSystemDefaultLCID16
+3 pascal16 GetUserDefaultLangID() GetUserDefaultLangID16
+4 pascal16 GetSystemDefaultLangID() GetSystemDefaultLangID16
 5 pascal GetLocaleInfoA(long long ptr word) GetLocaleInfo16
-6 stub LCMAPSTRINGA
+6 pascal16 LCMapStringA(word long ptr word ptr word) LCMapString16
 7 pascal16 GetStringTypeA(long long str word ptr) GetStringType16
 8 pascal16 CompareStringA(long long str word str word) CompareString16
 9 pascal16 RegisterNLSInfoChanged(ptr) RegisterNLSInfoChanged16






More information about the wine-patches mailing list