August 2012 - Wine-commits - list.winehq.org

Nikolay Sivov : winealsa: Fix variable types so pointer is not truncated on 64bit.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 72452b10151085afc92c9bfb5f5d224d68dc2de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72452b10151085afc92c9bfb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 21 07:53:00 2012 +0400 winealsa: Fix variable types so pointer is not truncated on 64bit. --- dlls/winealsa.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index ff762eb..7c496c5 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -176,10 +176,10 @@ static int MIDI_AlsaToWindowsDeviceType(unsigned int type) static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - DWORD dwCallBack; + DWORD_PTR dwCallBack; UINT uFlags; HANDLE hDev; - DWORD dwInstance; + DWORD_PTR dwInstance; TRACE("wDevID = %04X wMsg = %d dwParm1 = %04lX dwParam2 = %04lX\n", wDevID, wMsg, dwParam1, dwParam2);

1 0

Alexandre Julliard : JIB announcement.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: website Branch: master Commit: 449ff6f5432d84fe8bbb451184fcc3f3ac5f1465 URL: http://source.winehq.org/git/website.git/?a=commit;h=449ff6f5432d84fe8bbb45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 21 19:33:39 2012 +0200 JIB announcement. --- news/en/2012082101.xml | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/news/en/2012082101.xml b/news/en/2012082101.xml new file mode 100644 index 0000000..f659a03 --- /dev/null +++ b/news/en/2012082101.xml @@ -0,0 +1,7 @@ +<news> +<date>August 21, 2012</date> +<title>Donations from JIB</title> +<body> +<p>The <a href="http://jib.magicermine.com">Jinn in the Bottle</a> +project recently announced that they are now donating 15% of their +sales to Wine.</p></body></news>

1 0

André Hentschel : winedev: Remove winedev-graphical as the content is outdated.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: docs Branch: master Commit: 17bc662768b0d4dd65cc57b03c51ecbb21c5aa01 URL: http://source.winehq.org/git/docs.git/?a=commit;h=17bc662768b0d4dd65cc57b03… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 16 22:56:24 2012 +0200 winedev: Remove winedev-graphical as the content is outdated. --- en/Makefile.in | 1 - en/winedev-graphical.sgml | 40 ---------------------------------------- en/winedev-guide.sgml | 2 -- 3 files changed, 0 insertions(+), 43 deletions(-) diff --git a/en/Makefile.in b/en/Makefile.in index 5e56c83..f4ad503 100644 --- a/en/Makefile.in +++ b/en/Makefile.in @@ -24,7 +24,6 @@ WINEDEV_SRCS = \ winedev-opengl.sgml \ winedev-testing.sgml \ winedev-coding.sgml \ - winedev-graphical.sgml \ winedev-kernel.sgml \ winedev-otherdebug.sgml \ winedev-windowing.sgml diff --git a/en/winedev-graphical.sgml b/en/winedev-graphical.sgml deleted file mode 100644 index 8524991..0000000 --- a/en/winedev-graphical.sgml +++ /dev/null @@ -1,40 +0,0 @@ - <chapter> - <title>Graphical modules</title> - <sect1> - <title>GDI Module</title> - - <sect2> - <title>X Windows System interface</title> - - <para> - The X libraries used to implement X clients (such as Wine) - do not work properly if multiple threads access the same - display concurrently. It is possible to compile the X - libraries to perform their own synchronization (initiated - by calling <function>XInitThreads()</function>). However, - Wine does not use this approach. Instead Wine performs its - own synchronization using the - <function>wine_tsx11_lock()</function> / <function>wine_tsx11_unlock()</function> - functions. This locking protects library access - with a critical section, and also arranges things so that - X libraries compiled without <option>-D_REENTRANT</option> - (eg. with global <varname>errno</varname> variable) will - work with Wine. - </para> - <para> - In the past, all calls to X used to go through a wrapper called - <function>TSX...()</function> (for "Thread Safe X ..."). - While it is still being used in the code, it's inefficient - as the lock is potentially acquired and released unnecessarily. - New code should explicitly acquire the lock. - </para> - </sect2> - </sect1> - </chapter> - - diff --git a/en/winedev-guide.sgml b/en/winedev-guide.sgml index 5ea6ef0..aebbbac 100644 --- a/en/winedev-guide.sgml +++ b/en/winedev-guide.sgml @@ -9,7 +9,6 @@ <!entity architecture SYSTEM "winedev-architecture.sgml"> <!entity kernel SYSTEM "winedev-kernel.sgml"> -<!entity graphical SYSTEM "winedev-graphical.sgml"> <!entity windowing SYSTEM "winedev-windowing.sgml"> <!entity ole SYSTEM "winedev-ole.sgml"> <!entity opengl SYSTEM "winedev-opengl.sgml"> @@ -127,7 +126,6 @@ &architecture; &kernel; - &graphical; &windowing; &ole; &opengl;

1 0

Jacek Caban : oleaut32: Added more tests.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 1742012ff09329018650c79eaa84c3b529355c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1742012ff09329018650c79ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 20 17:42:53 2012 +0200 oleaut32: Added more tests. --- dlls/oleaut32/tests/tmarshal.c | 56 +++++++++++++++++++++++++++++++- dlls/oleaut32/tests/tmarshal.idl | 12 +++++++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + 3 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 337e911..be8ef94 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -153,6 +153,35 @@ static void end_host_object(DWORD tid, HANDLE thread) static ItestDual TestDual, TestDualDisp; +static HRESULT WINAPI TestSecondIface_QueryInterface(ITestSecondIface *iface, REFIID riid, void **ppv) +{ + return ItestDual_QueryInterface(&TestDual, riid, ppv); +} + +static ULONG WINAPI TestSecondIface_AddRef(ITestSecondIface *iface) +{ + return 2; +} + +static ULONG WINAPI TestSecondIface_Release(ITestSecondIface *iface) +{ + return 1; +} + +static HRESULT WINAPI TestSecondIface_test(ITestSecondIface *iface) +{ + return 1; +} + +static const ITestSecondIfaceVtbl TestSecondIfaceVtbl = { + TestSecondIface_QueryInterface, + TestSecondIface_AddRef, + TestSecondIface_Release, + TestSecondIface_test +}; + +static ITestSecondIface TestSecondIface = { &TestSecondIfaceVtbl }; + static HRESULT WINAPI TestDual_QueryInterface(ItestDual *iface, REFIID riid, void **ppvObject) { if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch)) { @@ -161,6 +190,9 @@ static HRESULT WINAPI TestDual_QueryInterface(ItestDual *iface, REFIID riid, voi }else if(IsEqualGUID(riid, &IID_ItestDual)) { *ppvObject = &TestDual; return S_OK; + }else if(IsEqualGUID(riid, &IID_ITestSecondIface)) { + *ppvObject = &TestSecondIface; + return S_OK; } *ppvObject = NULL; @@ -786,6 +818,13 @@ static HRESULT WINAPI StaticWidget_TestDual(IStaticWidget *iface, ItestDual *p) return S_OK; } +static HRESULT WINAPI StaticWidget_TestSecondIface(IStaticWidget *iface, ITestSecondIface *p) +{ + trace("TestSecondIface()\n"); + ok(p == &TestSecondIface, "wrong ItestSecondIface\n"); + return S_OK; +} + static const IStaticWidgetVtbl StaticWidgetVtbl = { StaticWidget_QueryInterface, StaticWidget_AddRef, @@ -794,7 +833,8 @@ static const IStaticWidgetVtbl StaticWidgetVtbl = { StaticWidget_GetTypeInfo, StaticWidget_GetIDsOfNames, StaticWidget_Invoke, - StaticWidget_TestDual + StaticWidget_TestDual, + StaticWidget_TestSecondIface }; static IStaticWidget StaticWidget = { &StaticWidgetVtbl }; @@ -1624,6 +1664,20 @@ static void test_StaticWidget(void) ok(V_VT(&varresult) == VT_EMPTY, "vt %x\n", V_VT(&varresult)); VariantClear(&varresult); + /* call TestSecondIface */ + dispparams.cNamedArgs = 0; + dispparams.cArgs = 1; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + V_VT(vararg) = VT_DISPATCH; + V_DISPATCH(vararg) = (IDispatch*)&TestDualDisp; + VariantInit(&varresult); + hr = ITypeInfo_Invoke(type_info, &StaticWidget, DISPID_TM_TESTSECONDIFACE, DISPATCH_METHOD, + &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "vt %x\n", V_VT(&varresult)); + VariantClear(&varresult); + ITypeInfo_Release(type_info); } diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index a26589d..c589574 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -66,6 +66,15 @@ library TestTypelib [ odl, + uuid(3f7e06fe-0bce-46f0-8b7d-3a68393c7968) + ] + interface ITestSecondIface : IUnknown + { + HRESULT test(); + } + + [ + odl, uuid(a1f8cae3-c947-4c5f-b57d-c87b9b5f3586), oleautomation, dual @@ -168,6 +177,9 @@ library TestTypelib { [id(DISPID_TM_TESTDUAL)] HRESULT TestDual([in] ItestDual *p); + + [id(DISPID_TM_TESTSECONDIFACE)] + HRESULT TestSecondIface([in] ITestSecondIface *p); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 8570fe9..879d974 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -43,6 +43,7 @@ #define DISPID_TM_VARCARRAY 24 #define DISPID_TM_RESTRICTED 25 #define DISPID_TM_NEG_RESTRICTED -26 +#define DISPID_TM_TESTSECONDIFACE 27 #define DISPID_NOA_BSTRRET 1 #define DISPID_NOA_ERROR 2

1 0

Vincent Povirk : windowscodecs: Allow CopyPixels to succeed without padding from the last row.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 32bfd81051238bf50dbfd2b95cf811c8eeb35b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32bfd81051238bf50dbfd2b95… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 16:40:33 2012 -0500 windowscodecs: Allow CopyPixels to succeed without padding from the last row. --- dlls/windowscodecs/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 091b9fb..2898d97 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -82,7 +82,7 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, if (dststride < bytesperrow) return E_INVALIDARG; - if ((dststride * rc->Height) > dstbuffersize) + if ((dststride * (rc->Height-1)) + ((rc->Width * bpp) + 7)/8 > dstbuffersize) return E_INVALIDARG; /* if the whole bitmap is copied and the buffer format matches then it's a matter of a single memcpy */

1 0

Vincent Povirk : windowscodecs: Implement IWICImagingFactory:: CreateBitmapFromSource.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 88eed3c0dedbc9c69d99f9c56d00533b458260d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88eed3c0dedbc9c69d99f9c56… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 16:41:50 2012 -0500 windowscodecs: Implement IWICImagingFactory::CreateBitmapFromSource. --- dlls/windowscodecs/imgfactory.c | 79 ++++++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/bitmap.c | 5 +- 2 files changed, 80 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index a739662..01ce034 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -466,8 +466,83 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFacto IWICBitmapSource *piBitmapSource, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) { - FIXME("(%p,%p,%u,%p): stub\n", iface, piBitmapSource, option, ppIBitmap); - return E_NOTIMPL; + IWICBitmap *result; + IWICBitmapLock *lock; + IWICPalette *palette; + UINT width, height; + WICPixelFormatGUID pixelformat = {0}; + HRESULT hr; + WICRect rc; + double dpix, dpiy; + + TRACE("(%p,%p,%u,%p)\n", iface, piBitmapSource, option, ppIBitmap); + + if (!piBitmapSource || !ppIBitmap) + return E_INVALIDARG; + + hr = IWICBitmapSource_GetSize(piBitmapSource, &width, &height); + + if (SUCCEEDED(hr)) + hr = IWICBitmapSource_GetPixelFormat(piBitmapSource, &pixelformat); + + if (SUCCEEDED(hr)) + hr = BitmapImpl_Create(width, height, &pixelformat, option, &result); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmap_Lock(result, NULL, WICBitmapLockWrite, &lock); + if (SUCCEEDED(hr)) + { + UINT stride, buffersize; + BYTE *buffer; + rc.X = rc.Y = 0; + rc.Width = width; + rc.Height = height; + + hr = IWICBitmapLock_GetStride(lock, &stride); + + if (SUCCEEDED(hr)) + hr = IWICBitmapLock_GetDataPointer(lock, &buffersize, &buffer); + + if (SUCCEEDED(hr)) + hr = IWICBitmapSource_CopyPixels(piBitmapSource, &rc, stride, + buffersize, buffer); + + IWICBitmapLock_Release(lock); + } + + if (SUCCEEDED(hr)) + hr = PaletteImpl_Create(&palette); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapSource_CopyPalette(piBitmapSource, palette); + + if (SUCCEEDED(hr)) + hr = IWICBitmap_SetPalette(result, palette); + else + hr = S_OK; + + IWICPalette_Release(palette); + } + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapSource_GetResolution(piBitmapSource, &dpix, &dpiy); + + if (SUCCEEDED(hr)) + hr = IWICBitmap_SetResolution(result, dpix, dpiy); + else + hr = S_OK; + } + + if (SUCCEEDED(hr)) + *ppIBitmap = result; + else + IWICBitmap_Release(result); + } + + return hr; } static HRESULT WINAPI ComponentFactory_CreateBitmapFromSourceRect(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 56b4cfd..91376ac 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -329,7 +329,7 @@ static void test_createbitmapfromsource(void) hr = IWICImagingFactory_CreateBitmapFromSource(factory, (IWICBitmapSource*)bitmap, WICBitmapCacheOnLoad, &bitmap2); - todo_wine ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromSource failed hr=%x\n", hr); + ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromSource failed hr=%x\n", hr); IWICBitmap_Release(bitmap); @@ -338,8 +338,9 @@ static void test_createbitmapfromsource(void) hr = IWICImagingFactory_CreatePalette(factory, &palette); ok(hr == S_OK, "IWICImagingFactory_CreatePalette failed hr=%x\n", hr); + /* palette isn't copied for non-indexed formats? */ hr = IWICBitmap_CopyPalette(bitmap2, palette); - ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "IWICBitmap_CopyPalette failed hr=%x\n", hr); + todo_wine ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "IWICBitmap_CopyPalette failed hr=%x\n", hr); IWICPalette_Release(palette);

1 0

Gerald Pfeifer : wininet: Fix initialization in test_cert_struct.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 44953d7003f0d49b950c5ae8981229756fbc49eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=44953d7003f0d49b950c5ae89… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Aug 19 00:41:48 2012 +0200 wininet: Fix initialization in test_cert_struct. --- dlls/wininet/tests/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index acbaf2e..c4db996 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2945,7 +2945,7 @@ static void test_cert_struct(HINTERNET req) "test.winehq.org\r\n" "webmaster(a)winehq.org"; - memset(&info, 0x5, sizeof(&info)); + memset(&info, 0x5, sizeof(info)); size = sizeof(info); res = InternetQueryOption(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, &info, &size);

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 95d00e8ecccfedc449e843809dcecedd715d0ad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d00e8ecccfedc449e843809… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Aug 20 11:14:36 2012 +0900 po: Update Korean translation. --- po/ko.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index 34cf2f6..1a80880 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3318,7 +3318,7 @@ msgid "" "Cached copies of web pages, images and certificates." msgstr "" "임시 인터넷 파일\n" -"웹페이지의 캐시된 복사본,그림 그리고 인증서." +"웹 페이지의 캐시된 복사본,그림 그리고 인증서." #: inetcpl.rc:70 msgid "" @@ -5574,11 +5574,11 @@ msgstr "컨트롤 아이디를 찾을 수 없음.\n" #: winerror.mc:2506 msgid "Invalid combo box message.\n" -msgstr "올바르지 않은 콤보박스 메세지.\n" +msgstr "올바르지 않은 콤보 박스 메세지입니다.\n" #: winerror.mc:2511 msgid "Not a combo box window.\n" -msgstr "콤보박스 창이 아닙니다.\n" +msgstr "콤보 박스 창이 아닙니다.\n" #: winerror.mc:2516 msgid "Invalid edit height.\n"

1 0

Vincent Povirk : mscoree: Avoid calling mono_image_open_from_module_handle for libraries.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: d5cec3b08e0ab928a6d85caddbb9a5031689af90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5cec3b08e0ab928a6d85cadd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 20 11:15:33 2012 -0500 mscoree: Avoid calling mono_image_open_from_module_handle for libraries. --- dlls/mscoree/corruntimehost.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index b5ee842..ffc204d 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -911,13 +911,9 @@ static void CDECL ReallyFixupVTable(struct dll_fixup *fixup) { host->mono->mono_thread_attach(domain); - image = host->mono->mono_image_open_from_module_handle(fixup->dll, - filenameA, 1, &status); + assembly = host->mono->mono_assembly_open(filenameA, &status); } - if (image) - assembly = host->mono->mono_assembly_load_from(image, filenameA, &status); - if (assembly) { int i;

1 0

Michael Stefaniuc : qedit: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: e59cc20f93ca904a4d232e047c466e752f366de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59cc20f93ca904a4d232e047… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 20 11:55:43 2012 +0200 qedit: COM cleanup for the IClassFactory iface. --- dlls/qedit/main.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index 6b0375e..40514d5 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -42,12 +42,16 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) * DirectShow ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; - + IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + struct object_creation_info { const CLSID *clsid; @@ -60,34 +64,30 @@ static const struct object_creation_info object_creation[] = { &CLSID_SampleGrabber, SampleGrabber_create }, }; -static HRESULT WINAPI -DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) +static HRESULT WINAPI DSCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } *ppobj = NULL; - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + WARN("(%p)->(%s,%p), not found\n", iface, debugstr_guid(riid), ppobj); return E_NOINTERFACE; } -static ULONG WINAPI DSCF_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI DSCF_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) +static ULONG WINAPI DSCF_Release(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -96,9 +96,10 @@ static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) return ref; } -static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, + void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; @@ -116,9 +117,9 @@ static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter return hres; } -static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) +static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); return S_OK; } @@ -182,12 +183,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) factory = CoTaskMemAlloc(sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; + factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl; factory->ref = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - *ppv = &(factory->ITF_IClassFactory); + *ppv = &factory->IClassFactory_iface; return S_OK; }

1 0