Commit 296c5a6b authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard

Fixed some issues found by winapi_check.

parent 3c85eb18
...@@ -27,21 +27,18 @@ ...@@ -27,21 +27,18 @@
#define eq(received, expected, label, type) \ #define eq(received, expected, label, type) \
ok((received) == (expected), "%s: got " type " instead of " type, (label),(received),(expected)) ok((received) == (expected), "%s: got " type " instead of " type, (label),(received),(expected))
#define BUFFER_SIZE 50 #define BUFFER_SIZE 50
// Buffer used by callback function /* Buffer used by callback function */
char GlobalBuffer[BUFFER_SIZE]; char GlobalBuffer[BUFFER_SIZE];
// TODO : /* TODO :
// Unicode versions * Unicode versions
// EnumTimeFormatsA * EnumTimeFormatsA
// EnumDateFormatsA * EnumDateFormatsA
// LCMapStringA * LCMapStringA
// GetUserDefaultLangID * GetUserDefaultLangID
// ... * ...
*/
void TestGetLocaleInfoA() void TestGetLocaleInfoA()
{ {
...@@ -194,7 +191,9 @@ char buffer[BUFFER_SIZE], Expected[BUFFER_SIZE], format[BUFFER_SIZE]; ...@@ -194,7 +191,9 @@ char buffer[BUFFER_SIZE], Expected[BUFFER_SIZE], format[BUFFER_SIZE];
LCID lcid; LCID lcid;
lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT ); lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT );
// lcid = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT ); #if 0
lcid = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT );
#endif
memset( buffer, 'x', sizeof (buffer)/sizeof(buffer[0]) ); memset( buffer, 'x', sizeof (buffer)/sizeof(buffer[0]) );
ret = GetCurrencyFormatA(lcid, 0, "23,65", NULL, buffer, sizeof(buffer)); ret = GetCurrencyFormatA(lcid, 0, "23,65", NULL, buffer, sizeof(buffer));
...@@ -277,7 +276,9 @@ BOOL CALLBACK EnumTimeFormatsProc(char * lpTimeFormatString) ...@@ -277,7 +276,9 @@ BOOL CALLBACK EnumTimeFormatsProc(char * lpTimeFormatString)
{ {
trace("%s\n", lpTimeFormatString); trace("%s\n", lpTimeFormatString);
strcpy(GlobalBuffer, lpTimeFormatString); strcpy(GlobalBuffer, lpTimeFormatString);
// return TRUE; #if 0
return TRUE;
#endif
return FALSE; return FALSE;
} }
...@@ -336,7 +337,9 @@ char buffer1[BUFFER_SIZE], buffer2[BUFFER_SIZE]; ...@@ -336,7 +337,9 @@ char buffer1[BUFFER_SIZE], buffer2[BUFFER_SIZE];
START_TEST(locale) START_TEST(locale)
{ {
// TestEnumTimeFormats(); #if 0
TestEnumTimeFormats();
#endif
TestGetLocaleInfoA(); TestGetLocaleInfoA();
TestGetTimeFormatA(); TestGetTimeFormatA();
TestGetDateFormatA(); TestGetDateFormatA();
......
...@@ -44,6 +44,9 @@ RETERR16 WINAPI DiGetClassDevs16(LPLPDEVICE_INFO16 lplpdi, ...@@ -44,6 +44,9 @@ RETERR16 WINAPI DiGetClassDevs16(LPLPDEVICE_INFO16 lplpdi,
return OK; return OK;
} }
/***********************************************************************
* SetupDiGetDeviceInterfaceDetailA (SETUPAPI.@)
*/
BOOL WINAPI SetupDiGetDeviceInterfaceDetailA( BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
HDEVINFO DeviceInfoSet, HDEVINFO DeviceInfoSet,
PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData,
...@@ -56,6 +59,9 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA( ...@@ -56,6 +59,9 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
return FALSE; return FALSE;
} }
/***********************************************************************
* SetupDiGetDeviceInterfaceDetailW (SETUPAPI.@)
*/
BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(
HDEVINFO DeviceInfoSet, HDEVINFO DeviceInfoSet,
PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData,
...@@ -68,6 +74,9 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( ...@@ -68,6 +74,9 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(
return FALSE; return FALSE;
} }
/***********************************************************************
* SetupDiEnumDeviceInterfaces (SETUPAPI.@)
*/
BOOL WINAPI SetupDiEnumDeviceInterfaces( BOOL WINAPI SetupDiEnumDeviceInterfaces(
HDEVINFO DeviceInfoSet, HDEVINFO DeviceInfoSet,
PSP_DEVINFO_DATA DeviceInfoData, PSP_DEVINFO_DATA DeviceInfoData,
...@@ -79,6 +88,9 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces( ...@@ -79,6 +88,9 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces(
return FALSE; return FALSE;
} }
/***********************************************************************
* SetupDiGetClassDevsA (SETUPAPI.@)
*/
HDEVINFO WINAPI SetupDiGetClassDevsA( HDEVINFO WINAPI SetupDiGetClassDevsA(
CONST GUID *class, CONST GUID *class,
LPCSTR enumstr, LPCSTR enumstr,
...@@ -90,6 +102,9 @@ HDEVINFO WINAPI SetupDiGetClassDevsA( ...@@ -90,6 +102,9 @@ HDEVINFO WINAPI SetupDiGetClassDevsA(
return NULL; return NULL;
} }
/***********************************************************************
* SetupDiEnumDeviceInfo (SETUPAPI.@)
*/
BOOL WINAPI SetupDiEnumDeviceInfo( BOOL WINAPI SetupDiEnumDeviceInfo(
HDEVINFO devinfo, HDEVINFO devinfo,
DWORD index, DWORD index,
...@@ -105,12 +120,18 @@ BOOL WINAPI SetupDiEnumDeviceInfo( ...@@ -105,12 +120,18 @@ BOOL WINAPI SetupDiEnumDeviceInfo(
return FALSE; return FALSE;
} }
/***********************************************************************
* SetupDiDestroyDeviceInfoList (SETUPAPI.@)
*/
BOOL WINAPI SetupDiDestroyDeviceInfoList( HDEVINFO devinfo ) BOOL WINAPI SetupDiDestroyDeviceInfoList( HDEVINFO devinfo )
{ {
FIXME("%04lx\n", (DWORD)devinfo); FIXME("%04lx\n", (DWORD)devinfo);
return FALSE; return FALSE;
} }
/***********************************************************************
* SetupDiGetDeviceRegistryPropertyA (SETUPAPI.@)
*/
BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(
HDEVINFO devinfo, HDEVINFO devinfo,
PSP_DEVINFO_DATA DeviceInfoData, PSP_DEVINFO_DATA DeviceInfoData,
......
...@@ -1774,10 +1774,7 @@ BOOL WINAPI AreFileApisANSI(void) ...@@ -1774,10 +1774,7 @@ BOOL WINAPI AreFileApisANSI(void)
/*********************************************************************** /***********************************************************************
* GetTickCount (USER.13)
* GetCurrentTime (USER.15)
* GetTickCount (KERNEL32.@) * GetTickCount (KERNEL32.@)
* GetSystemMSecCount (SYSTEM.6)
* *
* Returns the number of milliseconds, modulo 2^32, since the start * Returns the number of milliseconds, modulo 2^32, since the start
* of the wineserver. * of the wineserver.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment