April 2012 - Wine-Commits - list.winehq.org

Aric Stewart : quartz: Convert VideoRenderer to use strmbase' s BaseControlWindow.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: 75300a7e32e198368893d06b7d6088850c614fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75300a7e32e198368893d06b7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:09:14 2012 -0500 quartz: Convert VideoRenderer to use strmbase's BaseControlWindow. --- dlls/quartz/videorenderer.c | 731 ++++++------------------------------------- 1 files changed, 91 insertions(+), 640 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75300a7e32e198368893d…

1 0

Huw Davies : winspool: Initialise portname.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: 25f9d6e33e5f55143e5b7e63944fef901a34d550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f9d6e33e5f55143e5b7e639… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 3 11:43:38 2012 +0100 winspool: Initialise portname. --- dlls/winspool.drv/info.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index c50a894..8e3fdf3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2309,6 +2309,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD len = strlenW(filename); job->filename = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); memcpy(job->filename, filename, (len + 1) * sizeof(WCHAR)); + job->portname = NULL; job->document_title = strdupW(default_doc_title); job->printer_name = strdupW(printer->name); job->devmode = dup_devmode( printer->devmode );

1 0

Huw Davies : winspool/tests: Add some tests for OpenPrinter with non-NULL defaults.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: bfab84378de6d6795b5eae8a1c9fe836146a1511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfab84378de6d6795b5eae8a1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 3 11:43:40 2012 +0100 winspool/tests: Add some tests for OpenPrinter with non-NULL defaults. --- dlls/winspool.drv/tests/info.c | 110 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 110 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 3f26693..b9d2201 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2871,6 +2871,115 @@ static void test_IsValidDevmodeW(void) ok(br == FALSE, "Got %d\n", br); } +static void test_OpenPrinter_defaults(void) +{ + HANDLE printer; + BOOL ret; + DWORD needed; + short default_size; + ADDJOB_INFO_1 *add_job; + JOB_INFO_2 *job_info; + DEVMODE my_dm; + PRINTER_DEFAULTS prn_def; + PRINTER_INFO_2 *pi; + + if (!default_printer) + { + skip("There is no default printer installed\n"); + return; + } + + /* Printer opened with NULL defaults. Retrieve default paper size + and confirm that jobs have this size. */ + + ret = OpenPrinter( default_printer, &printer, NULL ); + if (!ret) + { + skip("Unable to open the default printer (%s)\n", default_printer); + return; + } + + ret = GetPrinter( printer, 2, NULL, 0, &needed ); + ok( !ret, "got %d\n", ret ); + pi = HeapAlloc( GetProcessHeap(), 0, needed ); + ret = GetPrinter( printer, 2, (BYTE *)pi, needed, &needed ); + ok( ret, "got %d\n", ret ); + default_size = pi->pDevMode->u1.s1.dmPaperSize; + HeapFree( GetProcessHeap(), 0, pi ); + + ret = AddJob( printer, 1, NULL, 0, &needed ); + ok( !ret, "got %d\n", ret ); + add_job = HeapAlloc( GetProcessHeap(), 0, needed ); + ret = AddJob( printer, 1, (BYTE *)add_job, needed, &needed ); + ok( ret, "got %d\n", ret ); + + ret = GetJob( printer, add_job->JobId, 2, NULL, 0, &needed ); + ok( !ret, "got %d\n", ret ); + job_info = HeapAlloc( GetProcessHeap(), 0, needed ); + ret = GetJob( printer, add_job->JobId, 2, (BYTE *)job_info, needed, &needed ); + ok( ret, "got %d\n", ret ); + +todo_wine + ok( job_info->pDevMode != NULL, "got NULL devmode\n"); + if (job_info->pDevMode) + ok( job_info->pDevMode->u1.s1.dmPaperSize == default_size, "got %d default %d\n", + job_info->pDevMode->u1.s1.dmPaperSize, default_size ); + + HeapFree( GetProcessHeap(), 0, job_info ); + ScheduleJob( printer, add_job->JobId ); /* remove the empty job */ + HeapFree( GetProcessHeap(), 0, add_job ); + ClosePrinter( printer ); + + /* Printer opened with something other than the default paper size. */ + + memset( &my_dm, 0, sizeof(my_dm) ); + my_dm.dmSize = sizeof(my_dm); + my_dm.dmFields = DM_PAPERSIZE; + my_dm.u1.s1.dmPaperSize = (default_size == DMPAPER_A4) ? DMPAPER_LETTER : DMPAPER_A4; + + prn_def.pDatatype = NULL; + prn_def.pDevMode = &my_dm; + prn_def.DesiredAccess = PRINTER_ACCESS_USE; + + ret = OpenPrinter( default_printer, &printer, &prn_def ); + ok( ret, "got %d\n", ret ); + + /* GetPrinter stills returns default size */ + ret = GetPrinter( printer, 2, NULL, 0, &needed ); + ok( !ret, "got %d\n", ret ); + pi = HeapAlloc( GetProcessHeap(), 0, needed ); + ret = GetPrinter( printer, 2, (BYTE *)pi, needed, &needed ); + ok( ret, "got %d\n", ret ); + ok( pi->pDevMode->u1.s1.dmPaperSize == default_size, "got %d default %d\n", + pi->pDevMode->u1.s1.dmPaperSize, default_size ); + + HeapFree( GetProcessHeap(), 0, pi ); + + /* However the GetJob has the new size */ + ret = AddJob( printer, 1, NULL, 0, &needed ); + ok( !ret, "got %d\n", ret ); + add_job = HeapAlloc( GetProcessHeap(), 0, needed ); + ret = AddJob( printer, 1, (BYTE *)add_job, needed, &needed ); + ok( ret, "got %d\n", ret ); + + ret = GetJob( printer, add_job->JobId, 2, NULL, 0, &needed ); + ok( !ret, "got %d\n", ret ); + job_info = HeapAlloc( GetProcessHeap(), 0, needed ); + ret = GetJob( printer, add_job->JobId, 2, (BYTE *)job_info, needed, &needed ); + ok( ret, "got %d\n", ret ); + + ok( job_info->pDevMode->dmFields == DM_PAPERSIZE, "got %08x\n", + job_info->pDevMode->dmFields ); + ok( job_info->pDevMode->u1.s1.dmPaperSize == my_dm.u1.s1.dmPaperSize, + "got %d new size %d\n", + job_info->pDevMode->u1.s1.dmPaperSize, my_dm.u1.s1.dmPaperSize ); + + HeapFree( GetProcessHeap(), 0, job_info ); + ScheduleJob( printer, add_job->JobId ); /* remove the empty job */ + HeapFree( GetProcessHeap(), 0, add_job ); + ClosePrinter( printer ); +} + START_TEST(info) { hwinspool = GetModuleHandleA("winspool.drv"); @@ -2919,6 +3028,7 @@ START_TEST(info) test_XcvDataW_MonitorUI(); test_XcvDataW_PortIsValid(); test_IsValidDevmodeW(); + test_OpenPrinter_defaults(); /* Cleanup our temporary file */ DeleteFileA(tempfileA);

1 0

Andrew Eikum : mmddk.h: Remove unused, Wine-specific WinMM defines.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: 1b21fe827f385d0cc0cc8b900994ce56de656cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b21fe827f385d0cc0cc8b900… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 3 09:14:16 2012 -0500 mmddk.h: Remove unused, Wine-specific WinMM defines. --- dlls/dsound/dsound.c | 4 ---- dlls/winmm/lolvldrv.c | 4 ---- include/mmddk.h | 8 -------- 3 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 444b933..91184c9 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1203,10 +1203,6 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) return DSERR_OUTOFMEMORY; } - /* We rely on the sound driver to return the actual sound format of - * the device if it does not support 22050x8x2 and is given the - * WAVE_DIRECTSOUND flag. - */ device->pwfx->wFormatTag = WAVE_FORMAT_PCM; device->pwfx->nSamplesPerSec = ds_default_sample_rate; device->pwfx->wBitsPerSample = ds_default_bits_per_sample; diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 820d28b..7081a86 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -340,10 +340,6 @@ UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, case DRV_QUERYDEVICEINTERFACESIZE: return MMDRV_Message(mld, uMsg, dwParam1, dwParam2); - case DRV_QUERYDSOUNDIFACE: /* Wine-specific: Retrieve DirectSound interface */ - case DRV_QUERYDSOUNDDESC: /* Wine-specific: Retrieve DirectSound driver description*/ - return MMDRV_Message(mld, uMsg, dwParam1, dwParam2); - default: WARN("Unknown call %04x\n", uMsg); return MMSYSERR_INVALPARAM; diff --git a/include/mmddk.h b/include/mmddk.h index d6359ef..d4217f2 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -91,10 +91,6 @@ typedef struct { #define DRV_QUERYIDFROMSTRINGID (DRV_RESERVED + 16) #define DRV_QUERYFUNCTIONINSTANCEID (DRV_RESERVED + 17) #define DRV_QUERYFUNCTIONINSTANCEIDSIZE (DRV_RESERVED + 18) -#ifdef __WINESRC__ -#define DRV_QUERYDSOUNDIFACE (DRV_RESERVED + 20) -#define DRV_QUERYDSOUNDDESC (DRV_RESERVED + 21) -#endif #define DRVM_MAPPER_PREFERRED_FLAGS_PREFERREDONLY 0x00000001 @@ -466,10 +462,6 @@ BOOL WINAPI mmTaskSignal(DWORD); VOID WINAPI mmTaskYield(VOID); DWORD WINAPI mmGetCurrentTask(VOID); -#ifdef __WINESRC__ -#define WAVE_DIRECTSOUND 0x0080 -#endif - #include <poppack.h> #ifdef __cplusplus

1 0

Jacek Caban : mshtml: Added IHTMLMetaElement::get_name implementation.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: f4c20b02dbc99bf47668aa98a31074ac3c4012bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c20b02dbc99bf47668aa98a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 3 12:03:37 2012 +0200 mshtml: Added IHTMLMetaElement::get_name implementation. --- dlls/mshtml/htmlmeta.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlmeta.c b/dlls/mshtml/htmlmeta.c index e80ca13..ef222a9 100644 --- a/dlls/mshtml/htmlmeta.c +++ b/dlls/mshtml/htmlmeta.c @@ -132,8 +132,19 @@ static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) static HRESULT WINAPI HTMLMetaElement_get_name(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString name_str, val_str; + nsresult nsres; + + static const PRUnichar nameW[] = {'n','a','m','e',0}; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_InitDepend(&name_str, nameW); + nsAString_Init(&val_str, NULL); + nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &name_str, &val_str); + nsAString_Finish(&name_str); + + return return_nsstr(nsres, &val_str, p); } static HRESULT WINAPI HTMLMetaElement_put_url(IHTMLMetaElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 37db092..09b6586 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -47,7 +47,7 @@ static const char range_test2_str[] = "<html><body>abc<hr />123<br /><hr />def</body></html>"; static const char elem_test_str[] = "<html><head><title>test</title><style id=\"styleid\">.body { margin-right: 0px; }</style>" - "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" + "<meta id=\"metaid\" name=\"meta name\" http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" "<body onload=\"Testing()\">text test" "<a id=\"a\" href=\"http://test\" name=\"x\">link</a>" "<input id=\"in\" class=\"testclass\" tabIndex=\"2\" title=\"test title\" />" @@ -839,6 +839,17 @@ static IHTMLStyleElement *_get_style_iface(unsigned line, IUnknown *unk) return obj; } +#define get_metaelem_iface(u) _get_metaelem_iface(__LINE__,u) +static IHTMLMetaElement *_get_metaelem_iface(unsigned line, IUnknown *unk) +{ + IHTMLMetaElement *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLMetaElement, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLMetaElement: %08x\n", hres); + return ret; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -3232,6 +3243,22 @@ static void _test_form_elements(unsigned line, IUnknown *unk) IHTMLFormElement_Release(form); } +#define test_meta_name(a,b) _test_meta_name(__LINE__,a,b) +static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) +{ + IHTMLMetaElement *meta; + BSTR name = NULL; + HRESULT hres; + + + meta = _get_metaelem_iface(line, unk); + hres = IHTMLMetaElement_get_name(meta, &name); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(name, exname), "name = %s, expected %s\n", wine_dbgstr_w(name), exname); + SysFreeString(name); + IHTMLMetaElement_Release(meta); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -5259,6 +5286,12 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, "metaid"); + if(elem) { + test_meta_name((IUnknown*)elem, "meta name"); + IHTMLElement_Release(elem); + } + elem = doc_get_body(doc); node = get_first_child((IUnknown*)elem);

1 0

Aric Stewart : strmbase: COM cleanup for PosPassThru.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: 9846d0245726d3260ad0eafb99fd40947e7d5ea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9846d0245726d3260ad0eafb9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 2 08:38:47 2012 -0500 strmbase: COM cleanup for PosPassThru. --- dlls/strmbase/pospass.c | 125 ++++++++++++++++++++++++++--------------------- 1 files changed, 69 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9846d0245726d3260ad0e…

1 0

Jacek Caban : mshtml: Added IHTMLMetaElement::get_httpEquiv implementation.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: fe4cb8441a1465d616b39cd70b77e1a1a5e68ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe4cb8441a1465d616b39cd70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 3 12:04:05 2012 +0200 mshtml: Added IHTMLMetaElement::get_httpEquiv implementation. --- dlls/mshtml/htmlmeta.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlmeta.c b/dlls/mshtml/htmlmeta.c index d75b7f4..00bb007 100644 --- a/dlls/mshtml/htmlmeta.c +++ b/dlls/mshtml/htmlmeta.c @@ -104,8 +104,19 @@ static HRESULT WINAPI HTMLMetaElement_put_httpEquiv(IHTMLMetaElement *iface, BST static HRESULT WINAPI HTMLMetaElement_get_httpEquiv(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString httpequiv_str, val_str; + nsresult nsres; + + static const PRUnichar httpEquivW[] = {'h','t','t','p','-','e','q','u','i','v',0}; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_InitDepend(&httpequiv_str, httpEquivW); + nsAString_Init(&val_str, NULL); + nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &httpequiv_str, &val_str); + nsAString_Finish(&httpequiv_str); + + return return_nsstr(nsres, &val_str, p); } static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c3927d2..267ac9e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3275,6 +3275,22 @@ static void _test_meta_content(unsigned line, IUnknown *unk, const char *exconte IHTMLMetaElement_Release(meta); } +#define test_meta_httpequiv(a,b) _test_meta_httpequiv(__LINE__,a,b) +static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const char *exval) +{ + IHTMLMetaElement *meta; + BSTR val = NULL; + HRESULT hres; + + + meta = _get_metaelem_iface(line, unk); + hres = IHTMLMetaElement_get_httpEquiv(meta, &val); + ok_(__FILE__,line)(hres == S_OK, "get_httpEquiv failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(val, exval), "httpEquiv = %s, expected %s\n", wine_dbgstr_w(val), exval); + SysFreeString(val); + IHTMLMetaElement_Release(meta); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -5306,6 +5322,7 @@ static void test_elems(IHTMLDocument2 *doc) if(elem) { test_meta_name((IUnknown*)elem, "meta name"); test_meta_content((IUnknown*)elem, "text/html; charset=utf-8"); + test_meta_httpequiv((IUnknown*)elem, "Content-Type"); IHTMLElement_Release(elem); }

1 0

Christian Costa : dmusic: Check return codes and display name from port caps when enumerating microsoft synthetizer .
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: 31bfc380eef32c00d66f173e89d0815ca8ef112f URL: http://source.winehq.org/git/wine.git/?a=commit;h=31bfc380eef32c00d66f173e8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 08:52:54 2012 +0200 dmusic: Check return codes and display name from port caps when enumerating microsoft synthetizer. --- dlls/dmusic/dmusic.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index b0dd7c9..ba12f98 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -138,12 +138,16 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD ind if (index == (nb_midi_in + nb_midi_out + 1)) { - IDirectMusicSynth8* synth; - TRACE("Enumerating port: 'Microsoft Software Synthesizer'\n"); - CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); - IDirectMusicSynth8_GetPortCaps(synth, port_caps); - IDirectMusicSynth8_Release(synth); - return S_OK; + IDirectMusicSynth8* synth = NULL; + HRESULT hr; + hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); + if (SUCCEEDED(hr)) + IDirectMusicSynth8_GetPortCaps(synth, port_caps); + if (SUCCEEDED(hr)) + TRACE("Enumerating port: %s\n", debugstr_w(port_caps->wszDescription)); + if (synth) + IDirectMusicSynth8_Release(synth); + return hr; } return S_FALSE;

1 0

Aric Stewart : quartz: Change VideoRenderer to use strmbase' s BaseControlVideo.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: dbf910b053eb3bc0db003536ecf3daec3a2a0c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf910b053eb3bc0db003536e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:09:22 2012 -0500 quartz: Change VideoRenderer to use strmbase's BaseControlVideo. --- dlls/quartz/videorenderer.c | 757 +++++++++++++------------------------------ 1 files changed, 221 insertions(+), 536 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbf910b053eb3bc0db003…

1 0

Michael Stefaniuc : devenum: COM cleanup for IParseDisplayName.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: 448986f1c4f89d0bb089f8d76e2aadbbba95a1fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=448986f1c4f89d0bb089f8d76… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 3 00:22:12 2012 +0200 devenum: COM cleanup for IParseDisplayName. --- dlls/devenum/devenum_private.h | 2 +- dlls/devenum/parsedisplayname.c | 36 +++++++++++++----------------------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index fe3c5d2..45736a5 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -67,7 +67,7 @@ typedef struct typedef struct { - const IParseDisplayNameVtbl *lpVtbl; + IParseDisplayName IParseDisplayName_iface; } ParseDisplayNameImpl; typedef struct diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index b36b3ed..40850b2 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -27,31 +27,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); -static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface( - LPPARSEDISPLAYNAME iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface(IParseDisplayName *iface, + REFIID riid, void **ppv) { TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); - if (ppvObj == NULL) return E_POINTER; + if (!ppv) + return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IParseDisplayName)) { - *ppvObj = iface; - IParseDisplayName_AddRef(iface); - return S_OK; + *ppv = iface; + IParseDisplayName_AddRef(iface); + return S_OK; } FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } -/********************************************************************** - * DEVENUM_IParseDisplayName_AddRef (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(LPPARSEDISPLAYNAME iface) +static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(IParseDisplayName *iface) { TRACE("\n"); @@ -60,10 +57,7 @@ static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(LPPARSEDISPLAYNAME iface) return 2; /* non-heap based object */ } -/********************************************************************** - * DEVENUM_IParseDisplayName_Release (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IParseDisplayName_Release(LPPARSEDISPLAYNAME iface) +static ULONG WINAPI DEVENUM_IParseDisplayName_Release(IParseDisplayName *iface) { TRACE("\n"); @@ -81,12 +75,8 @@ static ULONG WINAPI DEVENUM_IParseDisplayName_Release(LPPARSEDISPLAYNAME iface) * Might not handle more complicated strings properly (ie anything * not in "@device:sw:{CLSID1}\<filter name or CLSID>" format */ -static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName( - LPPARSEDISPLAYNAME iface, - IBindCtx *pbc, - LPOLESTR pszDisplayName, - ULONG *pchEaten, - IMoniker **ppmkOut) +static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName(IParseDisplayName *iface, + IBindCtx *pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { LPOLESTR pszBetween = NULL; LPOLESTR pszClass = NULL; @@ -163,4 +153,4 @@ static const IParseDisplayNameVtbl IParseDisplayName_Vtbl = }; /* The one instance of this class */ -ParseDisplayNameImpl DEVENUM_ParseDisplayName = { &IParseDisplayName_Vtbl }; +ParseDisplayNameImpl DEVENUM_ParseDisplayName = { { &IParseDisplayName_Vtbl } };

1 0