March 2015 - Wine-commits - list.winehq.org

Michael Stefaniuc : mshtml/tests: Actually test the return of IHTMLTable_get_width().
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 0cce9200d95b62fd2a3bba5168ff1c4528820ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cce9200d95b62fd2a3bba516… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 25 11:49:12 2015 +0100 mshtml/tests: Actually test the return of IHTMLTable_get_width(). --- dlls/mshtml/tests/dom.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 29356d7..c8ab19d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6823,7 +6823,7 @@ static void test_table_elem(IHTMLElement *elem) hres = IHTMLTable_put_width(table, v); ok(hres == S_OK, "put_width = %08x\n", hres); VariantClear(&v); - IHTMLTable_get_width(table, &v); + hres = IHTMLTable_get_width(table, &v); ok(hres == S_OK, "get_width = %08x\n", hres); ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -6833,7 +6833,7 @@ static void test_table_elem(IHTMLElement *elem) hres = IHTMLTable_put_width(table, v); ok(hres == S_OK, "put_width = %08x\n", hres); VariantClear(&v); - IHTMLTable_get_width(table, &v); + hres = IHTMLTable_get_width(table, &v); ok(hres == S_OK, "get_width = %08x\n", hres); ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -6843,7 +6843,7 @@ static void test_table_elem(IHTMLElement *elem) hres = IHTMLTable_put_width(table, v); ok(hres == S_OK, "put_width = %08x\n", hres); VariantClear(&v); - IHTMLTable_get_width(table, &v); + hres = IHTMLTable_get_width(table, &v); ok(hres == S_OK, "get_width = %08x\n", hres); ok(!strcmp_wa(V_BSTR(&v), "40.2%"), "Expected 40.2%%, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -6852,7 +6852,7 @@ static void test_table_elem(IHTMLElement *elem) V_I4(&v) = 11; hres = IHTMLTable_put_width(table, v); ok(hres == S_OK, "put_width = %08x\n", hres); - IHTMLTable_get_width(table, &v); + hres = IHTMLTable_get_width(table, &v); ok(hres == S_OK, "get_width = %08x\n", hres); ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -6861,7 +6861,7 @@ static void test_table_elem(IHTMLElement *elem) V_R8(&v) = 11.9; hres = IHTMLTable_put_width(table, v); ok(hres == S_OK, "put_width = %08x\n", hres); - IHTMLTable_get_width(table, &v); + hres = IHTMLTable_get_width(table, &v); ok(hres == S_OK, "get_width = %08x\n", hres); ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v);

1 0

Alexandre Julliard : server: Fix the string type in traces for I/ O completion names.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 9fc48b28662414afe1ea7c60a6b08f2103bc8439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc48b28662414afe1ea7c60a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 20:30:30 2015 +0900 server: Fix the string type in traces for I/O completion names. --- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 4 ++-- server/trace.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1b7831e..0205131 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4845,7 +4845,7 @@ struct create_completion_request unsigned int attributes; unsigned int concurrent; obj_handle_t rootdir; - /* VARARG(filename,string); */ + /* VARARG(filename,unicode_str); */ char __pad_28[4]; }; struct create_completion_reply @@ -4863,7 +4863,7 @@ struct open_completion_request unsigned int access; unsigned int attributes; obj_handle_t rootdir; - /* VARARG(filename,string); */ + /* VARARG(filename,unicode_str); */ }; struct open_completion_reply { diff --git a/server/protocol.def b/server/protocol.def index 2cd8272..a34dde9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3366,7 +3366,7 @@ enum coords_relative unsigned int attributes; /* object attributes */ unsigned int concurrent; /* max number of concurrent active threads */ obj_handle_t rootdir; /* root directory */ - VARARG(filename,string); /* port name */ + VARARG(filename,unicode_str); /* port name */ @REPLY obj_handle_t handle; /* port handle */ @END @@ -3377,7 +3377,7 @@ enum coords_relative unsigned int access; /* desired access to a port */ unsigned int attributes; /* object attributes */ obj_handle_t rootdir; /* root directory */ - VARARG(filename,string); /* port name */ + VARARG(filename,unicode_str); /* port name */ @REPLY obj_handle_t handle; /* port handle */ @END diff --git a/server/trace.c b/server/trace.c index c7f4921..e5d3cd3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3951,7 +3951,7 @@ static void dump_create_completion_request( const struct create_completion_reque fprintf( stderr, ", attributes=%08x", req->attributes ); fprintf( stderr, ", concurrent=%08x", req->concurrent ); fprintf( stderr, ", rootdir=%04x", req->rootdir ); - dump_varargs_string( ", filename=", cur_size ); + dump_varargs_unicode_str( ", filename=", cur_size ); } static void dump_create_completion_reply( const struct create_completion_reply *req ) @@ -3964,7 +3964,7 @@ static void dump_open_completion_request( const struct open_completion_request * fprintf( stderr, " access=%08x", req->access ); fprintf( stderr, ", attributes=%08x", req->attributes ); fprintf( stderr, ", rootdir=%04x", req->rootdir ); - dump_varargs_string( ", filename=", cur_size ); + dump_varargs_unicode_str( ", filename=", cur_size ); } static void dump_open_completion_reply( const struct open_completion_reply *req )

1 0

Jacek Caban : wininet: Pass timeout as DWORD in setsockopt calls.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: b720e42fcfbf148f9d2d0606549a805745fbc90c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b720e42fcfbf148f9d2d06065… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 25 13:10:14 2015 +0100 wininet: Pass timeout as DWORD in setsockopt calls. --- dlls/wininet/netconnection.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index a268aa7..9f64cb9 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -949,22 +949,10 @@ int NETCON_GetCipherStrength(netconn_t *connection) DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) { int result; - struct timeval tv; - /* value is in milliseconds, convert to struct timeval */ - if (value == INFINITE) - { - tv.tv_sec = 0; - tv.tv_usec = 0; - } - else - { - tv.tv_sec = value / 1000; - tv.tv_usec = (value % 1000) * 1000; - } result = setsockopt(connection->socket, SOL_SOCKET, - send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, - sizeof(tv)); + send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&value, + sizeof(value)); if (result == -1) { WARN("setsockopt failed\n");

1 0

Piotr Caban : msvcrt/tests: Add atan, tanh and exp tests on invalid arguments.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 6de6e42a36d0bce0fa88b54b28a95bdb802d3237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6de6e42a36d0bce0fa88b54b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 25 13:13:57 2015 +0100 msvcrt/tests: Add atan, tanh and exp tests on invalid arguments. --- dlls/msvcrt/tests/misc.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index a4c5c8c..ab14e04 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -21,8 +21,29 @@ #include "wine/test.h" #include <errno.h> #include <stdio.h> +#include <math.h> #include "msvcrt.h" +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() + +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() + +static inline BOOL almost_equal(double d1, double d2) { + if(d1-d2>-1e-30 && d1-d2<1e-30) + return TRUE; + return FALSE; +} + static int (__cdecl *prand_s)(unsigned int *); static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); static int (__cdecl *pstrerror_s)(char *, MSVCRT_size_t, int); @@ -34,6 +55,9 @@ static void (__cdecl *p__invalid_parameter)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, uintptr_t); static void (__cdecl *p_qsort_s)(void*, MSVCRT_size_t, MSVCRT_size_t, int (__cdecl*)(void*, const void*, const void*), void*); +static double (__cdecl *p_atan)(double); +static double (__cdecl *p_exp)(double); +static double (__cdecl *p_tanh)(double); static void init(void) { @@ -48,6 +72,9 @@ static void init(void) p_set_errno = (void *)GetProcAddress(hmod, "_set_errno"); p__invalid_parameter = (void *)GetProcAddress(hmod, "_invalid_parameter"); p_qsort_s = (void *)GetProcAddress(hmod, "qsort_s"); + p_atan = (void *)GetProcAddress(hmod, "atan"); + p_exp = (void *)GetProcAddress(hmod, "exp"); + p_tanh = (void *)GetProcAddress(hmod, "tanh"); } static void test_rand_s(void) @@ -477,6 +504,42 @@ static void test_qsort_s(void) ok(tab[i] == i, "data sorted incorrectly on position %d: %d\n", i, tab[i]); } +static void test_math_functions(void) +{ + double ret; + + errno = 0xdeadbeef; + p_atan(NAN); + ok(errno == EDOM, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = p_atan(INFINITY); + ok(almost_equal(ret, 1.57079632679489661923), "ret = %lf\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = p_atan(-INFINITY); + ok(almost_equal(ret, -1.57079632679489661923), "ret = %lf\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + p_tanh(NAN); + ok(errno == EDOM, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = p_tanh(INFINITY); + ok(almost_equal(ret, 1.0), "ret = %lf\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + p_exp(NAN); + ok(errno == EDOM, "errno = %d\n", errno); + + errno = 0xdeadbeef; + p_exp(INFINITY); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); +} + START_TEST(misc) { int arg_c; @@ -504,4 +567,5 @@ START_TEST(misc) test__popen(arg_v[0]); test__invalid_parameter(); test_qsort_s(); + test_math_functions(); }

1 0

Piotr Caban : msvcrt: Fix NAN handling in printf.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 46db64ce1b0b0c729fed3e4737505da4d22c0e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46db64ce1b0b0c729fed3e473… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 25 14:22:02 2015 +0100 msvcrt: Fix NAN handling in printf. --- dlls/msvcrt/printf.h | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 80133d6..4757931 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -26,6 +26,10 @@ #define FUNC_NAME(func) func ## _a #endif +#ifndef signbit +#define signbit(x) ((x) < 0) +#endif + typedef struct FUNC_NAME(pf_flags_t) { APICHAR Sign, LeftAlign, Alternate, PadZero; @@ -539,19 +543,23 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API int len = flags.Precision + 10; double val = pf_args(args_ctx, pos, VT_R8, valist).get_double; int r; - BOOL inf = FALSE, nan = FALSE; + BOOL inf = FALSE, nan = FALSE, ind = FALSE; if(isinf(val)) inf = TRUE; - else if(isnan(val)) - nan = TRUE; /* FIXME: NaN value may be displayed as #IND or #QNAN */ + else if(isnan(val)) { + if(!signbit(val)) + nan = TRUE; + else + ind = TRUE; + } - if(inf || nan) { - if(nan || val<0) + if(inf || nan || ind) { + if(ind || val<0) flags.Sign = '-'; if(flags.Format=='g' || flags.Format=='G') - val = 1.1234; /* fraction will be overwritten with #INF or #IND string */ + val = (nan ? 1.12345 : 1.1234); /* fraction will be overwritten with #INF, #IND or #QNAN string */ else val = 1; @@ -592,18 +600,33 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API if(decimal_point) { *decimal_point = *locinfo->lconv->decimal_point; - if(inf || nan) { + if(inf || nan || ind) { static const char inf_str[] = "#INF"; static const char ind_str[] = "#IND"; + static const char nan_str[] = "#QNAN"; + + const char *str; + int size; + + if(inf) { + str = inf_str; + size = sizeof(inf_str); + }else if(ind) { + str = ind_str; + size = sizeof(ind_str); + }else { + str = nan_str; + size = sizeof(nan_str); + } - for(i=1; i<(inf ? sizeof(inf_str) : sizeof(ind_str)); i++) { + for(i=1; i<size; i++) { if(decimal_point[i]<'0' || decimal_point[i]>'9') break; - decimal_point[i] = inf ? inf_str[i-1] : ind_str[i-1]; + decimal_point[i] = str[i-1]; } - if(i!=sizeof(inf_str) && i!=1) + if(i!=size && i!=1) decimal_point[i-1]++; } }

1 0

Piotr Caban : msvcrt/tests: Use NAN and INFINITY definitions from port.h in printf tests.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 248bd63b53a2fd407794c253d414e2eabeed9631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=248bd63b53a2fd407794c253d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 25 14:22:16 2015 +0100 msvcrt/tests: Use NAN and INFINITY definitions from port.h in printf tests. --- dlls/msvcrt/tests/printf.c | 55 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 0606c25..7f734ea 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -27,7 +27,6 @@ #include <stdio.h> #include <errno.h> -#include <math.h> #include "windef.h" #include "winbase.h" @@ -35,6 +34,27 @@ #include "wine/test.h" +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() + +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() + +static inline float __port_ind(void) +{ + static const unsigned __ind_bytes = 0xffc00000; + return *(const float *)&__ind_bytes; +} +#define IND __port_ind() + static int (__cdecl *p__vscprintf)(const char *format, __ms_va_list valist); static int (__cdecl *p__vscwprintf)(const wchar_t *format, __ms_va_list valist); static int (__cdecl *p__vsnwprintf_s)(wchar_t *str, size_t sizeOfBuffer, @@ -82,7 +102,7 @@ static void test_sprintf( void ) { char buffer[100]; const char *format; - double pnumber=789456123, inf, nan; + double pnumber=789456123; int x, r; WCHAR wide[] = { 'w','i','d','e',0}; @@ -675,38 +695,47 @@ static void test_sprintf( void ) r = sprintf(buffer, format, 0x12345); ok(!strcmp(buffer,"2345"), "failed \"%s\"\n", buffer); - nan = 0.0; - inf = 1.0/nan; - nan = sqrt(-1); format = "%lf"; - r = sprintf(buffer, format, nan); + r = sprintf(buffer, format, IND); ok(r==9, "r = %d\n", r); ok(!strcmp(buffer, "-1.#IND00"), "failed: \"%s\"\n", buffer); - r = sprintf(buffer, format, inf); + r = sprintf(buffer, format, NAN); + ok(r==8, "r = %d\n", r); + ok(!strcmp(buffer, "1.#QNAN0"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, INFINITY); ok(r==8, "r = %d\n", r); ok(!strcmp(buffer, "1.#INF00"), "failed: \"%s\"\n", buffer); format = "%le"; - r = sprintf(buffer, format, nan); + r = sprintf(buffer, format, IND); ok(r==14, "r = %d\n", r); ok(!strcmp(buffer, "-1.#IND00e+000"), "failed: \"%s\"\n", buffer); - r = sprintf(buffer, format, inf); + r = sprintf(buffer, format, NAN); + ok(r==13, "r = %d\n", r); + ok(!strcmp(buffer, "1.#QNAN0e+000"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, INFINITY); ok(r==13, "r = %d\n", r); ok(!strcmp(buffer, "1.#INF00e+000"), "failed: \"%s\"\n", buffer); format = "%lg"; - r = sprintf(buffer, format, nan); + r = sprintf(buffer, format, IND); ok(r==7, "r = %d\n", r); ok(!strcmp(buffer, "-1.#IND"), "failed: \"%s\"\n", buffer); - r = sprintf(buffer, format, inf); + r = sprintf(buffer, format, NAN); + ok(r==7, "r = %d\n", r); + ok(!strcmp(buffer, "1.#QNAN"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, INFINITY); ok(r==6, "r = %d\n", r); ok(!strcmp(buffer, "1.#INF"), "failed: \"%s\"\n", buffer); format = "%010.2lf"; - r = sprintf(buffer, format, nan); + r = sprintf(buffer, format, IND); ok(r==10, "r = %d\n", r); ok(!strcmp(buffer, "-000001.#J"), "failed: \"%s\"\n", buffer); - r = sprintf(buffer, format, inf); + r = sprintf(buffer, format, NAN); + ok(r==10, "r = %d\n", r); + ok(!strcmp(buffer, "0000001.#R"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, INFINITY); ok(r==10, "r = %d\n", r); ok(!strcmp(buffer, "0000001.#J"), "failed: \"%s\"\n", buffer); }

1 0

Hans Leidekker : msi: Fall back to the database summary information stream in MSI_OpenPackageW.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 052b3a748e144093ec7043e68333fbc2e85fcdd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=052b3a748e144093ec7043e68… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 14:31:47 2015 +0100 msi: Fall back to the database summary information stream in MSI_OpenPackageW. --- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 18 +++++++++++++----- dlls/msi/suminfo.c | 4 ++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a953d28..b67698a 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -952,6 +952,7 @@ extern UINT msi_spawn_error_dialog( MSIPACKAGE*, LPWSTR, LPWSTR ) DECLSPEC_HIDDE /* summary information */ extern UINT msi_get_suminfo( IStorage *stg, UINT uiUpdateCount, MSISUMMARYINFO **si ) DECLSPEC_HIDDEN; +extern UINT msi_get_db_suminfo( MSIDATABASE *db, UINT uiUpdateCount, MSISUMMARYINFO **si ) DECLSPEC_HIDDEN; extern LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ) DECLSPEC_HIDDEN; extern INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) DECLSPEC_HIDDEN; extern LPWSTR msi_get_suminfo_product( IStorage *stg ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index de50703..6fbbbf5 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1488,8 +1488,12 @@ static WCHAR *get_package_code( MSIDATABASE *db ) r = msi_get_suminfo( db->storage, 0, &si ); if (r != ERROR_SUCCESS) { - WARN("failed to load summary info %u\n", r); - return NULL; + r = msi_get_db_suminfo( db, 0, &si ); + if (r != ERROR_SUCCESS) + { + WARN("failed to load summary info %u\n", r); + return NULL; + } } ret = msi_suminfo_dup_string( si, PID_REVNUMBER ); msiobj_release( &si->hdr ); @@ -1638,9 +1642,13 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) r = msi_get_suminfo( db->storage, 0, &si ); if (r != ERROR_SUCCESS) { - WARN("failed to load summary info\n"); - msiobj_release( &package->hdr ); - return ERROR_INSTALL_PACKAGE_INVALID; + r = msi_get_db_suminfo( db, 0, &si ); + if (r != ERROR_SUCCESS) + { + WARN("failed to load summary info\n"); + msiobj_release( &package->hdr ); + return ERROR_INSTALL_PACKAGE_INVALID; + } } r = parse_suminfo( si, package ); msiobj_release( &si->hdr ); diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 97544d5..bb5e935 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -469,7 +469,7 @@ UINT msi_get_suminfo( IStorage *stg, UINT uiUpdateCount, MSISUMMARYINFO **ret ) return ERROR_SUCCESS; } -static UINT get_db_suminfo( MSIDATABASE *db, UINT uiUpdateCount, MSISUMMARYINFO **ret ) +UINT msi_get_db_suminfo( MSIDATABASE *db, UINT uiUpdateCount, MSISUMMARYINFO **ret ) { IStream *stm; MSISUMMARYINFO *si; @@ -547,7 +547,7 @@ UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, ret = msi_get_suminfo( db->storage, uiUpdateCount, &si ); if (ret != ERROR_SUCCESS) - ret = get_db_suminfo( db, uiUpdateCount, &si ); + ret = msi_get_db_suminfo( db, uiUpdateCount, &si ); if (ret != ERROR_SUCCESS) { if ((si = create_suminfo( db->storage, uiUpdateCount )))

1 0

Hans Leidekker : msi: Avoid allocating a database handle only to retrieve the summary information.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: cd73576ec0f7f7a7f810bf3fd6e17b6625d6d2f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd73576ec0f7f7a7f810bf3fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 14:32:17 2015 +0100 msi: Avoid allocating a database handle only to retrieve the summary information. --- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 70 +-------------------------- dlls/msi/suminfo.c | 140 ++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 102 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd73576ec0f7f7a7f810b…

1 0

Hans Leidekker : msi: Use the last sequence number specified for patch media when updating media records.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: f8dc7c221bc73c851eb1a7e8d6e28295cd542210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8dc7c221bc73c851eb1a7e8d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 14:32:44 2015 +0100 msi: Use the last sequence number specified for patch media when updating media records. --- dlls/msi/msipriv.h | 1 - dlls/msi/patch.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fd7667e..ac7ba32 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -193,7 +193,6 @@ typedef struct tagMSIPATCHINFO MSIPATCHSTATE state; BOOL delete_on_close; UINT disk_id; - UINT last_sequence; } MSIPATCHINFO; typedef struct tagMSIBINARY diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index 838dbb0..b7bf2ef 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -741,7 +741,7 @@ static UINT patch_add_media( MSIPACKAGE *package, IStorage *storage, MSIPATCHINF disk_id = package->db->media_transform_disk_id; TRACE("disk id %u\n", disk_id); - TRACE("last sequence %u\n", patch->last_sequence); + TRACE("last sequence %u\n", media->last_sequence); TRACE("prompt %s\n", debugstr_w(media->prompt)); TRACE("cabinet %s\n", debugstr_w(media->cabinet)); TRACE("volume %s\n", debugstr_w(media->volume)); @@ -749,7 +749,7 @@ static UINT patch_add_media( MSIPACKAGE *package, IStorage *storage, MSIPATCHINF rec = MSI_CreateRecord( 6 ); MSI_RecordSetInteger( rec, 1, disk_id ); - MSI_RecordSetInteger( rec, 2, patch->last_sequence ); + MSI_RecordSetInteger( rec, 2, media->last_sequence ); MSI_RecordSetStringW( rec, 3, media->prompt ); MSI_RecordSetStringW( rec, 4, media->cabinet ); MSI_RecordSetStringW( rec, 5, media->volume ); @@ -828,7 +828,6 @@ static UINT patch_set_offsets( MSIDATABASE *db, MSIPATCHINFO *patch ) if (r != ERROR_SUCCESS) ERR("Failed to update Media table entry, expect breakage (%u)\n", r); - patch->last_sequence = last_sequence; db->media_transform_offset = last_sequence + 1; patch_offset_list_free( pos );

1 0

Hans Leidekker : msi: Check the component enabled flag earlier.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: b7453555a29440ec4b95df87938bf4b00387123b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7453555a29440ec4b95df879… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 14:33:08 2015 +0100 msi: Check the component enabled flag earlier. --- dlls/msi/files.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 531ce38..36e91ca 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -72,7 +72,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil DWORD size; comp->Action = msi_get_component_action( package, comp ); - if (comp->Action != INSTALLSTATE_LOCAL || (comp->assembly && comp->assembly->installed)) + if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL || (comp->assembly && comp->assembly->installed)) { TRACE("skipping %s (not scheduled for install)\n", debugstr_w(file->File)); return msifs_skipped; @@ -353,7 +353,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) rc = ERROR_FUNCTION_FAILED; goto done; } - if (!file->Component->Enabled) continue; if (file->state != msifs_hashmatch && file->state != msifs_skipped &&

1 0