wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Lauri Kenttä : cryptui: Use (*.ext) instead of (.ext) in file format strings.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 104e31993d86dce1f52ebf30b6eeccecadb2a2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=104e31993d86dce1f52ebf30b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Mar 13 17:03:49 2012 +0200 cryptui: Use (*.ext) instead of (.ext) in file format strings. --- dlls/cryptui/cryptui.rc | 14 +++++++------- po/ar.po | 20 ++++++++------------ po/bg.po | 20 ++++++++------------ po/ca.po | 32 ++++++++++++++++++++------------ po/cs.po | 20 ++++++++------------ po/da.po | 20 ++++++++------------ po/de.po | 34 +++++++++++++++++++++------------- po/el.po | 20 ++++++++------------ po/en.po | 22 +++++++++------------- po/en_US.po | 37 ++++++++++++++++--------------------- po/eo.po | 20 ++++++++------------ po/es.po | 34 +++++++++++++++++++++------------- po/fa.po | 20 ++++++++------------ po/fi.po | 34 +++++++++++++++++++++------------- po/fr.po | 34 +++++++++++++++++++++------------- po/he.po | 20 ++++++++------------ po/hi.po | 20 ++++++++------------ po/hu.po | 34 +++++++++++++++++++++------------- po/it.po | 34 +++++++++++++++++++++------------- po/ja.po | 34 +++++++++++++++++++--------------- po/ko.po | 34 +++++++++++++++++++++------------- po/lt.po | 34 +++++++++++++++++++++------------- po/ml.po | 20 ++++++++------------ po/nb_NO.po | 32 ++++++++++++++++++++------------ po/nl.po | 34 +++++++++++++++++++++------------- po/or.po | 20 ++++++++------------ po/pa.po | 20 ++++++++------------ po/pl.po | 34 +++++++++++++++++++++------------- po/pt_BR.po | 34 +++++++++++++++++++++------------- po/pt_PT.po | 34 +++++++++++++++++++++------------- po/rm.po | 20 ++++++++------------ po/ro.po | 34 +++++++++++++++++++++------------- po/ru.po | 34 +++++++++++++++++++++------------- po/sk.po | 20 ++++++++------------ po/sl.po | 34 +++++++++++++++++++++------------- po/sr_RS(a)cyrillic.po | 20 ++++++++------------ po/sr_RS(a)latin.po | 20 ++++++++------------ po/sv.po | 28 ++++++++++++++++------------ po/te.po | 20 ++++++++------------ po/th.po | 20 ++++++++------------ po/tr.po | 20 ++++++++------------ po/uk.po | 34 +++++++++++++++++++--------------- po/wa.po | 20 ++++++++------------ po/wine.pot | 20 ++++++++------------ po/zh_CN.po | 20 ++++++++------------ po/zh_TW.po | 20 ++++++++------------ 46 files changed, 625 insertions(+), 578 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=104e31993d86dce1f52eb…

1 0

Lauri Kenttä : cryptui: Use the same string in import and export wizards.
by Alexandre Julliard 13 Mar '12

13 Mar '12

1 0

Jaka Kranjc : po: Preserve the previous msgid on change as a hint to translators.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 08e7491cb5a18c260209cd8629aa33521fd3124b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e7491cb5a18c260209cd862… Author: Jaka Kranjc <lynxlupodian(a)users.sourceforge.net> Date: Tue Feb 21 22:51:28 2012 +0100 po: Preserve the previous msgid on change as a hint to translators. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e7d691d..045d4f5 100755 --- a/configure +++ b/configure @@ -15590,7 +15590,7 @@ then test "$srcdir" = . || as_fn_error $? "Rebuilding po files is not supported for out of tree builds." "$LINENO" 5 wine_fn_append_rule ALL_MAKEFILE_DEPENDS "ALL_POT_FILES =$ALL_POT_FILES \$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot - msgmerge -q \$@ \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@ + msgmerge --previous -q \$@ \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@ \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES) msgcat -o \$@ \$(ALL_POT_FILES)" fi diff --git a/configure.ac b/configure.ac index 3fd320e..27db29c 100644 --- a/configure.ac +++ b/configure.ac @@ -3107,7 +3107,7 @@ then WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], [ALL_POT_FILES =$ALL_POT_FILES \$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot - msgmerge -q \$[@] \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$[(a)].new && mv \$[(a)].new \$[@] + msgmerge --previous -q \$[@] \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$[(a)].new && mv \$[(a)].new \$[@] \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES) msgcat -o \$[@] \$(ALL_POT_FILES)]) fi

1 0

Piotr Caban : urlmon: Search for MIME filters defined in registry in get_mime_filter.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: be4192510d79f8b03f54ee2aea241c65d80f3dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=be4192510d79f8b03f54ee2ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 13 14:10:38 2012 +0100 urlmon: Search for MIME filters defined in registry in get_mime_filter. --- dlls/urlmon/session.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index d61a35e..17e0ddc 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -260,9 +260,17 @@ HRESULT get_protocol_handler(IUri *uri, CLSID *clsid, BOOL *urlmon_protocol, ICl IInternetProtocol *get_mime_filter(LPCWSTR mime) { + static const WCHAR filtersW[] = {'P','r','o','t','o','c','o','l','s', + '\\','F','i','l','t','e','r',0 }; + static const WCHAR CLSIDW[] = {'C','L','S','I','D',0}; + IClassFactory *cf = NULL; IInternetProtocol *ret; mime_filter *iter; + HKEY hlist, hfilter; + WCHAR clsidw[64]; + CLSID clsid; + DWORD res, type, size; HRESULT hres; EnterCriticalSection(&session_cs); @@ -276,12 +284,44 @@ IInternetProtocol *get_mime_filter(LPCWSTR mime) LeaveCriticalSection(&session_cs); - if(!cf) + if(cf) { + hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocol, (void**)&ret); + if(FAILED(hres)) { + WARN("CreateInstance failed: %08x\n", hres); + return NULL; + } + + return ret; + } + + res = RegOpenKeyW(HKEY_CLASSES_ROOT, filtersW, &hlist); + if(res != ERROR_SUCCESS) { + TRACE("Could not open MIME filters key\n"); + return NULL; + } + + res = RegOpenKeyW(hlist, mime, &hfilter); + CloseHandle(hlist); + if(res != ERROR_SUCCESS) + return NULL; + + size = sizeof(clsidw); + res = RegQueryValueExW(hfilter, CLSIDW, NULL, &type, (LPBYTE)clsidw, &size); + CloseHandle(hfilter); + if(res!=ERROR_SUCCESS || type!=REG_SZ) { + WARN("Could not get filter CLSID for %s\n", debugstr_w(mime)); return NULL; + } + + hres = CLSIDFromString(clsidw, &clsid); + if(FAILED(hres)) { + WARN("CLSIDFromString failed for %s (%x)\n", debugstr_w(mime), hres); + return NULL; + } - hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocol, (void**)&ret); + hres = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&ret); if(FAILED(hres)) { - WARN("CreateInstance failed: %08x\n", hres); + WARN("CoCreateInstance failed: %08x\n", hres); return NULL; }

1 0

Piotr Caban : urlmon: Clean session related data in free_session function.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: b36cb0b94dd7abbf767f3ef22a04f2b3d9e81dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36cb0b94dd7abbf767f3ef22… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 13 14:09:30 2012 +0100 urlmon: Clean session related data in free_session function. --- dlls/urlmon/session.c | 27 +++++++++++++++++---------- dlls/urlmon/urlmon_main.c | 12 +++++------- dlls/urlmon/urlmon_main.h | 2 +- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 24ed2e5..d61a35e 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -119,7 +119,7 @@ static HRESULT get_protocol_cf(LPCWSTR schema, DWORD schema_len, CLSID *pclsid, return SUCCEEDED(hres) ? S_OK : MK_E_SYNTAX; } -static HRESULT register_namespace(IClassFactory *cf, REFIID clsid, LPCWSTR protocol, BOOL urlmon_protocol) +HRESULT register_namespace(IClassFactory *cf, REFIID clsid, LPCWSTR protocol, BOOL urlmon_protocol) { name_space *new_name_space; @@ -165,15 +165,6 @@ static HRESULT unregister_namespace(IClassFactory *cf, LPCWSTR protocol) return S_OK; } - -void register_urlmon_namespace(IClassFactory *cf, REFIID clsid, LPCWSTR protocol, BOOL do_register) -{ - if(do_register) - register_namespace(cf, clsid, protocol, TRUE); - else - unregister_namespace(cf, protocol); -} - BOOL is_registered_protocol(LPCWSTR url) { DWORD schema_len; @@ -675,5 +666,21 @@ HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPSTR pcszUAOut, DWORD *cbS void free_session(void) { + name_space *ns_iter, *ns_last; + mime_filter *mf_iter, *mf_last; + + LIST_FOR_EACH_ENTRY_SAFE(ns_iter, ns_last, &name_space_list, name_space, entry) { + if(!ns_iter->urlmon) + IClassFactory_Release(ns_iter->cf); + heap_free(ns_iter->protocol); + heap_free(ns_iter); + } + + LIST_FOR_EACH_ENTRY_SAFE(mf_iter, mf_last, &mime_filter_list, mime_filter, entry) { + IClassFactory_Release(mf_iter->cf); + heap_free(mf_iter->mime); + heap_free(mf_iter); + } + heap_free(user_agent); } diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index e22f037..3fea58c 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -42,7 +42,7 @@ LONG URLMON_refCount = 0; static HMODULE hCabinet = NULL; static DWORD urlmon_tls = TLS_OUT_OF_INDEXES; -static void init_session(BOOL); +static void init_session(void); static struct list tls_list = LIST_INIT(tls_list); @@ -136,7 +136,6 @@ static void process_detach(void) if (hCabinet) FreeLibrary(hCabinet); - init_session(FALSE); free_session(); free_tls_list(); } @@ -152,7 +151,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) switch(fdwReason) { case DLL_PROCESS_ATTACH: - init_session(TRUE); + init_session(); break; case DLL_PROCESS_DETACH: @@ -327,15 +326,14 @@ static const struct object_creation_info object_creation[] = { &CLSID_CUri, &CUriCF.IClassFactory_iface, NULL } }; -static void init_session(BOOL init) +static void init_session(void) { unsigned int i; for(i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) { - if(object_creation[i].protocol) - register_urlmon_namespace(object_creation[i].cf, object_creation[i].clsid, - object_creation[i].protocol, init); + register_namespace(object_creation[i].cf, object_creation[i].clsid, + object_creation[i].protocol, TRUE); } } diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 391b1b3..be9bc7f 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -68,7 +68,7 @@ IInternetProtocolInfo *get_protocol_info(LPCWSTR) DECLSPEC_HIDDEN; HRESULT get_protocol_handler(IUri*,CLSID*,BOOL*,IClassFactory**) DECLSPEC_HIDDEN; IInternetProtocol *get_mime_filter(LPCWSTR) DECLSPEC_HIDDEN; BOOL is_registered_protocol(LPCWSTR) DECLSPEC_HIDDEN; -void register_urlmon_namespace(IClassFactory*,REFIID,LPCWSTR,BOOL) DECLSPEC_HIDDEN; +HRESULT register_namespace(IClassFactory*,REFIID,LPCWSTR,BOOL) DECLSPEC_HIDDEN; HINTERNET get_internet_session(IInternetBindInfo*) DECLSPEC_HIDDEN; LPWSTR get_useragent(void) DECLSPEC_HIDDEN; void free_session(void) DECLSPEC_HIDDEN;

1 0

Piotr Caban : urlmon: Use wine lists to store namespaces and MIME filters.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: e804d0915a909997681a0d9cf1eba6a9308408b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e804d0915a909997681a0d9cf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 13 14:09:09 2012 +0100 urlmon: Use wine lists to store namespaces and MIME filters. --- dlls/urlmon/session.c | 82 +++++++++++++++++++----------------------------- 1 files changed, 33 insertions(+), 49 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index fc36c0b..24ed2e5 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -23,25 +23,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); -typedef struct name_space { +typedef struct { LPWSTR protocol; IClassFactory *cf; CLSID clsid; BOOL urlmon; - struct name_space *next; + struct list entry; } name_space; -typedef struct mime_filter { +typedef struct { IClassFactory *cf; CLSID clsid; LPWSTR mime; - struct mime_filter *next; + struct list entry; } mime_filter; -static name_space *name_space_list = NULL; -static mime_filter *mime_filter_list = NULL; +static struct list name_space_list = LIST_INIT(name_space_list); +static struct list mime_filter_list = LIST_INIT(mime_filter_list); static CRITICAL_SECTION session_cs; static CRITICAL_SECTION_DEBUG session_cs_dbg = @@ -63,7 +63,7 @@ static name_space *find_name_space(LPCWSTR protocol) { name_space *iter; - for(iter = name_space_list; iter; iter = iter->next) { + LIST_FOR_EACH_ENTRY(iter, &name_space_list, name_space, entry) { if(!strcmpW(iter->protocol, protocol)) return iter; } @@ -134,8 +134,7 @@ static HRESULT register_namespace(IClassFactory *cf, REFIID clsid, LPCWSTR proto EnterCriticalSection(&session_cs); - new_name_space->next = name_space_list; - name_space_list = new_name_space; + list_add_head(&name_space_list, &new_name_space->entry); LeaveCriticalSection(&session_cs); @@ -144,32 +143,25 @@ static HRESULT register_namespace(IClassFactory *cf, REFIID clsid, LPCWSTR proto static HRESULT unregister_namespace(IClassFactory *cf, LPCWSTR protocol) { - name_space *iter, *last = NULL; + name_space *iter; EnterCriticalSection(&session_cs); - for(iter = name_space_list; iter; iter = iter->next) { - if(iter->cf == cf && !strcmpW(iter->protocol, protocol)) - break; - last = iter; - } + LIST_FOR_EACH_ENTRY(iter, &name_space_list, name_space, entry) { + if(iter->cf == cf && !strcmpW(iter->protocol, protocol)) { + list_remove(&iter->entry); - if(iter) { - if(last) - last->next = iter->next; - else - name_space_list = iter->next; - } + LeaveCriticalSection(&session_cs); - LeaveCriticalSection(&session_cs); - - if(iter) { - if(!iter->urlmon) - IClassFactory_Release(iter->cf); - heap_free(iter->protocol); - heap_free(iter); + if(!iter->urlmon) + IClassFactory_Release(iter->cf); + heap_free(iter->protocol); + heap_free(iter); + return S_OK; + } } + LeaveCriticalSection(&session_cs); return S_OK; } @@ -284,7 +276,7 @@ IInternetProtocol *get_mime_filter(LPCWSTR mime) EnterCriticalSection(&session_cs); - for(iter = mime_filter_list; iter; iter = iter->next) { + LIST_FOR_EACH_ENTRY(iter, &mime_filter_list, mime_filter, entry) { if(!strcmpW(iter->mime, mime)) { cf = iter->cf; break; @@ -379,8 +371,7 @@ static HRESULT WINAPI InternetSession_RegisterMimeFilter(IInternetSession *iface EnterCriticalSection(&session_cs); - filter->next = mime_filter_list; - mime_filter_list = filter; + list_add_head(&mime_filter_list, &filter->entry); LeaveCriticalSection(&session_cs); @@ -390,33 +381,26 @@ static HRESULT WINAPI InternetSession_RegisterMimeFilter(IInternetSession *iface static HRESULT WINAPI InternetSession_UnregisterMimeFilter(IInternetSession *iface, IClassFactory *pCF, LPCWSTR pwzType) { - mime_filter *iter, *prev = NULL; + mime_filter *iter; TRACE("(%p %s)\n", pCF, debugstr_w(pwzType)); EnterCriticalSection(&session_cs); - for(iter = mime_filter_list; iter; iter = iter->next) { - if(iter->cf == pCF && !strcmpW(iter->mime, pwzType)) - break; - prev = iter; - } + LIST_FOR_EACH_ENTRY(iter, &mime_filter_list, mime_filter, entry) { + if(iter->cf == pCF && !strcmpW(iter->mime, pwzType)) { + list_remove(&iter->entry); - if(iter) { - if(prev) - prev->next = iter->next; - else - mime_filter_list = iter->next; - } + LeaveCriticalSection(&session_cs); - LeaveCriticalSection(&session_cs); - - if(iter) { - IClassFactory_Release(iter->cf); - heap_free(iter->mime); - heap_free(iter); + IClassFactory_Release(iter->cf); + heap_free(iter->mime); + heap_free(iter); + return S_OK; + } } + LeaveCriticalSection(&session_cs); return S_OK; }

1 0

Christian Costa : d3drm: Fix leakage of pData2 on error.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: fe339ba25bd3143fd6eb15d2841ab5a434cdf1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe339ba25bd3143fd6eb15d28… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 9 11:55:37 2012 +0100 d3drm: Fix leakage of pData2 on error. --- dlls/d3drm/meshbuilder.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 21ff568..5885062 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1159,10 +1159,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* hr = IDirectXFileData_GetType(pData2, &pGuid); if (hr != DXFILE_OK) - { - IDirectXFileData_Release(pData2); goto end; - } TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); @@ -1206,11 +1203,14 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* } IDirectXFileData_Release(pData2); + pData2 = NULL; } ret = D3DRM_OK; end: + if (pData2) + IDirectXFileData_Release(pData2); if (pData) IDirectXFileData_Release(pData); if (pEnumObject)

1 0

Christian Costa : d3drm: Fix leakage of This-> pCoords2d when releasing object.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: ccb38b2d9f9190086642ffe8b46cf3ac87cca607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccb38b2d9f9190086642ffe8b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 9 11:55:29 2012 +0100 d3drm: Fix leakage of This->pCoords2d when releasing object. --- dlls/d3drm/meshbuilder.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 39df1c6..21ff568 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -340,6 +340,7 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* HeapFree(GetProcessHeap(), 0, This->pVertices); HeapFree(GetProcessHeap(), 0, This->pNormals); HeapFree(GetProcessHeap(), 0, This->pFaceData); + HeapFree(GetProcessHeap(), 0, This->pCoords2d); HeapFree(GetProcessHeap(), 0, This); }

1 0

Christian Costa : d3drm: Turn some FIXME into TRACE.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 28745b6f98a6a928cc001784d434dca9a5ee22e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28745b6f98a6a928cc001784d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 9 11:55:01 2012 +0100 d3drm: Turn some FIXME into TRACE. --- dlls/d3drm/meshbuilder.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index cea7da0..39df1c6 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1145,7 +1145,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* hr = IDirectXFileData_GetNextObject(pData, &pObject); if (hr == DXFILEERR_NOMOREOBJECTS) { - FIXME("no more object\n"); + TRACE("No more object\n"); break; } if (hr != DXFILE_OK) @@ -1163,7 +1163,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* goto end; } - FIXME("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); + TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); if (!IsEqualGUID(pGuid, &TID_D3DRMMeshNormals)) { @@ -1176,7 +1176,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* This->nb_normals = *(DWORD*)ptr; tmp = *(DWORD*)(ptr + sizeof(DWORD) + This->nb_normals * sizeof(D3DVECTOR)); - FIXME("MeshNormals: nb_normals = %d, nb_faces_normals = %d\n", This->nb_normals, tmp); + TRACE("MeshNormals: nb_normals = %d, nb_faces_normals = %d\n", This->nb_normals, tmp); This->pNormals = HeapAlloc(GetProcessHeap(), 0, This->nb_normals * sizeof(D3DVECTOR)); memcpy(This->pNormals, ptr + sizeof(DWORD), This->nb_normals * sizeof(D3DVECTOR)); @@ -1189,7 +1189,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* This->nb_coords2d = *(DWORD*)ptr; - FIXME("MeshTextureCoords: nb_coords2d = %d\n", This->nb_coords2d); + TRACE("MeshTextureCoords: nb_coords2d = %d\n", This->nb_coords2d); This->pCoords2d = HeapAlloc(GetProcessHeap(), 0, This->nb_coords2d * sizeof(Coords2d)); memcpy(This->pCoords2d, ptr + sizeof(DWORD), This->nb_coords2d * sizeof(Coords2d));

1 0

Hans Leidekker : msi: Fix deleting services on installation.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: c98bf1b57b795e97161c8960e1964eafde1816ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98bf1b57b795e97161c8960e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 13 12:51:26 2012 +0100 msi: Fix deleting services on installation. Based on a patch by Berhard Loos. --- dlls/msi/action.c | 19 ++++++--------- dlls/msi/tests/action.c | 56 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 87fc906..16e2186 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5913,28 +5913,25 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) MSIPACKAGE *package = param; MSICOMPONENT *comp; MSIRECORD *uirow; - LPCWSTR component; LPWSTR name = NULL, display_name = NULL; DWORD event, len; SC_HANDLE scm = NULL, service = NULL; - event = MSI_RecordGetInteger( rec, 3 ); - if (!(event & msidbServiceControlEventDelete)) - return ERROR_SUCCESS; - - component = MSI_RecordGetString(rec, 6); - comp = msi_get_loaded_component(package, component); + comp = msi_get_loaded_component( package, MSI_RecordGetString(rec, 6) ); if (!comp) return ERROR_SUCCESS; + event = MSI_RecordGetInteger( rec, 3 ); + deformat_string( package, MSI_RecordGetString(rec, 2), &name ); + comp->Action = msi_get_component_action( package, comp ); - if (comp->Action != INSTALLSTATE_ABSENT) + if (!(comp->Action == INSTALLSTATE_LOCAL && (event & msidbServiceControlEventDelete)) && + !(comp->Action == INSTALLSTATE_ABSENT && (event & msidbServiceControlEventUninstallDelete))) { - TRACE("component not scheduled for removal %s\n", debugstr_w(component)); + TRACE("service %s not scheduled for removal\n", debugstr_w(name)); + msi_free( name ); return ERROR_SUCCESS; } - - deformat_string( package, MSI_RecordGetString(rec, 2), &name ); stop_service( name ); scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ); diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 3743e50..2b482df 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -73,7 +73,8 @@ static const char component_dat[] = "Two\t{BF03D1A6-20DA-4A65-82F3-6CAC995915CE}\tFIRSTDIR\t2\t\ttwo.txt\n" "dangler\t{6091DF25-EF96-45F1-B8E9-A9B1420C7A3C}\tTARGETDIR\t4\t\tregdata\n" "component\t\tMSITESTDIR\t0\t1\tfile\n" - "service_comp\t\tMSITESTDIR\t0\t1\tservice_file"; + "service_comp\t{935A0A91-22A3-4F87-BCA8-928FFDFE2353}\tMSITESTDIR\t0\t\tservice_file\n" + "service_comp2\t{3F7B04A4-9521-4649-BDC9-0C8722740A49}\tMSITESTDIR\t0\t\tservice_file2"; static const char directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -109,7 +110,8 @@ static const char feature_comp_dat[] = "Three\tThree\n" "Two\tTwo\n" "feature\tcomponent\n" - "service_feature\tservice_comp\n"; + "service_feature\tservice_comp\n" + "service_feature\tservice_comp2"; static const char file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" @@ -121,7 +123,8 @@ static const char file_dat[] = "three.txt\tThree\tthree.txt\t1000\t\t\t0\t3\n" "two.txt\tTwo\ttwo.txt\t1000\t\t\t0\t2\n" "file\tcomponent\tfilename\t100\t\t\t8192\t1\n" - "service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t1"; + "service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t6\n" + "service_file2\tservice_comp2\tservice2.exe\t100\t\t\t8192\t7"; static const char install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -149,7 +152,7 @@ static const char media_dat[] = "i2\ti4\tL64\tS255\tS32\tS72\n" "Media\tDiskId\n" "1\t3\t\t\tDISK1\t\n" - "2\t5\t\tmsitest.cab\tDISK2\t\n"; + "2\t7\t\tmsitest.cab\tDISK2\t\n"; static const char property_dat[] = "Property\tValue\n" @@ -172,7 +175,9 @@ static const char property_dat[] = "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" "SERVNAME\tTestService\n" + "SERVNAME2\tTestService2\n" "SERVDISP\tTestServiceDisp\n" + "SERVDISP2\tTestServiceDisp2\n" "MSIFASTINSTALL\t1\n"; static const char environment_dat[] = @@ -211,13 +216,15 @@ static const char service_install_dat[] = "LoadOrderGroup\tDependencies\tStartName\tPassword\tArguments\tComponent_\tDescription\n" "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" "ServiceInstall\tServiceInstall\n" - "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService\t\t-a arg\tservice_comp\tdescription"; + "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService\t\t-a arg\tservice_comp\tdescription\n" + "TestService2\tSERVNAME2]\t[SERVDISP2]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService2\t\t-a arg\tservice_comp2\tdescription"; static const char service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" "s72\tl255\ti2\tL255\tI2\ts72\n" "ServiceControl\tServiceControl\n" - "ServiceControl\tTestService\t8\t\t0\tservice_comp"; + "ServiceControl\tTestService3\t8\t\t0\tservice_comp\n" + "ServiceControl2\tTestService3\t128\t\t0\tservice_comp2"; static const char sss_service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" @@ -254,11 +261,13 @@ static const char sds_install_exec_seq_dat[] = "CostFinalize\t\t1000\n" "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" - "DeleteServices\tInstalled\t5000\n" + "StopServices\t\t5000\n" + "DeleteServices\t\t5050\n" "MoveFiles\t\t5100\n" "InstallFiles\t\t5200\n" "DuplicateFiles\t\t5300\n" - "InstallServices\tNOT Installed\t5400\n" + "InstallServices\t\t5400\n" + "StartServices\t\t5450\n" "RegisterProduct\t\t5500\n" "PublishFeatures\t\t5600\n" "PublishProduct\t\t5700\n" @@ -2181,6 +2190,7 @@ static void create_test_files(void) create_file("msitest\\filename", 100); create_file("msitest\\service.exe", 100); + create_file("msitest\\service2.exe", 100); DeleteFileA("four.txt"); DeleteFileA("five.txt"); @@ -2208,6 +2218,7 @@ static void delete_test_files(void) DeleteFileA("msitest\\first\\two.txt"); DeleteFileA("msitest\\one.txt"); DeleteFileA("msitest\\service.exe"); + DeleteFileA("msitest\\service2.exe"); DeleteFileA("msitest\\filename"); RemoveDirectoryA("msitest\\second"); RemoveDirectoryA("msitest\\first"); @@ -4706,6 +4717,7 @@ static void test_envvar(void) delete_pf("msitest\\filename", TRUE); delete_pf("msitest\\one.txt", TRUE); delete_pf("msitest\\service.exe", TRUE); + delete_pf("msitest\\service2.exe", TRUE); delete_pf("msitest", FALSE); error: @@ -4830,6 +4842,7 @@ static void test_start_services(void) ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); delete_test_files(); @@ -4853,6 +4866,8 @@ static void test_start_services(void) static void test_delete_services(void) { UINT r; + SC_HANDLE manager, service; + DWORD error; if (is_process_limited()) { @@ -4860,6 +4875,18 @@ static void test_delete_services(void) return; } + manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(manager != NULL, "can't open service manager %u\n", GetLastError()); + if (!manager) return; + + service = CreateServiceA(manager, "TestService3", "TestService3", + SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, "C:\\doesnt_exist.exe", NULL, NULL, NULL, NULL, NULL); + ok(service != NULL, "can't create service %u\n", GetLastError()); + CloseServiceHandle(service); + CloseServiceHandle(manager); + if (!service) goto error; + create_test_files(); create_database(msifile, sds_tables, sizeof(sds_tables) / sizeof(msi_table)); @@ -4873,6 +4900,16 @@ static void test_delete_services(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(manager != NULL, "can't open service manager\n"); + if (!manager) goto error; + + service = OpenServiceA(manager, "TestService3", GENERIC_ALL); + error = GetLastError(); + ok(service == NULL, "TestService3 not deleted\n"); + ok(error == ERROR_SERVICE_DOES_NOT_EXIST, "wrong error %u\n", error); + CloseServiceHandle(manager); + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -4887,6 +4924,7 @@ static void test_delete_services(void) ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: @@ -4928,6 +4966,7 @@ static void test_self_registration(void) ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: @@ -5034,6 +5073,7 @@ static void test_validate_product_id(void) ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); error:

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2012