February 2016 - Wine-commits

Piotr Caban : msvcrt: Fix 64-bit _CxxThrowException implementation.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 97b9ff81b8c0764ba1fed1fc884f77967f1bb38b URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b9ff81b8c0764ba1fed1fc8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 25 11:09:03 2016 +0100 msvcrt: Fix 64-bit _CxxThrowException implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 7cffa00..17292d5 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1152,6 +1152,7 @@ void* CDECL MSVCRT___RTCastToVoid(void *cppobj) /********************************************************************* * _CxxThrowException (MSVCRT.@) */ +#ifndef __x86_64__ void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) { ULONG_PTR args[3]; @@ -1161,6 +1162,18 @@ void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *typ args[2] = (ULONG_PTR)type; RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 3, args ); } +#else +void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) +{ + ULONG_PTR args[4]; + + args[0] = CXX_FRAME_MAGIC_VC6; + args[1] = (ULONG_PTR)object; + args[2] = (ULONG_PTR)type; + RtlPcToFileHeader( (void*)type, (void**)&args[3]); + RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 4, args ); +} +#endif /********************************************************************* * ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z

1 0

Alex Henrie : ntdll: Finish serial reads of size 0 immediately.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: f35c1b2dc123a834d365e0ddb441370b22b97cbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35c1b2dc123a834d365e0ddb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 24 22:55:35 2016 -0700 ntdll: Finish serial reads of size 0 immediately. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/comm.c | 4 ---- dlls/ntdll/file.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 97ec794..6b0c3ed 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -2151,13 +2151,9 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = (LONGLONG)i; status = pNtReadFile(hcom, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); - /* FIXME: Remove once Wine is fixed */ - if (status == STATUS_PENDING) WaitForSingleObject(hcom, TIMEOUT); if (i >= 0) { -todo_wine ok(status == STATUS_SUCCESS, "%d: expected STATUS_SUCCESS, got %#x\n", i, status); -todo_wine ok(U(iob).Status == STATUS_SUCCESS, "%d: expected STATUS_SUCCESS, got %#x\n", i, U(iob).Status); ok(iob.Information == 0, "%d: expected 0, got %lu\n", i, iob.Information); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3883e5a..46fea51 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -883,6 +883,11 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, status = length ? STATUS_END_OF_FILE : STATUS_SUCCESS; goto done; case FD_TYPE_SERIAL: + if (!length) + { + status = STATUS_SUCCESS; + goto done; + } break; default: status = STATUS_PIPE_BROKEN;

1 0

Jacek Caban : ntdll: Moved RegisterTraceGuids[AW] implementation to ntdll.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: d2d40b1da3b1b50be216a996af42abe24a27929e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d40b1da3b1b50be216a996a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 19:35:01 2016 +0100 ntdll: Moved RegisterTraceGuids[AW] implementation to ntdll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 +-- dlls/advapi32/eventlog.c | 64 --------------------------------------------- dlls/ntdll/misc.c | 58 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 ++ 4 files changed, 62 insertions(+), 66 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 36f176b..88f7fee 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -661,8 +661,8 @@ @ stdcall RegisterServiceCtrlHandlerExA(str ptr ptr) @ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) @ stdcall RegisterServiceCtrlHandlerW(wstr ptr) -@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) -@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) +@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) ntdll.EtwRegisterTraceGuidsA +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) ntdll.EtwRegisterTraceGuidsW # @ stub RemoveTraceCallback # @ stub RemoveUsersFromEncryptedFile @ stdcall ReportEventA(long long long long ptr long long ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 7839fc4..93c164d 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -742,70 +742,6 @@ BOOL WINAPI ReportEventW( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dw } /****************************************************************************** - * RegisterTraceGuidsW [ADVAPI32.@] - * - * Register an event trace provider and the event trace classes that it uses - * to generate events. - * - * PARAMS - * RequestAddress [I] ControlCallback function - * RequestContext [I] Optional provider-defined context - * ControlGuid [I] GUID of the registering provider - * GuidCount [I] Number of elements in the TraceGuidReg array - * TraceGuidReg [I/O] Array of TRACE_GUID_REGISTRATION structures - * MofImagePath [I] not supported, set to NULL - * MofResourceName [I] not supported, set to NULL - * RegistrationHandle [O] Provider's registration handle - * - * RETURNS - * Success: ERROR_SUCCESS - * Failure: System error code - * - * FIXME - * Stub. - */ -ULONG WINAPI RegisterTraceGuidsW( WMIDPREQUEST RequestAddress, - PVOID RequestContext, LPCGUID ControlGuid, ULONG GuidCount, - PTRACE_GUID_REGISTRATION TraceGuidReg, LPCWSTR MofImagePath, - LPCWSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) -{ - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, - debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), - debugstr_w(MofResourceName), RegistrationHandle); - - if (TraceGuidReg) - { - ULONG i; - for (i = 0; i < GuidCount; i++) - { - FIXME(" register trace class %s\n", debugstr_guid(TraceGuidReg[i].Guid)); - TraceGuidReg[i].RegHandle = (HANDLE)0xdeadbeef; - } - } - *RegistrationHandle = (TRACEHANDLE)0xdeadbeef; - return ERROR_SUCCESS; -} - -/****************************************************************************** - * RegisterTraceGuidsA [ADVAPI32.@] - * - * See RegisterTraceGuidsW. - * - * FIXME - * Stub. - */ -ULONG WINAPI RegisterTraceGuidsA( WMIDPREQUEST RequestAddress, - PVOID RequestContext, LPCGUID ControlGuid, ULONG GuidCount, - PTRACE_GUID_REGISTRATION TraceGuidReg, LPCSTR MofImagePath, - LPCSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) -{ - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, - debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), - debugstr_a(MofResourceName), RegistrationHandle); - return ERROR_SUCCESS; -} - -/****************************************************************************** * StartTraceW [ADVAPI32.@] * * Register and start an event trace session diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 2cfa900..0f6c5df 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -30,6 +30,8 @@ #include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" +#include "wmistr.h" +#include "evntrace.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -335,3 +337,59 @@ BOOL WINAPI WinSqmIsOptedIn(void) FIXME("() stub\n"); return FALSE; } + +/****************************************************************************** + * EtwRegisterTraceGuidsW (NTDLL.@) + * + * Register an event trace provider and the event trace classes that it uses + * to generate events. + * + * PARAMS + * RequestAddress [I] ControlCallback function + * RequestContext [I] Optional provider-defined context + * ControlGuid [I] GUID of the registering provider + * GuidCount [I] Number of elements in the TraceGuidReg array + * TraceGuidReg [I/O] Array of TRACE_GUID_REGISTRATION structures + * MofImagePath [I] not supported, set to NULL + * MofResourceName [I] not supported, set to NULL + * RegistrationHandle [O] Provider's registration handle + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: System error code + */ +ULONG WINAPI EtwRegisterTraceGuidsW( WMIDPREQUEST RequestAddress, + void *RequestContext, const GUID *ControlGuid, ULONG GuidCount, + TRACE_GUID_REGISTRATION *TraceGuidReg, const WCHAR *MofImagePath, + const WCHAR *MofResourceName, TRACEHANDLE *RegistrationHandle ) +{ + FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, + debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), + debugstr_w(MofResourceName), RegistrationHandle); + + if (TraceGuidReg) + { + ULONG i; + for (i = 0; i < GuidCount; i++) + { + FIXME(" register trace class %s\n", debugstr_guid(TraceGuidReg[i].Guid)); + TraceGuidReg[i].RegHandle = (HANDLE)0xdeadbeef; + } + } + *RegistrationHandle = (TRACEHANDLE)0xdeadbeef; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * EtwRegisterTraceGuidsA (NTDLL.@) + */ +ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress, + void *RequestContext, const GUID *ControlGuid, ULONG GuidCount, + TRACE_GUID_REGISTRATION *TraceGuidReg, const char *MofImagePath, + const char *MofResourceName, TRACEHANDLE *RegistrationHandle ) +{ + FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, + debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), + debugstr_a(MofResourceName), RegistrationHandle); + return ERROR_SUCCESS; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d3cd489..0ccd79f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -41,6 +41,8 @@ # @ stub DbgUiStopDebugging @ stub DbgUiWaitStateChange @ stdcall DbgUserBreakPoint() +@ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) +@ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) # @ stub KiFastSystemCall # @ stub KiFastSystemCallRet # @ stub KiIntSystemCall

1 0

Miklós Máté : winex11: Add 1280x960 resolution.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: c0219a73848245d5f3b85c79330b2bb1792df230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0219a73848245d5f3b85c793… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Tue Feb 23 18:37:30 2016 +0100 winex11: Add 1280x960 resolution. This enables high resolution setting in Anachronox, when Wine is configured to emulate a virtual desktop. The game only supports 640x480 and 1280x960. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 9b5e27b..72916c8 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -37,8 +37,8 @@ static unsigned int dd_mode_count; static unsigned int max_width; static unsigned int max_height; -static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1400, 1600}; -static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 1024, 1050, 1200}; +static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; +static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200}; #define NUM_DESKTOP_MODES (sizeof(widths) / sizeof(widths[0])) #define _NET_WM_STATE_REMOVE 0

1 0

Paul Gofman : d3dx9: Don' t pass usage flags when creating temporary texture
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 546c55a09d77d197e3ca74426a2f329fad8bc8ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=546c55a09d77d197e3ca74426… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Feb 25 13:37:12 2016 +0300 d3dx9: Don't pass usage flags when creating temporary texture Some usage flags require D3DPOOL_DEFAULT (and not D3DPOOL_SYSTEMMEM), and the usage of texture being created is overall not related to intermediate buffer texture usage. If texture being created has D3DUSAGE_AUTOGENMIPMAP, updating it from non autogenerated mipmap should be fine according to MSDN (IDirect3DDevice9::UpdateTexture). 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/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 38349e2..27f08ad 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -678,7 +678,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC); if (pool == D3DPOOL_DEFAULT && !dynamic_texture) { - hr = D3DXCreateTexture(device, width, height, miplevels, usage, format, D3DPOOL_SYSTEMMEM, &buftex); + hr = D3DXCreateTexture(device, width, height, miplevels, 0, format, D3DPOOL_SYSTEMMEM, &buftex); texptr = &buftex; } else

1 0

Paul Gofman : d3dx9: D3DXQuaternionToAxisAngle should not crash on NULLs in output parameters.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 215e2d7fed58ccd7c5e55ad536fb311608b51d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=215e2d7fed58ccd7c5e55ad53… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Feb 25 17:34:04 2016 +0300 d3dx9: D3DXQuaternionToAxisAngle should not crash on NULLs in output parameters. 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/math.c | 12 ++++++++---- dlls/d3dx9_36/tests/math.c | 11 ++++++++--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 5e8d51a..123bd2f 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1652,10 +1652,14 @@ void WINAPI D3DXQuaternionToAxisAngle(const D3DXQUATERNION *pq, D3DXVECTOR3 *pax { TRACE("pq %p, paxis %p, pangle %p\n", pq, paxis, pangle); - paxis->x = pq->x; - paxis->y = pq->y; - paxis->z = pq->z; - *pangle = 2.0f * acosf(pq->w); + if (paxis) + { + paxis->x = pq->x; + paxis->y = pq->y; + paxis->z = pq->z; + } + if (pangle) + *pangle = 2.0f * acosf(pq->w); } /*_________________D3DXVec2_____________________*/ diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index ac4475d..cbe94b5 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1019,9 +1019,14 @@ static void D3DXQuaternionTest(void) /* Test the null quaternion */ expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; expected = 3.141593f; - D3DXQuaternionToAxisAngle(&nul,&axis,&angle); - expect_vec3(expectedvec,axis); - ok(relative_error(angle, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + D3DXQuaternionToAxisAngle(&nul, &axis, &angle); + expect_vec3(expectedvec, axis); + ok(relative_error(angle, expected) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + + D3DXQuaternionToAxisAngle(&nul, &axis, NULL); + D3DXQuaternionToAxisAngle(&nul, NULL, &angle); + expect_vec3(expectedvec, axis); + ok(relative_error(angle, expected) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); } static void D3DXVector2Test(void)

1 0

Frédéric Delanoy : windowscodecs/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: e8704b6b8d9530680ceff2bd49d137985dedbdb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8704b6b8d9530680ceff2bd4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 23 21:42:30 2016 +0100 windowscodecs/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/bitmap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 1b91dca..42f452a 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -823,13 +823,8 @@ todo_wine hr = IWICBitmap_CopyPixels(bitmap, NULL, 4, sizeof(data), data); ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); for (i = 0; i < sizeof(data); i++) - { - if (data[i] != data_8bpp_pal_wic[i]) -todo_wine + todo_wine_if (data[i] != data_8bpp_pal_wic[i]) ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n", i, data_8bpp_pal_wic[i], data[i]); - else - ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n", i, data_8bpp_pal_wic[i], data[i]); - } IWICBitmap_Release(bitmap); DeleteObject(hbmp);

1 0

Alexandre Julliard : make_unicode: Mark most data tables as hidden.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 0bbeaae678b9bcc91b73e3686013a872e8c39042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bbeaae678b9bcc91b73e3686… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 13:39:01 2016 +0900 make_unicode: Mark most data tables as hidden. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 ++-- dlls/dwrite/bidi.c | 4 ++-- dlls/dwrite/bracket.c | 4 +++- dlls/dwrite/linebreak.c | 4 +++- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 4 +++- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/vertical.c | 4 +++- dlls/kernel32/locale.c | 4 ++-- dlls/kernel32/nameprep.c | 6 ++++-- dlls/usp10/bidi.c | 2 +- dlls/usp10/bracket.c | 4 +++- dlls/usp10/breaking.c | 2 +- dlls/usp10/indicsyllable.c | 4 +++- dlls/usp10/linebreak.c | 4 +++- dlls/usp10/mirror.c | 2 +- dlls/usp10/shape.c | 6 +++--- dlls/usp10/shaping.c | 6 ++++-- dlls/usp10/usp10.c | 2 +- dlls/wineps.drv/text.c | 2 +- dlls/wineps.drv/vertical.c | 4 +++- tools/make_unicode | 15 +++++++++++---- 22 files changed, 59 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bbeaae678b9bcc91b73e…

1 0

Hugh McMaster : reg/tests: Add two more tests for REG_MULTI_SZ.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 786eb1a70ed642f7ea047c1e9f743bfc3ebf002c URL: http://source.winehq.org/git/wine.git/?a=commit;h=786eb1a70ed642f7ea047c1e9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 24 15:30:19 2016 +1100 reg/tests: Add two more tests for REG_MULTI_SZ. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index db3b5a2..5455021 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -380,6 +380,15 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi16 /d \"two\\0\\0strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi17 /t REG_MULTI_SZ /s \"#\" /d \"#\" /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + buffer[0] = 0; buffer[1] = 0; + todo_wine verify_reg(hkey, "multi17", REG_MULTI_SZ, buffer, 2, 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi18 /t REG_MULTI_SZ /d \"\\0\" /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + todo_wine verify_reg(hkey, "multi18", REG_MULTI_SZ, buffer, 2, 0); + RegCloseKey(hkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg: Add support for REG_MULTI_SZ.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 47b2238b3dc7ad5f0f482d0c9cd525cfeb4537f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b2238b3dc7ad5f0f482d0c9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 24 15:30:20 2016 +1100 reg: Add support for REG_MULTI_SZ. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 23 ++++++++++++++++++++++- programs/reg/tests/reg.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 22 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index c6351a9..0155912 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -284,7 +284,28 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r break; } case REG_MULTI_SZ: - /* FIXME: Needs handling */ + { + int i, destindex, len = strlenW(data); + WCHAR *buffer = HeapAlloc(GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR)); + + for (i = 0, destindex = 0; i < len; i++, destindex++) + { + if (data[i] == '\\' && data[i + 1] == '0') + { + buffer[destindex] = 0; + i++; + } + else if (data[i] == separator) + buffer[destindex] = 0; + else + buffer[destindex] = data[i]; + } + buffer[destindex] = 0; + if (destindex && buffer[destindex - 1]) + buffer[++destindex] = 0; + *reg_count = (destindex + 1) * sizeof(WCHAR); + return (BYTE *)buffer; + } default: output_message(STRING_UNHANDLED_TYPE, reg_type, data); } diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 5455021..ac01631 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -326,25 +326,25 @@ static void test_add(void) /* REG_MULTI_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); memcpy(buffer, "three\0little\0strings\0", 22); - todo_wine verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); + verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi1 /s \"#\" /d \"three#little#strings\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - todo_wine verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi2 /d \"\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - todo_wine verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi3 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"threelittlestrings\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - todo_wine verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0", 20, TODO_REG_SIZE); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0", 20, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi5 /s \"#randomgibberish\" /d \"three#little#strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); @@ -353,16 +353,16 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi7 /s \"\" /d \"three#little#strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi8 /s \"#\" /d \"##\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi9 /s \"#\" /d \"two##strings\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi10 /s \"#\" /d \"#a\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi11 /s \"#\" /d \"a#\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); buffer[0]='a'; buffer[1]=0; buffer[2]=0; - todo_wine verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); + verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi12 /t REG_MULTI_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -371,23 +371,23 @@ static void test_add(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi14 /t REG_MULTI_SZ /d \"\\0a\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi15 /t REG_MULTI_SZ /d \"a\\0\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "multi15", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi15", REG_MULTI_SZ, buffer, 3, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi16 /d \"two\\0\\0strings\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi17 /t REG_MULTI_SZ /s \"#\" /d \"#\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); buffer[0] = 0; buffer[1] = 0; - todo_wine verify_reg(hkey, "multi17", REG_MULTI_SZ, buffer, 2, 0); + verify_reg(hkey, "multi17", REG_MULTI_SZ, buffer, 2, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi18 /t REG_MULTI_SZ /d \"\\0\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "multi18", REG_MULTI_SZ, buffer, 2, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi18", REG_MULTI_SZ, buffer, 2, 0); RegCloseKey(hkey);

1 0