November 2019 - Wine-commits

Michael Stefaniuc : dmstyle/tests: Check all IDirectMusicTrack8_IsParamSupported() types.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 5d11ee2fe02a37a3bc5beb8bfcc320e7492698c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d11ee2fe02a37a3bc5beb8b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:16 2019 +0100 dmstyle/tests: Check all IDirectMusicTrack8_IsParamSupported() types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 66 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 7 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 6b2275866c..0c17ef3b41 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -244,22 +244,61 @@ static void test_track(void) CLSID classid; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + } param_types[] = { + { X(GUID_BandParam) }, + { X(GUID_ChordParam) }, + { X(GUID_Clear_All_Bands) }, + { X(GUID_CommandParam) }, + { X(GUID_CommandParam2) }, + { X(GUID_CommandParamNext) }, + { X(GUID_ConnectToDLSCollection) }, + { X(GUID_Disable_Auto_Download) }, + { X(GUID_DisableTempo) }, + { X(GUID_DisableTimeSig) }, + { X(GUID_Download) }, + { X(GUID_DownloadToAudioPath) }, + { X(GUID_Enable_Auto_Download) }, + { X(GUID_EnableTempo) }, + { X(GUID_EnableTimeSig) }, + { X(GUID_IDirectMusicBand) }, + { X(GUID_IDirectMusicChordMap) }, + { X(GUID_IDirectMusicStyle) }, + { X(GUID_MuteParam) }, + { X(GUID_Play_Marker) }, + { X(GUID_RhythmParam) }, + { X(GUID_SeedVariations) }, + { X(GUID_StandardMIDIFile) }, + { X(GUID_TempoParam) }, + { X(GUID_TimeSignature) }, + { X(GUID_Unload) }, + { X(GUID_UnloadFromAudioPath) }, + { X(GUID_Valid_Start_Time) }, + { X(GUID_Variations) } + }; +#undef X #define X(class) &CLSID_ ## class, #class const struct { REFCLSID clsid; const char *name; BOOL has_save; BOOL has_join; + /* bitfields with supported param types */ + unsigned int has_params; + unsigned int todo_params; } class[] = { - { X(DirectMusicAuditionTrack), TRUE, FALSE }, - { X(DirectMusicChordTrack), TRUE, TRUE }, - { X(DirectMusicCommandTrack), TRUE, TRUE }, - { X(DirectMusicMotifTrack), FALSE, FALSE }, - { X(DirectMusicMuteTrack), TRUE, FALSE }, - { X(DirectMusicStyleTrack), FALSE, TRUE }, + { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 }, + { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 1 }, + { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 }, + { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 }, + { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 }, + { X(DirectMusicStyleTrack), FALSE, TRUE, 0x1224200, 0 }, }; #undef X - unsigned int i; + unsigned int i, j; for (i = 0; i < ARRAY_SIZE(class); i++) { trace("Testing %s\n", class[i].name); @@ -287,6 +326,19 @@ static void test_track(void) hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + for (j = 0; j < ARRAY_SIZE(param_types); j++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[j].type); + if (class[i].has_params & (1 << j)) + todo_wine_if(class[i].todo_params & (1 << j)) + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[j].name, hr); + else + todo_wine_if(class[i].todo_params & (1 << j)) + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[j].name, hr); + } + if (class[i].clsid == &CLSID_DirectMusicMuteTrack) { hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmime: SegTrigger track supports all param types, even invalid ones.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 9b0512de26635b7943b564a3a0e7fe77ab1d198d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b0512de26635b7943b564a3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:17 2019 +0100 dmime: SegTrigger track supports all param types, even invalid ones. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segtriggertrack.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 3050a5031b..7e1d75aa05 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -156,11 +156,7 @@ static HRESULT WINAPI segment_track_IsParamSupported(IDirectMusicTrack8 *iface, TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); - if (IsEqualGUID(type, &GUID_IDirectMusicStyle)) - return S_OK; - - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + return S_OK; } static HRESULT WINAPI segment_track_AddNotificationType(IDirectMusicTrack8 *iface,

1 0

Michael Stefaniuc : dmime: The Wave track supports two additional param types.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: d65f1e55a20c35b0a6cf35b308052e4fc2e76d90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d65f1e55a20c35b0a6cf35b3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:18 2019 +0100 dmime: The Wave track supports two additional param types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/wavetrack.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index a679ed60ab..5869c9e72d 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -136,20 +136,27 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rgu return S_OK; } -static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - if (IsEqualGUID (rguidType, &GUID_Disable_Auto_Download) - || IsEqualGUID (rguidType, &GUID_Download) - || IsEqualGUID (rguidType, &GUID_DownloadToAudioPath) - || IsEqualGUID (rguidType, &GUID_Enable_Auto_Download)) { - TRACE("param supported\n"); - return S_OK; - } - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); + static const REFGUID valid[] = { + &GUID_Disable_Auto_Download, + &GUID_Download, + &GUID_DownloadToAudioPath, + &GUID_Enable_Auto_Download, + &GUID_Unload, + &GUID_UnloadFromAudioPath + }; + unsigned int i; + + TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); + + for (i = 0; i < ARRAY_SIZE(valid); i++) + if (IsEqualGUID(type, valid[i])) + return S_OK; + + TRACE("param unsupported\n"); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI wave_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype)

1 0

Michael Stefaniuc : dmime/tests: Check all IDirectMusicTrack_IsParamSupported() types.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 1f5e2b7815595dc4538e4cb60518aa90e1ab087d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f5e2b7815595dc4538e4cb6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:19 2019 +0100 dmime/tests: Check all IDirectMusicTrack_IsParamSupported() types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 82 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 20 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 944a278dbb..3fb0e8afd8 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -532,24 +532,62 @@ static void test_track(void) CLSID classid; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + } param_types[] = { + { X(GUID_BandParam) }, + { X(GUID_ChordParam) }, + { X(GUID_Clear_All_Bands) }, + { X(GUID_CommandParam) }, + { X(GUID_CommandParam2) }, + { X(GUID_CommandParamNext) }, + { X(GUID_ConnectToDLSCollection) }, + { X(GUID_Disable_Auto_Download) }, + { X(GUID_DisableTempo) }, + { X(GUID_DisableTimeSig) }, + { X(GUID_Download) }, + { X(GUID_DownloadToAudioPath) }, + { X(GUID_Enable_Auto_Download) }, + { X(GUID_EnableTempo) }, + { X(GUID_EnableTimeSig) }, + { X(GUID_IDirectMusicBand) }, + { X(GUID_IDirectMusicChordMap) }, + { X(GUID_IDirectMusicStyle) }, + { X(GUID_MuteParam) }, + { X(GUID_Play_Marker) }, + { X(GUID_RhythmParam) }, + { X(GUID_SeedVariations) }, + { X(GUID_StandardMIDIFile) }, + { X(GUID_TempoParam) }, + { X(GUID_TimeSignature) }, + { X(GUID_Unload) }, + { X(GUID_UnloadFromAudioPath) }, + { X(GUID_Valid_Start_Time) }, + { X(GUID_Variations) }, + { X(GUID_NULL) } + }; +#undef X #define X(class) &CLSID_ ## class, #class const struct { REFCLSID clsid; const char *name; - BOOL has_param; + /* bitfield with supported param types */ + unsigned int has_params; } class[] = { - { X(DirectMusicLyricsTrack), TRUE }, - { X(DirectMusicMarkerTrack), TRUE }, - { X(DirectMusicParamControlTrack), TRUE }, - { X(DirectMusicSegmentTriggerTrack), TRUE }, - { X(DirectMusicSeqTrack), FALSE }, - { X(DirectMusicSysExTrack), FALSE }, - { X(DirectMusicTempoTrack), TRUE }, - { X(DirectMusicTimeSigTrack), TRUE }, - { X(DirectMusicWaveTrack), TRUE } + { X(DirectMusicLyricsTrack), 0 }, + { X(DirectMusicMarkerTrack), 0x8080000 }, + { X(DirectMusicParamControlTrack), 0 }, + { X(DirectMusicSegmentTriggerTrack), 0x3fffffff }, + { X(DirectMusicSeqTrack), ~0 }, /* param methods not implemented */ + { X(DirectMusicSysExTrack), ~0 }, /* param methods not implemented */ + { X(DirectMusicTempoTrack), 0x802100 }, + { X(DirectMusicTimeSigTrack), 0x1004200 }, + { X(DirectMusicWaveTrack), 0x6001c80 } }; #undef X - unsigned int i; + unsigned int i, j; for (i = 0; i < ARRAY_SIZE(class); i++) { trace("Testing %s\n", class[i].name); @@ -558,7 +596,18 @@ static void test_track(void) ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); /* IDirectMusicTrack */ - if (!class[i].has_param) { + if (class[i].has_params != ~0) { + for (j = 0; j < ARRAY_SIZE(param_types); j++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt, param_types[j].type); + if (class[i].has_params & (1 << j)) + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[j].name, hr); + else + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[j].name, hr); + } + } else { hr = IDirectMusicTrack_GetParam(dmt, NULL, 0, NULL, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack_GetParam failed: %08x\n", hr); hr = IDirectMusicTrack_SetParam(dmt, NULL, 0, NULL); @@ -569,13 +618,6 @@ static void test_track(void) hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); ok(hr == E_NOTIMPL, "got: %08x\n", hr); } - else { - hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); - if (class[i].clsid == &CLSID_DirectMusicSegmentTriggerTrack) - ok(hr == S_OK, "got: %08x\n", hr); - else - ok(hr == DMUS_E_TYPE_UNSUPPORTED, "got: %08x\n", hr); - } if (class[i].clsid != &CLSID_DirectMusicMarkerTrack && class[i].clsid != &CLSID_DirectMusicTimeSigTrack) { hr = IDirectMusicTrack_AddNotificationType(dmt, NULL); @@ -591,7 +633,7 @@ static void test_track(void) if (hr == S_OK) { hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); - if (!class[i].has_param) { + if (class[i].has_params == ~0) { hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0);

1 0

Michael Stefaniuc : dmband/tests: Check all IDirectMusicTrack_IsParamSupported() types.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 7d534d829902c021e4972ac22e83efb3ecaa2093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d534d829902c021e4972ac2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:20 2019 +0100 dmband/tests: Check all IDirectMusicTrack_IsParamSupported() types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/tests/dmband.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 29d0668219..459d00ed1d 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -181,6 +181,44 @@ static void test_bandtrack(void) CLSID class; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + BOOL supported; + } param_types[] = { + { X(GUID_BandParam), TRUE }, + { X(GUID_ChordParam), FALSE }, + { X(GUID_Clear_All_Bands), TRUE }, + { X(GUID_CommandParam), FALSE }, + { X(GUID_CommandParam2), FALSE }, + { X(GUID_CommandParamNext), FALSE }, + { X(GUID_ConnectToDLSCollection), TRUE }, + { X(GUID_Disable_Auto_Download), TRUE }, + { X(GUID_DisableTempo), FALSE }, + { X(GUID_DisableTimeSig), FALSE }, + { X(GUID_Download), TRUE }, + { X(GUID_DownloadToAudioPath), TRUE }, + { X(GUID_Enable_Auto_Download), TRUE }, + { X(GUID_EnableTempo), FALSE }, + { X(GUID_EnableTimeSig), FALSE }, + { X(GUID_IDirectMusicBand), TRUE }, + { X(GUID_IDirectMusicChordMap), FALSE }, + { X(GUID_IDirectMusicStyle), FALSE }, + { X(GUID_MuteParam), FALSE }, + { X(GUID_Play_Marker), FALSE }, + { X(GUID_RhythmParam), FALSE }, + { X(GUID_SeedVariations), FALSE }, + { X(GUID_StandardMIDIFile), TRUE }, + { X(GUID_TempoParam), FALSE }, + { X(GUID_TimeSignature), FALSE }, + { X(GUID_Unload), TRUE }, + { X(GUID_UnloadFromAudioPath), TRUE }, + { X(GUID_Valid_Start_Time), FALSE }, + { X(GUID_Variations), FALSE }, + }; +#undef X + unsigned int i; hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); @@ -203,8 +241,20 @@ static void test_bandtrack(void) hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); } + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + for (i = 0; i < ARRAY_SIZE(param_types); i++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[i].type); + if (param_types[i].supported) + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[i].name, hr); + else + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[i].name, hr); + } + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL);

1 0

Zebediah Figura : d3d9: Track WINED3D_RS_ZENABLE in the primary stateblock.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: c7073bec0c84239072d80ca809b944dfc56ab4cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7073bec0c84239072d80ca8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 17:26:30 2019 -0600 d3d9: Track WINED3D_RS_ZENABLE in the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ec1800a649..5ef0c9cdf6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1007,6 +1007,8 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (!extended) { device->auto_mipmaps = 0; + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); } @@ -4630,6 +4632,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_swapchain_incref(d3d_swapchain->wined3d_swapchain); IDirect3DSwapChain9Ex_Release(&d3d_swapchain->IDirect3DSwapChain9Ex_iface); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc->enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil);

1 0

Zebediah Figura : d3d8: Track WINED3D_RS_POINTSIZE_MIN and WINED3D_RS_ZENABLE in the primary stateblock.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 9fb7c84b15250e6420f5e365914f8a9720c64e86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fb7c84b15250e6420f5e365… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 17:26:31 2019 -0600 d3d8: Track WINED3D_RS_POINTSIZE_MIN and WINED3D_RS_ZENABLE in the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 92b67b9274..17d8a726c7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -922,6 +922,9 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, implicit_swapchain = wined3d_swapchain_get_parent(device->implicit_swapchain); implicit_swapchain->swap_interval = wined3dswapinterval_from_d3d(present_parameters->FullScreen_PresentationInterval); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_POINTSIZE_MIN, 0); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); @@ -3710,6 +3713,9 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_swapchain_incref(wined3d_swapchain); IDirect3DSwapChain8_Release(&d3d_swapchain->IDirect3DSwapChain8_iface); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0);

1 0

Zebediah Figura : ddraw: Track WINED3D_RS_ZENABLE in the primary stateblock.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 769ba7d1e91c9a178786b9139a301cdffef2300b URL: https://source.winehq.org/git/wine.git/?a=commit;h=769ba7d1e91c9a178786b913… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 17:26:32 2019 -0600 ddraw: Track WINED3D_RS_ZENABLE in the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 2 ++ dlls/ddraw/surface.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cdb2e9c2ba..4ad1fdb7f5 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -7025,6 +7025,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, ddraw->d3ddevice = device; + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_ZENABLE, + d3d_device_update_depth_stencil(device)); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, d3d_device_update_depth_stencil(device)); if (version == 1) /* Color keying is initially enabled for version 1 devices. */ diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 89e5024c0e..fda42f2982 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6085,6 +6085,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return hr_ddraw_from_wined3d(hr); } + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); }

1 0

Serge Gautherie : wbemprox: Always free 'new_path'.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: a45dfea99a2eeaf3ede829b04e58c13d14b33970 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a45dfea99a2eeaf3ede829b0… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Mon Nov 18 11:16:48 2019 +0100 wbemprox: Always free 'new_path'. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 96d1e0b850..53d4b169cd 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2341,7 +2341,13 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c goto done; } if (!wcscmp( data.cFileName, dotW ) || !wcscmp( data.cFileName, dotdotW )) continue; - new_path = append_path( path, data.cFileName, &len ); + + if (!(new_path = append_path( path, data.cFileName, &len ))) + { + status = FILL_STATUS_FAILED; + FindClose( handle ); + goto done; + } if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -2354,6 +2360,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c rec = (struct record_datafile *)(table->data + offset); rec->name = build_name( root[0], new_path ); rec->version = get_file_version( rec->name ); + heap_free( new_path ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row ); @@ -2465,7 +2472,13 @@ static enum fill_status fill_directory( struct table *table, const struct expr * !wcscmp( data.cFileName, dotW ) || !wcscmp( data.cFileName, dotdotW )) continue; - new_path = append_path( path, data.cFileName, &len ); + if (!(new_path = append_path( path, data.cFileName, &len ))) + { + FindClose( handle ); + status = FILL_STATUS_FAILED; + goto done; + } + if (!(push_dir( dirstack, new_path, len ))) { heap_free( new_path ); @@ -2476,6 +2489,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * rec = (struct record_directory *)(table->data + offset); rec->accessmask = FILE_ALL_ACCESS; rec->name = build_name( root[0], new_path ); + heap_free( new_path ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row );

1 0

Alexandre Julliard : Wine release 4.20
by Alexandre Julliard 15 Nov '19

15 Nov '19

Module: website Branch: master Commit: 19e82fb9d5402e41d5409ee698b03630013fe80a URL: https://source.winehq.org/git/website.git/?a=commit;h=19e82fb9d5402e41d5409… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 15 23:55:37 2019 +0100 Wine release 4.20 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019111501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2019111501.xml b/news/en/2019111501.xml new file mode 100644 index 00000000..4f78e8ef --- /dev/null +++ b/news/en/2019111501.xml @@ -0,0 +1,16 @@ +<news> +<date>November 15, 2019</date> +<title>Wine 4.20 Released</title> +<body> + The Wine development release 4.20 is now available. + <a href="{$root}/announce/4.20">What's new</a> in this release: +<ul> + <li>New version of the Mono engine with an FNA update.</li> + <li>Code persistence in VBScript and JScript.</li> + <li>Vulkan spec updates.</li> + <li>Improved support for LLVM MinGW.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.20.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0