[prev in list] [next in list] [prev in thread] [next in thread]
List: ros-diffs
Subject: [ros-diffs] [cwittich] 39234: sync msi with wine 1.1.14
From: cwittich () svn ! reactos ! org
Date: 2009-01-31 14:13:21
Message-ID: 20090131153340.7047598984 () mail ! reactos ! org
[Download RAW message or body]
Author: cwittich
Date: Sat Jan 31 08:13:20 2009
New Revision: 39234
URL: http://svn.reactos.org/svn/reactos?rev=39234&view=rev
Log:
sync msi with wine 1.1.14
Modified:
trunk/reactos/dll/win32/msi/database.c
trunk/reactos/dll/win32/msi/msi.c
trunk/reactos/dll/win32/msi/msi.spec
trunk/reactos/dll/win32/msi/registry.c
trunk/reactos/dll/win32/msi/regsvr.c
trunk/reactos/dll/win32/msi/source.c
trunk/reactos/dll/win32/msi/storages.c
trunk/reactos/dll/win32/msi/table.c
Modified: trunk/reactos/dll/win32/msi/database.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?rev=39234&r1=39233&r2=39234&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/database.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/database.c [iso-8859-1] Sat Jan 31 08:13:20 2009
@@ -1206,7 +1206,7 @@
MERGETABLE *table = data->curtable;
MERGEROW *mergerow;
MSIQUERY *dbview;
- MSIRECORD *row;
+ MSIRECORD *row = NULL;
LPWSTR query;
UINT r;
Modified: trunk/reactos/dll/win32/msi/msi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=39234&r1=39233&r2=39234&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Sat Jan 31 08:13:20 2009
@@ -1553,7 +1553,7 @@
TRACE("(%s, %s, %d, %s, %p)\n", debugstr_w(szProductCode),
debugstr_w(szUserSid), dwContext, debugstr_w(szComponent), pdwState);
- if (!pdwState)
+ if (!pdwState || !szComponent)
return ERROR_INVALID_PARAMETER;
if (!szProductCode || !*szProductCode || lstrlenW(szProductCode) != GUID_SIZE - \
1)
Modified: trunk/reactos/dll/win32/msi/msi.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev=39234&r1=39233&r2=39234&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] Sat Jan 31 08:13:20 2009
@@ -250,8 +250,8 @@
254 stub MsiDeterminePatchSequenceW
255 stdcall MsiSourceListAddSourceExA(str str long long str long)
256 stdcall MsiSourceListAddSourceExW(wstr wstr long long wstr long)
-257 stub MsiSourceListClearSourceA
-258 stub MsiSourceListClearSourceW
+257 stdcall MsiSourceListClearSourceA(str str long long str)
+258 stdcall MsiSourceListClearSourceW(wstr wstr long long wstr)
259 stub MsiSourceListClearAllExA
260 stub MsiSourceListClearAllExW
261 stub MsiSourceListForceResolutionExA
Modified: trunk/reactos/dll/win32/msi/registry.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?rev=39234&r1=39233&r2=39234&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] Sat Jan 31 08:13:20 2009
@@ -1894,7 +1894,7 @@
MSIINSTALLCONTEXT *pdwTargetProductContext, LPWSTR szTargetUserSid,
LPDWORD pcchTargetUserSid, LPWSTR *szTransforms)
{
- UINT r;
+ UINT r = ERROR_INVALID_PARAMETER;
if (dwContext & MSIINSTALLCONTEXT_USERMANAGED)
{
Modified: trunk/reactos/dll/win32/msi/regsvr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/regsvr.c?rev=39234&r1=39233&r2=39234&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/regsvr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/regsvr.c [iso-8859-1] Sat Jan 31 08:13:20 2009
@@ -42,7 +42,6 @@
#include "initguid.h"
#include "msipriv.h"
#include "msiserver.h"
-
WINE_DEFAULT_DEBUG_CHANNEL(msi);
/*
Modified: trunk/reactos/dll/win32/msi/source.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/source.c?rev=39234&r1=39233&r2=39234&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/source.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/source.c [iso-8859-1] Sat Jan 31 08:13:20 2009
@@ -1314,3 +1314,27 @@
FIXME("(%s %s %d)\n", debugstr_w(szProduct), debugstr_w(szUserName), \
dwReserved); return ERROR_SUCCESS;
}
+
+/******************************************************************
+ * MsiSourceListClearSourceA (MSI.@)
+ */
+UINT WINAPI MsiSourceListClearSourceA(LPCSTR szProductCodeOrPatchCode, LPCSTR \
szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD \
dwOptions, + LPCSTR szSource)
+{
+ FIXME("(%s %s %x %x %s)\n", debugstr_a(szProductCodeOrPatchCode), \
debugstr_a(szUserSid), + dwContext, dwOptions, debugstr_a(szSource));
+ return ERROR_SUCCESS;
+}
+
+/******************************************************************
+ * MsiSourceListClearSourceW (MSI.@)
+ */
+UINT WINAPI MsiSourceListClearSourceW(LPCWSTR szProductCodeOrPatchCode, LPCWSTR \
szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD \
dwOptions, + LPCWSTR szSource)
+{
+ FIXME("(%s %s %x %x %s)\n", debugstr_w(szProductCodeOrPatchCode), \
debugstr_w(szUserSid), + dwContext, dwOptions, debugstr_w(szSource));
+ return ERROR_SUCCESS;
+}
Modified: trunk/reactos/dll/win32/msi/storages.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/storages.c?rev=39234&r1=39233&r2=39234&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/storages.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/storages.c [iso-8859-1] Sat Jan 31 08:13:20 2009
@@ -134,7 +134,7 @@
static HRESULT stream_to_storage(IStream *stm, IStorage **stg)
{
- ILockBytes *lockbytes;
+ ILockBytes *lockbytes = NULL;
STATSTG stat;
LPVOID data;
HRESULT hr;
@@ -177,7 +177,7 @@
done:
msi_free(data);
- ILockBytes_Release(lockbytes);
+ if (lockbytes) ILockBytes_Release(lockbytes);
return hr;
}
Modified: trunk/reactos/dll/win32/msi/table.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=39234&r1=39233&r2=39234&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/table.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/table.c [iso-8859-1] Sat Jan 31 08:13:20 2009
@@ -1818,7 +1818,7 @@
done:
msiobj_release(&rec->hdr);
- if (columns) columns->ops->delete(columns);
+ columns->ops->delete(columns);
return r;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic