[WMIC] Sync with Wine Staging 3.17. CORE-15127

This commit is contained in:
Amine Khaldi 2018-10-01 00:15:34 +01:00
parent cb0f46bddf
commit 5a217e3a6f
3 changed files with 5 additions and 4 deletions

View file

@ -1,4 +1,5 @@
add_definitions(-D__WINESRC__)
add_executable(wmic main.c wmic.rc)
target_link_libraries(wmic wine)
set_module_type(wmic win32cui UNICODE)

View file

@ -82,7 +82,7 @@ static const WCHAR *find_class( const WCHAR *alias )
{
unsigned int i;
for (i = 0; i < sizeof(alias_map)/sizeof(alias_map[0]); i++)
for (i = 0; i < ARRAY_SIZE(alias_map); i++)
{
if (!strcmpiW( alias, alias_map[i].alias )) return alias_map[i].class;
}
@ -158,7 +158,7 @@ static int output_message( int msg )
static const WCHAR fmtW[] = {'%','s',0};
WCHAR buffer[8192];
LoadStringW( GetModuleHandleW(NULL), msg, buffer, sizeof(buffer)/sizeof(WCHAR) );
LoadStringW( GetModuleHandleW(NULL), msg, buffer, ARRAY_SIZE(buffer));
return output_string( fmtW, buffer );
}
@ -193,7 +193,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propname )
hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services );
if (hr != S_OK) goto done;
len = strlenW( class ) + sizeof(select_allW) / sizeof(select_allW[0]);
len = strlenW( class ) + ARRAY_SIZE(select_allW);
if (!(query = SysAllocStringLen( NULL, len ))) goto done;
strcpyW( query, select_allW );
strcatW( query, class );

View file

@ -230,7 +230,7 @@ reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.17
reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.17
reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3
reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.17
reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3
reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.17
reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.17
reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3
reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources.