wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Michael Stefaniuc : dmime/tests: COM tests for the different DirectMusic*Tracks.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 13dfc393dee4f0feb412a5209e7282e6126ae915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13dfc393dee4f0feb412a5209… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 10:47:03 2014 +0100 dmime/tests: COM tests for the different DirectMusic*Tracks. --- dlls/dmime/tests/dmime.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index ab0b293..df11c0d 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -23,6 +23,8 @@ #include <wine/test.h> #include <dmusici.h> +#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) + static BOOL missing_dmime(void) { IDirectMusicSegment8 *dms; @@ -130,6 +132,77 @@ static void test_COM_segmentstate(void) while (IDirectMusicSegmentState8_Release(dmss8)); } +static void test_COM_track(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; +#define X(class) &CLSID_ ## class, #class + const struct { + REFCLSID clsid; + const char *name; + } class[] = { + { X(DirectMusicLyricsTrack) }, + { X(DirectMusicMarkerTrack) }, + { X(DirectMusicParamControlTrack) }, + { X(DirectMusicSegmentTriggerTrack) }, + { X(DirectMusicSeqTrack) }, + { X(DirectMusicSysExTrack) }, + { X(DirectMusicTempoTrack) }, + { X(DirectMusicTimeSigTrack) }, + { X(DirectMusicWaveTrack) } + }; +#undef X + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(class); i++) { + /* COM aggregation */ + dmt8 = (IDirectMusicTrack8*)0xdeadbeef; + hr = CoCreateInstance(class[i].clsid, (IUnknown*)&dmt8, CLSCTX_INPROC_SERVER, &IID_IUnknown, + (void**)&dmt8); + if (hr == REGDB_E_CLASSNOTREG) { + win_skip("%s not registered\n", class[i].name); + continue; + } + ok(hr == CLASS_E_NOAGGREGATION, + "%s create failed: %08x, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); + ok(!dmt8, "dmt8 = %p\n", dmt8); + + /* Invalid RIID */ + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, + (void**)&dmt8); + ok(hr == E_NOINTERFACE, "%s create failed: %08x, expected E_NOINTERFACE\n", + class[i].name, hr); + + /* Same refcount for all DirectMusicTrack interfaces */ + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, + (void**)&dmt8); + if (hr == E_NOINTERFACE && !dmt8) { + skip("%s not created with CoCreateInstance()\n", class[i].name); + continue; + } + ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + refcount = IDirectMusicTrack8_AddRef(dmt8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicTrack8_Release(dmt8)); + } +} + START_TEST(dmime) { CoInitialize(NULL); @@ -142,6 +215,7 @@ START_TEST(dmime) } test_COM_segment(); test_COM_segmentstate(); + test_COM_track(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmime/tests: Add COM tests for DirectMusicSegmentState.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 77bf52b8a246caad62616677fcc67411f326fd94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77bf52b8a246caad62616677f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 10:44:34 2014 +0100 dmime/tests: Add COM tests for DirectMusicSegmentState. --- dlls/dmime/tests/dmime.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 185d76f..ab0b293 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -90,6 +90,46 @@ static void test_COM_segment(void) ok (refcount == 0, "refcount == %u, expected 0\n", refcount); } +static void test_COM_segmentstate(void) +{ + IDirectMusicSegmentState8 *dmss8 = (IDirectMusicSegmentState8*)0xdeadbeef; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, (IUnknown*)&dmss8, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmss8); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicSegmentState8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmss8, "dmss8 = %p\n", dmss8); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmss8); + ok(hr == E_NOINTERFACE, + "DirectMusicSegmentState8 create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicSegmentState interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegmentState8, (void**)&dmss8); + if (hr == E_NOINTERFACE) { + win_skip("DirectMusicSegmentState without IDirectMusicSegmentState8\n"); + return; + } + ok(hr == S_OK, "DirectMusicSegmentState8 create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicSegmentState8_AddRef(dmss8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicSegmentState8_QueryInterface(dmss8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicSegmentState8_Release(dmss8)); +} + START_TEST(dmime) { CoInitialize(NULL); @@ -101,6 +141,7 @@ START_TEST(dmime) return; } test_COM_segment(); + test_COM_segmentstate(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmime/tests: Move the unrelated COM test out of performance.c.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: d4861c07c46bad1001274daf201a77af42747fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4861c07c46bad1001274daf2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 10:42:57 2014 +0100 dmime/tests: Move the unrelated COM test out of performance.c. --- dlls/dmime/tests/Makefile.in | 1 + dlls/dmime/tests/dmime.c | 106 ++++++++++++++++++++++++++++++++++++++++ dlls/dmime/tests/performance.c | 51 ------------------- 3 files changed, 107 insertions(+), 51 deletions(-) diff --git a/dlls/dmime/tests/Makefile.in b/dlls/dmime/tests/Makefile.in index 10793cf..4d4e718 100644 --- a/dlls/dmime/tests/Makefile.in +++ b/dlls/dmime/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = dmime.dll IMPORTS = user32 ole32 C_SRCS = \ + dmime.c \ performance.c diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c new file mode 100644 index 0000000..185d76f --- /dev/null +++ b/dlls/dmime/tests/dmime.c @@ -0,0 +1,106 @@ +/* + * Copyright 2012, 2014 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> +#include <windef.h> +#include <wine/test.h> +#include <dmusici.h> + +static BOOL missing_dmime(void) +{ + IDirectMusicSegment8 *dms; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment, (void**)&dms); + + if (hr == S_OK && dms) + { + IDirectMusicSegment_Release(dms); + return FALSE; + } + return TRUE; +} + +static void test_COM_segment(void) +{ + IDirectMusicSegment8 *dms = (IDirectMusicSegment8*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *stream; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicSegment, (IUnknown*)&dms, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dms); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicSegment create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dms, "dms = %p\n", dms); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectSound, (void**)&dms); + ok(hr == E_NOINTERFACE, + "DirectMusicSegment create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount */ + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment8, (void**)&dms); + if (hr == E_NOINTERFACE) { + win_skip("DirectMusicSegment without IDirectMusicSegment8\n"); + return; + } + ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicSegment8_AddRef(dms); + ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + IDirectMusicSegment8_AddRef(dms); + refcount = IDirectMusicSegment8_Release(dms); + ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IPersistStream, (void**)&stream); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IDirectMusicSegment8_Release(dms); + ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_Release(unk); + ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + refcount = IPersistStream_Release(stream); + ok (refcount == 1, "refcount == %u, expected 1\n", refcount); + refcount = IDirectMusicSegment8_Release(dms); + ok (refcount == 0, "refcount == %u, expected 0\n", refcount); +} + +START_TEST(dmime) +{ + CoInitialize(NULL); + + if (missing_dmime()) + { + skip("dmime not available\n"); + CoUninitialize(); + return; + } + test_COM_segment(); + + CoUninitialize(); +} diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index d0d5079..591ae1f 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -255,55 +255,6 @@ static void test_COM(void) ok (refcount == 0, "refcount == %u, expected 0\n", refcount); } -static void test_dms_COM(void) -{ - IDirectMusicSegment8 *dms = (IDirectMusicSegment8*)0xdeadbeef; - IDirectMusicObject *dmo; - IPersistStream *stream; - IUnknown *unk; - ULONG refcount; - HRESULT hr; - - /* COM aggregation */ - hr = CoCreateInstance(&CLSID_DirectMusicSegment, (IUnknown*)&dms, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&dms); - ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicSegment create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); - ok(!dms, "dms = %p\n", dms); - - /* Invalid RIID */ - hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectSound, (void**)&dms); - ok(hr == E_NOINTERFACE, - "DirectMusicSegment create failed: %08x, expected E_NOINTERFACE\n", hr); - - /* Same refcount */ - hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectMusicSegment8, (void**)&dms); - ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); - refcount = IDirectMusicSegment8_AddRef(dms); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); - hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); - IDirectMusicSegment8_AddRef(dms); - refcount = IDirectMusicSegment8_Release(dms); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); - hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IPersistStream, (void**)&stream); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); - refcount = IDirectMusicSegment8_Release(dms); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); - hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); - refcount = IUnknown_Release(unk); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); - refcount = IDirectMusicObject_Release(dmo); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); - refcount = IPersistStream_Release(stream); - ok (refcount == 1, "refcount == %u, expected 1\n", refcount); - refcount = IDirectMusicSegment8_Release(dms); - ok (refcount == 0, "refcount == %u, expected 0\n", refcount); -} - START_TEST( performance ) { HRESULT hr; @@ -323,7 +274,5 @@ START_TEST( performance ) test_COM(); test_createport(); - test_dms_COM(); - CoUninitialize(); }

1 0

Michael Stefaniuc : dmime: None of the COM classes support COM aggregation.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 2343eeff91346eef661bc72baa1979746973da91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2343eeff91346eef661bc72ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 10:41:27 2014 +0100 dmime: None of the COM classes support COM aggregation. --- dlls/dmime/audiopath.c | 7 ++++--- dlls/dmime/dmime_main.c | 43 ++++++++++++++++++---------------------- dlls/dmime/dmime_private.h | 30 ++++++++++++++-------------- dlls/dmime/graph.c | 3 ++- dlls/dmime/lyricstrack.c | 3 ++- dlls/dmime/markertrack.c | 3 ++- dlls/dmime/paramcontroltrack.c | 3 ++- dlls/dmime/performance.c | 20 ++++++++----------- dlls/dmime/segment.c | 10 +++------- dlls/dmime/segmentstate.c | 3 ++- dlls/dmime/segtriggertrack.c | 3 ++- dlls/dmime/seqtrack.c | 3 ++- dlls/dmime/sysextrack.c | 3 ++- dlls/dmime/tempotrack.c | 3 ++- dlls/dmime/timesigtrack.c | 3 ++- dlls/dmime/wavetrack.c | 3 ++- 16 files changed, 71 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2343eeff91346eef661bc…

1 0

Henri Verbeet : ddraw: Pass the monitor to the callback in ddraw_enumerate_secondary_devices().
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: c7d05d2d604064c96c5a6c8107c297b3bd9f488c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d05d2d604064c96c5a6c810… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:06 2014 +0100 ddraw: Pass the monitor to the callback in ddraw_enumerate_secondary_devices(). --- dlls/ddraw/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 2dd0393..3bcd9b8 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -85,7 +85,7 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC { TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); cont_enum = callback(&adapter_id.device_identifier, adapter_id.description, - adapter_id.device_name, context, 0); + adapter_id.device_name, context, wined3d_get_adapter_monitor(wined3d, adapter)); } } }

1 0

Henri Verbeet : wined3d: Make rebind_fbo in struct wined3d_context a bitfield.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 5dd286d05a6dcd3c58922b77a29ba21ddeeb4f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd286d05a6dcd3c58922b77a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:05 2014 +0100 wined3d: Make rebind_fbo in struct wined3d_context a bitfield. --- dlls/wined3d/wined3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c10f120..b985745 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1083,7 +1083,8 @@ struct wined3d_context DWORD lastWasPow2Texture : 8; /* MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* MAX_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max MAX_TEXTURES, 8 */ - DWORD padding : 20; + DWORD rebind_fbo : 1; + DWORD padding : 19; DWORD shader_update_mask; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -1116,7 +1117,6 @@ struct wined3d_context struct fbo_entry *current_fbo; GLuint fbo_read_binding; GLuint fbo_draw_binding; - BOOL rebind_fbo; struct wined3d_surface **blit_targets; GLenum *draw_buffers; DWORD draw_buffers_mask; /* Enabled draw buffers, 31 max. */

1 0

Henri Verbeet : wined3d: Explicitly request alpha testing for blitting the cursor and logo textures to screen.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 51cdeeacd4b4b8d48bcf938b5763ad1a5036812f URL: http://source.winehq.org/git/wine.git/?a=commit;h=51cdeeacd4b4b8d48bcf938b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:04 2014 +0100 wined3d: Explicitly request alpha testing for blitting the cursor and logo textures to screen. --- dlls/wined3d/surface.c | 9 +++++---- dlls/wined3d/swapchain.c | 4 ++-- include/wine/wined3d.h | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 35e3783..832caa5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4321,7 +4321,7 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW } static void surface_blt_to_drawable(const struct wined3d_device *device, - enum wined3d_texture_filter_type filter, BOOL color_key, + enum wined3d_texture_filter_type filter, BOOL alpha_test, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { @@ -4348,7 +4348,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, device->blitter->set_shader(device->blit_priv, context, src_surface); - if (color_key) + if (alpha_test) { gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); checkGLcall("glEnable(GL_ALPHA_TEST)"); @@ -4372,7 +4372,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); - if (color_key) + if (alpha_test) { gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); checkGLcall("glDisable(GL_ALPHA_TEST)"); @@ -4571,7 +4571,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE src_surface->container->color_key_flags &= ~WINEDDSD_CKSRCBLT; } - surface_blt_to_drawable(device, filter, flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE), + surface_blt_to_drawable(device, filter, + flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_ALPHATEST), src_surface, src_rect, dst_surface, dst_rect); /* Restore the color key parameters */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 40fabc6..0e7d79f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -432,7 +432,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT RECT rect = {0, 0, src_surface->resource.width, src_surface->resource.height}; /* Blit the logo into the upper left corner of the drawable. */ - wined3d_surface_blt(back_buffer, &rect, src_surface, &rect, WINEDDBLT_KEYSRC, + wined3d_surface_blt(back_buffer, &rect, src_surface, &rect, WINEDDBLT_ALPHATEST, NULL, WINED3D_TEXF_POINT); } @@ -453,7 +453,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT if (swapchain->desc.windowed) MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&destRect, 2); - wined3d_surface_blt(back_buffer, &destRect, cursor, NULL, WINEDDBLT_KEYSRC, + wined3d_surface_blt(back_buffer, &destRect, cursor, NULL, WINEDDBLT_ALPHATEST, NULL, WINED3D_TEXF_POINT); } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0f23fa2..7ddd466 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1268,6 +1268,7 @@ enum wined3d_display_rotation #define WINEDDBLT_WAIT 0x01000000 #define WINEDDBLT_DEPTHFILL 0x02000000 #define WINEDDBLT_DONOTWAIT 0x08000000 +#define WINEDDBLT_ALPHATEST 0x80000000 /* DDSURFACEDESC.dwFlags */ #define WINEDDSD_CAPS 0x00000001

1 0

Henri Verbeet : wined3d: Place the logo texture in the default pool.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 06d6bdae4ae23ca47bf64c5252af1e393bb60eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d6bdae4ae23ca47bf64c525… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:03 2014 +0100 wined3d: Place the logo texture in the default pool. --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 40790c1..ecad608 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -580,8 +580,8 @@ static void device_load_logo(struct wined3d_device *device, const char *filename desc.format = WINED3DFMT_B5G6R5_UNORM; desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = 0; - desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.usage = WINED3DUSAGE_DYNAMIC; + desc.pool = WINED3D_POOL_DEFAULT; desc.width = bm.bmWidth; desc.height = bm.bmHeight; desc.depth = 1;

1 0

Henri Verbeet : wined3d: Place the cursor texture in the default pool.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: f8e62bc5962bc71ed584fd35329aba180f5e9df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e62bc5962bc71ed584fd353… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:02 2014 +0100 wined3d: Place the cursor texture in the default pool. --- dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 925f879..40790c1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3809,8 +3809,8 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined desc.format = WINED3DFMT_B8G8R8A8_UNORM; desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = 0; - desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.usage = WINED3DUSAGE_DYNAMIC; + desc.pool = WINED3D_POOL_DEFAULT; desc.width = cursor_image->resource.width; desc.height = cursor_image->resource.height; desc.depth = 1; @@ -3825,7 +3825,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined } surface = surface_from_resource(wined3d_texture_get_sub_resource(texture, 0)); - if (FAILED(wined3d_surface_map(surface, &map_desc, NULL, 0))) + if (FAILED(wined3d_surface_map(surface, &map_desc, NULL, WINED3D_MAP_DISCARD))) { ERR("Failed to map destination surface.\n"); wined3d_texture_decref(texture);

1 0

Ken Thomases : winemac: For ChangeDisplaySettingsEx(), if caller didn' t specify, prefer non-interlaced and unstretched modes.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: c072a4564e55d38b3279e598a0b4a276639ab5d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c072a4564e55d38b3279e598a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 10 03:11:36 2014 -0600 winemac: For ChangeDisplaySettingsEx(), if caller didn't specify, prefer non-interlaced and unstretched modes. --- dlls/winemac.drv/display.c | 72 +++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index e44415d..2f801f0 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -235,7 +235,9 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, struct macdrv_display *displays; int num_displays; CFArrayRef display_modes; - CFIndex count, i, safe; + CFIndex count, i, safe, best; + CGDisplayModeRef best_display_mode; + uint32_t best_io_flags; TRACE("%s %p %p 0x%08x %p\n", debugstr_w(devname), devmode, hwnd, flags, lpvoid); @@ -299,6 +301,7 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, TRACE("\n"); safe = -1; + best_display_mode = NULL; count = CFArrayGetCount(display_modes); for (i = 0; i < count; i++) { @@ -334,57 +337,78 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, if (devmode->dmDisplayFrequency != (DWORD)refresh_rate) continue; } + if (devmode->dmFields & DM_DISPLAYFLAGS) + { + if (!(devmode->dmDisplayFlags & DM_INTERLACED) != !(io_flags & kDisplayModeInterlacedFlag)) + continue; + } + else if (best_display_mode) + { + if (io_flags & kDisplayModeInterlacedFlag && !(best_io_flags & kDisplayModeInterlacedFlag)) + continue; + else if (!(io_flags & kDisplayModeInterlacedFlag) && best_io_flags & kDisplayModeInterlacedFlag) + goto better; + } if (devmode->dmFields & DM_DISPLAYFIXEDOUTPUT) { if (!(devmode->dmDisplayFixedOutput == DMDFO_STRETCH) != !(io_flags & kDisplayModeStretchedFlag)) continue; } - if (devmode->dmFields & DM_DISPLAYFLAGS) + else if (best_display_mode) { - if (!(devmode->dmDisplayFlags & DM_INTERLACED) != !(io_flags & kDisplayModeInterlacedFlag)) + if (io_flags & kDisplayModeStretchedFlag && !(best_io_flags & kDisplayModeStretchedFlag)) continue; + else if (!(io_flags & kDisplayModeStretchedFlag) && best_io_flags & kDisplayModeStretchedFlag) + goto better; } + if (best_display_mode) + continue; + +better: + best_display_mode = display_mode; + best = safe; + best_io_flags = io_flags; + } + + if (best_display_mode) + { /* we have a valid mode */ - TRACE("Requested display settings match mode %ld\n", safe); + TRACE("Requested display settings match mode %ld\n", best); if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings(devmode)) { WARN("Failed to update registry\n"); ret = DISP_CHANGE_NOTUPDATED; - break; } + else if (flags & (CDS_TEST | CDS_NORESET)) + ret = DISP_CHANGE_SUCCESSFUL; + else if (macdrv_set_display_mode(&displays[0], best_display_mode)) + { + int mode_bpp = display_mode_bits_per_pixel(best_display_mode); + size_t width = CGDisplayModeGetWidth(best_display_mode); + size_t height = CGDisplayModeGetHeight(best_display_mode); - if (flags & (CDS_TEST | CDS_NORESET)) + SendMessageW(GetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, + MAKELPARAM(width, height)); ret = DISP_CHANGE_SUCCESSFUL; + } else { - if (macdrv_set_display_mode(&displays[0], display_mode)) - { - SendMessageW(GetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, - MAKELPARAM(width, height)); - ret = DISP_CHANGE_SUCCESSFUL; - } - else - { - WARN("Failed to set display mode\n"); - ret = DISP_CHANGE_FAILED; - } + WARN("Failed to set display mode\n"); + ret = DISP_CHANGE_FAILED; } - - break; } - - CFRelease(display_modes); - macdrv_free_displays(displays); - - if (i >= count) + else { /* no valid modes found */ ERR("No matching mode found %ux%ux%d @%u!\n", devmode->dmPelsWidth, devmode->dmPelsHeight, bpp, devmode->dmDisplayFrequency); } + CFRelease(display_modes); + macdrv_free_displays(displays); + return ret; }

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
82
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 January 2014