May 2016 - Wine-Commits - list.winehq.org

Paul Gofman : d3dx9: Add test for 0 * INF preshader operation.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: a5fcc4d2a2ef065014d7502c612091b3e7cb5265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5fcc4d2a2ef065014d7502c6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 2 18:38:28 2016 +0300 d3dx9: Add test for 0 * INF preshader operation. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index aea3ded..4ef4d4c 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3973,6 +3973,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) { {"exp", 0x10500001, 1, {0x3f800000, 0x3f800000, 0x3e5edc66, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, + {"0 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000}, + {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, }; unsigned int i;

1 0

Paul Gofman : d3dx9: Add 'exp' preshader opcode.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: 2925d6e6ec23e4fa9a2830b6318fdab8360540ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2925d6e6ec23e4fa9a2830b63… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 2 18:38:27 2016 +0300 d3dx9: Add 'exp' preshader opcode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 3 ++ dlls/d3dx9_36/tests/effect.c | 96 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 2287f15..a16c065 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -43,6 +43,7 @@ enum pres_ops PRESHADER_OP_SIN, PRESHADER_OP_COS, PRESHADER_OP_RSQ, + PRESHADER_OP_EXP, }; typedef double (*pres_op_func)(double *args, int n); @@ -80,6 +81,7 @@ static double pres_rsq(double *args, int n) else return 1.0 / sqrt(v); } +static double pres_exp(double *args, int n) {return pow(2.0, args[0]);} #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 @@ -119,6 +121,7 @@ static const struct op_info pres_op_info[] = {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ + {0x105, "exp", 1, 0, pres_exp}, /* PRESHADER_OP_EXP */ }; enum pres_value_type diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 9d58a80..aea3ded 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3886,6 +3886,101 @@ static void test_effect_preshader(IDirect3DDevice9 *device) effect->lpVtbl->Release(effect); } +struct test_preshader_op_def +{ + const char *mnem; + unsigned int opcode; + unsigned int args_count; + unsigned int expected_result[4]; + D3DXVECTOR4 fvect1, fvect2; + unsigned int ulps; + BOOL todo[4]; +}; + +static void test_preshader_op(IDirect3DDevice9 *device, const DWORD *sample_effect_blob, + unsigned int sample_effect_blob_size, const struct test_preshader_op_def *test) +{ + static const struct + { + unsigned int pos; + unsigned int result_index; + } + blob_position[] = + { + {0, 0}, + {2468, 0}, + {2319, 2} + }; + DWORD *test_effect_blob; + HRESULT hr; + ID3DXEffect *effect; + D3DLIGHT9 light; + unsigned int i, passes_count; + float *v; + unsigned int op_pos, op_step; + D3DXHANDLE param; + + op_step = 2 + (test->args_count + 1) * 3; + op_pos = blob_position[test->args_count].pos; + + test_effect_blob = HeapAlloc(GetProcessHeap(), 0, sample_effect_blob_size); + memcpy(test_effect_blob, sample_effect_blob, sample_effect_blob_size); + for (i = 0; i < 4; ++i) + test_effect_blob[op_pos + i * op_step] = test->opcode; + + hr = D3DXCreateEffect(device, test_effect_blob, sample_effect_blob_size, + NULL, NULL, 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->Begin(effect, &passes_count, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + param = effect->lpVtbl->GetParameterByName(effect, NULL, "opvect1"); + ok(!!param, "GetParameterByName failed.\n"); + hr = effect->lpVtbl->SetVector(effect, param, &test->fvect1); + ok(hr == D3D_OK, "SetVector failed, hr %#x.\n", hr); + + if (test->args_count > 1) + { + param = effect->lpVtbl->GetParameterByName(effect, NULL, "opvect2"); + ok(!!param, "GetParameterByName failed.\n"); + hr = effect->lpVtbl->SetVector(effect, param, &test->fvect2); + ok(hr == D3D_OK, "SetVector failed, hr %#x.\n", hr); + } + + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = IDirect3DDevice9_GetLight(device, blob_position[test->args_count].result_index, &light); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + v = &light.Diffuse.r; + for (i = 0; i < 4; ++i) + todo_wine_if(test->todo[i]) + ok(compare_float(v[i], ((float *)test->expected_result)[i], test->ulps), + "Operation %s, component %u, expected %#x (%g), got %#x (%g).\n", test->mnem, i, + test->expected_result[i], ((float *)test->expected_result)[i], ((unsigned int *)v)[i], v[i]); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->End(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + effect->lpVtbl->Release(effect); + HeapFree(GetProcessHeap(), 0, test_effect_blob); +} + +static void test_effect_preshader_ops(IDirect3DDevice9 *device) +{ + static const struct test_preshader_op_def op_tests[] = + { + {"exp", 0x10500001, 1, {0x3f800000, 0x3f800000, 0x3e5edc66, 0x7f800000}, + {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(op_tests); ++i) + test_preshader_op(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + &op_tests[i]); +} + START_TEST(effect) { HWND wnd; @@ -3927,6 +4022,7 @@ START_TEST(effect) test_effect_compilation_errors(device); test_effect_states(device); test_effect_preshader(device); + test_effect_preshader_ops(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Alistair Leslie-Hughes : d3dcompiler: Add D3DLoadModule stub.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: 5fb90db781cf5a0534716d57e186fe03fbb58169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb90db781cf5a0534716d57e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 2 09:32:17 2016 +0000 d3dcompiler: Add D3DLoadModule stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/compiler.c | 6 ++++++ dlls/d3dcompiler_47/d3dcompiler_47.spec | 2 +- include/d3dcompiler.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 17e58fe..36e793e 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -792,3 +792,9 @@ HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO return E_NOTIMPL; } + +HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module) +{ + FIXME("data %p, size %lu, module %p stub!\n", data, size, module); + return E_NOTIMPL; +} diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec index 9b2cb7d..05bc793 100644 --- a/dlls/d3dcompiler_47/d3dcompiler_47.spec +++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec @@ -17,7 +17,7 @@ @ stdcall D3DGetInputSignatureBlob(ptr long ptr) @ stdcall D3DGetOutputSignatureBlob(ptr long ptr) @ stub D3DGetTraceInstructionOffsets -@ stub D3DLoadModule +@ stdcall D3DLoadModule(ptr long ptr) @ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) @ stdcall D3DReadFileToBlob(wstr ptr) @ stdcall D3DReflect(ptr long ptr ptr) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 3f1fdb3..5d60792 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -120,6 +120,8 @@ typedef HRESULT (WINAPI *pD3DPreprocess)(const void *data, SIZE_T size, const ch const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); +HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module); + #ifdef __cplusplus } #endif

1 0

Hugh McMaster : reg: Output the number of matches when querying the registry recursively.
by Alexandre Julliard May 3, 2016

May 3, 2016

1 0

Hugh McMaster : reg: Output line break before displaying query output.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: 7b9a1a355fe64b540a35a03dfbd8a38f20b019ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b9a1a355fe64b540a35a03df… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 2 12:06:33 2016 +0000 reg: Output line break before displaying query output. This matches Windows' behaviour. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index df3b453..7852e74 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -833,6 +833,7 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL { WCHAR *p; HKEY root, key; + WCHAR newlineW[] = {'\n',0}; int ret; if (!sane_path(key_name)) @@ -860,6 +861,8 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL return 1; } + output_string(newlineW); + if (value_name || value_empty) { ret = query_value(key, value_name, key_name, recurse);

1 0

Michael Stefaniuc : dwrite/tests: Use SetRect() instead of open coding it.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: a5e2bd5902cdcead51614ddd1e9ff325be44af24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5e2bd5902cdcead51614ddd1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 3 11:09:53 2016 +0200 dwrite/tests: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 5fb4121..299607c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4233,15 +4233,13 @@ static void test_CreateGlyphRunAnalysis(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(!IsRectEmpty(&rect), "got empty rect\n"); - rect.left = rect.top = 0; - rect.bottom = rect.right = 1; + SetRect(&rect, 0, 0, 1, 1); hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_CLEARTYPE_3x1, &rect); ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsRectEmpty(&rect), "unexpected empty rect\n"); } else { - rect.left = rect.top = 0; - rect.bottom = rect.right = 1; + SetRect(&rect, 0, 0, 1, 1); hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect); ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsRectEmpty(&rect), "got empty rect\n");

1 0

Michael Stefaniuc : wmp/tests: Use SetRect() instead of open coding it.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: 365e2e9dbc7e8d4b164ef23291dd149493b7fcc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=365e2e9dbc7e8d4b164ef2329… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 3 11:08:55 2016 +0200 wmp/tests: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/tests/oleobj.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index cc2f4fe..971a2fe 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -963,10 +963,7 @@ static void test_wmp(void) test_window(hwnd); - pos.left = 1; - pos.top = 2; - pos.right = 301; - pos.bottom = 312; + SetRect(&pos, 1, 2, 301, 312); hres = IOleInPlaceObject_SetObjectRects(ipobj, &pos, &pos); ok(hres == S_OK, "SetObjectRects failed: %08x\n", hres); GetClientRect(hwnd, &pos);

1 0

Hugh McMaster : kernel32/tests: Add more tests for GetConsoleFontInfo.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: 46cc1388cfa78c41ea73cfee61ba00ab04cdd19e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46cc1388cfa78c41ea73cfee6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue May 3 02:06:50 2016 +0200 kernel32/tests: Add more tests for GetConsoleFontInfo. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 59 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 3f627be..3f72573 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2789,7 +2789,7 @@ static void test_GetConsoleFontInfo(HANDLE std_output) CONSOLE_FONT_INFO *cfi; BOOL ret; CONSOLE_SCREEN_BUFFER_INFO csbi; - COORD orig_font, tmp_font; + COORD orig_sb_size, tmp_sb_size, orig_font, tmp_font; hmod = GetModuleHandleA("kernel32.dll"); pGetConsoleFontInfo = (void *)GetProcAddress(hmod, "GetConsoleFontInfo"); @@ -2811,6 +2811,12 @@ static void test_GetConsoleFontInfo(HANDLE std_output) cfi = HeapAlloc(GetProcessHeap(), 0, memsize); memset(cfi, 0, memsize); + GetConsoleScreenBufferInfo(std_output, &csbi); + orig_sb_size = csbi.dwSize; + tmp_sb_size.X = csbi.dwSize.X + 3; + tmp_sb_size.Y = csbi.dwSize.Y + 5; + SetConsoleScreenBufferSize(std_output, tmp_sb_size); + SetLastError(0xdeadbeef); ret = pGetConsoleFontInfo(NULL, FALSE, 0, cfi); ok(!ret, "got %d, expected zero\n", ret); @@ -2834,22 +2840,61 @@ static void test_GetConsoleFontInfo(HANDLE std_output) index = cfi[0].nFont; orig_font = GetConsoleFontSize(std_output, index); - SetLastError(0xdeadbeef); + memset(cfi, 0, memsize); ret = pGetConsoleFontInfo(std_output, FALSE, num_fonts, cfi); todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); - ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", cfi[index].dwFontSize.X, win_width); - ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", cfi[index].dwFontSize.Y, win_height); + todo_wine ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", + cfi[index].dwFontSize.X, win_width); + todo_wine ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", + cfi[index].dwFontSize.Y, win_height); for (i = 0; i < num_fonts; i++) { + ok(cfi[i].nFont == i, "element out of order, got nFont %d, expected %d\n", cfi[i].nFont, i); tmp_font = GetConsoleFontSize(std_output, cfi[i].nFont); tmp_w = (double)orig_font.X / tmp_font.X * win_width; tmp_h = (double)orig_font.Y / tmp_font.Y * win_height; - ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w); - ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h); + todo_wine ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w); + todo_wine ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h); } + + SetLastError(0xdeadbeef); + ret = pGetConsoleFontInfo(NULL, TRUE, 0, cfi); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleFontInfo(GetStdHandle(STD_INPUT_HANDLE), TRUE, 0, cfi); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleFontInfo(std_output, TRUE, 0, cfi); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(cfi, 0, memsize); + ret = pGetConsoleFontInfo(std_output, TRUE, num_fonts, cfi); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n", + cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X); + todo_wine ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n", + cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y); + + for (i = 0; i < num_fonts; i++) + { + ok(cfi[i].nFont == i, "element out of order, got nFont %d, expected %d\n", cfi[i].nFont, i); + tmp_font = GetConsoleFontSize(std_output, cfi[i].nFont); + tmp_w = (double)orig_font.X / tmp_font.X * csbi.dwMaximumWindowSize.X; + tmp_h = (double)orig_font.Y / tmp_font.Y * csbi.dwMaximumWindowSize.Y; + todo_wine ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w); + todo_wine ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h); + } + + HeapFree(GetProcessHeap(), 0, cfi); + SetConsoleScreenBufferSize(std_output, orig_sb_size); } START_TEST(console)

1 0

Sebastian Lackner : kernel32: Fix possible leak of directory handle in RemoveDirectoryW.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: d638df9f3e31c08623fa653f837abc754c0d2e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d638df9f3e31c08623fa653f8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue May 3 03:22:24 2016 +0200 kernel32: Fix possible leak of directory handle in RemoveDirectoryW. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index b3fccb2..620401d 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1655,13 +1655,19 @@ BOOL WINAPI RemoveDirectoryW( LPCWSTR path ) status = NtOpenFile( &handle, DELETE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); - if (status == STATUS_SUCCESS) - status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, FALSE ); - RtlFreeUnicodeString( &nt_name ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + RtlFreeUnicodeString( &nt_name ); + return FALSE; + } + status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, FALSE ); + RtlFreeUnicodeString( &nt_name ); if (status != STATUS_SUCCESS) { SetLastError( RtlNtStatusToDosError(status) ); + NtClose( handle ); return FALSE; }

1 0

Daniel Lehman : ntdll: Fix prev_count from NtReleaseMutant.
by Alexandre Julliard May 3, 2016

May 3, 2016

Module: wine Branch: master Commit: 7950562e9e7faf26a13fc542845462094f4fa875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7950562e9e7faf26a13fc5428… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue May 3 02:55:43 2016 +0200 ntdll: Fix prev_count from NtReleaseMutant. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 2 +- dlls/ntdll/tests/om.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 46cbca7..e949df6 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -510,7 +510,7 @@ NTSTATUS WINAPI NtReleaseMutant( IN HANDLE handle, OUT PLONG prev_count OPTIONAL { req->handle = wine_server_obj_handle( handle ); status = wine_server_call( req ); - if (prev_count) *prev_count = reply->prev_count; + if (prev_count) *prev_count = 1 - reply->prev_count; } SERVER_END_REQ; return status; diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 2bc4ccd..64a16ab 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1942,12 +1942,12 @@ static void test_mutant(void) prev = 0xdeadbeef; status = pNtReleaseMutant(mutant, &prev); ok( status == STATUS_SUCCESS, "NtQueryRelease failed %08x\n", status ); - todo_wine ok( prev == -1, "NtQueryRelease failed, expected -1, got %d\n", prev ); + ok( prev == -1, "NtQueryRelease failed, expected -1, got %d\n", prev ); prev = 0xdeadbeef; status = pNtReleaseMutant(mutant, &prev); ok( status == STATUS_SUCCESS, "NtQueryRelease failed %08x\n", status ); - todo_wine ok( prev == 0, "NtQueryRelease failed, expected 0, got %d\n", prev ); + ok( prev == 0, "NtQueryRelease failed, expected 0, got %d\n", prev ); memset(&info, 0xcc, sizeof(info)); status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL);

1 0