September 2017 - Wine-Commits

Zebediah Figura : ieframe: Add stub implementation of InternetExplorerManager.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 1bee19a3f67508d76257a680418f74620cd06598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bee19a3f67508d76257a6804… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 15 11:33:19 2017 -0500 ieframe: Add stub implementation of InternetExplorerManager. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.h | 5 +- dlls/ieframe/ieframe_main.c | 35 ++++-------- dlls/ieframe/iexplore.c | 117 ++++++++++++++++++++++++++++++++++++++--- dlls/ieframe/tests/ie.c | 24 +++++++++ programs/iexplore/iexplore.inf | 3 ++ 5 files changed, 151 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1bee19a3f67508d76257a…

1 0

Hugh Bellamy : gdiplus: Fix validation of HatchStyle in GdipCreateHatchBrush.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: e0601829e1093c6ba6e42004f5270817a6d90a3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0601829e1093c6ba6e42004f… Author: Hugh Bellamy <hughbellars(a)gmail.com> Date: Sun Sep 17 11:46:56 2017 +0100 gdiplus: Fix validation of HatchStyle in GdipCreateHatchBrush. Signed-off-by: Hugh Bellamy <hughbellars(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 3 +++ dlls/gdiplus/tests/brush.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 201fadf..6db4ada 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -250,6 +250,9 @@ GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, AR if(!brush) return InvalidParameter; + if(hatchstyle < HatchStyleMin || hatchstyle > HatchStyleMax) + return InvalidParameter; + *brush = heap_alloc_zero(sizeof(GpHatch)); if (!*brush) return OutOfMemory; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 045d5e5..e002a6f 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -45,6 +45,33 @@ static void test_constructor_destructor(void) expect(Ok, status); } +static void test_createHatchBrush(void) +{ + GpStatus status; + GpHatch *brush; + + status = GdipCreateHatchBrush(HatchStyleMin, 1, 2, &brush); + expect(Ok, status); + ok(brush != NULL, "Expected the brush to be initialized."); + + GdipDeleteBrush((GpBrush *)brush); + + status = GdipCreateHatchBrush(HatchStyleMax, 1, 2, &brush); + expect(Ok, status); + ok(brush != NULL, "Expected the brush to be initialized."); + + GdipDeleteBrush((GpBrush *)brush); + + status = GdipCreateHatchBrush(HatchStyle05Percent, 1, 2, NULL); + expect(InvalidParameter, status); + + status = GdipCreateHatchBrush((HatchStyle)(HatchStyleMin - 1), 1, 2, &brush); + expect(InvalidParameter, status); + + status = GdipCreateHatchBrush((HatchStyle)(HatchStyleMax + 1), 1, 2, &brush); + expect(InvalidParameter, status); +} + static void test_type(void) { GpStatus status; @@ -1563,6 +1590,7 @@ START_TEST(brush) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_constructor_destructor(); + test_createHatchBrush(); test_type(); test_gradientblendcount(); test_getblend();

1 0

Hugh Bellamy : gdiplus: Define GpHatchStyle.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: c022c46613c137ab53185b5e7752aff14a085c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c022c46613c137ab53185b5e7… Author: Hugh Bellamy <hughbellars(a)gmail.com> Date: Fri Sep 15 16:39:59 2017 +0100 gdiplus: Define GpHatchStyle. Signed-off-by: Hugh Bellamy <hughbellars(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 6 +++--- dlls/gdiplus/gdiplus_private.h | 4 ++-- dlls/gdiplus/tests/brush.c | 22 ++++++++++++++++++++++ include/gdiplusflat.h | 4 ++-- include/gdiplusgpstubs.h | 1 + 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 6db4ada..d5cd94a 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -230,7 +230,7 @@ static const char HatchBrushes[][8] = { { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff }, /* HatchStyleDarkHorizontal */ }; -GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result) +GpStatus get_hatch_data(GpHatchStyle hatchstyle, const char **result) { if (hatchstyle < sizeof(HatchBrushes) / sizeof(HatchBrushes[0])) { @@ -244,7 +244,7 @@ GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result) /****************************************************************************** * GdipCreateHatchBrush [GDIPLUS.@] */ -GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) +GpStatus WINGDIPAPI GdipCreateHatchBrush(GpHatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) { TRACE("(%d, %d, %d, %p)\n", hatchstyle, forecol, backcol, brush); @@ -941,7 +941,7 @@ GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch *brush, ARGB *forecol) return Ok; } -GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch *brush, HatchStyle *hatchstyle) +GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch *brush, GpHatchStyle *hatchstyle) { TRACE("(%p, %p)\n", brush, hatchstyle); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 6bb7f88..33f6ceb 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -139,7 +139,7 @@ extern GpStatus trace_path(GpGraphics *graphics, GpPath *path) DECLSPEC_HIDDEN; typedef struct region_element region_element; extern void delete_element(region_element *element) DECLSPEC_HIDDEN; -extern GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result) DECLSPEC_HIDDEN; +extern GpStatus get_hatch_data(GpHatchStyle hatchstyle, const char **result) DECLSPEC_HIDDEN; static inline INT gdip_round(REAL x) { @@ -276,7 +276,7 @@ struct GpBrush{ struct GpHatch{ GpBrush brush; - HatchStyle hatchstyle; + GpHatchStyle hatchstyle; ARGB forecol; ARGB backcol; }; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index e002a6f..45b2710 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1556,6 +1556,27 @@ static void test_pathgradientblend(void) expect(Ok, status); } +static void test_getHatchStyle(void) +{ + GpStatus status; + GpHatch *brush; + GpHatchStyle hatchStyle; + + GdipCreateHatchBrush(HatchStyleHorizontal, 11, 12, &brush); + + status = GdipGetHatchStyle(NULL, &hatchStyle); + expect(InvalidParameter, status); + + status = GdipGetHatchStyle(brush, NULL); + expect(InvalidParameter, status); + + status = GdipGetHatchStyle(brush, &hatchStyle); + expect(Ok, status); + expect(HatchStyleHorizontal, hatchStyle); + + GdipDeleteBrush((GpBrush *)brush); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1606,6 +1627,7 @@ START_TEST(brush) test_pathgradientcenterpoint(); test_pathgradientpresetblend(); test_pathgradientblend(); + test_getHatchStyle(); GdiplusShutdown(gdiplusToken); DestroyWindow(hwnd); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index f2ac91e..8bfe8b8 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -387,10 +387,10 @@ GpStatus WINGDIPAPI GdipWarpPath(GpPath*,GpMatrix*,GDIPCONST GpPointF*,INT,REAL, GpStatus WINGDIPAPI GdipWidenPath(GpPath*,GpPen*,GpMatrix*,REAL); /* HatchBrush */ -GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle,ARGB,ARGB,GpHatch**); +GpStatus WINGDIPAPI GdipCreateHatchBrush(GpHatchStyle,ARGB,ARGB,GpHatch**); GpStatus WINGDIPAPI GdipGetHatchBackgroundColor(GpHatch*,ARGB*); GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch*,ARGB*); -GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch*,HatchStyle*); +GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch*,GpHatchStyle*); /* Image */ GpStatus WINGDIPAPI GdipCloneImage(GpImage*, GpImage**); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 5a65cd8..67b6ac1 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -95,5 +95,6 @@ typedef FlushIntention GpFlushIntention; typedef CoordinateSpace GpCoordinateSpace; typedef PenAlignment GpPenAlignment; typedef PenType GpPenType; +typedef HatchStyle GpHatchStyle; #endif

1 0

Alex Henrie : msvcrt: Set the correct error number in pow(f).
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 3864851feb1a8a76a8665dea0484512f1fc13c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3864851feb1a8a76a8665dea0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Sep 14 09:16:57 2017 -0600 msvcrt: Set the correct error number in pow(f). Old versions of MSVC set EDOM on pow(-1, INFINITY) and pow(-1, -INFINITY) but new versions do not. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 12 ++++++++---- dlls/ucrtbase/tests/misc.c | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 05a2b72..60ce4e6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -318,9 +318,11 @@ float CDECL MSVCRT_log10f( float x ) */ float CDECL MSVCRT_powf( float x, float y ) { - /* FIXME: If x < 0 and y is not integral, set EDOM */ float z = powf(x,y); - if (!finitef(z)) math_error(_DOMAIN, "powf", x, 0, z); + if (x < 0 && y != floorf(y)) math_error(_DOMAIN, "powf", x, y, z); + else if (!x && finitef(y) && y < 0) math_error(_SING, "powf", x, y, z); + else if (finitef(x) && finitef(y) && !finitef(z)) math_error(_OVERFLOW, "powf", x, y, z); + else if (x && finitef(x) && finitef(y) && !z) math_error(_UNDERFLOW, "powf", x, y, z); return z; } @@ -530,9 +532,11 @@ double CDECL MSVCRT_log10( double x ) */ double CDECL MSVCRT_pow( double x, double y ) { - /* FIXME: If x < 0 and y is not integral, set EDOM */ double z = pow(x,y); - if (!isfinite(z)) math_error(_DOMAIN, "pow", x, y, z); + if (x < 0 && y != floor(y)) math_error(_DOMAIN, "pow", x, y, z); + else if (!x && isfinite(y) && y < 0) math_error(_SING, "pow", x, y, z); + else if (isfinite(x) && isfinite(y) && !isfinite(z)) math_error(_OVERFLOW, "pow", x, y, z); + else if (x && isfinite(x) && isfinite(y) && !z) math_error(_UNDERFLOW, "pow", x, y, z); return z; } diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 04718c9..d17f2d0 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -647,6 +647,29 @@ static void test_math_errors(void) {"atan2", INFINITY, 0, -1, -1}, {"atan2", 0, -INFINITY, -1, -1}, {"atan2", 0, INFINITY, -1, -1}, + {"pow", -INFINITY, -2, -1, -1}, + {"pow", -INFINITY, -1, -1, -1}, + {"pow", -INFINITY, 0, -1, -1}, + {"pow", -INFINITY, 1, -1, -1}, + {"pow", -INFINITY, 2, -1, -1}, + {"pow", -1e100, -10, -1, _UNDERFLOW}, + {"pow", -1e100, 10, ERANGE, _OVERFLOW}, + {"pow", -1, 1.5, EDOM, _DOMAIN}, + {"pow", 0, -2, ERANGE, _SING}, + {"pow", 0, -1, ERANGE, _SING}, + {"pow", 0.5, -INFINITY, -1, -1}, + {"pow", 0.5, INFINITY, -1, -1}, + {"pow", 2, -INFINITY, -1, -1}, + {"pow", 2, -1e100, -1, _UNDERFLOW}, + {"pow", 2, 1e100, ERANGE, _OVERFLOW}, + {"pow", 2, INFINITY, -1, -1}, + {"pow", 1e100, -10, -1, _UNDERFLOW}, + {"pow", 1e100, 10, ERANGE, _OVERFLOW}, + {"pow", INFINITY, -2, -1, -1}, + {"pow", INFINITY, -1, -1, -1}, + {"pow", INFINITY, 0, -1, -1}, + {"pow", INFINITY, 1, -1, -1}, + {"pow", INFINITY, 2, -1, -1}, }; const struct { char func[16];

1 0

Anton Romanov : secur32: Protect SSLRead/Write with cs on OSX.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 1dbf6c8f54c17e50852470caf88febb816aad4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dbf6c8f54c17e50852470caf… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Fri Sep 15 22:40:03 2017 -0700 secur32: Protect SSLRead/Write with cs on OSX. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 7f38133..015de92 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -185,6 +185,7 @@ enum { struct mac_session { SSLContextRef context; struct schan_transport *transport; + CRITICAL_SECTION cs; }; @@ -742,6 +743,9 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre if (!s) return FALSE; + InitializeCriticalSection(&s->cs); + s->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": mac_session.cs"); + status = SSLNewContext(cred->credential_use == SECPKG_CRED_INBOUND, &s->context); if (status != noErr) { @@ -803,6 +807,7 @@ void schan_imp_dispose_session(schan_imp_session session) status = SSLDisposeContext(s->context); if (status != noErr) ERR("Failed to dispose of session context: %d\n", status); + DeleteCriticalSection(&s->cs); HeapFree(GetProcessHeap(), 0, s); } @@ -1090,7 +1095,9 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); + EnterCriticalSection(&s->cs); status = SSLWrite(s->context, buffer, *length, length); + LeaveCriticalSection(&s->cs); if (status == noErr) TRACE("Wrote %lu bytes\n", *length); else if (status == errSSLWouldBlock) @@ -1120,7 +1127,9 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); + EnterCriticalSection(&s->cs); status = SSLRead(s->context, buffer, *length, length); + LeaveCriticalSection(&s->cs); if (status == noErr || status == errSSLClosedGraceful) TRACE("Read %lu bytes\n", *length); else if (status == errSSLWouldBlock)

1 0

Nikolay Sivov : gdiplus: Implement playback for EmfPlusRecordTypeSetInterpolationMode.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 071d7c3fbe91b813dad06f8d77e9ebd6699a5be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=071d7c3fbe91b813dad06f8d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 18 10:42:46 2017 +0300 gdiplus: Implement playback for EmfPlusRecordTypeSetInterpolationMode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index fbaee28..d135e36 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1840,6 +1840,10 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return GdipSetCompositingQuality(real_metafile->playback_graphics, (flags >> 8) & 0xf); } + case EmfPlusRecordTypeSetInterpolationMode: + { + return GdipSetInterpolationMode(real_metafile->playback_graphics, (flags >> 8) & 0xf); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Alexandre Julliard : kernel32/tests: Add tests for the register values at process start.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: 985cf6731cc55a42c3a5ef9ec903e207dbd4a80f URL: http://source.winehq.org/git/wine.git/?a=commit;h=985cf6731cc55a42c3a5ef9ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 18 15:45:10 2017 +0200 kernel32/tests: Add tests for the register values at process start. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index ca51a41..e7fe35c 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3020,6 +3020,8 @@ static void test_SuspendProcessState(void) BOOL pipe_connected; ULONG pipe_magic, numb; BOOL ret; + void *entry_ptr, *peb_ptr; + PEB child_peb; exit_process_ptr = GetProcAddress(hkernel32, "ExitProcess"); ok(exit_process_ptr != NULL, "GetProcAddress ExitProcess failed\n"); @@ -3103,6 +3105,19 @@ static void test_SuspendProcessState(void) ok(ret, "Failed to write to remote process memory (%d)\n", GetLastError()); #ifdef __x86_64__ + ok( ctx.ContextFlags == CONTEXT_FULL, "wrong flags %x\n", ctx.ContextFlags ); + ok( !ctx.Rax, "rax is not zero %lx\n", ctx.Rax ); + todo_wine + { + ok( !ctx.Rbx, "rbx is not zero %lx\n", ctx.Rbx ); + ok( !ctx.Rsi, "rsi is not zero %lx\n", ctx.Rsi ); + ok( !ctx.Rdi, "rdi is not zero %lx\n", ctx.Rdi ); + ok( !ctx.Rbp, "rbp is not zero %lx\n", ctx.Rbp ); + ok( !((ctx.Rsp + 0x28) & 0xfff), "rsp is not at top of stack page %lx\n", ctx.Rsp ); + } + entry_ptr = (void *)ctx.Rcx; + peb_ptr = (void *)ctx.Rdx; + rop_chain.exit_process_ptr = exit_process_ptr; ctx.Rcx = (ULONG_PTR)remote_pipe_params + offsetof(struct pipe_params, pipe_name); ctx.Rdx = (ULONG_PTR)remote_pipe_params + offsetof(struct pipe_params, pipe_write_buf); @@ -3117,6 +3132,20 @@ static void test_SuspendProcessState(void) ret = WriteProcessMemory(pi.hProcess, (void *)ctx.Rsp, &rop_chain, sizeof(rop_chain), NULL); ok(ret, "Failed to write to remote process thread stack (%d)\n", GetLastError()); #else + ok( ctx.ContextFlags == CONTEXT_FULL, "wrong flags %x\n", ctx.ContextFlags ); + todo_wine + ok( !ctx.Ebp || broken(ctx.Ebp), /* winxp */ "ebp is not zero %08x\n", ctx.Ebp ); + if (!ctx.Ebp) /* winxp is completely different */ + { + ok( !ctx.Ecx, "ecx is not zero %08x\n", ctx.Ecx ); + ok( !ctx.Edx, "edx is not zero %08x\n", ctx.Edx ); + ok( !ctx.Esi, "esi is not zero %08x\n", ctx.Esi ); + ok( !ctx.Edi, "edi is not zero %08x\n", ctx.Edi ); + ok( !((ctx.Esp + 0x10) & 0xfff), "esp is not at top of stack page %08x\n", ctx.Esp ); + } + entry_ptr = (void *)ctx.Eax; + peb_ptr = (void *)ctx.Ebx; + rop_chain.exit_process_ptr = exit_process_ptr; rop_chain.pipe_name = (ULONG_PTR)remote_pipe_params + offsetof(struct pipe_params, pipe_name); rop_chain.pipe_write_buf = (ULONG_PTR)remote_pipe_params + offsetof(struct pipe_params, pipe_write_buf); @@ -3132,6 +3161,18 @@ static void test_SuspendProcessState(void) ret = WriteProcessMemory(pi.hProcess, (void *)ctx.Esp, &rop_chain, sizeof(rop_chain), NULL); ok(ret, "Failed to write to remote process thread stack (%d)\n", GetLastError()); #endif + + ret = ReadProcessMemory( pi.hProcess, peb_ptr, &child_peb, sizeof(child_peb), NULL ); + todo_wine + ok( ret, "Failed to read PEB (%u)\n", GetLastError() ); + if (ret) + ok( child_peb.ImageBaseAddress == exe_base, "wrong base %p/%p\n", + child_peb.ImageBaseAddress, exe_base ); + todo_wine + ok( entry_ptr == (char *)exe_base + nt_header.OptionalHeader.AddressOfEntryPoint, + "wrong entry point %p/%p\n", entry_ptr, + (char *)exe_base + nt_header.OptionalHeader.AddressOfEntryPoint ); + ret = SetThreadContext(pi.hThread, &ctx); ok(ret, "Failed to set remote thread context (%d)\n", GetLastError());

1 0

Hugh McMaster : regedit/tests: Combine and rename the r_exec_import_*str functions.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: ee11f6fff5f6332f58ce51a844cedab6719e57ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee11f6fff5f6332f58ce51a84… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:43 2017 +0000 regedit/tests: Combine and rename the r_exec_import_*str functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 56 +++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 1f2284f..5912c25 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -67,48 +67,38 @@ static BOOL write_file(const void *str, DWORD size) return ret; } -#define exec_import_str(c) r_exec_import_str(__LINE__, c) -static BOOL r_exec_import_str(unsigned line, const char *file_contents) -{ - BOOL br; - - if (!write_file(file_contents, strlen(file_contents))) - return FALSE; - - run_regedit_exe("regedit.exe /s test.reg"); - - br = DeleteFileA("test.reg"); - lok(br, "DeleteFile failed: %u\n", GetLastError()); +#define exec_import_str(c) import_reg(__LINE__,c,FALSE) +#define exec_import_wstr(c) import_reg(__LINE__,c,TRUE) - return br; -} - -#define exec_import_wstr(c) r_exec_import_wstr(__LINE__, c) -static BOOL r_exec_import_wstr(unsigned line, const char *file_contents) +static BOOL import_reg(unsigned line, const char *contents, BOOL unicode) { - int lenA, len, memsize; - WCHAR *wstr; - BOOL br = FALSE; + int lenA; + BOOL ret; - lenA = strlen(file_contents); + lenA = strlen(contents); - len = MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, NULL, 0); - memsize = len * sizeof(WCHAR); - wstr = HeapAlloc(GetProcessHeap(), 0, memsize); - if (!wstr) return FALSE; - MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, len); + if (unicode) + { + int len = MultiByteToWideChar(CP_UTF8, 0, contents, lenA, NULL, 0); + int size = len * sizeof(WCHAR); + WCHAR *wstr = HeapAlloc(GetProcessHeap(), 0, size); + if (!wstr) return FALSE; + MultiByteToWideChar(CP_UTF8, 0, contents, lenA, wstr, len); + + ret = write_file(wstr, size); + HeapFree(GetProcessHeap(), 0, wstr); + } + else + ret = write_file(contents, lenA); - if (!write_file(wstr, memsize)) - goto exit; + if (!ret) return FALSE; run_regedit_exe("regedit.exe /s test.reg"); - br = DeleteFileA("test.reg"); - lok(br, "DeleteFile failed: %u\n", GetLastError()); + ret = DeleteFileA("test.reg"); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); -exit: - HeapFree(GetProcessHeap(), 0, wstr); - return br; + return ret; } #define TODO_REG_TYPE (0x0001u)

1 0

Hugh McMaster : reg/tests: Combine and rename the test_import_*str functions.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: bfe5fed0b3e628a859eb53d906a104c28a3ce6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe5fed0b3e628a859eb53d90… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:40 2017 +0000 reg/tests: Combine and rename the test_import_*str functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 50 +++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1857545..c41d284 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -750,47 +750,37 @@ static BOOL write_file(const void *str, DWORD size) return ret; } -#define test_import_str(c,r) test_import_str_(__LINE__,c,r) -static BOOL test_import_str_(unsigned line, const char *file_contents, DWORD *rc) -{ - BOOL ret; - - if (!write_file(file_contents, strlen(file_contents))) - return FALSE; - - run_reg_exe("reg import test.reg", rc); - - ret = DeleteFileA("test.reg"); - lok(ret, "DeleteFile failed: %u\n", GetLastError()); - - return ret; -} +#define test_import_str(c,r) import_reg(__LINE__,c,FALSE,r) +#define test_import_wstr(c,r) import_reg(__LINE__,c,TRUE,r) -#define test_import_wstr(c,r) test_import_wstr_(__LINE__,c,r) -static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *rc) +static BOOL import_reg(unsigned line, const char *contents, BOOL unicode, DWORD *rc) { - int lenA, len, memsize; - WCHAR *wstr; - BOOL ret = FALSE; + int lenA; + BOOL ret; - lenA = strlen(file_contents); + lenA = strlen(contents); - len = MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, NULL, 0); - memsize = len * sizeof(WCHAR); - wstr = HeapAlloc(GetProcessHeap(), 0, memsize); - if (!wstr) return FALSE; - MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, len); + if (unicode) + { + int len = MultiByteToWideChar(CP_UTF8, 0, contents, lenA, NULL, 0); + int size = len * sizeof(WCHAR); + WCHAR *wstr = HeapAlloc(GetProcessHeap(), 0, size); + if (!wstr) return FALSE; + MultiByteToWideChar(CP_UTF8, 0, contents, lenA, wstr, len); + + ret = write_file(wstr, size); + HeapFree(GetProcessHeap(), 0, wstr); + } + else + ret = write_file(contents, lenA); - if (!write_file(wstr, memsize)) - goto exit; + if (!ret) return FALSE; run_reg_exe("reg import test.reg", rc); ret = DeleteFileA("test.reg"); lok(ret, "DeleteFile failed: %u\n", GetLastError()); -exit: - HeapFree(GetProcessHeap(), 0, wstr); return ret; }

1 0

Stefan Dösinger : include: CHOOSECOLOR.lCustData is an LPARAM.
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

Module: wine Branch: master Commit: cd67446d8f43efb84ea8a32aa829047f84514168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd67446d8f43efb84ea8a32aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Sep 17 10:48:14 2017 +0200 include: CHOOSECOLOR.lCustData is an LPARAM. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commdlg.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/commdlg.h b/include/commdlg.h index df56c14..c059b19 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -180,10 +180,10 @@ typedef struct { DWORD lStructSize; HWND hwndOwner; HWND hInstance; /* Should be an HINSTANCE but MS made a typo */ - DWORD rgbResult; - LPDWORD lpCustColors; + COLORREF rgbResult; + COLORREF *lpCustColors; DWORD Flags; - DWORD lCustData; + LPARAM lCustData; LPCCHOOKPROC lpfnHook; LPCSTR lpTemplateName; } CHOOSECOLORA; @@ -193,10 +193,10 @@ typedef struct { DWORD lStructSize; HWND hwndOwner; HWND hInstance; /* Should be an HINSTANCE but MS made a typo */ - DWORD rgbResult; - LPDWORD lpCustColors; + COLORREF rgbResult; + COLORREF *lpCustColors; DWORD Flags; - DWORD lCustData; + LPARAM lCustData; LPCCHOOKPROC lpfnHook; LPCWSTR lpTemplateName; } CHOOSECOLORW;

1 0