October 2009 - Wine-commits

Nikolay Sivov : comctl32/tooltips: Test the way structure size field is validated.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: f394bed5971be188c5a2d0ca823823a11f52db20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f394bed5971be188c5a2d0ca8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 15 15:37:06 2009 +0400 comctl32/tooltips: Test the way structure size field is validated. --- dlls/comctl32/tests/tooltips.c | 148 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 9 +-- 2 files changed, 150 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index ddc162a..4014322 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -23,6 +23,8 @@ #include "wine/test.h" +#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) + static void test_create_tooltip(void) { HWND parent, hwnd; @@ -464,6 +466,152 @@ static void test_ttm_gettoolinfo(void) ok(0xaaaaaaaa == ti.lParam, "Expected 0xaaaaaaaa, got %lx\n", ti.lParam); DestroyWindow(hwnd); + + /* 1. test size parameter validation rules (ansi messages) */ + hwnd = CreateWindowExA(0, TOOLTIPS_CLASSA, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + + ti.cbSize = TTTOOLINFOA_V1_SIZE - 1; + ti.hwnd = NULL; + ti.hinst = GetModuleHandleA(NULL); + ti.uFlags = 0; + ti.uId = 0x1234ABCD; + ti.lpszText = NULL; + ti.lParam = 0xdeadbeef; + GetClientRect(hwnd, &ti.rect); + r = SendMessage(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&ti); + ok(r, "Adding the tool to the tooltip failed\n"); + r = SendMessage(hwnd, TTM_GETTOOLCOUNT, 0, 0); + expect(1, r); + + ti.cbSize = TTTOOLINFOA_V1_SIZE - 1; + ti.hwnd = NULL; + ti.uId = 0x1234ABCD; + SendMessage(hwnd, TTM_DELTOOLA, 0, (LPARAM)&ti); + r = SendMessage(hwnd, TTM_GETTOOLCOUNT, 0, 0); + expect(0, r); + + ti.cbSize = TTTOOLINFOA_V2_SIZE - 1; + ti.hwnd = NULL; + ti.hinst = GetModuleHandleA(NULL); + ti.uFlags = 0; + ti.uId = 0x1234ABCD; + ti.lpszText = NULL; + ti.lParam = 0xdeadbeef; + GetClientRect(hwnd, &ti.rect); + r = SendMessage(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&ti); + ok(r, "Adding the tool to the tooltip failed\n"); + r = SendMessage(hwnd, TTM_GETTOOLCOUNT, 0, 0); + expect(1, r); + + ti.cbSize = TTTOOLINFOA_V2_SIZE - 1; + ti.hwnd = NULL; + ti.uId = 0x1234ABCD; + SendMessage(hwnd, TTM_DELTOOLA, 0, (LPARAM)&ti); + r = SendMessage(hwnd, TTM_GETTOOLCOUNT, 0, 0); + expect(0, r); + + ti.cbSize = TTTOOLINFOA_V2_SIZE + 1; + ti.hwnd = NULL; + ti.hinst = GetModuleHandleA(NULL); + ti.uFlags = 0; + ti.uId = 0x1234ABCD; + ti.lpszText = NULL; + ti.lParam = 0xdeadbeef; + GetClientRect(hwnd, &ti.rect); + r = SendMessage(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&ti); + ok(r, "Adding the tool to the tooltip failed\n"); + r = SendMessage(hwnd, TTM_GETTOOLCOUNT, 0, 0); + expect(1, r); + + ti.cbSize = TTTOOLINFOA_V2_SIZE + 1; + ti.hwnd = NULL; + ti.uId = 0x1234ABCD; + SendMessage(hwnd, TTM_DELTOOLA, 0, (LPARAM)&ti); + r = SendMessage(hwnd, TTM_GETTOOLCOUNT, 0, 0); + expect(0, r); + + DestroyWindow(hwnd); + + /* 2. test size parameter validation rules (w-messages) */ + hwnd = CreateWindowExW(0, TOOLTIPS_CLASSW, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + if(!hwnd) + { + win_skip("CreateWindowExW() not supported. Skipping.\n"); + return; + } + + tiW.cbSize = TTTOOLINFOW_V1_SIZE - 1; + tiW.hwnd = NULL; + tiW.hinst = GetModuleHandleA(NULL); + tiW.uFlags = 0; + tiW.uId = 0x1234ABCD; + tiW.lpszText = NULL; + tiW.lParam = 0xdeadbeef; + GetClientRect(hwnd, &tiW.rect); + r = SendMessageW(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&tiW); + ok(r, "Adding the tool to the tooltip failed\n"); + r = SendMessageW(hwnd, TTM_GETTOOLCOUNT, 0, 0); + expect(1, r); + + tiW.cbSize = TTTOOLINFOW_V1_SIZE - 1; + tiW.hwnd = NULL; + tiW.uId = 0x1234ABCD; + SendMessageW(hwnd, TTM_DELTOOLW, 0, (LPARAM)&tiW); + r = SendMessageW(hwnd, TTM_GETTOOLCOUNT, 0, 0); + expect(0, r); + + tiW.cbSize = TTTOOLINFOW_V2_SIZE - 1; + tiW.hwnd = NULL; + tiW.hinst = GetModuleHandleA(NULL); + tiW.uFlags = 0; + tiW.uId = 0x1234ABCD; + tiW.lpszText = NULL; + tiW.lParam = 0xdeadbeef; + GetClientRect(hwnd, &tiW.rect); + r = SendMessageW(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&tiW); + ok(r, "Adding the tool to the tooltip failed\n"); + r = SendMessageW(hwnd, TTM_GETTOOLCOUNT, 0, 0); + expect(1, r); + + tiW.cbSize = TTTOOLINFOW_V2_SIZE - 1; + tiW.hwnd = NULL; + tiW.uId = 0x1234ABCD; + SendMessageW(hwnd, TTM_DELTOOLW, 0, (LPARAM)&tiW); + r = SendMessageW(hwnd, TTM_GETTOOLCOUNT, 0, 0); + expect(0, r); + + tiW.cbSize = TTTOOLINFOW_V2_SIZE + 1; + tiW.hwnd = NULL; + tiW.hinst = GetModuleHandleA(NULL); + tiW.uFlags = 0; + tiW.uId = 0x1234ABCD; + tiW.lpszText = NULL; + tiW.lParam = 0xdeadbeef; + GetClientRect(hwnd, &tiW.rect); + r = SendMessageW(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&tiW); + ok(r, "Adding the tool to the tooltip failed\n"); + r = SendMessageW(hwnd, TTM_GETTOOLCOUNT, 0, 0); + expect(1, r); + /* looks like TTM_DELTOOLW doesn't work with invalid size */ + tiW.cbSize = TTTOOLINFOW_V2_SIZE + 1; + tiW.hwnd = NULL; + tiW.uId = 0x1234ABCD; + SendMessageW(hwnd, TTM_DELTOOLW, 0, (LPARAM)&tiW); + r = SendMessageW(hwnd, TTM_GETTOOLCOUNT, 0, 0); + expect(1, r); + + tiW.cbSize = TTTOOLINFOW_V2_SIZE; + tiW.hwnd = NULL; + tiW.uId = 0x1234ABCD; + SendMessageW(hwnd, TTM_DELTOOLW, 0, (LPARAM)&tiW); + r = SendMessageW(hwnd, TTM_GETTOOLCOUNT, 0, 0); + expect(0, r); + + DestroyWindow(hwnd); } START_TEST(tooltips) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 05cd0dc..99656d7 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1027,8 +1027,6 @@ TOOLTIPS_AddToolA (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpToolInfo) if (lpToolInfo == NULL) return FALSE; - if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE) - return FALSE; TRACE("add tool (%p) %p %ld%s!\n", infoPtr->hwndSelf, lpToolInfo->hwnd, lpToolInfo->uId, @@ -1116,8 +1114,6 @@ TOOLTIPS_AddToolW (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) if (lpToolInfo == NULL) return FALSE; - if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE) - return FALSE; TRACE("add tool (%p) %p %ld%s!\n", infoPtr->hwndSelf, lpToolInfo->hwnd, lpToolInfo->uId, @@ -1279,8 +1275,6 @@ TOOLTIPS_DelToolA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) if (lpToolInfo == NULL) return 0; - if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE) - return 0; if (infoPtr->uNumTools == 0) return 0; @@ -1299,7 +1293,8 @@ TOOLTIPS_DelToolW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) if (lpToolInfo == NULL) return 0; - if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE) + if (lpToolInfo->cbSize > TTTOOLINFOW_V2_SIZE && + lpToolInfo->cbSize != TTTOOLINFOW_V3_SIZE) return 0; if (infoPtr->uNumTools == 0) return 0;

1 0

Nikolay Sivov : comctl32/tooltips: Remove redundant code, let handlers deal with A<->W conversions.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 38c0d421ecbbfadbb94afbea5da785b44f269b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c0d421ecbbfadbb94afbea5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 15 14:53:28 2009 +0400 comctl32/tooltips: Remove redundant code, let handlers deal with A<->W conversions. --- dlls/comctl32/tooltips.c | 834 +++++++++++----------------------------------- 1 files changed, 203 insertions(+), 631 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38c0d421ecbbfadbb94af…

1 0

Nikolay Sivov : comctl32/tooltips: Remove unneeded helper parameter.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: f84a6bdf3ae8b11e9ca40c6e0b38d876f6ea7342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f84a6bdf3ae8b11e9ca40c6e0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 15 14:54:23 2009 +0400 comctl32/tooltips: Remove unneeded helper parameter. --- dlls/comctl32/tooltips.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index b6412a8..dba5b3f 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -213,15 +213,12 @@ TOOLTIPS_InitSystemSettings (TOOLTIPS_INFO *infoPtr) /* Custom draw routines */ static void -TOOLTIPS_customdraw_fill(NMTTCUSTOMDRAW *lpnmttcd, - const HWND hwnd, +TOOLTIPS_customdraw_fill(const TOOLTIPS_INFO *infoPtr, NMTTCUSTOMDRAW *lpnmttcd, HDC hdc, const RECT *rcBounds, UINT uFlags) { - TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(hwnd); - ZeroMemory(lpnmttcd, sizeof(NMTTCUSTOMDRAW)); lpnmttcd->uDrawFlags = uFlags; - lpnmttcd->nmcd.hdr.hwndFrom = hwnd; + lpnmttcd->nmcd.hdr.hwndFrom = infoPtr->hwndSelf; lpnmttcd->nmcd.hdr.code = NM_CUSTOMDRAW; if (infoPtr->nCurrentTool != -1) { TTTOOL_INFO *toolPtr = &infoPtr->tools[infoPtr->nCurrentTool]; @@ -276,7 +273,7 @@ TOOLTIPS_Refresh (const TOOLTIPS_INFO *infoPtr, HDC hdc) /* Custom draw - Call PrePaint once initial properties set up */ /* Note: Contrary to MSDN, CDRF_SKIPDEFAULT still draws a tooltip */ - TOOLTIPS_customdraw_fill(&nmttcd, infoPtr->hwndSelf, hdc, &rc, uFlags); + TOOLTIPS_customdraw_fill(infoPtr, &nmttcd, hdc, &rc, uFlags); cdmode = TOOLTIPS_notify_customdraw(CDDS_PREPAINT, &nmttcd); uFlags = nmttcd.uDrawFlags;

1 0

Hans Leidekker : msi: Define common strings only once.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 843382f28472a312c9a5beefa4298f7c4b4a5ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=843382f28472a312c9a5beefa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 15 12:46:27 2009 +0200 msi: Define common strings only once. --- dlls/msi/action.c | 162 +++++++++++++------------------------------------- dlls/msi/appsearch.c | 20 ++---- dlls/msi/classes.c | 13 ---- dlls/msi/cond.y | 1 - dlls/msi/custom.c | 37 +++-------- dlls/msi/database.c | 11 +-- dlls/msi/dialog.c | 19 ++---- dlls/msi/events.c | 4 - dlls/msi/files.c | 11 +--- dlls/msi/helpers.c | 8 +-- dlls/msi/media.c | 5 +- dlls/msi/msi.c | 26 ++------ dlls/msi/msipriv.h | 44 ++++++++++++-- dlls/msi/package.c | 64 ++++++++------------ dlls/msi/registry.c | 10 +--- dlls/msi/source.c | 11 +--- dlls/msi/string.c | 3 +- dlls/msi/table.c | 3 - dlls/msi/upgrade.c | 7 +-- 19 files changed, 145 insertions(+), 314 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=843382f28472a312c9a5b…

1 0

Hans Leidekker : msi: Add some tests for MsiGetTargetPathW.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 55b89f4a66810518b88584a2130071529123c7ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b89f4a66810518b88584a21… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 15 12:47:17 2009 +0200 msi: Add some tests for MsiGetTargetPathW. --- dlls/msi/tests/package.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 55d9bb3..fcad0be 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -843,7 +843,10 @@ static void test_doaction( void ) static void test_gettargetpath_bad(void) { + static const WCHAR boo[] = {'b','o','o',0}; + static const WCHAR empty[] = {0}; char buffer[0x80]; + WCHAR bufferW[0x80]; MSIHANDLE hpkg; DWORD sz; UINT r; @@ -869,6 +872,32 @@ static void test_gettargetpath_bad(void) r = MsiGetTargetPath( hpkg, "boo", buffer, NULL ); ok( r == ERROR_DIRECTORY, "wrong return val\n"); + sz = 0; + r = MsiGetTargetPath( hpkg, "", buffer, &sz ); + ok( r == ERROR_DIRECTORY, "wrong return val\n"); + + r = MsiGetTargetPathW( 0, NULL, NULL, NULL ); + ok( r == ERROR_INVALID_PARAMETER, "wrong return val\n"); + + r = MsiGetTargetPathW( 0, NULL, NULL, &sz ); + ok( r == ERROR_INVALID_PARAMETER, "wrong return val\n"); + + r = MsiGetTargetPathW( 0, boo, NULL, NULL ); + ok( r == ERROR_INVALID_HANDLE, "wrong return val\n"); + + r = MsiGetTargetPathW( 0, boo, NULL, NULL ); + ok( r == ERROR_INVALID_HANDLE, "wrong return val\n"); + + r = MsiGetTargetPathW( hpkg, boo, NULL, NULL ); + ok( r == ERROR_DIRECTORY, "wrong return val\n"); + + r = MsiGetTargetPathW( hpkg, boo, bufferW, NULL ); + ok( r == ERROR_DIRECTORY, "wrong return val\n"); + + sz = 0; + r = MsiGetTargetPathW( hpkg, empty, bufferW, &sz ); + ok( r == ERROR_DIRECTORY, "wrong return val\n"); + MsiCloseHandle( hpkg ); DeleteFile(msifile); }

1 0

Hans Leidekker : msi: Reorder functions to avoid forward declarations.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 796eed1dc708041bb67e3f73533c90b39969cf04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=796eed1dc708041bb67e3f735… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 15 12:47:48 2009 +0200 msi: Reorder functions to avoid forward declarations. --- dlls/msi/action.c | 446 +++++++++++++++++++++++++--------------------------- 1 files changed, 214 insertions(+), 232 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=796eed1dc708041bb67e3…

1 0

Hans Leidekker : msi: Use a function to test the UI level instead of passing a boolean around.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: e3aa2f33d93e1f9cc1ab19b87ad7fd34f490a887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3aa2f33d93e1f9cc1ab19b87… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 15 12:48:26 2009 +0200 msi: Use a function to test the UI level instead of passing a boolean around. --- dlls/msi/action.c | 55 +++++++++++++++++----------------------------------- 1 files changed, 18 insertions(+), 37 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b75cadc..1a06600 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -693,6 +693,12 @@ static UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) return ERROR_SUCCESS; } +static BOOL needs_ui_sequence(MSIPACKAGE *package) +{ + INT level = msi_get_property_int(package, szUILevel, 0); + return (level & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED; +} + static UINT msi_set_context(MSIPACKAGE *package) { WCHAR val[10]; @@ -714,16 +720,11 @@ static UINT msi_set_context(MSIPACKAGE *package) return ERROR_SUCCESS; } -typedef struct { - MSIPACKAGE* package; - BOOL UI; -} iterate_action_param; - static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param) { - iterate_action_param *iap = param; UINT rc; LPCWSTR cond, action; + MSIPACKAGE *package = param; action = MSI_RecordGetString(row,1); if (!action) @@ -736,21 +737,21 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param) cond = MSI_RecordGetString(row,2); /* this is a hack to skip errors in the condition code */ - if (MSI_EvaluateConditionW(iap->package, cond) == MSICONDITION_FALSE) + if (MSI_EvaluateConditionW(package, cond) == MSICONDITION_FALSE) { TRACE("Skipping action: %s (condition is false)\n", debugstr_w(action)); return ERROR_SUCCESS; } - if (iap->UI) - rc = ACTION_PerformUIAction(iap->package,action,-1); + if (needs_ui_sequence(package)) + rc = ACTION_PerformUIAction(package, action, -1); else - rc = ACTION_PerformAction(iap->package,action,-1,FALSE); + rc = ACTION_PerformAction(package, action, -1, FALSE); msi_dialog_check_messages( NULL ); - if (iap->package->CurrentInstallState != ERROR_SUCCESS ) - rc = iap->package->CurrentInstallState; + if (package->CurrentInstallState != ERROR_SUCCESS) + rc = package->CurrentInstallState; if (rc == ERROR_FUNCTION_NOT_CALLED) rc = ERROR_SUCCESS; @@ -772,23 +773,13 @@ UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR szTable, INT iSequenceMode ) '`','S','e','q','u','e','n','c','e','`',' ', '>',' ','0',' ','O','R','D','E','R',' ','B','Y',' ', '`','S','e','q','u','e','n','c','e','`',0}; - iterate_action_param iap; - - /* - * FIXME: probably should be checking UILevel in the - * ACTION_PerformUIAction/ACTION_PerformAction - * rather than saving the UI level here. Those - * two functions can be merged too. - */ - iap.package = package; - iap.UI = TRUE; TRACE("%p %s %i\n", package, debugstr_w(szTable), iSequenceMode ); r = MSI_OpenQuery( package->db, &view, query, szTable ); if (r == ERROR_SUCCESS) { - r = MSI_IterateRecords( view, NULL, ITERATE_Actions, &iap ); + r = MSI_IterateRecords( view, NULL, ITERATE_Actions, package ); msiobj_release(&view->hdr); } @@ -806,7 +797,6 @@ static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran) '`','S','e','q','u','e','n','c','e','`',' ', '>',' ','%','i',' ', 'O','R','D','E','R',' ', 'B','Y',' ', '`','S','e','q','u','e','n','c','e','`',0 }; - MSIRECORD * row = 0; static const WCHAR IVQuery[] = {'S','E','L','E','C','T',' ','`','S','e','q','u','e','n','c','e','`', ' ', 'F','R','O','M',' ','`','I','n','s','t','a','l','l', @@ -815,10 +805,6 @@ static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran) ' ','\'', 'I','n','s','t','a','l','l', 'V','a','l','i','d','a','t','e','\'', 0}; INT seq = 0; - iterate_action_param iap; - - iap.package = package; - iap.UI = FALSE; if (package->script->ExecuteSequenceRun) { @@ -831,7 +817,7 @@ static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran) /* get the sequence number */ if (UIran) { - row = MSI_QueryGetRecord(package->db, IVQuery); + MSIRECORD *row = MSI_QueryGetRecord(package->db, IVQuery); if( !row ) return ERROR_FUNCTION_FAILED; seq = MSI_RecordGetInteger(row,1); @@ -843,7 +829,7 @@ static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran) { TRACE("Running the actions\n"); - rc = MSI_IterateRecords(view, NULL, ITERATE_Actions, &iap); + rc = MSI_IterateRecords(view, NULL, ITERATE_Actions, package); msiobj_release(&view->hdr); } @@ -862,18 +848,13 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package) '`','S','e','q','u','e','n','c','e','`',' ', '>',' ','0',' ','O','R','D','E','R',' ','B','Y',' ', '`','S','e','q','u','e','n','c','e','`',0}; - iterate_action_param iap; - - iap.package = package; - iap.UI = TRUE; rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view); - if (rc == ERROR_SUCCESS) { TRACE("Running the actions\n"); - rc = MSI_IterateRecords(view, NULL, ITERATE_Actions, &iap); + rc = MSI_IterateRecords(view, NULL, ITERATE_Actions, package); msiobj_release(&view->hdr); } @@ -6466,7 +6447,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_clone_properties( package ); msi_set_context( package ); - if ( (msi_get_property_int(package, szUILevel, 0) & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED ) + if (needs_ui_sequence( package)) { package->script->InWhatSequence |= SEQUENCE_UI; rc = ACTION_ProcessUISequence(package);

1 0

Charles Davis : ntdll: Shorten an ERR message and change it to a FIXME.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: a54ba8712f20f614c7b39c742981cd6c682fca8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54ba8712f20f614c7b39c742… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Wed Oct 14 10:46:53 2009 -0600 ntdll: Shorten an ERR message and change it to a FIXME. --- dlls/ntdll/cdrom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index b5f2365..94faf13 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1018,7 +1018,7 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA /* We need IOCDAudioControl for IOCTL_CDROM_CURRENT_POSITION */ if (fmt->Format == IOCTL_CDROM_CURRENT_POSITION) { - ERR("This version of Mac OS X does not support IOCDAudioControl\n"); + FIXME("NIY\n"); return STATUS_NOT_SUPPORTED; } /* No IOCDAudioControl support; just set the audio status to none */

1 0

Alexandre Julliard : kernel32: Use the PWD variable to set the initial current directory.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 87894c5f7b5d95d74ae01693dbba25386e872516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87894c5f7b5d95d74ae01693d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 12:05:55 2009 +0200 kernel32: Use the PWD variable to set the initial current directory. --- dlls/kernel32/process.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index eca9e38..7f0a218 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -759,6 +759,7 @@ static BOOL build_command_line( WCHAR **argv ) static void init_current_directory( CURDIR *cur_dir ) { UNICODE_STRING dir_str; + const char *pwd; char *cwd; int size; @@ -781,13 +782,25 @@ static void init_current_directory( CURDIR *cur_dir ) break; } + /* try to use PWD if it is valid, so that we don't resolve symlinks */ + + pwd = getenv( "PWD" ); if (cwd) { + struct stat st1, st2; + + if (!pwd || stat( pwd, &st1 ) == -1 || + (!stat( cwd, &st2 ) && (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino))) + pwd = cwd; + } + + if (pwd) + { WCHAR *dirW; - int lenW = MultiByteToWideChar( CP_UNIXCP, 0, cwd, -1, NULL, 0 ); + int lenW = MultiByteToWideChar( CP_UNIXCP, 0, pwd, -1, NULL, 0 ); if ((dirW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) { - MultiByteToWideChar( CP_UNIXCP, 0, cwd, -1, dirW, lenW ); + MultiByteToWideChar( CP_UNIXCP, 0, pwd, -1, dirW, lenW ); RtlInitUnicodeString( &dir_str, dirW ); RtlSetCurrentDirectory_U( &dir_str ); RtlFreeUnicodeString( &dir_str );

1 0

Alexandre Julliard : setupapi: Get rid of the code to build fake dlls from existing modules.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: f1dc1d35a0c72fd18064be26c7fffc269e0299d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1dc1d35a0c72fd18064be26c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 14 17:07:32 2009 +0200 setupapi: Get rid of the code to build fake dlls from existing modules. --- dlls/setupapi/fakedll.c | 120 ++++++++-------------------------------------- 1 files changed, 21 insertions(+), 99 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 1b39d2e..8613ca3 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -105,82 +105,11 @@ static inline void add_directory( struct dll_info *info, unsigned int idx, DWORD info->nt->OptionalHeader.DataDirectory[idx].Size = size; } -/* find the limits of the resource data */ -static void get_resource_data( const IMAGE_RESOURCE_DIRECTORY *dir, const BYTE *root, - DWORD *rva_start, DWORD *rva_end ) -{ - const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; - int i; - - entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - for (i = 0; i < dir->NumberOfNamedEntries + dir->NumberOfIdEntries; i++, entry++) - { - const void *ptr = root + entry->u2.s3.OffsetToDirectory; - if (entry->u2.s3.DataIsDirectory) get_resource_data( ptr, root, rva_start, rva_end ); - else - { - const IMAGE_RESOURCE_DATA_ENTRY *data = ptr; - *rva_start = min( *rva_start, data->OffsetToData ); - *rva_end = max( *rva_end, data->OffsetToData + data->Size ); - } - } -} - -/* fixup RVAs of resource data */ -static void fixup_resources( IMAGE_RESOURCE_DIRECTORY *dir, BYTE *root, int delta ) -{ - IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; - int i; - - entry = (IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - for (i = 0; i < dir->NumberOfNamedEntries + dir->NumberOfIdEntries; i++, entry++) - { - void *ptr = root + entry->u2.s3.OffsetToDirectory; - if (entry->u2.s3.DataIsDirectory) fixup_resources( ptr, root, delta ); - else - { - IMAGE_RESOURCE_DATA_ENTRY *data = ptr; - if (data->OffsetToData) data->OffsetToData += delta; - } - } -} - -/* add version resources to the dll by copying them from the source module */ -static BOOL add_version_resource( HMODULE module, struct dll_info *dll_info ) -{ - BOOL ret = FALSE; - DWORD rva_start = ~0U, rva_end = 0, dir_size, total_size; - const IMAGE_RESOURCE_DIRECTORY *basedir; - const BYTE *data_start, *root; - BYTE *buffer; - - if (!module) return TRUE; - if (LdrFindResourceDirectory_U( module, NULL, 0, &basedir ) != STATUS_SUCCESS) return TRUE; - root = (const BYTE *)basedir; - get_resource_data( basedir, root, &rva_start, &rva_end ); - data_start = (const BYTE *)module + rva_start; - if (data_start <= root) return FALSE; - dir_size = data_start - root; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, dir_size ))) return FALSE; - memcpy( buffer, root, dir_size ); - fixup_resources( (IMAGE_RESOURCE_DIRECTORY *)buffer, buffer, dll_info->mem_pos + dir_size - rva_start ); - if (!xwrite( dll_info, buffer, dir_size, dll_info->file_pos )) goto done; - if (!xwrite( dll_info, data_start, rva_end - rva_start, dll_info->file_pos + dir_size )) goto done; - total_size = dir_size + rva_end - rva_start; - add_directory( dll_info, IMAGE_DIRECTORY_ENTRY_RESOURCE, dll_info->mem_pos, total_size ); - add_section( dll_info, ".rsrc", total_size, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ ); - ret = TRUE; -done: - HeapFree( GetProcessHeap(), 0, buffer ); - return ret; -} - -/* build a complete fake dll, optionally using module as a source */ -static BOOL build_fake_dll( HANDLE file, HMODULE module ) +/* build a complete fake dll from scratch */ +static BOOL build_fake_dll( HANDLE file ) { IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; - const IMAGE_NT_HEADERS *src_nt = NULL; struct dll_info info; BYTE *buffer; BOOL ret = FALSE; @@ -204,28 +133,25 @@ static BOOL build_fake_dll( HANDLE file, HMODULE module ) memcpy( dos + 1, fakedll_signature, sizeof(fakedll_signature) ); nt = info.nt = (IMAGE_NT_HEADERS *)(buffer + lfanew); - if (module) src_nt = RtlImageNtHeader( module ); /* some fields are copied from the source dll */ -#define SET(field,def) nt->field = src_nt ? src_nt->field : def - SET( FileHeader.Machine, IMAGE_FILE_MACHINE_I386 ); - SET( FileHeader.TimeDateStamp, 0 ); - SET( FileHeader.Characteristics, IMAGE_FILE_DLL ); - SET( OptionalHeader.MajorLinkerVersion, 1 ); - SET( OptionalHeader.MinorLinkerVersion, 0 ); - SET( OptionalHeader.MajorOperatingSystemVersion, 1 ); - SET( OptionalHeader.MinorOperatingSystemVersion, 0 ); - SET( OptionalHeader.MajorImageVersion, 1 ); - SET( OptionalHeader.MinorImageVersion, 0 ); - SET( OptionalHeader.MajorSubsystemVersion, 4 ); - SET( OptionalHeader.MinorSubsystemVersion, 0 ); - SET( OptionalHeader.Win32VersionValue, 0 ); - SET( OptionalHeader.Subsystem, IMAGE_SUBSYSTEM_WINDOWS_GUI ); - SET( OptionalHeader.DllCharacteristics, 0 ); - SET( OptionalHeader.SizeOfStackReserve, 0 ); - SET( OptionalHeader.SizeOfStackCommit, 0 ); - SET( OptionalHeader.SizeOfHeapReserve, 0 ); - SET( OptionalHeader.SizeOfHeapCommit, 0 ); -#undef SET + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; + nt->FileHeader.TimeDateStamp = 0; + nt->FileHeader.Characteristics = IMAGE_FILE_DLL; + nt->OptionalHeader.MajorLinkerVersion = 1; + nt->OptionalHeader.MinorLinkerVersion = 0; + nt->OptionalHeader.MajorOperatingSystemVersion = 1; + nt->OptionalHeader.MinorOperatingSystemVersion = 0; + nt->OptionalHeader.MajorImageVersion = 1; + nt->OptionalHeader.MinorImageVersion = 0; + nt->OptionalHeader.MajorSubsystemVersion = 4; + nt->OptionalHeader.MinorSubsystemVersion = 0; + nt->OptionalHeader.Win32VersionValue = 0; + nt->OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_GUI; + nt->OptionalHeader.DllCharacteristics = 0; + nt->OptionalHeader.SizeOfStackReserve = 0; + nt->OptionalHeader.SizeOfStackCommit = 0; + nt->OptionalHeader.SizeOfHeapReserve = 0; + nt->OptionalHeader.SizeOfHeapCommit = 0; /* other fields have fixed values */ nt->Signature = IMAGE_NT_SIGNATURE; nt->FileHeader.NumberOfSections = 0; @@ -261,8 +187,6 @@ static BOOL build_fake_dll( HANDLE file, HMODULE module ) add_section( &info, ".reloc", sizeof(reloc_section), IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_DISCARDABLE | IMAGE_SCN_MEM_READ ); - if (!add_version_resource( module, &info )) goto done; - header_size += nt->FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER); nt->OptionalHeader.SizeOfHeaders = ALIGN( header_size, file_alignment ); nt->OptionalHeader.SizeOfImage = ALIGN( info.mem_pos, section_alignment ); @@ -454,10 +378,8 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) } else { - HMODULE module = LoadLibraryW( source ); WARN( "fake dll %s not found for %s\n", debugstr_w(source), debugstr_w(name) ); - ret = build_fake_dll( h, module ); - if (module) FreeLibrary( module ); + ret = build_fake_dll( h ); } CloseHandle( h );

1 0