April 2017 - Wine-Commits - list.winehq.org

Akihiro Sagawa : d3d8/tests: Add LockRect tests with dynamic textures.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 58055a3c0856186f5e662fe6b89ebbe9c4d58d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58055a3c0856186f5e662fe6b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 4 19:56:55 2017 +0900 d3d8/tests: Add LockRect tests with dynamic textures. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 49f9e545fbb523d0f61ce9676a23513318d3e6e7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/visual.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c0ecc6a..e2b7742 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5216,8 +5216,10 @@ static void add_dirty_rect_test_draw(IDirect3DDevice8 *device) static void add_dirty_rect_test(void) { - IDirect3DSurface8 *surface_dst2, *surface_src_green, *surface_src_red, *surface_managed; - IDirect3DTexture8 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, *tex_managed; + IDirect3DTexture8 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, + *tex_managed, *tex_dynamic; + IDirect3DSurface8 *surface_dst2, *surface_src_green, *surface_src_red, + *surface_managed, *surface_dynamic; D3DLOCKED_RECT locked_rect; IDirect3DDevice8 *device; IDirect3D8 *d3d; @@ -5254,6 +5256,9 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &tex_managed); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 1, D3DUSAGE_DYNAMIC, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex_dynamic); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = IDirect3DTexture8_GetSurfaceLevel(tex_dst2, 0, &surface_dst2); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); @@ -5263,6 +5268,8 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); hr = IDirect3DTexture8_GetSurfaceLevel(tex_managed, 0, &surface_managed); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); fill_surface(surface_src_red, 0x00ff0000, 0); fill_surface(surface_src_green, 0x0000ff00, 0); @@ -5455,6 +5462,7 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* Tests with managed textures. */ fill_surface(surface_managed, 0x00ff0000, 0); hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_managed); ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); @@ -5489,7 +5497,6 @@ static void add_dirty_rect_test(void) /* So does ResourceManagerDiscardBytes. */ fill_surface(surface_managed, 0x000000ff, D3DLOCK_NO_DIRTY_UPDATE); - ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); hr = IDirect3DDevice8_ResourceManagerDiscardBytes(device, 0); ok(SUCCEEDED(hr), "Failed to evict managed resources, hr %#x.\n", hr); add_dirty_rect_test_draw(device); @@ -5499,6 +5506,26 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* Tests with dynamic textures */ + fill_surface(surface_dynamic, 0x0000ffff, 0); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_dynamic); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ffff, 1), + "Expected color 0x0000ffff, got 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + /* Dynamic textures don't honor D3DLOCK_NO_DIRTY_UPDATE. */ + fill_surface(surface_dynamic, 0x00ffff00, D3DLOCK_NO_DIRTY_UPDATE); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00ffff00, 1), + "Expected color 0x00ffff00, got 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* AddDirtyRect on a locked texture is allowed. */ hr = IDirect3DTexture8_LockRect(tex_src_red, 0, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); @@ -5517,11 +5544,13 @@ static void add_dirty_rect_test(void) IDirect3DSurface8_Release(surface_managed); IDirect3DSurface8_Release(surface_src_red); IDirect3DSurface8_Release(surface_src_green); + IDirect3DSurface8_Release(surface_dynamic); IDirect3DTexture8_Release(tex_src_red); IDirect3DTexture8_Release(tex_src_green); IDirect3DTexture8_Release(tex_dst1); IDirect3DTexture8_Release(tex_dst2); IDirect3DTexture8_Release(tex_managed); + IDirect3DTexture8_Release(tex_dynamic); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done:

1 0

Akihiro Sagawa : d3d9/tests: Add LockRect tests with dynamic textures.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 5ea7b85664f023ea1c966172f90ef5aa1f6995cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea7b85664f023ea1c966172f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 4 19:56:53 2017 +0900 d3d9/tests: Add LockRect tests with dynamic textures. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 87fe9779ec91937211dc26c3a30c8ac93b8a0720) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/tests/visual.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4213779..068fb4e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17287,8 +17287,10 @@ static void add_dirty_rect_test_draw(IDirect3DDevice9 *device) static void add_dirty_rect_test(void) { HRESULT hr; - IDirect3DTexture9 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, *tex_managed; - IDirect3DSurface9 *surface_dst2, *surface_src_green, *surface_src_red, *surface_managed; + IDirect3DTexture9 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, + *tex_managed, *tex_dynamic; + IDirect3DSurface9 *surface_dst2, *surface_src_green, *surface_src_red, + *surface_managed, *surface_dynamic; IDirect3DDevice9 *device; IDirect3D9 *d3d; unsigned int i; @@ -17325,6 +17327,9 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &tex_managed, NULL); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 1, D3DUSAGE_DYNAMIC, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex_dynamic, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_dst2, 0, &surface_dst2); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); @@ -17334,6 +17339,8 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_managed, 0, &surface_managed); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); fill_surface(surface_src_red, 0x00ff0000, 0); fill_surface(surface_src_green, 0x0000ff00, 0); @@ -17526,6 +17533,7 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* Tests with managed textures. */ fill_surface(surface_managed, 0x00ff0000, 0); hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_managed); ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); @@ -17560,7 +17568,6 @@ static void add_dirty_rect_test(void) /* So does EvictManagedResources. */ fill_surface(surface_managed, 0x000000ff, D3DLOCK_NO_DIRTY_UPDATE); - ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); hr = IDirect3DDevice9_EvictManagedResources(device); ok(SUCCEEDED(hr), "Failed to evict managed resources, hr %#x.\n", hr); add_dirty_rect_test_draw(device); @@ -17570,6 +17577,26 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* Tests with dynamic textures */ + fill_surface(surface_dynamic, 0x0000ffff, 0); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_dynamic); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ffff, 1), + "Expected color 0x0000ffff, got 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + /* Dynamic textures don't honor D3DLOCK_NO_DIRTY_UPDATE. */ + fill_surface(surface_dynamic, 0x00ffff00, D3DLOCK_NO_DIRTY_UPDATE); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00ffff00, 1), + "Expected color 0x00ffff00, got 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* AddDirtyRect on a locked texture is allowed. */ hr = IDirect3DTexture9_LockRect(tex_src_red, 0, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); @@ -17592,11 +17619,13 @@ static void add_dirty_rect_test(void) IDirect3DSurface9_Release(surface_managed); IDirect3DSurface9_Release(surface_src_red); IDirect3DSurface9_Release(surface_src_green); + IDirect3DSurface9_Release(surface_dynamic); IDirect3DTexture9_Release(tex_src_red); IDirect3DTexture9_Release(tex_src_green); IDirect3DTexture9_Release(tex_dst1); IDirect3DTexture9_Release(tex_dst2); IDirect3DTexture9_Release(tex_managed); + IDirect3DTexture9_Release(tex_dynamic); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d);

1 0

Jacob Lifshay : kernel32: Fix improper escaping of quotes in command line.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: b098b31b85474524a58cb7dcb34bc4ed0fbb6b76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b098b31b85474524a58cb7dcb… Author: Jacob Lifshay <programmerjake(a)gmail.com> Date: Thu Feb 9 16:26:36 2017 -0800 kernel32: Fix improper escaping of quotes in command line. Signed-off-by: Jacob Lifshay <programmerjake(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c7ad47e9b29971509d8ea76e918b6f623ca52a17) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 793f3ef..e1372fb 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -745,6 +745,10 @@ static void update_library_argv0( const WCHAR *argv0 ) * resulting in an odd number of '\' followed by a '"' * '\"' -> '\\\"' * '\\"' -> '\\\\\"' + * - '\'s are followed by the closing '"' must be doubled, + * resulting in an even number of '\' followed by a '"' + * ' \' -> '" \\"' + * ' \\' -> '" \\\\"' * - '\'s that are not followed by a '"' can be left as is * 'a\b' == 'a\b' * 'a\\b' == 'a\\b' @@ -787,7 +791,7 @@ static BOOL build_command_line( WCHAR **argv ) } len+=(a-*arg)+1 /* for the separating space */; if (has_space) - len+=2; /* for the quotes */ + len+=2+bcount; /* for the quotes and doubling of '\' preceding the closing quote */ } if (!(rupp->CommandLine.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR)))) @@ -800,6 +804,7 @@ static BOOL build_command_line( WCHAR **argv ) { BOOL has_space,has_quote; WCHAR* a; + int bcount; /* Check for quotes and spaces in this argument */ has_space=has_quote=FALSE; @@ -821,9 +826,7 @@ static BOOL build_command_line( WCHAR **argv ) /* Now transfer it to the command line */ if (has_space) *p++='"'; - if (has_quote) { - int bcount; - + if (has_quote || has_space) { bcount=0; a=*arg; while (*a!='\0') { @@ -849,8 +852,14 @@ static BOOL build_command_line( WCHAR **argv ) WCHAR* x = *arg; while ((*p=*x++)) p++; } - if (has_space) + if (has_space) { + int i; + + /* Double all the '\' preceding the closing quote */ + for (i=0;i<bcount;i++) + *p++='\\'; *p++='"'; + } *p++=' '; } if (p > rupp->CommandLine.Buffer)

1 0

Dmitry Timoshkov : user32: BUTTON_CalcLabelRect should use the button font.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: c791260354ac499bd89587c2428c5455a9a8e76b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c791260354ac499bd89587c24… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 6 14:23:41 2017 +0300 user32: BUTTON_CalcLabelRect should use the button font. Otherwise WM_SETTEXT handler gets wrong rectangle to erase an old text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e45b80088bc4bf6f048e267c09dc0ce83c1a3485) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/button.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index e85e30d..cc70e37 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -598,15 +598,22 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc) switch (style & (BS_ICON|BS_BITMAP)) { case BS_TEXT: + { + HFONT hFont, hPrevFont = 0; + if (!(text = get_button_text( hwnd ))) goto empty_rect; if (!text[0]) { HeapFree( GetProcessHeap(), 0, text ); goto empty_rect; } + + if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hdc, hFont ); DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT); + if (hPrevFont) SelectObject( hdc, hPrevFont ); HeapFree( GetProcessHeap(), 0, text ); break; + } case BS_ICON: if (!GetIconInfo((HICON)GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ), &iconInfo))

1 0

Fabian Maurer : msvcr120: Add fesetenv stub.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: e938fd03d41784ba35bcf0ca533daeff85467aff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e938fd03d41784ba35bcf0ca5… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Feb 7 17:42:34 2017 +0100 msvcr120: Add fesetenv stub. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 986a67ab37be340c8fb527de9aee3dcde8332c0b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 3dc6b20..6cea910 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -92,7 +92,7 @@ @ stub fegetexceptflag @ stub fegetround @ stub feholdexcept -@ stub fesetenv +@ cdecl fesetenv(ptr) ucrtbase.fesetenv @ stub fesetexceptflag @ stub fesetround @ stub fetestexcept diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index edd31e3..c11993a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2151,7 +2151,7 @@ @ cdecl feof(ptr) MSVCRT_feof @ stub feraiseexcept @ cdecl ferror(ptr) MSVCRT_ferror -@ stub fesetenv +@ cdecl fesetenv(ptr) MSVCRT_fesetenv @ stub fesetexceptflag @ stub fesetround @ stub fetestexcept diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 3c1c343..15c1441 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1817,7 +1817,7 @@ @ cdecl feof(ptr) msvcr120.feof @ stub feraiseexcept @ cdecl ferror(ptr) msvcr120.ferror -@ stub fesetenv +@ cdecl fesetenv(ptr) msvcr120.fesetenv @ stub fesetexceptflag @ stub fesetround @ stub fetestexcept diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6880d6c..94b507c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1268,6 +1268,15 @@ void CDECL _fpreset(void) } /********************************************************************* + * fesetenv (MSVCR120.@) + */ +int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) +{ + FIXME("(%p) stub\n", env); + return 0; +} + +/********************************************************************* * _isnan (MSVCRT.@) */ INT CDECL MSVCRT__isnan(double num) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4cd3760..e4a2201 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2293,7 +2293,7 @@ @ stub feholdexcept @ cdecl feof(ptr) MSVCRT_feof @ cdecl ferror(ptr) MSVCRT_ferror -@ stub fesetenv +@ cdecl fesetenv(ptr) MSVCRT_fesetenv @ stub fesetexceptflag @ stub fesetround @ stub fetestexcept

1 0

Dmitry Timoshkov : kernel32: Replace Peb-> BeingDebugged check by CheckRemoteDebuggerPresent().
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: c0f1b3816d44ff5e3fdb48f7515fc0e078fc2a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f1b3816d44ff5e3fdb48f75… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 10 17:21:32 2017 +0100 kernel32: Replace Peb->BeingDebugged check by CheckRemoteDebuggerPresent(). misctool.dll from AmiBroker intentionally sets PEB->BeingDebugged to a random value returned by RDTSC instruction on PROCESS_ATTACH. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8de06f12dd267cd56284c4f307852486e867b229) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 6 +++++- include/winbase.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index cef21ad..793f3ef 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1085,6 +1085,7 @@ static inline DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry ) */ static DWORD WINAPI start_process( LPTHREAD_START_ROUTINE entry ) { + BOOL being_debugged; PEB *peb = NtCurrentTeb()->Peb; if (!entry) @@ -1098,8 +1099,11 @@ static DWORD WINAPI start_process( LPTHREAD_START_ROUTINE entry ) DPRINTF( "%04x:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(), debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); + if (!CheckRemoteDebuggerPresent( GetCurrentProcess(), &being_debugged )) + being_debugged = FALSE; + SetLastError( 0 ); /* clear error code */ - if (peb->BeingDebugged) DbgBreakPoint(); + if (being_debugged) DbgBreakPoint(); return call_process_entry( peb, entry ); } diff --git a/include/winbase.h b/include/winbase.h index eff5972..d8320e6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1737,6 +1737,7 @@ WINBASEAPI BOOL WINAPI CancelTimerQueueTimer(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI CancelWaitableTimer(HANDLE); WINBASEAPI BOOL WINAPI CheckNameLegalDOS8Dot3A(const char*,char*,DWORD,BOOL*,BOOL*); WINBASEAPI BOOL WINAPI CheckNameLegalDOS8Dot3W(const WCHAR*, char*,DWORD,BOOL*,BOOL*); +WINBASEAPI BOOL WINAPI CheckRemoteDebuggerPresent(HANDLE,BOOL*); WINBASEAPI BOOL WINAPI ChangeTimerQueueTimer(HANDLE,HANDLE,ULONG,ULONG); WINADVAPI BOOL WINAPI CheckTokenMembership(HANDLE,PSID,PBOOL); WINBASEAPI BOOL WINAPI ClearCommBreak(HANDLE);

1 0

Bruno Jesus : winemp3.acm: Ignore XING headers when parsing MP3 files.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: b0620c78f48f76ba2dc0a7dc78fb4b91304e8a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0620c78f48f76ba2dc0a7dc7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Feb 7 13:55:53 2017 -0200 winemp3.acm: Ignore XING headers when parsing MP3 files. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2253d1a9d3a36bc3dcdc05acc8bf47085b739c6f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemp3.acm/mpegl3.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 37993b4..28a1998 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -248,6 +248,13 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) aad->convert = mp3_horse; aad->mh = mpg123_new(NULL,&err); mpg123_open_feed(aad->mh); + + /* mpg123 may find a XING header in the mp3 and use that information + * to ask for seeks in order to read specific frames in the file. + * We cannot allow that since the caller application is feeding us. + * This fixes problems for mp3 files encoded with LAME (bug 42361) + */ + mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); } /* no encoding yet else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM &&

1 0

Józef Kucia : ddraw: Relax "dwSize" validation in ddraw_surface*_Lock().
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 6ce7eccda012764f6ffcb85cdd29fc8d2562cab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce7eccda012764f6ffcb85cd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 17 12:26:37 2017 +0100 ddraw: Relax "dwSize" validation in ddraw_surface*_Lock(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2bef0eafd03430189e88f535ffa3d3b9a981b678) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 6 +-- dlls/ddraw/surface.c | 91 ++++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 4 -- 3 files changed, 54 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ce7eccda012764f6ffcb…

1 0

Hans Leidekker : wbemprox: Only include matching rows in the table row count.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: b5366b0223722ee535f84439cdc112fc76b84afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5366b0223722ee535f84439c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 27 09:16:55 2017 +0100 wbemprox: Only include matching rows in the table row count. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f2c005464ef4c0ec5f424d094eb6300e3514b288) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index cf9ae5c..14e819e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2350,7 +2350,7 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co struct record_printer *rec; enum fill_status status = FILL_STATUS_UNFILTERED; PRINTER_INFO_2W *info; - DWORD i, offset = 0, count = 0, size = 0; + DWORD i, offset = 0, count = 0, size = 0, num_rows = 0; EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FILL_STATUS_FAILED; @@ -2382,9 +2382,10 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co continue; } offset += sizeof(*rec); + num_rows++; } - TRACE("created %u rows\n", count); - table->num_rows = count; + TRACE("created %u rows\n", num_rows); + table->num_rows = num_rows; heap_free( info ); return status; @@ -2567,7 +2568,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * static const WCHAR fmtW[] = {'C','P','U','%','u',0}; WCHAR caption[100], device_id[14], processor_id[17], manufacturer[13], name[49] = {0}, version[50]; struct record_processor *rec; - UINT i, offset = 0, num_cores, num_logical_processors, count = get_processor_count(); + UINT i, offset = 0, num_rows = 0, num_cores, num_logical_processors, count = get_processor_count(); enum fill_status status = FILL_STATUS_UNFILTERED; if (!resize_table( table, count, sizeof(*rec) )) return FILL_STATUS_FAILED; @@ -2608,10 +2609,11 @@ static enum fill_status fill_processor( struct table *table, const struct expr * continue; } offset += sizeof(*rec); + num_rows++; } - TRACE("created %u rows\n", count); - table->num_rows = count; + TRACE("created %u rows\n", num_rows); + table->num_rows = num_rows; return status; }

1 0

Józef Kucia : d3d11/tests: Add tests showing that views do not keep resource reference.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: a82bd1f59dcf13471449bbacf6cbe0c377025dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82bd1f59dcf13471449bbacf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:35 2017 +0100 d3d11/tests: Add tests showing that views do not keep resource reference. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0ce7d71c4657d7537b9e571d89eb1122d953448d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 52619ab..a524f58 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2727,8 +2727,11 @@ static void test_create_depthstencil_view(void) get_dsv_desc(current_desc, &tests[i].dsv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, current_desc, &dsview); ok(SUCCEEDED(hr), "Test %u: Failed to create depth stencil view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11DepthStencilView_QueryInterface(dsview, &IID_ID3D10DepthStencilView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -3088,8 +3091,11 @@ static void test_create_rendertarget_view(void) get_rtv_desc(current_desc, &tests[i].rtv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateRenderTargetView(device, texture, current_desc, &rtview); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11RenderTargetView_QueryInterface(rtview, &IID_ID3D10RenderTargetView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -3444,8 +3450,11 @@ static void test_create_shader_resource_view(void) get_srv_desc(current_desc, &tests[i].srv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateShaderResourceView(device, texture, current_desc, &srview); ok(SUCCEEDED(hr), "Test %u: Failed to create a shader resource view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -8111,6 +8120,7 @@ static void test_swapchain_views(void) ID3D11DeviceContext *context; ID3D11RenderTargetView *rtv; ID3D11Device *device; + ULONG refcount; HRESULT hr; static const struct vec4 color = {0.2f, 0.3f, 0.5f, 1.0f}; @@ -8121,6 +8131,9 @@ static void test_swapchain_views(void) device = test_context.device; context = test_context.immediate_context; + refcount = get_refcount((IUnknown *)test_context.backbuffer); + todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + draw_color_quad(&test_context, &color); check_texture_color(test_context.backbuffer, 0xff7f4c33, 1); @@ -8131,6 +8144,9 @@ static void test_swapchain_views(void) ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + refcount = get_refcount((IUnknown *)test_context.backbuffer); + todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + draw_color_quad(&test_context, &color); todo_wine check_texture_color(test_context.backbuffer, 0xffbc957c, 1); @@ -10345,8 +10361,11 @@ static void test_create_unordered_access_view(void) get_uav_desc(current_desc, &tests[i].uav_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateUnorderedAccessView(device, texture, current_desc, &uav); ok(SUCCEEDED(hr), "Test %u: Failed to create unordered access view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); memset(&uav_desc, 0, sizeof(uav_desc)); ID3D11UnorderedAccessView_GetDesc(uav, &uav_desc);

1 0