October 2012 - Wine-commits

Jacek Caban : urlmon.idl: Added ICodeInstall declaration.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: c24f074cd7fd17700309b5a136867d4ccfd5eef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c24f074cd7fd17700309b5a13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 29 14:02:01 2012 +0100 urlmon.idl: Added ICodeInstall declaration. --- include/urlmon.idl | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 140852a..85444f9 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -541,6 +541,39 @@ interface IWindowForBindingUI : IUnknown } /***************************************************************************** + * ICodeInstall interface + */ +[ + local, + object, + uuid(79eac9d1-baf9-11ce-8c82-00aa004ba90b), + pointer_default(unique) +] +interface ICodeInstall : IWindowForBindingUI +{ + typedef [unique] ICodeInstall *LPCODEINSTALL; + + typedef enum { + CIP_DISK_FULL, + CIP_ACCESS_DENIED, + CIP_NEWER_VERSION_EXISTS, + CIP_OLDER_VERSION_EXISTS, + CIP_NAME_CONFLICT, + CIP_TRUST_VERIFICATION_COMPONENT_MISSING, + CIP_EXE_SELF_REGISTERATION_TIMEOUT, + CIP_UNSAFE_TO_ABORT, + CIP_NEED_REBOOT, + CIP_NEED_REBOOT_UI_PERMISSION + } CIP_STATUS; + + HRESULT OnCodeInstallProblem( + [in] ULONG ulStatusCode, + [in, unique] LPCWSTR szDestination, + [in, unique] LPCWSTR szSource, + [in] DWORD dwReserved); +} + +/***************************************************************************** * IHttpSecurity interface */ [

1 0

Alexandre Julliard : user32: Don' t flush window surfaces while waiting for a sent message reply.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: b7582525a047018b08768e6672cc2c2f64fdcce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7582525a047018b08768e667… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 29 11:18:06 2012 +0100 user32: Don't flush window surfaces while waiting for a sent message reply. --- dlls/user32/message.c | 6 ++++-- dlls/user32/winproc.c | 5 +---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index c1fe036..b934705 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3682,8 +3682,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, if (!peek_message( &msg, hwnd, first, last, flags, 0 )) { - if (flags & PM_NOYIELD) flush_window_surfaces( FALSE ); - else wow_handlers.wait_message( 0, NULL, 0, 0, 0 ); + flush_window_surfaces( !(flags & PM_NOYIELD) ); + if (!(flags & PM_NOYIELD)) wow_handlers.wait_message( 0, NULL, 0, 0, 0 ); return FALSE; } @@ -3739,6 +3739,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT while (!peek_message( msg, hwnd, first, last, PM_REMOVE | (mask << 16), mask )) { + flush_window_surfaces( TRUE ); wow_handlers.wait_message( 1, &server_queue, INFINITE, mask, 0 ); } @@ -4071,6 +4072,7 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, CONST HANDLE *pHandles, for (i = 0; i < count; i++) handles[i] = pHandles[i]; handles[count] = get_server_queue_handle(); + flush_window_surfaces( TRUE ); return wow_handlers.wait_message( count+1, handles, timeout, mask, flags ); } diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 33afbdd..3b13b82 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1124,10 +1124,7 @@ static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM static DWORD wait_message( DWORD count, CONST HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { - DWORD ret; - - flush_window_surfaces( TRUE ); - ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); + DWORD ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); if (ret == WAIT_TIMEOUT && !count && !timeout) NtYieldExecution(); return ret; }

1 0

Alexandre Julliard : winex11: Delay mapping a layered window until its attributes are set.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 3ad40bf64732cbef4ba199a45eefa12f4b491419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad40bf64732cbef4ba199a45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 29 14:37:56 2012 +0100 winex11: Delay mapping a layered window until its attributes are set. --- dlls/winex11.drv/window.c | 21 ++++++++++++++++++++- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7819a54..1a9b27c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1500,6 +1500,7 @@ void CDECL X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED)) /* changing WS_EX_LAYERED resets attributes */ { + data->layered = FALSE; set_window_visual( data, &default_visual ); sync_window_opacity( data->display, data->whole_window, 0, 0, 0 ); if (data->surface) set_surface_color_key( data->surface, CLR_INVALID ); @@ -2187,10 +2188,13 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (!data->mapped) { BOOL needs_icon = !data->icon_pixmap; + BOOL needs_map = TRUE; + /* layered windows are mapped only once their attributes are set */ + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED) needs_map = data->layered; release_win_data( data ); if (needs_icon) fetch_icon_data( hwnd, 0, 0 ); - map_window( hwnd, new_style ); + if (needs_map) map_window( hwnd, new_style ); return; } else if ((swp_flags & SWP_STATECHANGED) && (!data->iconic != !(new_style & WS_MINIMIZE))) @@ -2336,6 +2340,20 @@ void CDECL X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alph sync_window_opacity( data->display, data->whole_window, key, alpha, flags ); if (data->surface) set_surface_color_key( data->surface, (flags & LWA_COLORKEY) ? key : CLR_INVALID ); + + data->layered = TRUE; + if (!data->mapped) /* mapping is delayed until attributes are set */ + { + DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); + + if ((style & WS_VISIBLE) && + ((style & WS_MINIMIZE) || is_window_rect_mapped( &data->window_rect ))) + { + release_win_data( data ); + map_window( hwnd, style ); + return; + } + } release_win_data( data ); } else @@ -2371,6 +2389,7 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO if (!(data = get_win_data( hwnd ))) return FALSE; + data->layered = TRUE; if (!data->embedded && argb_visual.visualid) set_window_visual( data, &argb_visual ); rect = *window_rect; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 99f045f..5a34e75 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -558,6 +558,7 @@ struct x11drv_win_data BOOL iconic : 1; /* is window in iconic state? */ BOOL embedded : 1; /* is window an XEMBED client? */ BOOL shaped : 1; /* is window using a custom region shape? */ + BOOL layered : 1; /* is window layered and with valid attributes? */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */

1 0

Maarten Lankhorst : ws2_32: Define IP_UNICAST_IF if not found on linux.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 7ce6a2dfd434d8c61d5bd1525a555c19706ac5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce6a2dfd434d8c61d5bd1525… Author: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> Date: Sat Oct 27 12:39:59 2012 +0200 ws2_32: Define IP_UNICAST_IF if not found on linux. --- dlls/ws2_32/socket.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 792ab1c..5c69d21 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -157,6 +157,9 @@ # include "wsnwlink.h" #endif +#if defined(linux) && !defined(IP_UNICAST_IF) +#define IP_UNICAST_IF 50 +#endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) # define sipx_network sipx_addr.x_net

1 0

Frédéric Delanoy : ws2_32/tests: Remove dead code (coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 378e86fafaabda04af8e7506dff77b571bea0236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=378e86fafaabda04af8e7506d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 27 19:23:12 2012 +0200 ws2_32/tests: Remove dead code (coverity). --- dlls/ws2_32/tests/sock.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6fa4249..8860448 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5402,8 +5402,6 @@ static void test_completion_port(void) if (dest != INVALID_SOCKET) closesocket(dest); - if (src != INVALID_SOCKET) - closesocket(src); memset(&ov, 0, sizeof(ov));

1 0

Jacek Caban : vbscript: Added support for negative constants.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: a41ba1c3e83099ea6ecc30ce7b9e1ceddca27d82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41ba1c3e83099ea6ecc30ce7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 29 11:52:31 2012 +0100 vbscript: Added support for negative constants. --- dlls/vbscript/parser.y | 19 ++++++++++++++----- dlls/vbscript/tests/lang.vbs | 12 +++++++++++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8a2a9e3..45f9169 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -125,6 +125,7 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression +%type <expression> ConstExpression NumericLiteralExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt Step_opt ExpressionList %type <bool> OptionExplicit_opt DoType @@ -218,7 +219,11 @@ ConstDeclList | ConstDecl ',' ConstDeclList { $1->next = $3; $$ = $1; } ConstDecl - : Identifier '=' LiteralExpression { $$ = new_const_decl(ctx, $1, $3); CHECK_ERROR; } + : Identifier '=' ConstExpression { $$ = new_const_decl(ctx, $1, $3); CHECK_ERROR; } + +ConstExpression + : LiteralExpression { $$ = $1; } + | '-' NumericLiteralExpression { $$ = new_unary_expression(ctx, EXPR_NEG, $2); CHECK_ERROR; } DoType : tWHILE { $$ = TRUE; } @@ -354,14 +359,18 @@ LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } | tFALSE { $$ = new_bool_expression(ctx, VARIANT_FALSE); CHECK_ERROR; } | tString { $$ = new_string_expression(ctx, $1); CHECK_ERROR; } - | tShort { $$ = new_long_expression(ctx, EXPR_USHORT, $1); CHECK_ERROR; } - | '0' { $$ = new_long_expression(ctx, EXPR_USHORT, 0); CHECK_ERROR; } - | tLong { $$ = new_long_expression(ctx, EXPR_ULONG, $1); CHECK_ERROR; } - | tDouble { $$ = new_double_expression(ctx, $1); CHECK_ERROR; } + | NumericLiteralExpression { $$ = $1; } | tEMPTY { $$ = new_expression(ctx, EXPR_EMPTY, 0); CHECK_ERROR; } | tNULL { $$ = new_expression(ctx, EXPR_NULL, 0); CHECK_ERROR; } | tNOTHING { $$ = new_expression(ctx, EXPR_NOTHING, 0); CHECK_ERROR; } +NumericLiteralExpression + : tShort { $$ = new_long_expression(ctx, EXPR_USHORT, $1); CHECK_ERROR; } + | '0' { $$ = new_long_expression(ctx, EXPR_USHORT, 0); CHECK_ERROR; } + | tLong { $$ = new_long_expression(ctx, EXPR_ULONG, $1); CHECK_ERROR; } + | tDouble { $$ = new_double_expression(ctx, $1); CHECK_ERROR; } + + PrimaryExpression : '(' Expression ')' { $$ = new_unary_expression(ctx, EXPR_BRACKETS, $2); } | tME { $$ = new_expression(ctx, EXPR_ME, 0); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 76f4003..8cffc7f 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -912,9 +912,19 @@ Call obj.test(obj) Call ok(getVT(test) = "VT_DISPATCH", "getVT(test) = " & getVT(test)) Call ok(Me is Test, "Me is not Test") -Const c1 = 1, c2 = 2 +Const c1 = 1, c2 = 2, c3 = -3 Call ok(c1 = 1, "c1 = " & c1) Call ok(getVT(c1) = "VT_I2", "getVT(c1) = " & getVT(c1)) +Call ok(c3 = -3, "c3 = " & c3) +Call ok(getVT(c3) = "VT_I2", "getVT(c3) = " & getVT(c3)) + +Const cb = True, cs = "test", cnull = null +Call ok(cb, "cb = " & cb) +Call ok(getVT(cb) = "VT_BOOL", "getVT(cb) = " & getVT(cb)) +Call ok(cs = "test", "cs = " & cs) +Call ok(getVT(cs) = "VT_BSTR", "getVT(cs) = " & getVT(cs)) +Call ok(isNull(cnull), "cnull = " & cnull) +Call ok(getVT(cnull) = "VT_NULL", "getVT(cnull) = " & getVT(cnull)) if false then Const conststr = "str" Call ok(conststr = "str", "conststr = " & conststr)

1 0

Hans Leidekker : comctl32: Use the dialog template caption as default propsheet title.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 232a44edafd074c092628d65b513fa0674c2cd18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=232a44edafd074c092628d65b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:11:24 2012 +0100 comctl32: Use the dialog template caption as default propsheet title. --- dlls/comctl32/propsheet.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index b2ceee8..b73c448 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -555,13 +555,12 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, if (IS_INTRESOURCE( lppsp->pszTitle )) { - if (!LoadStringW( lppsp->hInstance, (DWORD_PTR)lppsp->pszTitle,szTitle,sizeof(szTitle)/sizeof(szTitle[0]) )) - { - pTitle = pszNull; - FIXME("Could not load resource #%04x?\n",LOWORD(lppsp->pszTitle)); - } - else + if (LoadStringW( lppsp->hInstance, (DWORD_PTR)lppsp->pszTitle, szTitle, sizeof(szTitle)/sizeof(szTitle[0]) )) pTitle = szTitle; + else if (*p) + pTitle = p; + else + pTitle = pszNull; } else pTitle = lppsp->pszTitle;

1 0

Hans Leidekker : msi: Add a test for embedded nulls in string property values.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: a1c4d2c97731644f4e6265fb71fe5c7b66b06147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c4d2c97731644f4e6265fb7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:11:55 2012 +0100 msi: Add a test for embedded nulls in string property values. --- dlls/msi/tests/format.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 3ecfc66..d91241d 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -2530,6 +2530,9 @@ static void test_formatrecord_tables(void) r = add_custom_action_entry( hdb, "'EscapeIt3', 51, 'prop', '[abcd\\xefgh]'" ); ok( r == ERROR_SUCCESS, "cannot add custom action: %d\n", r); + r = add_custom_action_entry( hdb, "'EmbedNull', 51, 'prop', '[~]np'" ); + ok( r == ERROR_SUCCESS, "cannot add custom action: %d\n", r); + r = package_from_db( hdb, &hpkg ); if (r == ERROR_INSTALL_PACKAGE_REJECTED) { @@ -2661,7 +2664,7 @@ static void test_formatrecord_tables(void) /* custom action 51, escaped text 1 */ r = MsiDoAction( hpkg, "EscapeIt1" ); - ok( r == ERROR_SUCCESS, "EscapeIt failed: %d\n", r); + ok( r == ERROR_SUCCESS, "EscapeIt1 failed: %d\n", r); size = MAX_PATH; r = MsiGetProperty( hpkg, "prop", buf, &size ); @@ -2670,7 +2673,7 @@ static void test_formatrecord_tables(void) /* custom action 51, escaped text 2 */ r = MsiDoAction( hpkg, "EscapeIt2" ); - ok( r == ERROR_SUCCESS, "EscapeIt failed: %d\n", r); + ok( r == ERROR_SUCCESS, "EscapeIt2 failed: %d\n", r); size = MAX_PATH; r = MsiGetProperty( hpkg, "prop", buf, &size ); @@ -2679,13 +2682,33 @@ static void test_formatrecord_tables(void) /* custom action 51, escaped text 3 */ r = MsiDoAction( hpkg, "EscapeIt3" ); - ok( r == ERROR_SUCCESS, "EscapeIt failed: %d\n", r); + ok( r == ERROR_SUCCESS, "EscapeIt3 failed: %d\n", r); size = MAX_PATH; r = MsiGetProperty( hpkg, "prop", buf, &size ); ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); ok( !lstrcmp( buf, "" ), "Expected '', got %s\n", buf); + /* custom action 51, embedded null */ + r = MsiDoAction( hpkg, "EmbedNull" ); + ok( r == ERROR_SUCCESS, "EmbedNull failed: %d\n", r); + + size = MAX_PATH; + memset( buf, 'a', sizeof(buf) ); + r = MsiGetProperty( hpkg, "prop", buf, &size ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + todo_wine ok( !memcmp( buf, "\0np", sizeof("\0np") ), "wrong value\n"); + todo_wine ok( size == sizeof("\0np") - 1, "got %u\n", size ); + + r = MsiSetProperty( hpkg, "prop", "[~]np" ); + ok( r == ERROR_SUCCESS, "cannot set property: %d\n", r); + + size = MAX_PATH; + memset( buf, 'a', sizeof(buf) ); + r = MsiGetProperty( hpkg, "prop", buf, &size ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + ok( !lstrcmp( buf, "[~]np" ), "Expected '[~]np', got %s\n", buf); + sprintf( expected, "1: %sI am a really long directory\\ ", root); /* component with INSTALLSTATE_LOCAL */

1 0

Hans Leidekker : msi: Add more tests for embedded nulls in string property values.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 652863f4d59ac9cf434f708092217dd26eea4cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=652863f4d59ac9cf434f70809… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:12:27 2012 +0100 msi: Add more tests for embedded nulls in string property values. --- dlls/msi/tests/package.c | 54 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 45 insertions(+), 9 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 5d56afe..85f0d86 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -593,6 +593,17 @@ static UINT create_inilocator_table( MSIHANDLE hdb ) "PRIMARY KEY `Signature_`)" ); } +static UINT create_custom_action_table( MSIHANDLE hdb ) +{ + return run_query( hdb, + "CREATE TABLE `CustomAction` (" + "`Action` CHAR(72) NOT NULL, " + "`Type` SHORT NOT NULL, " + "`Source` CHAR(75), " + "`Target` CHAR(255) " + "PRIMARY KEY `Action`)" ); +} + #define make_add_entry(type, qtext) \ static UINT add##_##type##_##entry( MSIHANDLE hdb, const char *values ) \ { \ @@ -672,6 +683,10 @@ make_add_entry(inilocator, "(`Signature_`, `FileName`, `Section`, `Key`, `Field`, `Type`) " "VALUES( %s )") +make_add_entry(custom_action, + "INSERT INTO `CustomAction` " + "(`Action`, `Type`, `Source`, `Target`) VALUES( %s )") + static UINT add_reglocator_entry( MSIHANDLE hdb, const char *sig, UINT root, const char *path, const char *name, UINT type ) { @@ -2139,10 +2154,10 @@ static void test_props(void) DeleteFile(msifile); } -static BOOL find_prop_in_property(MSIHANDLE hdb, LPCSTR prop, LPCSTR val) +static BOOL find_prop_in_property(MSIHANDLE hdb, LPCSTR prop, LPCSTR val, int len) { MSIHANDLE hview, hrec; - BOOL found; + BOOL found = FALSE; CHAR buffer[MAX_PATH]; DWORD sz; UINT r; @@ -2152,7 +2167,8 @@ static BOOL find_prop_in_property(MSIHANDLE hdb, LPCSTR prop, LPCSTR val) r = MsiViewExecute(hview, 0); ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); - found = FALSE; + if (len < 0) len = lstrlenA(val); + while (r == ERROR_SUCCESS && !found) { r = MsiViewFetch(hview, &hrec); @@ -2164,16 +2180,17 @@ static BOOL find_prop_in_property(MSIHANDLE hdb, LPCSTR prop, LPCSTR val) { sz = MAX_PATH; r = MsiRecordGetString(hrec, 2, buffer, &sz); - if (r == ERROR_SUCCESS && !lstrcmpA(buffer, val)) + if (r == ERROR_SUCCESS && !memcmp(buffer, val, len) && !buffer[len]) + { + ok(sz == len, "wrong size %u\n", sz); found = TRUE; + } } MsiCloseHandle(hrec); } - MsiViewClose(hview); MsiCloseHandle(hview); - return found; } @@ -2249,6 +2266,12 @@ static void test_property_table(void) r = add_property_entry(hdb, "'prop', 'val'"); ok(r == ERROR_SUCCESS, "cannot add property: %d\n", r); + r = create_custom_action_table(hdb); + ok(r == ERROR_SUCCESS, "cannot create CustomAction table: %d\n", r); + + r = add_custom_action_entry( hdb, "'EmbedNull', 51, 'prop2', '[~]np'" ); + ok( r == ERROR_SUCCESS, "cannot add custom action: %d\n", r); + r = package_from_db(hdb, &hpkg); ok(r == ERROR_SUCCESS, "failed to create package %u\n", r); @@ -2261,7 +2284,7 @@ static void test_property_table(void) hdb = MsiGetActiveDatabase(hpkg); - found = find_prop_in_property(hdb, "prop", "val"); + found = find_prop_in_property(hdb, "prop", "val", -1); ok(found, "prop should be in the _Property table\n"); r = add_property_entry(hdb, "'dantes', 'mercedes'"); @@ -2271,7 +2294,7 @@ static void test_property_table(void) r = do_query(hdb, query, &hrec); ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); - found = find_prop_in_property(hdb, "dantes", "mercedes"); + found = find_prop_in_property(hdb, "dantes", "mercedes", -1); ok(found == FALSE, "dantes should not be in the _Property table\n"); sz = MAX_PATH; @@ -2283,9 +2306,22 @@ static void test_property_table(void) r = MsiSetProperty(hpkg, "dantes", "mercedes"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - found = find_prop_in_property(hdb, "dantes", "mercedes"); + found = find_prop_in_property(hdb, "dantes", "mercedes", -1); ok(found == TRUE, "dantes should be in the _Property table\n"); + r = MsiDoAction( hpkg, "EmbedNull" ); + ok( r == ERROR_SUCCESS, "EmbedNull failed: %d\n", r); + + sz = MAX_PATH; + memset( buffer, 'a', sizeof(buffer) ); + r = MsiGetProperty( hpkg, "prop2", buffer, &sz ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + todo_wine ok( !memcmp( buffer, "\0np", sizeof("\0np") ), "wrong value\n"); + todo_wine ok( sz == sizeof("\0np") - 1, "got %u\n", sz ); + + found = find_prop_in_property(hdb, "prop2", "\0np", 3); + todo_wine ok(found == TRUE, "prop2 should be in the _Property table\n"); + MsiCloseHandle(hdb); MsiCloseHandle(hpkg); DeleteFile(msifile);

1 0

Hans Leidekker : msi: Add support for storing strings with embedded nulls in the string table.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 6950ac1d1cbd842f1de0050585a0bbbe55fe1635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6950ac1d1cbd842f1de005058… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:12:50 2012 +0100 msi: Add support for storing strings with embedded nulls in the string table. --- dlls/msi/msipriv.h | 4 +- dlls/msi/msiquery.c | 2 +- dlls/msi/storages.c | 2 +- dlls/msi/streams.c | 2 +- dlls/msi/string.c | 73 +++++++++++++++++++++++++++++++------------------- dlls/msi/table.c | 29 ++++++++++---------- dlls/msi/where.c | 4 +- 7 files changed, 66 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6950ac1d1cbd842f1de00…

1 0