January 2011 - Wine-Commits

Andrew Nguyen : msvcrt: Null terminate the temporary locale buffer in _create_locale.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: dd1b937287193ba1aa954b47680063c8dcdaf0a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1b937287193ba1aa954b476… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Jan 15 02:28:24 2011 -0600 msvcrt: Null terminate the temporary locale buffer in _create_locale. Spotted with Valgrind. --- dlls/msvcrt/locale.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 06c8da1..2f2be43 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -676,6 +676,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) lcid[i] = 0; else if(p) { memcpy(buf, locale, p-locale); + buf[p-locale] = '\0'; lcid[i] = MSVCRT_locale_to_LCID(buf); } else lcid[i] = MSVCRT_locale_to_LCID(locale);

1 0

Nikolay Sivov : rsaenh/tests: Fix a key leak (Valgrind).
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 0a46f9b678c1ca009f8b401fe77b839a0c84ea18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a46f9b678c1ca009f8b401fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 16 14:49:10 2011 +0300 rsaenh/tests: Fix a key leak (Valgrind). --- dlls/rsaenh/tests/rsaenh.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index dd69c1d..fab959c 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -662,6 +662,8 @@ static void test_hashes(void) sizeof(signed_ssl3_shamd5_hash)); printBytes("got", pbSigValue, len); } + result = CryptDestroyKey(hKeyExchangeKey); + ok(result, "CryptDestroyKey failed 0x%08x\n", GetLastError()); result = CryptDestroyHash(hHash); ok(result, "CryptDestroyHash failed 0x%08x\n", GetLastError()); result = CryptReleaseContext(prov, 0);

1 0

Andrew Nguyen : msvcrt: Fix a possible memory leak in _wsystem for the NULL command case.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: b42f162563d0d0e9253f9891ffc04fee9852097c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b42f162563d0d0e9253f9891f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Jan 15 02:28:13 2011 -0600 msvcrt: Fix a possible memory leak in _wsystem for the NULL command case. Spotted with Valgrind. --- dlls/msvcrt/process.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 349efeb..65518b8 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1169,6 +1169,7 @@ int CDECL _wsystem(const MSVCRT_wchar_t* cmd) *MSVCRT__errno() = MSVCRT_ENOENT; return 0; } + HeapFree(GetProcessHeap(), 0, comspec); return 1; }

1 0

Andrew Nguyen : msvcrt/tests: Avoid embedding extended ASCII characters in locale string literals.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 92fe8ef38e84f6a62f71a6cdde37a2eb51c0bdc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92fe8ef38e84f6a62f71a6cdd… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Jan 15 02:28:19 2011 -0600 msvcrt/tests: Avoid embedding extended ASCII characters in locale string literals. --- dlls/msvcrt/tests/locale.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 911bddd..0e8d0dd 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -435,20 +435,20 @@ static void test_setlocale(void) if(ret) ok(!strcmp( ret, "Norwegian-Nynorsk_Norway.1252") || !strcmp(ret, "Norwegian (Nynorsk)_Norway.1252") - || broken(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252")) + || broken(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252")) || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "nor"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252") + ok(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252") || !strcmp(ret, "Norwegian (Bokmal)_Norway.1252") || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "norwegian-bokmal"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252") + ok(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252") || !strcmp(ret, "Norwegian (Bokmal)_Norway.1252") || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); @@ -459,7 +459,7 @@ static void test_setlocale(void) || !strcmp(ret, "Norwegian (Nynorsk)_Norway.1252") || broken(!strcmp(ret, "Norwegian_Norway.1252")) || broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252")) - || broken(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252")), "ret = %s\n", ret); + || broken(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "plk"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");

1 0

Andrew Nguyen : iphlpapi: Correctly compute the buffer offset for the DNS address structure in GetAdaptersAddresses .
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 587a9aa9f01abaf40a17a538df823ebdf79025d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587a9aa9f01abaf40a17a538d… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Jan 15 02:28:02 2011 -0600 iphlpapi: Correctly compute the buffer offset for the DNS address structure in GetAdaptersAddresses. Spotted with Valgrind. --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 3995a17..2966640 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1100,7 +1100,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, } if (!(flags & GAA_FLAG_SKIP_DNS_SERVER)) { - firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)aa + total_size - dns_server_size - dns_suffix_size); + firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)first_aa + total_size - dns_server_size - dns_suffix_size); get_dns_server_addresses(firstDns, &dns_server_size); for (aa = first_aa; aa; aa = aa->Next) {

1 0

Erich Hoover : hhctrl.ocx: Add support for the print button using IWebBrowser_ExecWB.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 037d58c4f6e2e45cb76decd49972043aa8b9bda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=037d58c4f6e2e45cb76decd49… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Jan 14 15:16:31 2011 -0700 hhctrl.ocx: Add support for the print button using IWebBrowser_ExecWB. --- dlls/hhctrl.ocx/help.c | 4 +++- dlls/hhctrl.ocx/hhctrl.h | 1 + dlls/hhctrl.ocx/webbrowser.c | 5 +++++ 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 2ea0132..31a7c1b 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -641,10 +641,12 @@ static void TB_OnClick(HWND hWnd, DWORD dwID) case IDTB_FORWARD: DoPageAction(info, WB_GOFORWARD); break; + case IDTB_PRINT: + DoPageAction(info, WB_PRINT); + break; case IDTB_EXPAND: case IDTB_CONTRACT: case IDTB_SYNC: - case IDTB_PRINT: case IDTB_OPTIONS: case IDTB_BROWSE_FWD: case IDTB_BROWSE_BACK: diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 91d3a77..03a4807 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -47,6 +47,7 @@ #define WB_SEARCH 3 #define WB_REFRESH 4 #define WB_STOP 5 +#define WB_PRINT 6 typedef struct { LPWSTR chm_file; diff --git a/dlls/hhctrl.ocx/webbrowser.c b/dlls/hhctrl.ocx/webbrowser.c index d90a1a5..90b405d 100644 --- a/dlls/hhctrl.ocx/webbrowser.c +++ b/dlls/hhctrl.ocx/webbrowser.c @@ -751,7 +751,12 @@ void DoPageAction(HHInfo *info, DWORD dwAction) break; case WB_REFRESH: IWebBrowser2_Refresh(pWebBrowser2); + break; case WB_STOP: IWebBrowser2_Stop(pWebBrowser2); + break; + case WB_PRINT: + IWebBrowser2_ExecWB(pWebBrowser2, OLECMDID_PRINT, OLECMDEXECOPT_DONTPROMPTUSER, 0, 0); + break; } }

1 0

Andrew Nguyen : gameux: Free the allocated GameStatisticsImpl object on failure in GameStatisticsMgrImpl ::GetGameStatistics.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: e6da2aec8f9e5bea9e0c857790c7dfaec4191fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6da2aec8f9e5bea9e0c85779… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jan 16 03:41:49 2011 -0600 gameux: Free the allocated GameStatisticsImpl object on failure in GameStatisticsMgrImpl::GetGameStatistics. Spotted with Valgrind. --- dlls/gameux/gamestatistics.c | 13 +++++++++++-- dlls/gameux/tests/gamestatistics.c | 4 +++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index ecd518f..61df25e 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -1086,7 +1086,8 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( { HRESULT hr; WCHAR lpApplicationId[49]; - GameStatisticsImpl *statisticsImpl; + GameStatisticsImpl *statisticsImpl = NULL; + IGameStatistics *output_iface; TRACE("(%p, %s, 0x%x, %p, %p)\n", iface, debugstr_w(GDFBinaryPath), openType, pOpenResult, ppiStats); @@ -1097,13 +1098,21 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( if(SUCCEEDED(hr)) { - *ppiStats = IGameStatistics_from_impl(statisticsImpl); + output_iface = IGameStatistics_from_impl(statisticsImpl); hr = GAMEUX_buildStatisticsFilePath(lpApplicationId, statisticsImpl->stats.sStatsFile); } if(SUCCEEDED(hr)) hr = GAMEUX_loadGameStatistics(&statisticsImpl->stats, lpApplicationId, openType, pOpenResult); + if(SUCCEEDED(hr)) + *ppiStats = output_iface; + else + { + HeapFree(GetProcessHeap(), 0, statisticsImpl); + *ppiStats = NULL; + } + return hr; } diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index c49e693..5bae4c8 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -225,7 +225,7 @@ static void test_gamestatisticsmgr( void ) WORD wMaxStatsPerCategory = 0, wMaxCategories = 0; IGameStatisticsMgr* gsm = NULL; - IGameStatistics* gs = NULL; + IGameStatistics* gs; hr = CoCreateInstance( &CLSID_GameStatistics, NULL, CLSCTX_INPROC_SERVER, &IID_IGameStatisticsMgr, (LPVOID*)&gsm); ok(hr == S_OK, "IGameStatisticsMgr creating failed (result false)\n"); @@ -233,8 +233,10 @@ static void test_gamestatisticsmgr( void ) /* test trying to create interface IGameStatistics using GetGameStatistics method */ /* this should fail, cause statistics doesn't yet exists */ + gs = (void *)0xdeadbeef; hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "GetGameStatistics returned unexpected value: 0x%08x\n", hr); + ok(gs == NULL, "Expected output pointer to be NULL, got %p\n", gs); /* now, allow to create */ hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs);

1 0

Andrew Nguyen : msvcrt: Fix a possible memory leak in _wpopen if a memory allocation fails.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 9361b61949b19ab9ce636ba76c5a5f3f88920736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9361b61949b19ab9ce636ba76… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Jan 15 02:28:08 2011 -0600 msvcrt: Fix a possible memory leak in _wpopen if a memory allocation fails. --- dlls/msvcrt/process.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 3e2e15e..349efeb 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1079,7 +1079,12 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc if (!(comspec = msvcrt_get_comspec())) goto error; len = strlenW(comspec) + strlenW(flag) + strlenW(command) + 1; - if (!(fullcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(MSVCRT_wchar_t)))) goto error; + if (!(fullcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(MSVCRT_wchar_t)))) + { + HeapFree(GetProcessHeap(), 0, comspec); + goto error; + } + strcpyW(fullcmd, comspec); strcatW(fullcmd, flag); strcatW(fullcmd, command);

1 0

Michael Stefaniuc : mmdevapi: Use ifaces instead of vtbl pointers in MMDevice.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 00d1915902b74ae06becd7b7cc7f5ad06ba574f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00d1915902b74ae06becd7b7c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 17 10:41:30 2011 +0100 mmdevapi: Use ifaces instead of vtbl pointers in MMDevice. --- dlls/mmdevapi/devenum.c | 51 +++++++++++++++++++++++++-------------------- dlls/mmdevapi/mmdevapi.h | 4 +- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index d375de9..35c6a78 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -171,8 +171,8 @@ static void MMDevice_Create(MMDevice **dev, WCHAR *name, GUID *id, EDataFlow flo return; } lstrcpyW(cur->alname, name); - cur->lpVtbl = &MMDeviceVtbl; - cur->lpEndpointVtbl = &MMEndpointVtbl; + cur->IMMDevice_iface.lpVtbl = &MMDeviceVtbl; + cur->IMMEndpoint_iface.lpVtbl = &MMEndpointVtbl; cur->ref = 0; InitializeCriticalSection(&cur->crst); cur->crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": MMDevice.crst"); @@ -246,9 +246,14 @@ static void MMDevice_Destroy(MMDevice *This) HeapFree(GetProcessHeap(), 0, This); } +static inline MMDevice *impl_from_IMMDevice(IMMDevice *iface) +{ + return CONTAINING_RECORD(iface, MMDevice, IMMDevice_iface); +} + static HRESULT WINAPI MMDevice_QueryInterface(IMMDevice *iface, REFIID riid, void **ppv) { - MMDevice *This = (MMDevice *)iface; + MMDevice *This = impl_from_IMMDevice(iface); TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) @@ -258,7 +263,7 @@ static HRESULT WINAPI MMDevice_QueryInterface(IMMDevice *iface, REFIID riid, voi || IsEqualIID(riid, &IID_IMMDevice)) *ppv = This; else if (IsEqualIID(riid, &IID_IMMEndpoint)) - *ppv = &This->lpEndpointVtbl; + *ppv = &This->IMMEndpoint_iface; if (*ppv) { IUnknown_AddRef((IUnknown*)*ppv); @@ -270,7 +275,7 @@ static HRESULT WINAPI MMDevice_QueryInterface(IMMDevice *iface, REFIID riid, voi static ULONG WINAPI MMDevice_AddRef(IMMDevice *iface) { - MMDevice *This = (MMDevice *)iface; + MMDevice *This = impl_from_IMMDevice(iface); LONG ref; ref = InterlockedIncrement(&This->ref); @@ -280,7 +285,7 @@ static ULONG WINAPI MMDevice_AddRef(IMMDevice *iface) static ULONG WINAPI MMDevice_Release(IMMDevice *iface) { - MMDevice *This = (MMDevice *)iface; + MMDevice *This = impl_from_IMMDevice(iface); LONG ref; ref = InterlockedDecrement(&This->ref); @@ -293,7 +298,7 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls HRESULT hr = E_NOINTERFACE; #ifdef HAVE_OPENAL - MMDevice *This = (MMDevice *)iface; + MMDevice *This = impl_from_IMMDevice(iface); TRACE("(%p)->(%p,%x,%p,%p)\n", iface, riid, clsctx, params, ppv); @@ -385,7 +390,7 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls static HRESULT WINAPI MMDevice_OpenPropertyStore(IMMDevice *iface, DWORD access, IPropertyStore **ppv) { - MMDevice *This = (MMDevice *)iface; + MMDevice *This = impl_from_IMMDevice(iface); TRACE("(%p)->(%x,%p)\n", This, access, ppv); if (!ppv) @@ -395,7 +400,7 @@ static HRESULT WINAPI MMDevice_OpenPropertyStore(IMMDevice *iface, DWORD access, static HRESULT WINAPI MMDevice_GetId(IMMDevice *iface, WCHAR **itemid) { - MMDevice *This = (MMDevice *)iface; + MMDevice *This = impl_from_IMMDevice(iface); WCHAR *str; GUID *id = &This->devguid; static const WCHAR formatW[] = { '{','0','.','0','.','0','.','0','0','0','0','0','0','0','0','}','.', @@ -418,7 +423,7 @@ static HRESULT WINAPI MMDevice_GetId(IMMDevice *iface, WCHAR **itemid) static HRESULT WINAPI MMDevice_GetState(IMMDevice *iface, DWORD *state) { - MMDevice *This = (MMDevice *)iface; + MMDevice *This = impl_from_IMMDevice(iface); TRACE("(%p)->(%p)\n", iface, state); if (!state) @@ -438,32 +443,32 @@ static const IMMDeviceVtbl MMDeviceVtbl = MMDevice_GetState }; -static MMDevice *get_this_from_endpoint(IMMEndpoint *iface) +static inline MMDevice *impl_from_IMMEndpoint(IMMEndpoint *iface) { - return (MMDevice*)((char*)iface - offsetof(MMDevice,lpEndpointVtbl)); + return CONTAINING_RECORD(iface, MMDevice, IMMEndpoint_iface); } static HRESULT WINAPI MMEndpoint_QueryInterface(IMMEndpoint *iface, REFIID riid, void **ppv) { - MMDevice *This = get_this_from_endpoint(iface); - return IMMDevice_QueryInterface((IMMDevice*)This, riid, ppv); + MMDevice *This = impl_from_IMMEndpoint(iface); + return IMMDevice_QueryInterface(&This->IMMDevice_iface, riid, ppv); } static ULONG WINAPI MMEndpoint_AddRef(IMMEndpoint *iface) { - MMDevice *This = get_this_from_endpoint(iface); - return IMMDevice_AddRef((IMMDevice*)This); + MMDevice *This = impl_from_IMMEndpoint(iface); + return IMMDevice_AddRef(&This->IMMDevice_iface); } static ULONG WINAPI MMEndpoint_Release(IMMEndpoint *iface) { - MMDevice *This = get_this_from_endpoint(iface); - return IMMDevice_Release((IMMDevice*)This); + MMDevice *This = impl_from_IMMEndpoint(iface); + return IMMDevice_Release(&This->IMMDevice_iface); } static HRESULT WINAPI MMEndpoint_GetDataFlow(IMMEndpoint *iface, EDataFlow *flow) { - MMDevice *This = get_this_from_endpoint(iface); + MMDevice *This = impl_from_IMMEndpoint(iface); if (!flow) return E_POINTER; *flow = This->flow; @@ -570,7 +575,7 @@ static HRESULT WINAPI MMDevCol_Item(IMMDeviceCollection *iface, UINT n, IMMDevic && (cur->state & This->state) && i++ == n) { - *dev = (IMMDevice *)cur; + *dev = &cur->IMMDevice_iface; IMMDevice_AddRef(*dev); return S_OK; } @@ -1059,9 +1064,9 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa *device = NULL; if (flow == eRender) - *device = (IMMDevice*)MMDevice_def_play; + *device = &MMDevice_def_play->IMMDevice_iface; else if (flow == eCapture) - *device = (IMMDevice*)MMDevice_def_rec; + *device = &MMDevice_def_rec->IMMDevice_iface; else { WARN("Unknown flow %u\n", flow); @@ -1084,7 +1089,7 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA for (i = 0; i < MMDevice_count; ++i) { WCHAR *str; - dev = (IMMDevice*)MMDevice_head[i]; + dev = &MMDevice_head[i]->IMMDevice_iface; IMMDevice_GetId(dev, &str); if (str && !lstrcmpW(str, name)) diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index afe7bba..cf5520c 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -27,8 +27,8 @@ extern HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERT extern HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERTYKEY key, REFPROPVARIANT pv); typedef struct MMDevice { - const IMMDeviceVtbl *lpVtbl; - const IMMEndpointVtbl *lpEndpointVtbl; + IMMDevice IMMDevice_iface; + IMMEndpoint IMMEndpoint_iface; LONG ref; CRITICAL_SECTION crst;

1 0

Alexandre Julliard : shdocvw: Get rid of the IDB_IETOOLBAR define, the bitmap is loaded by name.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 831338df0112211f528a207394c996d4c5385e04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831338df0112211f528a20739… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 17 13:33:26 2011 +0100 shdocvw: Get rid of the IDB_IETOOLBAR define, the bitmap is loaded by name. --- dlls/shdocvw/resource.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index 6f5c777..5a24925 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -28,7 +28,6 @@ #define IDC_BROWSE_ADDRESSBAR 1004 #define IDC_BROWSE_STATUSBAR 1005 #define IDC_BROWSE_TOOLBAR 1006 -#define IDB_IETOOLBAR 1007 #define ID_BROWSE_NEW_WINDOW 275 #define ID_BROWSE_OPEN 256

1 0