Ros-diffs March 2022

ros-diffs@reactos.org

20 participants
436 discussions

[reactos] 321/360: [WINESYNC] msi: Use nameless unions.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4bf22783a80fe6236d0d6… commit 4bf22783a80fe6236d0d6671e2be995e1b812503 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 21:43:46 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:38 2022 +0100 [WINESYNC] msi: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id cc2cc1463a493651f765fe18852a16c01184ad92 by Jacek Caban <jacek(a)codeweavers.com> --- dll/win32/msi/CMakeLists.txt | 2 +- dll/win32/msi/suminfo.c | 51 ++++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt index 2acc74d7337..2927a5dd1bc 100644 --- a/dll/win32/msi/CMakeLists.txt +++ b/dll/win32/msi/CMakeLists.txt @@ -42,7 +42,6 @@ list(APPEND SOURCE storages.c streams.c string.c - suminfo.c table.c tokenize.c update.c @@ -59,6 +58,7 @@ add_rpc_files(server winemsi.idl) set(IDL_FLAGS ${OLD_IDL_FLAGS}) list(APPEND PCH_SKIP_SOURCE + suminfo.c # The only file without NONAMELESSUNION ${BISON_cond_OUTPUTS} ${BISON_sql_OUTPUTS} ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c diff --git a/dll/win32/msi/suminfo.c b/dll/win32/msi/suminfo.c index 663760e0a23..cd65d68f0eb 100644 --- a/dll/win32/msi/suminfo.c +++ b/dll/win32/msi/suminfo.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "stdio.h" #include "windef.h" @@ -91,7 +90,7 @@ static HRESULT (WINAPI *pPropVariantChangeType) static void free_prop( PROPVARIANT *prop ) { if (prop->vt == VT_LPSTR ) - msi_free( prop->u.pszVal ); + msi_free( prop->pszVal ); prop->vt = VT_EMPTY; } @@ -227,14 +226,14 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz LPSTR str = msi_alloc( propdata->u.str.len ); memcpy( str, propdata->u.str.str, propdata->u.str.len ); str[ propdata->u.str.len - 1 ] = 0; - property.u.pszVal = str; + property.pszVal = str; } else if( propdata->type == VT_FILETIME ) - property.u.filetime = propdata->u.ft; + property.filetime = propdata->u.ft; else if( propdata->type == VT_I2 ) - property.u.iVal = propdata->u.i2; + property.iVal = propdata->u.i2; else if( propdata->type == VT_I4 ) - property.u.lVal = propdata->u.i4; + property.lVal = propdata->u.i4; /* check the type is the same as we expect */ if( type != propdata->type ) @@ -358,16 +357,16 @@ static UINT write_property_to_data( const PROPVARIANT *prop, LPBYTE data ) switch( prop->vt ) { case VT_I2: - sz += write_dword( data, sz, prop->u.iVal ); + sz += write_dword( data, sz, prop->iVal ); break; case VT_I4: - sz += write_dword( data, sz, prop->u.lVal ); + sz += write_dword( data, sz, prop->lVal ); break; case VT_FILETIME: - sz += write_filetime( data, sz, &prop->u.filetime ); + sz += write_filetime( data, sz, &prop->filetime ); break; case VT_LPSTR: - sz += write_string( data, sz, prop->u.pszVal ); + sz += write_string( data, sz, prop->pszVal ); break; } return sz; @@ -656,11 +655,11 @@ static UINT get_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT *puiDataType, IN { case VT_I2: if( piValue ) - *piValue = prop->u.iVal; + *piValue = prop->iVal; break; case VT_I4: if( piValue ) - *piValue = prop->u.lVal; + *piValue = prop->lVal; break; case VT_LPSTR: if( pcchValueBuf ) @@ -669,14 +668,14 @@ static UINT get_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT *puiDataType, IN if( str->unicode ) { - len = MultiByteToWideChar( CP_ACP, 0, prop->u.pszVal, -1, NULL, 0 ) - 1; - MultiByteToWideChar( CP_ACP, 0, prop->u.pszVal, -1, str->str.w, *pcchValueBuf ); + len = MultiByteToWideChar( CP_ACP, 0, prop->pszVal, -1, NULL, 0 ) - 1; + MultiByteToWideChar( CP_ACP, 0, prop->pszVal, -1, str->str.w, *pcchValueBuf ); } else { - len = lstrlenA( prop->u.pszVal ); + len = lstrlenA( prop->pszVal ); if( str->str.a ) - lstrcpynA(str->str.a, prop->u.pszVal, *pcchValueBuf ); + lstrcpynA(str->str.a, prop->pszVal, *pcchValueBuf ); } if (len >= *pcchValueBuf) ret = ERROR_MORE_DATA; @@ -685,7 +684,7 @@ static UINT get_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT *puiDataType, IN break; case VT_FILETIME: if( pftValue ) - *pftValue = prop->u.filetime; + *pftValue = prop->filetime; break; case VT_EMPTY: break; @@ -705,7 +704,7 @@ LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ) prop = &si->property[uiProperty]; if( prop->vt != VT_LPSTR ) return NULL; - return strdupAtoW( prop->u.pszVal ); + return strdupAtoW( prop->pszVal ); } INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) @@ -717,7 +716,7 @@ INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) prop = &si->property[uiProperty]; if( prop->vt != VT_I4 ) return -1; - return prop->u.lVal; + return prop->lVal; } LPWSTR msi_get_suminfo_product( IStorage *stg ) @@ -864,28 +863,28 @@ static UINT set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT type, switch( type ) { case VT_I4: - prop->u.lVal = iValue; + prop->lVal = iValue; break; case VT_I2: - prop->u.iVal = iValue; + prop->iVal = iValue; break; case VT_FILETIME: - prop->u.filetime = *pftValue; + prop->filetime = *pftValue; break; case VT_LPSTR: if( str->unicode ) { len = WideCharToMultiByte( CP_ACP, 0, str->str.w, -1, NULL, 0, NULL, NULL ); - prop->u.pszVal = msi_alloc( len ); + prop->pszVal = msi_alloc( len ); WideCharToMultiByte( CP_ACP, 0, str->str.w, -1, - prop->u.pszVal, len, NULL, NULL ); + prop->pszVal, len, NULL, NULL ); } else { len = lstrlenA( str->str.a ) + 1; - prop->u.pszVal = msi_alloc( len ); - lstrcpyA( prop->u.pszVal, str->str.a ); + prop->pszVal = msi_alloc( len ); + lstrcpyA( prop->pszVal, str->str.a ); } break; }

2 years, 9 months

[reactos] 320/360: [WINESYNC] msi: Fix building the fusion filename.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3e22d8922d94cb86f7ff… commit a3e22d8922d94cb86f7ff5995811f473e6ea2c89 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 21:43:44 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:37 2022 +0100 [WINESYNC] msi: Fix building the fusion filename. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50809 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 46424c6196a7b544ff6173d544fc120cc9f804d9 by Hans Leidekker <hans(a)codeweavers.com> --- dll/win32/msi/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index 2af8c7b6b51..f1b0d7d8866 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -541,7 +541,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; lstrcpyW(filename, path); - lstrcpyW(filename, L"\\"); + lstrcatW(filename, L"\\"); lstrcatW(filename, L"fusion.dll"); if (GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES) {

2 years, 9 months

[reactos] 319/360: [WINESYNC] msi: Remove read-only bit when copying the package file.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c1431b92f405b5c773e3… commit 1c1431b92f405b5c773e30e54d0a48b650b2a473 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 21:40:21 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:37 2022 +0100 [WINESYNC] msi: Remove read-only bit when copying the package file. CopyFileW also copies the file attributes, and the copy will be opened with write access later on. Signed-off-by: Jérôme Gardou <jerome.gardou(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id e830975806df9ef283c89f7153b06b145dfb2cec by JÃ©rÃ´me Gardou <jerome.gardou(a)gmail.com>

2 years, 9 months

[reactos] 318/360: [WINESYNC] msi: Return an error if trying to run a 64-bit custom action in a 32-bit prefix.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34b3377879783441a938d… commit 34b3377879783441a938dc69bdf26b8033837a33 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 21:40:18 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:37 2022 +0100 [WINESYNC] msi: Return an error if trying to run a 64-bit custom action in a 32-bit prefix. This matches native behaviour (manually tested). This allows the Research in Motion (Blackberry) USB and Modem driver to fail cleanly instead of hanging, if run in a 32-bit prefix. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 408662379281aa24f41b680f1aba9abf2b40c603 by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/msi/custom.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c index 0ccb96d7d1b..b717c293eae 100644 --- a/dll/win32/msi/custom.c +++ b/dll/win32/msi/custom.c @@ -769,6 +769,13 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( if (!ret) info->arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY); + if (info->arch == SCS_64BIT_BINARY && sizeof(void *) == 4 && !is_wow64) + { + ERR("Attempt to run a 64-bit custom action inside a 32-bit WINEPREFIX.\n"); + free_custom_action_data( info ); + return NULL; + } + custom_start_server(package, info->arch); info->handle = CreateThread(NULL, 0, custom_client_thread, info, 0, NULL);

2 years, 9 months

[reactos] 317/360: [WINESYNC] msi: Check for failure from do_msidbCustomActionTypeDll().

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc7157139f03954363f5c… commit fc7157139f03954363f5c292b97dceda4a38e4eb Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 21:40:18 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:37 2022 +0100 [WINESYNC] msi: Check for failure from do_msidbCustomActionTypeDll(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 5f21acdc9e9840b50a6991b8e8dc52758adb192d by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/msi/custom.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c index 47d04a87ea0..0ccb96d7d1b 100644 --- a/dll/win32/msi/custom.c +++ b/dll/win32/msi/custom.c @@ -792,7 +792,8 @@ static UINT HANDLE_CustomType1( MSIPACKAGE *package, const WCHAR *source, const TRACE("Calling function %s from %s\n", debugstr_w(target), debugstr_w(binary->tmpfile)); - info = do_msidbCustomActionTypeDll( package, type, binary->tmpfile, target, action ); + if (!(info = do_msidbCustomActionTypeDll( package, type, binary->tmpfile, target, action ))) + return ERROR_FUNCTION_FAILED; return wait_thread_handle( info ); } @@ -897,7 +898,8 @@ static UINT HANDLE_CustomType17( MSIPACKAGE *package, const WCHAR *source, const return ERROR_FUNCTION_FAILED; } - info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action ); + if (!(info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action ))) + return ERROR_FUNCTION_FAILED; return wait_thread_handle( info ); }

2 years, 9 months

[reactos] 316/360: [WINESYNC] msi: Also set "MsiRunningElevated" installer property.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8585445613422f219b52c… commit 8585445613422f219b52cc7fb5f726672a9f0186 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 21:40:17 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:36 2022 +0100 [WINESYNC] msi: Also set "MsiRunningElevated" installer property. This property is supposed to be set starting from Windows Installer 4.0 targeting Windows Vista. This patch fixes the installer that checks this property in addition to VersionNT and ALLUSERS. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id dac655abce0397b3c1accec64039b8cd75beb561 by Dmitry Timoshkov <dmitry(a)baikal.ru> --- dll/win32/msi/package.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index e3060507b73..2af8c7b6b51 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -744,6 +744,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) /* in a wine environment the user is always admin and privileged */ msi_set_property( package->db, L"AdminUser", L"1", -1 ); msi_set_property( package->db, L"Privileged", L"1", -1 ); + msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 ); /* set the os things */ OSVersion.dwOSVersionInfoSize = sizeof(OSVersion); @@ -970,6 +971,8 @@ void msi_adjust_privilege_properties( MSIPACKAGE *package ) msi_set_property( package->db, L"ALLUSERS", L"1", -1 ); } msi_set_property( package->db, L"AdminUser", L"1", -1 ); + msi_set_property( package->db, L"Privileged", L"1", -1 ); + msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 ); } MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db )

2 years, 9 months

[reactos] 315/360: [WINESYNC] msi/tests: Use wide-char string literals.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fdd4d83b3de4855cb7e8… commit 0fdd4d83b3de4855cb7e8d114754a9ce4efddb19 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 21:40:15 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:36 2022 +0100 [WINESYNC] msi/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id f211bd0a4e0b8e8911b6a64ff4f09bb9d4ec2f84 by Michael Stefaniuc <mstefani(a)winehq.org> --- modules/rostests/winetests/msi/custom.c | 4 +--- modules/rostests/winetests/msi/record.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index caf24356948..d74d0a2d097 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -518,12 +518,10 @@ static void test_db(MSIHANDLE hinst) for (i = 0; i < 20; i++) { - WCHAR emptyW[1] = { 0 }; - r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); - r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, emptyW); + r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, L""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); } diff --git a/modules/rostests/winetests/msi/record.c b/modules/rostests/winetests/msi/record.c index 8e4c2df4294..407d756caae 100644 --- a/modules/rostests/winetests/msi/record.c +++ b/modules/rostests/winetests/msi/record.c @@ -56,7 +56,6 @@ static void test_msirecord(void) char buf[10]; WCHAR bufW[10]; const char str[] = "hello"; - const WCHAR strW[] = { 'h','e','l','l','o',0}; char filename[MAX_PATH]; /* check behaviour with an invalid record */ @@ -210,7 +209,7 @@ static void test_msirecord(void) r = MsiRecordGetStringW(h,0,bufW,&sz); ok(r == ERROR_MORE_DATA, "wrong error\n"); ok(sz == 5, "MsiRecordGetStringA returned the wrong length\n"); - ok(0==memcmp(bufW,strW,8), "MsiRecordGetStringA returned the wrong string\n"); + ok(!memcmp(bufW, L"hello", 8), "MsiRecordGetStringA returned the wrong string\n"); sz = 0; bufW[0] = 'x';

2 years, 9 months

[reactos] 314/360: [WINESYNC] msi: Use a string literal for empty strings.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d95ee4fe9e7ca0485a52… commit 7d95ee4fe9e7ca0485a524226a026ebcbd65cefd Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 21:40:14 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:36 2022 +0100 [WINESYNC] msi: Use a string literal for empty strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 17c745a9d253b888366831ce4b9e695297f0dac2 by Michael Stefaniuc <mstefani(a)winehq.org> --- dll/win32/msi/action.c | 6 +++--- dll/win32/msi/automation.c | 2 +- dll/win32/msi/msi.c | 4 ++-- dll/win32/msi/source.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c index f6f03ccb59a..c628239e676 100644 --- a/dll/win32/msi/action.c +++ b/dll/win32/msi/action.c @@ -1276,7 +1276,7 @@ static UINT load_folder_persistence( MSIPACKAGE *package, MSIFOLDER *folder ) static UINT load_folder( MSIRECORD *row, LPVOID param ) { MSIPACKAGE *package = param; - static WCHAR szEmpty[] = {0}; + static WCHAR szEmpty[] = L""; LPWSTR p, tgt_short, tgt_long, src_short, src_long; MSIFOLDER *folder; @@ -5268,14 +5268,14 @@ static UINT ACTION_RegisterUser(MSIPACKAGE *package) L"ProductID", L"USERNAME", L"COMPANYNAME", - {0}, + L"", }; static const WCHAR szRegKeys[][80] = { L"ProductID", L"RegOwner", L"RegCompany", - {0}, + L"", }; HKEY hkey = 0; LPWSTR buffer, productid = NULL; diff --git a/dll/win32/msi/automation.c b/dll/win32/msi/automation.c index dc38436e682..80d6b8a66ba 100644 --- a/dll/win32/msi/automation.c +++ b/dll/win32/msi/automation.c @@ -781,7 +781,7 @@ static HRESULT summaryinfo_invoke( DATE date; LPWSTR str; - static WCHAR szEmpty[] = {0}; + static WCHAR szEmpty[] = L""; hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; diff --git a/dll/win32/msi/msi.c b/dll/win32/msi/msi.c index 237246b8b10..960624c0d79 100644 --- a/dll/win32/msi/msi.c +++ b/dll/win32/msi/msi.c @@ -324,7 +324,7 @@ static UINT get_patch_product_codes( LPCWSTR szPatchPackage, WCHAR ***product_co MSIHANDLE patch, info = 0; UINT r, type; DWORD size; - static WCHAR empty[] = {0}; + static WCHAR empty[] = L""; WCHAR *codes = NULL; r = MsiOpenDatabaseW( szPatchPackage, MSIDBOPEN_READONLY, &patch ); @@ -1096,7 +1096,7 @@ static WCHAR *reg_get_value( HKEY hkey, const WCHAR *name, DWORD *type ) static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, awstring *szValue, LPDWORD pcchValueBuf) { - static WCHAR empty[] = {0}; + static WCHAR empty[] = L""; MSIINSTALLCONTEXT context = MSIINSTALLCONTEXT_USERUNMANAGED; UINT r = ERROR_UNKNOWN_PROPERTY; HKEY prodkey, userdata, source; diff --git a/dll/win32/msi/source.c b/dll/win32/msi/source.c index b4b3b54fe35..0eed436774a 100644 --- a/dll/win32/msi/source.c +++ b/dll/win32/msi/source.c @@ -585,7 +585,7 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, 0, 0, NULL, &size); if (rc != ERROR_SUCCESS) { - static WCHAR szEmpty[] = {0}; + static WCHAR szEmpty[] = L""; rc = ERROR_SUCCESS; source = NULL; ptr = szEmpty;

2 years, 9 months

[reactos] 313/360: [WINESYNC] msi: Correct Query for loading an image.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ad17dd7b2735334ccda7… commit 9ad17dd7b2735334ccda779203a56e87db155276 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 21:40:10 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:36 2022 +0100 [WINESYNC] msi: Correct Query for loading an image. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 358d4f5a914e574c026380666964fcefb0495517 by Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dll/win32/msi/dialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c index 18a92e6fb9b..bc0c0fa3290 100644 --- a/dll/win32/msi/dialog.c +++ b/dll/win32/msi/dialog.c @@ -463,7 +463,7 @@ static HANDLE msi_load_image( MSIDATABASE *db, LPCWSTR name, UINT type, if (!(tmp = msi_create_temp_file( db ))) return NULL; - rec = MSI_QueryGetRecord( db, L"SELCT * FROM `Binary` WHERE `Name` = '%s'", name ); + rec = MSI_QueryGetRecord( db, L"SELECT * FROM `Binary` WHERE `Name` = '%s'", name ); if( rec ) { r = MSI_RecordStreamToFile( rec, 2, tmp ); @@ -962,7 +962,7 @@ static HBITMAP msi_load_picture( MSIDATABASE *db, const WCHAR *name, INT cx, INT BITMAP bm; UINT r; - rec = MSI_QueryGetRecord( db, L"SELCT * FROM `Binary` WHERE `Name` = '%s'", name ); + rec = MSI_QueryGetRecord( db, L"SELECT * FROM `Binary` WHERE `Name` = '%s'", name ); if (!rec) goto end;

2 years, 9 months

[reactos] 312/360: [WINESYNC] msi/tests: Test the "VersionNT" property.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6228b299ca2639d98f6d… commit b6228b299ca2639d98f6d0a0664e8a9f71b801ee Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 21:40:10 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:36 2022 +0100 [WINESYNC] msi/tests: Test the "VersionNT" property. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 990fc66274d68b915df62005ab93792129612fc1 by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/msi/package.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/rostests/winetests/msi/package.c b/modules/rostests/winetests/msi/package.c index f8bf431883b..3b98d9ef111 100644 --- a/modules/rostests/winetests/msi/package.c +++ b/modules/rostests/winetests/msi/package.c @@ -5735,6 +5735,9 @@ static void test_installprops(void) GetNativeSystemInfo(&si); + sprintf(buf, "%d", LOBYTE(LOWORD(GetVersion())) * 100 + HIBYTE(LOWORD(GetVersion()))); + check_prop(hpkg, "VersionNT", buf, 1); + if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { sprintf(buf, "%d", si.wProcessorLevel);

2 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2022