- Wine-Devel - list.winehq.org

[PATCH v2] xactengine3_7: Initial IXACT3Engine tests
by Alistair Leslie-Hughes Oct. 7, 2020

Oct. 7, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure.ac | 1 + dlls/xactengine3_7/tests/Makefile.in | 5 ++ dlls/xactengine3_7/tests/xact3.c | 100 +++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 dlls/xactengine3_7/tests/Makefile.in create mode 100644 dlls/xactengine3_7/tests/xact3.c diff --git a/configure.ac b/configure.ac index 865aa924d07..a57697a0ddf 100644 --- a/configure.ac +++ b/configure.ac @@ -3915,6 +3915,7 @@ WINE_CONFIG_MAKEFILE(dlls/xactengine3_4) WINE_CONFIG_MAKEFILE(dlls/xactengine3_5) WINE_CONFIG_MAKEFILE(dlls/xactengine3_6) WINE_CONFIG_MAKEFILE(dlls/xactengine3_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine3_7/tests) WINE_CONFIG_MAKEFILE(dlls/xapofx1_1) WINE_CONFIG_MAKEFILE(dlls/xapofx1_2) WINE_CONFIG_MAKEFILE(dlls/xapofx1_3) diff --git a/dlls/xactengine3_7/tests/Makefile.in b/dlls/xactengine3_7/tests/Makefile.in new file mode 100644 index 00000000000..c32b2562546 --- /dev/null +++ b/dlls/xactengine3_7/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = xactengine3_7.dll +IMPORTS = ole32 + +C_SRCS = \ + xact3.c diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c new file mode 100644 index 00000000000..9b0d3defb09 --- /dev/null +++ b/dlls/xactengine3_7/tests/xact3.c @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <math.h> +#include <limits.h> +#include <float.h> + +#define COBJMACROS +#include "wine/test.h" + +#include "x3daudio.h" + +#include "initguid.h" +#include "xact3.h" + +DEFINE_GUID(IID_IXACT3Engine30, 0x9e33f661, 0x2d07, 0x43ec, 0x97, 0x04, 0xbb, 0xcb, 0x71, 0xa5, 0x49, 0x72); +DEFINE_GUID(IID_IXACT3Engine31, 0xe72c1b9a, 0xd717, 0x41c0, 0x81, 0xa6, 0x50, 0xeb, 0x56, 0xe8, 0x06, 0x49); + +DEFINE_GUID(CLSID_XACTEngine30, 0x3b80ee2a, 0xb0f5, 0x4780, 0x9e, 0x30, 0x90, 0xcb, 0x39, 0x68, 0x5b, 0x03); +DEFINE_GUID(CLSID_XACTEngine31, 0x962f5027, 0x99be, 0x4692, 0xa4, 0x68, 0x85, 0x80, 0x2c, 0xf8, 0xde, 0x61); +DEFINE_GUID(CLSID_XACTEngine32, 0xd3332f02, 0x3dd0, 0x4de9, 0x9a, 0xec, 0x20, 0xd8, 0x5c, 0x41, 0x11, 0xb6); +DEFINE_GUID(CLSID_XACTEngine33, 0x94c1affa, 0x66e7, 0x4961, 0x95, 0x21, 0xcf, 0xde, 0xf3, 0x12, 0x8d, 0x4f); +DEFINE_GUID(CLSID_XACTEngine34, 0x0977d092, 0x2d95, 0x4e43, 0x8d, 0x42, 0x9d, 0xdc, 0xc2, 0x54, 0x5e, 0xd5); +DEFINE_GUID(CLSID_XACTEngine35, 0x074b110f, 0x7f58, 0x4743, 0xae, 0xa5, 0x12, 0xf1, 0x5b, 0x50, 0x74, 0xed); +DEFINE_GUID(CLSID_XACTEngine36, 0x248d8a3b, 0x6256, 0x44d3, 0xa0, 0x18, 0x2a, 0xc9, 0x6c, 0x45, 0x9f, 0x47); + +struct xact_interfaces +{ + REFGUID clsid; + REFIID iid; + HRESULT expected; +} xact_interfaces[] = +{ + {&CLSID_XACTEngine30, &IID_IXACT3Engine30, S_OK }, + {&CLSID_XACTEngine30, &IID_IXACT3Engine31, E_NOINTERFACE}, + {&CLSID_XACTEngine30, &IID_IXACT3Engine, E_NOINTERFACE }, + + /* Version 3.1 to 3.4 use the same inteface */ + {&CLSID_XACTEngine31, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine32, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine33, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine34, &IID_IXACT3Engine31, S_OK }, + + /* Version 3.5 to 3.7 use the same inteface */ + {&CLSID_XACTEngine35, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine35, &IID_IXACT3Engine, S_OK }, + + {&CLSID_XACTEngine36, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine36, &IID_IXACT3Engine, S_OK }, + + {&CLSID_XACTEngine, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine, &IID_IXACT3Engine, S_OK }, + {&CLSID_XACTEngine, &IID_IUnknown, S_OK }, +}; + +static void test_interfaces(void) +{ + IUnknown *unk; + HRESULT hr; + int i; + + for (i = 0; i < ARRAY_SIZE(xact_interfaces); i++) + { + hr = CoCreateInstance(xact_interfaces[i].clsid, NULL, CLSCTX_INPROC_SERVER, + xact_interfaces[i].iid, (void**)&unk); + if (hr == REGDB_E_CLASSNOTREG) + { + trace("%d %s not registered. Skipping\n", i, wine_dbgstr_guid(xact_interfaces[i].clsid) ); + continue; + } + ok(hr == xact_interfaces[i].expected, "%d, Unexpected value 0x%08x\n", i, hr); + if (hr == S_OK) + IUnknown_Release(unk); + } +} + +START_TEST(xact3) +{ + CoInitialize(NULL); + + test_interfaces(); + + CoUninitialize(); +} -- 2.28.0

1 0

[PATCH] tzres: Add Cuba Time Zone.
by Daniel Lehman Oct. 7, 2020

Oct. 7, 2020

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/tzres/tzres.rc | 2 ++ loader/wine.inf.in | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/tzres/tzres.rc b/dlls/tzres/tzres.rc index 4763aa63ebf..f7eebe73393 100644 --- a/dlls/tzres/tzres.rc +++ b/dlls/tzres/tzres.rc @@ -86,6 +86,8 @@ STRINGTABLE 62305 "Chatham Islands Daylight Time" 160 "China Standard Time" 161 "China Daylight Time" + 17136 "Cuba Standard Time" + 17137 "Cuba Daylight Time" 50384 "Dateline Standard Time" 50385 "Dateline Daylight Time" 62720 "E. Africa Standard Time" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index f3ad3ce754f..a1794742677 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2970,6 +2970,24 @@ HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"MUI_Dlt",,"@tzres.dll,-1 HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"MUI_Std",,"@tzres.dll,-160" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Std",,"China Standard Time" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"Display",,"America/Havana" +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"Dlt",,"Cuba Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"MUI_Dlt",,"@tzres.dll,-17137" +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"MUI_Std",,"@tzres.dll,-17136" +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"Std",,"Cuba Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2008",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2009",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2010",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2011",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,02,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2012",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2013",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"FirstEntry",0x10001,"2004" +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"LastEntry",0x10001,"2013" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"Display",,"Etc/GMT+12" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"Dlt",,"Dateline Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"MUI_Dlt",,"@tzres.dll,-50385" -- 2.25.1

1 0

[PATCH 1/5] winegstreamer: Use RGB15/16 formats instead of BGR15/16.
by Anton Baskanov Oct. 7, 2020

Oct. 7, 2020

Gstreamer stores the first component in the most significant bits, same as DirectShow. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index acb15dc9238..5b5add409c7 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -194,11 +194,11 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE amt->subtype = MEDIASUBTYPE_RGB24; bih->biBitCount = 24; break; - case GST_VIDEO_FORMAT_BGR16: + case GST_VIDEO_FORMAT_RGB16: amt->subtype = MEDIASUBTYPE_RGB565; bih->biBitCount = 16; break; - case GST_VIDEO_FORMAT_BGR15: + case GST_VIDEO_FORMAT_RGB15: amt->subtype = MEDIASUBTYPE_RGB555; bih->biBitCount = 16; break; @@ -380,8 +380,8 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) {&MEDIASUBTYPE_ARGB32, GST_VIDEO_FORMAT_BGRA}, {&MEDIASUBTYPE_RGB32, GST_VIDEO_FORMAT_BGRx}, {&MEDIASUBTYPE_RGB24, GST_VIDEO_FORMAT_BGR}, - {&MEDIASUBTYPE_RGB565, GST_VIDEO_FORMAT_BGR16}, - {&MEDIASUBTYPE_RGB555, GST_VIDEO_FORMAT_BGR15}, + {&MEDIASUBTYPE_RGB565, GST_VIDEO_FORMAT_RGB16}, + {&MEDIASUBTYPE_RGB555, GST_VIDEO_FORMAT_RGB15}, }; const VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)mt->pbFormat; -- 2.17.1

3 9

[PATCH] winemac: Remove unused GetCurrentProcess() call.
by Brendan Shanks Oct. 7, 2020

Oct. 7, 2020

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/cocoa_app.m | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b4dcbfff473..e296d4b4af0 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -19,7 +19,6 @@ */ #import <Carbon/Carbon.h> -#include <dlfcn.h> #import "cocoa_app.h" #import "cocoa_event.h" @@ -1332,8 +1331,6 @@ CGEventRef WineAppEventTapCallBack(CGEventTapProxy proxy, CGEventType type, - (BOOL) installEventTap { - ProcessSerialNumber psn; - OSErr err; CGEventMask mask = CGEventMaskBit(kCGEventLeftMouseDown) | CGEventMaskBit(kCGEventLeftMouseUp) | CGEventMaskBit(kCGEventRightMouseDown) | @@ -1346,31 +1343,10 @@ - (BOOL) installEventTap CGEventMaskBit(kCGEventOtherMouseDragged) | CGEventMaskBit(kCGEventScrollWheel); CFRunLoopSourceRef source; - void* appServices; - OSErr (*pGetCurrentProcess)(ProcessSerialNumber* PSN); if (cursorClippingEventTap) return TRUE; - // We need to get the Mac GetCurrentProcess() from the ApplicationServices - // framework with dlsym() because the Win32 function of the same name - // obscures it. - appServices = dlopen("/System/Library/Frameworks/ApplicationServices.framework/ApplicationServices", RTLD_LAZY); - if (!appServices) - return FALSE; - - pGetCurrentProcess = dlsym(appServices, "GetCurrentProcess"); - if (!pGetCurrentProcess) - { - dlclose(appServices); - return FALSE; - } - - err = pGetCurrentProcess(&psn); - dlclose(appServices); - if (err != noErr) - return FALSE; - // We create an annotated session event tap rather than a process-specific // event tap because we need to programmatically move the cursor even when // mouse moves are directed to other processes. We disable our tap when -- 2.26.2

2 2

[PATCH] quartz: Use wide-char string literals.
by Michael Stefaniuc Oct. 7, 2020

Oct. 7, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/filesource.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 79df639ab4a..cc252c0e0e0 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -183,9 +183,7 @@ static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file) BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID *source_clsid) { - WCHAR extensions_path[278] = {'M','e','d','i','a',' ','T','y','p','e','\\','E','x','t','e','n','s','i','o','n','s','\\',0}; - static const WCHAR wszExtensions[] = {'E','x','t','e','n','s','i','o','n','s',0}; - static const WCHAR wszMediaType[] = {'M','e','d','i','a',' ','T','y','p','e',0}; + WCHAR extensions_path[278] = L"Media Type\\Extensions\\"; DWORD majortype_idx, size; const WCHAR *ext; HKEY parent_key; @@ -223,7 +221,7 @@ BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID return FALSE; } - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszMediaType, 0, KEY_READ, &parent_key)) + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Media Type", 0, KEY_READ, &parent_key)) { CloseHandle(file); return FALSE; @@ -239,7 +237,7 @@ BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID if (RegEnumKeyExW(parent_key, majortype_idx, majortype_str, &size, NULL, NULL, NULL, NULL)) break; - if (!wcscmp(majortype_str, wszExtensions)) + if (!wcscmp(majortype_str, L"Extensions")) continue; if (RegOpenKeyExW(parent_key, majortype_str, 0, KEY_READ, &majortype_key)) -- 2.26.2

2 1

[PATCH] atl: Use wide-char string literals.
by Michael Stefaniuc Oct. 7, 2020

Oct. 7, 2020

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 Oct. 6, 2020

Oct. 6, 2020

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 Oct. 6, 2020

Oct. 6, 2020

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 Oct. 6, 2020

Oct. 6, 2020

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 Oct. 6, 2020

Oct. 6, 2020

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