wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

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 : 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 : 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

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

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 : mpr: Added missing pointer dereference (Coverity).
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: c1833ea96345dbfe6f1f7ec0e60242bb2617a3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1833ea96345dbfe6f1f7ec0e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 29 23:24:16 2011 +0200 mpr: Added missing pointer dereference (Coverity). --- dlls/mpr/wnet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 2c57aaa..946f47e 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1173,7 +1173,7 @@ static DWORD _enumerateContextW(PWNetEnumerator enumerator, LPDWORD lpcCount, if (ret == WN_SUCCESS) { /* reflect the fact that we already enumerated "Entire Network" */ - lpcCount++; + (*lpcCount)++; *lpBufferSize = bufferSize + bytesNeeded; } else

1 0

Marcus Meissner : ntdll: Specify div to be divl.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: a73a6e0cded6b49de05af9eca69199a96b89adb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73a6e0cded6b49de05af9eca… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 29 20:59:01 2011 +0200 ntdll: Specify div to be divl. Avoids a clang bug. --- dlls/ntdll/large_int.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index cb98bae..54ce6b0 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -264,7 +264,7 @@ UINT WINAPI RtlEnlargedUnsignedDivide( ULONGLONG a, UINT b, UINT *remptr ) p1 = a >> 32; p2 = a & 0xffffffffLL; - __asm__("div %4,%%eax" + __asm__("divl %4,%%eax" : "=a" (ret), "=d" (rem) : "0" (p2), "1" (p1), "g" (b) ); if (remptr) *remptr = rem;

1 0

Dylan Smith : include: Pack ACMDRVSTREAMHEADER since ACMSTREAMHEADER is packed.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 836308ff17ad82836f23dd4f3ff61df4d1ccaadc URL: http://source.winehq.org/git/wine.git/?a=commit;h=836308ff17ad82836f23dd4f3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat May 28 18:02:49 2011 -0400 include: Pack ACMDRVSTREAMHEADER since ACMSTREAMHEADER is packed. --- include/msacmdrv.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/msacmdrv.h b/include/msacmdrv.h index 6436404..3933ea1 100644 --- a/include/msacmdrv.h +++ b/include/msacmdrv.h @@ -109,6 +109,7 @@ typedef struct _ACMDRVSTREAMINSTANCE } ACMDRVSTREAMINSTANCE, *PACMDRVSTREAMINSTANCE; typedef struct _ACMDRVSTREAMHEADER *PACMDRVSTREAMHEADER; +#include <pshpack1.h> typedef struct _ACMDRVSTREAMHEADER { DWORD cbStruct; DWORD fdwStatus; @@ -135,6 +136,7 @@ typedef struct _ACMDRVSTREAMHEADER { LPBYTE pbPreparedDst; DWORD cbPreparedDstLength; } ACMDRVSTREAMHEADER; +#include <poppack.h> typedef struct _ACMDRVSTREAMSIZE {

1 0

Marcus Meissner : wineoss.drv: Mark internal symbols with hidden visibility .
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: f8c8c13cc5d6d28ed8b60eab82f9fc0dabfd6f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c8c13cc5d6d28ed8b60eab8… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat May 28 10:49:32 2011 +0200 wineoss.drv: Mark internal symbols with hidden visibility. --- dlls/wineoss.drv/audio.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wineoss.drv/audio.h b/dlls/wineoss.drv/audio.h index 602e842..c917196 100644 --- a/dlls/wineoss.drv/audio.h +++ b/dlls/wineoss.drv/audio.h @@ -158,26 +158,26 @@ typedef struct { OSS_MSG_RING msgRing; } WINE_WAVEIN; -extern WINE_WAVEOUT WOutDev[MAX_WAVEDRV]; -extern WINE_WAVEIN WInDev[MAX_WAVEDRV]; -extern unsigned numOutDev; -extern unsigned numInDev; +extern WINE_WAVEOUT WOutDev[MAX_WAVEDRV] DECLSPEC_HIDDEN; +extern WINE_WAVEIN WInDev[MAX_WAVEDRV] DECLSPEC_HIDDEN; +extern unsigned numOutDev DECLSPEC_HIDDEN; +extern unsigned numInDev DECLSPEC_HIDDEN; -extern int getEnables(OSS_DEVICE *ossdev); -extern void copy_format(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2); +extern int getEnables(OSS_DEVICE *ossdev) DECLSPEC_HIDDEN; +extern void copy_format(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) DECLSPEC_HIDDEN; extern DWORD OSS_OpenDevice(OSS_DEVICE* ossdev, unsigned req_access, int* frag, int strict_format, - int sample_rate, int stereo, int fmt); + int sample_rate, int stereo, int fmt) DECLSPEC_HIDDEN; -extern void OSS_CloseDevice(OSS_DEVICE* ossdev); +extern void OSS_CloseDevice(OSS_DEVICE* ossdev) DECLSPEC_HIDDEN; -extern DWORD wodSetVolume(WORD wDevID, DWORD dwParam); +extern DWORD wodSetVolume(WORD wDevID, DWORD dwParam) DECLSPEC_HIDDEN; /* dscapture.c */ -extern DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv); -extern DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc); +extern DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv) DECLSPEC_HIDDEN; +extern DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc) DECLSPEC_HIDDEN; /* dsrender.c */ -extern DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv); -extern DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc); +extern DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv) DECLSPEC_HIDDEN; +extern DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : windowscodecs: Mark 3 vtables static.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 42ef8a5705bc80056fb4866cd60348d2e992e3df URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ef8a5705bc80056fb4866cd… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat May 28 10:49:31 2011 +0200 windowscodecs: Mark 3 vtables static. --- dlls/windowscodecs/stream.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index 1ed08f3..cd235a3 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -242,7 +242,7 @@ static HRESULT WINAPI StreamOnMemory_Clone(IStream *iface, } -const IStreamVtbl StreamOnMemory_Vtbl = +static const IStreamVtbl StreamOnMemory_Vtbl = { /*** IUnknown methods ***/ StreamOnMemory_QueryInterface, @@ -538,7 +538,7 @@ static HRESULT WINAPI StreamOnStreamRange_Clone(IStream *iface, } -const IStreamVtbl StreamOnStreamRange_Vtbl = +static const IStreamVtbl StreamOnStreamRange_Vtbl = { /*** IUnknown methods ***/ StreamOnStreamRange_QueryInterface, @@ -854,7 +854,7 @@ static HRESULT WINAPI IWICStreamImpl_InitializeFromIStreamRegion(IWICStream *ifa } -const IWICStreamVtbl WICStream_Vtbl = +static const IWICStreamVtbl WICStream_Vtbl = { /*** IUnknown methods ***/ IWICStreamImpl_QueryInterface,

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
95
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 May 2011