February 2016 - Wine-Commits

Sebastian Lackner : kernel32/tests: Move logic of okChildInt macro into a function.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 5bb169ad7b5ecd7a87ba55ebc284c938efdea9db URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bb169ad7b5ecd7a87ba55ebc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 08:57:57 2016 +0100 kernel32/tests: Move logic of okChildInt macro into a function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 4ef6431..0beb9bf 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -582,18 +582,16 @@ static void ok_child_stringWA( int line, const char *sect, const char *key, HeapFree(GetProcessHeap(),0,resultA); } +static void ok_child_int( int line, const char *sect, const char *key, UINT expect ) +{ + UINT result = GetPrivateProfileIntA( sect, key, !expect, resfile ); + ok_(__FILE__, line)( result == expect, "%s:%s expected %u, but got %u\n", sect, key, expect, result ); +} + #define okChildString(sect, key, expect) ok_child_string(__LINE__, (sect), (key), (expect), 1 ) #define okChildIString(sect, key, expect) ok_child_string(__LINE__, (sect), (key), (expect), 0 ) #define okChildStringWA(sect, key, expect) ok_child_stringWA(__LINE__, (sect), (key), (expect), 1 ) - -/* using !expect ensures that the test will fail if the sect/key isn't present - * in result file - */ -#define okChildInt(sect, key, expect) \ - do { \ - UINT result = GetPrivateProfileIntA((sect), (key), !(expect), resfile); \ - ok(result == expect, "%s:%s expected %u, but got %u\n", (sect), (key), (UINT)(expect), result); \ - } while (0) +#define okChildInt(sect, key, expect) ok_child_int(__LINE__, (sect), (key), (expect)) static void test_Startup(void) {

1 0

Sebastian Lackner : vcomp/tests: Add tests for 64-bit atomic instructions.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 3fefd3aa2df5ebb91afd6cba81b94a0c85fef68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fefd3aa2df5ebb91afd6cba8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 07:47:59 2016 +0100 vcomp/tests: Add tests for 64-bit atomic instructions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3fefd3aa2df5ebb91afd6…

1 0

Sebastian Lackner : vcomp: Implement 64-bit atomic instructions.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: b29c072e315ee0440c162574b905e8d768153f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29c072e315ee0440c162574b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 07:47:13 2016 +0100 vcomp: Implement 64-bit atomic instructions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 68 ++++++++++++++++++++++++++++++++++++++++++++- dlls/vcomp/vcomp.spec | 22 +++++++-------- dlls/vcomp100/vcomp100.spec | 22 +++++++-------- dlls/vcomp110/vcomp110.spec | 22 +++++++-------- dlls/vcomp120/vcomp120.spec | 22 +++++++-------- dlls/vcomp90/vcomp90.spec | 22 +++++++-------- 6 files changed, 122 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b29c072e315ee0440c162…

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_upload_data().
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 0706019a079900e3c5167f923334368f7e108eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=0706019a079900e3c5167f923… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 9 21:30:00 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 9931057..16b6555 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -76,7 +76,7 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine dst_row_pitch = width * format->conv_byte_count; dst_slice_pitch = dst_row_pitch * height; - wined3d_volume_get_pitch(volume, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_pitch(volume->container, volume->texture_level, &src_row_pitch, &src_slice_pitch); converted_mem = HeapAlloc(GetProcessHeap(), 0, dst_slice_pitch * depth); format->convert(data->addr, converted_mem, src_row_pitch, src_slice_pitch,

1 0

Hugh McMaster : reg: Do not allow combinations of /v, /ve or /va in the ' delete' function.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: c59e3eae3b0e3440a0b9d1774b11040899fc5db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59e3eae3b0e3440a0b9d1774… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 10 22:23:14 2016 +1100 reg: Do not allow combinations of /v, /ve or /va in the 'delete' function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 04256bc..322fa90 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -395,13 +395,7 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 1; } - if (value_name && value_empty) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - - if (value_empty && value_all) + if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) { output_message(STRING_INVALID_CMDLINE); return 1;

1 0

Nikolay Sivov : dwrite: Add a helper to test for isolate class instead of relying on enum layout.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 3d34f29b5c120d36da934b781f97b01e0e33e6c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d34f29b5c120d36da934b781… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 13:10:47 2016 +0300 dwrite: Add a helper to test for isolate class instead of relying on enum layout. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bidi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 273d100..abf3604 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -543,6 +543,11 @@ static inline void iso_dump_types(const char* header, IsolatedRun *run) Note: On input only these directional classes are expected AL, HL, R, L, ON, BN, NSM, AN, EN, ES, ET, CS, ------------------------------------------------------------------------*/ +static BOOL bidi_is_isolate(UINT8 class) +{ + return class == LRI || class == RLI || class == FSI || class == PDI; +} + static void bidi_resolve_weak(IsolatedRun *iso_run) { int i; @@ -553,7 +558,7 @@ static void bidi_resolve_weak(IsolatedRun *iso_run) int j = get_prev_valid_char_from_run(iso_run, i); if (j == -1) *iso_run->item[i].class = iso_run->sos; - else if (*iso_run->item[j].class >= LRI) + else if (bidi_is_isolate(*iso_run->item[j].class)) *iso_run->item[i].class = ON; else *iso_run->item[i].class = *iso_run->item[j].class; @@ -754,7 +759,7 @@ static void bidi_resolve_neutrals(IsolatedRun *run) /* Translate isolates into NI */ for (i = 0; i < run->length; i++) { - if (*run->item[i].class >= LRI) + if (bidi_is_isolate(*run->item[i].class)) *run->item[i].class = NI; switch (*run->item[i].class) {

1 0

Sebastian Lackner : kernel32/tests: Simplify activation context tests by using todo_wine_if.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: fd0780cb35243b0c4bf480c044e768066fe2c7f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0780cb35243b0c4bf480c04… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 08:06:17 2016 +0100 kernel32/tests: Simplify activation context tests by using todo_wine_if. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 47 ++++++++++++-------------------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 64176cb..af3dadf 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -776,12 +776,7 @@ static void test_create_and_fail(const char *manifest, const char *depmanifest, create_manifest_file("bad.manifest", manifest, -1, "testdep.manifest", depmanifest); handle = pCreateActCtxW(&actctx); - if (todo) todo_wine - { - ok(handle == INVALID_HANDLE_VALUE, "handle != INVALID_HANDLE_VALUE\n"); - ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "GetLastError == %u\n", GetLastError()); - } - else + todo_wine_if(todo) { ok(handle == INVALID_HANDLE_VALUE, "handle != INVALID_HANDLE_VALUE\n"); ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "GetLastError == %u\n", GetLastError()); @@ -2089,13 +2084,9 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should err = GetLastError(); ok_(__FILE__, line)(ret == should_find, "FindActCtxSectionStringA: expected ret = %u, got %u\n", should_find, ret); - if (todo) - todo_wine - ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), - "FindActCtxSectionStringA: unexpected error %u\n", err); - else - ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), - "FindActCtxSectionStringA: unexpected error %u\n", err); + todo_wine_if(todo) + ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), + "FindActCtxSectionStringA: unexpected error %u\n", err); memset(&data, 0xfe, sizeof(data)); data.cbSize = sizeof(data); @@ -2105,13 +2096,9 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should err = GetLastError(); ok_(__FILE__, line)(ret == should_find, "FindActCtxSectionStringW: expected ret = %u, got %u\n", should_find, ret); - if (todo) - todo_wine - ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), - "FindActCtxSectionStringW: unexpected error %u\n", err); - else - ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), - "FindActCtxSectionStringW: unexpected error %u\n", err); + todo_wine_if(todo) + ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), + "FindActCtxSectionStringW: unexpected error %u\n", err); SetLastError(0); ret = pFindActCtxSectionStringA(0, NULL, section, string_to_find, NULL); @@ -2144,22 +2131,14 @@ static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_fi data.cbSize = sizeof(data); ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, &data); - if (todo) - todo_wine - ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), - "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); - else - ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), - "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); + todo_wine_if(todo) + ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), + "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, NULL); - if (todo) - todo_wine - ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), - "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); - else - ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), - "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); + todo_wine_if(todo) + ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), + "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); pRtlFreeUnicodeString(&string_to_findW); }

1 0

Andrew Eikum : xaudio2: Handle openal source allocation failure.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: ecadabe25b11bbd2bb41facf40dfc592e12632ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecadabe25b11bbd2bb41facf4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 9 10:39:23 2016 -0600 xaudio2: Handle openal source allocation failure. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 32bc1c8..6d766a1 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -32,6 +32,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static ALCdevice *(ALC_APIENTRY *palcLoopbackOpenDeviceSOFT)(const ALCchar*); static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei); @@ -1415,11 +1416,21 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, hr = XA2SRC_SetOutputVoices(&src->IXAudio2SourceVoice_iface, pSendList); if(FAILED(hr)){ + HeapFree(GetProcessHeap(), 0, src->fmt); src->in_use = FALSE; return hr; } alGenSources(1, &src->al_src); + if(!src->al_src){ + static int once = 0; + if(!once++) + ERR_(winediag)("OpenAL ran out of sources, consider increasing its source limit.\n"); + HeapFree(GetProcessHeap(), 0, src->fmt); + src->in_use = FALSE; + return E_OUTOFMEMORY; + } + alGenBuffers(XAUDIO2_MAX_QUEUED_BUFFERS, src->al_bufs); alSourcePlay(src->al_src);

1 0

Nikolay Sivov : msxml3/tests: Simplify a couple of tests using todo_wine_if().
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: cdda92fc4ef7e674f2167d581dec3f7ed0a2918c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdda92fc4ef7e674f2167d581… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 13:41:47 2016 +0300 msxml3/tests: Simplify a couple of tests using todo_wine_if(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/saxreader.c | 4 +--- dlls/msxml3/tests/schema.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 88b2404..9c8d103 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2867,9 +2867,7 @@ static void test_saxreader_encoding(void) CloseHandle(file); hr = ISAXXMLReader_parseURL(reader, testXmlW); - if (entry->todo) - todo_wine ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid); - else + todo_wine_if(entry->todo) ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid); DeleteFileA(testXmlA); diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index bfedb8b..43ddc3c 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1322,10 +1322,7 @@ static void test_XDR_datatypes(void) hr = IXMLDOMNode_get_nodeTypedValue(node, &v); EXPECT_HR(hr, S_OK); - if (ptr->todo) - todo_wine - ok(V_VT(&v) == ptr->type_schema, "%s: got variant type %i\n", ptr->query, V_VT(&v)); - else + todo_wine_if(ptr->todo) ok(V_VT(&v) == ptr->type_schema, "%s: got variant type %i\n", ptr->query, V_VT(&v)); switch (ptr->type_schema)

1 0

Hugh McMaster : reg/tests: Add tests for /v* flags.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: a2bdfbae396a5b7385558ffcdc4a00c9b64ea88e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2bdfbae396a5b7385558ffcd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 10 22:23:16 2016 +1100 reg/tests: Add tests for /v* flags. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 4981bdd..d815d89 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -411,6 +411,23 @@ static void test_query(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } +static void test_v_flags(void) +{ + DWORD r; + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Wine /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + START_TEST(reg) { DWORD r; @@ -422,4 +439,5 @@ START_TEST(reg) test_add(); test_delete(); test_query(); + test_v_flags(); }

1 0