wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Fabian Maurer : msvcr120: Add fesetenv stub.
by Alexandre Julliard 20 Apr '17

20 Apr '17

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

Jarkko Korpi : ntoskrnl: Add IoStopTimer stub.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: e88776f17917861a8448708956b348287a2773c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e88776f17917861a844870895… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Sat Feb 4 17:59:18 2017 +0200 ntoskrnl: Add IoStopTimer stub. Signed-off-by: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 85214c56e3dc3577bee09aab89b2c79eafbf728f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index bc12788..06320d0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -682,6 +682,15 @@ void WINAPI IoStartTimer(PDEVICE_OBJECT DeviceObject) /*********************************************************************** + * IoStopTimer (NTOSKRNL.EXE.@) + */ +void WINAPI IoStopTimer(PDEVICE_OBJECT DeviceObject) +{ + FIXME( "stub: %p\n", DeviceObject ); +} + + +/*********************************************************************** * IoAllocateIrp (NTOSKRNL.EXE.@) */ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 078178b..3e9dba2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -463,7 +463,7 @@ @ stub IoStartPacket @ stdcall IoStartTimer(ptr) @ stub IoStatisticsLock -@ stub IoStopTimer +@ stdcall IoStopTimer(ptr) @ stub IoSynchronousInvalidateDeviceRelations @ stub IoSynchronousPageWrite @ stub IoThreadToProcess

1 0

Akihiro Sagawa : wined3d: Upload textures if NO_DIRTY_UPDATE flag is set when locking dynamic textures.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: c694f5eb74167f46c136deb16777860c48d73375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c694f5eb74167f46c136deb16… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 4 19:56:57 2017 +0900 wined3d: Upload textures if NO_DIRTY_UPDATE flag is set when locking 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 6cf2dc67e1eb06b5c5483c82b16ed55dd0272d2d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/texture.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e2b7742..4b6c1dc 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5521,7 +5521,7 @@ static void add_dirty_rect_test(void) 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), + 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); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 068fb4e..963d37b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17592,7 +17592,7 @@ static void add_dirty_rect_test(void) 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), + 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); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index da003e1..9857a82 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1752,7 +1752,8 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour return E_OUTOFMEMORY; } - if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) + if (!(flags & WINED3D_MAP_READONLY) + && (!(flags & WINED3D_MAP_NO_DIRTY_UPDATE) || (resource->usage & WINED3DUSAGE_DYNAMIC))) wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding);

1 0

Akihiro Sagawa : d3d8/tests: Add LockRect tests with dynamic textures.
by Alexandre Julliard 20 Apr '17

20 Apr '17

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 20 Apr '17

20 Apr '17

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

Bruno Jesus : winemp3.acm: Fixes compilation for older mpg123 library versions.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 54c22b0864abaf8bb379c827614f0d9f4646e2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c22b0864abaf8bb379c8276… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Feb 19 22:16:18 2017 -0300 winemp3.acm: Fixes compilation for older mpg123 library versions. Thanks to Sebastian Lackner for the correct approach. 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 bb036ae502f7012af17a4a5eefcb43e294ab502f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemp3.acm/mpegl3.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 28a1998..cc6008d 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -249,12 +249,14 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) aad->mh = mpg123_new(NULL,&err); mpg123_open_feed(aad->mh); +#if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */ /* 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); +#endif } /* no encoding yet else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM &&

1 0

Bruno Jesus : winemp3.acm: Ignore XING headers when parsing MP3 files.
by Alexandre Julliard 20 Apr '17

20 Apr '17

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 20 Apr '17

20 Apr '17

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

Bruno Jesus : notepad: Only skip valid command options.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: f0a2b5b7afbcefa6b9c7265440c9fd59878a36f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a2b5b7afbcefa6b9c726544… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 31 01:31:33 2017 -0200 notepad: Only skip valid command options. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bd19402b6d3f6efa30e3b7d088c4bbebd716a2c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/notepad/main.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 20e887b..6f567a9 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -615,7 +615,7 @@ static int AlertFileDoesNotExist(LPCWSTR szFileName) static void HandleCommandLine(LPWSTR cmdline) { - WCHAR delimiter; + WCHAR delimiter, *ptr; BOOL opt_print = FALSE; /* skip white space */ @@ -630,22 +630,29 @@ static void HandleCommandLine(LPWSTR cmdline) if (*cmdline == delimiter) cmdline++; - while (*cmdline == ' ' || *cmdline == '-' || *cmdline == '/') + ptr = cmdline; + while (*ptr == ' ' || *ptr == '-' || *ptr == '/') { WCHAR option; - if (*cmdline++ == ' ') continue; + if (*ptr++ == ' ') continue; - option = *cmdline; - if (option) cmdline++; - while (*cmdline == ' ') cmdline++; + option = *ptr; + if (option) ptr++; + while (*ptr == ' ') ptr++; switch(option) { case 'p': case 'P': - opt_print = TRUE; + { + if (!opt_print) + { + opt_print = TRUE; + cmdline = ptr; + } break; + } } }

1 0

Nikolay Sivov : comctl32/propsheet: Only use header bitmap when asked for it.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 992280add64610193d886d8b5f25db1ca5efabc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992280add64610193d886d8b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 08:17:04 2017 +0300 comctl32/propsheet: Only use header bitmap when asked for it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 34dd326060e7458661aa0644e3aa81503cc5097d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/propsheet.c | 115 ++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 56 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4c04dfe..f575e16 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3205,61 +3205,65 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) COLORREF clrOld = 0; int oldBkMode = 0; - hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u5.hbmHeader); - hOldFont = SelectObject(hdc, psInfo->hFontBold); - - GetClientRect(hwndLineHeader, &r); - MapWindowPoints(hwndLineHeader, hwnd, (LPPOINT) &r, 2); - SetRect(&rzone, 0, 0, r.right + 1, r.top - 1); - - GetObjectW(psInfo->ppshheader.u5.hbmHeader, sizeof(BITMAP), &bm); - - if (psInfo->ppshheader.dwFlags & PSH_WIZARD97_OLD) - { - /* Fill the unoccupied part of the header with color of the - * left-top pixel, but do it only when needed. - */ - if (bm.bmWidth < r.right || bm.bmHeight < r.bottom) - { - hbr = CreateSolidBrush(GetPixel(hdcSrc, 0, 0)); - r = rzone; - if (bm.bmWidth < r.right) - { - r.left = bm.bmWidth; - FillRect(hdc, &r, hbr); - } - if (bm.bmHeight < r.bottom) - { - r.left = 0; - r.top = bm.bmHeight; - FillRect(hdc, &r, hbr); - } - DeleteObject(hbr); - } - - /* Draw the header itself. */ - BitBlt(hdc, 0, 0, - bm.bmWidth, min(bm.bmHeight, rzone.bottom), - hdcSrc, 0, 0, SRCCOPY); - } - else - { - int margin; - hbr = GetSysColorBrush(COLOR_WINDOW); - FillRect(hdc, &rzone, hbr); - - /* Draw the header bitmap. It's always centered like a - * common 49 x 49 bitmap. */ - margin = (rzone.bottom - 49) / 2; - BitBlt(hdc, rzone.right - 49 - margin, margin, - min(bm.bmWidth, 49), min(bm.bmHeight, 49), - hdcSrc, 0, 0, SRCCOPY); - - /* NOTE: Native COMCTL32 draws a white stripe over the bitmap - * if its height is smaller than 49 pixels. Because the reason - * for this bug is unknown the current code doesn't try to - * replicate it. */ - } + GetClientRect(hwndLineHeader, &r); + MapWindowPoints(hwndLineHeader, hwnd, (LPPOINT) &r, 2); + SetRect(&rzone, 0, 0, r.right + 1, r.top - 1); + + hOldFont = SelectObject(hdc, psInfo->hFontBold); + + if (psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER) + { + hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u5.hbmHeader); + + GetObjectW(psInfo->ppshheader.u5.hbmHeader, sizeof(BITMAP), &bm); + if (psInfo->ppshheader.dwFlags & PSH_WIZARD97_OLD) + { + /* Fill the unoccupied part of the header with color of the + * left-top pixel, but do it only when needed. + */ + if (bm.bmWidth < r.right || bm.bmHeight < r.bottom) + { + hbr = CreateSolidBrush(GetPixel(hdcSrc, 0, 0)); + r = rzone; + if (bm.bmWidth < r.right) + { + r.left = bm.bmWidth; + FillRect(hdc, &r, hbr); + } + if (bm.bmHeight < r.bottom) + { + r.left = 0; + r.top = bm.bmHeight; + FillRect(hdc, &r, hbr); + } + DeleteObject(hbr); + } + + /* Draw the header itself. */ + BitBlt(hdc, 0, 0, bm.bmWidth, min(bm.bmHeight, rzone.bottom), + hdcSrc, 0, 0, SRCCOPY); + } + else + { + int margin; + hbr = GetSysColorBrush(COLOR_WINDOW); + FillRect(hdc, &rzone, hbr); + + /* Draw the header bitmap. It's always centered like a + * common 49 x 49 bitmap. */ + margin = (rzone.bottom - 49) / 2; + BitBlt(hdc, rzone.right - 49 - margin, margin, + min(bm.bmWidth, 49), min(bm.bmHeight, 49), + hdcSrc, 0, 0, SRCCOPY); + + /* NOTE: Native COMCTL32 draws a white stripe over the bitmap + * if its height is smaller than 49 pixels. Because the reason + * for this bug is unknown the current code doesn't try to + * replicate it. */ + } + + SelectObject(hdcSrc, hbmp); + } clrOld = SetTextColor (hdc, 0x00000000); oldBkMode = SetBkMode (hdc, TRANSPARENT); @@ -3300,7 +3304,6 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) SetTextColor(hdc, clrOld); SetBkMode(hdc, oldBkMode); SelectObject(hdc, hOldFont); - SelectObject(hdcSrc, hbmp); } if ( (ppshpage && (ppshpage->dwFlags & PSP_HIDEHEADER)) &&

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017