October 2020 - Wine-devel - list.winehq.org

[PATCH] atl: Use wide-char string literals.
by Michael Stefaniuc 07 Oct '20

07 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Includes non trivial manual changes, there might be dragons... dlls/atl/atl.c | 20 +++++--------- dlls/atl/atl_ax.c | 35 +++++++++++------------- dlls/atl/registrar.c | 60 +++++++++++++++-------------------------- dlls/atl/tests/atl_ax.c | 3 +-- 4 files changed, 44 insertions(+), 74 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 358986d7a4c..7529425b7ee 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -123,7 +123,6 @@ HRESULT WINAPI AtlUnmarshalPtr(IStream *stm, const IID *iid, IUnknown **ppUnk) */ HDC WINAPI AtlCreateTargetDC( HDC hdc, DVTARGETDEVICE *dv ) { - static const WCHAR displayW[] = {'d','i','s','p','l','a','y',0}; const WCHAR *driver = NULL, *device = NULL, *port = NULL; DEVMODEW *devmode = NULL; @@ -139,7 +138,7 @@ HDC WINAPI AtlCreateTargetDC( HDC hdc, DVTARGETDEVICE *dv ) else { if (hdc) return hdc; - driver = displayW; + driver = L"display"; } return CreateDCW( driver, device, port, devmode ); } @@ -342,12 +341,10 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, WCHAR *path; HRESULT hres; - static const WCHAR tlb_extW[] = {'.','t','l','b',0}; - TRACE("(%p %s %p %p)\n", inst, debugstr_w(lpszIndex), pbstrPath, ppTypeLib); index_len = lpszIndex ? lstrlenW(lpszIndex) : 0; - path = heap_alloc((MAX_PATH+index_len)*sizeof(WCHAR) + sizeof(tlb_extW)); + path = heap_alloc((MAX_PATH+index_len)*sizeof(WCHAR) + sizeof(L".tlb")); if(!path) return E_OUTOFMEMORY; @@ -367,7 +364,7 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, for(ptr = path+path_len-1; ptr > path && *ptr != '\\' && *ptr != '.'; ptr--); if(*ptr != '.') ptr = path+path_len; - memcpy(ptr, tlb_extW, sizeof(tlb_extW)); + lstrcpyW(ptr, L".tlb"); hres = LoadTypeLib(path, &typelib); } @@ -781,20 +778,15 @@ HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID clsid, const struct _AT } if(!reg) { - WCHAR reg_path[256] = {'C','L','S','I','D','\\'}, *ptr = reg_path+6; - - static const WCHAR implemented_catW[] = - {'I','m','p','l','e','m','e','n','t','e','d',' ','C','a','t','e','g','o','r','i','e','s',0}; - static const WCHAR required_catW[] = - {'R','e','q','u','i','r','e','d',' ','C','a','t','e','g','o','r','i','e','s',0}; + WCHAR reg_path[256] = L"CLSID\\", *ptr = reg_path+6; ptr += StringFromGUID2(clsid, ptr, 64)-1; *ptr++ = '\\'; - memcpy(ptr, implemented_catW, sizeof(implemented_catW)); + lstrcpyW(ptr, L"Implemented Categories"); RegDeleteKeyW(HKEY_CLASSES_ROOT, reg_path); - memcpy(ptr, required_catW, sizeof(required_catW)); + lstrcpyW(ptr, L"Required Categories"); RegDeleteKeyW(HKEY_CLASSES_ROOT, reg_path); } diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 3bb9dbc22df..f180f5e2b40 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -55,8 +55,6 @@ typedef struct IOCS { BOOL fActive, fInPlace, fWindowless; } IOCS; -static const WCHAR wine_atl_iocsW[] = {'_','_','W','I','N','E','_','A','T','L','_','I','O','C','S','\0'}; - /********************************************************************** * AtlAxWin class window procedure */ @@ -90,20 +88,20 @@ BOOL WINAPI AtlAxWinInit(void) WNDCLASSEXW wcex; #if _ATL_VER <= _ATL_VER_30 -#define ATL_NAME_SUFFIX 0 +#define ATL_NAME_SUFFIX #elif _ATL_VER == _ATL_VER_80 -#define ATL_NAME_SUFFIX '8','0',0 +#define ATL_NAME_SUFFIX L"800" #elif _ATL_VER == _ATL_VER_90 -#define ATL_NAME_SUFFIX '9','0',0 +#define ATL_NAME_SUFFIX L"900" #elif _ATL_VER == _ATL_VER_100 -#define ATL_NAME_SUFFIX '1','0','0',0 +#define ATL_NAME_SUFFIX L"1000" #elif _ATL_VER == _ATL_VER_110 -#define ATL_NAME_SUFFIX '1','1','0',0 +#define ATL_NAME_SUFFIX L"1100" #else #error Unsupported version #endif - static const WCHAR AtlAxWinW[] = {'A','t','l','A','x','W','i','n',ATL_NAME_SUFFIX}; + static const WCHAR AtlAxWinW[] = L"AtlAxWin" ATL_NAME_SUFFIX; FIXME("version %04x semi-stub\n", _ATL_VER); @@ -127,7 +125,7 @@ BOOL WINAPI AtlAxWinInit(void) return FALSE; if(_ATL_VER > _ATL_VER_30) { - static const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX}; + static const WCHAR AtlAxWinLicW[] = L"AtlAxWinLic" ATL_NAME_SUFFIX; wcex.lpszClassName = AtlAxWinLicW; if ( !RegisterClassExW( &wcex ) ) @@ -152,7 +150,7 @@ static HRESULT IOCS_Detach( IOCS *This ) /* remove subclassing */ if ( This->hWnd ) { SetWindowLongPtrW( This->hWnd, GWLP_WNDPROC, (ULONG_PTR) This->OrigWndProc ); - RemovePropW( This->hWnd, wine_atl_iocsW); + RemovePropW( This->hWnd, L"__WINE_ATL_IOCS" ); This->hWnd = NULL; } if ( This->control ) @@ -906,7 +904,7 @@ static LRESULT IOCS_OnWndProc( IOCS *This, HWND hWnd, UINT uMsg, WPARAM wParam, static LRESULT CALLBACK AtlHost_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) { - IOCS *This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); + IOCS *This = (IOCS*) GetPropW( hWnd, L"__WINE_ATL_IOCS" ); return IOCS_OnWndProc( This, hWnd, wMsg, wParam, lParam ); } @@ -915,7 +913,7 @@ static HRESULT IOCS_Attach( IOCS *This, HWND hWnd, IUnknown *pUnkControl ) /* su This->hWnd = hWnd; IUnknown_QueryInterface( pUnkControl, &IID_IOleObject, (void**)&This->control ); IOleObject_SetClientSite( This->control, &This->IOleClientSite_iface ); - SetPropW( hWnd, wine_atl_iocsW, This ); + SetPropW( hWnd, L"__WINE_ATL_IOCS", This ); This->OrigWndProc = (WNDPROC)SetWindowLongPtrW( hWnd, GWLP_WNDPROC, (ULONG_PTR) AtlHost_wndproc ); return S_OK; @@ -924,9 +922,8 @@ static HRESULT IOCS_Attach( IOCS *This, HWND hWnd, IUnknown *pUnkControl ) /* su static HRESULT IOCS_Init( IOCS *This ) { RECT rect; - static const WCHAR AXWIN[] = {'A','X','W','I','N',0}; - IOleObject_SetHostNames( This->control, AXWIN, AXWIN ); + IOleObject_SetHostNames( This->control, L"AXWIN", L"AXWIN" ); GetClientRect( This->hWnd, &rect ); IOCS_OnSize( This, &rect ); @@ -1000,7 +997,6 @@ enum content static enum content get_content_type(LPCOLESTR name, CLSID *control_id) { - static const WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':',0}; WCHAR new_urlW[MAX_PATH]; DWORD size = MAX_PATH; @@ -1021,7 +1017,7 @@ static enum content get_content_type(LPCOLESTR name, CLSID *control_id) return IsURL; } - if (!wcsnicmp(name, mshtml_prefixW, 7)) + if (!wcsnicmp(name, L"mshtml:", 7)) { FIXME("mshtml prefix not implemented\n"); *control_id = CLSID_WebBrowser; @@ -1266,8 +1262,7 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) src += lstrlenW(src) + 1; /* title */ if ( GET_WORD(tmp) == '{' ) /* all this mess created because of this line */ { - static const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n', 0}; - PUT_BLOCK(AtlAxWin, ARRAY_SIZE(AtlAxWin)); + PUT_BLOCK(L"AtlAxWin", ARRAY_SIZE(L"AtlAxWin")); PUT_BLOCK(tmp, lstrlenW(tmp)+1); } else PUT_BLOCK(tmp, src-tmp); @@ -1373,7 +1368,7 @@ HRESULT WINAPI AtlAxGetHost(HWND hWnd, IUnknown **host) *host = NULL; - This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); + This = (IOCS*) GetPropW( hWnd, L"__WINE_ATL_IOCS" ); if ( !This ) { WARN("No container attached to %p\n", hWnd ); @@ -1395,7 +1390,7 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk) *pUnk = NULL; - This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); + This = (IOCS*) GetPropW( hWnd, L"__WINE_ATL_IOCS" ); if ( !This || !This->control ) { WARN("No control attached to %p\n", hWnd ); diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 586cce3201d..7c3c5976b22 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -32,27 +32,20 @@ static const struct { WCHAR name[22]; HKEY key; } root_keys[] = { - {{'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}, - HKEY_CLASSES_ROOT}, - {{'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}, - HKEY_CURRENT_USER}, - {{'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}, - HKEY_LOCAL_MACHINE}, - {{'H','K','E','Y','_','U','S','E','R','S',0}, - HKEY_USERS}, - {{'H','K','E','Y','_','P','E','R','F','O','R','M','A','N','C','E','_','D','A','T','A',0}, - HKEY_PERFORMANCE_DATA}, - {{'H','K','E','Y','_','D','Y','N','_','D','A','T','A',0}, - HKEY_DYN_DATA}, - {{'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}, - HKEY_CURRENT_CONFIG}, - {{'H','K','C','R',0}, HKEY_CLASSES_ROOT}, - {{'H','K','C','U',0}, HKEY_CURRENT_USER}, - {{'H','K','L','M',0}, HKEY_LOCAL_MACHINE}, - {{'H','K','U',0}, HKEY_USERS}, - {{'H','K','P','D',0}, HKEY_PERFORMANCE_DATA}, - {{'H','K','D','D',0}, HKEY_DYN_DATA}, - {{'H','K','C','C',0}, HKEY_CURRENT_CONFIG} + {L"HKEY_CLASSES_ROOT", HKEY_CLASSES_ROOT}, + {L"HKEY_CURRENT_USER", HKEY_CURRENT_USER}, + {L"HKEY_LOCAL_MACHINE", HKEY_LOCAL_MACHINE}, + {L"HKEY_USERS", HKEY_USERS}, + {L"HKEY_PERFORMANCE_DATA", HKEY_PERFORMANCE_DATA}, + {L"HKEY_DYN_DATA", HKEY_DYN_DATA}, + {L"HKEY_CURRENT_CONFIG", HKEY_CURRENT_CONFIG}, + {L"HKCR", HKEY_CLASSES_ROOT}, + {L"HKCU", HKEY_CURRENT_USER}, + {L"HKLM", HKEY_LOCAL_MACHINE}, + {L"HKU", HKEY_USERS}, + {L"HKPD", HKEY_PERFORMANCE_DATA}, + {L"HKDD", HKEY_DYN_DATA}, + {L"HKCC", HKEY_CURRENT_CONFIG} }; typedef struct rep_list_str { @@ -150,7 +143,6 @@ static HRESULT do_preprocess(const Registrar *This, LPCOLESTR data, strbuf *buf) { LPCOLESTR iter, iter2 = data; rep_list *rep_iter; - static const WCHAR wstr[] = {'%',0}; iter = wcschr(data, '%'); while(iter) { @@ -164,7 +156,7 @@ static HRESULT do_preprocess(const Registrar *This, LPCOLESTR data, strbuf *buf) return DISP_E_EXCEPTION; if(iter == iter2) { - strbuf_write(wstr, buf, 1); + strbuf_write(L"%", buf, 1); }else { for(rep_iter = This->rep; rep_iter; rep_iter = rep_iter->next) { if(rep_iter->key_len == iter-iter2 @@ -205,11 +197,6 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO DO_DELETE } key_type = NORMAL; - static const WCHAR wstrNoRemove[] = {'N','o','R','e','m','o','v','e',0}; - static const WCHAR wstrForceRemove[] = {'F','o','r','c','e','R','e','m','o','v','e',0}; - static const WCHAR wstrDelete[] = {'D','e','l','e','t','e',0}; - static const WCHAR wstrval[] = {'v','a','l',0}; - iter = *pstr; hres = get_word(&iter, buf); if(FAILED(hres)) @@ -218,13 +205,13 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO while(buf->str[1] || buf->str[0] != '}') { key_type = NORMAL; - if(!lstrcmpiW(buf->str, wstrNoRemove)) + if(!lstrcmpiW(buf->str, L"NoRemove")) key_type = NO_REMOVE; - else if(!lstrcmpiW(buf->str, wstrForceRemove)) + else if(!lstrcmpiW(buf->str, L"ForceRemove")) key_type = FORCE_REMOVE; - else if(!lstrcmpiW(buf->str, wstrval)) + else if(!lstrcmpiW(buf->str, L"val")) key_type = IS_VAL; - else if(!lstrcmpiW(buf->str, wstrDelete)) + else if(!lstrcmpiW(buf->str, L"Delete")) key_type = DO_DELETE; if(key_type != NORMAL) { @@ -716,9 +703,6 @@ HRESULT WINAPI AtlUpdateRegistryFromResourceD(HINSTANCE inst, LPCOLESTR res, IRegistrar *registrar; HRESULT hres; - static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; - static const WCHAR registryW[] = {'R','E','G','I','S','T','R','Y',0}; - if(!GetModuleFileNameW(inst, module_name, MAX_PATH)) { FIXME("hinst %p: did not get module name\n", inst); return E_FAIL; @@ -735,15 +719,15 @@ HRESULT WINAPI AtlUpdateRegistryFromResourceD(HINSTANCE inst, LPCOLESTR res, return hres; } - IRegistrar_AddReplacement(registrar, moduleW, module_name); + IRegistrar_AddReplacement(registrar, L"MODULE", module_name); for (iter = pMapEntries; iter && iter->szKey; iter++) IRegistrar_AddReplacement(registrar, iter->szKey, iter->szData); if(bRegister) - hres = IRegistrar_ResourceRegisterSz(registrar, module_name, res, registryW); + hres = IRegistrar_ResourceRegisterSz(registrar, module_name, res, L"REGISTRY"); else - hres = IRegistrar_ResourceUnregisterSz(registrar, module_name, res, registryW); + hres = IRegistrar_ResourceUnregisterSz(registrar, module_name, res, L"REGISTRY"); if(registrar != pReg) IRegistrar_Release(registrar); diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c index 6b944d1b285..94db3640ee3 100644 --- a/dlls/atl/tests/atl_ax.c +++ b/dlls/atl/tests/atl_ax.c @@ -115,7 +115,6 @@ static void test_ax_win(void) { BOOL ret; WNDCLASSEXW wcex; - static const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; static HMODULE hinstance = 0; ret = AtlAxWinInit(); @@ -124,7 +123,7 @@ static void test_ax_win(void) hinstance = GetModuleHandleA(NULL); memset(&wcex, 0, sizeof(wcex)); wcex.cbSize = sizeof(wcex); - ret = GetClassInfoExW(hinstance, AtlAxWin, &wcex); + ret = GetClassInfoExW(hinstance, L"AtlAxWin", &wcex); ok(ret, "AtlAxWin has not registered\n"); ok(wcex.style == CS_GLOBALCLASS, "wcex.style %08x\n", wcex.style); } -- 2.26.2

2 1

[PATCH] joy.cpl: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/joy.cpl/main.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3921f59cbb5..66ac58f7038 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(joycpl); DECLSPEC_HIDDEN HMODULE hcpl; -static const WCHAR button_class[] = {'B','u','t','t','o','n','\0'}; - /********************************************************************* * DllMain */ @@ -169,14 +167,11 @@ static void initialize_joysticks_list(HWND hwnd, struct JoystickData *data) */ static BOOL get_app_key(HKEY *defkey, HKEY *appkey) { - static const WCHAR reg_key[] = { 'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\', - 'D','i','r','e','c','t','I','n','p','u','t','\\', - 'J','o','y','s','t','i','c','k','s','\0' }; *appkey = 0; /* Registry key can be found in HKCU\Software\Wine\DirectInput */ - if (RegCreateKeyExW(HKEY_CURRENT_USER, reg_key, 0, NULL, 0, KEY_SET_VALUE | KEY_READ, NULL, defkey, NULL)) + if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\Wine\\DirectInput\\Joysticks", 0, NULL, 0, + KEY_SET_VALUE | KEY_READ, NULL, defkey, NULL)) *defkey = 0; return *defkey || *appkey; @@ -215,13 +210,12 @@ static DWORD set_config_key(HKEY defkey, HKEY appkey, const WCHAR *name, const W */ static void enable_joystick(WCHAR *joy_name, BOOL enable) { - static const WCHAR disabled_str[] = {'d','i','s','a','b','l','e','d','\0'}; HKEY hkey, appkey; get_app_key(&hkey, &appkey); if (!enable) - set_config_key(hkey, appkey, joy_name, disabled_str, lstrlenW(disabled_str)); + set_config_key(hkey, appkey, joy_name, L"disabled", lstrlenW(L"disabled")); else set_config_key(hkey, appkey, joy_name, NULL, 0); @@ -231,7 +225,6 @@ static void enable_joystick(WCHAR *joy_name, BOOL enable) static void initialize_disabled_joysticks_list(HWND hwnd) { - static const WCHAR disabled_str[] = {'d','i','s','a','b','l','e','d','\0'}; HKEY hkey, appkey; DWORD values = 0; LSTATUS status; @@ -250,7 +243,7 @@ static void initialize_disabled_joysticks_list(HWND hwnd) status = RegEnumValueW(hkey, i, buf_name, &name_len, NULL, NULL, (BYTE*) buf_data, &data_len); - if (status == ERROR_SUCCESS && !lstrcmpW(disabled_str, buf_data)) + if (status == ERROR_SUCCESS && !lstrcmpW(L"disabled", buf_data)) SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_ADDSTRING, 0, (LPARAM) buf_name); } @@ -492,7 +485,7 @@ static void draw_joystick_buttons(HWND hwnd, struct JoystickData* data) button_number_to_wchar(i + 1, button_label); - data->graphics.buttons[i] = CreateWindowW(button_class, button_label, WS_CHILD, + data->graphics.buttons[i] = CreateWindowW(L"Button", button_label, WS_CHILD, r.left, r.top, r.right - r.left, r.bottom - r.top, hwnd, NULL, NULL, hinst); @@ -504,8 +497,7 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data) { int i; HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE); - static const WCHAR axes_names[TEST_MAX_AXES][7] = { {'X',',','Y','\0'}, {'R','x',',','R','y','\0'}, - {'Z',',','R','z','\0'}, {'P','O','V','\0'} }; + static const WCHAR axes_names[TEST_MAX_AXES][7] = { L"X,Y", L"Rx,Ry", L"Z,Rz", L"POV"}; static const DWORD axes_idc[TEST_MAX_AXES] = { IDC_TESTGROUPXY, IDC_TESTGROUPRXRY, IDC_TESTGROUPZRZ, IDC_TESTGROUPPOV }; @@ -521,7 +513,7 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data) r.bottom = r.top + TEST_AXIS_SIZE_Y; MapDialogRect(hwnd, &r); - data->graphics.axes[i] = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE, + data->graphics.axes[i] = CreateWindowW(L"Button", NULL, WS_CHILD | WS_VISIBLE, r.left, r.top, r.right - r.left, r.bottom - r.top, hwnd, NULL, NULL, hinst); } @@ -617,7 +609,7 @@ static void draw_ff_axis(HWND hwnd, struct JoystickData *data) MapDialogRect(hwnd, &r); /* Draw direction axis */ - data->graphics.ff_axis = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE, + data->graphics.ff_axis = CreateWindowW(L"Button", NULL, WS_CHILD | WS_VISIBLE, r.left, r.top, r.right - r.left, r.bottom - r.top, hwnd, NULL, NULL, hinst); } -- 2.26.2

1 0

[PATCH] dinput/tests: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/tests/joystick.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index f082c612b08..8a3e5e3022c 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -405,17 +405,13 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) ok(SUCCEEDED(hr), "IDirectInput_GetProperty() for DIPROP_GUIDANDPATH failed: %08x\n", hr); { - static const WCHAR formatW[] = {'\\','\\','?','\\','%','*','[','^','#',']','#','v','i','d','_', - '%','0','4','x','&','p','i','d','_','%','0','4','x',0}; - static const WCHAR miW[] = {'m','i','_',0}; - static const WCHAR igW[] = {'i','g','_',0}; int vid, pid; _wcslwr(dpg.wszPath); - count = swscanf(dpg.wszPath, formatW, &vid, &pid); + count = swscanf(dpg.wszPath, L"\\\\?\\%*[^#]#vid_%04x&pid_%04x", &vid, &pid); ok(count == 2, "DIPROP_GUIDANDPATH path has wrong format. Expected count: 2 Got: %i Path: %s\n", count, wine_dbgstr_w(dpg.wszPath)); - ok(wcsstr(dpg.wszPath, miW) != 0 || wcsstr(dpg.wszPath, igW) != 0, + ok(wcsstr(dpg.wszPath, L"mi_") != 0 || wcsstr(dpg.wszPath, L"ig_") != 0, "DIPROP_GUIDANDPATH path should contain either 'ig_' or 'mi_' substring. Path: %s\n", wine_dbgstr_w(dpg.wszPath)); } -- 2.26.2

1 0

[PATCH] dinput8/tests: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput8/tests/device.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 80a7fe26c3b..2fc04358cc1 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -627,18 +627,17 @@ static void test_mouse_keyboard(void) if (raw_devices[0].hwndTarget != NULL) { - WCHAR di_hwnd_class[] = {'D','I','E','m','W','i','n',0}; WCHAR str[16]; int i; di_hwnd = raw_devices[0].hwndTarget; i = GetClassNameW(di_hwnd, str, ARRAY_SIZE(str)); - ok(i == lstrlenW(di_hwnd_class), "GetClassName returned incorrect length\n"); - ok(!lstrcmpW(di_hwnd_class, str), "GetClassName returned incorrect name for this window's class\n"); + ok(i == lstrlenW(L"DIEmWin"), "GetClassName returned incorrect length\n"); + ok(!lstrcmpW(L"DIEmWin", str), "GetClassName returned incorrect name for this window's class\n"); i = GetWindowTextW(di_hwnd, str, ARRAY_SIZE(str)); - ok(i == lstrlenW(di_hwnd_class), "GetClassName returned incorrect length\n"); - ok(!lstrcmpW(di_hwnd_class, str), "GetClassName returned incorrect name for this window's class\n"); + ok(i == lstrlenW(L"DIEmWin"), "GetClassName returned incorrect length\n"); + ok(!lstrcmpW(L"DIEmWin", str), "GetClassName returned incorrect name for this window's class\n"); } hr = IDirectInputDevice8_Acquire(di_mouse); -- 2.26.2

1 0

[PATCH 2/2] advpack: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advpack/advpack.c | 47 +++++++---------------------- dlls/advpack/files.c | 36 +++++------------------ dlls/advpack/install.c | 60 ++++++++++---------------------------- dlls/advpack/reg.c | 29 +++++++----------- dlls/advpack/tests/files.c | 7 +---- 5 files changed, 46 insertions(+), 133 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index e3d4d50837b..25751af64bc 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -41,13 +41,7 @@ typedef HRESULT (WINAPI *DLLREGISTER) (void); #define PREFIX_LEN 5 /* registry path of the Installed Components key for per-user stubs */ -static const WCHAR setup_key[] = { - 'S','O','F','T','W','A','R','E','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'A','c','t','i','v','e',' ','S','e','t','u','p','\\', - 'I','n','s','t','a','l','l','e','d',' ', - 'C','o','m','p','o','n','e','n','t','s',0 -}; +static const WCHAR setup_key[] = L"SOFTWARE\\Microsoft\\Active Setup\\Installed Components"; /* Strip single quotes from a token - note size includes NULL */ static void strip_quotes(WCHAR *buffer, DWORD *size) @@ -73,9 +67,6 @@ static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dw HKEY root, subkey = 0; DWORD size; - static const WCHAR hklm[] = {'H','K','L','M',0}; - static const WCHAR hkcu[] = {'H','K','C','U',0}; - /* load the destination parameters */ SetupFindFirstLineW(hInf, pszSection, NULL, &context); SetupGetStringFieldW(&context, 1, prefix, PREFIX_LEN + 2, &size); @@ -85,9 +76,9 @@ static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dw SetupGetStringFieldW(&context, 3, value, MAX_PATH + 2, &size); strip_quotes(value, &size); - if (!lstrcmpW(prefix, hklm)) + if (!lstrcmpW(prefix, L"HKLM")) root = HKEY_LOCAL_MACHINE; - else if (!lstrcmpW(prefix, hkcu)) + else if (!lstrcmpW(prefix, L"HKCU")) root = HKEY_CURRENT_USER; else root = NULL; @@ -115,13 +106,7 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DWORD size; int ldid; - static const WCHAR source_dir[] = {'S','o','u','r','c','e','D','i','r',0}; - - static const WCHAR custDestW[] = { - 'C','u','s','t','o','m','D','e','s','t','i','n','a','t','i','o','n',0 - }; - - if (!SetupGetLineTextW(NULL, hInf, pszInstallSection, custDestW, + if (!SetupGetLineTextW(NULL, hInf, pszInstallSection, L"CustomDestination", field, MAX_FIELD_LENGTH, &size)) return; @@ -165,7 +150,7 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) } /* set dest to pszWorkingDir if key is SourceDir */ - if (pszWorkingDir && !lstrcmpiW(value, source_dir)) + if (pszWorkingDir && !lstrcmpiW(value, L"SourceDir")) lstrcpynW(dest, pszWorkingDir, MAX_PATH); else get_dest_dir(hInf, value, dest, MAX_PATH); @@ -559,12 +544,6 @@ HRESULT WINAPI SetPerUserSecValuesW(PERUSERSECTIONW* pPerUser) { HKEY setup, guid; - static const WCHAR stub_path[] = {'S','t','u','b','P','a','t','h',0}; - static const WCHAR version[] = {'V','e','r','s','i','o','n',0}; - static const WCHAR locale[] = {'L','o','c','a','l','e',0}; - static const WCHAR compid[] = {'C','o','m','p','o','n','e','n','t','I','D',0}; - static const WCHAR isinstalled[] = {'I','s','I','n','s','t','a','l','l','e','d',0}; - TRACE("(%p)\n", pPerUser); if (!pPerUser || !*pPerUser->szGUID) @@ -585,25 +564,25 @@ HRESULT WINAPI SetPerUserSecValuesW(PERUSERSECTIONW* pPerUser) if (*pPerUser->szStub) { - RegSetValueExW(guid, stub_path, 0, REG_SZ, (LPBYTE)pPerUser->szStub, + RegSetValueExW(guid, L"StubPath", 0, REG_SZ, (BYTE *)pPerUser->szStub, (lstrlenW(pPerUser->szStub) + 1) * sizeof(WCHAR)); } if (*pPerUser->szVersion) { - RegSetValueExW(guid, version, 0, REG_SZ, (LPBYTE)pPerUser->szVersion, + RegSetValueExW(guid, L"Version", 0, REG_SZ, (BYTE *)pPerUser->szVersion, (lstrlenW(pPerUser->szVersion) + 1) * sizeof(WCHAR)); } if (*pPerUser->szLocale) { - RegSetValueExW(guid, locale, 0, REG_SZ, (LPBYTE)pPerUser->szLocale, + RegSetValueExW(guid, L"Locale", 0, REG_SZ, (BYTE *)pPerUser->szLocale, (lstrlenW(pPerUser->szLocale) + 1) * sizeof(WCHAR)); } if (*pPerUser->szCompID) { - RegSetValueExW(guid, compid, 0, REG_SZ, (LPBYTE)pPerUser->szCompID, + RegSetValueExW(guid, L"ComponentID", 0, REG_SZ, (BYTE *)pPerUser->szCompID, (lstrlenW(pPerUser->szCompID) + 1) * sizeof(WCHAR)); } @@ -613,7 +592,7 @@ HRESULT WINAPI SetPerUserSecValuesW(PERUSERSECTIONW* pPerUser) (lstrlenW(pPerUser->szDispName) + 1) * sizeof(WCHAR)); } - RegSetValueExW(guid, isinstalled, 0, REG_DWORD, + RegSetValueExW(guid, L"IsInstalled", 0, REG_DWORD, (LPBYTE)&pPerUser->dwIsInstalled, sizeof(DWORD)); RegCloseKey(guid); @@ -911,10 +890,6 @@ HRESULT WINAPI UserInstStubWrapperW(HWND hWnd, HINSTANCE hInstance, HRESULT hr = S_OK; BOOL res; - static const WCHAR real_stub_path[] = { - 'R','e','a','l','S','t','u','b','P','a','t','h',0 - }; - TRACE("(%p, %p, %s, %i)\n", hWnd, hInstance, debugstr_w(pszParms), nShow); if (!pszParms || !*pszParms) @@ -931,7 +906,7 @@ HRESULT WINAPI UserInstStubWrapperW(HWND hWnd, HINSTANCE hInstance, return E_FAIL; } - res = RegQueryValueExW(guid, real_stub_path, NULL, NULL, (LPBYTE)stub, &size); + res = RegQueryValueExW(guid, L"RealStubPath", NULL, NULL, (BYTE *)stub, &size); if (res || !*stub) goto done; diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 3e4cb366007..58ff76e0505 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -120,14 +120,6 @@ HRESULT WINAPI AddDelBackupEntryW(LPCWSTR lpcszFileList, LPCWSTR lpcszBackupDir, WCHAR szIniPath[MAX_PATH]; LPCWSTR szString = NULL; - static const WCHAR szBackupEntry[] = { - '-','1',',','0',',','0',',','0',',','0',',','0',',','-','1',0 - }; - - static const WCHAR backslash[] = {'\\',0}; - static const WCHAR ini[] = {'.','i','n','i',0}; - static const WCHAR backup[] = {'b','a','c','k','u','p',0}; - TRACE("(%s, %s, %s, %d)\n", debugstr_w(lpcszFileList), debugstr_w(lpcszBackupDir), debugstr_w(lpcszBaseName), dwFlags); @@ -139,21 +131,21 @@ HRESULT WINAPI AddDelBackupEntryW(LPCWSTR lpcszFileList, LPCWSTR lpcszBackupDir, else GetWindowsDirectoryW(szIniPath, MAX_PATH); - lstrcatW(szIniPath, backslash); + lstrcatW(szIniPath, L"\\"); lstrcatW(szIniPath, lpcszBaseName); - lstrcatW(szIniPath, ini); + lstrcatW(szIniPath, L".ini"); SetFileAttributesW(szIniPath, FILE_ATTRIBUTE_NORMAL); if (dwFlags & AADBE_ADD_ENTRY) - szString = szBackupEntry; + szString = L"-1,0,0,0,0,0,-1"; else if (dwFlags & AADBE_DEL_ENTRY) szString = NULL; /* add or delete the INI entries */ while (*lpcszFileList) { - WritePrivateProfileStringW(backup, lpcszFileList, szString, szIniPath); + WritePrivateProfileStringW(L"backup", lpcszFileList, szString, szIniPath); lpcszFileList += lstrlenW(lpcszFileList) + 1; } @@ -332,10 +324,6 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) DWORD fattrs = GetFileAttributesW(fname); HRESULT ret = E_FAIL; - static const WCHAR asterisk[] = {'*',0}; - static const WCHAR dot[] = {'.',0}; - static const WCHAR dotdot[] = {'.','.',0}; - if (fattrs & FILE_ATTRIBUTE_DIRECTORY) { HANDLE hFindFile; @@ -345,7 +333,7 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) /* Generate a path with wildcard suitable for iterating */ if (fname_len && fname[fname_len-1] != '\\') fname[fname_len++] = '\\'; - lstrcpyW(fname + fname_len, asterisk); + lstrcpyW(fname + fname_len, L"*"); if ((hFindFile = FindFirstFileW(fname, &w32fd)) != INVALID_HANDLE_VALUE) { @@ -353,8 +341,7 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) for (done = FALSE; !done; done = !FindNextFileW(hFindFile, &w32fd)) { TRACE("%s\n", debugstr_w(w32fd.cFileName)); - if (lstrcmpW(dot, w32fd.cFileName) != 0 && - lstrcmpW(dotdot, w32fd.cFileName) != 0) + if (lstrcmpW(L".", w32fd.cFileName) != 0 && lstrcmpW(L"..", w32fd.cFileName) != 0) { lstrcpyW(fname + fname_len, w32fd.cFileName); if (DELNODE_recurse_dirtree(fname, flags) != S_OK) @@ -1063,12 +1050,6 @@ HRESULT WINAPI GetVersionFromFileExW(LPCWSTR lpszFilename, LPDWORD pdwMSVer, BOOL bFileCopied = FALSE; UINT uValueLen; - static const WCHAR backslash[] = {'\\',0}; - static const WCHAR translation[] = { - '\\','V','a','r','F','i','l','e','I','n','f','o', - '\\','T','r','a','n','s','l','a','t','i','o','n',0 - }; - TRACE("(%s, %p, %p, %d)\n", debugstr_w(lpszFilename), pdwMSVer, pdwLSVer, bVersion); @@ -1106,8 +1087,7 @@ HRESULT WINAPI GetVersionFromFileExW(LPCWSTR lpszFilename, LPDWORD pdwMSVer, if (bVersion) { - if (!VerQueryValueW(pVersionInfo, backslash, - (LPVOID *)&pFixedVersionInfo, &uValueLen)) + if (!VerQueryValueW(pVersionInfo, L"\\", (void **)&pFixedVersionInfo, &uValueLen)) goto done; if (!uValueLen) @@ -1118,7 +1098,7 @@ HRESULT WINAPI GetVersionFromFileExW(LPCWSTR lpszFilename, LPDWORD pdwMSVer, } else { - if (!VerQueryValueW(pVersionInfo, translation, + if (!VerQueryValueW(pVersionInfo, L"\\VarFileInfo\\Translation", (LPVOID *)&pLangAndCodePage, &uValueLen)) goto done; diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 24e2c4579a9..a2ccbd55099 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -59,20 +59,6 @@ typedef struct _ADVInfo typedef HRESULT (*iterate_fields_func)(HINF hinf, PCWSTR field, const void *arg); -/* Advanced INF commands */ -static const WCHAR CheckAdminRights[] = { - 'C','h','e','c','k','A','d','m','i','n','R','i','g','h','t','s',0 -}; -static const WCHAR DelDirs[] = {'D','e','l','D','i','r','s',0}; -static const WCHAR PerUserInstall[] = {'P','e','r','U','s','e','r','I','n','s','t','a','l','l',0}; -static const WCHAR RegisterOCXs[] = {'R','e','g','i','s','t','e','r','O','C','X','s',0}; -static const WCHAR RunPreSetupCommands[] = { - 'R','u','n','P','r','e','S','e','t','u','p','C','o','m','m','a','n','d','s',0 -}; -static const WCHAR RunPostSetupCommands[] = { - 'R','u','n','P','o','s','t','S','e','t','u','p','C','o','m','m','a','n','d','s',0 -}; - /* Advanced INF callbacks */ static HRESULT del_dirs_callback(HINF hinf, PCWSTR field, const void *arg) { @@ -103,33 +89,25 @@ static HRESULT per_user_install_callback(HINF hinf, PCWSTR field, const void *ar INFCONTEXT context; DWORD size; - static const WCHAR disp_name[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; - static const WCHAR version[] = {'V','e','r','s','i','o','n',0}; - static const WCHAR is_installed[] = {'I','s','I','n','s','t','a','l','l','e','d',0}; - static const WCHAR comp_id[] = {'C','o','m','p','o','n','e','n','t','I','D',0}; - static const WCHAR guid[] = {'G','U','I','D',0}; - static const WCHAR locale[] = {'L','o','c','a','l','e',0}; - static const WCHAR stub_path[] = {'S','t','u','b','P','a','t','h',0}; - per_user.bRollback = FALSE; per_user.dwIsInstalled = 0; - SetupGetLineTextW(NULL, hinf, field, disp_name, per_user.szDispName, ARRAY_SIZE(per_user.szDispName), &size); + SetupGetLineTextW(NULL, hinf, field, L"DisplayName", per_user.szDispName, ARRAY_SIZE(per_user.szDispName), &size); - SetupGetLineTextW(NULL, hinf, field, version, per_user.szVersion, ARRAY_SIZE(per_user.szVersion), &size); + SetupGetLineTextW(NULL, hinf, field, L"Version", per_user.szVersion, ARRAY_SIZE(per_user.szVersion), &size); - if (SetupFindFirstLineW(hinf, field, is_installed, &context)) + if (SetupFindFirstLineW(hinf, field, L"IsInstalled", &context)) { SetupGetIntField(&context, 1, (PINT)&per_user.dwIsInstalled); } - SetupGetLineTextW(NULL, hinf, field, comp_id, per_user.szCompID, ARRAY_SIZE(per_user.szCompID), &size); + SetupGetLineTextW(NULL, hinf, field, L"ComponentID", per_user.szCompID, ARRAY_SIZE(per_user.szCompID), &size); - SetupGetLineTextW(NULL, hinf, field, guid, per_user.szGUID, ARRAY_SIZE(per_user.szGUID), &size); + SetupGetLineTextW(NULL, hinf, field, L"GUID", per_user.szGUID, ARRAY_SIZE(per_user.szGUID), &size); - SetupGetLineTextW(NULL, hinf, field, locale, per_user.szLocale, ARRAY_SIZE(per_user.szLocale), &size); + SetupGetLineTextW(NULL, hinf, field, L"Locale", per_user.szLocale, ARRAY_SIZE(per_user.szLocale), &size); - SetupGetLineTextW(NULL, hinf, field, stub_path, per_user.szStub, ARRAY_SIZE(per_user.szStub), &size); + SetupGetLineTextW(NULL, hinf, field, L"StubPath", per_user.szStub, ARRAY_SIZE(per_user.szStub), &size); return SetPerUserSecValuesW(&per_user); } @@ -299,8 +277,7 @@ static HRESULT check_admin_rights(const ADVInfo *info) INFCONTEXT context; HRESULT hr = S_OK; - if (!SetupFindFirstLineW(info->hinf, info->install_sec, - CheckAdminRights, &context)) + if (!SetupFindFirstLineW(info->hinf, info->install_sec, L"CheckAdminRights", &context)) return S_OK; if (!SetupGetIntField(&context, 1, &check)) @@ -356,30 +333,29 @@ static HRESULT adv_install(ADVInfo *info) if (hr != S_OK) return hr; - hr = iterate_section_fields(info->hinf, info->install_sec, RunPreSetupCommands, + hr = iterate_section_fields(info->hinf, info->install_sec, L"RunPreSetupCommands", run_setup_commands_callback, info); if (hr != S_OK) return hr; OleInitialize(NULL); hr = iterate_section_fields(info->hinf, info->install_sec, - RegisterOCXs, register_ocxs_callback, NULL); + L"RegisterOCXs", register_ocxs_callback, NULL); OleUninitialize(); if (hr != S_OK) return hr; hr = iterate_section_fields(info->hinf, info->install_sec, - PerUserInstall, per_user_install_callback, info); + L"PerUserInstall", per_user_install_callback, info); if (hr != S_OK) return hr; - hr = iterate_section_fields(info->hinf, info->install_sec, RunPostSetupCommands, + hr = iterate_section_fields(info->hinf, info->install_sec, L"RunPostSetupCommands", run_setup_commands_callback, info); if (hr != S_OK) return hr; - hr = iterate_section_fields(info->hinf, info->install_sec, - DelDirs, del_dirs_callback, info); + hr = iterate_section_fields(info->hinf, info->install_sec, L"DelDirs", del_dirs_callback, info); if (hr != S_OK) return hr; @@ -393,9 +369,6 @@ static HRESULT get_working_dir(ADVInfo *info, LPCWSTR inf_filename, LPCWSTR work LPCWSTR ptr; DWORD len; - static const WCHAR backslash[] = {'\\',0}; - static const WCHAR inf_dir[] = {'\\','I','N','F',0}; - if ((ptr = wcsrchr(inf_filename, '\\'))) { len = ptr - inf_filename + 1; @@ -409,7 +382,7 @@ static HRESULT get_working_dir(ADVInfo *info, LPCWSTR inf_filename, LPCWSTR work else { GetCurrentDirectoryW(MAX_PATH, path); - lstrcatW(path, backslash); + lstrcatW(path, L"\\"); lstrcatW(path, inf_filename); /* check if the INF file is in the current directory */ @@ -421,7 +394,7 @@ static HRESULT get_working_dir(ADVInfo *info, LPCWSTR inf_filename, LPCWSTR work { /* default to the windows\inf directory if all else fails */ GetWindowsDirectoryW(path, MAX_PATH); - lstrcatW(path, inf_dir); + lstrcatW(path, L"\\INF"); } len = lstrlenW(path) + 1; @@ -445,7 +418,6 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, HRESULT hr; LPCWSTR ptr, path; - static const WCHAR backslash[] = {'\\',0}; if (!(ptr = wcsrchr(inf_filename, '\\'))) ptr = inf_filename; @@ -485,7 +457,7 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, return E_OUTOFMEMORY; lstrcpyW(info->inf_path, info->working_dir); - lstrcatW(info->inf_path, backslash); + lstrcatW(info->inf_path, L"\\"); lstrcatW(info->inf_path, info->inf_filename); /* RunSetupCommand opens unmodified filename parameter */ diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 472bbcd9694..555743d656c 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -31,23 +31,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); -static const WCHAR REGINST[] = {'R','E','G','I','N','S','T',0}; -static const WCHAR Strings[] = {'S','t','r','i','n','g','s',0}; -static const WCHAR MOD_PATH[] = {'_','M','O','D','_','P','A','T','H',0}; -static const WCHAR SYS_MOD_PATH[] = {'_','S','Y','S','_','M','O','D','_','P','A','T','H',0}; -static const WCHAR SystemRoot[] = {'S','y','s','t','e','m','R','o','o','t',0}; -static const WCHAR escaped_SystemRoot[] = {'%','S','y','s','t','e','m','R','o','o','t','%',0}; -static const WCHAR quote[] = {'\"',0}; - static BOOL get_temp_ini_path(LPWSTR name) { - static const WCHAR prefix[] = {'a','v','p',0}; WCHAR tmp_dir[MAX_PATH]; if(!GetTempPathW(ARRAY_SIZE(tmp_dir), tmp_dir)) return FALSE; - if(!GetTempFileNameW(tmp_dir, prefix, 0, name)) + if (!GetTempFileNameW(tmp_dir, L"avp", 0, name)) return FALSE; return TRUE; } @@ -65,7 +56,7 @@ static BOOL create_tmp_ini_file(HMODULE hm, WCHAR *ini_file) goto error; } - if(!(hrsrc = FindResourceW(hm, REGINST, REGINST))) { + if (!(hrsrc = FindResourceW(hm, L"REGINST", L"REGINST"))) { ERR("Can't find REGINST resource\n"); goto error; } @@ -180,16 +171,16 @@ static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path) if (!GetModuleFileNameW(hm, mod_path + 1, ARRAY_SIZE(mod_path) - 2)) return E_FAIL; - lstrcatW(mod_path, quote); - WritePrivateProfileStringW(Strings, MOD_PATH, mod_path, ini_path); + lstrcatW(mod_path, L"\""); + WritePrivateProfileStringW(L"Strings", L"_MOD_PATH", mod_path, ini_path); *sys_root = '\0'; - GetEnvironmentVariableW(SystemRoot, sys_root, ARRAY_SIZE(sys_root)); + GetEnvironmentVariableW(L"SystemRoot", sys_root, ARRAY_SIZE(sys_root)); if(!wcsnicmp(sys_root, mod_path + 1, lstrlenW(sys_root))) { *sys_mod_path = '\"'; - lstrcpyW(sys_mod_path + 1, escaped_SystemRoot); + lstrcpyW(sys_mod_path + 1, L"%SystemRoot%"); lstrcatW(sys_mod_path, mod_path + 1 + lstrlenW(sys_root)); } else @@ -198,7 +189,7 @@ static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path) lstrcpyW(sys_mod_path, mod_path); } - WritePrivateProfileStringW(Strings, SYS_MOD_PATH, sys_mod_path, ini_path); + WritePrivateProfileStringW(L"Strings", L"_SYS_MOD_PATH", sys_mod_path, ini_path); return S_OK; } @@ -242,9 +233,9 @@ HRESULT WINAPI RegInstallW(HMODULE hm, LPCWSTR pszSection, const STRTABLEW* pstT tmp_value[0] = '\"'; lstrcpyW(tmp_value + 1, pstTable->pse[i].pszValue); - lstrcatW(tmp_value, quote); - - WritePrivateProfileStringW(Strings, pstTable->pse[i].pszName, tmp_value, tmp_ini_path); + lstrcatW(tmp_value, L"\""); + + WritePrivateProfileStringW(L"Strings", pstTable->pse[i].pszName, tmp_value, tmp_ini_path); } } diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 135a09f97d6..488b7ab6136 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -472,12 +472,7 @@ static void test_ExtractFiles(void) ok(!RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to not exist\n"); if(pExtractFilesW) { - static const WCHAR extract_cabW[] = {'e','x','t','r','a','c','t','.','c','a','b',0}; - static const WCHAR destW[] = {'d','e','s','t',0}; - static const WCHAR file_listW[] = - {'a','.','t','x','t',':','t','e','s','t','d','i','r','\\','c','.','t','x','t',0}; - - hr = pExtractFilesW(extract_cabW, destW, 0, file_listW, NULL, 0); + hr = pExtractFilesW(L"extract.cab", L"dest", 0, L"a.txt:testdir\\c.txt", NULL, 0); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); -- 2.26.2

1 0

[PATCH 1/2] advpack: Don't use sizeof to calculate the length of a WCHAR string
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advpack/install.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index d82de9c3617..24e2c4579a9 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -446,10 +446,6 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, LPCWSTR ptr, path; static const WCHAR backslash[] = {'\\',0}; - static const WCHAR default_install[] = { - 'D','e','f','a','u','l','t','I','n','s','t','a','l','l',0 - }; - if (!(ptr = wcsrchr(inf_filename, '\\'))) ptr = inf_filename; @@ -464,16 +460,16 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, /* FIXME: determine the proper platform to install (NTx86, etc) */ if (!install_sec || !*install_sec) { - len = sizeof(default_install) - 1; - ptr = default_install; + len = ARRAY_SIZE(L"DefaultInstall"); + ptr = L"DefaultInstall"; } else { - len = lstrlenW(install_sec); + len = lstrlenW(install_sec) + 1; ptr = install_sec; } - info->install_sec = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + info->install_sec = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!info->install_sec) return E_OUTOFMEMORY; -- 2.26.2

1 0

[PATCH] winemine: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winemine/main.c | 53 +++++++++++++++------------------------- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 255d21714fd..37ce1927047 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -33,19 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winemine); static const DWORD wnd_style = WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX; -static const WCHAR registry_key[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','M','i','n','e',0}; - -static const WCHAR xposW[] = {'X','p','o','s',0}; -static const WCHAR yposW[] = {'Y','p','o','s',0}; -static const WCHAR heightW[] = {'H','e','i','g','h','t',0}; -static const WCHAR widthW[] = {'W','i','d','t','h',0}; -static const WCHAR minesW[] = {'M','i','n','e','s',0}; -static const WCHAR difficultyW[] = {'D','i','f','f','i','c','u','l','t','y',0}; -static const WCHAR markW[] = {'M','a','r','k',0}; -static const WCHAR nameW[] = {'N','a','m','e','%','u',0}; -static const WCHAR timeW[] = {'T','i','m','e','%','u',0}; void CheckLevel( BOARD *p_board ) { @@ -77,38 +64,38 @@ static void LoadBoard( BOARD *p_board ) WCHAR key_name[8]; unsigned i; - RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hkey ); + RegOpenKeyExW( HKEY_CURRENT_USER, L"Software\\Microsoft\\WinMine", 0, KEY_QUERY_VALUE, &hkey ); size = sizeof( p_board->pos.x ); - if( RegQueryValueExW( hkey, xposW, NULL, &type, (BYTE*) &p_board->pos.x, &size ) ) + if( RegQueryValueExW( hkey, L"Xpos", NULL, &type, (BYTE*) &p_board->pos.x, &size ) ) p_board->pos.x = 0; size = sizeof( p_board->pos.y ); - if( RegQueryValueExW( hkey, yposW, NULL, &type, (BYTE*) &p_board->pos.y, &size ) ) + if( RegQueryValueExW( hkey, L"Ypos", NULL, &type, (BYTE*) &p_board->pos.y, &size ) ) p_board->pos.y = 0; size = sizeof( p_board->rows ); - if( RegQueryValueExW( hkey, heightW, NULL, &type, (BYTE*) &p_board->rows, &size ) ) + if( RegQueryValueExW( hkey, L"Height", NULL, &type, (BYTE*) &p_board->rows, &size ) ) p_board->rows = BEGINNER_ROWS; size = sizeof( p_board->cols ); - if( RegQueryValueExW( hkey, widthW, NULL, &type, (BYTE*) &p_board->cols, &size ) ) + if( RegQueryValueExW( hkey, L"Width", NULL, &type, (BYTE*) &p_board->cols, &size ) ) p_board->cols = BEGINNER_COLS; size = sizeof( p_board->mines ); - if( RegQueryValueExW( hkey, minesW, NULL, &type, (BYTE*) &p_board->mines, &size ) ) + if( RegQueryValueExW( hkey, L"Mines", NULL, &type, (BYTE*) &p_board->mines, &size ) ) p_board->mines = BEGINNER_MINES; size = sizeof( p_board->difficulty ); - if( RegQueryValueExW( hkey, difficultyW, NULL, &type, (BYTE*) &p_board->difficulty, &size ) ) + if( RegQueryValueExW( hkey, L"Difficulty", NULL, &type, (BYTE*) &p_board->difficulty, &size ) ) p_board->difficulty = BEGINNER; size = sizeof( p_board->IsMarkQ ); - if( RegQueryValueExW( hkey, markW, NULL, &type, (BYTE*) &p_board->IsMarkQ, &size ) ) + if( RegQueryValueExW( hkey, L"Mark", NULL, &type, (BYTE*) &p_board->IsMarkQ, &size ) ) p_board->IsMarkQ = TRUE; for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, nameW, i+1 ); + wsprintfW( key_name, L"Name%u", i+1 ); size = sizeof( data ); if( RegQueryValueExW( hkey, key_name, NULL, &type, (LPBYTE) data, &size ) == ERROR_SUCCESS ) @@ -118,7 +105,7 @@ static void LoadBoard( BOARD *p_board ) } for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, timeW, i+1 ); + wsprintfW( key_name, L"Time%u", i+1 ); size = sizeof( p_board->best_time[i] ); if( RegQueryValueExW( hkey, key_name, NULL, &type, (BYTE*) &p_board->best_time[i], &size ) ) p_board->best_time[i] = 999; @@ -163,28 +150,28 @@ void SaveBoard( BOARD *p_board ) WCHAR data[MAX_PLAYER_NAME_SIZE+1]; WCHAR key_name[8]; - if( RegCreateKeyExW( HKEY_CURRENT_USER, registry_key, + if( RegCreateKeyExW( HKEY_CURRENT_USER, L"Software\\Microsoft\\WinMine", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL ) != ERROR_SUCCESS) return; - RegSetValueExW( hkey, xposW, 0, REG_DWORD, (LPBYTE) &p_board->pos.x, sizeof(p_board->pos.x) ); - RegSetValueExW( hkey, yposW, 0, REG_DWORD, (LPBYTE) &p_board->pos.y, sizeof(p_board->pos.y) ); - RegSetValueExW( hkey, difficultyW, 0, REG_DWORD, (LPBYTE) &p_board->difficulty, sizeof(p_board->difficulty) ); - RegSetValueExW( hkey, heightW, 0, REG_DWORD, (LPBYTE) &p_board->rows, sizeof(p_board->rows) ); - RegSetValueExW( hkey, widthW, 0, REG_DWORD, (LPBYTE) &p_board->cols, sizeof(p_board->cols) ); - RegSetValueExW( hkey, minesW, 0, REG_DWORD, (LPBYTE) &p_board->mines, sizeof(p_board->mines) ); - RegSetValueExW( hkey, markW, 0, REG_DWORD, (LPBYTE) &p_board->IsMarkQ, sizeof(p_board->IsMarkQ) ); + RegSetValueExW( hkey, L"Xpos", 0, REG_DWORD, (BYTE*) &p_board->pos.x, sizeof(p_board->pos.x) ); + RegSetValueExW( hkey, L"Ypos", 0, REG_DWORD, (BYTE*) &p_board->pos.y, sizeof(p_board->pos.y) ); + RegSetValueExW( hkey, L"Difficulty", 0, REG_DWORD, (BYTE*) &p_board->difficulty, sizeof(p_board->difficulty) ); + RegSetValueExW( hkey, L"Height", 0, REG_DWORD, (BYTE*) &p_board->rows, sizeof(p_board->rows) ); + RegSetValueExW( hkey, L"Width", 0, REG_DWORD, (BYTE*) &p_board->cols, sizeof(p_board->cols) ); + RegSetValueExW( hkey, L"Mines", 0, REG_DWORD, (BYTE*) &p_board->mines, sizeof(p_board->mines) ); + RegSetValueExW( hkey, L"Mark", 0, REG_DWORD, (BYTE*) &p_board->IsMarkQ, sizeof(p_board->IsMarkQ) ); for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, nameW, i+1 ); + wsprintfW( key_name, L"Name%u", i+1 ); lstrcpynW( data, p_board->best_name[i], ARRAY_SIZE(data)); RegSetValueExW( hkey, key_name, 0, REG_SZ, (LPBYTE) data, (lstrlenW(data)+1) * sizeof(WCHAR) ); } for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, timeW, i+1 ); + wsprintfW( key_name, L"Time%u", i+1 ); RegSetValueExW( hkey, key_name, 0, REG_DWORD, (LPBYTE) &p_board->best_time[i], sizeof(p_board->best_time[i]) ); } RegCloseKey( hkey ); -- 2.26.2

1 0

[PATCH] view: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/view/view.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index 2664eeb9b1f..ad29734828b 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -24,7 +24,7 @@ static HINSTANCE hInst; static HWND hMainWnd; -static WCHAR szAppName[5] = {'V','i','e','w',0}; +static const WCHAR szAppName[] = L"View"; static WCHAR szTitle[MAX_PATH]; static WCHAR szFileTitle[MAX_PATH]; @@ -52,14 +52,13 @@ typedef struct static BOOL FileOpen(HWND hWnd, WCHAR *fn, int fnsz) { WCHAR filter[120], metafileFilter[100]; - static const WCHAR filterW[] = {'%','s','%','c','*','.','w','m','f',';','*','.','e','m','f','%','c',0}; OPENFILENAMEW ofn = { sizeof(OPENFILENAMEW), 0, 0, NULL, NULL, 0, 0, NULL, fnsz, NULL, 0, NULL, NULL, OFN_SHOWHELP, 0, 0, NULL, 0, NULL }; LoadStringW( hInst, IDS_OPEN_META_STRING, metafileFilter, ARRAY_SIZE(metafileFilter) ); - swprintf( filter, ARRAY_SIZE(filter), filterW, metafileFilter, 0, 0 ); + swprintf( filter, ARRAY_SIZE(filter), L"%s%c*.wmf;*.emf%c", metafileFilter, 0, 0 ); ofn.lpstrFilter = filter; ofn.hwndOwner = hWnd; @@ -217,7 +216,6 @@ static void UpdateWindowCaption(void) { WCHAR szCaption[MAX_PATH]; WCHAR szView[MAX_PATH]; - static const WCHAR hyphenW[] = { ' ','-',' ',0 }; LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); @@ -225,7 +223,7 @@ static void UpdateWindowCaption(void) { lstrcpyW(szCaption, szFileTitle); LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); - lstrcatW(szCaption, hyphenW); + lstrcatW(szCaption, L" - "); lstrcatW(szCaption, szView); } else -- 2.26.2

1 0

[PATCH] taskkill: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/taskkill/taskkill.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 600bab14fde..193ed058297 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -102,12 +102,11 @@ static int WINAPIV taskkill_message_printfW(int msg, ...) static int taskkill_message(int msg) { - static const WCHAR formatW[] = {'%','1',0}; WCHAR msg_buffer[8192]; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - return taskkill_printfW(formatW, msg_buffer); + return taskkill_printfW(L"%1", msg_buffer); } /* Post WM_CLOSE to all top-level windows belonging to the process with specified PID. */ @@ -444,12 +443,6 @@ static BOOL add_to_task_list(WCHAR *name) * options are detected as parameters when placed after options that accept one. */ static BOOL process_arguments(int argc, WCHAR *argv[]) { - static const WCHAR opForceTerminate[] = {'f',0}; - static const WCHAR opImage[] = {'i','m',0}; - static const WCHAR opPID[] = {'p','i','d',0}; - static const WCHAR opHelp[] = {'?',0}; - static const WCHAR opTerminateChildren[] = {'t',0}; - if (argc > 1) { int i; @@ -460,7 +453,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) if (argc == 2) { argdata = argv[1]; - if ((*argdata == '/' || *argdata == '-') && !lstrcmpW(opHelp, argdata + 1)) + if ((*argdata == '/' || *argdata == '-') && !lstrcmpW(L"?", argdata + 1)) { taskkill_message(STRING_USAGE); exit(0); @@ -476,14 +469,14 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) goto invalid; argdata++; - if (!wcsicmp(opTerminateChildren, argdata)) + if (!wcsicmp(L"t", argdata)) WINE_FIXME("argument T not supported\n"); - if (!wcsicmp(opForceTerminate, argdata)) + if (!wcsicmp(L"f", argdata)) force_termination = TRUE; /* Options /IM and /PID appear to behave identically, except for * the fact that they cannot be specified at the same time. */ - else if ((got_im = !wcsicmp(opImage, argdata)) || - (got_pid = !wcsicmp(opPID, argdata))) + else if ((got_im = !wcsicmp(L"im", argdata)) || + (got_pid = !wcsicmp(L"pid", argdata))) { if (!argv[i + 1]) { -- 2.26.2

1 0

[PATCH] sc: Use wide-char string literals.
by Michael Stefaniuc 06 Oct '20

06 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/sc/sc.c | 123 +++++++++++++++-------------------------------- 1 file changed, 40 insertions(+), 83 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index c9744afee36..a20813b8cd5 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -43,16 +43,6 @@ struct create_params static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_params *cp ) { - static const WCHAR displaynameW[] = {'d','i','s','p','l','a','y','n','a','m','e','=',0}; - static const WCHAR typeW[] = {'t','y','p','e','=',0}; - static const WCHAR startW[] = {'s','t','a','r','t','=',0}; - static const WCHAR errorW[] = {'e','r','r','o','r','=',0}; - static const WCHAR binpathW[] = {'b','i','n','p','a','t','h','=',0}; - static const WCHAR groupW[] = {'g','r','o','u','p','=',0}; - static const WCHAR tagW[] = {'t','a','g','=',0}; - static const WCHAR dependW[] = {'d','e','p','e','n','d','=',0}; - static const WCHAR objW[] = {'o','b','j','=',0}; - static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d','=',0}; unsigned int i; cp->displayname = NULL; @@ -68,63 +58,44 @@ static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_pa for (i = 0; i < argc; i++) { - if (!wcsicmp( argv[i], displaynameW ) && i < argc - 1) cp->displayname = argv[i + 1]; - if (!wcsicmp( argv[i], binpathW ) && i < argc - 1) cp->binpath = argv[i + 1]; - if (!wcsicmp( argv[i], groupW ) && i < argc - 1) cp->group = argv[i + 1]; - if (!wcsicmp( argv[i], dependW ) && i < argc - 1) cp->depend = argv[i + 1]; - if (!wcsicmp( argv[i], objW ) && i < argc - 1) cp->obj = argv[i + 1]; - if (!wcsicmp( argv[i], passwordW ) && i < argc - 1) cp->password = argv[i + 1]; + if (!wcsicmp( argv[i], L"displayname=" ) && i < argc - 1) cp->displayname = argv[i + 1]; + if (!wcsicmp( argv[i], L"binpath=" ) && i < argc - 1) cp->binpath = argv[i + 1]; + if (!wcsicmp( argv[i], L"group=" ) && i < argc - 1) cp->group = argv[i + 1]; + if (!wcsicmp( argv[i], L"depend=" ) && i < argc - 1) cp->depend = argv[i + 1]; + if (!wcsicmp( argv[i], L"obj=" ) && i < argc - 1) cp->obj = argv[i + 1]; + if (!wcsicmp( argv[i], L"password=" ) && i < argc - 1) cp->password = argv[i + 1]; - if (!wcsicmp( argv[i], tagW ) && i < argc - 1) + if (!wcsicmp( argv[i], L"tag=" ) && i < argc - 1) { - static const WCHAR yesW[] = {'y','e','s',0}; - if (!wcsicmp( argv[i], yesW )) + if (!wcsicmp( argv[i], L"yes" )) { WINE_FIXME("tag argument not supported\n"); cp->tag = TRUE; } } - if (!wcsicmp( argv[i], typeW ) && i < argc - 1) + if (!wcsicmp( argv[i], L"type=" ) && i < argc - 1) { - static const WCHAR ownW[] = {'o','w','n',0}; - static const WCHAR shareW[] = {'s','h','a','r','e',0}; - static const WCHAR kernelW[] = {'k','e','r','n','e','l',0}; - static const WCHAR filesysW[] = {'f','i','l','e','s','y','s',0}; - static const WCHAR recW[] = {'r','e','c',0}; - static const WCHAR interactW[] = {'i','n','t','e','r','a','c','t',0}; - - if (!wcsicmp( argv[i + 1], ownW )) cp->type = SERVICE_WIN32_OWN_PROCESS; - if (!wcsicmp( argv[i + 1], shareW )) cp->type = SERVICE_WIN32_SHARE_PROCESS; - if (!wcsicmp( argv[i + 1], kernelW )) cp->type = SERVICE_KERNEL_DRIVER; - if (!wcsicmp( argv[i + 1], filesysW )) cp->type = SERVICE_FILE_SYSTEM_DRIVER; - if (!wcsicmp( argv[i + 1], recW )) cp->type = SERVICE_RECOGNIZER_DRIVER; - if (!wcsicmp( argv[i + 1], interactW )) cp->type |= SERVICE_INTERACTIVE_PROCESS; + if (!wcsicmp( argv[i + 1], L"own" )) cp->type = SERVICE_WIN32_OWN_PROCESS; + if (!wcsicmp( argv[i + 1], L"share" )) cp->type = SERVICE_WIN32_SHARE_PROCESS; + if (!wcsicmp( argv[i + 1], L"kernel" )) cp->type = SERVICE_KERNEL_DRIVER; + if (!wcsicmp( argv[i + 1], L"filesys" )) cp->type = SERVICE_FILE_SYSTEM_DRIVER; + if (!wcsicmp( argv[i + 1], L"rec" )) cp->type = SERVICE_RECOGNIZER_DRIVER; + if (!wcsicmp( argv[i + 1], L"interact" )) cp->type |= SERVICE_INTERACTIVE_PROCESS; } - if (!wcsicmp( argv[i], startW ) && i < argc - 1) + if (!wcsicmp( argv[i], L"start="L"start" ) && i < argc - 1) { - static const WCHAR bootW[] = {'b','o','o','t',0}; - static const WCHAR systemW[] = {'s','y','s','t','e','m',0}; - static const WCHAR autoW[] = {'a','u','t','o',0}; - static const WCHAR demandW[] = {'d','e','m','a','n','d',0}; - static const WCHAR disabledW[] = {'d','i','s','a','b','l','e','d',0}; - - if (!wcsicmp( argv[i + 1], bootW )) cp->start = SERVICE_BOOT_START; - if (!wcsicmp( argv[i + 1], systemW )) cp->start = SERVICE_SYSTEM_START; - if (!wcsicmp( argv[i + 1], autoW )) cp->start = SERVICE_AUTO_START; - if (!wcsicmp( argv[i + 1], demandW )) cp->start = SERVICE_DEMAND_START; - if (!wcsicmp( argv[i + 1], disabledW )) cp->start = SERVICE_DISABLED; + if (!wcsicmp( argv[i + 1], L"boot" )) cp->start = SERVICE_BOOT_START; + if (!wcsicmp( argv[i + 1], L"system" )) cp->start = SERVICE_SYSTEM_START; + if (!wcsicmp( argv[i + 1], L"auto" )) cp->start = SERVICE_AUTO_START; + if (!wcsicmp( argv[i + 1], L"demand" )) cp->start = SERVICE_DEMAND_START; + if (!wcsicmp( argv[i + 1], L"disabled" )) cp->start = SERVICE_DISABLED; } - if (!wcsicmp( argv[i], errorW ) && i < argc - 1) + if (!wcsicmp( argv[i], L"error=" ) && i < argc - 1) { - static const WCHAR normalW[] = {'n','o','r','m','a','l',0}; - static const WCHAR severeW[] = {'s','e','v','e','r','e',0}; - static const WCHAR criticalW[] = {'c','r','i','t','i','c','a','l',0}; - static const WCHAR ignoreW[] = {'i','g','n','o','r','e',0}; - - if (!wcsicmp( argv[i + 1], normalW )) cp->error = SERVICE_ERROR_NORMAL; - if (!wcsicmp( argv[i + 1], severeW )) cp->error = SERVICE_ERROR_SEVERE; - if (!wcsicmp( argv[i + 1], criticalW )) cp->error = SERVICE_ERROR_CRITICAL; - if (!wcsicmp( argv[i + 1], ignoreW )) cp->error = SERVICE_ERROR_IGNORE; + if (!wcsicmp( argv[i + 1], L"normal" )) cp->error = SERVICE_ERROR_NORMAL; + if (!wcsicmp( argv[i + 1], L"severe" )) cp->error = SERVICE_ERROR_SEVERE; + if (!wcsicmp( argv[i + 1], L"critical" )) cp->error = SERVICE_ERROR_CRITICAL; + if (!wcsicmp( argv[i + 1], L"ignore" )) cp->error = SERVICE_ERROR_IGNORE; } } if (!cp->binpath) return FALSE; @@ -133,9 +104,6 @@ static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_pa static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *fa ) { - static const WCHAR runW[] = {'r','u','n',0}; - static const WCHAR restartW[] = {'r','e','s','t','a','r','t',0}; - static const WCHAR rebootW[] = {'r','e','b','o','o','t',0}; unsigned int i, count; WCHAR *actions, *p; @@ -164,9 +132,9 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f p = actions; for (i = 0; i < count; i++) { - if (!wcsicmp( p, runW )) fa->lpsaActions[i].Type = SC_ACTION_RUN_COMMAND; - else if (!wcsicmp( p, restartW )) fa->lpsaActions[i].Type = SC_ACTION_RESTART; - else if (!wcsicmp( p, rebootW )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; + if (!wcsicmp( p, L"run" )) fa->lpsaActions[i].Type = SC_ACTION_RUN_COMMAND; + else if (!wcsicmp( p, L"restart" )) fa->lpsaActions[i].Type = SC_ACTION_RESTART; + else if (!wcsicmp( p, L"reboot="L"reboot" )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; else fa->lpsaActions[i].Type = SC_ACTION_NONE; p += lstrlenW( p ) + 1; @@ -180,10 +148,6 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f static BOOL parse_failure_params( int argc, const WCHAR *argv[], SERVICE_FAILURE_ACTIONSW *fa ) { - static const WCHAR resetW[] = {'r','e','s','e','t','=',0}; - static const WCHAR rebootW[] = {'r','e','b','o','o','t','=',0}; - static const WCHAR commandW[] = {'c','o','m','m','a','n','d','=',0}; - static const WCHAR actionsW[] = {'a','c','t','i','o','n','s','=',0}; unsigned int i; fa->dwResetPeriod = 0; @@ -194,10 +158,10 @@ static BOOL parse_failure_params( int argc, const WCHAR *argv[], SERVICE_FAILURE for (i = 0; i < argc; i++) { - if (!wcsicmp( argv[i], resetW ) && i < argc - 1) fa->dwResetPeriod = wcstol( argv[i + 1], NULL, 10 ); - if (!wcsicmp( argv[i], rebootW ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; - if (!wcsicmp( argv[i], commandW ) && i < argc - 1) fa->lpCommand = (WCHAR *)argv[i + 1]; - if (!wcsicmp( argv[i], actionsW )) + if (!wcsicmp( argv[i], L"reset=" ) && i < argc - 1) fa->dwResetPeriod = wcstol( argv[i + 1], NULL, 10 ); + if (!wcsicmp( argv[i], L"reboot="L"reboot" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; + if (!wcsicmp( argv[i], L"command=" ) && i < argc - 1) fa->lpCommand = (WCHAR *)argv[i + 1]; + if (!wcsicmp( argv[i], L"actions=" )) { if (i == argc - 1) return FALSE; if (!parse_failure_actions( argv[i + 1], fa )) return FALSE; @@ -214,13 +178,6 @@ static void usage( void ) int __cdecl wmain( int argc, const WCHAR *argv[] ) { - static const WCHAR createW[] = {'c','r','e','a','t','e',0}; - static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR failureW[] = {'f','a','i','l','u','r','e',0}; - static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; - static const WCHAR startW[] = {'s','t','a','r','t',0}; - static const WCHAR stopW[] = {'s','t','o','p',0}; - static const WCHAR sdsetW[] = {'s','d','s','e','t',0}; SC_HANDLE manager, service; SERVICE_STATUS status; BOOL ret = FALSE; @@ -240,7 +197,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) return 1; } - if (!wcsicmp( argv[1], createW )) + if (!wcsicmp( argv[1], L"create" )) { struct create_params cp; @@ -265,7 +222,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to create service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], descriptionW )) + else if (!wcsicmp( argv[1], L"description" )) { service = OpenServiceW( manager, argv[2], SERVICE_CHANGE_CONFIG ); if (service) @@ -278,7 +235,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], failureW )) + else if (!wcsicmp( argv[1], L"failure" )) { service = OpenServiceW( manager, argv[2], SERVICE_CHANGE_CONFIG ); if (service) @@ -296,7 +253,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], deleteW )) + else if (!wcsicmp( argv[1], L"delete" )) { service = OpenServiceW( manager, argv[2], DELETE ); if (service) @@ -307,7 +264,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], startW )) + else if (!wcsicmp( argv[1], L"start="L"start" )) { service = OpenServiceW( manager, argv[2], SERVICE_START ); if (service) @@ -318,7 +275,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], stopW )) + else if (!wcsicmp( argv[1], L"stop" )) { service = OpenServiceW( manager, argv[2], SERVICE_STOP ); if (service) @@ -329,7 +286,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], sdsetW )) + else if (!wcsicmp( argv[1], L"sdset" )) { WINE_FIXME("SdSet command not supported, faking success\n"); ret = TRUE; -- 2.26.2

1 0