diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index f621aee9e52..b291b8a4675 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -931,6 +931,21 @@ HRESULT WINAPI CoRevokeClassObject16(DWORD dwRegister) /* [in] token on class ob 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 --git a/dlls/ole32/compobj.spec b/dlls/ole32/compobj.spec index 606f7a64e71..fd5632ed39c 100644 --- a/dlls/ole32/compobj.spec +++ b/dlls/ole32/compobj.spec @@ -31,8 +31,8 @@ owner ole32 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 --git a/dlls/ole32/ole2nls.c b/dlls/ole32/ole2nls.c index c00c8686f7a..61ec4707259 100644 --- a/dlls/ole32/ole2nls.c +++ b/dlls/ole32/ole2nls.c @@ -45,6 +45,47 @@ BOOL16 WINAPI GetStringType16(LCID locale,DWORD dwInfoType,LPCSTR src, 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 --git a/dlls/ole32/ole2nls.spec b/dlls/ole32/ole2nls.spec index e3d381b3463..6a03c271c22 100644 --- a/dlls/ole32/ole2nls.spec +++ b/dlls/ole32/ole2nls.spec @@ -2,12 +2,12 @@ name ole2nls 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 diff --git a/include/winnls.h b/include/winnls.h index 987e19645bb..624225daf3e 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -395,7 +395,9 @@ INT WINAPI GetNumberFormatA(LCID,DWORD,LPCSTR,const NUMBERFMTA*,LPSTR,in INT WINAPI GetNumberFormatW(LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,int); #define GetNumberFormat WINELIB_NAME_AW(GetNumberFormat) BOOL WINAPI IsValidCodePage(UINT); - +INT WINAPI LCMapStringA(LCID,DWORD,LPCSTR,INT,LPSTR,INT); +INT WINAPI LCMapStringW(LCID,DWORD,LPCWSTR,INT,LPWSTR,INT); +#define LCMapString WINELIB_NAME_AW(LCMapString) #ifdef __cplusplus }