May 2011 - Wine-commits - list.winehq.org

David Hedberg : crypt32: Add BCryptEnumAlgorithms stub.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 66db40e89190e970e599aafcc2c682d030924f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=66db40e89190e970e599aafcc… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon May 30 12:45:30 2011 +0200 crypt32: Add BCryptEnumAlgorithms stub. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 12 ++++++++++++ include/bcrypt.h | 7 +++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 7d85e12..e1ffb8a 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -14,7 +14,7 @@ @ stub BCryptDuplicateHash @ stub BCryptDuplicateKey @ stub BCryptEncrypt -@ stub BCryptEnumAlgorithms +@ stdcall BCryptEnumAlgorithms(long ptr ptr long) @ stub BCryptEnumContextFunctionProviders @ stub BCryptEnumContextFunctions @ stub BCryptEnumContexts diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index abe9750..441b3ef 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -22,6 +22,7 @@ #include "wine/debug.h" #include "winbase.h" +#include "bcrypt.h" WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); @@ -38,3 +39,14 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return TRUE; } + +NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, + BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) +{ + FIXME("%08x, %p, %p, %08x - stub\n", dwAlgOperations, pAlgCount, ppAlgList, dwFlags); + + *ppAlgList=NULL; + *pAlgCount=0; + + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/bcrypt.h b/include/bcrypt.h index a3d7fe0..43d1f94 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -40,4 +40,11 @@ typedef LONG NTSTATUS; #endif +typedef struct _BCRYPT_ALGORITHM_IDENTIFIER +{ + LPWSTR pszName; + ULONG dwClass; + ULONG dwFlags; +} BCRYPT_ALGORITHM_IDENTIFIER; + #endif /* __WINE_BCRYPT_H */

1 0

David Hedberg : ole32: Add ManualResetEvent implementation.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: a0980b47c8840ae1952c3561923e02ca1ff3b376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0980b47c8840ae1952c35619… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon May 30 12:45:31 2011 +0200 ole32: Add ManualResetEvent implementation. --- dlls/ole32/compobj.c | 113 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/tests/marshal.c | 64 +++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 0aa3aee..28e5da1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -458,6 +458,116 @@ static void COM_RevokeAllClasses(const struct apartment *apt) LeaveCriticalSection( &csRegisteredClassList ); } +/****************************************************************************** + * Implementation of the manual reset event object. (CLSID_ManualResetEvent) + */ + +typedef struct ManualResetEvent { + ISynchronize ISynchronize_iface; + LONG ref; + HANDLE event; +} MREImpl; + +static inline MREImpl *impl_from_ISynchronize(ISynchronize *iface) +{ + return CONTAINING_RECORD(iface, MREImpl, ISynchronize_iface); +} + +static HRESULT WINAPI ISynchronize_fnQueryInterface(ISynchronize *iface, REFIID riid, void **ppv) +{ + MREImpl *This = impl_from_ISynchronize(iface); + TRACE("%p (%s, %p)\n", This, debugstr_guid(riid), ppv); + + *ppv = NULL; + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ISynchronize)) + *ppv = This; + else + ERR("Unknown interface %s requested.\n", debugstr_guid(riid)); + + if(*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI ISynchronize_fnAddRef(ISynchronize *iface) +{ + MREImpl *This = impl_from_ISynchronize(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("%p - ref %d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ISynchronize_fnRelease(ISynchronize *iface) +{ + MREImpl *This = impl_from_ISynchronize(iface); + LONG ref = InterlockedDecrement(&This->ref); + TRACE("%p - ref %d\n", This, ref); + + if(!ref) + { + CloseHandle(This->event); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI ISynchronize_fnWait(ISynchronize *iface, DWORD dwFlags, DWORD dwMilliseconds) +{ + MREImpl *This = impl_from_ISynchronize(iface); + UINT index; + TRACE("%p (%08x, %08x)\n", This, dwFlags, dwMilliseconds); + return CoWaitForMultipleHandles(dwFlags, dwMilliseconds, 1, &This->event, &index); +} + +static HRESULT WINAPI ISynchronize_fnSignal(ISynchronize *iface) +{ + MREImpl *This = impl_from_ISynchronize(iface); + TRACE("%p\n", This); + SetEvent(This->event); + return S_OK; +} + +static HRESULT WINAPI ISynchronize_fnReset(ISynchronize *iface) +{ + MREImpl *This = impl_from_ISynchronize(iface); + TRACE("%p\n", This); + ResetEvent(This->event); + return S_OK; +} + +static ISynchronizeVtbl vt_ISynchronize = { + ISynchronize_fnQueryInterface, + ISynchronize_fnAddRef, + ISynchronize_fnRelease, + ISynchronize_fnWait, + ISynchronize_fnSignal, + ISynchronize_fnReset +}; + +static HRESULT ManualResetEvent_Construct(IUnknown *punkouter, REFIID iid, void **ppv) +{ + MREImpl *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MREImpl)); + HRESULT hr; + + if(punkouter) + FIXME("Aggregation not implemented.\n"); + + This->ref = 1; + This->ISynchronize_iface.lpVtbl = &vt_ISynchronize; + This->event = CreateEventW(NULL, TRUE, FALSE, NULL); + + hr = ISynchronize_QueryInterface(&This->ISynchronize_iface, iid, ppv); + ISynchronize_Release(&This->ISynchronize_iface); + return hr; +} + /*********************************************************************** * CoRevokeClassObject [OLE32.@] * @@ -2510,6 +2620,9 @@ HRESULT WINAPI CoCreateInstance( return S_OK; } + if (IsEqualCLSID(rclsid, &CLSID_ManualResetEvent)) + return ManualResetEvent_Construct(pUnkOuter, iid, ppv); + /* * Get a class factory to construct the object we want. */ diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 86a8f0f..87b2006 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -36,6 +36,7 @@ #include "wine/test.h" DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); /* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); @@ -2836,6 +2837,68 @@ static void test_globalinterfacetable(void) IGlobalInterfaceTable_Release(git); } +static void test_manualresetevent(void) +{ + ISynchronize *psync1, *psync2; + IUnknown *punk; + LONG ref; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ManualResetEvent, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&punk); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!!punk, "Got NULL.\n"); + IUnknown_Release(punk); + + hr = CoCreateInstance(&CLSID_ManualResetEvent, NULL, CLSCTX_INPROC_SERVER, &IID_ISynchronize, (void**)&psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!!psync1, "Got NULL.\n"); + + hr = ISynchronize_Wait(psync1, 0, 5); + ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr); + + hr = ISynchronize_Reset(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Signal(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Wait(psync1, 0, 5); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Wait(psync1, 0, 5); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Reset(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Wait(psync1, 0, 5); + ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr); + + hr = CoCreateInstance(&CLSID_ManualResetEvent, NULL, CLSCTX_INPROC_SERVER, &IID_ISynchronize, (void**)&psync2); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!!psync2, "Got NULL.\n"); + ok(psync1 != psync2, "psync1 == psync2.\n"); + hr = ISynchronize_Wait(psync2, 0, 5); + ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr); + + hr = ISynchronize_Reset(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Reset(psync2); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Signal(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Wait(psync2, 0, 5); + ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr); + + ref = ISynchronize_AddRef(psync1); + ok(ref == 2, "Got ref: %d\n", ref); + ref = ISynchronize_AddRef(psync1); + ok(ref == 3, "Got ref: %d\n", ref); + ref = ISynchronize_Release(psync1); + ok(ref == 2, "Got nonzero ref: %d\n", ref); + ref = ISynchronize_Release(psync2); + ok(!ref, "Got nonzero ref: %d\n", ref); + ref = ISynchronize_Release(psync1); + ok(ref == 1, "Got nonzero ref: %d\n", ref); + ref = ISynchronize_Release(psync1); + ok(!ref, "Got nonzero ref: %d\n", ref); +} + static const char *debugstr_iid(REFIID riid) { static char name[256]; @@ -3120,6 +3183,7 @@ START_TEST(marshal) test_local_server(); test_globalinterfacetable(); + test_manualresetevent(); /* must be last test as channel hooks can't be unregistered */ test_channel_hook();

1 0

Jacek Caban : include: Added iextag.idl file.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: e6ee2c163ea445bca1d73d8e64a0ee3258c7f67c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ee2c163ea445bca1d73d8e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 30 17:51:37 2011 +0200 include: Added iextag.idl file. --- .gitignore | 1 + include/Makefile.in | 1 + include/iextag.idl | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index cbe3b9f..711a35d 100644 --- a/.gitignore +++ b/.gitignore @@ -180,6 +180,7 @@ include/hlink.h include/htiframe.h include/iads.h include/icftypes.h +include/iextag.h include/imnact.h include/imnxport.h include/indexsrv.h diff --git a/include/Makefile.in b/include/Makefile.in index 1db5e81..673c32f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -41,6 +41,7 @@ PUBLIC_IDL_H_SRCS = \ htiframe.idl \ iads.idl \ icftypes.idl \ + iextag.idl \ imnact.idl \ imnxport.idl \ indexsrv.idl \ diff --git a/include/iextag.idl b/include/iextag.idl new file mode 100644 index 0000000..7ec0518 --- /dev/null +++ b/include/iextag.idl @@ -0,0 +1,105 @@ +/* + * Copyright 2011 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +[ + object, + uuid(7e8bc44d-aeff-11d1-89c2-00c04fb6bfc4), + dual, + pointer_default(unique) + ] +interface IClientCaps : IDispatch +{ + [propget, id(1)] + HRESULT javaEnabled([out, retval] VARIANT_BOOL *pVal); + + [propget, id(2)] + HRESULT cookieEnabled([out, retval] VARIANT_BOOL *pVal); + + [propget, id(3)] + HRESULT cpuClass([out, retval] BSTR *p); + + [propget, id(4)] + HRESULT systemLanguage([out, retval] BSTR *p); + + [propget, id(6)] + HRESULT userLanguage([out, retval] BSTR *p); + + [propget, id(7)] + HRESULT platform([out, retval] BSTR *p); + + [propget, id(9)] + HRESULT connectionSpeed([out, retval] long *p); + + [propget, id(10)] + HRESULT onLine([out, retval] VARIANT_BOOL *p); + + [propget, id(11)] + HRESULT colorDepth([out, retval] long *p); + + [propget, id(12)] + HRESULT bufferDepth([out, retval] long *p); + + [propget, id(13)] + HRESULT width([out, retval] long *p); + + [propget, id(14)] + HRESULT height([out, retval] long *p); + + [propget, id(15)] + HRESULT availHeight([out, retval] long *p); + + [propget, id(16)] + HRESULT availWidth([out, retval] long *p); + + [propget, id(17)] + HRESULT connectionType([out, retval] BSTR *p); + + [id(18)] + HRESULT isComponentInstalled( + [in] BSTR bstrName, + [in] BSTR bstrType, + [in, defaultvalue("")] BSTR bStrVer, + [out, retval] VARIANT_BOOL *p); + + [id(19)] + HRESULT getComponentVersion( + [in] BSTR bstrName, + [in] BSTR bstrType, + [out, retval] BSTR *pbstrVer); + + [id(20)] + HRESULT compareVersions( + [in] BSTR bstrVer1, + [in] BSTR bstrVer2, + [out, retval] long *p); + + [id(21)] + HRESULT addComponentRequest( + [in] BSTR bstrName, + [in] BSTR bstrType, + [in, defaultvalue("")] BSTR bstrVer); + + [id(22)] + HRESULT doComponentRequest([out, retval] VARIANT_BOOL *p); + + [id(23)] + HRESULT clearComponentRequest(); +}

1 0

Marcus Meissner : kernel32: Pass in a real string to SetLocaleInfoA, not a function pointer (Coverity).
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: d2dd407eb91e894e7e0fc6aa861514e3c42de297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2dd407eb91e894e7e0fc6aa8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 29 23:31:03 2011 +0200 kernel32: Pass in a real string to SetLocaleInfoA, not a function pointer (Coverity). --- dlls/kernel32/tests/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 1268c1d..e13247e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2440,13 +2440,13 @@ static void test_SetLocaleInfoA(void) /* IDATE */ SetLastError(0); - bRet = SetLocaleInfoA(lcid, LOCALE_IDATE, (LPSTR)test_SetLocaleInfoA); + bRet = SetLocaleInfoA(lcid, LOCALE_IDATE, "test_SetLocaleInfoA"); ok(!bRet && GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); /* ILDATE */ SetLastError(0); - bRet = SetLocaleInfoA(lcid, LOCALE_ILDATE, (LPSTR)test_SetLocaleInfoA); + bRet = SetLocaleInfoA(lcid, LOCALE_ILDATE, "test_SetLocaleInfoA"); ok(!bRet && GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); }

1 0

Marcus Meissner : gdiplus: Convert and pass in 3 points, not 1 (Coverity).
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 9af15023a2cbda823942d526f50a7958484e3997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af15023a2cbda823942d526f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 29 23:53:45 2011 +0200 gdiplus: Convert and pass in 3 points, not 1 (Coverity). --- dlls/gdiplus/matrix.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 1035cc2..acfe989 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -105,7 +105,8 @@ GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect *rect, GDIPCONST GpPoint GpMatrix **matrix) { GpRectF rectF; - GpPointF ptF; + GpPointF ptF[3]; + int i; TRACE("(%p, %p, %p)\n", rect, pt, matrix); @@ -114,10 +115,11 @@ GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect *rect, GDIPCONST GpPoint rectF.Width = (REAL)rect->Width; rectF.Height = (REAL)rect->Height; - ptF.X = (REAL)pt->X; - ptF.Y = (REAL)pt->Y; - - return GdipCreateMatrix3(&rectF, &ptF, matrix); + for (i = 0; i < 3; i++) { + ptF[i].X = (REAL)pt[i].X; + ptF[i].Y = (REAL)pt[i].Y; + } + return GdipCreateMatrix3(&rectF, ptF, matrix); } GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix *matrix, GpMatrix **clone)

1 0

Hans Leidekker : msi: Skip files from global assemblies in the RemoveFiles action.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 1d6540bdc8bac62b759870cbb3da99c8005adca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d6540bdc8bac62b759870cbb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 09:27:53 2011 +0200 msi: Skip files from global assemblies in the RemoveFiles action. --- dlls/msi/files.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 8b2feb9..2ea119e 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1164,7 +1164,10 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) TRACE("Skipping removal due to install mode\n"); return ERROR_SUCCESS; } - + if (comp->assembly && !comp->assembly->application) + { + return ERROR_SUCCESS; + } if (comp->Attributes & msidbComponentAttributesPermanent) { TRACE("permanent component, not removing file\n"); @@ -1266,15 +1269,19 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) MSIRECORD *uirow; LPWSTR dir, p; VS_FIXEDFILEINFO *ver; + MSICOMPONENT *comp = file->Component; if ( file->state == msifs_installed ) ERR("removing installed file %s\n", debugstr_w(file->TargetPath)); - file->Component->Action = msi_get_component_action( package, file->Component ); - if (file->Component->Action != INSTALLSTATE_ABSENT || file->Component->Installed == INSTALLSTATE_SOURCE) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_ABSENT || comp->Installed == INSTALLSTATE_SOURCE) + continue; + + if (comp->assembly && !comp->assembly->application) continue; - if (file->Component->Attributes & msidbComponentAttributesPermanent) + if (comp->Attributes & msidbComponentAttributesPermanent) { TRACE("permanent component, not removing file\n"); continue; @@ -1299,7 +1306,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) { WARN("failed to delete %s (%u)\n", debugstr_w(file->TargetPath), GetLastError()); } - else if (!has_persistent_dir( package, file->Component )) + else if (!has_persistent_dir( package, comp )) { if ((dir = strdupW( file->TargetPath ))) { @@ -1312,7 +1319,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) uirow = MSI_CreateRecord( 9 ); MSI_RecordSetStringW( uirow, 1, file->FileName ); - MSI_RecordSetStringW( uirow, 9, file->Component->Directory ); + MSI_RecordSetStringW( uirow, 9, comp->Directory ); msi_ui_actiondata( package, szRemoveFiles, uirow ); msiobj_release( &uirow->hdr ); /* FIXME: call msi_ui_progress here? */

1 0

Hans Leidekker : msi: Set the SystemComponent installation property if necessary.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 4c49cf853d25463b9eae42c61a18fe37c9d8e31f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c49cf853d25463b9eae42c61… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 09:28:14 2011 +0200 msi: Set the SystemComponent installation property if necessary. --- dlls/msi/action.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 86a8c99..5f42d7c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4815,6 +4815,10 @@ static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey) {'A','R','P','U','R','L','U','P','D','A','T','E','I','N','F','O',0}; static const WCHAR szURLUpdateInfo[] = {'U','R','L','U','p','d','a','t','e','I','n','f','o',0}; + static const WCHAR szARPSYSTEMCOMPONENT[] = + {'A','R','P','S','Y','S','T','E','M','C','O','M','P','O','N','E','N','T',0}; + static const WCHAR szSystemComponent[] = + {'S','y','s','t','e','m','C','o','m','p','o','n','e','n','t',0}; static const WCHAR *propval[] = { szARPAUTHORIZEDCDFPREFIX, szAuthorizedCDFPrefix, @@ -4844,7 +4848,10 @@ static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey) } msi_reg_set_val_dword(hkey, szWindowsInstaller, 1); - + if (msi_get_property_int( package->db, szARPSYSTEMCOMPONENT, 0 )) + { + msi_reg_set_val_dword( hkey, szSystemComponent, 1 ); + } size = deformat_string(package, modpath_fmt, &buffer); RegSetValueExW(hkey, szModifyPath, 0, REG_EXPAND_SZ, (LPBYTE)buffer, size); RegSetValueExW(hkey, szUninstallString, 0, REG_EXPAND_SZ, (LPBYTE)buffer, size);

1 0

Hans Leidekker : appwiz.cpl: Don't list system components.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 9432d65b7a6cb731bf513390f8e1677ad926f1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9432d65b7a6cb731bf513390f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 09:28:31 2011 +0200 appwiz.cpl: Don't list system components. --- dlls/appwiz.cpl/appwiz.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 957b8bf..48aee45 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -100,6 +100,7 @@ static const WCHAR CommentsW[] = {'C','o','m','m','e','n','t','s',0}; static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l', 'S','t','r','i','n','g',0}; static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; +static const WCHAR SystemComponentW[] = {'S','y','s','t','e','m','C','o','m','p','o','n','e','n','t',0}; static const WCHAR PathUninstallW[] = { 'S','o','f','t','w','a','r','e','\\', @@ -153,7 +154,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) HKEY hkeyApp; int i, id = 0; DWORD sizeOfSubKeyName, displen, uninstlen; - DWORD dwNoModify, dwType, value; + DWORD dwNoModify, dwType, value, size; WCHAR subKeyName[256]; WCHAR *command; APPINFO *info = NULL; @@ -165,12 +166,19 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) NULL, NULL, NULL) != ERROR_NO_MORE_ITEMS; ++i) { RegOpenKeyExW(root, subKeyName, 0, KEY_READ, &hkeyApp); - + size = sizeof(value); + if (!RegQueryValueExW(hkeyApp, SystemComponentW, NULL, &dwType, (LPBYTE)&value, &size) + && dwType == REG_DWORD && value == 1) + { + RegCloseKey(hkeyApp); + sizeOfSubKeyName = sizeof(subKeyName) / sizeof(subKeyName[0]); + continue; + } displen = 0; uninstlen = 0; if (!RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, NULL, &displen)) { - DWORD size = sizeof(value); + size = sizeof(value); if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &dwType, (LPBYTE)&value, &size) && dwType == REG_DWORD && value == 1) {

1 0

Hans Leidekker : uninstaller: Don't list system components.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 3de8370a4e9c98590fcf95c3421a10fde830d292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de8370a4e9c98590fcf95c34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 09:28:45 2011 +0200 uninstaller: Don't list system components. --- programs/uninstaller/main.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index c85bf5a..e3178db 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -60,7 +60,7 @@ static const WCHAR PathUninstallW[] = { 'U','n','i','n','s','t','a','l','l',0 }; static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l','S','t','r','i','n','g',0}; static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; - +static const WCHAR SystemComponentW[] = {'S','y','s','t','e','m','C','o','m','p','o','n','e','n','t',0}; /** * Used to output program list when used with --list @@ -176,19 +176,27 @@ static int FetchFromRootKey(HKEY root) { HKEY hkeyApp; int i; - DWORD sizeOfSubKeyName, displen, uninstlen; + DWORD sizeOfSubKeyName, displen, uninstlen, value, type, size; WCHAR subKeyName[256]; sizeOfSubKeyName = 255; for (i=0; RegEnumKeyExW( root, i, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, NULL ) != ERROR_NO_MORE_ITEMS; ++i) { RegOpenKeyExW(root, subKeyName, 0, KEY_READ, &hkeyApp); + if (!RegQueryValueExW(hkeyApp, SystemComponentW, NULL, &type, (LPBYTE)&value, &size) && + type == REG_DWORD && value == 1) + { + RegCloseKey(hkeyApp); + sizeOfSubKeyName = 255; + continue; + } if (!RegQueryValueExW(hkeyApp, DisplayNameW, NULL, NULL, NULL, &displen)) { - DWORD value, type; WCHAR *command; - if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &type, NULL, &value) && type == REG_DWORD && value == 1) + size = sizeof(value); + if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &type, (LPBYTE)&value, &size) && + type == REG_DWORD && value == 1) { static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','x','%','s',0}; command = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(fmtW) + lstrlenW(subKeyName)) * sizeof(WCHAR));

1 0

Alistair Leslie-Hughes : dbghelp: Add stubs SymFromIndex, SymFromIndexW.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 5d01166f9699eddfa1d793f2ab5f676c19a142dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d01166f9699eddfa1d793f2a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 19 21:58:53 2011 +1000 dbghelp: Add stubs SymFromIndex, SymFromIndexW. --- dlls/dbghelp/dbghelp.spec | 4 ++-- dlls/dbghelp/symbol.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 398847f..c50ab22 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -72,8 +72,8 @@ @ stdcall SymFindFileInPathW(long wstr wstr ptr long long long ptr ptr ptr) @ stdcall SymFromAddr(ptr int64 ptr ptr) @ stdcall SymFromAddrW(ptr int64 ptr ptr) -@ stub SymFromIndex -@ stub SymFromIndexW +@ stdcall SymFromIndex(long int64 long ptr) +@ stdcall SymFromIndexW(long int64 long ptr) @ stdcall SymFromName(long str ptr) @ stub SymFromNameW @ stub SymFromToken diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 16923e4..4682c85 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2087,3 +2087,27 @@ BOOL WINAPI SymGetLineFromNameW64(HANDLE hProcess, PCWSTR ModuleName, PCWSTR Fil dwLineNumber, plDisplacement, Line); return FALSE; } + +/****************************************************************** + * SymFromIndex (DBGHELP.@) + * + */ +BOOL WINAPI SymFromIndex(HANDLE hProcess, ULONG64 BaseOfDll, DWORD index, PSYMBOL_INFO symbol) +{ + FIXME("hProcess = %p, BaseOfDll = %s, index = %d, symbol = %p\n", + hProcess, wine_dbgstr_longlong(BaseOfDll), index, symbol); + + return FALSE; +} + +/****************************************************************** + * SymFromIndexW (DBGHELP.@) + * + */ +BOOL WINAPI SymFromIndexW(HANDLE hProcess, ULONG64 BaseOfDll, DWORD index, PSYMBOL_INFOW symbol) +{ + FIXME("hProcess = %p, BaseOfDll = %s, index = %d, symbol = %p\n", + hProcess, wine_dbgstr_longlong(BaseOfDll), index, symbol); + + return FALSE; +}

1 0