wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Alexandre Julliard : winex11: Add window data structure locking to the ReparentNotify event handler.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 89a60562a71c5322c11df875609b0f9e0beb96bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a60562a71c5322c11df8756… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 19 13:13:40 2012 +0200 winex11: Add window data structure locking to the ReparentNotify event handler. --- dlls/winex11.drv/event.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index d58919c..744bc40 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -938,8 +938,13 @@ static void X11DRV_ReparentNotify( HWND hwnd, XEvent *xev ) HWND parent, old_parent; DWORD style; - if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->embedded) return; + if (!(data = get_win_data( hwnd ))) return; + + if (!data->embedded) + { + release_win_data( data ); + return; + } if (data->whole_window) { @@ -947,6 +952,7 @@ static void X11DRV_ReparentNotify( HWND hwnd, XEvent *xev ) { TRACE( "%p/%lx reparented to root\n", hwnd, data->whole_window ); data->embedder = 0; + release_win_data( data ); SendMessageW( hwnd, WM_CLOSE, 0, 0 ); return; } @@ -954,6 +960,7 @@ static void X11DRV_ReparentNotify( HWND hwnd, XEvent *xev ) } TRACE( "%p/%lx reparented to %lx\n", hwnd, data->whole_window, event->parent ); + release_win_data( data ); style = GetWindowLongW( hwnd, GWL_STYLE ); if (event->parent == root_window)

1 0

Alexandre Julliard : winex11: Add window data structure locking to the ConfigureNotify event handler.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 24c0abfd40a977ae82bc8af9330d28f192e4e295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24c0abfd40a977ae82bc8af93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 19 13:13:23 2012 +0200 winex11: Add window data structure locking to the ConfigureNotify event handler. --- dlls/winex11.drv/event.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 5b50978..d58919c 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -993,17 +993,17 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) int cx, cy, x = event->x, y = event->y; if (!hwnd) return; - if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->mapped || data->iconic) return; - if (data->whole_window && !data->managed) return; + if (!(data = get_win_data( hwnd ))) return; + if (!data->mapped || data->iconic) goto done; + if (data->whole_window && !data->managed) goto done; /* ignore synthetic events on foreign windows */ - if (event->send_event && !data->whole_window) return; + if (event->send_event && !data->whole_window) goto done; if (data->configure_serial && (long)(data->configure_serial - event->serial) > 0) { TRACE( "win %p/%lx event %d,%d,%dx%d ignoring old serial %lu/%lu\n", hwnd, data->whole_window, event->x, event->y, event->width, event->height, event->serial, data->configure_serial ); - return; + goto done; } /* Get geometry */ @@ -1059,6 +1059,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) if (!IsZoomed( data->hwnd )) { TRACE( "win %p/%lx is maximized\n", data->hwnd, data->whole_window ); + release_win_data( data ); SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); return; } @@ -1068,13 +1069,21 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) if (IsZoomed( data->hwnd )) { TRACE( "window %p/%lx is no longer maximized\n", data->hwnd, data->whole_window ); + release_win_data( data ); SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); return; } } if ((flags & (SWP_NOSIZE | SWP_NOMOVE)) != (SWP_NOSIZE | SWP_NOMOVE)) + { + release_win_data( data ); SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); + return; + } + +done: + release_win_data( data ); }

1 0

Alexandre Julliard : winex11: Add window data structure locking to the Expose event handler.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 6a4490d8ab14a26a7647203f83e51b3dda4ff2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a4490d8ab14a26a7647203f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 19 13:12:42 2012 +0200 winex11: Add window data structure locking to the Expose event handler. --- dlls/winex11.drv/event.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index c9ae725..5b50978 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -821,7 +821,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) TRACE( "win %p (%lx) %d,%d %dx%d\n", hwnd, event->window, event->x, event->y, event->width, event->height ); - if (!(data = X11DRV_get_win_data( hwnd ))) return; + if (!(data = get_win_data( hwnd ))) return; rect.left = event->x; rect.top = event->y; @@ -858,7 +858,10 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) } else OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - if (!data->surface) RedrawWindow( hwnd, &rect, 0, flags ); + if (data->surface) flags = 0; + release_win_data( data ); + + if (flags) RedrawWindow( hwnd, &rect, 0, flags ); }

1 0

Huw Davies : comdlg32: Move all of the win 3. 1 style functionality into the same file.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: d26335497e36d71d0b2b0141d65d479de41ee749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d26335497e36d71d0b2b0141d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 19 11:08:01 2012 +0100 comdlg32: Move all of the win 3.1 style functionality into the same file. --- dlls/comdlg32/cdlg.h | 3 + dlls/comdlg32/filedlg.c | 183 --------------------------------------- dlls/comdlg32/filedlg31.c | 210 ++++++++++++++++++++++++++++++++++++++++++--- dlls/comdlg32/filedlg31.h | 52 ----------- 4 files changed, 199 insertions(+), 249 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d26335497e36d71d0b2b0…

1 0

Dmitry Timoshkov : windowscodecs: Add support for VT_LPWSTR property ids to MetadataHandler_GetValue.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: bd5162474acd119d4184309ba11a9f88e18625b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5162474acd119d4184309ba… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 19 10:04:28 2012 +0900 windowscodecs: Add support for VT_LPWSTR property ids to MetadataHandler_GetValue. --- dlls/windowscodecs/metadatahandler.c | 5 ++++ dlls/windowscodecs/tests/metadata.c | 40 ++++++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 5e50cb9..6b19f84 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -260,6 +260,11 @@ static int propvar_cmp(const PROPVARIANT *v1, const PROPVARIANT *v2) return lstrcmpA(v1->u.pszVal, v2->u.pszVal); } + if (v1->vt == VT_LPWSTR && v2->vt == VT_LPWSTR) + { + return lstrcmpiW(v1->u.pwszVal, v2->u.pwszVal); + } + if (!get_int_value(v1, &value1)) return -1; if (!get_int_value(v2, &value2)) return -1; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 928cba0..be700ad 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1636,15 +1636,17 @@ static void test_metadata_APE(void) { VT_UI1|VT_VECTOR, 0, 11, { 'H','e','l','l','o',' ','W','o','r','l','d' }, NULL, { 'A','p','p','l','i','c','a','t','i','o','n',0 } }, { VT_UI1|VT_VECTOR, 0, 10, { 1,0x11,2,0x22,0x33,4,0x44,0x55,0x66,0x77 }, NULL, { 'D','a','t','a',0 } } }; + WCHAR dataW[] = { 'd','a','t','a',0 }; HRESULT hr; IStream *stream; IWICPersistStream *persist; IWICMetadataReader *reader; IWICMetadataHandlerInfo *info; WCHAR name[64]; - UINT count, dummy; + UINT count, dummy, i; GUID format; - CLSID id; + CLSID clsid; + PROPVARIANT id, value; hr = CoCreateInstance(&CLSID_WICAPEMetadataReader, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void **)&reader); @@ -1676,12 +1678,24 @@ static void test_metadata_APE(void) ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr); ok(IsEqualGUID(&format, &GUID_MetadataFormatAPE), "wrong format %s\n", debugstr_guid(&format)); + PropVariantInit(&value); + id.vt = VT_LPWSTR; + U(id).pwszVal = dataW; + + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + ok(hr == S_OK, "GetValue error %#x\n", hr); + ok(value.vt == (VT_UI1|VT_VECTOR), "unexpected vt: %i\n", id.vt); + ok(td[1].count == U(value).caub.cElems, "expected cElems %d, got %d\n", td[1].count, U(value).caub.cElems); + for (i = 0; i < U(value).caub.cElems; i++) + ok(td[1].value[i] == U(value).caub.pElems[i], "%u: expected value %#x/%#x, got %#x\n", i, (ULONG)td[1].value[i], (ULONG)(td[1].value[i] >> 32), U(value).caub.pElems[i]); + PropVariantClear(&value); + hr = IWICMetadataReader_GetMetadataHandlerInfo(reader, &info); ok(hr == S_OK, "GetMetadataHandlerInfo error %#x\n", hr); - hr = IWICMetadataHandlerInfo_GetCLSID(info, &id); + hr = IWICMetadataHandlerInfo_GetCLSID(info, &clsid); ok(hr == S_OK, "GetCLSID error %#x\n", hr); - ok(IsEqualGUID(&id, &CLSID_WICAPEMetadataReader), "wrong CLSID %s\n", debugstr_guid(&id)); + ok(IsEqualGUID(&clsid, &CLSID_WICAPEMetadataReader), "wrong CLSID %s\n", debugstr_guid(&clsid)); hr = IWICMetadataHandlerInfo_GetFriendlyName(info, 64, name, &dummy); ok(hr == S_OK, "GetFriendlyName error %#x\n", hr); @@ -1706,6 +1720,7 @@ static void test_metadata_GIF_comment(void) { { VT_LPSTR, 0, 12, { 0 }, "Hello World!", { 'T','e','x','t','E','n','t','r','y',0 } } }; + WCHAR text_entryW[] = { 'T','E','X','T','E','N','T','R','Y',0 }; HRESULT hr; IStream *stream; IWICPersistStream *persist; @@ -1714,7 +1729,8 @@ static void test_metadata_GIF_comment(void) WCHAR name[64]; UINT count, dummy; GUID format; - CLSID id; + CLSID clsid; + PROPVARIANT id, value; hr = CoCreateInstance(&CLSID_WICGifCommentMetadataReader, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void **)&reader); @@ -1746,12 +1762,22 @@ static void test_metadata_GIF_comment(void) ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr); ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), "wrong format %s\n", debugstr_guid(&format)); + PropVariantInit(&value); + id.vt = VT_LPWSTR; + U(id).pwszVal = text_entryW; + + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + ok(hr == S_OK, "GetValue error %#x\n", hr); + ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); + ok(!strcmp(U(value).pszVal, "Hello World!"), "unexpected value: %s\n", U(value).pszVal); + PropVariantClear(&value); + hr = IWICMetadataReader_GetMetadataHandlerInfo(reader, &info); ok(hr == S_OK, "GetMetadataHandlerInfo error %#x\n", hr); - hr = IWICMetadataHandlerInfo_GetCLSID(info, &id); + hr = IWICMetadataHandlerInfo_GetCLSID(info, &clsid); ok(hr == S_OK, "GetCLSID error %#x\n", hr); - ok(IsEqualGUID(&id, &CLSID_WICGifCommentMetadataReader), "wrong CLSID %s\n", debugstr_guid(&id)); + ok(IsEqualGUID(&clsid, &CLSID_WICGifCommentMetadataReader), "wrong CLSID %s\n", debugstr_guid(&clsid)); hr = IWICMetadataHandlerInfo_GetFriendlyName(info, 64, name, &dummy); ok(hr == S_OK, "GetFriendlyName error %#x\n", hr);

1 0

Christian Costa : dmusic: Rename params in DMUSIC_CreateSynthPortImpl.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 1481d11f66b960f97280247553cf91d05312e72a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1481d11f66b960f9728024755… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Sep 18 23:13:49 2012 +0200 dmusic: Rename params in DMUSIC_CreateSynthPortImpl. --- dlls/dmusic/port.c | 106 ++++++++++++++++++++++++++------------------------- 1 files changed, 54 insertions(+), 52 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index c5b17b7..ea5f6fd 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -472,63 +472,65 @@ static const IDirectMusicThruVtbl SynthPortImpl_DirectMusicThru_Vtbl = { SynthPortImpl_IDirectMusicThru_ThruChannel }; -HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps, DWORD device) +HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) { - SynthPortImpl *obj; - HRESULT hr = E_FAIL; - UINT j; + SynthPortImpl *obj; + HRESULT hr = E_FAIL; + UINT i; - TRACE("(%p,%p,%p,%d)\n", lpcGUID, ppobj, pUnkOuter, device); + TRACE("(%p,%p,%p,%p,%p%d)\n", guid, object, unkouter, port_params, port_caps, device); - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SynthPortImpl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - obj->IDirectMusicPort_iface.lpVtbl = &SynthPortImpl_DirectMusicPort_Vtbl; - obj->IDirectMusicPortDownload_iface.lpVtbl = &SynthPortImpl_DirectMusicPortDownload_Vtbl; - obj->IDirectMusicThru_iface.lpVtbl = &SynthPortImpl_DirectMusicThru_Vtbl; - obj->ref = 0; /* will be inited by QueryInterface */ - obj->fActive = FALSE; - obj->params = *pPortParams; - obj->caps = *pPortCaps; - obj->pDirectSound = NULL; - obj->pLatencyClock = NULL; - hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&obj->pLatencyClock, NULL); - if(hr != S_OK) - { - HeapFree(GetProcessHeap(), 0, obj); - return hr; - } + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SynthPortImpl)); + if (!obj) { + *object = NULL; + return E_OUTOFMEMORY; + } -if(0) -{ - if (pPortParams->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS) { - obj->nrofgroups = pPortParams->dwChannelGroups; - /* setting default priorities */ - for (j = 0; j < obj->nrofgroups; j++) { - TRACE ("Setting default channel priorities on channel group %i\n", j + 1); - obj->group[j].channel[0].priority = DAUD_CHAN1_DEF_VOICE_PRIORITY; - obj->group[j].channel[1].priority = DAUD_CHAN2_DEF_VOICE_PRIORITY; - obj->group[j].channel[2].priority = DAUD_CHAN3_DEF_VOICE_PRIORITY; - obj->group[j].channel[3].priority = DAUD_CHAN4_DEF_VOICE_PRIORITY; - obj->group[j].channel[4].priority = DAUD_CHAN5_DEF_VOICE_PRIORITY; - obj->group[j].channel[5].priority = DAUD_CHAN6_DEF_VOICE_PRIORITY; - obj->group[j].channel[6].priority = DAUD_CHAN7_DEF_VOICE_PRIORITY; - obj->group[j].channel[7].priority = DAUD_CHAN8_DEF_VOICE_PRIORITY; - obj->group[j].channel[8].priority = DAUD_CHAN9_DEF_VOICE_PRIORITY; - obj->group[j].channel[9].priority = DAUD_CHAN10_DEF_VOICE_PRIORITY; - obj->group[j].channel[10].priority = DAUD_CHAN11_DEF_VOICE_PRIORITY; - obj->group[j].channel[11].priority = DAUD_CHAN12_DEF_VOICE_PRIORITY; - obj->group[j].channel[12].priority = DAUD_CHAN13_DEF_VOICE_PRIORITY; - obj->group[j].channel[13].priority = DAUD_CHAN14_DEF_VOICE_PRIORITY; - obj->group[j].channel[14].priority = DAUD_CHAN15_DEF_VOICE_PRIORITY; - obj->group[j].channel[15].priority = DAUD_CHAN16_DEF_VOICE_PRIORITY; - } - } -} + obj->IDirectMusicPort_iface.lpVtbl = &SynthPortImpl_DirectMusicPort_Vtbl; + obj->IDirectMusicPortDownload_iface.lpVtbl = &SynthPortImpl_DirectMusicPortDownload_Vtbl; + obj->IDirectMusicThru_iface.lpVtbl = &SynthPortImpl_DirectMusicThru_Vtbl; + obj->ref = 0; /* Will be inited by QueryInterface */ + obj->fActive = FALSE; + obj->params = *port_params; + obj->caps = *port_caps; + obj->pDirectSound = NULL; + obj->pLatencyClock = NULL; + hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&obj->pLatencyClock, NULL); + if (hr != S_OK) + { + HeapFree(GetProcessHeap(), 0, obj); + *object = NULL; + return hr; + } + + if (0) + { + if (port_params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS) { + obj->nrofgroups = port_params->dwChannelGroups; + /* Setting default priorities */ + for (i = 0; i < obj->nrofgroups; i++) { + TRACE ("Setting default channel priorities on channel group %i\n", i + 1); + obj->group[i].channel[0].priority = DAUD_CHAN1_DEF_VOICE_PRIORITY; + obj->group[i].channel[1].priority = DAUD_CHAN2_DEF_VOICE_PRIORITY; + obj->group[i].channel[2].priority = DAUD_CHAN3_DEF_VOICE_PRIORITY; + obj->group[i].channel[3].priority = DAUD_CHAN4_DEF_VOICE_PRIORITY; + obj->group[i].channel[4].priority = DAUD_CHAN5_DEF_VOICE_PRIORITY; + obj->group[i].channel[5].priority = DAUD_CHAN6_DEF_VOICE_PRIORITY; + obj->group[i].channel[6].priority = DAUD_CHAN7_DEF_VOICE_PRIORITY; + obj->group[i].channel[7].priority = DAUD_CHAN8_DEF_VOICE_PRIORITY; + obj->group[i].channel[8].priority = DAUD_CHAN9_DEF_VOICE_PRIORITY; + obj->group[i].channel[9].priority = DAUD_CHAN10_DEF_VOICE_PRIORITY; + obj->group[i].channel[10].priority = DAUD_CHAN11_DEF_VOICE_PRIORITY; + obj->group[i].channel[11].priority = DAUD_CHAN12_DEF_VOICE_PRIORITY; + obj->group[i].channel[12].priority = DAUD_CHAN13_DEF_VOICE_PRIORITY; + obj->group[i].channel[13].priority = DAUD_CHAN14_DEF_VOICE_PRIORITY; + obj->group[i].channel[14].priority = DAUD_CHAN15_DEF_VOICE_PRIORITY; + obj->group[i].channel[15].priority = DAUD_CHAN16_DEF_VOICE_PRIORITY; + } + } + } - return IDirectMusicPort_QueryInterface((LPDIRECTMUSICPORT)obj, lpcGUID, ppobj); + return IDirectMusicPort_QueryInterface((LPDIRECTMUSICPORT)obj, guid, object); } HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device)

1 0

Christian Costa : dmusic: Rename IDirectMusicPortImpl object to SynthPortImpl.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 7844c1ca25a09527ad8b95d33f6babba1aee95f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7844c1ca25a09527ad8b95d33… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Sep 18 23:13:41 2012 +0200 dmusic: Rename IDirectMusicPortImpl object to SynthPortImpl. --- dlls/dmusic/dmusic_private.h | 11 +- dlls/dmusic/port.c | 240 +++++++++++++++++++++--------------------- 2 files changed, 125 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7844c1ca25a09527ad8b9…

1 0

Christian Costa : dmusic: Rename CreateSynthPortImpl to CreateSynthPortImpl and create stubs for CreateMidi{In|Out}PortImpl .
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 51eb9331cf2b3f2a1d852b509469bca36ea14430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51eb9331cf2b3f2a1d852b509… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Sep 18 23:13:32 2012 +0200 dmusic: Rename CreateSynthPortImpl to CreateSynthPortImpl and create stubs for CreateMidi{In|Out}PortImpl. Init constructors in system ports list accordingly. --- dlls/dmusic/dmusic.c | 8 ++++---- dlls/dmusic/dmusic_private.h | 4 +++- dlls/dmusic/port.c | 16 +++++++++++++++- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 36e9516..b4b35ec 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -352,7 +352,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) /* Fill midi mapper port info */ port->device = MIDI_MAPPER; - port->create = DMUSIC_CreateDirectMusicPortImpl; /* FIXME: The same for all ports for now */ + port->create = DMUSIC_CreateMidiOutPortImpl; midiOutGetDevCapsW(MIDI_MAPPER, &caps_out, sizeof(caps_out)); strcpyW(port->caps.wszDescription, caps_out.szPname); strcatW(port->caps.wszDescription, emulated); @@ -364,7 +364,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) for (i = 0; i < nb_midi_out; i++) { port->device = i; - port->create = DMUSIC_CreateDirectMusicPortImpl; /* FIXME: The same for all ports for now */ + port->create = DMUSIC_CreateMidiOutPortImpl; midiOutGetDevCapsW(i, &caps_out, sizeof(caps_out)); strcpyW(port->caps.wszDescription, caps_in.szPname); strcatW(port->caps.wszDescription, emulated); @@ -377,7 +377,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) for (i = 0; i < nb_midi_in; i++) { port->device = i; - port->create = DMUSIC_CreateDirectMusicPortImpl; /* FIXME: The same for all ports for now */ + port->create = DMUSIC_CreateMidiInPortImpl; midiInGetDevCapsW(i, &caps_in, sizeof(caps_in)); strcpyW(port->caps.wszDescription, caps_in.szPname); strcatW(port->caps.wszDescription, emulated); @@ -387,7 +387,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) } /* Fill synth port info */ - port->create = DMUSIC_CreateDirectMusicPortImpl; /* FIXME: The same for all ports for now */ + port->create = DMUSIC_CreateSynthPortImpl; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); if (SUCCEEDED(hr)) { diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index a1430ef..d8ff16e 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -169,7 +169,9 @@ struct IDirectMusicPortImpl { }; /** Internal factory */ -extern HRESULT DMUSIC_CreateDirectMusicPortImpl(LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps, DWORD device) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateMidiInPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN; /***************************************************************************** * IReferenceClockImpl implementation structure diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 0626518..917a4ec 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -472,7 +472,7 @@ static const IDirectMusicThruVtbl DirectMusicThru_Vtbl = { IDirectMusicThruImpl_ThruChannel }; -HRESULT DMUSIC_CreateDirectMusicPortImpl(LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps, DWORD device) +HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps, DWORD device) { IDirectMusicPortImpl *obj; HRESULT hr = E_FAIL; @@ -530,3 +530,17 @@ if(0) return IDirectMusicPortImpl_QueryInterface ((LPDIRECTMUSICPORT)obj, lpcGUID, ppobj); } + +HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) +{ + TRACE("(%p,%p,%p,%p,%p,%d): stub\n", guid, object, unkouter, port_params, port_caps, device); + + return E_NOTIMPL; +} + +HRESULT DMUSIC_CreateMidiInPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) +{ + TRACE("(%p,%p,%p,%p,%p,%d): stub\n", guid, object, unkouter, port_params, port_caps, device); + + return E_NOTIMPL; +}

1 0

Henri Verbeet : wined3d: Implement version checks for geometry shaders.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: fb989f1d1eb092f3273a206964f01376b93bc398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb989f1d1eb092f3273a20696… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 22:13:59 2012 +0200 wined3d: Implement version checks for geometry shaders. --- dlls/wined3d/arb_program_shader.c | 32 +++++++++++++++++--------------- dlls/wined3d/device.c | 11 ++++++----- dlls/wined3d/directx.c | 8 ++++---- dlls/wined3d/glsl_shader.c | 33 ++++++++++++++------------------- dlls/wined3d/shader.c | 20 ++++++++++++-------- dlls/wined3d/wined3d_private.h | 18 ++++++++++-------- 6 files changed, 63 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb989f1d1eb092f3273a2…

1 0

Henri Verbeet : wined3d: wined3d_device_get_sampler_state() never fails.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: 62670c7ba530ee894f8c1d8f58e3e5405d77b8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62670c7ba530ee894f8c1d8f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 22:13:58 2012 +0200 wined3d: wined3d_device_get_sampler_state() never fails. --- dlls/d3d8/device.c | 4 ++-- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 29 ++++++++--------------------- dlls/wined3d/device.c | 15 ++++++--------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 6 files changed, 21 insertions(+), 38 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2b7e7c0..5e21a38 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1785,7 +1785,7 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); const struct tss_lookup *l; - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, Type, value); @@ -1799,7 +1799,7 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, wined3d_mutex_lock(); if (l->sampler_state) - hr = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state, value); + *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state); else hr = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state, value); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ea90e1a..2662f4e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1794,15 +1794,14 @@ static HRESULT WINAPI d3d9_device_GetSamplerState(IDirect3DDevice9Ex *iface, DWORD sampler, D3DSAMPLERSTATETYPE state, DWORD *value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, sampler %u, state %#x, value %p.\n", iface, sampler, state, value); wined3d_mutex_lock(); - hr = wined3d_device_get_sampler_state(device->wined3d_device, sampler, state, value); + *value = wined3d_device_get_sampler_state(device->wined3d_device, sampler, state); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetSamplerState(IDirect3DDevice9Ex *iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 908efa3..20b2510 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2217,7 +2217,7 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, D3DRENDERSTATETYPE state, DWORD *value) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, state %#x, value %p.\n", iface, state, value); @@ -2231,8 +2231,7 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, { enum wined3d_texture_filter_type tex_mag; - hr = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER, &tex_mag); - + tex_mag = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER); switch (tex_mag) { case WINED3D_TEXF_POINT: @@ -2253,16 +2252,8 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, enum wined3d_texture_filter_type tex_min; enum wined3d_texture_filter_type tex_mip; - hr = wined3d_device_get_sampler_state(device->wined3d_device, - 0, WINED3D_SAMP_MIN_FILTER, &tex_min); - if (FAILED(hr)) - { - wined3d_mutex_unlock(); - return hr; - } - hr = wined3d_device_get_sampler_state(device->wined3d_device, - 0, WINED3D_SAMP_MIP_FILTER, &tex_mip); - + tex_min = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MIN_FILTER); + tex_mip = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MIP_FILTER); switch (tex_min) { case WINED3D_TEXF_POINT: @@ -2311,12 +2302,10 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, case D3DRENDERSTATE_TEXTUREADDRESS: case D3DRENDERSTATE_TEXTUREADDRESSU: - hr = wined3d_device_get_sampler_state(device->wined3d_device, - 0, WINED3D_SAMP_ADDRESS_U, value); + *value = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_ADDRESS_U); break; case D3DRENDERSTATE_TEXTUREADDRESSV: - hr = wined3d_device_get_sampler_state(device->wined3d_device, - 0, WINED3D_SAMP_ADDRESS_V, value); + *value = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_ADDRESS_V); break; case D3DRENDERSTATE_BORDERCOLOR: @@ -2332,7 +2321,6 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, case D3DRENDERSTATE_ZBIAS: *value = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS); - hr = D3D_OK; break; default: @@ -2344,7 +2332,6 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, break; } *value = wined3d_device_get_render_state(device->wined3d_device, state); - hr = D3D_OK; } wined3d_mutex_unlock(); @@ -4584,8 +4571,8 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD *value) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT hr; const struct tss_lookup *l; + HRESULT hr = D3D_OK; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); @@ -4605,7 +4592,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, if (l->sampler_state) { - hr = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state, value); + *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state); switch (state) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 596206c..69518b4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2363,11 +2363,11 @@ void CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, device_invalidate_state(device, STATE_SAMPLER(sampler_idx)); } -HRESULT CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device, - UINT sampler_idx, enum wined3d_sampler_state state, DWORD *value) +DWORD CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device, + UINT sampler_idx, enum wined3d_sampler_state state) { - TRACE("device %p, sampler_idx %u, state %s, value %p.\n", - device, sampler_idx, debug_d3dsamplerstate(state), value); + TRACE("device %p, sampler_idx %u, state %s.\n", + device, sampler_idx, debug_d3dsamplerstate(state)); if (sampler_idx >= WINED3DVERTEXTEXTURESAMPLER0 && sampler_idx <= WINED3DVERTEXTEXTURESAMPLER3) sampler_idx -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); @@ -2376,13 +2376,10 @@ HRESULT CDECL wined3d_device_get_sampler_state(const struct wined3d_device *devi / sizeof(*device->stateBlock->state.sampler_states)) { WARN("Invalid sampler %u.\n", sampler_idx); - return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */ + return 0; /* Windows accepts overflowing this array ... we do not. */ } - *value = device->stateBlock->state.sampler_states[sampler_idx][state]; - TRACE("Returning %#x.\n", *value); - - return WINED3D_OK; + return device->stateBlock->state.sampler_states[sampler_idx][state]; } HRESULT CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7aea714..c50dd29 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -77,7 +77,7 @@ @ cdecl wined3d_device_get_raster_status(ptr long ptr) @ cdecl wined3d_device_get_render_state(ptr long) @ cdecl wined3d_device_get_render_target(ptr long ptr) -@ cdecl wined3d_device_get_sampler_state(ptr long long ptr) +@ cdecl wined3d_device_get_sampler_state(ptr long long) @ cdecl wined3d_device_get_scissor_rect(ptr ptr) @ cdecl wined3d_device_get_software_vertex_processing(ptr) @ cdecl wined3d_device_get_stream_source(ptr long ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 57b6a1b..b44cc42 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2145,8 +2145,8 @@ HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *de DWORD __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state); HRESULT __cdecl wined3d_device_get_render_target(const struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface **render_target); -HRESULT __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, - UINT sampler_idx, enum wined3d_sampler_state state, DWORD *value); +DWORD __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, + UINT sampler_idx, enum wined3d_sampler_state state); HRESULT __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect); BOOL __cdecl wined3d_device_get_software_vertex_processing(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *device,

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
83
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 September 2012