March 2009 - Wine-Commits - list.winehq.org

Paul Vriens : shell32/tests: Fix a test failure on W2K and earlier.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: 0a3509255e4436cc44fd817fbb1366d8bb87eef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3509255e4436cc44fd817fb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 12 12:06:04 2009 +0100 shell32/tests: Fix a test failure on W2K and earlier. --- dlls/shell32/tests/shlfolder.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 404c413..7c33867 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -757,7 +757,10 @@ static void test_GetAttributesOf(void) if (FAILED(hr)) return; hr = IShellFolder_GetAttributesOf(psfMyComputer, 1, &pidlEmpty, &dwFlags); - todo_wine {ok (hr == E_INVALIDARG, "MyComputer->GetAttributesOf(emtpy pidl) should fail! hr = %08x\n", hr); } + todo_wine + ok (hr == E_INVALIDARG || + broken(SUCCEEDED(hr)), /* W2K and earlier */ + "MyComputer->GetAttributesOf(emtpy pidl) should fail! hr = %08x\n", hr); dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfMyComputer, 0, NULL, &dwFlags);

1 0

Paul Vriens : msi/tests: Fix a test for systems with %TEMP% being less than 2 levels deep.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: 7a8000d4e86805e2f43c537d24a772a92610621e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8000d4e86805e2f43c537d2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 12 11:06:01 2009 +0100 msi/tests: Fix a test for systems with %TEMP% being less than 2 levels deep. --- dlls/msi/tests/install.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 601b0f7..f0ee296 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4193,8 +4193,8 @@ static void test_transformprop(void) static void test_currentworkingdir(void) { UINT r; - CHAR path[MAX_PATH]; - LPSTR ptr, ptr2; + CHAR drive[MAX_PATH], path[MAX_PATH]; + LPSTR ptr; CreateDirectoryA("msitest", NULL); create_file("msitest\\augustus", 500); @@ -4221,18 +4221,17 @@ static void test_currentworkingdir(void) ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); - lstrcpyA(path, CURR_DIR); + lstrcpyA(drive, CURR_DIR); + drive[2] = '\\'; + drive[3] = '\0'; + SetCurrentDirectoryA(drive); + + lstrcpy(path, CURR_DIR); if (path[lstrlenA(path) - 1] != '\\') lstrcatA(path, "\\"); - lstrcatA(path, "msitest.msi"); - - ptr2 = strrchr(path, '\\'); - *ptr2 = '\0'; - ptr = strrchr(path, '\\'); - *ptr2 = '\\'; - *(ptr++) = '\0'; - - SetCurrentDirectoryA(path); + lstrcatA(path, msifile); + ptr = strchr(path, ':'); + ptr +=2; r = MsiInstallProductA(ptr, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);

1 0

Francois Gouget : mshtml: Fix typos in the French translation.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: a2de9de2629acde4f3f1c65d865b3e3e203f8b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2de9de2629acde4f3f1c65d8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 12 13:04:40 2009 +0100 mshtml: Fix typos in the French translation. --- dlls/mshtml/Fr.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/Fr.rc b/dlls/mshtml/Fr.rc index 86c4846..2542670 100644 --- a/dlls/mshtml/Fr.rc +++ b/dlls/mshtml/Fr.rc @@ -32,10 +32,10 @@ STRINGTABLE DISCARDABLE ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Programme d'installation de Gecko de Wine" +CAPTION "Programme d'installation de Gecko pour Wine" FONT 8, "MS Shell Dlg" { - LTEXT "Cette application essaie d'afficher une page HTML. Wine requiert la pr�sence du moteur de rendu Gecko de Mozilla" \ + LTEXT "Cette application essaie d'afficher une page HTML. Wine requiert la pr�sence du moteur de rendu Gecko de Mozilla " \ "pour afficher cette page. Cliquez sur Installer si vous souhaitez que Wine " \ "t�l�charge et installe automatiquement Gecko.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "Progression", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12

1 0

Hans Leidekker : msi: Fix handling of REINSTALL overrides.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: 40cfbaf0230b94ce1a20ff847bdf5ff95b694da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40cfbaf0230b94ce1a20ff847… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 12 11:46:35 2009 +0100 msi: Fix handling of REINSTALL overrides. We were forcing features with a REINSTALL override to be reinstalled locally, which is only correct if the original install state is local. This causes problems with the office 2007 sp1 installer, which applies a REINSTALL override to an advertised feature. --- dlls/msi/action.c | 5 +- dlls/msi/tests/package.c | 334 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 314 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40cfbaf0230b94ce1a20f…

1 0

Alexandre Julliard : winspool.drv: Make sure the DEVMODE structure is fully initialized.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: ca5d2eabdceb84c93fc256df0ff0da19d68362ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca5d2eabdceb84c93fc256df0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 12 13:34:12 2009 +0100 winspool.drv: Make sure the DEVMODE structure is fully initialized. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 92bbc94..c96bac0 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1509,7 +1509,7 @@ static LPDEVMODEA DEVMODEdupWtoA(const DEVMODEW *dmW) size = dmW->dmSize - CCHDEVICENAME - ((dmW->dmSize > FIELD_OFFSET(DEVMODEW, dmFormName)) ? CCHFORMNAME : 0); - dmA = HeapAlloc(GetProcessHeap(), 0, size + dmW->dmDriverExtra); + dmA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + dmW->dmDriverExtra); if (!dmA) return NULL; WideCharToMultiByte(CP_ACP, 0, dmW->dmDeviceName, -1,

1 0

Alexandre Julliard : winedbg: Don't name a function PRIVATE.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: d7d84e71d3ae4ecdfa8289932673bfe4a9df57fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d84e71d3ae4ecdfa8289932… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 12 14:29:53 2009 +0100 winedbg: Don't name a function PRIVATE. --- programs/winedbg/tgt_minidump.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index bcdadcf..3aa892c 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -79,7 +79,7 @@ struct tgt_process_minidump_data HANDLE hMap; }; -static inline struct tgt_process_minidump_data* PRIVATE(struct dbg_process* pcs) +static inline struct tgt_process_minidump_data* private_data(struct dbg_process* pcs) { return (struct tgt_process_minidump_data*)pcs->pio_data; } @@ -91,8 +91,8 @@ static BOOL WINAPI tgt_process_minidump_read(HANDLE hProcess, const void* addr, MINIDUMP_DIRECTORY* dir; void* stream; - if (!PRIVATE(dbg_curr_process)->mapping) return FALSE; - if (MiniDumpReadDumpStream(PRIVATE(dbg_curr_process)->mapping, + if (!private_data(dbg_curr_process)->mapping) return FALSE; + if (MiniDumpReadDumpStream(private_data(dbg_curr_process)->mapping, MemoryListStream, &dir, &stream, &size)) { MINIDUMP_MEMORY_LIST* mml = (MINIDUMP_MEMORY_LIST*)stream; @@ -107,7 +107,7 @@ static BOOL WINAPI tgt_process_minidump_read(HANDLE hProcess, const void* addr, len = min(len, get_addr64(mmd->StartOfMemoryRange) + mmd->Memory.DataSize - (DWORD_PTR)addr); memcpy(buffer, - (char*)PRIVATE(dbg_curr_process)->mapping + mmd->Memory.Rva + (DWORD_PTR)addr - get_addr64(mmd->StartOfMemoryRange), + (char*)private_data(dbg_curr_process)->mapping + mmd->Memory.Rva + (DWORD_PTR)addr - get_addr64(mmd->StartOfMemoryRange), len); if (rlen) *rlen = len; return TRUE; @@ -444,7 +444,7 @@ enum dbg_start minidump_reload(int argc, char* argv[]) static BOOL tgt_process_minidump_close_process(struct dbg_process* pcs, BOOL kill) { - struct tgt_process_minidump_data* data = PRIVATE(pcs); + struct tgt_process_minidump_data* data = private_data(pcs); cleanup(data); pcs->pio_data = NULL;

1 0

Ken Thomases : dbghelp: Increase file read buffer size for calc_crc32.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: df0f32bbd953544aa7a3e55010d9b7d9993dfcc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df0f32bbd953544aa7a3e5501… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 11 09:09:07 2009 -0500 dbghelp: Increase file read buffer size for calc_crc32. --- dlls/dbghelp/crc32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/crc32.c b/dlls/dbghelp/crc32.c index 21333ac..f07bf42 100644 --- a/dlls/dbghelp/crc32.c +++ b/dlls/dbghelp/crc32.c @@ -136,7 +136,7 @@ DWORD calc_crc32(int fd) 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; int i, r; - unsigned char buffer[256]; + unsigned char buffer[8192]; DWORD crc = ~0; lseek(fd, 0, SEEK_SET);

1 0

Francois Gouget : dinput: Add a trailing '\n' to ERR() messages.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: 40363a223c3a8af784eaadd433647c633e127a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40363a223c3a8af784eaadd43… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 10:10:44 2009 +0100 dinput: Add a trailing '\n' to ERR() messages. Also convert a 'smart' quote to a regular quote. --- dlls/dinput/joystick_osx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index b44896c..21f8ca3 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -175,19 +175,19 @@ static CFMutableDictionaryRef creates_osx_device_match(int usage) } else { - ERR("CFNumberCreate() failed."); + ERR("CFNumberCreate() failed.\n"); return NULL; } } else { - ERR("CFNumberCreate failed."); + ERR("CFNumberCreate failed.\n"); return NULL; } } else { - ERR("CFDictionaryCreateMutable failed."); + ERR("CFDictionaryCreateMutable failed.\n"); return NULL; } @@ -205,7 +205,7 @@ static int find_osx_devices(void) tIOReturn = IOHIDManagerOpen( gIOHIDManagerRef, 0L); if ( kIOReturnSuccess != tIOReturn ) { - ERR("Couldn’t open IOHIDManager."); + ERR("Couldn't open IOHIDManager."); return 0; }

1 0

Ken Thomases : dbghelp: Extract calc_crc32 function into a separate file.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: 637827a2d04c010d44031bfa39972716a3f128f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=637827a2d04c010d44031bfa3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 11 09:09:00 2009 -0500 dbghelp: Extract calc_crc32 function into a separate file. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/crc32.c | 149 ++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/dbghelp_private.h | 3 + dlls/dbghelp/elf_module.c | 130 +--------------------------------- 4 files changed, 157 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=637827a2d04c010d44031…

1 0

Ken Thomases : dbghelp: Rename some things to be less ELF-centric.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: b8f6a68d6fb8caa6560a6c3847614bb56690d904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f6a68d6fb8caa6560a6c384… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 11 09:08:54 2009 -0500 dbghelp: Rename some things to be less ELF-centric. --- dlls/dbghelp/dbghelp_private.h | 7 ++++--- dlls/dbghelp/elf_module.c | 6 +++--- dlls/dbghelp/module.c | 12 ++++++------ dlls/dbghelp/symbol.c | 4 ++-- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 5d3f401..289e24c 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -111,7 +111,7 @@ void* hash_table_iter_up(struct hash_table_iter* hti); extern unsigned dbghelp_options; /* some more Wine extensions */ -#define SYMOPT_WINE_WITH_ELF_MODULES 0x40000000 +#define SYMOPT_WINE_WITH_NATIVE_MODULES 0x40000000 enum location_kind {loc_error, /* reg is the error code */ loc_absolute, /* offset is the location */ @@ -413,10 +413,11 @@ extern BOOL validate_addr64(DWORD64 addr); extern BOOL pcs_callback(const struct process* pcs, ULONG action, void* data); extern void* fetch_buffer(struct process* pcs, unsigned size); +typedef BOOL (*enum_modules_cb)(const WCHAR*, unsigned long addr, void* user); + /* elf_module.c */ #define ELF_NO_MAP ((const void*)0xffffffff) -typedef BOOL (*elf_enum_modules_cb)(const WCHAR*, unsigned long addr, void* user); -extern BOOL elf_enum_modules(HANDLE hProc, elf_enum_modules_cb, void*); +extern BOOL elf_enum_modules(HANDLE hProc, enum_modules_cb, void*); extern BOOL elf_fetch_file_info(const WCHAR* name, DWORD* base, DWORD* size, DWORD* checksum); struct elf_file_map; extern BOOL elf_load_debug_info(struct module* module, struct elf_file_map* fmap); diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 3b6c7cc..52ada0e 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1390,7 +1390,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, */ static BOOL elf_enum_modules_internal(const struct process* pcs, const WCHAR* main_name, - elf_enum_modules_cb cb, void* user) + enum_modules_cb cb, void* user) { struct r_debug dbg_hdr; void* lm_addr; @@ -1531,7 +1531,7 @@ BOOL elf_read_wine_loader_dbg_info(struct process* pcs) * This function doesn't require that someone has called SymInitialize * on this very process. */ -BOOL elf_enum_modules(HANDLE hProc, elf_enum_modules_cb cb, void* user) +BOOL elf_enum_modules(HANDLE hProc, enum_modules_cb cb, void* user) { struct process pcs; struct elf_info elf_info; @@ -1636,7 +1636,7 @@ BOOL elf_read_wine_loader_dbg_info(struct process* pcs) return FALSE; } -BOOL elf_enum_modules(HANDLE hProc, elf_enum_modules_cb cb, void* user) +BOOL elf_enum_modules(HANDLE hProc, enum_modules_cb cb, void* user) { return FALSE; } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index a7af0f5..abccf2c 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -358,13 +358,13 @@ struct module* module_find_by_addr(const struct process* pcs, unsigned long addr } /****************************************************************** - * module_is_elf_container_loaded + * module_is_container_loaded * - * checks whether the ELF container, for a (supposed) PE builtin is + * checks whether the native container, for a (supposed) PE builtin is * already loaded */ -static BOOL module_is_elf_container_loaded(const struct process* pcs, - const WCHAR* ImageName, DWORD base) +static BOOL module_is_container_loaded(const struct process* pcs, + const WCHAR* ImageName, DWORD base) { size_t len; struct module* module; @@ -525,7 +525,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (wImageName) { module = module_is_already_loaded(pcs, wImageName); - if (!module && module_is_elf_container_loaded(pcs, wImageName, BaseOfDll)) + if (!module && module_is_container_loaded(pcs, wImageName, BaseOfDll)) { /* force the loading of DLL as builtin */ module = pe_load_builtin_module(pcs, wImageName, BaseOfDll, SizeOfDll); @@ -709,7 +709,7 @@ BOOL WINAPI SymEnumerateModulesW64(HANDLE hProcess, for (module = pcs->lmodules; module; module = module->next) { - if (!(dbghelp_options & SYMOPT_WINE_WITH_ELF_MODULES) && module->type == DMT_ELF) + if (!(dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) && module->type == DMT_ELF) continue; if (!EnumModulesCallback(module->module.ModuleName, module->module.BaseOfImage, UserContext)) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 0810506..1686607 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1009,7 +1009,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR Mask, } /* not found in PE modules, retry on the ELF ones */ - if (!pair.requested && (dbghelp_options & SYMOPT_WINE_WITH_ELF_MODULES)) + if (!pair.requested && (dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES)) { for (pair.requested = pair.pcs->lmodules; pair.requested; pair.requested = pair.requested->next) { @@ -1336,7 +1336,7 @@ BOOL WINAPI SymFromName(HANDLE hProcess, PCSTR Name, PSYMBOL_INFO Symbol) } /* not found in PE modules, retry on the ELF ones */ - if (dbghelp_options & SYMOPT_WINE_WITH_ELF_MODULES) + if (dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) { for (module = pcs->lmodules; module; module = module->next) {

1 0