December 2012 - Wine-Commits

Dmitry Timoshkov : po: Correct Russian translation of Portrait/ Landscape to match other places.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: 50d6583104f9f02e59ebf578d6372ead654fb194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d6583104f9f02e59ebf578d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 25 12:23:21 2012 +0800 po: Correct Russian translation of Portrait/Landscape to match other places. --- po/ru.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ru.po b/po/ru.po index 2e784b2..e940da4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -734,11 +734,11 @@ msgstr "&Источник:" #: comdlg32.rc:417 msgid "P&ortrait" -msgstr "&Портрет" +msgstr "&Книжная" #: comdlg32.rc:418 msgid "L&andscape" -msgstr "Л&андшафт" +msgstr "&Альбомная" #: comdlg32.rc:423 msgid "Setup Page"

1 0

Ken Thomases : winemac.drv: Tell git' s diff engine to recognize Objective-C source files.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: ce0f9b3128cf2955b3430ff294c5de28bcf3b9ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0f9b3128cf2955b3430ff29… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:14 2012 -0600 winemac.drv: Tell git's diff engine to recognize Objective-C source files. --- dlls/winemac.drv/.gitattributes | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/.gitattributes b/dlls/winemac.drv/.gitattributes new file mode 100644 index 0000000..4e9525e --- /dev/null +++ b/dlls/winemac.drv/.gitattributes @@ -0,0 +1,2 @@ +*.m diff=objc +*.h diff=objc

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.20
by Jeremy Newman Dec. 26, 2012

Dec. 26, 2012

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 Dec. 26, 2012

Dec. 26, 2012

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 Dec. 26, 2012

Dec. 26, 2012

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 Dec. 24, 2012

Dec. 24, 2012

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 Dec. 24, 2012

Dec. 24, 2012

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

Jacek Caban : atl100: Added AtlRegisterClassCategoriesHelper implementation .
by Alexandre Julliard Dec. 24, 2012

Dec. 24, 2012

Module: wine Branch: master Commit: 56c094186f7baf72310acee2194b6a13ae237be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c094186f7baf72310acee21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 24 15:13:39 2012 +0100 atl100: Added AtlRegisterClassCategoriesHelper implementation. --- dlls/atl100/atl.c | 75 +++++++++++++++++++++++++++++++++++++++- dlls/atl100/tests/Makefile.in | 2 +- dlls/atl100/tests/atl.c | 62 +++++++++++++++++++++++++++++++++ include/atlbase.h | 11 ++++++ 4 files changed, 147 insertions(+), 3 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 570fe5c..219365d 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -1,5 +1,6 @@ /* * Copyright 2012 Stefan Leichter + * Copyright 2012 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl100); +static ICatRegister *catreg; + /*********************************************************************** * AtlAdvise [atl100.@] */ @@ -379,8 +382,60 @@ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, */ HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID clsid, const struct _ATL_CATMAP_ENTRY *catmap, BOOL reg) { - FIXME("(%s %p %x)\n", debugstr_guid(clsid), catmap, reg); - return E_NOTIMPL; + const struct _ATL_CATMAP_ENTRY *iter; + HRESULT hres; + + TRACE("(%s %p %x)\n", debugstr_guid(clsid), catmap, reg); + + if(!catreg) { + ICatRegister *new_catreg; + + hres = CoCreateInstance(&CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, + &IID_ICatRegister, (void**)&new_catreg); + if(FAILED(hres)) + return hres; + + if(InterlockedCompareExchangePointer((void**)&catreg, new_catreg, NULL)) + ICatRegister_Release(new_catreg); + } + + for(iter = catmap; iter->iType != _ATL_CATMAP_ENTRY_END; iter++) { + CATID catid = *iter->pcatid; /* For stupid lack of const in ICatRegister declaration. */ + + if(iter->iType == _ATL_CATMAP_ENTRY_IMPLEMENTED) { + if(reg) + hres = ICatRegister_RegisterClassImplCategories(catreg, clsid, 1, &catid); + else + hres = ICatRegister_UnRegisterClassImplCategories(catreg, clsid, 1, &catid); + }else { + if(reg) + hres = ICatRegister_RegisterClassReqCategories(catreg, clsid, 1, &catid); + else + hres = ICatRegister_UnRegisterClassReqCategories(catreg, clsid, 1, &catid); + } + if(FAILED(hres)) + return hres; + } + + if(!reg) { + WCHAR reg_path[256] = {'C','L','S','I','D','\\'}, *ptr = reg_path+6; + + static const WCHAR implemented_catW[] = + {'I','m','p','l','e','m','e','n','t','e','d',' ','C','a','t','e','g','o','r','i','e','s',0}; + static const WCHAR required_catW[] = + {'R','e','q','u','i','r','e','d',' ','C','a','t','e','g','o','r','i','e','s',0}; + + ptr += StringFromGUID2(clsid, ptr, 64)-1; + *ptr++ = '\\'; + + memcpy(ptr, implemented_catW, sizeof(implemented_catW)); + RegDeleteKeyW(HKEY_CLASSES_ROOT, reg_path); + + memcpy(ptr, required_catW, sizeof(required_catW)); + RegDeleteKeyW(HKEY_CLASSES_ROOT, reg_path); + } + + return S_OK; } /*********************************************************************** @@ -390,3 +445,19 @@ DWORD WINAPI AtlGetVersion(void *pReserved) { return _ATL_VER; } + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch(fdwReason) { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + if(catreg) + ICatRegister_Release(catreg); + } + + return TRUE; +} diff --git a/dlls/atl100/tests/Makefile.in b/dlls/atl100/tests/Makefile.in index 4230bad..29e83d0 100644 --- a/dlls/atl100/tests/Makefile.in +++ b/dlls/atl100/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = atl100.dll -IMPORTS = ole32 atl100 +IMPORTS = atl100 ole32 advapi32 EXTRADEFS = -D_ATL_VER=_ATL_VER_100 C_SRCS = \ diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 7e6a7e0..e7882fa 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -25,6 +25,18 @@ #include <wine/test.h> +static const GUID CLSID_Test = + {0x178fc163,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x46}}; +#define CLSID_TEST_STR "178fc163-0000-0000-0000-000000000046" + +static const GUID CATID_CatTest1 = + {0x178fc163,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x46}}; +#define CATID_CATTEST1_STR "178fc163-0000-0000-0000-000000000146" + +static const GUID CATID_CatTest2 = + {0x178fc163,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x46}}; +#define CATID_CATTEST2_STR "178fc163-0000-0000-0000-000000000246" + static void test_winmodule(void) { _AtlCreateWndData create_data[3]; @@ -95,11 +107,61 @@ static void test_winmodule(void) ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); } +#define test_key_exists(a,b) _test_key_exists(__LINE__,a,b) +static void _test_key_exists(unsigned line, HKEY root, const char *key_name) +{ + HKEY key; + DWORD res; + + res = RegOpenKeyA(root, key_name, &key); + ok_(__FILE__,line)(res == ERROR_SUCCESS, "Could not open key %s\n", key_name); + if(res == ERROR_SUCCESS) + RegCloseKey(key); +} + +#define test_key_not_exists(a,b) _test_key_not_exists(__LINE__,a,b) +static void _test_key_not_exists(unsigned line, HKEY root, const char *key_name) +{ + HKEY key; + DWORD res; + + res = RegOpenKeyA(root, key_name, &key); + ok_(__FILE__,line)(res == ERROR_FILE_NOT_FOUND, "Attempting to open %s returned %u\n", key_name, res); + if(res == ERROR_SUCCESS) + RegCloseKey(key); +} + +static void test_regcat(void) +{ + HRESULT hres; + + const struct _ATL_CATMAP_ENTRY catmap[] = { + {_ATL_CATMAP_ENTRY_IMPLEMENTED, &CATID_CatTest1}, + {_ATL_CATMAP_ENTRY_REQUIRED, &CATID_CatTest2}, + {_ATL_CATMAP_ENTRY_END} + }; + + hres = AtlRegisterClassCategoriesHelper(&CLSID_Test, catmap, TRUE); + ok(hres == S_OK, "AtlRegisterClassCategoriesHelper failed: %08x\n", hres); + + test_key_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}"); + test_key_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}\\Implemented Categories\\{" CATID_CATTEST1_STR "}"); + test_key_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}\\Required Categories\\{" CATID_CATTEST2_STR "}"); + + hres = AtlRegisterClassCategoriesHelper(&CLSID_Test, catmap, FALSE); + ok(hres == S_OK, "AtlRegisterClassCategoriesHelper failed: %08x\n", hres); + + test_key_not_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}\\Implemented Categories"); + test_key_not_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}\\Required Categories"); + test_key_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}"); +} + START_TEST(atl) { CoInitialize(NULL); test_winmodule(); + test_regcat(); CoUninitialize(); } diff --git a/include/atlbase.h b/include/atlbase.h index 831150d..ee8167c 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -22,6 +22,7 @@ #define __WINE_ATLBASE_H__ #include <atliface.h> +#include <comcat.h> /* Wine extension: we (ab)use _ATL_VER to handle struct layout differences between ATL versions. */ #define _ATL_VER_30 0x0300 @@ -213,6 +214,16 @@ struct _ATL_REGMAP_ENTRY LPCOLESTR szData; }; +struct _ATL_CATMAP_ENTRY +{ + int iType; + const CATID *pcatid; +}; + +#define _ATL_CATMAP_ENTRY_END 0 +#define _ATL_CATMAP_ENTRY_IMPLEMENTED 1 +#define _ATL_CATMAP_ENTRY_REQUIRED 2 + HRESULT WINAPI AtlAdvise(IUnknown *pUnkCP, IUnknown *pUnk, const IID * iid, LPDWORD dpw); HRESULT WINAPI AtlAxAttachControl(IUnknown*,HWND,IUnknown**); HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**);

1 0

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

Dec. 24, 2012

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

Christian Costa : dmusic: Implement SynthPortImpl_IDirectMusicPort_DownloadInstrument.
by Alexandre Julliard Dec. 24, 2012

Dec. 24, 2012

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