February 2020 - Wine-commits

Alexandre Julliard : wrc: Set the output format from the output file name.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 0a66eaea689e97ebf2277afaecfb844cd73ec1bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a66eaea689e97ebf2277afa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 10:38:06 2020 +0100 wrc: Set the output format from the output file name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 43 +++++++++++++++---------------------------- tools/wrc/utils.c | 7 +++++++ tools/wrc/utils.h | 1 + tools/wrc/wrc.c | 8 +++++++- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 12095436dd..f7261795fc 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2705,49 +2705,36 @@ static void output_source_h( struct makefile *make, struct incl_file *source, co static void output_source_rc( struct makefile *make, struct incl_file *source, const char *obj ) { struct strarray defines = get_source_defines( make, source, obj ); + char *po_dir = NULL; unsigned int i; if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name ); + if (linguas.count && (source->file->flags & FLAG_RC_PO)) po_dir = top_obj_dir_path( make, "po" ); strarray_add( &make->res_files, strmake( "%s.res", obj )); - output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); + if (source->file->flags & FLAG_RC_PO && !(source->file->flags & FLAG_PARENTDIR)) + { + strarray_add( &make->clean_files, strmake( "%s.pot", obj )); + output( "%s.pot ", obj_dir_path( make, obj ) ); + } + output( "%s.res: %s", obj_dir_path( make, obj ), source->filename ); + output_filename( tools_path( make, "wrc" )); + output_filenames( source->dependencies ); + output( "\n" ); output( "\t%s -u -o $@", tools_path( make, "wrc" ) ); if (make->is_win16) output_filename( "-m16" ); else output_filenames( target_flags ); output_filename( "--nostdinc" ); + if (po_dir) output_filename( strmake( "--po-dir=%s", po_dir )); output_filenames( defines ); - if (linguas.count && (source->file->flags & FLAG_RC_PO)) + output_filename( source->filename ); + output( "\n" ); + if (po_dir) { - char *po_dir = top_obj_dir_path( make, "po" ); - output_filename( strmake( "--po-dir=%s", po_dir )); - output_filename( source->filename ); - output( "\n" ); output( "%s.res:", obj_dir_path( make, obj )); for (i = 0; i < linguas.count; i++) output_filename( strmake( "%s/%s.mo", po_dir, linguas.str[i] )); output( "\n" ); } - else - { - output_filename( source->filename ); - output( "\n" ); - } - if (source->file->flags & FLAG_RC_PO && !(source->file->flags & FLAG_PARENTDIR)) - { - strarray_add( &make->clean_files, strmake( "%s.pot", obj )); - output( "%s.pot: %s\n", obj_dir_path( make, obj ), source->filename ); - 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" ); - output_filenames( defines ); - output_filename( source->filename ); - output( "\n" ); - output( "%s.pot ", obj_dir_path( make, obj )); - } - output( "%s.res:", obj_dir_path( make, obj )); - output_filename( tools_path( make, "wrc" )); - output_filenames( source->dependencies ); - output( "\n" ); } diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 9780beb613..8c8a36faf5 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -219,6 +219,13 @@ char *xstrdup(const char *str) return strcpy(s, str); } +int strendswith( const char *str, const char *end ) +{ + int l = strlen(str); + int m = strlen(end); + return l >= m && !strcmp( str + l - m, end ); +} + int compare_striA( const char *str1, const char *str2 ) { for (;;) diff --git a/tools/wrc/utils.h b/tools/wrc/utils.h index aed10b5dea..8b48be38e1 100644 --- a/tools/wrc/utils.h +++ b/tools/wrc/utils.h @@ -36,6 +36,7 @@ char *xstrdup(const char *str); int compare_striA( const char *str1, const char *str2 ); int compare_striW( const WCHAR *str1, const WCHAR *str2 ); char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); +int strendswith( const char *str, const char *end ); int parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4), noreturn)); diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index b4cb013f8e..f81fe7baa6 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -589,8 +589,14 @@ int main(int argc,char *argv[]) verify_translations(resource_top); exit(0); } + if (!po_mode && output_name) + { + if (strendswith( output_name, ".po" )) po_mode = 1; + else if (strendswith( output_name, ".pot" )) po_mode = 2; + } if (po_mode) { + if (!win32) error( "PO files are not supported in 16-bit mode\n" ); if (po_mode == 2) /* pot file */ { if (!output_name) @@ -604,7 +610,7 @@ int main(int argc,char *argv[]) output_name = NULL; exit(0); } - add_translations( po_dir ); + if (win32) add_translations( po_dir ); /* Convert the internal lists to binary data */ resources2res(resource_top);

1 0

Julian Rüger : German translation for release 5.1.
by Alexandre Julliard 07 Feb '20

07 Feb '20

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 07 Feb '20

07 Feb '20

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 07 Feb '20

07 Feb '20

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

Zebediah Figura : d3d9: Retrieve stream frequency state from the primary stateblock.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: 8ff3041dd4276571b246dc08bf210a45de80a3ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ff3041dd4276571b246dc08… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 21:17:44 2020 -0600 d3d9: Retrieve stream frequency state from the primary stateblock. 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 880e90a2ff..87d7db3d00 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3747,15 +3747,16 @@ static HRESULT WINAPI d3d9_device_SetStreamSourceFreq(IDirect3DDevice9Ex *iface, static HRESULT WINAPI d3d9_device_GetStreamSourceFreq(IDirect3DDevice9Ex *iface, UINT stream_idx, UINT *freq) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + const struct wined3d_stream_state *stream; TRACE("iface %p, stream_idx %u, freq %p.\n", iface, stream_idx, freq); wined3d_mutex_lock(); - hr = wined3d_device_get_stream_source_freq(device->wined3d_device, stream_idx, freq); + stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + *freq = stream->flags | stream->frequency; wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetIndices(IDirect3DDevice9Ex *iface, IDirect3DIndexBuffer9 *buffer)

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetStreamSourceFreq().
by Alexandre Julliard 06 Feb '20

06 Feb '20

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

Zhiyi Zhang : wined3d: Add GPU information for NVIDIA GeForce GTX 1650 SUPER.
by Alexandre Julliard 06 Feb '20

06 Feb '20

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

Michael Stefaniuc : propsys/tests: Get rid of strcmp_wa().
by Alexandre Julliard 06 Feb '20

06 Feb '20

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 06 Feb '20

06 Feb '20

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

Michael Stefaniuc : shlwapi/tests: Get rid of strcmp_wa().
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: 65f5a834dad4bb87f38496afc012ce2d28b407d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65f5a834dad4bb87f38496af… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 6 22:41:16 2020 +0200 shlwapi/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/shlwapi/tests/ordinal.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 135d82ead1..f1527eb6b8 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -95,13 +95,6 @@ static const CHAR ie_international[] = { static const CHAR acceptlanguage[] = { 'A','c','c','e','p','t','L','a','n','g','u','a','g','e',0}; -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); -} - typedef struct { int id; const void *args[5]; @@ -2740,11 +2733,11 @@ static void test_SHGetIniString(void) ret = pSHGetIniStringW(TestAppW, AKeyW, out, ARRAY_SIZE(out), pathW); ok(ret == 1, "SHGetIniStringW should have given 1, instead: %d\n", ret); - ok(!strcmp_wa(out, "1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); + ok(!lstrcmpW(out, L"1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); ret = pSHGetIniStringW(TestAppW, AnotherKeyW, out, ARRAY_SIZE(out), pathW); ok(ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); - ok(!strcmp_wa(out, "asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); + ok(!lstrcmpW(out, L"asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); out[0] = 1; ret = pSHGetIniStringW(TestAppW, JunkKeyW, out, ARRAY_SIZE(out), pathW);

1 0