wine-devel September 2018

wine-devel@winehq.org

70 participants
627 discussions

[PATCH 2/2] comctl32: Fix drawing function of disabled button in toolbar.
by Ziqing Hui 10 Sep '18

10 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24784 Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 2 +- dlls/comctl32/toolbar.c | 82 +++++++++++++++++++++++++++++-------------- 2 files changed, 56 insertions(+), 28 deletions(-)

2 2

[PATCH 5/5] msi/tests: Add more tests for remote MsiSummaryInfoGetProperty.
by Dmitry Timoshkov 10 Sep '18

10 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/tests/custom.c | 69 +++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index a727bbd4df..f06aee0675 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -277,10 +277,14 @@ static void test_props(MSIHANDLE hinst) static void test_db(MSIHANDLE hinst) { + static const UINT prop_type[20] = { VT_EMPTY, VT_EMPTY, VT_LPSTR, VT_EMPTY, VT_EMPTY, + VT_EMPTY, VT_EMPTY, VT_LPSTR, VT_EMPTY, VT_LPSTR, + VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_I4, + VT_I4, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY }; MSIHANDLE hdb, view, rec, rec2, suminfo; char buffer[10]; DWORD sz; - UINT r, count, type; + UINT r, count, type, i; INT int_value; FILETIME ft; @@ -466,30 +470,49 @@ static void test_db(MSIHANDLE hinst) r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); - type = 0xdeadbeef; - int_value = 0xdeadbeef; - strcpy(buffer, "deadbeef"); - sz = sizeof(buffer); - r = MsiSummaryInfoGetPropertyA(suminfo, PID_AUTHOR, &type, &int_value, &ft, buffer, &sz); - ok(hinst, !r, "got %u\n", r); - ok(hinst, type == 0, "got %u\n", type); - ok(hinst, int_value == 0, "got %u\n", int_value); - ok(hinst, sz == sizeof(buffer), "got %u\n", sz); - ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + for (i = 0; i < 20; i++) + { + /* for some reason query for PID_TITLE leads to install failure under Windows */ + if (i == PID_TITLE) continue; + + type = 0xdeadbeef; + int_value = 0xdeadbeef; + *buffer = 0; + sz = sizeof(buffer); + r = MsiSummaryInfoGetPropertyA(suminfo, i, &type, &int_value, &ft, buffer, &sz); + if (sz == sizeof(buffer) || i == PID_TEMPLATE) + ok(hinst, !r, "%u: got %u\n", i, r); + else + ok(hinst, r == ERROR_MORE_DATA, "%u: got %u\n", i, r); + ok(hinst, type == prop_type[i], "%u: expected %u, got %u\n", i, prop_type[i], type); + if (i == PID_PAGECOUNT) + ok(hinst, int_value == 100, "%u: got %u\n", i, int_value); + else + ok(hinst, int_value == 0, "%u: got %u\n", i, int_value); + if (i == PID_TEMPLATE) + { + ok(hinst, sz == 5, "%u: got %u\n", i, sz); + ok(hinst, !lstrcmpA(buffer, ";1033"), "%u: got %s\n", i, buffer); + } + else if (i == PID_REVNUMBER) + { + ok(hinst, sz == 76, "%u: got %u\n", i, sz); + ok(hinst, !lstrcmpA(buffer, "{004757CA"), "%u: got %s\n", i, buffer); + } + else + { + ok(hinst, sz == sizeof(buffer), "%u: got %u\n", i, sz); + ok(hinst, !*buffer, "%u: got %s\n", i, buffer); + } + } - type = 0xdeadbeef; - int_value = 0xdeadbeef; - strcpy(buffer, "deadbeef"); - sz = sizeof(buffer); - r = MsiSummaryInfoGetPropertyA(suminfo, PID_CODEPAGE, &type, &int_value, &ft, buffer, &sz); - ok(hinst, !r, "got %u\n", r); - ok(hinst, type == 0, "got %u\n", type); - ok(hinst, int_value == 0, "got %u\n", int_value); - ok(hinst, sz == sizeof(buffer), "got %u\n", sz); - ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + GetSystemTimeAsFileTime(&ft); - r = MsiSummaryInfoSetPropertyA(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, ""); - ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + for (i = 0; i < 20; i++) + { + r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); + ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); + } r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL); ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); -- 2.17.1

3 2

[PATCH 4/5] msi: Handle the remote case in MsiSummaryInfoGetProperty. (v2)
by Dmitry Timoshkov 10 Sep '18

10 Sep '18

This patch fixes the regression introduced by bf5589311de8ac2c74e3bd73bef32337a2ce8df2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/suminfo.c | 66 +++++++++++++++++++++++++++++++++++++++-- dlls/msi/tests/custom.c | 7 ----- dlls/msi/winemsi.idl | 2 ++ 3 files changed, 66 insertions(+), 9 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index d2bf678853..37c49d72e2 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -741,7 +741,29 @@ UINT WINAPI MsiSummaryInfoGetPropertyA( } if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) - return ERROR_INVALID_HANDLE; + { + MSIHANDLE remote; + WCHAR *buf = NULL; + + if (!(remote = msi_get_remote( handle ))) + return ERROR_INVALID_HANDLE; + + __TRY + { + r = remote_SummaryInfoGetProperty( remote, uiProperty, puiDataType, piValue, pftValue, &buf ); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + + if (!r) + r = msi_strncpyWtoA( buf, -1, szValueBuf, pcchValueBuf, TRUE ); + + midl_user_free( buf ); + return r; + } str.unicode = FALSE; str.str.a = szValueBuf; @@ -769,7 +791,29 @@ UINT WINAPI MsiSummaryInfoGetPropertyW( } if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) - return ERROR_INVALID_HANDLE; + { + MSIHANDLE remote; + WCHAR *buf = NULL; + + if (!(remote = msi_get_remote( handle ))) + return ERROR_INVALID_HANDLE; + + __TRY + { + r = remote_SummaryInfoGetProperty( remote, uiProperty, puiDataType, piValue, pftValue, &buf ); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + + if (!r) + r = msi_strncpyW( buf, -1, szValueBuf, pcchValueBuf ); + + midl_user_free( buf ); + return r; + } str.unicode = TRUE; str.str.w = szValueBuf; @@ -1150,3 +1194,21 @@ UINT __cdecl s_remote_SummaryInfoGetPropertyCount( MSIHANDLE suminfo, UINT *coun { return MsiSummaryInfoGetPropertyCount( suminfo, count ); } + +UINT __cdecl s_remote_SummaryInfoGetProperty( MSIHANDLE suminfo, UINT property, UINT *type, + INT *value, FILETIME *ft, LPWSTR *buf ) +{ + WCHAR empty[1]; + DWORD size = 0; + UINT r; + + r = MsiSummaryInfoGetPropertyW( suminfo, property, type, value, ft, empty, &size ); + if (r == ERROR_MORE_DATA) + { + size++; + *buf = midl_user_allocate( size * sizeof(WCHAR) ); + if (!*buf) return ERROR_OUTOFMEMORY; + r = MsiSummaryInfoGetPropertyW( suminfo, property, type, value, ft, *buf, &size ); + } + return r; +} diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index eb0ed625ef..a727bbd4df 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -464,7 +464,6 @@ static void test_db(MSIHANDLE hinst) ok(hinst, count == 5, "got %u\n", count); r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); -todo_wine ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); type = 0xdeadbeef; @@ -472,11 +471,8 @@ todo_wine strcpy(buffer, "deadbeef"); sz = sizeof(buffer); r = MsiSummaryInfoGetPropertyA(suminfo, PID_AUTHOR, &type, &int_value, &ft, buffer, &sz); -todo_wine ok(hinst, !r, "got %u\n", r); -todo_wine ok(hinst, type == 0, "got %u\n", type); -todo_wine ok(hinst, int_value == 0, "got %u\n", int_value); ok(hinst, sz == sizeof(buffer), "got %u\n", sz); ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); @@ -486,11 +482,8 @@ todo_wine strcpy(buffer, "deadbeef"); sz = sizeof(buffer); r = MsiSummaryInfoGetPropertyA(suminfo, PID_CODEPAGE, &type, &int_value, &ft, buffer, &sz); -todo_wine ok(hinst, !r, "got %u\n", r); -todo_wine ok(hinst, type == 0, "got %u\n", type); -todo_wine ok(hinst, int_value == 0, "got %u\n", int_value); ok(hinst, sz == sizeof(buffer), "got %u\n", sz); ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 5a14ffdb79..ebbca82a16 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -75,6 +75,8 @@ interface IWineMsiRemote UINT remote_DatabaseOpenView( [in] MSIHANDLE db, [in, string] LPCWSTR query, [out] MSIHANDLE *view ); UINT remote_SummaryInfoGetPropertyCount( [in] MSIHANDLE suminfo, [out] UINT *count ); + UINT remote_SummaryInfoGetProperty( [in] MSIHANDLE suminfo, [in] UINT property, [out] UINT *type, [out] INT *value, + [out] FILETIME *ft, [out, string] LPWSTR *buf ); MSIHANDLE remote_GetActiveDatabase( [in] MSIHANDLE hinst ); UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size ); -- 2.17.1

3 2

[PATCH 3/5] msi: Handle the remote case in MsiSummaryInfoGetPropertyCount. (v2)
by Dmitry Timoshkov 10 Sep '18

10 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/suminfo.c | 25 ++++++++++++++++++++++++- dlls/msi/tests/custom.c | 3 --- dlls/msi/winemsi.idl | 2 ++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 8c844a6a6c..d2bf678853 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -600,7 +600,25 @@ UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE hSummaryInfo, PUINT pCount) si = msihandle2msiinfo( hSummaryInfo, MSIHANDLETYPE_SUMMARYINFO ); if( !si ) - return ERROR_INVALID_HANDLE; + { + MSIHANDLE remote; + UINT ret; + + if (!(remote = msi_get_remote( hSummaryInfo ))) + return ERROR_INVALID_HANDLE; + + __TRY + { + ret = remote_SummaryInfoGetPropertyCount( remote, pCount ); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; + } if( pCount ) *pCount = get_property_count( si->property ); @@ -1127,3 +1145,8 @@ UINT msi_load_suminfo_properties( MSIPACKAGE *package ) msiobj_release( &si->hdr ); return r; } + +UINT __cdecl s_remote_SummaryInfoGetPropertyCount( MSIHANDLE suminfo, UINT *count ) +{ + return MsiSummaryInfoGetPropertyCount( suminfo, count ); +} diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 0ba5f10c88..eb0ed625ef 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -456,14 +456,11 @@ static void test_db(MSIHANDLE hinst) ok(hinst, !r, "got %u\n", r); r = MsiSummaryInfoGetPropertyCount(suminfo, NULL); -todo_wine ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); count = 0xdeadbeef; r = MsiSummaryInfoGetPropertyCount(suminfo, &count); -todo_wine ok(hinst, !r, "got %u\n", r); -todo_wine ok(hinst, count == 5, "got %u\n", count); r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 50f62fcbfd..5a14ffdb79 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -74,6 +74,8 @@ interface IWineMsiRemote UINT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo ); UINT remote_DatabaseOpenView( [in] MSIHANDLE db, [in, string] LPCWSTR query, [out] MSIHANDLE *view ); + UINT remote_SummaryInfoGetPropertyCount( [in] MSIHANDLE suminfo, [out] UINT *count ); + MSIHANDLE remote_GetActiveDatabase( [in] MSIHANDLE hinst ); UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size ); UINT remote_SetProperty( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR property, [in, string, unique] LPCWSTR value ); -- 2.17.1

3 2

[PATCH 2/5] msi: Handle the remote case in MsiSummaryInfoSetProperty.
by Dmitry Timoshkov 10 Sep '18

10 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/suminfo.c | 20 ++++++++++++++++++++ dlls/msi/tests/custom.c | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index e796a692e4..8c844a6a6c 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -836,7 +836,17 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT return ERROR_INVALID_PARAMETER; if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) + { + MSIHANDLE remote; + + if ((remote = msi_get_remote( handle ))) + { + WARN("MsiSummaryInfoSetProperty not allowed during a custom action!\n"); + return ERROR_FUNCTION_FAILED; + } + return ERROR_INVALID_HANDLE; + } str.unicode = TRUE; str.str.w = szValue; @@ -867,7 +877,17 @@ UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT return ERROR_INVALID_PARAMETER; if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) + { + MSIHANDLE remote; + + if ((remote = msi_get_remote( handle ))) + { + WARN("MsiSummaryInfoSetProperty not allowed during a custom action!\n"); + return ERROR_FUNCTION_FAILED; + } + return ERROR_INVALID_HANDLE; + } str.unicode = FALSE; str.str.a = szValue; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 1cf24536d0..0ba5f10c88 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -499,7 +499,9 @@ todo_wine ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); r = MsiSummaryInfoSetPropertyA(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, ""); -todo_wine + ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + + r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL); ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); r = MsiCloseHandle(suminfo); -- 2.17.1

3 2

[PATCH 1/5] msi/tests: Add some tests for remote MSI summary info APIs.
by Dmitry Timoshkov 10 Sep '18

10 Sep '18

These patches depend on "msi: Add exception handling around all custom action RPC calls." Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/tests/custom.c | 52 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 6332d68768..1cf24536d0 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -30,6 +30,7 @@ #include <msxml.h> #include <msi.h> #include <msiquery.h> +#include <msidefs.h> static int todo_level, todo_do_loop; @@ -279,7 +280,9 @@ static void test_db(MSIHANDLE hinst) MSIHANDLE hdb, view, rec, rec2, suminfo; char buffer[10]; DWORD sz; - UINT r; + UINT r, count, type; + INT int_value; + FILETIME ft; hdb = MsiGetActiveDatabase(hinst); ok(hinst, hdb, "MsiGetActiveDatabase failed\n"); @@ -452,6 +455,53 @@ static void test_db(MSIHANDLE hinst) r = MsiGetSummaryInformationA(hdb, NULL, 1, &suminfo); ok(hinst, !r, "got %u\n", r); + r = MsiSummaryInfoGetPropertyCount(suminfo, NULL); +todo_wine + ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); + + count = 0xdeadbeef; + r = MsiSummaryInfoGetPropertyCount(suminfo, &count); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, count == 5, "got %u\n", count); + + r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); +todo_wine + ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); + + type = 0xdeadbeef; + int_value = 0xdeadbeef; + strcpy(buffer, "deadbeef"); + sz = sizeof(buffer); + r = MsiSummaryInfoGetPropertyA(suminfo, PID_AUTHOR, &type, &int_value, &ft, buffer, &sz); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, type == 0, "got %u\n", type); +todo_wine + ok(hinst, int_value == 0, "got %u\n", int_value); + ok(hinst, sz == sizeof(buffer), "got %u\n", sz); + ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + + type = 0xdeadbeef; + int_value = 0xdeadbeef; + strcpy(buffer, "deadbeef"); + sz = sizeof(buffer); + r = MsiSummaryInfoGetPropertyA(suminfo, PID_CODEPAGE, &type, &int_value, &ft, buffer, &sz); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, type == 0, "got %u\n", type); +todo_wine + ok(hinst, int_value == 0, "got %u\n", int_value); + ok(hinst, sz == sizeof(buffer), "got %u\n", sz); + ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + + r = MsiSummaryInfoSetPropertyA(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, ""); +todo_wine + ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + r = MsiCloseHandle(suminfo); ok(hinst, !r, "got %u\n", r); -- 2.17.1

3 2

[PATCH] msi: Add exception handling around all custom action RPC calls.
by Zebediah Figura 10 Sep '18

10 Sep '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/cond.y | 13 +++- dlls/msi/custom.c | 5 ++ dlls/msi/format.c | 21 +++++- dlls/msi/install.c | 195 +++++++++++++++++++++++++++++++++++++++++++++------- dlls/msi/msi.c | 12 +++- dlls/msi/msipriv.h | 1 + dlls/msi/msiquery.c | 92 ++++++++++++++++++++++--- dlls/msi/package.c | 57 +++++++++++++-- dlls/msi/suminfo.c | 12 +++- 9 files changed, 363 insertions(+), 45 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index a8c9734..2e252be 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -39,6 +39,7 @@ #include "msipriv.h" #include "winemsi.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" #include "wine/list.h" @@ -858,7 +859,17 @@ MSICONDITION WINAPI MsiEvaluateConditionW( MSIHANDLE hInstall, LPCWSTR szConditi if (!szCondition) return MSICONDITION_NONE; - return remote_EvaluateCondition(remote, szCondition); + __TRY + { + ret = remote_EvaluateCondition(remote, szCondition); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; } ret = MSI_EvaluateConditionW( package, szCondition ); diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 436a096..a0fc3dd 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -76,6 +76,11 @@ void __RPC_USER MIDL_user_free(void __RPC_FAR * ptr) heap_free(ptr); } +LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) +{ + return I_RpcExceptionFilter(eptr->ExceptionRecord->ExceptionCode); +} + UINT msi_schedule_action( MSIPACKAGE *package, UINT script, const WCHAR *action ) { UINT count; diff --git a/dlls/msi/format.c b/dlls/msi/format.c index d32afb2..128143f 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -35,6 +35,7 @@ #include "msipriv.h" #include "winemsi.h" +#include "wine/exception.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -919,7 +920,15 @@ UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, if ((remote = msi_get_remote(hInstall))) { - r = remote_FormatRecord(remote, (struct wire_record *)&record->count, &value); + __TRY + { + r = remote_FormatRecord(remote, (struct wire_record *)&record->count, &value); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY if (!r) r = msi_strncpyW(value, -1, szResult, sz); @@ -968,7 +977,15 @@ UINT WINAPI MsiFormatRecordA(MSIHANDLE hinst, MSIHANDLE hrec, char *buf, DWORD * if ((remote = msi_get_remote(hinst))) { - r = remote_FormatRecord(remote, (struct wire_record *)&rec->count, &value); + __TRY + { + r = remote_FormatRecord(remote, (struct wire_record *)&rec->count, &value); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY if (!r) r = msi_strncpyWtoA(value, -1, buf, sz, TRUE); diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 0e224c9..ce36bd3 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -36,6 +36,7 @@ #include "winemsi.h" #include "wine/heap.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -80,7 +81,17 @@ UINT WINAPI MsiDoActionW( MSIHANDLE hInstall, LPCWSTR szAction ) if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_DoAction(remote, szAction); + __TRY + { + ret = remote_DoAction(remote, szAction); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; } ret = ACTION_PerformAction(package, szAction); @@ -129,7 +140,17 @@ UINT WINAPI MsiSequenceW( MSIHANDLE hInstall, LPCWSTR szTable, INT iSequenceMode if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_Sequence(remote, szTable, iSequenceMode); + __TRY + { + ret = remote_Sequence(remote, szTable, iSequenceMode); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; } ret = MSI_Sequence( package, szTable ); msiobj_release( &package->hdr ); @@ -257,7 +278,16 @@ UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DW return ERROR_INVALID_HANDLE; } - r = remote_GetTargetPath(remote, folderW, &path); + __TRY + { + r = remote_GetTargetPath(remote, folderW, &path); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r) r = msi_strncpyWtoA(path, -1, buf, sz, TRUE); @@ -300,7 +330,16 @@ UINT WINAPI MsiGetTargetPathW(MSIHANDLE hinst, const WCHAR *folder, WCHAR *buf, if (!(remote = msi_get_remote(hinst))) return ERROR_INVALID_HANDLE; - r = remote_GetTargetPath(remote, folder, &path); + __TRY + { + r = remote_GetTargetPath(remote, folder, &path); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r) r = msi_strncpyW(path, -1, buf, sz); @@ -396,7 +435,16 @@ UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DW return ERROR_INVALID_HANDLE; } - r = remote_GetSourcePath(remote, folderW, &path); + __TRY + { + r = remote_GetSourcePath(remote, folderW, &path); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r) r = msi_strncpyWtoA(path, -1, buf, sz, TRUE); @@ -439,7 +487,16 @@ UINT WINAPI MsiGetSourcePathW(MSIHANDLE hinst, const WCHAR *folder, WCHAR *buf, if (!(remote = msi_get_remote(hinst))) return ERROR_INVALID_HANDLE; - r = remote_GetSourcePath(remote, folder, &path); + __TRY + { + r = remote_GetSourcePath(remote, folder, &path); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r) r = msi_strncpyW(path, -1, buf, sz); @@ -560,7 +617,17 @@ UINT WINAPI MsiSetTargetPathW(MSIHANDLE hInstall, LPCWSTR szFolder, if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_SetTargetPath(remote, szFolder, szFolderPath); + __TRY + { + ret = remote_SetTargetPath(remote, szFolder, szFolderPath); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; } ret = MSI_SetTargetPathW( package, szFolder, szFolderPath ); @@ -616,7 +683,17 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) if (!(remote = msi_get_remote(hInstall))) return FALSE; - return remote_GetMode(remote, iRunMode); + __TRY + { + r = remote_GetMode(remote, iRunMode); + } + __EXCEPT(rpc_filter) + { + r = FALSE; + } + __ENDTRY + + return r; } switch (iRunMode) @@ -699,7 +776,17 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) if (!(remote = msi_get_remote(hInstall))) return FALSE; - return remote_SetMode(remote, iRunMode, fState); + __TRY + { + r = remote_SetMode(remote, iRunMode, fState); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + + return r; } switch (iRunMode) @@ -877,7 +964,17 @@ UINT WINAPI MsiSetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature, if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_SetFeatureState(remote, szFeature, iState); + __TRY + { + rc = remote_SetFeatureState(remote, szFeature, iState); + } + __EXCEPT(rpc_filter) + { + rc = GetExceptionCode(); + } + __ENDTRY + + return rc; } rc = MSI_SetFeatureStateW(package,szFeature,iState); @@ -1008,11 +1105,17 @@ UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature, if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - /* FIXME: should use SEH */ - if (!piInstalled || !piAction) - return RPC_X_NULL_REF_POINTER; + __TRY + { + ret = remote_GetFeatureState(remote, szFeature, piInstalled, piAction); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY - return remote_GetFeatureState(remote, szFeature, piInstalled, piAction); + return ret; } ret = MSI_GetFeatureStateW(package, szFeature, piInstalled, piAction); @@ -1123,11 +1226,17 @@ UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature, if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - /* FIXME: should use SEH */ - if (!piCost) - return RPC_X_NULL_REF_POINTER; + __TRY + { + ret = remote_GetFeatureCost(remote, szFeature, iCostTree, iState, piCost); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY - return remote_GetFeatureCost(remote, szFeature, iCostTree, iState, piCost); + return ret; } if (!piCost) @@ -1370,7 +1479,17 @@ UINT WINAPI MsiSetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent, if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_SetComponentState(remote, szComponent, iState); + __TRY + { + ret = remote_SetComponentState(remote, szComponent, iState); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; } ret = MSI_SetComponentStateW(package, szComponent, iState); @@ -1401,11 +1520,17 @@ UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent, if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - /* FIXME: should use SEH */ - if (!piInstalled || !piAction) - return RPC_X_NULL_REF_POINTER; + __TRY + { + ret = remote_GetComponentState(remote, szComponent, piInstalled, piAction); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY - return remote_GetComponentState(remote, szComponent, piInstalled, piAction); + return ret; } ret = MSI_GetComponentStateW( package, szComponent, piInstalled, piAction); @@ -1429,7 +1554,17 @@ LANGID WINAPI MsiGetLanguage(MSIHANDLE hInstall) if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_GetLanguage(remote); + __TRY + { + langid = remote_GetLanguage(remote); + } + __EXCEPT(rpc_filter) + { + langid = 0; + } + __ENDTRY + + return langid; } langid = msi_get_property_int( package->db, szProductLanguage, 0 ); @@ -1478,7 +1613,17 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel) if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_SetInstallLevel(remote, iInstallLevel); + __TRY + { + r = remote_SetInstallLevel(remote, iInstallLevel); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + + return r; } r = MSI_SetInstallLevel( package, iInstallLevel ); diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index ae146e6..39b9354 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -47,6 +47,7 @@ #include "msxml2.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -2026,7 +2027,16 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i if (!(remote = msi_get_remote(handle))) return ERROR_INVALID_HANDLE; - r = remote_EnumComponentCosts(remote, component, index, state, buffer, cost, temp); + __TRY + { + r = remote_EnumComponentCosts(remote, component, index, state, buffer, cost, temp); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (r == ERROR_SUCCESS) { lstrcpynW(drive, buffer, *buflen); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 34bc490..10031d6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -741,6 +741,7 @@ UINT msi_strcpy_to_awstring(const WCHAR *, int, awstring *, DWORD *) DECLSPEC_HI /* msi server interface */ extern MSIHANDLE msi_get_remote(MSIHANDLE handle) DECLSPEC_HIDDEN; +extern LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) DECLSPEC_HIDDEN; /* handle functions */ extern void *msihandle2msiinfo(MSIHANDLE handle, UINT type) DECLSPEC_HIDDEN; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 7dcfa7f..544bfc9 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "winerror.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" #include "msi.h" #include "msiquery.h" @@ -258,7 +259,16 @@ UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE hdb, if (!(remote = msi_get_remote(hdb))) return ERROR_INVALID_HANDLE; - ret = remote_DatabaseOpenView(remote, szQuery, &remote_view); + __TRY + { + ret = remote_DatabaseOpenView(remote, szQuery, &remote_view); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + if (!ret) *phView = alloc_msi_remote_handle(remote_view); return ret; @@ -397,7 +407,16 @@ UINT WINAPI MsiViewFetch(MSIHANDLE hView, MSIHANDLE *record) if (!(remote = msi_get_remote(hView))) return ERROR_INVALID_HANDLE; - ret = remote_ViewFetch(remote, &wire_rec); + __TRY + { + ret = remote_ViewFetch(remote, &wire_rec); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + if (!ret) { ret = unmarshal_record(wire_rec, record); @@ -447,7 +466,17 @@ UINT WINAPI MsiViewClose(MSIHANDLE hView) if (!(remote = msi_get_remote(hView))) return ERROR_INVALID_HANDLE; - return remote_ViewClose(remote); + __TRY + { + ret = remote_ViewClose(remote); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; } ret = MSI_ViewClose( query ); @@ -494,7 +523,15 @@ UINT WINAPI MsiViewExecute(MSIHANDLE hView, MSIHANDLE hRec) if (!(remote = msi_get_remote(hView))) return ERROR_INVALID_HANDLE; - ret = remote_ViewExecute(remote, rec ? (struct wire_record *)&rec->count : NULL); + __TRY + { + ret = remote_ViewExecute(remote, rec ? (struct wire_record *)&rec->count : NULL); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY if (rec) msiobj_release(&rec->hdr); @@ -611,7 +648,16 @@ UINT WINAPI MsiViewGetColumnInfo(MSIHANDLE hView, MSICOLINFO info, MSIHANDLE *hR if (!(remote = msi_get_remote(hView))) return ERROR_INVALID_HANDLE; - r = remote_ViewGetColumnInfo(remote, info, &wire_rec); + __TRY + { + r = remote_ViewGetColumnInfo(remote, info, &wire_rec); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r) { r = unmarshal_record(wire_rec, hRec); @@ -680,8 +726,17 @@ UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode, if (!(remote = msi_get_remote(hView))) return ERROR_INVALID_HANDLE; - r = remote_ViewModify(remote, eModifyMode, - (struct wire_record *)&rec->count, &wire_refreshed); + __TRY + { + r = remote_ViewModify(remote, eModifyMode, + (struct wire_record *)&rec->count, &wire_refreshed); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r && (eModifyMode == MSIMODIFY_REFRESH || eModifyMode == MSIMODIFY_SEEK)) { r = copy_remote_record(wire_refreshed, hRecord); @@ -1004,7 +1059,16 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIHANDLE hdb, if (!(remote = msi_get_remote(hdb))) return ERROR_INVALID_HANDLE; - r = remote_DatabaseGetPrimaryKeys(remote, table, &wire_rec); + __TRY + { + r = remote_DatabaseGetPrimaryKeys(remote, table, &wire_rec); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r) { r = unmarshal_record(wire_rec, phRec); @@ -1083,7 +1147,17 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( if (!(remote = msi_get_remote(hDatabase))) return MSICONDITION_ERROR; - return remote_DatabaseIsTablePersistent(remote, szTableName); + __TRY + { + r = remote_DatabaseIsTablePersistent(remote, szTableName); + } + __EXCEPT(rpc_filter) + { + r = MSICONDITION_ERROR; + } + __ENDTRY + + return r; } r = MSI_DatabaseIsTablePersistent( db, szTableName ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 273ca71..3374964 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -44,6 +44,7 @@ #include "wine/heap.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" #include "msipriv.h" @@ -1739,8 +1740,16 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) } else if ((remote = msi_get_remote(hInstall))) { - handle = remote_GetActiveDatabase(remote); - handle = alloc_msi_remote_handle(handle); + __TRY + { + handle = remote_GetActiveDatabase(hInstall); + handle = alloc_msi_remote_handle(handle); + } + __EXCEPT(rpc_filter) + { + handle = 0; + } + __ENDTRY } return handle; @@ -2100,7 +2109,15 @@ INT WINAPI MsiProcessMessage( MSIHANDLE hInstall, INSTALLMESSAGE eMessageType, if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - ret = remote_ProcessMessage(remote, eMessageType, (struct wire_record *)&record->count); + __TRY + { + ret = remote_ProcessMessage(remote, eMessageType, (struct wire_record *)&record->count); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY msiobj_release(&record->hdr); return ret; @@ -2230,7 +2247,17 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_SetProperty(remote, szName, szValue); + __TRY + { + ret = remote_SetProperty(remote, szName, szValue); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; } ret = msi_set_property( package->db, szName, szValue, -1 ); @@ -2407,7 +2434,16 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD return ERROR_INVALID_HANDLE; } - r = remote_GetProperty(remote, nameW, &value, &len); + __TRY + { + r = remote_GetProperty(remote, nameW, &value, &len); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + heap_free(nameW); if (!r) @@ -2463,7 +2499,16 @@ UINT WINAPI MsiGetPropertyW(MSIHANDLE hinst, const WCHAR *name, WCHAR *buf, DWOR if (!(remote = msi_get_remote(hinst))) return ERROR_INVALID_HANDLE; - r = remote_GetProperty(remote, name, &value, &len); + __TRY + { + r = remote_GetProperty(remote, name, &value, &len); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r) { /* String might contain embedded nulls. diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 288ba40..e796a69 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -29,6 +29,7 @@ #include "winnls.h" #include "shlwapi.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" #include "msi.h" #include "msiquery.h" @@ -528,7 +529,16 @@ UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, if (!(remote = msi_get_remote(hDatabase))) return ERROR_INVALID_HANDLE; - ret = remote_DatabaseGetSummaryInformation(remote, uiUpdateCount, &remote_suminfo); + __TRY + { + ret = remote_DatabaseGetSummaryInformation(remote, uiUpdateCount, &remote_suminfo); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + if (!ret) *pHandle = alloc_msi_remote_handle(remote_suminfo); -- 2.7.4

2 1

[PATCH v4 01/11] shell32/autocomplete: Revamp pwzsRegKeyPath handling so it can deal with arbitrary sizes and make it more robust
by Gabriel Ivăncescu 10 Sep '18

10 Sep '18

Handle heap_alloc failure, reg strings without a \ character at all, try harder to find the reg path (if only value fails the lookup), and read the registry value with any size. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This patch series supersedes the series starting with 150630 (second half will come after these are committed) v2: Retrieve the registry value without failing in rare race conditions. v3: Don't open the HKEY_LOCAL_MACHINE twice under some circumstances. v4: Adjusted with a loop as suggested by Huw Davies. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/autocomplete.c | 81 +++++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index cf8da50..b2c388e 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -486,40 +486,57 @@ static HRESULT WINAPI IAutoComplete2_fnInit( if (This->options & ACO_AUTOSUGGEST) create_listbox(This); - if (pwzsRegKeyPath) { - WCHAR *key; - WCHAR result[MAX_PATH]; - WCHAR *value; - HKEY hKey = 0; - LONG res; - LONG len; - - /* pwszRegKeyPath contains the key as well as the value, so we split */ - key = heap_alloc((lstrlenW(pwzsRegKeyPath)+1)*sizeof(WCHAR)); - strcpyW(key, pwzsRegKeyPath); - value = strrchrW(key, '\\'); - *value = 0; - value++; - /* Now value contains the value and buffer the key */ - res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); - if (res != ERROR_SUCCESS) { - /* if the key is not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); - } - if (res == ERROR_SUCCESS) { - res = RegQueryValueW(hKey, value, result, &len); - if (res == ERROR_SUCCESS) { - This->quickComplete = heap_alloc(len*sizeof(WCHAR)); - strcpyW(This->quickComplete, result); - } - RegCloseKey(hKey); - } - heap_free(key); + if (pwzsRegKeyPath) + { + static const HKEY roots[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + WCHAR *key, *value; + DWORD type, sz; + BYTE *qc; + HKEY hKey; + LSTATUS res; + size_t len; + UINT i; + + /* pwszRegKeyPath contains the key as well as the value, so split it */ + value = strrchrW(pwzsRegKeyPath, '\\'); + len = value - pwzsRegKeyPath; + + if (value && (key = heap_alloc((len+1) * sizeof(*key))) != NULL) + { + memcpy(key, pwzsRegKeyPath, len * sizeof(*key)); + key[len] = '\0'; + value++; + + for (i = 0; i < ARRAY_SIZE(roots); i++) + { + if (RegOpenKeyExW(roots[i], key, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + continue; + sz = MAX_PATH * sizeof(WCHAR); + + while ((qc = heap_alloc(sz)) != NULL) + { + res = RegQueryValueExW(hKey, value, NULL, &type, qc, &sz); + if (res == ERROR_SUCCESS && type == REG_SZ) + { + This->quickComplete = heap_realloc(qc, sz); + i = ARRAY_SIZE(roots); + break; + } + heap_free(qc); + if (res != ERROR_MORE_DATA || type != REG_SZ) + break; + } + RegCloseKey(hKey); + } + heap_free(key); + } } - if ((pwszQuickComplete) && (!This->quickComplete)) { - This->quickComplete = heap_alloc((lstrlenW(pwszQuickComplete)+1)*sizeof(WCHAR)); - lstrcpyW(This->quickComplete, pwszQuickComplete); + if (!This->quickComplete && pwszQuickComplete) + { + size_t len = strlenW(pwszQuickComplete)+1; + if ((This->quickComplete = heap_alloc(len * sizeof(WCHAR))) != NULL) + memcpy(This->quickComplete, pwszQuickComplete, len * sizeof(WCHAR)); } return S_OK; -- 1.9.1

2 19

[PATCH] winspool.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Sep '18

10 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winspool.drv/info.c | 50 +++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f63f3f687b..7c4ee9a26f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -332,7 +332,7 @@ static const printenv_t * validate_envW(LPCWSTR env) TRACE("testing %s\n", debugstr_w(env)); if (env && env[0]) { - for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { if (lstrcmpiW(env, all_printenv[i]->envname) == 0) { @@ -594,7 +594,7 @@ static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) di3.pConfigFile = driver_nt; di3.pDefaultDataType = rawW; - for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { di3.pEnvironment = (WCHAR *) all_printenv[i]->envname; if (all_printenv[i]->envname == envname_win40W) @@ -752,7 +752,7 @@ static WCHAR *get_ppd_dir( void ) WCHAR *dir, tmp_path[MAX_PATH]; BOOL res; - len = GetTempPathW( sizeof(tmp_path) / sizeof(tmp_path[0]), tmp_path ); + len = GetTempPathW( ARRAY_SIZE( tmp_path ), tmp_path ); if (!len) return NULL; dir = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) + sizeof(wine_ppds) ) ; if (!dir) return NULL; @@ -927,7 +927,7 @@ static BOOL CUPS_LoadPrinters(void) nrofdests = pcupsGetDests(&dests); TRACE("Found %d CUPS %s:\n", nrofdests, (nrofdests == 1) ? "printer" : "printers"); for (i=0;i<nrofdests;i++) { - MultiByteToWideChar(CP_UNIXCP, 0, dests[i].name, -1, nameW, sizeof(nameW) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, dests[i].name, -1, nameW, ARRAY_SIZE(nameW)); printer_type = get_cups_printer_type( dests + i ); TRACE( "Printer %d: %s. printer_type %x\n", i, debugstr_w(nameW), printer_type ); @@ -1010,7 +1010,7 @@ static BOOL CUPS_LoadPrinters(void) } if (hadprinter && !haddefault) { - MultiByteToWideChar(CP_UNIXCP, 0, dests[0].name, -1, nameW, sizeof(nameW) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, dests[0].name, -1, nameW, ARRAY_SIZE(nameW)); SetDefaultPrinterW(nameW); } pcupsFreeDests(nrofdests, dests); @@ -1037,13 +1037,13 @@ static char *get_queue_name( HANDLE printer, BOOL *cups ) if (!port) goto end; RegQueryValueExW( key, PortW, 0, &type, (BYTE*)port, &needed ); - if (!strncmpW( port, CUPS_Port, sizeof(CUPS_Port) / sizeof(WCHAR) -1 )) + if (!strncmpW( port, CUPS_Port, ARRAY_SIZE( CUPS_Port ) -1 )) { - name = port + sizeof(CUPS_Port) / sizeof(WCHAR) - 1; + name = port + ARRAY_SIZE( CUPS_Port ) - 1; *cups = TRUE; } - else if (!strncmpW( port, LPR_Port, sizeof(LPR_Port) / sizeof(WCHAR) -1 )) - name = port + sizeof(LPR_Port) / sizeof(WCHAR) - 1; + else if (!strncmpW( port, LPR_Port, ARRAY_SIZE( LPR_Port ) -1 )) + name = port + ARRAY_SIZE( LPR_Port ) - 1; if (name) { needed = WideCharToMultiByte( CP_UNIXCP, 0, name, -1, NULL, 0, NULL, NULL ); @@ -1222,7 +1222,7 @@ static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) goto end; } - MultiByteToWideChar(CP_ACP, 0, devname, -1, devnameW, sizeof(devnameW) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, devname, -1, devnameW, ARRAY_SIZE(devnameW)); if(RegOpenKeyA(hkeyPrinters, devname, &hkeyPrinter) == ERROR_SUCCESS) { DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); @@ -1391,7 +1391,7 @@ static LPWSTR get_servername_from_name(LPCWSTR name) TRACE("found %s\n", debugstr_w(server)); - len = sizeof(buffer)/sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); if (GetComputerNameW(buffer, &len)) { if (lstrcmpW(buffer, server) == 0) { /* The requested Servername is our computername */ @@ -1641,7 +1641,7 @@ void WINSPOOL_LoadSystemPrinters(void) if(RegQueryInfoKeyW(hkeyPrinters, NULL, NULL, NULL, &num, NULL, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { for(i = 0; i < num; i++) { - if(RegEnumKeyW(hkeyPrinters, i, PrinterName, sizeof(PrinterName)/sizeof(PrinterName[0])) == ERROR_SUCCESS) { + if(RegEnumKeyW(hkeyPrinters, i, PrinterName, ARRAY_SIZE(PrinterName)) == ERROR_SUCCESS) { if(RegOpenKeyW(hkeyPrinters, PrinterName, &hkey) == ERROR_SUCCESS) { if(RegQueryValueExW(hkey, NameW, 0, 0, 0, &needed) == ERROR_FILE_NOT_FOUND) { set_reg_szW(hkey, NameW, PrinterName); @@ -2941,7 +2941,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD job->job_id = InterlockedIncrement(&next_job_id); - len = GetSystemDirectoryW(path, sizeof(path) / sizeof(WCHAR)); + len = GetSystemDirectoryW(path, ARRAY_SIZE(path)); if(path[len - 1] != '\\') path[len++] = '\\'; memcpy(path + len, spool_path, sizeof(spool_path)); @@ -3384,7 +3384,7 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) LPCWSTR lpNameW = get_opened_printer_name(hPrinter); HKEY hkeyPrinters, hkey; WCHAR def[MAX_PATH]; - DWORD size = sizeof( def ) / sizeof( def[0] ); + DWORD size = ARRAY_SIZE(def); if(!lpNameW) { SetLastError(ERROR_INVALID_HANDLE); @@ -4667,8 +4667,7 @@ static BOOL WINSPOOL_EnumPrintersW(DWORD dwType, LPWSTR lpszName, pi = (used <= cbBuf) ? lpbPrinters : NULL; for(i = 0; i < number; i++) { - if(RegEnumKeyW(hkeyPrinters, i, PrinterName, sizeof(PrinterName)/sizeof(PrinterName[0])) != - ERROR_SUCCESS) { + if(RegEnumKeyW(hkeyPrinters, i, PrinterName, ARRAY_SIZE(PrinterName)) != ERROR_SUCCESS) { ERR("Can't enum key number %d\n", i); RegCloseKey(hkeyPrinters); return FALSE; @@ -5508,8 +5507,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment, PBYTE data_ptr = NULL; DWORD needed = 0; - if(RegEnumKeyW(hkeyDrivers, i, DriverNameW, sizeof(DriverNameW)/sizeof(DriverNameW[0])) - != ERROR_SUCCESS) { + if(RegEnumKeyW(hkeyDrivers, i, DriverNameW, ARRAY_SIZE(DriverNameW)) != ERROR_SUCCESS) { ERR("Can't enum key number %d\n", i); RegCloseKey(hkeyDrivers); return FALSE; @@ -5585,7 +5583,7 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, /* Precompute the overall total; we need this to know where pointers end and data begins (i.e. data_offset) */ - for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { needed = found = 0; ret = WINSPOOL_EnumPrinterDrivers(pName, all_printenv[i]->envname, Level, @@ -5599,7 +5597,7 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, *pcReturned = 0; *pcbNeeded = 0; total_found = 0; - for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { needed = found = 0; ret = WINSPOOL_EnumPrinterDrivers(pName, all_printenv[i]->envname, Level, @@ -5963,7 +5961,7 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) if ((pszPrinter == NULL) || (pszPrinter[0] == '\0')) { default_printer[0] = '\0'; - size = sizeof(default_printer)/sizeof(WCHAR); + size = ARRAY_SIZE(default_printer); /* if we have a default Printer, do nothing. */ if (GetDefaultPrinterW(default_printer, &size)) @@ -5974,7 +5972,7 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE, PrintersW, 0, KEY_READ, &hreg)) { default_printer[0] = '\0'; - size = sizeof(default_printer)/sizeof(WCHAR); + size = ARRAY_SIZE(default_printer); if (!RegEnumKeyExW(hreg, 0, default_printer, &size, NULL, NULL, NULL, NULL)) { pszPrinter = default_printer; @@ -8350,8 +8348,8 @@ static INT_PTR CALLBACK file_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM WCHAR caption[200], message[200]; int mb_ret; - LoadStringW(WINSPOOL_hInstance, IDS_CAPTION, caption, sizeof(caption) / sizeof(WCHAR)); - LoadStringW(WINSPOOL_hInstance, IDS_FILE_EXISTS, message, sizeof(message) / sizeof(WCHAR)); + LoadStringW(WINSPOOL_hInstance, IDS_CAPTION, caption, ARRAY_SIZE(caption)); + LoadStringW(WINSPOOL_hInstance, IDS_FILE_EXISTS, message, ARRAY_SIZE(message)); mb_ret = MessageBoxW(hwnd, message, caption, MB_OKCANCEL | MB_ICONEXCLAMATION); if(mb_ret == IDCANCEL) { @@ -8364,8 +8362,8 @@ static INT_PTR CALLBACK file_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { WCHAR caption[200], message[200]; - LoadStringW(WINSPOOL_hInstance, IDS_CAPTION, caption, sizeof(caption) / sizeof(WCHAR)); - LoadStringW(WINSPOOL_hInstance, IDS_CANNOT_OPEN, message, sizeof(message) / sizeof(WCHAR)); + LoadStringW(WINSPOOL_hInstance, IDS_CAPTION, caption, ARRAY_SIZE(caption)); + LoadStringW(WINSPOOL_hInstance, IDS_CANNOT_OPEN, message, ARRAY_SIZE(message)); MessageBoxW(hwnd, message, caption, MB_OK | MB_ICONEXCLAMATION); HeapFree(GetProcessHeap(), 0, filename); return TRUE; -- 2.14.4

2 1

[PATCH 1/2] comctl32/tests: Add test for disabled toolbar button.
by Ziqing Hui 10 Sep '18

10 Sep '18

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 103 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+)

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
63
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-devel September 2018