October 2009 - Wine-Commits

Hans Leidekker : msi: Add some tests for MsiGetTargetPathW.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

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

Alexandre Julliard : setupapi: Add support for specifying a fake dll source as '-' to delete it.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 777a30b997abf5ffa4d61893487056ce56b88451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=777a30b997abf5ffa4d618934… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 14:05:46 2009 +0200 setupapi: Add support for specifying a fake dll source as '-' to delete it. --- dlls/setupapi/fakedll.c | 8 +++++++- tools/wine.inf.in | 1 + 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 6397950..3b5a47c 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -597,7 +597,13 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) if (!(h = create_dest_file( name ))) return TRUE; /* not a fake dll */ if (h == INVALID_HANDLE_VALUE) return FALSE; - if ((buffer = load_fake_dll( source, &size ))) + if (source[0] == '-' && !source[1]) + { + /* '-' source means delete the file */ + TRACE( "deleting %s\n", debugstr_w(name) ); + ret = FALSE; + } + else if ((buffer = load_fake_dll( source, &size ))) { DWORD written; diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 9f0a2de..6e2df39 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2455,6 +2455,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,dosx.exe 11,,dsound.vxd 11,,notepad.exe +11,,winetest.exe,- 11,,winhlp32.exe 12,,mountmgr.sys 16422,Internet Explorer,iexplore.exe

1 0

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

Oct. 15, 2009

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: Fix an obviously wrong structure size check.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 98a7d8cf9d3c9984af7fec043a07ec73e1383ee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a7d8cf9d3c9984af7fec043… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 15 14:49:30 2009 +0400 comctl32/tooltips: Fix an obviously wrong structure size check. --- dlls/comctl32/tests/tooltips.c | 51 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 30 ++++++++++++----------- include/commctrl.h | 4 +++ 3 files changed, 71 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index b8c46cb..ddc162a 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -416,6 +416,56 @@ static void test_gettext(void) DestroyWindow(hwnd); } +static void test_ttm_gettoolinfo(void) +{ + TTTOOLINFOA ti; + TTTOOLINFOW tiW; + HWND hwnd; + DWORD r; + + hwnd = CreateWindowExA(0, TOOLTIPS_CLASSA, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + + ti.cbSize = TTTOOLINFOA_V2_SIZE; + ti.hwnd = NULL; + ti.hinst = GetModuleHandleA(NULL); + ti.uFlags = 0; + ti.uId = 0x1234ABCD; + ti.lpszText = NULL; + ti.lParam = 0xdeadbeef; + GetClientRect(hwnd, &ti.rect); + r = SendMessageA(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&ti); + ok(r, "Adding the tool to the tooltip failed\n"); + + ti.cbSize = TTTOOLINFOA_V2_SIZE; + ti.lParam = 0xaaaaaaaa; + r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti); + ok(r, "Getting tooltip info failed\n"); + ok(0xdeadbeef == ti.lParam, "Expected 0xdeadbeef, got %lx\n", ti.lParam); + + tiW.cbSize = TTTOOLINFOW_V2_SIZE; + tiW.hwnd = NULL; + tiW.uId = 0x1234ABCD; + tiW.lParam = 0xaaaaaaaa; + r = SendMessageA(hwnd, TTM_GETTOOLINFOW, 0, (LPARAM)&tiW); + ok(r, "Getting tooltip info failed\n"); + ok(0xdeadbeef == tiW.lParam, "Expected 0xdeadbeef, got %lx\n", tiW.lParam); + + ti.cbSize = TTTOOLINFOA_V2_SIZE; + ti.uId = 0x1234ABCD; + ti.lParam = 0xaaaaaaaa; + r = SendMessageA(hwnd, TTM_SETTOOLINFOA, 0, (LPARAM)&ti); + + ti.cbSize = TTTOOLINFOA_V2_SIZE; + ti.lParam = 0xdeadbeef; + r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti); + ok(r, "Getting tooltip info failed\n"); + ok(0xaaaaaaaa == ti.lParam, "Expected 0xaaaaaaaa, got %lx\n", ti.lParam); + + DestroyWindow(hwnd); +} + START_TEST(tooltips) { InitCommonControls(); @@ -423,4 +473,5 @@ START_TEST(tooltips) test_create_tooltip(); test_customdraw(); test_gettext(); + test_ttm_gettoolinfo(); } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 54600e8..05cd0dc 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1076,7 +1076,7 @@ TOOLTIPS_AddToolA (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpToolInfo) } } - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA)) + if (lpToolInfo->cbSize >= TTTOOLINFOA_V2_SIZE) toolPtr->lParam = lpToolInfo->lParam; /* install subclassing hook */ @@ -1164,7 +1164,7 @@ TOOLTIPS_AddToolW (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) } } - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW)) + if (lpToolInfo->cbSize >= TTTOOLINFOW_V2_SIZE) toolPtr->lParam = lpToolInfo->lParam; /* install subclassing hook */ @@ -1337,7 +1337,7 @@ TOOLTIPS_EnumToolsA (const TOOLTIPS_INFO *infoPtr, UINT uIndex, LPTTTOOLINFOA lp /* lpToolInfo->lpszText = toolPtr->lpszText; */ lpToolInfo->lpszText = NULL; /* FIXME */ - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA)) + if (lpToolInfo->cbSize >= TTTOOLINFOA_V2_SIZE) lpToolInfo->lParam = toolPtr->lParam; return TRUE; @@ -1369,7 +1369,7 @@ TOOLTIPS_EnumToolsW (const TOOLTIPS_INFO *infoPtr, UINT uIndex, LPTTTOOLINFOW lp /* lpToolInfo->lpszText = toolPtr->lpszText; */ lpToolInfo->lpszText = NULL; /* FIXME */ - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW)) + if (lpToolInfo->cbSize >= TTTOOLINFOW_V2_SIZE) lpToolInfo->lParam = toolPtr->lParam; return TRUE; @@ -1416,7 +1416,7 @@ TOOLTIPS_GetCurrentToolA (const TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo /* lpToolInfo->lpszText = toolPtr->lpszText; */ lpToolInfo->lpszText = NULL; /* FIXME */ - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA)) + if (lpToolInfo->cbSize >= TTTOOLINFOA_V2_SIZE) lpToolInfo->lParam = toolPtr->lParam; return TRUE; @@ -1448,7 +1448,7 @@ TOOLTIPS_GetCurrentToolW (const TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo /* lpToolInfo->lpszText = toolPtr->lpszText; */ lpToolInfo->lpszText = NULL; /* FIXME */ - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW)) + if (lpToolInfo->cbSize >= TTTOOLINFOW_V2_SIZE) lpToolInfo->lParam = toolPtr->lParam; return TRUE; @@ -1602,7 +1602,7 @@ TOOLTIPS_GetToolInfoA (const TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) /* lpToolInfo->lpszText = toolPtr->lpszText; */ lpToolInfo->lpszText = NULL; /* FIXME */ - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA)) + if (lpToolInfo->cbSize >= TTTOOLINFOA_V2_SIZE) lpToolInfo->lParam = toolPtr->lParam; return TRUE; @@ -1637,7 +1637,7 @@ TOOLTIPS_GetToolInfoW (const TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) /* lpToolInfo->lpszText = toolPtr->lpszText; */ lpToolInfo->lpszText = NULL; /* FIXME */ - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW)) + if (lpToolInfo->cbSize >= TTTOOLINFOW_V2_SIZE) lpToolInfo->lParam = toolPtr->lParam; return TRUE; @@ -1660,7 +1660,7 @@ TOOLTIPS_HitTestA (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOA lptthit) TRACE("tool %d!\n", nTool); /* copy tool data */ - if (lptthit->ti.cbSize >= sizeof(TTTOOLINFOA)) { + if (lptthit->ti.cbSize >= TTTOOLINFOA_V1_SIZE) { toolPtr = &infoPtr->tools[nTool]; lptthit->ti.uFlags = toolPtr->uFlags; @@ -1670,7 +1670,8 @@ TOOLTIPS_HitTestA (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOA lptthit) lptthit->ti.hinst = toolPtr->hinst; /* lptthit->ti.lpszText = toolPtr->lpszText; */ lptthit->ti.lpszText = NULL; /* FIXME */ - lptthit->ti.lParam = toolPtr->lParam; + if (lptthit->ti.cbSize >= TTTOOLINFOA_V2_SIZE) + lptthit->ti.lParam = toolPtr->lParam; } return TRUE; @@ -1693,7 +1694,7 @@ TOOLTIPS_HitTestW (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOW lptthit) TRACE("tool %d!\n", nTool); /* copy tool data */ - if (lptthit->ti.cbSize >= sizeof(TTTOOLINFOW)) { + if (lptthit->ti.cbSize >= TTTOOLINFOW_V1_SIZE) { toolPtr = &infoPtr->tools[nTool]; lptthit->ti.uFlags = toolPtr->uFlags; @@ -1703,7 +1704,8 @@ TOOLTIPS_HitTestW (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOW lptthit) lptthit->ti.hinst = toolPtr->hinst; /* lptthit->ti.lpszText = toolPtr->lpszText; */ lptthit->ti.lpszText = NULL; /* FIXME */ - lptthit->ti.lParam = toolPtr->lParam; + if (lptthit->ti.cbSize >= TTTOOLINFOW_V2_SIZE) + lptthit->ti.lParam = toolPtr->lParam; } return TRUE; @@ -2018,7 +2020,7 @@ TOOLTIPS_SetToolInfoA (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpToolInfo) } } - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA)) + if (lpToolInfo->cbSize >= TTTOOLINFOA_V2_SIZE) toolPtr->lParam = lpToolInfo->lParam; return 0; @@ -2072,7 +2074,7 @@ TOOLTIPS_SetToolInfoW (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) } } - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW)) + if (lpToolInfo->cbSize >= TTTOOLINFOW_V2_SIZE) toolPtr->lParam = lpToolInfo->lParam; if (infoPtr->nCurrentTool == nTool) diff --git a/include/commctrl.h b/include/commctrl.h index 2add8b8..f2ea3ae 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1774,6 +1774,10 @@ typedef struct tagTOOLINFOW { #define TTTOOLINFOA_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lpszText) #define TTTOOLINFOW_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lpszText) #define TTTOOLINFO_V1_SIZE CCSIZEOF_STRUCT(WINELIB_NAME_AW(TTTOOLINFO), lpszText) +#define TTTOOLINFOA_V2_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lParam) +#define TTTOOLINFOW_V2_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lParam) +#define TTTOOLINFOA_V3_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lpReserved) +#define TTTOOLINFOW_V3_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lpReserved) typedef struct _TT_HITTESTINFOA {

1 0

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

Oct. 15, 2009

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

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

Oct. 15, 2009

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

Stefan Dösinger : opengl32: Give wglSwapBuffers a real function, make it hookable.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 49012919905d2ace7dd6f2546b78780f54a58735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49012919905d2ace7dd6f2546… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 14 23:20:20 2009 +0200 opengl32: Give wglSwapBuffers a real function, make it hookable. --- dlls/opengl32/make_opengl | 2 +- dlls/opengl32/opengl32.spec | 2 +- dlls/opengl32/wgl.c | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index a1bd02b..c98cd45 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -665,7 +665,7 @@ print SPEC "@ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat @ stdcall wglSetLayerPaletteEntries(long long long long ptr) @ stdcall wglSetPixelFormat(long long ptr) gdi32.SetPixelFormat @ stdcall wglShareLists(long long) gdi32.wglShareLists -@ stdcall wglSwapBuffers(long) gdi32.SwapBuffers +@ stdcall wglSwapBuffers(long) @ stdcall wglSwapLayerBuffers(long long) @ stdcall wglUseFontBitmapsA(long long long long) gdi32.wglUseFontBitmapsA @ stdcall wglUseFontBitmapsW(long long long long) gdi32.wglUseFontBitmapsW diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index a965771..238b12a 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -352,7 +352,7 @@ @ stdcall wglSetLayerPaletteEntries(long long long long ptr) @ stdcall wglSetPixelFormat(long long ptr) gdi32.SetPixelFormat @ stdcall wglShareLists(long long) gdi32.wglShareLists -@ stdcall wglSwapBuffers(long) gdi32.SwapBuffers +@ stdcall wglSwapBuffers(long) @ stdcall wglSwapLayerBuffers(long long) @ stdcall wglUseFontBitmapsA(long long long long) gdi32.wglUseFontBitmapsA @ stdcall wglUseFontBitmapsW(long long long long) gdi32.wglUseFontBitmapsW diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 34f7f07..f6cf469 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -690,6 +690,13 @@ void WINAPI wine_glGetIntegerv( GLenum pname, GLint* params ) wine_wgl.p_wglGetIntegerv(pname, params); } +/*********************************************************************** + * wglSwapBuffers (OPENGL32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH wglSwapBuffers( HDC hdc ) +{ + return SwapBuffers(hdc); +} /* This is for brain-dead applications that use OpenGL functions before even creating a rendering context.... */

1 0

Alexandre Julliard : setupapi: Add support for using a wildcard in fake dll creation.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 7acd74ee0743974b5e500f43d340560899ba9eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7acd74ee0743974b5e500f43d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 13:53:14 2009 +0200 setupapi: Add support for using a wildcard in fake dll creation. This creates fake dlls for all the files we can't find and that haven't been created already. --- dlls/setupapi/fakedll.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 78 +----------------------------- 2 files changed, 123 insertions(+), 76 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index fa89ace..6397950 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -23,6 +23,9 @@ #include <stdarg.h> #include <fcntl.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif @@ -49,6 +52,7 @@ static const char fakedll_signature[] = "Wine placeholder DLL"; static const unsigned int file_alignment = 512; static const unsigned int section_alignment = 4096; +static const unsigned int max_dll_name_len = 64; static void *file_buffer; static size_t file_buffer_size; @@ -127,6 +131,16 @@ static char *dll_name_WtoA( char *nameA, const WCHAR *nameW, unsigned int len ) return nameA; } +/* convert a dll name A->W without depending on the current codepage */ +static WCHAR *dll_name_AtoW( WCHAR *nameW, const char *nameA, unsigned int len ) +{ + unsigned int i; + + for (i = 0; i < len; i++) nameW[i] = nameA[i]; + nameW[i] = 0; + return nameW; +} + /* add a dll to the list of dll that have been taken care of */ static BOOL add_handled_dll( const WCHAR *name ) { @@ -451,6 +465,111 @@ static HANDLE create_dest_file( const WCHAR *name ) return h; } +/* copy a fake dll file to the dest directory */ +static void install_fake_dll( WCHAR *dest, char *file, const char *ext ) +{ + int ret; + size_t size; + void *data; + DWORD written; + WCHAR *destname = dest + strlenW(dest); + char *name = strrchr( file, '/' ) + 1; + char *end = name + strlen(name); + + if (ext) strcpy( end, ext ); + if (!(ret = read_file( file, &data, &size ))) return; + + if (end > name + 2 && !strncmp( end - 2, "16", 2 )) end -= 2; /* remove "16" suffix */ + dll_name_AtoW( destname, name, end - name ); + if (!add_handled_dll( destname )) ret = -1; + + if (ret != -1) + { + HANDLE h = create_dest_file( dest ); + + if (h && h != INVALID_HANDLE_VALUE) + { + TRACE( "%s -> %s\n", debugstr_a(file), debugstr_w(dest) ); + + ret = (WriteFile( h, data, size, &written, NULL ) && written == size); + if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(dest), GetLastError() ); + CloseHandle( h ); + if (!ret) DeleteFileW( dest ); + } + } + *destname = 0; /* restore it for next file */ +} + +/* find and install all fake dlls in a given lib directory */ +static void install_lib_dir( WCHAR *dest, char *file, const char *default_ext ) +{ + DIR *dir; + struct dirent *de; + char *name; + + if (!(dir = opendir( file ))) return; + name = file + strlen(file); + *name++ = '/'; + while ((de = readdir( dir ))) + { + if (strlen( de->d_name ) > max_dll_name_len) continue; + if (!strcmp( de->d_name, "." )) continue; + if (!strcmp( de->d_name, ".." )) continue; + strcpy( name, de->d_name ); + if (default_ext) /* inside build dir */ + { + strcat( name, "/" ); + strcat( name, de->d_name ); + if (!strchr( de->d_name, '.' )) strcat( name, default_ext ); + install_fake_dll( dest, file, ".fake" ); + } + else install_fake_dll( dest, file, NULL ); + } + closedir( dir ); +} + +/* create fake dlls in dirname for all the files we can find */ +static BOOL create_wildcard_dlls( const WCHAR *dirname ) +{ + const char *build_dir = wine_get_build_dir(); + const char *path; + unsigned int i, maxlen = 0; + char *file; + WCHAR *dest; + + if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/"); + for (i = 0; (path = wine_dll_enum_load_path(i)); i++) maxlen = max( maxlen, strlen(path) ); + maxlen += 2 * max_dll_name_len + 2 + sizeof(".dll.fake"); + if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen ))) return FALSE; + + if (!(dest = HeapAlloc( GetProcessHeap(), 0, (strlenW(dirname) + max_dll_name_len) * sizeof(WCHAR) ))) + { + HeapFree( GetProcessHeap(), 0, file ); + return FALSE; + } + strcpyW( dest, dirname ); + dest[strlenW(dest) - 1] = 0; /* remove wildcard */ + + if (build_dir) + { + strcpy( file, build_dir ); + strcat( file, "/dlls" ); + install_lib_dir( dest, file, ".dll" ); + strcpy( file, build_dir ); + strcat( file, "/programs" ); + install_lib_dir( dest, file, ".exe" ); + } + for (i = 0; (path = wine_dll_enum_load_path( i )); i++) + { + strcpy( file, path ); + strcat( file, "/fakedlls" ); + install_lib_dir( dest, file, NULL ); + } + HeapFree( GetProcessHeap(), 0, file ); + HeapFree( GetProcessHeap(), 0, dest ); + return TRUE; +} + /*********************************************************************** * create_fake_dll */ @@ -471,6 +590,8 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) create_directories( name ); return TRUE; } + if (filename[0] == '*' && !filename[1]) return create_wildcard_dlls( name ); + add_handled_dll( filename ); if (!(h = create_dest_file( name ))) return TRUE; /* not a fake dll */ diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 6b6acf9..9f0a2de 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2446,93 +2446,19 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,hh.exe 10,,notepad.exe 10,,regedit.exe +10,,twain.dll,twain.dll16 10,,twain_32.dll 10,,winhelp.exe,winhelp.exe16 10,,winhlp32.exe 10,command,start.exe -11,,actxprxy.dll -11,,advapi32.dll -11,,advpack.dll -11,,appwiz.cpl -11,,cabinet.dll -11,,cmd.exe -11,,comctl32.dll -11,,comdlg32.dll -11,,control.exe -11,,crypt32.dll -11,,d3d8.dll -11,,d3d9.dll -11,,dbghelp.dll -11,,ddeml.dll,ddeml.dll16 11,,ddhelp.exe -11,,ddraw.dll -11,,dinput8.dll 11,,dosx.exe -11,,dsound.dll 11,,dsound.vxd -11,,dxdiagn.dll -11,,gdi32.dll -11,,glu32.dll -11,,hal.dll -11,,hhctrl.ocx -11,,imaadp32.acm -11,,imagehlp.dll -11,,itircl.dll -11,,itss.dll -11,,kernel32.dll -11,,mapi32.dll -11,,msadp32.acm -11,,msg711.acm -11,,msgsm32.acm -11,,mshtml.dll -11,,msi.dll -11,,msiexec.exe -11,,msvcrt.dll -11,,msxml3.dll 11,,notepad.exe -11,,ntdll.dll -11,,ntoskrnl.exe -11,,ole32.dll -11,,oleaut32.dll -11,,oledlg.dll -11,,olepro32.dll -11,,opengl32.dll -11,,progman.exe -11,,psapi.dll -11,,pstorec.dll -11,,quartz.dll -11,,regsvr32.exe -11,,reg.exe -11,,riched20.dll -11,,riched32.dll -11,,rpcrt4.dll -11,,rsabase.dll -11,,rsaenh.dll -11,,rundll32.exe -11,,schannel.dll -11,,sensapi.dll -11,,setupapi.dll -11,,shdocvw.dll -11,,shell32.dll -11,,shfolder.dll -11,,shlwapi.dll -11,,stdole2.tlb -11,,urlmon.dll -11,,user32.dll -11,,version.dll -11,,windowscodecs.dll -11,,winebrowser.exe 11,,winhlp32.exe -11,,wininet.dll -11,,winmm.dll -11,,winspool.drv -11,,wintab32.dll -11,,winver.exe -11,,wordpad.exe -11,,ws2_32.dll -11,,wsock32.dll 12,,mountmgr.sys 16422,Internet Explorer,iexplore.exe +11,,* [SystemIni] system.ini, mci,,"MPEGVideo=mciqtz32.dll"

1 0

Alexandre Julliard : setupapi: Check that the source is a valid fake dll and skip wrong 32/64 type dlls.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 76a8f0032a159d8968b565d51e1974b6a201844e URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a8f0032a159d8968b565d51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 13:25:07 2009 +0200 setupapi: Check that the source is a valid fake dll and skip wrong 32/64 type dlls. --- dlls/setupapi/fakedll.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 903fd23..2f9f80c 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -116,6 +116,11 @@ static int read_file( const char *name, void **data, size_t *size ) struct stat st; void *buffer = static_file_buffer; int fd, ret = -1; + size_t header_size; + IMAGE_DOS_HEADER *dos; + IMAGE_NT_HEADERS *nt; + const size_t min_size = sizeof(*dos) + sizeof(fakedll_signature) + + FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader.MajorLinkerVersion ); if ((fd = open( name, O_RDONLY | O_BINARY )) == -1) return 0; if (fstat( fd, &st ) == -1) goto done; @@ -131,7 +136,27 @@ static int read_file( const char *name, void **data, size_t *size ) buffer = file_buffer; } - if (pread( fd, buffer, st.st_size, 0 ) == st.st_size) + /* check for valid fake dll file */ + + if (st.st_size < min_size) goto done; + header_size = min( st.st_size, 4096 ); + if (pread( fd, buffer, header_size, 0 ) != header_size) goto done; + dos = buffer; + if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto done; + if (dos->e_lfanew < sizeof(fakedll_signature)) goto done; + if (memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) goto done; + if (dos->e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader.MajorLinkerVersion) > header_size) + goto done; + nt = (IMAGE_NT_HEADERS *)((char *)buffer + dos->e_lfanew); + if (nt->Signature == IMAGE_NT_SIGNATURE && nt->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC) + { + /* wrong 32/64 type, pretend it doesn't exist */ + ret = 0; + goto done; + } + if (st.st_size == header_size || + pread( fd, (char *)buffer + header_size, + st.st_size - header_size, header_size ) == st.st_size - header_size) { *data = buffer; ret = 1;

1 0

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

Oct. 15, 2009

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