August 2019 - Wine-commits - list.winehq.org

Gijs Vermeulen : wmp/tests: Add some IWMPPlaylist tests.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 2384e497bae1ef2206827fa139077d7921976005 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2384e497bae1ef2206827fa1… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Sat Aug 3 17:45:58 2019 +0200 wmp/tests: Add some IWMPPlaylist tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/tests/media.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index 7e76aee..fee18fd 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -666,6 +666,78 @@ static void test_player_url(void) IWMPPlayer4_Release(player); } +static void test_playlist(void) +{ + IWMPPlayer4 *player; + IWMPPlaylist *playlist, *playlist2; + HRESULT hr; + BSTR str, str2; + LONG count; + static const WCHAR nameW[] = {'P','l','a','y','l','i','s','t','1',0}; + + hr = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IWMPPlayer4, (void **)&player); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("CLSID_WindowsMediaPlayer is not registered.\n"); + return; + } + ok(hr == S_OK, "Failed to create media player instance, hr %#x.\n", hr); + + playlist = NULL; + hr = IWMPPlayer4_get_currentPlaylist(player, &playlist); + ok(hr == S_OK, "IWMPPlayer4_get_currentPlaylist failed: %08x\n", hr); + ok(playlist != NULL, "playlist == NULL\n"); + + if (0) /* fails on non-English locales */ + { + hr = IWMPPlaylist_get_name(playlist, &str); + ok(hr == S_OK, "Failed to get playlist name, hr %#x.\n", hr); + ok(!lstrcmpW(str, nameW), "Expected %s, got %s\n", wine_dbgstr_w(nameW), wine_dbgstr_w(str)); + SysFreeString(str); + } + + hr = IWMPPlaylist_get_count(playlist, NULL); + ok(hr == E_POINTER, "Failed to get count, hr %#x.\n", hr); + + count = -1; + hr = IWMPPlaylist_get_count(playlist, &count); + ok(hr == S_OK, "Failed to get count, hr %#x.\n", hr); + ok(count == 0, "Expected 0, got %d\n", count); + + IWMPPlaylist_Release(playlist); + + /* newPlaylist doesn't change current playlist */ + hr = IWMPPlayer4_newPlaylist(player, NULL, NULL, &playlist); + ok(hr == S_OK, "Failed to create a playlist, hr %#x.\n", hr); + + playlist2 = NULL; + hr = IWMPPlayer4_get_currentPlaylist(player, &playlist2); + ok(hr == S_OK, "IWMPPlayer4_get_currentPlaylist failed: %08x\n", hr); + ok(playlist2 != NULL && playlist2 != playlist, "Unexpected playlist instance\n"); + + IWMPPlaylist_Release(playlist2); + + /* different playlists can have the same name */ + str = SysAllocString(nameW); + hr = IWMPPlaylist_put_name(playlist, str); + ok(hr == S_OK, "Failed to get playlist name, hr %#x.\n", hr); + + playlist2 = NULL; + hr = IWMPPlayer4_newPlaylist(player, str, NULL, &playlist2); + ok(hr == S_OK, "Failed to create a playlist, hr %#x.\n", hr); + hr = IWMPPlaylist_get_name(playlist2, &str2); + ok(hr == S_OK, "Failed to get playlist name, hr %#x.\n", hr); + ok(playlist != playlist2, "Expected playlists to be different"); + ok(!lstrcmpW(str, str2), "Expected names to be the same\n"); + SysFreeString(str); + SysFreeString(str2); + + IWMPPlaylist_Release(playlist2); + + IWMPPlaylist_Release(playlist); + IWMPPlayer4_Release(player); +} + START_TEST(media) { CoInitialize(NULL); @@ -674,6 +746,7 @@ START_TEST(media) playing_event = CreateEventW(NULL, FALSE, FALSE, NULL); completed_event = CreateEventW(NULL, FALSE, FALSE, NULL); + test_playlist(); test_media_item(); test_player_url(); if (test_wmp()) {

1 0

Peter Dons Tychsen : msvcrt: Do not use casting in min/max constants.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: b72d6d1d86fccae000241809a0da37269c9d5632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b72d6d1d86fccae000241809… Author: Peter Dons Tychsen <pdt(a)dontech.dk> Date: Sun Jul 21 23:38:02 2019 +0200 msvcrt: Do not use casting in min/max constants. Signed-off-by: Peter Dons Tychsen <pdt(a)dontech.dk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/limits.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h index 13bab86..7f32f08 100644 --- a/include/msvcrt/limits.h +++ b/include/msvcrt/limits.h @@ -30,13 +30,13 @@ #define LONG_MAX 0x7fffffffL #define ULONG_MAX 0xffffffffUL -#define LLONG_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) +#define LLONG_MAX 0x7fffffffffffffffLL #define LLONG_MIN (-LLONG_MAX-1) -#define ULLONG_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) +#define ULLONG_MAX 0xffffffffffffffffULL -#define _I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) +#define _I64_MAX 0x7fffffffffffffffLL #define _I64_MIN (-_I64_MAX-1) -#define _UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) +#define _UI64_MAX 0xffffffffffffffffULL #define I64_MIN _I64_MIN #define I64_MAX _I64_MAX

1 0

Conor McCarthy : wldap32: Use ldap_memvfree() to free array allocated by libldap.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 02feb30b0ef0cc4f31cd885f5659026711b79c07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02feb30b0ef0cc4f31cd885f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 16 23:08:57 2019 +1000 wldap32: Use ldap_memvfree() to free array allocated by libldap. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index 62ffdba..e83e6d2 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -258,7 +258,7 @@ ULONG CDECL ldap_parse_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result, ldap_memfree( matchedU ); ldap_memfree( errorU ); - strarrayfreeU( referralsU ); + ldap_memvfree( (void **)referralsU ); ldap_controls_free( serverctrlsU ); #endif

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.9.2.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: d593a80bb6359f9cbcd47dd243e0bf5d08387cf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d593a80bb6359f9cbcd47dd2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 5 10:17:18 2019 -0500 mscoree: Update Wine Mono to 4.9.2. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index a05ca46..8be579d 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,8 +58,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.9.0" -#define MONO_SHA "8e2ec7ce6f10faa24e7b1b4bcab99a946dfe975c21327c8420c7abc74ee1c713" +#define MONO_VERSION "4.9.2" +#define MONO_SHA "b91f4656fca72d036934c2a9e845b2dfadad291e48e0b013fb2b08698200ff74" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 7420b4b..bcad7f4 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.9.0" +#define WINE_MONO_VERSION "4.9.2" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Gijs Vermeulen : wine.inf: Update E. South America Standard Time.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 2859c22cc6c10a7f3aa5e853b0151284b96be235 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2859c22cc6c10a7f3aa5e853… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Sun Aug 4 20:33:58 2019 +0200 wine.inf: Update E. South America Standard Time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47564 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 2ac524a..ea647f6 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2854,14 +2854,7 @@ HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Dlt",,"E. Sou HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"MUI_Dlt",,"@tzres.dll,-64097" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"MUI_Std",,"@tzres.dll,-64096" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Std",,"E. South America Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,df,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2023",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,e7,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2026",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,ea,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2034",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f2,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,f2,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2037",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f5,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,f5,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"LastEntry",0x10001,2037 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0c,00,02,00,05,00,17,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Display",,"Pacific/Easter"" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Dlt",,"Easter Island Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"MUI_Dlt",,"@tzres.dll,-58593"

1 0

Paul Gofman : d3dx9: Pass rectangle to {lock|unlock}_surface().
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 378204527e1f42ed1373a0cd7356770d235e319d URL: https://source.winehq.org/git/wine.git/?a=commit;h=378204527e1f42ed1373a0cd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Aug 5 12:36:27 2019 +0300 d3dx9: Pass rectangle to {lock|unlock}_surface(). This fixes regressions introduced by commits 65956ae50a136fe8467a0332c7495f36617a16dc, 092c14b9d86ee1e96e465908cc524ec85988d0ff. Surface source or destination rectangles were left behind. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47546 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/d3dx9_private.h | 4 +- dlls/d3dx9_36/surface.c | 68 +++++++++++------ dlls/d3dx9_36/tests/surface.c | 166 ++++++++++++++++++++++++++---------------- dlls/d3dx9_36/texture.c | 4 +- 4 files changed, 154 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=378204527e1f42ed1373…

1 0

Matteo Bruni : d3dx9: Get rid of unused unlock_surface() argument.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: eadc7b3128afdf59891c6f9a1c568077c4e6d087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eadc7b3128afdf59891c6f9a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 5 20:51:13 2019 +0200 d3dx9: Get rid of unused unlock_surface() argument. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 2 +- dlls/d3dx9_36/surface.c | 16 ++++++++-------- dlls/d3dx9_36/texture.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index c1a2792..9497343 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -123,7 +123,7 @@ HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, co const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN; -HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, +HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN; unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 44e19ec..8e9b834 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -256,7 +256,7 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO return hr; } -HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, +HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, IDirect3DSurface9 *temp_surface, BOOL update) { IDirect3DDevice9 *device; @@ -608,7 +608,7 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur copy_pixels(locked_rect.pBits, locked_rect.Pitch, 0, pixels, dst_pitch, 0, &volume, pixel_format); - unlock_surface(src_surface, NULL, &locked_rect, temp_surface, FALSE); + unlock_surface(src_surface, NULL, temp_surface, FALSE); *dst_buffer = buffer; return D3D_OK; @@ -1912,7 +1912,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, && src_size.height != surfdesc.Height)) { WARN("Source rect %s is misaligned.\n", wine_dbgstr_rect(src_rect)); - unlock_surface(dst_surface, dst_rect, &lockrect, surface, FALSE); + unlock_surface(dst_surface, dst_rect, surface, FALSE); return D3DXERR_INVALIDDATA; } @@ -1925,7 +1925,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, || !is_conversion_to_supported(destformatdesc)) { FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format); - unlock_surface(dst_surface, dst_rect, &lockrect, surface, FALSE); + unlock_surface(dst_surface, dst_rect, surface, FALSE); return E_NOTIMPL; } @@ -1946,7 +1946,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } } - return unlock_surface(dst_surface, dst_rect, &lockrect, surface, TRUE); + return unlock_surface(dst_surface, dst_rect, surface, TRUE); } /************************************************************ @@ -2036,7 +2036,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, hr = D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, lock.pBits, src_desc.Format, lock.Pitch, src_palette, src_rect, filter, color_key); - if (FAILED(unlock_surface(src_surface, NULL, &lock, temp_surface, FALSE))) + if (FAILED(unlock_surface(src_surface, NULL, temp_surface, FALSE))) return D3DXERR_INVALIDDATA; return hr; @@ -2217,7 +2217,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE IWICBitmapFrameEncode_WritePixels(frame, height, locked_rect.Pitch, height * locked_rect.Pitch, locked_rect.pBits); - unlock_surface(src_surface, src_rect, &locked_rect, temp_surface, FALSE); + unlock_surface(src_surface, src_rect, temp_surface, FALSE); } else /* Pixel format conversion */ { @@ -2254,7 +2254,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE } convert_argb_pixels(locked_rect.pBits, locked_rect.Pitch, 0, &size, src_format_desc, dst_data, dst_pitch, 0, &size, dst_format_desc, 0, NULL); - unlock_surface(src_surface, src_rect, &locked_rect, temp_surface, FALSE); + unlock_surface(src_surface, src_rect, temp_surface, FALSE); IWICBitmapFrameEncode_WritePixels(frame, height, dst_pitch, dst_pitch * height, dst_data); HeapFree(GetProcessHeap(), 0, dst_data); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 74a32b4..26d07ca 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1379,7 +1379,7 @@ HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D f fill_texture(format, data + y * lock_rect.Pitch + x * format->bytes_per_pixel, &value); } } - if (FAILED(hr = unlock_surface(surface, NULL, &lock_rect, temp_surface, TRUE))) + if (FAILED(hr = unlock_surface(surface, NULL, temp_surface, TRUE))) { IDirect3DSurface9_Release(surface); return hr;

1 0

Matteo Bruni : d3dx9/tests: Make the pixels array static.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 15dd8e2b981ca32cae94409153627b3300bbeab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15dd8e2b981ca32cae944091… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 5 20:51:14 2019 +0200 d3dx9/tests: Make the pixels array static. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index a43072f..4a10492 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1403,7 +1403,7 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) static void test_D3DXSaveSurfaceToFile(IDirect3DDevice9 *device) { - const BYTE pixels[] = + static const BYTE pixels[] = {0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff,}; DWORD pitch = sizeof(pixels) / 2;

1 0

Józef Kucia : wined3d: Fix memory leak in wined3d_swapchain_state_create() (Coverity).
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 14dee7bd0ddd9e7f6393d33ce26c09d9885c2b32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14dee7bd0ddd9e7f6393d33c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 5 15:30:00 2019 +0200 wined3d: Fix memory leak in wined3d_swapchain_state_create() (Coverity). 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> --- dlls/wined3d/swapchain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7d73dd1..04ee045 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1624,7 +1624,10 @@ HRESULT CDECL wined3d_swapchain_state_create(const struct wined3d_swapchain_desc return E_OUTOFMEMORY; if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window, wined3d, adapter_idx))) + { + heap_free(s); return hr; + } *state = s;

1 0

Zebediah Figura : wined3d: Inhibit the screensaver while a full-screen application has focus.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 236f590fd61a9cf7e186a03218c704621e7461c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=236f590fd61a9cf7e186a032… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 5 18:43:35 2019 +0430 wined3d: Inhibit the screensaver while a full-screen application has focus. This matches Windows behaviour at least as of Windows 7. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 ++++++++++ dlls/wined3d/swapchain.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4a6b005..6b4b079 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -912,6 +912,8 @@ static void destroy_default_samplers(struct wined3d_device *device, struct wined HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window) { + unsigned int screensaver_active; + TRACE("device %p, window %p.\n", device, window); if (!wined3d_register_window(NULL, window, device, 0)) @@ -922,6 +924,9 @@ HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, InterlockedExchangePointer((void **)&device->focus_window, window); SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + SystemParametersInfoW(SPI_GETSCREENSAVEACTIVE, 0, &screensaver_active, 0); + if ((device->restore_screensaver = !!screensaver_active)) + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); return WINED3D_OK; } @@ -932,6 +937,11 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) if (device->focus_window) wined3d_unregister_window(device->focus_window); InterlockedExchangePointer((void **)&device->focus_window, NULL); + if (device->restore_screensaver) + { + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, NULL, 0); + device->restore_screensaver = FALSE; + } } static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 04ee045..63fd7a1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1172,6 +1172,7 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa { struct wined3d_device *device = swapchain->device; HWND window = swapchain->state.device_window; + unsigned int screensaver_active; BOOL focus_messages, filter; /* This code is not protected by the wined3d mutex, so it may run while @@ -1184,6 +1185,10 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa if (activate) { + SystemParametersInfoW(SPI_GETSCREENSAVEACTIVE, 0, &screensaver_active, 0); + if ((device->restore_screensaver = !!screensaver_active)) + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); + if (!(device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) { /* The d3d versions do not agree on the exact messages here. D3d8 restores @@ -1209,6 +1214,12 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa } else { + if (device->restore_screensaver) + { + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, NULL, 0); + device->restore_screensaver = FALSE; + } + if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, NULL))) ERR("Failed to set display mode.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c7d9cd7..f7fd136 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3180,7 +3180,8 @@ struct wined3d_device BYTE d3d_initialized : 1; BYTE inScene : 1; /* A flag to check for proper BeginScene / EndScene call pairs */ BYTE softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ - BYTE padding : 4; + BYTE restore_screensaver : 1; + BYTE padding : 3; unsigned char surface_alignment; /* Line Alignment of surfaces */

1 0