December 2012 - Wine-commits

Jacek Caban : atl: Backport some tests from atl100.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 99065bb65fa41fc49a50452eae75aace5eb4c2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99065bb65fa41fc49a50452ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 26 13:50:11 2012 +0100 atl: Backport some tests from atl100. --- dlls/atl/tests/module.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index ffa62ad..45cff06 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -58,7 +58,63 @@ static void test_StructSize(void) HeapFree (GetProcessHeap(), 0, tst); } +static void test_winmodule(void) +{ + _AtlCreateWndData create_data[3]; + _ATL_MODULEW winmod; + void *p; + HRESULT hres; + + winmod.cbSize = sizeof(winmod); + winmod.m_pCreateWndList = (void*)0xdeadbeef; + winmod.m_csWindowCreate.LockCount = 0xdeadbeef; + hres = AtlModuleInit(&winmod, NULL, NULL); + ok(hres == S_OK, "AtlModuleInit failed: %08x\n", hres); + ok(!winmod.m_pCreateWndList, "winmod.m_pCreateWndList = %p\n", winmod.m_pCreateWndList); + ok(winmod.m_csWindowCreate.LockCount == -1, "winmod.m_csWindowCreate.LockCount = %d\n", + winmod.m_csWindowCreate.LockCount); + + AtlModuleAddCreateWndData(&winmod, create_data, (void*)0xdead0001); + ok(winmod.m_pCreateWndList == create_data, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[0].m_pThis == (void*)0xdead0001, "unexpected create_data[0].m_pThis %p\n", create_data[0].m_pThis); + ok(create_data[0].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[0].m_dwThreadID %x\n", + create_data[0].m_dwThreadID); + ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); + + AtlModuleAddCreateWndData(&winmod, create_data+1, (void*)0xdead0002); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[1].m_pThis == (void*)0xdead0002, "unexpected create_data[1].m_pThis %p\n", create_data[1].m_pThis); + ok(create_data[1].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[1].m_dwThreadID %x\n", + create_data[1].m_dwThreadID); + ok(create_data[1].m_pNext == create_data, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + + AtlModuleAddCreateWndData(&winmod, create_data+2, (void*)0xdead0003); + ok(winmod.m_pCreateWndList == create_data+2, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[2].m_pThis == (void*)0xdead0003, "unexpected create_data[2].m_pThis %p\n", create_data[2].m_pThis); + ok(create_data[2].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[2].m_dwThreadID %x\n", + create_data[2].m_dwThreadID); + ok(create_data[2].m_pNext == create_data+1, "unexpected create_data[2].m_pNext %p\n", create_data[2].m_pNext); + + p = AtlModuleExtractCreateWndData(&winmod); + ok(p == (void*)0xdead0003, "unexpected AtlModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[2].m_pNext == create_data+1, "unexpected create_data[2].m_pNext %p\n", create_data[2].m_pNext); + + create_data[1].m_dwThreadID = 0xdeadbeef; + + p = AtlModuleExtractCreateWndData(&winmod); + ok(p == (void*)0xdead0001, "unexpected AtlModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); + ok(!create_data[1].m_pNext, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + + p = AtlModuleExtractCreateWndData(&winmod); + ok(!p, "unexpected AtlModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); +} + START_TEST(module) { test_StructSize(); + test_winmodule(); }

1 0

Andrew Eikum : winmm: Rearrange device mapping when a new default device is chosen.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 4ab4bc5d095647ad1e4ca30c2749f0e3c337ad9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ab4bc5d095647ad1e4ca30c2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 26 08:40:03 2012 -0600 winmm: Rearrange device mapping when a new default device is chosen. --- dlls/winmm/waveform.c | 159 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 142 insertions(+), 17 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 18f3bb9..11ae66c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -278,6 +278,15 @@ static void WINMM_InitDevice(WINMM_Device *device, device->parent = parent; } +static inline WINMM_MMDevice *read_map(WINMM_MMDevice **map, UINT index) +{ + WINMM_MMDevice *ret; + EnterCriticalSection(&g_devthread_lock); + ret = map[index]; + LeaveCriticalSection(&g_devthread_lock); + return ret; +} + /* finds the first unused Device, marks it as "open", and returns * a pointer to the device * @@ -290,9 +299,9 @@ static WINMM_Device *WINMM_FindUnusedDevice(BOOL is_out, UINT mmdevice_index) UINT i; if(is_out) - mmdevice = g_out_map[mmdevice_index]; + mmdevice = read_map(g_out_map, mmdevice_index); else - mmdevice = g_in_map[mmdevice_index]; + mmdevice = read_map(g_in_map, mmdevice_index); EnterCriticalSection(&mmdevice->lock); for(i = 0; i < MAX_DEVICES; ++i){ @@ -629,6 +638,112 @@ static HRESULT WINMM_EnumDevices(WINMM_MMDevice **devices, return S_OK; } +static HRESULT WINAPI notif_QueryInterface(IMMNotificationClient *iface, + const GUID *riid, void **obj) +{ + ERR("Unexpected QueryInterface call: %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI notif_AddRef(IMMNotificationClient *iface) +{ + return 2; +} + +static ULONG WINAPI notif_Release(IMMNotificationClient *iface) +{ + return 1; +} + +static HRESULT WINAPI notif_OnDeviceStateChanged(IMMNotificationClient *iface, + const WCHAR *device_id, DWORD new_state) +{ + TRACE("Ignoring OnDeviceStateChanged callback\n"); + return S_OK; +} + +static HRESULT WINAPI notif_OnDeviceAdded(IMMNotificationClient *iface, + const WCHAR *device_id) +{ + TRACE("Ignoring OnDeviceAdded callback\n"); + return S_OK; +} + +static HRESULT WINAPI notif_OnDeviceRemoved(IMMNotificationClient *iface, + const WCHAR *device_id) +{ + TRACE("Ignoring OnDeviceRemoved callback\n"); + return S_OK; +} + +static HRESULT WINAPI notif_OnDefaultDeviceChanged(IMMNotificationClient *iface, + EDataFlow flow, ERole role, const WCHAR *device_id) +{ + WINMM_MMDevice ***map; + WINMM_MMDevice *prev; + UINT count, i; + + TRACE("%u %u %s\n", flow, role, wine_dbgstr_w(device_id)); + + if(role != eConsole) + return S_OK; + + EnterCriticalSection(&g_devthread_lock); + + if(flow == eRender){ + map = &g_out_map; + count = g_outmmdevices_count; + }else{ + map = &g_in_map; + count = g_inmmdevices_count; + } + + prev = (*map)[0]; + for(i = 0; i < count; ++i){ + WINMM_MMDevice *tmp; + + if(!lstrcmpW((*map)[i]->dev_id, device_id)){ + (*map)[0] = (*map)[i]; + (*map)[i] = prev; + + LeaveCriticalSection(&g_devthread_lock); + + return S_OK; + } + + tmp = (*map)[i]; + (*map)[i] = prev; + prev = tmp; + } + + WARN("Couldn't find new default device! Rearranged map for no reason.\n"); + (*map)[0] = prev; + + LeaveCriticalSection(&g_devthread_lock); + + return S_OK; +} + +static HRESULT WINAPI notif_OnPropertyValueChanged(IMMNotificationClient *iface, + const WCHAR *device_id, const PROPERTYKEY key) +{ + TRACE("Ignoring OnPropertyValueChanged callback\n"); + return S_OK; +} + +static IMMNotificationClientVtbl g_notif_vtbl = { + notif_QueryInterface, + notif_AddRef, + notif_Release, + notif_OnDeviceStateChanged, + notif_OnDeviceAdded, + notif_OnDeviceRemoved, + notif_OnDefaultDeviceChanged, + notif_OnPropertyValueChanged +}; + +static IMMNotificationClient g_notif = { &g_notif_vtbl }; + static HRESULT WINMM_InitMMDevices(void) { HRESULT hr, init_hr; @@ -644,6 +759,10 @@ static HRESULT WINMM_InitMMDevices(void) if(FAILED(hr)) goto exit; + hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(devenum, &g_notif); + if(FAILED(hr)) + WARN("RegisterEndpointNotificationCallback failed: %08x\n", hr); + hr = WINMM_EnumDevices(&g_out_mmdevices, &g_out_map, &g_outmmdevices_count, eRender, devenum); if(FAILED(hr)){ @@ -1087,7 +1206,7 @@ static LRESULT WOD_Open(WINMM_OpenInfo *info) if(info->req_device >= g_outmmdevices_count) return MMSYSERR_BADDEVICEID; - mmdevice = g_out_map[info->req_device]; + mmdevice = read_map(g_out_map, info->req_device); if(!mmdevice->out_caps.szPname[0]) return MMSYSERR_NOTENABLED; @@ -1160,7 +1279,7 @@ static LRESULT WID_Open(WINMM_OpenInfo *info) if(info->req_device >= g_inmmdevices_count) return MMSYSERR_BADDEVICEID; - mmdevice = g_in_map[info->req_device]; + mmdevice = read_map(g_in_map, info->req_device); if(!mmdevice->in_caps.szPname[0]) return MMSYSERR_NOTENABLED; @@ -1900,10 +2019,10 @@ static WINMM_MMDevice *WINMM_GetMixerMMDevice(HMIXEROBJ hmix, DWORD flags, case MIXER_OBJECTF_MIXER: /* == 0 */ *out = HandleToULong(hmix); if(*out < g_outmmdevices_count) - return g_out_map[*out]; + return read_map(g_out_map, *out); if(*out - g_outmmdevices_count < g_inmmdevices_count){ *out -= g_outmmdevices_count; - return g_in_map[*out]; + return read_map(g_in_map, *out); } /* fall through -- if it's not a valid mixer device, then * it could be a valid mixer handle. windows seems to do @@ -1916,17 +2035,17 @@ static WINMM_MMDevice *WINMM_GetMixerMMDevice(HMIXEROBJ hmix, DWORD flags, (!is_out && *out >= g_inmmdevices_count)) return NULL; if(is_out) - return g_out_map[*out]; - return g_in_map[*out]; + return read_map(g_out_map, *out); + return read_map(g_in_map, *out); case MIXER_OBJECTF_WAVEOUT: *out = HandleToULong(hmix); if(*out < g_outmmdevices_count) - return g_out_map[*out]; + return read_map(g_out_map, *out); return NULL; case MIXER_OBJECTF_WAVEIN: *out = HandleToULong(hmix); if(*out < g_inmmdevices_count) - return g_in_map[*out]; + return read_map(g_in_map, *out); return NULL; } @@ -2440,7 +2559,7 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps, if(uDeviceID >= g_outmmdevices_count) return MMSYSERR_BADDEVICEID; - caps = &g_out_map[uDeviceID]->out_caps; + caps = &read_map(g_out_map, uDeviceID)->out_caps; } memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps))); @@ -2939,7 +3058,9 @@ static UINT WINMM_QueryInstanceIDSize(UINT device, DWORD_PTR *len, BOOL is_out) if(device >= count) return MMSYSERR_INVALHANDLE; + EnterCriticalSection(&g_devthread_lock); *len = (lstrlenW(devices[device]->dev_id) + 1) * sizeof(WCHAR); + LeaveCriticalSection(&g_devthread_lock); return MMSYSERR_NOERROR; } @@ -2963,11 +3084,15 @@ static UINT WINMM_QueryInstanceID(UINT device, WCHAR *str, DWORD_PTR len, if(device >= count) return MMSYSERR_INVALHANDLE; + EnterCriticalSection(&g_devthread_lock); id_len = (lstrlenW(devices[device]->dev_id) + 1) * sizeof(WCHAR); - if(len < id_len) + if(len < id_len){ + LeaveCriticalSection(&g_devthread_lock); return MMSYSERR_ERROR; + } memcpy(str, devices[device]->dev_id, id_len); + LeaveCriticalSection(&g_devthread_lock); return MMSYSERR_NOERROR; } @@ -3082,7 +3207,7 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSi if(uDeviceID >= g_inmmdevices_count) return MMSYSERR_BADDEVICEID; - caps = &g_in_map[uDeviceID]->in_caps; + caps = &read_map(g_in_map, uDeviceID)->in_caps; } memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps))); @@ -3495,10 +3620,10 @@ UINT WINAPI mixerGetDevCapsW(UINT_PTR uDeviceID, LPMIXERCAPSW lpCaps, UINT uSize return MMSYSERR_BADDEVICEID; if(uDeviceID < g_outmmdevices_count){ - mmdevice = g_out_map[uDeviceID]; + mmdevice = read_map(g_out_map, uDeviceID); memcpy(caps.szPname, mmdevice->out_caps.szPname, sizeof(caps.szPname)); }else{ - mmdevice = g_in_map[uDeviceID - g_outmmdevices_count]; + mmdevice = read_map(g_in_map, uDeviceID - g_outmmdevices_count); memcpy(caps.szPname, mmdevice->in_caps.szPname, sizeof(caps.szPname)); } @@ -3541,11 +3666,11 @@ UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, return MMSYSERR_BADDEVICEID; if(uDeviceID < g_outmmdevices_count){ - mmdevice = g_out_map[uDeviceID]; + mmdevice = read_map(g_out_map, uDeviceID); *lphMix = (HMIXER)WINMM_MakeHWAVE(uDeviceID, TRUE, mmdevice->mixer_count); }else{ - mmdevice = g_in_map[uDeviceID - g_outmmdevices_count]; + mmdevice = read_map(g_in_map, uDeviceID - g_outmmdevices_count); *lphMix = (HMIXER)WINMM_MakeHWAVE(uDeviceID - g_outmmdevices_count, FALSE, mmdevice->mixer_count); }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.20
by Jeremy Newman 26 Dec '12

26 Dec '12

Module: website Branch: master Commit: 61741b0688f7eb7394b04f674de2be105a2a570f URL: http://source.winehq.org/git/website.git/?a=commit;h=61741b0688f7eb7394b04f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Dec 21 20:37:45 2012 +0100 Polish translation for release 1.5.20 --- news/pl/2012122101.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2012122101.xml b/news/pl/2012122101.xml new file mode 100644 index 0000000..9c0af0a --- /dev/null +++ b/news/pl/2012122101.xml @@ -0,0 +1,17 @@ +<news> +<date>Grudzień 21, 2012</date> +<title>Wydano Wine 1.5.20</title> +<body> + Wydanie rozwojowe Wine 1.5.20 jest już dostępne. + <a href="{$root}/announce/1.5.20">Co nowego</a> w tym wydaniu: +<ul> + <li>Kilka bibliotek dll o dziwnych nazwach do wsparcia zestawów API.</li> + <li>Zaimplementowano więcej funkcji ATL.</li> + <li>Nadal więcej funkcji C++ z biblioteki uruchomieniowej.</li> + <li>Kilka poprawek przy wyświetlaniu tekstu.</li> + <li>Ulepszenia w sterowniku PostScript.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.20.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Wine 1.5.20 freigegeben
by Jeremy Newman 26 Dec '12

26 Dec '12

Module: website Branch: master Commit: d17a36e1e3c5d89822ac65747a7000bd975f988d URL: http://source.winehq.org/git/website.git/?a=commit;h=d17a36e1e3c5d89822ac65… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 21 20:46:38 2012 +0100 Wine 1.5.20 freigegeben --- news/de/2012122101.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012122101.xml b/news/de/2012122101.xml new file mode 100644 index 0000000..3af627f --- /dev/null +++ b/news/de/2012122101.xml @@ -0,0 +1,17 @@ +<news> +<date>21. Dezember 2012</date> +<title>Wine 1.5.20 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.20 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.20">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Ein haufen DLLs mit hässlichen Namen für die API Set Unterstützung.</li> + <li>Mehr implementierete ATL Funktionen.</li> + <li>Schonwieder mehr C++ Runtime Funktionen.</li> + <li>Mehere Text Render Fehlerbehebungen.</li> + <li>PostScript Treiber Verbesserungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.20.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.20
by Jeremy Newman 26 Dec '12

26 Dec '12

Module: website Branch: master Commit: 8760dcb9fbae9f94df3cc10bc83535609b427629 URL: http://source.winehq.org/git/website.git/?a=commit;h=8760dcb9fbae9f94df3cc1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Dec 21 21:38:40 2012 +0100 French translation for release 1.5.20 --- news/fr/2012122101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2012122101.xml b/news/fr/2012122101.xml new file mode 100644 index 0000000..f5fb12e --- /dev/null +++ b/news/fr/2012122101.xml @@ -0,0 +1,16 @@ +<news> +<date>21 décembre 2012</date> +<title>Sortie de Wine 1.5.20</title> +<body> + La version de développement 1.5.20 de Wine est disponible. + <a href="{$root}/announce/1.5.20">Nouveautés</a> de cette version : +<ul> + <li>Quelques DLL avec des noms abominables pour la prise en charge des jeux d'API.</li> + <li>Fonctions ATL additionnelles implémentées.</li> + <li>Toujours plus de fonctions dans le moteur d'exécution C++.</li> + <li>Plusieurs correctifs dans le rendu de texte.</li> + <li>Améliorations dans le pilote PostScript.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.20.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Nikolay Sivov : msxml3: Remove separate structures for test interfaces.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: a701528fec36eca608f2fa31f9f014d441f6f69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a701528fec36eca608f2fa31f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 23 18:05:37 2012 +0400 msxml3: Remove separate structures for test interfaces. --- dlls/msxml3/tests/httpreq.c | 122 ++++++++++++++++++------------------------- 1 files changed, 50 insertions(+), 72 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index ef76088..6744657 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -145,59 +145,6 @@ static BSTR a2bstr(const char *str) return ret; } -typedef struct -{ - IServiceProvider IServiceProvider_iface; -} testprov_t; - -testprov_t testprov; - -static HRESULT WINAPI site_QueryInterface(IUnknown *iface, REFIID riid, void **ppvObject) -{ - *ppvObject = NULL; - - if (IsEqualGUID(riid, &IID_IServiceProvider)) - CHECK_EXPECT2(site_qi_IServiceProvider); - - if (IsEqualGUID(riid, &IID_IXMLDOMDocument)) - CHECK_EXPECT2(site_qi_IXMLDOMDocument); - - if (IsEqualGUID(riid, &IID_IOleClientSite)) - CHECK_EXPECT2(site_qi_IOleClientSite); - - if (IsEqualGUID(riid, &IID_IUnknown)) - *ppvObject = iface; - else if (IsEqualGUID(riid, &IID_IServiceProvider)) - *ppvObject = &testprov.IServiceProvider_iface; - - if (*ppvObject) IUnknown_AddRef(iface); - - return *ppvObject ? S_OK : E_NOINTERFACE; -} - -static ULONG WINAPI site_AddRef(IUnknown *iface) -{ - return 2; -} - -static ULONG WINAPI site_Release(IUnknown *iface) -{ - return 1; -} - -static const IUnknownVtbl testsiteVtbl = -{ - site_QueryInterface, - site_AddRef, - site_Release -}; - -typedef struct -{ - IUnknown IUnknown_iface; -} testsite_t; - -static testsite_t testsite = { { &testsiteVtbl } }; /* test IHTMLElementCollection */ static HRESULT WINAPI htmlecoll_QueryInterface(IHTMLElementCollection *iface, REFIID riid, void **ppvObject) @@ -290,7 +237,6 @@ static const IHTMLElementCollectionVtbl TestHTMLECollectionVtbl = { htmlecoll_GetTypeInfo, htmlecoll_GetIDsOfNames, htmlecoll_Invoke, - htmlecoll_toString, htmlecoll_put_length, htmlecoll_get_length, @@ -299,12 +245,7 @@ static const IHTMLElementCollectionVtbl TestHTMLECollectionVtbl = { htmlecoll_tags }; -typedef struct -{ - IHTMLElementCollection IHTMLElementCollection_iface; -} testhtmlecoll_t; - -static testhtmlecoll_t htmlecoll = { { &TestHTMLECollectionVtbl } }; +static IHTMLElementCollection htmlecoll = { &TestHTMLECollectionVtbl }; /* test IHTMLDocument2 */ static HRESULT WINAPI htmldoc2_QueryInterface(IHTMLDocument2 *iface, REFIID riid, void **ppvObject) @@ -362,7 +303,7 @@ static HRESULT WINAPI htmldoc2_get_Script(IHTMLDocument2 *iface, IDispatch **p) static HRESULT WINAPI htmldoc2_get_all(IHTMLDocument2 *iface, IHTMLElementCollection **p) { CHECK_EXPECT2(htmldoc2_get_all); - *p = &htmlecoll.IHTMLElementCollection_iface; + *p = &htmlecoll; return S_OK; } @@ -1141,12 +1082,7 @@ static const IHTMLDocument2Vtbl TestHTMLDocumentVtbl = { htmldoc2_createStyleSheet }; -typedef struct -{ - IHTMLDocument2 IHTMLDocument2_iface; -} testhtmldoc2_t; - -static testhtmldoc2_t htmldoc2 = { { &TestHTMLDocumentVtbl } }; +static IHTMLDocument2 htmldoc2 = { &TestHTMLDocumentVtbl }; static HRESULT WINAPI sp_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppvObject) { @@ -1193,7 +1129,7 @@ static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service, IsEqualGUID(riid, &IID_IHTMLDocument2)) { CHECK_EXPECT2(sp_queryservice_SID_secmgr_htmldoc2); - *obj = &htmldoc2.IHTMLDocument2_iface; + *obj = &htmldoc2; return S_OK; } else if (IsEqualGUID(service, &SID_SInternetHostSecurityManager) && @@ -1225,7 +1161,49 @@ static const IServiceProviderVtbl testprovVtbl = sp_QueryService }; -testprov_t testprov = { { &testprovVtbl } }; +static IServiceProvider testprov = { &testprovVtbl }; + +static HRESULT WINAPI site_QueryInterface(IUnknown *iface, REFIID riid, void **ppvObject) +{ + *ppvObject = NULL; + + if (IsEqualGUID(riid, &IID_IServiceProvider)) + CHECK_EXPECT2(site_qi_IServiceProvider); + + if (IsEqualGUID(riid, &IID_IXMLDOMDocument)) + CHECK_EXPECT2(site_qi_IXMLDOMDocument); + + if (IsEqualGUID(riid, &IID_IOleClientSite)) + CHECK_EXPECT2(site_qi_IOleClientSite); + + if (IsEqualGUID(riid, &IID_IUnknown)) + *ppvObject = iface; + else if (IsEqualGUID(riid, &IID_IServiceProvider)) + *ppvObject = &testprov; + + if (*ppvObject) IUnknown_AddRef(iface); + + return *ppvObject ? S_OK : E_NOINTERFACE; +} + +static ULONG WINAPI site_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI site_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl testsiteVtbl = +{ + site_QueryInterface, + site_AddRef, + site_Release +}; + +static IUnknown testsite = { &testsiteVtbl }; typedef struct { @@ -1402,7 +1380,7 @@ static void set_xhr_site(IXMLHttpRequest *xhr) SET_EXPECT(site_qi_IXMLDOMDocument); SET_EXPECT(site_qi_IOleClientSite); - hr = IObjectWithSite_SetSite(obj_site, &testsite.IUnknown_iface); + hr = IObjectWithSite_SetSite(obj_site, &testsite); EXPECT_HR(hr, S_OK); CHECK_CALLED(site_qi_IServiceProvider); @@ -1745,7 +1723,7 @@ todo_wine { SET_EXPECT(site_qi_IServiceProvider); SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); - hr = IObjectWithSite_SetSite(obj_site2, &testsite.IUnknown_iface); + hr = IObjectWithSite_SetSite(obj_site2, &testsite); EXPECT_HR(hr, S_OK); todo_wine EXPECT_REF(xhr, 1); @@ -1757,7 +1735,7 @@ todo_wine { SET_EXPECT(site_qi_IServiceProvider); SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); - hr = IObjectWithSite_SetSite(obj_site2, &testsite.IUnknown_iface); + hr = IObjectWithSite_SetSite(obj_site2, &testsite); EXPECT_HR(hr, S_OK); IObjectWithSite_Release(obj_site2);

1 0

Nikolay Sivov : msxml3: Make callback data available for ready state event handler.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: f445da0afa493dfaa2d6b79250c956995fd5ce64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f445da0afa493dfaa2d6b7925… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 23 17:12:19 2012 +0400 msxml3: Make callback data available for ready state event handler. --- dlls/msxml3/httprequest.c | 21 ++++++++++++++++----- dlls/msxml3/tests/httpreq.c | 22 +++++++++++++++++++++- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index d8ab1b9..f9db1cd 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -141,9 +141,17 @@ static inline serverhttp *impl_from_IServerXMLHTTPRequest(IServerXMLHTTPRequest static void httprequest_setreadystate(httprequest *This, READYSTATE state) { READYSTATE last = This->state; + static const char* readystates[] = { + "READYSTATE_UNINITIALIZED", + "READYSTATE_LOADING", + "READYSTATE_LOADED", + "READYSTATE_INTERACTIVE", + "READYSTATE_COMPLETE"}; This->state = state; + TRACE("state %s\n", readystates[state]); + if (This->sink && last != state) { DISPPARAMS params; @@ -206,6 +214,7 @@ static void BindStatusCallback_Detach(BindStatusCallback *bsc) if (bsc) { if (bsc->binding) IBinding_Abort(bsc->binding); + bsc->request->bsc = NULL; bsc->request = NULL; IBindStatusCallback_Release(&bsc->IBindStatusCallback_iface); } @@ -340,7 +349,11 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac } if (hr == S_OK) + { + BindStatusCallback_Detach(This->request->bsc); + This->request->bsc = This; httprequest_setreadystate(This->request, READYSTATE_COMPLETE); + } return S_OK; } @@ -984,10 +997,9 @@ static HRESULT httprequest_send(httprequest *This, VARIANT body) if (This->state != READYSTATE_LOADING) return E_FAIL; hr = BindStatusCallback_create(This, &bsc, &body); - if (FAILED(hr)) return hr; - - BindStatusCallback_Detach(This->bsc); - This->bsc = bsc; + if (FAILED(hr)) + /* success path to detach it is OnStopBinding call */ + BindStatusCallback_Detach(bsc); return hr; } @@ -995,7 +1007,6 @@ static HRESULT httprequest_send(httprequest *This, VARIANT body) static HRESULT httprequest_abort(httprequest *This) { BindStatusCallback_Detach(This->bsc); - This->bsc = NULL; httprequest_setreadystate(This, READYSTATE_UNINITIALIZED); diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index e3a1a91..ef76088 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1233,6 +1233,8 @@ typedef struct LONG ref; } dispevent; +static IXMLHttpRequest *httpreq; + static inline dispevent *impl_from_IDispatch( IDispatch *iface ) { return CONTAINING_RECORD(iface, dispevent, IDispatch_iface); @@ -1297,6 +1299,9 @@ static HRESULT WINAPI dispevent_Invoke(IDispatch *iface, DISPID member, REFIID r LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepInfo, UINT *argErr) { + LONG state; + HRESULT hr; + ok(member == 0, "expected 0 member, got %d\n", member); ok(lcid == LOCALE_SYSTEM_DEFAULT, "expected LOCALE_SYSTEM_DEFAULT, got lcid %x\n", lcid); ok(flags == DISPATCH_METHOD, "expected DISPATCH_METHOD, got %d\n", flags); @@ -1311,6 +1316,20 @@ static HRESULT WINAPI dispevent_Invoke(IDispatch *iface, DISPID member, REFIID r ok(argErr == NULL, "got %p\n", argErr); g_expectedcall++; + + state = READYSTATE_UNINITIALIZED; + hr = IXMLHttpRequest_get_readyState(httpreq, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (state == READYSTATE_COMPLETE) + { + BSTR text = NULL; + + hr = IXMLHttpRequest_get_responseText(httpreq, &text); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*text != 0, "got %s\n", wine_dbgstr_w(text)); + SysFreeString(text); + } + return E_FAIL; } @@ -1332,7 +1351,7 @@ static IDispatch* create_dispevent(void) event->IDispatch_iface.lpVtbl = &dispeventVtbl; event->ref = 1; - return (IDispatch*)&event->IDispatch_iface; + return &event->IDispatch_iface; } static IXMLHttpRequest *create_xhr(void) @@ -1507,6 +1526,7 @@ static void test_XMLHTTP(void) EXPECT_HR(hr, S_OK); ok(state == READYSTATE_UNINITIALIZED, "got %d, expected READYSTATE_UNINITIALIZED\n", state); + httpreq = xhr; event = create_dispevent(); EXPECT_REF(event, 1);

1 0

Christian Costa : dmusic: Move IDirectMusicDownloadedInstrument to port. c since it is port dependant and perform COM cleanup.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: 494fbc69cad43fe799efe18092859010d9aee698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=494fbc69cad43fe799efe1809… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Dec 24 09:46:10 2012 +0100 dmusic: Move IDirectMusicDownloadedInstrument to port.c since it is port dependant and perform COM cleanup. --- dlls/dmusic/Makefile.in | 1 - dlls/dmusic/dmusic_private.h | 9 ++-- dlls/dmusic/downloadedinstrument.c | 88 ------------------------------------ dlls/dmusic/port.c | 78 +++++++++++++++++++++++++++++++- 4 files changed, 81 insertions(+), 95 deletions(-) diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index 7522194..46aed59 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -8,7 +8,6 @@ C_SRCS = \ dmusic.c \ dmusic_main.c \ download.c \ - downloadedinstrument.c \ instrument.c \ port.c diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 3e5c6c2..1872177 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -95,7 +95,6 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LP /* Internal */ extern HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) DECLSPEC_HIDDEN; -extern HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; @@ -136,11 +135,11 @@ struct IDirectMusicBufferImpl { * IDirectMusicDownloadedInstrumentImpl implementation structure */ struct IDirectMusicDownloadedInstrumentImpl { - /* IUnknown fields */ - const IDirectMusicDownloadedInstrumentVtbl *lpVtbl; - LONG ref; + /* IUnknown fields */ + IDirectMusicDownloadedInstrument IDirectMusicDownloadedInstrument_iface; + LONG ref; - /* IDirectMusicDownloadedInstrumentImpl fields */ + /* IDirectMusicDownloadedInstrumentImpl fields */ }; /***************************************************************************** diff --git a/dlls/dmusic/downloadedinstrument.c b/dlls/dmusic/downloadedinstrument.c deleted file mode 100644 index b64d8ac..0000000 --- a/dlls/dmusic/downloadedinstrument.c +++ /dev/null @@ -1,88 +0,0 @@ -/* IDirectMusicDownloadedInstrument Implementation - * - * Copyright (C) 2003-2004 Rok Mandeljc - * - * This program 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 program 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 program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "dmusic_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); - -/* IDirectMusicDownloadedInstrumentImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface, REFIID riid, LPVOID *ppobj) { - IDirectMusicDownloadedInstrumentImpl *This = (IDirectMusicDownloadedInstrumentImpl *)iface; - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown) - || IsEqualIID (riid, &IID_IDirectMusicDownloadedInstrument) - || IsEqualIID (riid, &IID_IDirectMusicDownloadedInstrument8)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) { - IDirectMusicDownloadedInstrumentImpl *This = (IDirectMusicDownloadedInstrumentImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); - - DMUSIC_LockModule(); - - return refCount; -} - -static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) { - IDirectMusicDownloadedInstrumentImpl *This = (IDirectMusicDownloadedInstrumentImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); - - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMUSIC_UnlockModule(); - - return refCount; -} - -/* IDirectMusicDownloadedInstrumentImpl IDirectMusicDownloadedInstrument part: */ -/* none at this time */ - -static const IDirectMusicDownloadedInstrumentVtbl DirectMusicDownloadedInstrument_Vtbl = { - IDirectMusicDownloadedInstrumentImpl_QueryInterface, - IDirectMusicDownloadedInstrumentImpl_AddRef, - IDirectMusicDownloadedInstrumentImpl_Release -}; - -/* for ClassFactory */ -HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { - IDirectMusicDownloadedInstrumentImpl* dmdlinst; - - dmdlinst = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadedInstrumentImpl)); - if (NULL == dmdlinst) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - dmdlinst->lpVtbl = &DirectMusicDownloadedInstrument_Vtbl; - dmdlinst->ref = 0; /* will be inited by QueryInterface */ - - return IDirectMusicDownloadedInstrumentImpl_QueryInterface ((LPDIRECTMUSICDOWNLOADEDINSTRUMENT)dmdlinst, lpcGUID, ppobj); -} diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index b6489a7..eb139ca 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -23,6 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); +static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicDownloadedInstrumentImpl, IDirectMusicDownloadedInstrument_iface); +} + static inline SynthPortImpl *impl_from_SynthPortImpl_IDirectMusicPort(IDirectMusicPort *iface) { return CONTAINING_RECORD(iface, SynthPortImpl, IDirectMusicPort_iface); @@ -38,6 +43,77 @@ static inline SynthPortImpl *impl_from_SynthPortImpl_IDirectMusicThru(IDirectMus return CONTAINING_RECORD(iface, SynthPortImpl, IDirectMusicThru_iface); } +/* IDirectMusicDownloadedInstrument IUnknown part follows: */ +static HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface(IDirectMusicDownloadedInstrument *iface, REFIID riid, VOID **ret_iface) +{ + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument) || + IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument8)) + { + IDirectMusicDownloadedInstrument_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + WARN("(%p, %s, %p): not found\n", iface, debugstr_dmguid(riid), ret_iface); + + return E_NOINTERFACE; +} + +static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef(LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) +{ + IDirectMusicDownloadedInstrumentImpl *This = impl_from_IDirectMusicDownloadedInstrument(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + DMUSIC_LockModule(); + + return ref; +} + +static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release(LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) +{ + IDirectMusicDownloadedInstrumentImpl *This = impl_from_IDirectMusicDownloadedInstrument(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + DMUSIC_UnlockModule(); + + return ref; +} + +static const IDirectMusicDownloadedInstrumentVtbl DirectMusicDownloadedInstrument_Vtbl = { + IDirectMusicDownloadedInstrumentImpl_QueryInterface, + IDirectMusicDownloadedInstrumentImpl_AddRef, + IDirectMusicDownloadedInstrumentImpl_Release +}; + +HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDownloadedInstrument **instrument) +{ + IDirectMusicDownloadedInstrumentImpl *object; + + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + if (!object) + { + *instrument = NULL; + return E_OUTOFMEMORY; + } + + object->IDirectMusicDownloadedInstrument_iface.lpVtbl = &DirectMusicDownloadedInstrument_Vtbl; + object->ref = 1; + + *instrument = &object->IDirectMusicDownloadedInstrument_iface; + + return S_OK; +} + /* SynthPortImpl IDirectMusicPort IUnknown part follows: */ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSICPORT iface, REFIID riid, LPVOID *ret_iface) { @@ -157,7 +233,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECT if (!instrument || !downloaded_instrument || (num_note_ranges && !note_ranges)) return E_POINTER; - return DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(&IID_IDirectMusicDownloadedInstrument, (LPVOID*)downloaded_instrument, NULL); + return DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(downloaded_instrument); } static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_UnloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicDownloadedInstrument *downloaded_instrument)

1 0

Christian Costa : dmusic: Implement SynthPortImpl_IDirectMusicPort_DownloadInstrument.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: c6694e6dec9c9010d10ed7fe37526218b3a99302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6694e6dec9c9010d10ed7fe3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Dec 24 09:46:18 2012 +0100 dmusic: Implement SynthPortImpl_IDirectMusicPort_DownloadInstrument. --- dlls/dmusic/dmusic_private.h | 2 + dlls/dmusic/port.c | 108 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 105 insertions(+), 5 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 1872177..286b48b 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -140,6 +140,8 @@ struct IDirectMusicDownloadedInstrumentImpl { LONG ref; /* IDirectMusicDownloadedInstrumentImpl fields */ + BOOL downloaded; + void *data; }; /***************************************************************************** diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index eb139ca..55d0dad 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include "dmusic_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); @@ -82,7 +83,10 @@ static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release(LPDIRECTMUSICDO TRACE("(%p)->(): new ref = %u\n", iface, ref); if (!ref) + { + HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); + } DMUSIC_UnlockModule(); @@ -95,11 +99,20 @@ static const IDirectMusicDownloadedInstrumentVtbl DirectMusicDownloadedInstrumen IDirectMusicDownloadedInstrumentImpl_Release }; +static inline IDirectMusicDownloadedInstrumentImpl* unsafe_impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &DirectMusicDownloadedInstrument_Vtbl); + + return impl_from_IDirectMusicDownloadedInstrument(iface); +} + HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDownloadedInstrument **instrument) { IDirectMusicDownloadedInstrumentImpl *object; - object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { *instrument = NULL; @@ -227,20 +240,105 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Read(LPDIRECTMUSICPORT ifac static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicInstrument* instrument, IDirectMusicDownloadedInstrument** downloaded_instrument, DMUS_NOTERANGE* note_ranges, DWORD num_note_ranges) { SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); - - FIXME("(%p/%p)->(%p, %p, %p, %d): stub\n", iface, This, instrument, downloaded_instrument, note_ranges, num_note_ranges); + IDirectMusicInstrumentImpl *instrument_object; + HRESULT ret; + BOOL free; + HANDLE download; + DMUS_DOWNLOADINFO *info; + DMUS_OFFSETTABLE *offset_table; + DMUS_INSTRUMENT *instrument_info; + BYTE *data; + ULONG offset; + ULONG nb_regions; + ULONG size; + int i; + + TRACE("(%p/%p)->(%p, %p, %p, %d)\n", iface, This, instrument, downloaded_instrument, note_ranges, num_note_ranges); if (!instrument || !downloaded_instrument || (num_note_ranges && !note_ranges)) return E_POINTER; - return DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(downloaded_instrument); + instrument_object = impl_from_IDirectMusicInstrument(instrument); + + nb_regions = instrument_object->header.cRegions; + size = sizeof(DMUS_DOWNLOADINFO) + sizeof(ULONG) * (1 + nb_regions) + sizeof(DMUS_INSTRUMENT) + sizeof(DMUS_REGION) * nb_regions; + + data = (BYTE*)HeapAlloc(GetProcessHeap(), 0, size); + if (!data) + return E_OUTOFMEMORY; + + info = (DMUS_DOWNLOADINFO*)data; + offset_table = (DMUS_OFFSETTABLE*)(data + sizeof(DMUS_DOWNLOADINFO)); + offset = sizeof(DMUS_DOWNLOADINFO) + sizeof(ULONG) * (1 + nb_regions); + + info->dwDLType = DMUS_DOWNLOADINFO_INSTRUMENT2; + info->dwDLId = 0; + info->dwNumOffsetTableEntries = 1 + instrument_object->header.cRegions; + info->cbSize = size; + + offset_table->ulOffsetTable[0] = offset; + instrument_info = (DMUS_INSTRUMENT*)(data + offset); + offset += sizeof(DMUS_INSTRUMENT); + instrument_info->ulPatch = MIDILOCALE2Patch(&instrument_object->header.Locale); + instrument_info->ulFirstRegionIdx = 1; + instrument_info->ulGlobalArtIdx = 0; /* FIXME */ + instrument_info->ulFirstExtCkIdx = 0; /* FIXME */ + instrument_info->ulCopyrightIdx = 0; /* FIXME */ + instrument_info->ulFlags = 0; /* FIXME */ + + for (i = 0; i < nb_regions; i++) + { + DMUS_REGION *region = (DMUS_REGION*)(data + offset); + + offset_table->ulOffsetTable[1 + i] = offset; + offset += sizeof(DMUS_REGION); + region->RangeKey = instrument_object->regions[i].header.RangeKey; + region->RangeVelocity = instrument_object->regions[i].header.RangeVelocity; + region->fusOptions = instrument_object->regions[i].header.fusOptions; + region->usKeyGroup = instrument_object->regions[i].header.usKeyGroup; + region->ulRegionArtIdx = 0; /* FIXME */ + region->ulNextRegionIdx = i != (nb_regions - 1) ? (i + 2) : 0; + region->ulFirstExtCkIdx = 0; /* FIXME */ + region->WaveLink = instrument_object->regions[i].wave_link; + region->WSMP = instrument_object->regions[i].wave_sample; + region->WLOOP[0] = instrument_object->regions[i].wave_loop; + } + + ret = IDirectMusicSynth8_Download(This->synth, &download, (VOID*)data, &free); + + if (SUCCEEDED(ret)) + ret = DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(downloaded_instrument); + + if (SUCCEEDED(ret)) + { + IDirectMusicDownloadedInstrumentImpl *downloaded_object = impl_from_IDirectMusicDownloadedInstrument(*downloaded_instrument); + + downloaded_object->data = data; + downloaded_object->downloaded = TRUE; + } + + *downloaded_instrument = NULL; + HeapFree(GetProcessHeap(), 0, data); + + return E_FAIL; } static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_UnloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicDownloadedInstrument *downloaded_instrument) { SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + IDirectMusicDownloadedInstrumentImpl *downloaded_object = unsafe_impl_from_IDirectMusicDownloadedInstrument(downloaded_instrument); + + TRACE("(%p/%p)->(%p)\n", iface, This, downloaded_instrument); + + if (!downloaded_instrument) + return E_POINTER; + + if (!downloaded_object->downloaded) + return DMUS_E_NOT_DOWNLOADED_TO_PORT; - FIXME("(%p/%p)->(%p): stub\n", iface, This, downloaded_instrument); + HeapFree(GetProcessHeap(), 0, downloaded_object->data); + downloaded_object->data = NULL; + downloaded_object->downloaded = FALSE; return S_OK; }

1 0

Christian Costa : dmsynth: Dump data passed to Download method.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: 6ebf7a37feba12ad5a97671b8b0c0de93ab173cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ebf7a37feba12ad5a97671b8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Dec 24 09:46:45 2012 +0100 dmsynth: Dump data passed to Download method. --- dlls/dmsynth/synth.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 3ca5c53..4392230 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -126,10 +126,15 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups(LPDIRECTMUSICSY static HRESULT WINAPI IDirectMusicSynth8Impl_Download(LPDIRECTMUSICSYNTH8 iface, LPHANDLE hDownload, LPVOID data, LPBOOL free) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - DMUS_DOWNLOADINFO* info = (DMUS_DOWNLOADINFO*)data; + LPBYTE buffer = (LPBYTE)data; + DMUS_DOWNLOADINFO *info = (DMUS_DOWNLOADINFO*)buffer; + ULONG *offsets = ((DMUS_OFFSETTABLE*)(buffer + sizeof(DMUS_DOWNLOADINFO)))->ulOffsetTable; + LPBYTE object = buffer + sizeof(DMUS_DOWNLOADINFO) + info->dwNumOffsetTableEntries * sizeof(ULONG); FIXME("(%p)->(%p, %p, %p): stub\n", This, hDownload, data, free); + /* FIXME: Currently we only dump data which is very useful to known how native dmusic behave and debug builtin dmusic */ + if (!hDownload || !data || !free) return E_POINTER; @@ -142,17 +147,94 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(LPDIRECTMUSICSYNTH8 iface, TRACE(" - cbSize = %u\n", info->cbSize); } + /* The struct should have at least one offset corresponding to the donwload object itself */ + if (!info->dwNumOffsetTableEntries) + { + FIXME("Offset table is empty\n"); + return DMUS_E_BADOFFSETTABLE; + } + + /* First offset should point to the download object */ + if ((buffer + offsets[0]) != object) + { + FIXME("Object is not at the beginning\n"); + return DMUS_E_BADOFFSETTABLE; + } + if (info->dwDLType == DMUS_DOWNLOADINFO_INSTRUMENT) { FIXME("Download type DMUS_DOWNLOADINFO_INSTRUMENT not yet supported\n"); } else if (info->dwDLType == DMUS_DOWNLOADINFO_WAVE) { - FIXME("Download type DMUS_DOWNLOADINFO_WAVE not yet supported\n"); + DMUS_WAVE *wave = (DMUS_WAVE*)object; + DMUS_WAVEDATA *wave_data; + + TRACE("Processing download type DMUS_DOWNLOADINFO_WAVE\n"); + + if (TRACE_ON(dmsynth)) + { + TRACE("Dump DMUS_WAVE struct\n"); + TRACE(" - ulFirstExtCkIdx = %u\n", wave->ulFirstExtCkIdx); + TRACE(" - ulCopyrightIdx = %u\n", wave->ulCopyrightIdx); + TRACE(" - ulWaveDataIdx = %u\n", wave->ulWaveDataIdx); + TRACE(" - WaveformatEx:\n"); + TRACE(" - wFormatTag = %u\n", wave->WaveformatEx.wFormatTag); + TRACE(" - nChannels = %u\n", wave->WaveformatEx.nChannels); + TRACE(" - nSamplesPerSec = %u\n", wave->WaveformatEx.nSamplesPerSec); + TRACE(" - nAvgBytesPerSec = %u\n", wave->WaveformatEx.nAvgBytesPerSec); + TRACE(" - nBlockAlign = %u\n", wave->WaveformatEx.nBlockAlign); + TRACE(" - wBitsPerSample = %u\n", wave->WaveformatEx.wBitsPerSample); + TRACE(" - cbSize = %u\n", wave->WaveformatEx.cbSize); + + if (wave->ulCopyrightIdx) + { + DMUS_COPYRIGHT *copyright = (DMUS_COPYRIGHT*)(buffer + offsets[wave->ulCopyrightIdx]); + TRACE("Copyright = '%s'\n", (char*)copyright->byCopyright); + } + + wave_data = (DMUS_WAVEDATA*)(buffer + offsets[wave->ulWaveDataIdx]); + TRACE("Found %u bytes of wave data\n", wave_data->cbSize); + } } else if (info->dwDLType == DMUS_DOWNLOADINFO_INSTRUMENT2) { - FIXME("Download type DMUS_DOWNLOADINFO_INSTRUMENT2 not yet supported\n"); + DMUS_INSTRUMENT *instrument = (DMUS_INSTRUMENT*)object; + ULONG nb_regions = 0; + + TRACE("Processing download type DMUS_DOWNLOADINFO_INSTRUMENT2\n"); + + if (TRACE_ON(dmsynth)) + { + TRACE("Dump DMUS_INSTRUMENT struct\n"); + TRACE(" - ulPatch = %u\n", instrument->ulPatch); + TRACE(" - ulFirstRegionIdx = %u\n", instrument->ulFirstRegionIdx); + TRACE(" - ulGlobalArtIdx = %u\n", instrument->ulGlobalArtIdx); + TRACE(" - ulFirstExtCkIdx = %u\n", instrument->ulFirstExtCkIdx); + TRACE(" - ulCopyrightIdx = %u\n", instrument->ulCopyrightIdx); + TRACE(" - ulFlags = %u\n", instrument->ulFlags); + + if (instrument->ulCopyrightIdx) + { + DMUS_COPYRIGHT *copyright = (DMUS_COPYRIGHT*)(buffer + offsets[instrument->ulCopyrightIdx]); + TRACE("Copyright = '%s'\n", (char*)copyright->byCopyright); + } + } + + if (instrument->ulFirstRegionIdx) + { + ULONG region_idx = instrument->ulFirstRegionIdx; + + while (region_idx) + { + DMUS_REGION *region = (DMUS_REGION*)(buffer + offsets[region_idx]); + + region_idx = region->ulNextRegionIdx; + nb_regions++; + } + } + + TRACE("Number of regions = %u\n", nb_regions); } else if (info->dwDLType == DMUS_DOWNLOADINFO_WAVEARTICULATION) {

1 0