September 2008 - Wine-commits

Roy Shea : kernel32/test: Test import entries of a core windows DLL.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 91e33020f05618826a378b540a234f400a660ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e33020f05618826a378b540… Author: Roy Shea <royshea(a)gmail.com> Date: Fri Sep 12 13:54:22 2008 -0700 kernel32/test: Test import entries of a core windows DLL. --- dlls/kernel32/tests/loader.c | 71 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 363c2fd..a08cfdb 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -27,6 +27,13 @@ #define ALIGN_SIZE(size, alignment) (((size) + (alignment - 1)) & ~((alignment - 1))) +static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) +{ + if (rva == 0) + return NULL; + return ((char*) module) + rva; +} + static const struct { WORD e_magic; /* 00: MZ Header signature */ @@ -103,7 +110,7 @@ static IMAGE_SECTION_HEADER section = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ, /* Characteristics */ }; -START_TEST(loader) +static void test_Loader(void) { static const struct test_data { @@ -480,3 +487,65 @@ endloop: ok(DeleteFile(dll_name), "DeleteFile error %d\n", GetLastError()); } } + +/* Verify linking style of import descriptors */ +static void test_ImportDescriptors(void) +{ + HMODULE kernel32_module = NULL; + PIMAGE_DOS_HEADER d_header; + PIMAGE_NT_HEADERS nt_headers; + DWORD import_dir_size; + DWORD_PTR dir_offset; + PIMAGE_IMPORT_DESCRIPTOR import_chunk; + + /* Load kernel32 module */ + kernel32_module = GetModuleHandleA("kernel32.dll"); + assert( kernel32_module != NULL ); + + /* Get PE header info from module image */ + d_header = (PIMAGE_DOS_HEADER) kernel32_module; + nt_headers = (PIMAGE_NT_HEADERS) (((char*) d_header) + + d_header->e_lfanew); + + /* Get size of import entry directory */ + import_dir_size = nt_headers->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].Size; + if (!import_dir_size) + { + skip("Unable to continue testing due to missing import directory.\n"); + return; + } + + /* Get address of first import chunk */ + dir_offset = nt_headers->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress; + import_chunk = RVAToAddr(dir_offset, kernel32_module); + ok(import_chunk != 0, "Invalid import_chunk: %p\n", import_chunk); + if (!import_chunk) return; + + /* Iterate through import descriptors and verify set name, + * OriginalFirstThunk, and FirstThunk. Core Windows DLLs, such as + * kernel32.dll, don't use Borland-style linking, where the table of + * imported names is stored directly in FirstThunk and overwritten + * by the relocation, instead of being stored in OriginalFirstThunk. + * */ + for (; import_chunk->FirstThunk; import_chunk++) + { + LPCSTR module_name = (LPCSTR) RVAToAddr( + import_chunk->Name, kernel32_module); + PIMAGE_THUNK_DATA name_table = (PIMAGE_THUNK_DATA) RVAToAddr( + import_chunk->OriginalFirstThunk, kernel32_module); + PIMAGE_THUNK_DATA iat = (PIMAGE_THUNK_DATA) RVAToAddr( + import_chunk->FirstThunk, kernel32_module); + ok(module_name != NULL, "Imported module name should not be NULL\n"); + ok(name_table != NULL, + "Name table for imported module %s should not be NULL\n", + module_name); + ok(iat != NULL, "IAT for imported module %s should not be NULL\n", + module_name); + } +} + +START_TEST(loader) +{ + test_Loader(); + test_ImportDescriptors(); +}

1 0

Christian Costa : d3dxof: Simplify parsing.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 0025ef609013cde5268038f1b92038d9ce57ed92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0025ef609013cde5268038f1b… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sat Sep 13 00:09:57 2008 +0200 d3dxof: Simplify parsing. --- dlls/d3dxof/d3dxof.c | 299 +++++++++++++++++++------------------------------- 1 files changed, 113 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0025ef609013cde526803…

1 0

Andrew Talbot : comctl32: Sign-compare warnings fix.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 183f92b22a835f7ca39965c74eb98901a1579666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=183f92b22a835f7ca39965c74… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 13 19:11:55 2008 +0100 comctl32: Sign-compare warnings fix. --- dlls/comctl32/comboex.c | 2 +- dlls/comctl32/listview.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 1c9b202..32b18cc 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -198,7 +198,7 @@ static INT COMBOEX_Notify (COMBOEX_INFO *infoPtr, INT code, NMHDR *hdr) static INT -COMBOEX_NotifyItem (COMBOEX_INFO *infoPtr, INT code, NMCOMBOBOXEXW *hdr) +COMBOEX_NotifyItem (COMBOEX_INFO *infoPtr, UINT code, NMCOMBOBOXEXW *hdr) { /* Change the Text item from Unicode to ANSI if necessary for NOTIFY */ if (infoPtr->NtfUnicode) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1627001..70555e8 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -542,7 +542,7 @@ static inline int lstrncmpiW(LPCWSTR s1, LPCWSTR s2, int n) { int res; - n = min(min(n, strlenW(s1)), strlenW(s2)); + n = min(min(n, lstrlenW(s1)), lstrlenW(s2)); res = CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, s1, n, s2, n); return res ? res - sizeof(WCHAR) : res; } @@ -823,7 +823,7 @@ static BOOL notify_deleteitem(const LISTVIEW_INFO *infoPtr, INT nItem) return IsWindow(hwnd); } -static int get_ansi_notification(INT unicodeNotificationCode) +static int get_ansi_notification(UINT unicodeNotificationCode) { switch (unicodeNotificationCode) { @@ -847,11 +847,12 @@ static int get_ansi_notification(INT unicodeNotificationCode) pdi : dispinfo structure (can be unicode or ansi) isW : TRUE if dispinfo is Unicode */ -static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, INT notificationCode, LPNMLVDISPINFOW pdi, BOOL isW) +static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT notificationCode, LPNMLVDISPINFOW pdi, BOOL isW) { BOOL bResult = FALSE; BOOL convertToAnsi = FALSE, convertToUnicode = FALSE; - INT cchTempBufMax = 0, savCchTextMax = 0, realNotifCode; + INT cchTempBufMax = 0, savCchTextMax = 0; + UINT realNotifCode; LPWSTR pszTempBuf = NULL, savPszText = NULL; if ((pdi->item.mask & LVIF_TEXT) && is_textT(pdi->item.pszText, isW))

1 0

Alistair Leslie-Hughes : msxml3: Correct test.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 8af99c9751139500d8464d6f4707773b54e0c9b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8af99c9751139500d8464d6f4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Sep 13 22:13:50 2008 +1000 msxml3: Correct test. --- dlls/msxml3/tests/domdoc.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2bff372..c927274 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1669,10 +1669,7 @@ static void test_get_text(void) r = IXMLDOMNode_get_text( node, &str ); ok( r == S_OK, "ret %08x\n", r ); -todo_wine { - ok( !memcmp(str, szfn1_txt, sizeof(szfn1_txt)), "wrong string\n" ); - } - ok( !memcmp(str, szfn1_txt, sizeof(szfn1_txt)-4), "wrong string\n" ); + ok( !memcmp(str, szfn1_txt, lstrlenW(szfn1_txt) ), "wrong string\n" ); SysFreeString(str); r = IXMLDOMNode_get_attributes( node, &node_map );

1 0

Muneyuki Noguchi : winex11.drv: Make X11DRV_XIMLookupChars handle a long string properly.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: f8446f260651739f8374bcd969e5643c13dce596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8446f260651739f8374bcd96… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Sep 13 15:01:40 2008 +0900 winex11.drv: Make X11DRV_XIMLookupChars handle a long string properly. --- dlls/winex11.drv/xim.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 252dacd..5e413f0 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -177,15 +177,20 @@ static BOOL X11DRV_ImmSetInternalString(DWORD dwIndex, DWORD dwOffset, void X11DRV_XIMLookupChars( const char *str, DWORD count ) { DWORD dwOutput; - WCHAR wcOutput[64]; + WCHAR *wcOutput; HWND focus; - dwOutput = MultiByteToWideChar(CP_UNIXCP, 0, str, count, wcOutput, sizeof(wcOutput)/sizeof(WCHAR)); + dwOutput = MultiByteToWideChar(CP_UNIXCP, 0, str, count, NULL, 0); + wcOutput = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * dwOutput); + if (wcOutput == NULL) + return; + MultiByteToWideChar(CP_UNIXCP, 0, str, count, wcOutput, dwOutput); if ((focus = GetFocus())) IME_UpdateAssociation(focus); X11DRV_ImmSetInternalString(GCS_RESULTSTR,0,0,wcOutput,dwOutput); + HeapFree(GetProcessHeap(), 0, wcOutput); } static void X11DRV_ImmSetOpenStatus(BOOL fOpen)

1 0

Marcus Meissner : kernel32/tests: Pass correct size to MultiBytetoWideChar.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 395c4163b8786445a6cc8b8170e505c820ddd0c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395c4163b8786445a6cc8b817… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 14 13:11:09 2008 +0200 kernel32/tests: Pass correct size to MultiBytetoWideChar. --- dlls/kernel32/tests/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 8c76464..60d1f70 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -223,7 +223,7 @@ static BOOL create_wide_manifest(const char *filename, const char *manifest, BOO BOOL ret; int offset = (fBOM ? 0 : 1); - MultiByteToWideChar(CP_ACP, 0, manifest, -1, &wmanifest[1], (strlen(manifest)+1) * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, manifest, -1, &wmanifest[1], (strlen(manifest)+1)); wmanifest[0] = 0xfeff; if (fReverse) {

1 0

Marcus Meissner : oleview: Fixed LoadString buffer sizes.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 53d671d7362c136304e5ed7b370d4da3c8d285c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d671d7362c136304e5ed7b3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 13 22:19:20 2008 +0200 oleview: Fixed LoadString buffer sizes. --- programs/oleview/details.c | 10 +++++----- programs/oleview/oleview.c | 18 +++++++++--------- programs/oleview/tree.c | 24 ++++++++++++------------ programs/oleview/typelib.c | 12 ++++++------ 4 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53d671d7362c136304e5e…

1 0

Marcus Meissner : winefile: Fixed sizes to LoadString.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: a392d3774c5e283a0994143a0062163efbc8ab44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a392d3774c5e283a0994143a0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 13 22:43:34 2008 +0200 winefile: Fixed sizes to LoadString. --- programs/winefile/winefile.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index a51c80b..93ac0d4 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -201,14 +201,13 @@ static const TCHAR sLongNumFmt[] = {'%','I','6','4','u','\0'}; /* load resource string */ -static LPTSTR load_string(LPTSTR buffer, UINT id) +static LPTSTR load_string(LPTSTR buffer, DWORD size, UINT id) { - LoadString(Globals.hInstance, id, buffer, BUFFER_LEN); - + LoadString(Globals.hInstance, id, buffer, size); return buffer; } -#define RS(b, i) load_string(b, i) +#define RS(b, i) load_string(b, sizeof(b)/sizeof(b[0]), i) /* display error message for the specified WIN32 error code */ @@ -1407,9 +1406,9 @@ static Entry* read_tree(Root* root, LPCTSTR path, LPITEMIDLIST pidl, LPTSTR drv, root->drive_type = DRIVE_UNKNOWN; drv[0] = '\\'; drv[1] = '\0'; - load_string(root->volname, IDS_DESKTOP); + load_string(root->volname, sizeof(root->volname)/sizeof(root->volname[0]), IDS_DESKTOP); root->fs_flags = 0; - load_string(root->fs, IDS_SHELL); + load_string(root->fs, sizeof(root->fs)/sizeof(root->fs[0]), IDS_SHELL); return read_tree_shell(root, pidl, sortOrder, hwnd); } @@ -1422,9 +1421,9 @@ static Entry* read_tree(Root* root, LPCTSTR path, LPITEMIDLIST pidl, LPTSTR drv, root->drive_type = GetDriveType(path); lstrcat(drv, sSlash); - load_string(root->volname, IDS_ROOT_FS); + load_string(root->volname, sizeof(root->volname)/sizeof(root->volname[0]), IDS_ROOT_FS); root->fs_flags = 0; - load_string(root->fs, IDS_UNIXFS); + load_string(root->fs, sizeof(root->fs)/sizeof(root->fs[0]), IDS_UNIXFS); lstrcpy(root->path, sSlash); @@ -1509,7 +1508,7 @@ static ChildWnd* alloc_child_window(LPCTSTR path, LPITEMIDLIST pidl, HWND hwnd) #ifdef _SHELL_FOLDERS if (root->entry.etype == ET_SHELL) - load_string(root->entry.data.cFileName, IDS_DESKTOP); + load_string(root->entry.data.cFileName, sizeof(root->entry.data.cFileName)/sizeof(root->entry.data.cFileName[0]), IDS_DESKTOP); else #endif wsprintf(root->entry.data.cFileName, RS(b1,IDS_TITLEFMT), drv, root->fs); @@ -3865,7 +3864,7 @@ static void create_drive_bar(void) #endif #ifdef _SHELL_FOLDERS /* insert shell namespace button */ - load_string(b1, IDS_SHELL); + load_string(b1, sizeof(b1)/sizeof(b1[0]), IDS_SHELL); b1[lstrlen(b1)+1] = '\0'; SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b1); @@ -4720,18 +4719,18 @@ static void InitInstance(HINSTANCE hinstance) /* load column strings */ col = 1; - load_string(g_pos_names[col++], IDS_COL_NAME); - load_string(g_pos_names[col++], IDS_COL_SIZE); - load_string(g_pos_names[col++], IDS_COL_CDATE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_NAME); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_SIZE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_CDATE); #ifndef _NO_EXTENSIONS - load_string(g_pos_names[col++], IDS_COL_ADATE); - load_string(g_pos_names[col++], IDS_COL_MDATE); - load_string(g_pos_names[col++], IDS_COL_IDX); - load_string(g_pos_names[col++], IDS_COL_LINKS); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_ADATE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_MDATE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_IDX); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_LINKS); #endif - load_string(g_pos_names[col++], IDS_COL_ATTR); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_ATTR); #ifndef _NO_EXTENSIONS - load_string(g_pos_names[col++], IDS_COL_SEC); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_SEC); #endif }

1 0

Marcus Meissner : msi/tests: Reduce buffer to size of string written.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 67b06ecba5962c84fb512eb0ee62da7f96dc8b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b06ecba5962c84fb512eb0e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 14 12:07:15 2008 +0200 msi/tests: Reduce buffer to size of string written. --- dlls/msi/tests/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a3f4083..3f2b0fc 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2109,7 +2109,7 @@ static void test_readonlyfile(void) file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); - WriteFile(file, "readonlyfile", 20, &size, NULL); + WriteFile(file, "readonlyfile", strlen("readonlyfile"), &size, NULL); CloseHandle(file); r = MsiInstallProductA(msifile, NULL);

1 0

Marcus Meissner : dnsapi: Fixed incorrect buffer size to GetComputerNameExW .
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 8a4748bf01e1d4be86819f46640aa6b17526b38e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4748bf01e1d4be86819f466… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 14 10:13:17 2008 +0200 dnsapi: Fixed incorrect buffer size to GetComputerNameExW. --- dlls/dnsapi/query.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 6c7e4c8..75e2e33 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -773,7 +773,7 @@ static DNS_STATUS dns_get_hostname_a( COMPUTER_NAME_FORMAT format, PSTR buffer, PDWORD len ) { char name[256]; - DWORD size = sizeof(name); + DWORD size = sizeof(name)/sizeof(name[0]); if (!GetComputerNameExA( format, name, &size )) return DNS_ERROR_NAME_DOES_NOT_EXIST; @@ -792,7 +792,7 @@ static DNS_STATUS dns_get_hostname_w( COMPUTER_NAME_FORMAT format, PWSTR buffer, PDWORD len ) { WCHAR name[256]; - DWORD size = sizeof(name); + DWORD size = sizeof(name)/sizeof(name[0]); if (!GetComputerNameExW( format, name, &size )) return DNS_ERROR_NAME_DOES_NOT_EXIST;

1 0