December 2008 - Wine-commits

James Hawkins : msi: Implement MsiEnumPatchesExW.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 87fef9fd22d9c3d7aff11fc8cb6f2ada7465f5f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fef9fd22d9c3d7aff11fc8c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Dec 8 03:14:21 2008 -0600 msi: Implement MsiEnumPatchesExW. --- dlls/msi/registry.c | 312 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 309 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87fef9fd22d9c3d7aff11…

1 0

James Hawkins : msi: Add the MSIPATCHSTATE enumeration.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 43499b9f47dd526eb8403ad8bc3e2945b238afa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43499b9f47dd526eb8403ad8b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Dec 8 03:13:32 2008 -0600 msi: Add the MSIPATCHSTATE enumeration. --- include/msi.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/msi.h b/include/msi.h index 642de00..2dbe4d3 100644 --- a/include/msi.h +++ b/include/msi.h @@ -46,6 +46,17 @@ typedef enum tagINSTALLSTATE INSTALLSTATE_DEFAULT = 5 } INSTALLSTATE; +typedef enum tagMSIPATCHSTATE +{ + MSIPATCHSTATE_INVALID = 0, + MSIPATCHSTATE_APPLIED = 1, + MSIPATCHSTATE_SUPERSEDED = 2, + MSIPATCHSTATE_OBSOLETED = 4, + MSIPATCHSTATE_REGISTERED = 8, + MSIPATCHSTATE_ALL = (MSIPATCHSTATE_APPLIED | MSIPATCHSTATE_SUPERSEDED | + MSIPATCHSTATE_OBSOLETED | MSIPATCHSTATE_REGISTERED) +} MSIPATCHSTATE; + typedef enum tagINSTALLUILEVEL { INSTALLUILEVEL_NOCHANGE = 0,

1 0

James Hawkins : msi: Forward MsiEnumPatchesExA to MsiEnumPatchesExW.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: a32fcfa9b1edcf76d732045bd78984179a819e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32fcfa9b1edcf76d732045bd… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Dec 8 03:14:00 2008 -0600 msi: Forward MsiEnumPatchesExA to MsiEnumPatchesExW. --- dlls/msi/registry.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index d0ba4d3..f4046c0 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1656,11 +1656,75 @@ UINT WINAPI MsiEnumPatchesExA(LPCSTR szProductCode, LPCSTR szUserSid, LPSTR szTargetProductCode, MSIINSTALLCONTEXT *pdwTargetProductContext, LPSTR szTargetUserSid, LPDWORD pcchTargetUserSid) { - FIXME("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p) stub!\n", + LPWSTR prodcode = NULL; + LPWSTR usersid = NULL; + LPWSTR targsid = NULL; + WCHAR patch[GUID_SIZE]; + WCHAR targprod[GUID_SIZE]; + DWORD len; + UINT r; + + TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p)\n", debugstr_a(szProductCode), debugstr_a(szUserSid), dwContext, dwFilter, dwIndex, szPatchCode, szTargetProductCode, pdwTargetProductContext, szTargetUserSid, pcchTargetUserSid); - return ERROR_NO_MORE_ITEMS; + + if (szTargetUserSid && !pcchTargetUserSid) + return ERROR_INVALID_PARAMETER; + + if (szProductCode) prodcode = strdupAtoW(szProductCode); + if (szUserSid) usersid = strdupAtoW(szUserSid); + + r = MsiEnumPatchesExW(prodcode, usersid, dwContext, dwFilter, dwIndex, + patch, targprod, pdwTargetProductContext, + NULL, &len); + if (r != ERROR_SUCCESS) + goto done; + + WideCharToMultiByte(CP_ACP, 0, patch, -1, szPatchCode, + GUID_SIZE, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, targprod, -1, szTargetProductCode, + GUID_SIZE, NULL, NULL); + + if (!szTargetUserSid) + { + if (pcchTargetUserSid) + *pcchTargetUserSid = len; + + goto done; + } + + targsid = msi_alloc(++len * sizeof(WCHAR)); + if (!targsid) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + r = MsiEnumPatchesExW(prodcode, usersid, dwContext, dwFilter, dwIndex, + patch, targprod, pdwTargetProductContext, + targsid, &len); + if (r != ERROR_SUCCESS || !szTargetUserSid) + goto done; + + WideCharToMultiByte(CP_ACP, 0, targsid, -1, szTargetUserSid, + *pcchTargetUserSid, NULL, NULL); + + len = lstrlenW(targsid); + if (*pcchTargetUserSid < len + 1) + { + r = ERROR_MORE_DATA; + *pcchTargetUserSid = len * sizeof(WCHAR); + } + else + *pcchTargetUserSid = len; + +done: + msi_free(prodcode); + msi_free(usersid); + msi_free(targsid); + + return r; } /***********************************************************************

1 0

Francois Gouget : wininet & winhttp: Fix a pointer type mismatch warning when compiling on Windows. On Windows setsockopt() expects a char* while on Unix it accepts anything.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: c1b2008d0cd0e866b683966dd2adf33551a7c6ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b2008d0cd0e866b683966dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:28:43 2008 +0100 wininet & winhttp: Fix a pointer type mismatch warning when compiling on Windows. On Windows setsockopt() expects a char* while on Unix it accepts anything. --- dlls/winhttp/net.c | 2 +- dlls/wininet/netconnection.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index b343050..e9e12f7 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -558,7 +558,7 @@ DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) tv.tv_sec = value / 1000; tv.tv_usec = (value % 1000) * 1000; - if ((res = setsockopt( netconn->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, &tv, sizeof(tv) ) == -1)) + if ((res = setsockopt( netconn->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, sizeof(tv) ) == -1)) { WARN("setsockopt failed (%s)\n", strerror( errno )); return sock_get_error( errno ); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 79e96a3..e688a51 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -769,7 +769,7 @@ DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value tv.tv_usec = (value % 1000) * 1000; result = setsockopt(connection->socketFD, SOL_SOCKET, - send ? SO_SNDTIMEO : SO_RCVTIMEO, &tv, + send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, sizeof(tv)); if (result == -1)

1 0

James Hawkins : msi: Fix the type of the last parameter of MsiEnumPatchesEx .
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 7df94f3b04d76a5cdf90a949883b75be528128e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df94f3b04d76a5cdf90a9498… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Dec 8 03:13:13 2008 -0600 msi: Fix the type of the last parameter of MsiEnumPatchesEx. --- dlls/msi/registry.c | 4 ++-- include/msi.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 2568e7e..d0ba4d3 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1654,7 +1654,7 @@ UINT WINAPI MsiEnumRelatedProductsA(LPCSTR szUpgradeCode, DWORD dwReserved, UINT WINAPI MsiEnumPatchesExA(LPCSTR szProductCode, LPCSTR szUserSid, DWORD dwContext, DWORD dwFilter, DWORD dwIndex, LPSTR szPatchCode, LPSTR szTargetProductCode, MSIINSTALLCONTEXT *pdwTargetProductContext, - LPSTR szTargetUserSid, LPSTR pcchTargetUserSid) + LPSTR szTargetUserSid, LPDWORD pcchTargetUserSid) { FIXME("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p) stub!\n", debugstr_a(szProductCode), debugstr_a(szUserSid), dwContext, dwFilter, @@ -1669,7 +1669,7 @@ UINT WINAPI MsiEnumPatchesExA(LPCSTR szProductCode, LPCSTR szUserSid, UINT WINAPI MsiEnumPatchesExW(LPCWSTR szProductCode, LPCWSTR szUserSid, DWORD dwContext, DWORD dwFilter, DWORD dwIndex, LPWSTR szPatchCode, LPWSTR szTargetProductCode, MSIINSTALLCONTEXT *pdwTargetProductContext, - LPWSTR szTargetUserSid, LPWSTR pcchTargetUserSid) + LPWSTR szTargetUserSid, LPDWORD pcchTargetUserSid) { FIXME("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p) stub!\n", debugstr_w(szProductCode), debugstr_w(szUserSid), dwContext, dwFilter, diff --git a/include/msi.h b/include/msi.h index 0def6cb..642de00 100644 --- a/include/msi.h +++ b/include/msi.h @@ -605,9 +605,9 @@ UINT WINAPI MsiEnumPatchesW(LPCWSTR, DWORD, LPWSTR, LPWSTR, LPDWORD); #define MsiEnumPatches WINELIB_NAME_AW(MsiEnumPatches) UINT WINAPI MsiEnumPatchesExA(LPCSTR, LPCSTR, DWORD, DWORD, DWORD, LPSTR, LPSTR, - MSIINSTALLCONTEXT*, LPSTR, LPSTR); + MSIINSTALLCONTEXT*, LPSTR, LPDWORD); UINT WINAPI MsiEnumPatchesExW(LPCWSTR, LPCWSTR, DWORD, DWORD, DWORD, LPWSTR, LPWSTR, - MSIINSTALLCONTEXT*, LPWSTR, LPWSTR); + MSIINSTALLCONTEXT*, LPWSTR, LPDWORD); #define MsiEnumPatchesEx WINELIB_NAME_AW(MsiEnumPatchesEx) UINT WINAPI MsiGetFileHashA(LPCSTR, DWORD, PMSIFILEHASHINFO);

1 0

Francois Gouget : gdiplus: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: c0c38be711e0be844dbae4015328f77a159ccc77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c38be711e0be844dbae4015… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:27:40 2008 +0100 gdiplus: Add a trailing '\n' to a Wine trace. --- dlls/gdiplus/pen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index f41185a..b2d6dab 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -412,7 +412,7 @@ GpStatus WINGDIPAPI GdipSetPenColor(GpPen *pen, ARGB argb) GpStatus WINGDIPAPI GdipSetPenCompoundArray(GpPen *pen, GDIPCONST REAL *dash, INT count) { - FIXME("(%p, %p, %i): stub", pen, dash, count); + FIXME("(%p, %p, %i): stub\n", pen, dash, count); if (!pen || !dash || count < 2 || count%2 == 1) return InvalidParameter;

1 0

Francois Gouget : netapi32: Remove unneeded casts of zero.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 9d69e41501f3809e576b988edf7bd3c5834433d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d69e41501f3809e576b988ed… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:26:56 2008 +0100 netapi32: Remove unneeded casts of zero. --- dlls/netapi32/wksta.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 85a3368..7b39fd9 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -98,7 +98,7 @@ static void wprint_mac(WCHAR* buffer, int len, const MIB_IFROW *ifRow) else buffer[2*i+1] = (WCHAR)((val & 0xf) + '0'); } - buffer[2*i]=(WCHAR)0; + buffer[2*i]=0; } /* Theoretically this could be too short, except that MS defines

1 0

Francois Gouget : oleaut32: Remove unneeded casts of zero.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 39382652a9399574c2ca9c0d69cca60bf55ad28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=39382652a9399574c2ca9c0d6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:27:06 2008 +0100 oleaut32: Remove unneeded casts of zero. --- dlls/oleaut32/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 78abd3f..2ef1510 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -153,7 +153,7 @@ static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, /* Compiler cast where input cannot be negative */ #define NEGTST(dest, src, func) RETTYP _##func(src in, dest* out) { \ - if (in < (src)0) return DISP_E_OVERFLOW; *out = in; return S_OK; } + if (in < 0) return DISP_E_OVERFLOW; *out = in; return S_OK; } /* Compiler cast where input cannot be > some number */ #define POSTST(dest, src, func, tst) RETTYP _##func(src in, dest* out) { \

1 0

Francois Gouget : wnaspi32: Remove unneeded casts.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 2c23ad2588ba550980353f7010346ca91cb0cbf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c23ad2588ba550980353f701… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:27:19 2008 +0100 wnaspi32: Remove unneeded casts. --- dlls/wnaspi32/winaspi32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 45b352c..84b54f0 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -595,7 +595,7 @@ DWORD __cdecl GetASPI32DLLVersion(void) { #ifdef linux TRACE("Returning version 1\n"); - return (DWORD)1; + return 1; #else FIXME("Please add SCSI support for your operating system, returning 0\n"); return 0;

1 0

Francois Gouget : msacm32: Remove unneeded casts of zero.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 2320b81ba47de4236f9f6a508f07547909fdfb1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2320b81ba47de4236f9f6a508… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:26:47 2008 +0100 msacm32: Remove unneeded casts of zero. --- dlls/msacm32/format.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index a6fd57a..66f3b3c 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -360,7 +360,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD break; } - if (mmr == MMSYSERR_NOERROR && pafd->szFormat[0] == (WCHAR)0) { + if (mmr == MMSYSERR_NOERROR && pafd->szFormat[0] == 0) { wsprintfW(pafd->szFormat, fmt1, pafd->pwfx->nSamplesPerSec); if (pafd->pwfx->wBitsPerSample) { wsprintfW(pafd->szFormat + lstrlenW(pafd->szFormat), fmt2,

1 0