February 2020 - Wine-Commits

Alexandre Julliard : wrc: Add an option to set the input codepage to UTF-8.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 1d8f4fe4a0a90fada6c52fc7e766ae4fd8c64252 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d8f4fe4a0a90fada6c52fc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 08:48:08 2020 +0100 wrc: Add an option to set the input codepage to UTF-8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 8 ++++---- tools/wrc/parser.l | 2 +- tools/wrc/wrc.c | 8 +++++++- tools/wrc/wrc.h | 1 + tools/wrc/wrc.man.in | 3 +++ 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index e5628712cc..12095436dd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2710,7 +2710,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name ); strarray_add( &make->res_files, strmake( "%s.res", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -o $@", tools_path( make, "wrc" ) ); + output( "\t%s -u -o $@", tools_path( make, "wrc" ) ); if (make->is_win16) output_filename( "-m16" ); else output_filenames( target_flags ); output_filename( "--nostdinc" ); @@ -2735,7 +2735,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c { strarray_add( &make->clean_files, strmake( "%s.pot", obj )); output( "%s.pot: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -O pot -o $@", tools_path( make, "wrc" ) ); + output( "\t%s -u -O pot -o $@", tools_path( make, "wrc" ) ); if (make->is_win16) output_filename( "-m16" ); else output_filenames( target_flags ); output_filename( "--nostdinc" ); @@ -3019,7 +3019,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, strarray_add( &make->clean_files, dll_name ); strarray_add( &make->res_files, strmake( "%s.res", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), obj_dir_path( make, dll_name )); - output( "\techo \"%s.dll TESTDLL \\\"%s\\\"\" | %s -o $@\n", obj, + output( "\techo \"%s.dll TESTDLL \\\"%s\\\"\" | %s -u -o $@\n", obj, obj_dir_path( make, dll_name ), tools_path( make, "wrc" )); output( "%s:", obj_dir_path( make, dll_name )); @@ -3492,7 +3492,7 @@ static void output_test_module( struct makefile *make ) output( "all: %s/%s\n", top_obj_dir_path( make, "programs/winetest" ), testres ); output( "%s/%s: %s%s\n", top_obj_dir_path( make, "programs/winetest" ), testres, obj_dir_path( make, stripped ), ext ); - output( "\techo \"%s TESTRES \\\"%s%s\\\"\" | %s -o $@\n", + output( "\techo \"%s TESTRES \\\"%s%s\\\"\" | %s -u -o $@\n", testmodule, obj_dir_path( make, stripped ), ext, tools_path( make, "wrc" )); output_filenames_obj_dir( make, make->ok_files ); diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index f456c626d1..d1e768f72c 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -121,7 +121,7 @@ ws [ \f\t\r] /* Always update the current character position within a line */ #define YY_USER_ACTION char_number+=yyleng; wanted_id = want_id; want_id = 0; -#define YY_USER_INIT current_codepage = -1; +#define YY_USER_INIT current_codepage = utf8_input ? CP_UTF8 : -1; static void addcchar(char c); static void addwchar(WCHAR s); diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index d171bfa2ef..b4cb013f8e 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -144,6 +144,8 @@ int preprocess_only = 0; */ int no_preprocess = 0; +int utf8_input = 0; + int check_utf8 = 1; /* whether to check for valid utf8 */ static int pointer_size = sizeof(void *); @@ -184,7 +186,7 @@ enum long_options_values }; static const char short_options[] = - "b:D:Ef:F:hi:I:J:l:m:o:O:rU:v"; + "b:D:Ef:F:hi:I:J:l:m:o:O:ruU:v"; static const struct option long_options[] = { { "debug", 1, NULL, LONG_OPT_DEBUG }, { "define", 1, NULL, 'D' }, @@ -203,6 +205,7 @@ static const struct option long_options[] = { { "preprocessor", 1, NULL, LONG_OPT_PREPROCESSOR }, { "sysroot", 1, NULL, LONG_OPT_SYSROOT }, { "target", 1, NULL, 'F' }, + { "utf8", 0, NULL, 'u' }, { "undefine", 1, NULL, 'U' }, { "use-temp-file", 0, NULL, LONG_OPT_TMPFILE }, { "verbose", 0, NULL, 'v' }, @@ -503,6 +506,9 @@ int main(int argc,char *argv[]) case 'r': /* ignored for compatibility with rc */ break; + case 'u': + utf8_input = 1; + break; case 'U': wpp_del_define(optarg); break; diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 77e3e6942e..9664dd0392 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -39,6 +39,7 @@ extern int pedantic; extern int byteorder; extern int preprocess_only; extern int no_preprocess; +extern int utf8_input; extern int check_utf8; extern char *input_name; diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index 80fcd04c5b..24dca04902 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -124,6 +124,9 @@ To disable preprocessing, use \fB--preprocessor=cat\fR. .I \fB\-\-sysroot=\fIdir\fR Prefix the standard include paths with \fIdir\fR. .TP +.I \fB\-\-utf8\fR, \fB\-u\fR +Set the default codepage of the input file to UTF-8. +.TP .I \fB\-U\fR, \fB\-\-undefine\fR=\fIid\fR Undefine preprocessor identifier \fIid\fR. Please note that only macros defined up to this point are undefined by this command. However, these

1 0

Julian Rüger : German translation for release 5.1.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: website Branch: master Commit: a16e7db59f1991129f2a438711bff1e5f130e9b4 URL: https://source.winehq.org/git/website.git/?a=commit;h=a16e7db59f1991129f2a4… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Feb 7 13:15:18 2020 +0100 German translation for release 5.1. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020020201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2020020201.xml b/news/de/2020020201.xml new file mode 100644 index 00000000..e153df5e --- /dev/null +++ b/news/de/2020020201.xml @@ -0,0 +1,17 @@ +<news> +<date>2. Februar 2020</date> +<title>Wine 5.1 freigegeben</title> +<body> + Die Entwicklungsversion 5.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung, LLVM-MinGW als PE-Cross-Compiler zu verwenden.</li> + <li>Bessere Angabe der Fehlerstelle in Fehlermeldungen von JScript und VBScript.</li> + <li>Unterstützung verschieblicher Installation der Winelib-Werkzeuge.</li> + <li>Zeichnen von Ellipsen in Direct2D.</li> + <li>OLE-Moniker-Verbesserungen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.1.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Francois Gouget : testbot/doc: Sort the Perl module dependencies alphabetically.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: tools Branch: master Commit: adfb9d6b2d6157c3dd232339f9510b18d3bca5a9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=adfb9d6b2d6157c3dd23233… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 7 00:24:49 2020 +0100 testbot/doc: Sort the Perl module dependencies alphabetically. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index bd4f39b..0dd5710 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -7,8 +7,8 @@ Dependencies: - Sendmail - Bytes::Random::Secure (libbytes-random-secure-perl) - DBI::mysql (libdbd-mysql-perl) -- Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) +- Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Optional: Procmail (to process mailing list patches) - Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) - Optional: Net::OpenSSH (for SSH tunneling, libnet-openssh-perl)

1 0

Francois Gouget : testbot/Janitor: Take into accout the Engine's work staging directories.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: tools Branch: master Commit: e1cfa6ecbca4c89779e87651cea5d570f3877536 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e1cfa6ecbca4c89779e8765… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 7 00:24:42 2020 +0100 testbot/Janitor: Take into accout the Engine's work staging directories. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index dd13966..888bebf 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -276,7 +276,7 @@ if (opendir(my $dh, "$DataDir/staging")) # These files always expire after one day $TTL = 1 - $Age; } - elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|email|winetest(?:64)?-latest\.exe)$/) + elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|email|winetest(?:64)?-latest\.exe|work)$/) { my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; Error "Found a suspicious file$Deletion: staging/$Entry\n";

1 0

Michael Stefaniuc : winmm/tests: Get rid of strcmp_wa().
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: cdec2413e2a679e6eae1f4e055413d908292b5da URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdec2413e2a679e6eae1f4e0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 6 22:41:18 2020 +0200 winmm/tests: Get rid of strcmp_wa(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mci.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 7c8aee8273..f8bb4c56ac 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -163,13 +163,6 @@ static void test_notification_dbg(HWND hwnd, const char* command, WPARAM type, i else ok_(__FILE__,line)(msg.wParam == type, "got %04lx instead of MCI_NOTIFY_xyz %04lx from command %s\n", msg.wParam, type, command); } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), 0, 0); - return lstrcmpA(buf, stra); -} - static void test_mciParser(HWND hwnd) { MCIERROR err; @@ -464,7 +457,7 @@ static void test_openCloseWAVE(HWND hwnd) /* MCI_..._PARMSA and PARMSW share the same layout, use one for both tests. */ err = mciSendCommandW(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_NAME | MCI_SYSINFO_OPEN, (DWORD_PTR)&parm); ok(!err || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommandW MCI_SYSINFO all name 1 open buffer[8]: %s\n", dbg_mcierr(err)); - if(!err) ok(!strcmp_wa((LPWSTR)buf,"mysound"), "sysinfo name 1 open contents\n"); + if (!err) ok(!lstrcmpW((LPWSTR)buf, L"mysound"), "sysinfo name 1 open contents\n"); memset(buf, 0, sizeof(buf)); buf[0] = 'Y';

1 0

Zhiyi Zhang : wined3d: Add GPU information for NVIDIA GeForce GTX 1650 SUPER.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: c8aad3407c67536d70cbb802bb4f871d56eb500e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8aad3407c67536d70cbb802… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 5 15:28:09 2020 +0800 wined3d: Add GPU information for NVIDIA GeForce GTX 1650 SUPER. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 634a0be36a..d6ea822b66 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1359,6 +1359,7 @@ cards_nvidia_binary[] = {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ {"RTX 2060", CARD_NVIDIA_GEFORCE_RTX2060}, /* GeForce 2000 - highend */ {"GTX 1660 Ti", CARD_NVIDIA_GEFORCE_GTX1660TI}, /* GeForce 1600 - highend */ + {"GTX 1650 SUPER", CARD_NVIDIA_GEFORCE_GTX1650SUPER}, /* GeForce 1600 - midend high */ {"TITAN V", CARD_NVIDIA_TITANV}, /* GeForce 1000 - highend */ {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ {"GTX 1080 Ti", CARD_NVIDIA_GEFORCE_GTX1080TI}, /* GeForce 1000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 12b53f7577..03d682db34 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -420,6 +420,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_GEFORCE8, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_GEFORCE8, 12288}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1650SUPER,"NVIDIA GeForce GTX 1650 SUPER", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1660TI, "NVIDIA GeForce GTX 1660 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2060, "NVIDIA GeForce RTX 2060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2070, "NVIDIA GeForce RTX 2070", DRIVER_NVIDIA_GEFORCE8, 8192}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5beaa927d7..aea3481c40 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2585,6 +2585,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_NVIDIA_TITANV = 0x1d81, + CARD_NVIDIA_GEFORCE_GTX1650SUPER= 0x2187, CARD_NVIDIA_GEFORCE_GTX1660TI = 0x2182, CARD_NVIDIA_GEFORCE_RTX2060 = 0x1f08, CARD_NVIDIA_GEFORCE_RTX2070 = 0x1f07,

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetStreamSourceFreq().
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 705d74f42d68cb4fe0a70e089388e665c335dffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=705d74f42d68cb4fe0a70e08… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 21:17:45 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetStreamSourceFreq(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 87d7db3d00..da884544ea 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3737,8 +3737,6 @@ static HRESULT WINAPI d3d9_device_SetStreamSourceFreq(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); hr = wined3d_stateblock_set_stream_source_freq(device->update_state, stream_idx, freq); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_stream_source_freq(device->wined3d_device, stream_idx, freq); wined3d_mutex_unlock(); return hr;

1 0

Michael Stefaniuc : winhttp/tests: Get rid of strcmp_wa().
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: a1e7371dfd10dfc0702b9121a6a9302821073532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1e7371dfd10dfc0702b9121… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 6 22:41:17 2020 +0200 winhttp/tests: Get rid of strcmp_wa(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index b73c57a41d..83f7809a3c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -43,22 +43,6 @@ static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q', static const WCHAR test_winehq_https[] = {'h','t','t','p','s',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',':','4','4','3',0}; static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; -static WCHAR *a2w(const char *str) -{ - int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - return ret; -} - -static int strcmp_wa(const WCHAR *str1, const char *stra) -{ - WCHAR *str2 = a2w(stra); - int r = lstrcmpW(str1, str2); - heap_free(str2); - return r; -} - static BOOL proxy_active(void) { WINHTTP_PROXY_INFO proxy_info; @@ -2869,7 +2853,7 @@ static void test_multi_authentication(int port) size = sizeof(buf); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, www_authenticateW, buf, &size, &index); ok(ret, "expected success\n"); - ok(!strcmp_wa(buf, "Bearer"), "buf = %s\n", wine_dbgstr_w(buf)); + ok(!lstrcmpW(buf, L"Bearer"), "buf = %s\n", wine_dbgstr_w(buf)); ok(size == lstrlenW(buf) * sizeof(WCHAR), "size = %u\n", size); ok(index == 1, "index = %u\n", index);

1 0

Michael Stefaniuc : propsys/tests: Get rid of strcmp_wa().
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 2340212ee9c48c731c85bbad8c81ed833458bf15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2340212ee9c48c731c85bbad… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 6 22:41:14 2020 +0200 propsys/tests: Get rid of strcmp_wa(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index ccd075a959..a9b6e48827 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -57,13 +57,6 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - static void test_PSStringFromPropertyKey(void) { static const WCHAR fillerW[] = {'X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X', @@ -479,10 +472,10 @@ static void test_InitPropVariantFromGUIDAsString(void) const struct { REFGUID guid; - const char *str; + const WCHAR *str; } testcases[] = { - {&IID_NULL, "{00000000-0000-0000-0000-000000000000}" }, - {&dummy_guid, "{DEADBEEF-DEAD-BEEF-DEAD-BEEFCAFEBABE}" }, + {&IID_NULL, L"{00000000-0000-0000-0000-000000000000}" }, + {&dummy_guid, L"{DEADBEEF-DEAD-BEEF-DEAD-BEEFCAFEBABE}" }, }; hres = InitPropVariantFromGUIDAsString(NULL, &propvar); @@ -502,7 +495,7 @@ static void test_InitPropVariantFromGUIDAsString(void) hres = InitPropVariantFromGUIDAsString(testcases[i].guid, &propvar); ok(hres == S_OK, "%d) InitPropVariantFromGUIDAsString returned %x\n", i, hres); ok(propvar.vt == VT_LPWSTR, "%d) propvar.vt = %d\n", i, propvar.vt); - ok(!strcmp_wa(propvar.u.pwszVal, testcases[i].str), "%d) propvar.u.pwszVal = %s\n", + ok(!lstrcmpW(propvar.u.pwszVal, testcases[i].str), "%d) propvar.u.pwszVal = %s\n", i, wine_dbgstr_w(propvar.u.pwszVal)); CoTaskMemFree(propvar.u.pwszVal); @@ -512,7 +505,7 @@ static void test_InitPropVariantFromGUIDAsString(void) ok(V_VT(&var) == VT_BSTR, "%d) V_VT(&var) = %d\n", i, V_VT(&var)); ok(SysStringLen(V_BSTR(&var)) == 38, "SysStringLen returned %d\n", SysStringLen(V_BSTR(&var))); - ok(!strcmp_wa(V_BSTR(&var), testcases[i].str), "%d) V_BSTR(&var) = %s\n", + ok(!lstrcmpW(V_BSTR(&var), testcases[i].str), "%d) V_BSTR(&var) = %s\n", i, wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); } @@ -1443,7 +1436,7 @@ static void test_PropVariantToString(void) U(propvar).lVal = 22; hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); todo_wine ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); - todo_wine ok(!strcmp_wa(bufferW, "22"), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + todo_wine ok(!lstrcmpW(bufferW, L"22"), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); memset(bufferW, 0, sizeof(bufferW)); PropVariantClear(&propvar);

1 0

Michael Stefaniuc : oleaut32/tests: Get rid of strcmp_wa().
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 45da77a4e4aef914c10ead23836189ba6b222d52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45da77a4e4aef914c10ead23… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 6 22:41:15 2020 +0200 oleaut32/tests: Get rid of strcmp_wa(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 1bd40ac6bc..127af46ba1 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -661,19 +661,13 @@ static void test_var_call2( int line, HRESULT (WINAPI *func)(LPVARIANT,LPVARIANT VariantClear( &result ); } -static int strcmp_wa(const WCHAR *strw, const char *stra) -{ - WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); - return lstrcmpW(strw, buf); -} - #define test_bstr_var(a,b) _test_bstr_var(__LINE__,a,b) -static void _test_bstr_var(unsigned line, const VARIANT *v, const char *str) +static void _test_bstr_var(unsigned line, const VARIANT *v, const WCHAR *str) { ok_(__FILE__,line)(V_VT(v) == VT_BSTR, "unexpected vt=%d\n", V_VT(v)); if(V_VT(v) == VT_BSTR) - ok(!strcmp_wa(V_BSTR(v), str), "v=%s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), str); + ok(!lstrcmpW(V_BSTR(v), str), "v=%s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), + wine_dbgstr_w(str)); } static void test_VariantInit(void) @@ -6136,7 +6130,7 @@ static void test_VarCat(void) hres = pVarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); CHECK_CALLED(dispatch_invoke); - ok(!strcmp_wa(V_BSTR(&result), "1234"), "got %s\n", wine_dbgstr_w(V_BSTR(&result))); + ok(!lstrcmpW(V_BSTR(&result), L"1234"), "got %s\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); @@ -6179,20 +6173,20 @@ static void test_VarCat(void) ok(hres == S_OK, "VarCat failed: %08x\n", hres); VariantClear(&right); - cmp = strcmp_wa(V_BSTR(&result), "True"); + cmp = lstrcmpW(V_BSTR(&result), L"True"); VariantClear(&result); if(!cmp) { V_VT(&right) = VT_BOOL; V_BOOL(&right) = 100; hres = pVarCat(&left, &right, &result); ok(hres == S_OK, "VarCat failed: %08x\n", hres); - test_bstr_var(&result, "TrueTrue"); + test_bstr_var(&result, L"TrueTrue"); VariantClear(&result); V_BOOL(&right) = VARIANT_FALSE; hres = pVarCat(&left, &right, &result); ok(hres == S_OK, "VarCat failed: %08x\n", hres); - test_bstr_var(&result, "TrueFalse"); + test_bstr_var(&result, L"TrueFalse"); VariantClear(&result); }else { skip("Got %s as True, assuming non-English locale\n", wine_dbgstr_w(V_BSTR(&result)));

1 0