January 2011 - Wine-commits

Eric Pouech : dbghelp: Keep the mapping of any PDB file open until the module is unloaded.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 5ce195ae895db9ec9d51276dab6d5c870ceaee11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce195ae895db9ec9d51276da… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 8 14:04:14 2011 +0100 dbghelp: Keep the mapping of any PDB file open until the module is unloaded. --- dlls/dbghelp/msc.c | 75 +++++++++++++++++++++++++++------------------------ 1 files changed, 40 insertions(+), 35 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 74db2e9..4dcf65f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -66,6 +66,8 @@ struct pdb_file_info { enum pdb_kind kind; DWORD age; + HANDLE hMap; + const char* image; union { struct @@ -2130,16 +2132,16 @@ static void* pdb_read_ds_file(const struct PDB_DS_HEADER* pdb, return pdb_ds_read(pdb, block_list, toc->file_size[file_nr]); } -static void* pdb_read_file(const char* image, const struct pdb_file_info* pdb_file, +static void* pdb_read_file(const struct pdb_file_info* pdb_file, DWORD file_nr) { switch (pdb_file->kind) { case PDB_JG: - return pdb_read_jg_file((const struct PDB_JG_HEADER*)image, + return pdb_read_jg_file((const struct PDB_JG_HEADER*)pdb_file->image, pdb_file->u.jg.toc, file_nr); case PDB_DS: - return pdb_read_ds_file((const struct PDB_DS_HEADER*)image, + return pdb_read_ds_file((const struct PDB_DS_HEADER*)pdb_file->image, pdb_file->u.ds.toc, file_nr); } return NULL; @@ -2180,7 +2182,13 @@ static void pdb_module_remove(struct process* pcsn, struct module_format* modfmt unsigned i; for (i = 0; i < modfmt->u.pdb_info->used_subfiles; i++) + { pdb_free_file(&modfmt->u.pdb_info->pdb_files[i]); + if (modfmt->u.pdb_info->pdb_files[i].image) + UnmapViewOfFile(modfmt->u.pdb_info->pdb_files[i].image); + if (modfmt->u.pdb_info->pdb_files[i].hMap) + CloseHandle(modfmt->u.pdb_info->pdb_files[i].hMap); + } HeapFree(GetProcessHeap(), 0, modfmt); } @@ -2259,11 +2267,11 @@ static void pdb_convert_symbol_file(const PDB_SYMBOLS* symbols, } } -static HANDLE open_pdb_file(const struct process* pcs, - const struct pdb_lookup* lookup, - struct module* module) +static HANDLE map_pdb_file(const struct process* pcs, + const struct pdb_lookup* lookup, + struct module* module) { - HANDLE h; + HANDLE hFile, hMap = NULL; char dbg_file_path[MAX_PATH]; BOOL ret = FALSE; @@ -2283,19 +2291,21 @@ static HANDLE open_pdb_file(const struct process* pcs, WARN("\tCouldn't find %s\n", lookup->filename); return NULL; } - h = CreateFileA(dbg_file_path, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - TRACE("%s: %s returns %p\n", lookup->filename, dbg_file_path, h); - return (h == INVALID_HANDLE_VALUE) ? NULL : h; + if ((hFile = CreateFileA(dbg_file_path, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE) + { + hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); + CloseHandle(hFile); + } + return hMap; } static void pdb_process_types(const struct msc_debug_info* msc_dbg, - const char* image, const struct pdb_file_info* pdb_file) { BYTE* types_image = NULL; - types_image = pdb_read_file(image, pdb_file, 2); + types_image = pdb_read_file(pdb_file, 2); if (types_image) { PDB_TYPES types; @@ -2451,7 +2461,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* for (i = 1; i < num_files; i++) { - unsigned char* x = pdb_read_file(image, pdb_file, i); + unsigned char* x = pdb_read_file(pdb_file, i); FIXME("********************** [%u]: size=%08x\n", i, pdb_get_file_size(pdb_file, i)); dump(x, pdb_get_file_size(pdb_file, i)); @@ -2536,8 +2546,7 @@ static BOOL pdb_process_internal(const struct process* pcs, struct pdb_module_info* pdb_module_info, unsigned module_index) { - BOOL ret = FALSE; - HANDLE hFile, hMap = NULL; + HANDLE hMap = NULL; char* image = NULL; BYTE* symbols_image = NULL; char* files_image = NULL; @@ -2549,19 +2558,23 @@ static BOOL pdb_process_internal(const struct process* pcs, pdb_file = &pdb_module_info->pdb_files[module_index == -1 ? 0 : module_index]; /* Open and map() .PDB file */ - if ((hFile = open_pdb_file(pcs, pdb_lookup, msc_dbg->module)) == NULL || - ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) == NULL) || + if ((hMap = map_pdb_file(pcs, pdb_lookup, msc_dbg->module)) == NULL || ((image = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) == NULL)) { WARN("Unable to open .PDB file: %s\n", pdb_lookup->filename); - goto leave; + CloseHandle(hMap); + return FALSE; } if (!pdb_init(pdb_lookup, pdb_file, image, &matched) || matched != 2) { - goto leave; + CloseHandle(hMap); + UnmapViewOfFile(image); + return FALSE; } - symbols_image = pdb_read_file(image, pdb_file, 3); + pdb_file->hMap = hMap; + pdb_file->image = image; + symbols_image = pdb_read_file(pdb_file, 3); if (symbols_image) { PDB_SYMBOLS symbols; @@ -2583,7 +2596,7 @@ static BOOL pdb_process_internal(const struct process* pcs, symbols.version, symbols.version); } - files_image = pdb_read_file(image, pdb_file, 12); /* FIXME: really fixed ??? */ + files_image = pdb_read_file(pdb_file, 12); /* FIXME: really fixed ??? */ if (files_image) { if (*(const DWORD*)files_image == 0xeffeeffe) @@ -2600,10 +2613,10 @@ static BOOL pdb_process_internal(const struct process* pcs, pdb_process_symbol_imports(pcs, msc_dbg, &symbols, symbols_image, image, pdb_lookup, pdb_module_info, module_index); - pdb_process_types(msc_dbg, image, pdb_file); + pdb_process_types(msc_dbg, pdb_file); /* Read global symbol table */ - globalimage = pdb_read_file(image, pdb_file, symbols.gsym_file); + globalimage = pdb_read_file(pdb_file, symbols.gsym_file); if (globalimage) { codeview_snarf(msc_dbg, globalimage, 0, @@ -2621,7 +2634,7 @@ static BOOL pdb_process_internal(const struct process* pcs, HeapValidate(GetProcessHeap(), 0, NULL); pdb_convert_symbol_file(&symbols, &sfile, &size, file); - modimage = pdb_read_file(image, pdb_file, sfile.file); + modimage = pdb_read_file(pdb_file, sfile.file); if (modimage) { if (sfile.symbol_size) @@ -2655,19 +2668,11 @@ static BOOL pdb_process_internal(const struct process* pcs, else pdb_process_symbol_imports(pcs, msc_dbg, NULL, NULL, image, pdb_lookup, pdb_module_info, module_index); - ret = TRUE; - leave: - /* Cleanup */ pdb_free(symbols_image); pdb_free(files_image); - pdb_free_file(pdb_file); - if (image) UnmapViewOfFile(image); - if (hMap) CloseHandle(hMap); - if (hFile) CloseHandle(hFile); - - return ret; + return TRUE; } static BOOL pdb_process_file(const struct process* pcs, @@ -2720,7 +2725,7 @@ BOOL pdb_fetch_file_info(const struct pdb_lookup* pdb_lookup, unsigned* matched) { HANDLE hFile, hMap = NULL; char* image = NULL; - BOOL ret = TRUE; + BOOL ret; struct pdb_file_info pdb_file; if ((hFile = CreateFileA(pdb_lookup->filename, GENERIC_READ, FILE_SHARE_READ, NULL,

1 0

Eric Pouech : dbghelp: Added preliminary extended FPO information out of PDB files.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 99439e758943c5c36d67d1437cecc20d76adf2d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99439e758943c5c36d67d1437… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 8 14:04:20 2011 +0100 dbghelp: Added preliminary extended FPO information out of PDB files. --- dlls/dbghelp/cpu_i386.c | 32 ++++- dlls/dbghelp/dbghelp_private.h | 6 + dlls/dbghelp/msc.c | 304 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 340 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99439e758943c5c36d67d…

1 0

Eric Pouech : winedbg: Added CPU method for identifying a jmp insn, and implement it for i386.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: ae9f86042e7e11f4ff443392f462ef535e81c592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9f86042e7e11f4ff443392f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 8 14:08:56 2011 +0100 winedbg: Added CPU method for identifying a jmp insn, and implement it for i386. --- programs/winedbg/be_alpha.c | 6 ++++++ programs/winedbg/be_arm.c | 6 ++++++ programs/winedbg/be_cpu.h | 2 ++ programs/winedbg/be_i386.c | 37 +++++++++++++++++++++++++++++++++++++ programs/winedbg/be_ppc.c | 7 +++++++ programs/winedbg/be_sparc.c | 6 ++++++ programs/winedbg/be_x86_64.c | 6 ++++++ 7 files changed, 70 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_alpha.c b/programs/winedbg/be_alpha.c index 76cddb5..f16952c 100644 --- a/programs/winedbg/be_alpha.c +++ b/programs/winedbg/be_alpha.c @@ -77,6 +77,11 @@ static unsigned be_alpha_is_func_call(const void* insn, ADDRESS64* callee) return FALSE; } +static unsigned be_alpha_is_jump(const void* insn, ADDRESS64* jumpee) +{ + return FALSE; +} + static void be_alpha_disasm_one_insn(ADDRESS64* addr, int display) { dbg_printf("Disasm NIY\n"); @@ -159,6 +164,7 @@ struct backend_cpu be_alpha = be_alpha_is_function_return, be_alpha_is_break_insn, be_alpha_is_func_call, + be_alpha_is_jump, be_alpha_disasm_one_insn, be_alpha_insert_Xpoint, be_alpha_remove_Xpoint, diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 709ce26..99336e2 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -87,6 +87,11 @@ static unsigned be_arm_is_func_call(const void* insn, ADDRESS64* callee) return FALSE; } +static unsigned be_arm_is_jump(const void* insn, ADDRESS64* jumpee) +{ + return FALSE; +} + static void be_arm_disasm_one_insn(ADDRESS64* addr, int display) { dbg_printf("Disasm NIY\n"); @@ -181,6 +186,7 @@ struct backend_cpu be_arm = be_arm_is_function_return, be_arm_is_break_insn, be_arm_is_func_call, + be_arm_is_jump, be_arm_disasm_one_insn, be_arm_insert_Xpoint, be_arm_remove_Xpoint, diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index 005494d..ce9c32f 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -78,6 +78,8 @@ struct backend_cpu unsigned (*is_break_insn)(const void*); /* Check whether instruction at 'addr' is a function call */ unsigned (*is_function_call)(const void* insn, ADDRESS64* callee); + /* Check whether instruction at 'addr' is a jump */ + unsigned (*is_jump)(const void* insn, ADDRESS64* jumpee); /* Ask for disassembling one instruction. If display is true, assembly code * will be printed. In all cases, 'addr' is advanced at next instruction */ diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index d6111bd..6f07e06 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -539,6 +539,42 @@ static unsigned be_i386_is_func_call(const void* insn, ADDRESS64* callee) } } +static unsigned be_i386_is_jump(const void* insn, ADDRESS64* jumpee) +{ + BYTE ch; + int delta; + unsigned operand_size; + ADDRESS_MODE cs_addr_mode; + + cs_addr_mode = get_selector_type(dbg_curr_thread->handle, &dbg_context, + dbg_context.SegCs); + operand_size = get_size(cs_addr_mode); + + /* get operand_size (also getting rid of the various prefixes */ + do + { + if (!dbg_read_memory(insn, &ch, sizeof(ch))) return FALSE; + if (ch == 0x66) + { + operand_size = 48 - operand_size; /* 16 => 32, 32 => 16 */ + insn = (const char*)insn + 1; + } + } while (ch == 0x66 || ch == 0x67); + + switch (ch) + { + case 0xe9: /* jmp near */ + jumpee->Mode = cs_addr_mode; + if (!fetch_value((const char*)insn + 1, operand_size, &delta)) + return FALSE; + jumpee->Segment = dbg_context.SegCs; + jumpee->Offset = (DWORD)insn + 1 + (operand_size / 8) + delta; + return TRUE; + default: WINE_FIXME("unknown %x\n", ch); return FALSE; + } + return FALSE; +} + #define DR7_CONTROL_SHIFT 16 #define DR7_CONTROL_SIZE 4 @@ -751,6 +787,7 @@ struct backend_cpu be_i386 = be_i386_is_function_return, be_i386_is_break_insn, be_i386_is_func_call, + be_i386_is_jump, be_i386_disasm_one_insn, be_i386_insert_Xpoint, be_i386_remove_Xpoint, diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index 2377648..0d076bc 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -90,7 +90,13 @@ static unsigned be_ppc_is_func_call(const void* insn, ADDRESS64* callee) return FALSE; } +static unsigned be_ppc_is_jump(const void* insn, ADDRESS64* jumpee) +{ + return FALSE; +} + static void be_ppc_disasm_one_insn(ADDRESS64* addr, int display) + { dbg_printf("Disasm NIY\n"); } @@ -183,6 +189,7 @@ struct backend_cpu be_ppc = be_ppc_is_function_return, be_ppc_is_break_insn, be_ppc_is_func_call, + be_ppc_is_jump, be_ppc_disasm_one_insn, be_ppc_insert_Xpoint, be_ppc_remove_Xpoint, diff --git a/programs/winedbg/be_sparc.c b/programs/winedbg/be_sparc.c index 45ba44e..c9afc95 100644 --- a/programs/winedbg/be_sparc.c +++ b/programs/winedbg/be_sparc.c @@ -78,6 +78,11 @@ static unsigned be_sparc_is_func_call(const void* insn, ADDRESS64* callee) return FALSE; } +static unsigned be_sparc_is_jump(const void* insn, ADDRESS64* jumpee) +{ + return FALSE; +} + static void be_sparc_disasm_one_insn(ADDRESS64* addr, int display) { dbg_printf("not done for Sparc\n"); @@ -146,6 +151,7 @@ struct backend_cpu be_sparc = be_sparc_is_function_return, be_sparc_is_break_insn, be_sparc_is_func_call, + be_sparc_is_jump, be_sparc_disasm_one_insn, be_sparc_insert_Xpoint, be_sparc_remove_Xpoint, diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 6099a78..bd7a00a 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -343,6 +343,11 @@ static unsigned be_x86_64_is_func_call(const void* insn, ADDRESS64* callee) } } +static unsigned be_x86_64_is_jump(const void* insn, ADDRESS64* jumpee) +{ + return FALSE; +} + extern void be_x86_64_disasm_one_insn(ADDRESS64* addr, int display); #define DR7_CONTROL_SHIFT 16 @@ -560,6 +565,7 @@ struct backend_cpu be_x86_64 = be_x86_64_is_function_return, be_x86_64_is_break_insn, be_x86_64_is_func_call, + be_x86_64_is_jump, be_x86_64_disasm_one_insn, be_x86_64_insert_Xpoint, be_x86_64_remove_Xpoint,

1 0

Vitaliy Margolen : dinput: Explicitly define ASCII and Unicode methods in joydev joystick.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: e6a8aa67d0481693a8c69d02e9f8d76862a778ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a8aa67d0481693a8c69d02e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:44:11 2011 -0700 dinput: Explicitly define ASCII and Unicode methods in joydev joystick. --- dlls/dinput/joystick_linux.c | 45 +++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index c7958ae..a858ecd 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -107,6 +107,14 @@ static inline JoystickImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W { return (JoystickImpl *) iface; } +static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(JoystickImpl *This) +{ + return (IDirectInputDevice8A *)This; +} +static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickImpl *This) +{ + return (IDirectInputDevice8W *)This; +} static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903fb6bdf7 */ 0x9e573ed9, @@ -502,14 +510,14 @@ const struct dinput_device joystick_linux_device = { /****************************************************************************** * Acquire : gets exclusive control of the joystick */ -static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) +static HRESULT WINAPI JoystickLinuxWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) { - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; TRACE("(%p)\n",This); - res = IDirectInputDevice2AImpl_Acquire(iface); + res = IDirectInputDevice2WImpl_Acquire(iface); if (res != DI_OK) return res; @@ -520,7 +528,7 @@ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) This->joyfd = open(This->joydev->device, O_RDONLY); if (This->joyfd==-1) { ERR("open(%s) failed: %s\n", This->joydev->device, strerror(errno)); - IDirectInputDevice2AImpl_Unacquire(iface); + IDirectInputDevice2WImpl_Unacquire(iface); return DIERR_NOTFOUND; } } @@ -528,17 +536,23 @@ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) return DI_OK; } +static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + return JoystickLinuxWImpl_Acquire(IDirectInputDevice8W_from_impl(This)); +} + /****************************************************************************** * Unacquire : frees the joystick */ -static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) +static HRESULT WINAPI JoystickLinuxWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) { - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; TRACE("(%p)\n",This); - res = IDirectInputDevice2AImpl_Unacquire(iface); + res = IDirectInputDevice2WImpl_Unacquire(iface); if (res != DI_OK) return res; @@ -553,6 +567,12 @@ static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) return DI_NOEFFECT; } +static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + return JoystickLinuxWImpl_Unacquire(IDirectInputDevice8W_from_impl(This)); +} + static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) { struct pollfd plfd; @@ -665,12 +685,6 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice8AImpl_GetImageInfo }; -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(JoystickWvt.fun)) -#else -# define XCAST(fun) (void*) -#endif - static const IDirectInputDevice8WVtbl JoystickWvt = { IDirectInputDevice2WImpl_QueryInterface, @@ -680,8 +694,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_EnumObjects, JoystickWGenericImpl_GetProperty, JoystickWGenericImpl_SetProperty, - XCAST(Acquire)JoystickLinuxAImpl_Acquire, - XCAST(Unacquire)JoystickLinuxAImpl_Unacquire, + JoystickLinuxWImpl_Acquire, + JoystickLinuxWImpl_Unacquire, JoystickWGenericImpl_GetDeviceState, IDirectInputDevice2WImpl_GetDeviceData, IDirectInputDevice2WImpl_SetDataFormat, @@ -706,7 +720,6 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice8WImpl_SetActionMap, IDirectInputDevice8WImpl_GetImageInfo }; -#undef XCAST #else /* HAVE_LINUX_22_JOYSTICK_API */

1 0

Vitaliy Margolen : dinput: COM cleanup - use interfaces instead of vtbl. Combine both Unicode and ASCII interfaces into the same classes.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 6b30480021862ea7bb6475b21b3d709f80a9f9e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b30480021862ea7bb6475b21… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:44:19 2011 -0700 dinput: COM cleanup - use interfaces instead of vtbl. Combine both Unicode and ASCII interfaces into the same classes. --- dlls/dinput/device.c | 8 ++++---- dlls/dinput/device_private.h | 3 ++- dlls/dinput/dinput_main.c | 23 ++++++++++++++++++----- dlls/dinput/joystick.c | 8 ++++---- dlls/dinput/joystick_linux.c | 33 ++++++++++++++++++++++----------- dlls/dinput/joystick_linuxinput.c | 30 ++++++++++++++++++------------ dlls/dinput/joystick_osx.c | 29 ++++++++++++++++++++--------- dlls/dinput/keyboard.c | 31 +++++++++++++++++++++---------- dlls/dinput/mouse.c | 37 +++++++++++++++++++++++++------------ 9 files changed, 134 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b30480021862ea7bb647…

1 0

Hwang YunSong : wininet: Update Korean resource.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: e1c71291cc6038c08ba7ca6f1fa215ff7e70c5cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c71291cc6038c08ba7ca6f1… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Jan 8 10:40:14 2011 +0900 wininet: Update Korean resource. --- dlls/wininet/wininet_Ko.rc | 59 +++++++++++++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/wininet_Ko.rc b/dlls/wininet/wininet_Ko.rc index 1c4a87b..9bbd489 100644 --- a/dlls/wininet/wininet_Ko.rc +++ b/dlls/wininet/wininet_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 2003 Mike McCormack for CodeWeavers - * Copyright 2005,2007,2010 YunSong Hwang + * Copyright 2005,2007,2010,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,49 +19,68 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "��Ʈ��ũ ��ȣ �Է�" +CAPTION "네트워크 암호 입력" FONT 9, "MS Shell Dlg" { - LTEXT "�� ̸�� ȣ�� Է��Ͻʽÿ�:", -1, 40, 6, 150, 15 - LTEXT "��Ͻ�", -1, 40, 26, 50, 10 - LTEXT "��", -1, 40, 46, 50, 10 - LTEXT "��", -1, 40, 66, 50, 10 - LTEXT "��ȣ", -1, 40, 86, 50, 10 + LTEXT "당신의 사용자 이름과 암호를 입력하십시오:", -1, 40, 6, 150, 15 + LTEXT "프록시", -1, 40, 26, 50, 10 + LTEXT "영역", -1, 40, 46, 50, 10 + LTEXT "사용자", -1, 40, 66, 50, 10 + LTEXT "암호", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "��ȣ ��(&S)(�� )", IDC_SAVEPASSWORD, + CHECKBOX "암호 저장(&S)(안전하지 못함)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ȯ��", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "확인", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "취소", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } IDD_AUTHDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "�� ʿ�" +CAPTION "인증 필요" FONT 8, "MS Shell Dlg" { - LTEXT "�� ̸�� ȣ�� Է��Ͻʽÿ�:", -1, 40, 6, 150, 15 - LTEXT "��", -1, 40, 26, 50, 10 - LTEXT "��", -1, 40, 46, 50, 10 - LTEXT "��", -1, 40, 66, 50, 10 - LTEXT "��ȣ", -1, 40, 86, 50, 10 + LTEXT "당신의 사용자 이름과 암호를 입력하십시오:", -1, 40, 6, 150, 15 + LTEXT "서버", -1, 40, 26, 50, 10 + LTEXT "영역", -1, 40, 46, 50, 10 + LTEXT "사용자", -1, 40, 66, 50, 10 + LTEXT "암호", -1, 40, 86, 50, 10 LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "��ȣ ��(&S) (�� )", IDC_SAVEPASSWORD, + CHECKBOX "암호 저장(&S) (안전하지 못함)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ȯ��", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "확인", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "취소", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_INVCERTDLG DIALOG 3, 24, 250, 86 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "보안 경고" +FONT 8, "MS Shell Dlg" +{ + LTEXT "이 사이트의 인증서에 문제가 있습니다.", -1, 40, 6, 200, 20 + LTEXT "", IDC_CERT_ERROR, 40, 26, 200, 20 + LTEXT "그래도 계속 진행하겠습니까?", -1, 40, 46, 200, 20 + PUSHBUTTON "예", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "아니오", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP +} + + STRINGTABLE { - IDS_LANCONNECTION "�� " + IDS_LANCONNECTION "랜 연결" + IDS_CERT_CA_INVALID "이 인증서는 알 수 없거나 신뢰할 수없는 게시자에 의해 발행되었습니다." + IDS_CERT_DATE_INVALID "이 인증서의 날짜는 올바르지 않습니다." + IDS_CERT_CN_INVALID "이 인증서의 이름이 사이트하고 일치 하지 않습니다." + IDS_CERT_ERRORS "이 인증서에는 최소한 하나의 지정되지 않은 보안 문제가 있습니다." }

1 0

Hwang YunSong : winspool.drv: Update Korean resource.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: ac2b56162a742b36f2d30fe5a8af55fccb8e17a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2b56162a742b36f2d30fe5a… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Jan 8 10:41:46 2011 +0900 winspool.drv: Update Korean resource. --- dlls/winspool.drv/Ko.rc | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winspool.drv/Ko.rc b/dlls/winspool.drv/Ko.rc index f8ac166..8a3279e 100644 --- a/dlls/winspool.drv/Ko.rc +++ b/dlls/winspool.drv/Ko.rc @@ -1,7 +1,7 @@ /* * Korean resources for winspool * - * Copyright 2005 YunSong Hwang + * Copyright 2005,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,22 +20,24 @@ #include "wspool.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT FILENAME_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "��Ϸ� �μ�" +CAPTION "파일로 인쇄" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "�� ̸�(&O):", -1, 7, 13, 194, 13, WS_VISIBLE + LTEXT "출력 파일 이름(&O):", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "Ȯ��", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "��", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "확인", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "취소", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE END STRINGTABLE { - IDS_CAPTION "�� Ʈ" - IDS_FILE_EXISTS "�� մϴ�. 'Ȯ��'�� ��̴ϴ�." - IDS_CANNOT_OPEN "�� ϴ�." + IDS_CAPTION "지역 포트" + IDS_FILE_EXISTS "출력 파일은 존재합니다. '확인'을 누르면 덮어쓰여질겁니다." + IDS_CANNOT_OPEN "출력 파일을 만들수 없습니다." }

1 0

Hwang YunSong : wordpad: Update Korean resource.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 302415c3db8f03db0abcd6c44dc4bd2146e6da78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=302415c3db8f03db0abcd6c44… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Jan 8 10:43:18 2011 +0900 wordpad: Update Korean resource. --- programs/wordpad/Ko.rc | 284 ++++++++++++++++++++++++------------------------ 1 files changed, 143 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=302415c3db8f03db0abcd…

1 0

Joel Holdsworth : comctl32/rebar: Removed a redundant call.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 1e644a7db722c3f6a5971ba73898a79d4796cef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e644a7db722c3f6a5971ba73… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Jan 9 09:40:08 2011 +0000 comctl32/rebar: Removed a redundant call. --- dlls/comctl32/rebar.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 8ecfee3..552c83c 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1180,8 +1180,6 @@ static void REBAR_SetRowRectsX(const REBAR_INFO *infoPtr, INT iBeginBand, INT iE for (i = iBeginBand; i < iEndBand; i = next_visible(infoPtr, i)) { REBAR_BAND *lpBand = REBAR_GetBand(infoPtr, i); - - lpBand = REBAR_GetBand(infoPtr, i); if (lpBand->rcBand.left != xPos || lpBand->rcBand.right != xPos + lpBand->cxEffective) { lpBand->fDraw |= NTF_INVALIDATE; TRACE("Setting rect %d to %d,%d\n", i, xPos, xPos + lpBand->cxEffective);

1 0

Joel Holdsworth : comctl32/rebar: Implemented band reordering within rows.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: ebadd4ec46c9f8d725468c9858ed03bcc6c70e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebadd4ec46c9f8d725468c985… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Jan 9 09:40:10 2011 +0000 comctl32/rebar: Implemented band reordering within rows. --- dlls/comctl32/rebar.c | 97 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 77 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 552c83c..5ab55d4 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1262,6 +1262,42 @@ static int REBAR_ShrinkBandsLTR(const REBAR_INFO *infoPtr, INT iBeginBand, INT i return cxShrink; } +/* Tries to move a band to a given offset within a row. */ +static int REBAR_MoveBandToRowOffset(REBAR_INFO *infoPtr, INT iBand, INT iFirstBand, + INT iLastBand, INT xOff) +{ + REBAR_BAND *insertBand = REBAR_GetBand(infoPtr, iBand); + int xPos = 0, i; + const BOOL setBreak = REBAR_GetBand(infoPtr, iFirstBand)->fStyle & RBBS_BREAK; + + /* Find the band's new position */ + for (i = iFirstBand; i < iLastBand; i = next_visible(infoPtr, i)) + { + if(xPos > xOff) + break; + xPos += REBAR_GetBand(infoPtr, i)->cxEffective + SEP_WIDTH; + } + + /* Move the band to its new position */ + DPA_DeletePtr(infoPtr->bands, iBand); + if(i > iBand) + i--; + DPA_InsertPtr(infoPtr->bands, i, insertBand); + + /* Ensure only the last band has the RBBS_BREAK flag set */ + insertBand->fStyle &= ~RBBS_BREAK; + if(setBreak) + REBAR_GetBand(infoPtr, iFirstBand)->fStyle |= RBBS_BREAK; + + /* Return the currently grabbed band */ + if(infoPtr->iGrabbedBand == iBand) + { + infoPtr->iGrabbedBand = i; + return i; + } + else return -1; +} + /* Set the heights of the visible bands in [iBeginBand; iEndBand) to the max height. iBeginBand must be visible */ static int REBAR_SetBandsHeight(const REBAR_INFO *infoPtr, INT iBeginBand, INT iEndBand, INT yStart) { @@ -2005,7 +2041,8 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) { REBAR_BAND *hitBand; INT iHitBand, iRowBegin, iRowEnd; - INT movement, xBand; + INT movement, xBand, cxLeft = 0; + BOOL shrunkBands = FALSE; /* on first significant mouse movement, issue notify */ if (!(infoPtr->fStatus & BEGIN_DRAG_ISSUED)) { @@ -2030,21 +2067,44 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) movement = (infoPtr->dwStyle&CCS_VERT ? ptsmove->y : ptsmove->x) - (xBand + REBAR_PRE_GRIPPER - infoPtr->ihitoffset); - if (movement < 0) { - INT cxLeft = REBAR_ShrinkBandsRTL(infoPtr, iRowBegin, iHitBand, -movement, TRUE); - hitBand->cxEffective += -movement - cxLeft; - hitBand->cx = hitBand->cxEffective; - } else if (movement > 0) { - INT prev; - - if ((prev = prev_visible(infoPtr, iHitBand)) >= 0) { - INT cxLeft = REBAR_ShrinkBandsLTR(infoPtr, iHitBand, iRowEnd, movement, TRUE); - REBAR_BAND *lpPrev = REBAR_GetBand(infoPtr, prev_visible(infoPtr, iHitBand)); - lpPrev->cxEffective += movement - cxLeft; - lpPrev->cx = lpPrev->cxEffective; + /* Dragging the first band in a row cannot cause shrinking */ + if(iHitBand != iRowBegin) + { + if (movement < 0) { + cxLeft = REBAR_ShrinkBandsRTL(infoPtr, iRowBegin, iHitBand, -movement, TRUE); + + if(cxLeft < -movement) + { + hitBand->cxEffective += -movement - cxLeft; + hitBand->cx = hitBand->cxEffective; + shrunkBands = TRUE; + } + + } else if (movement > 0) { + + cxLeft = movement; + if (prev_visible(infoPtr, iHitBand) >= 0) + cxLeft = REBAR_ShrinkBandsLTR(infoPtr, iHitBand, iRowEnd, movement, TRUE); + + if(cxLeft < movement) + { + REBAR_BAND *lpPrev = REBAR_GetBand(infoPtr, prev_visible(infoPtr, iHitBand)); + lpPrev->cxEffective += movement - cxLeft; + lpPrev->cx = hitBand->cxEffective; + shrunkBands = TRUE; + } + } } + if(!shrunkBands) + { + /* It was not possible to move the band by shrinking bands. + * Try relocating the band instead. */ + REBAR_MoveBandToRowOffset(infoPtr, iHitBand, iRowBegin, + iRowEnd, xBand + movement); + } + REBAR_SetRowRectsX(infoPtr, iRowBegin, iRowEnd); if (infoPtr->dwStyle & CCS_VERT) REBAR_CalcVertBand(infoPtr, 0, infoPtr->uNumBands); @@ -3023,24 +3083,21 @@ REBAR_MouseMove (REBAR_INFO *infoPtr, LPARAM lParam) /* if we are currently dragging a band */ if (infoPtr->iGrabbedBand >= 0) { - REBAR_BAND *band1 = NULL, *band2; + REBAR_BAND *band; int yPtMove = (infoPtr->dwStyle & CCS_VERT ? ptMove.x : ptMove.y); if (GetCapture() != infoPtr->hwndSelf) ERR("We are dragging but haven't got capture?!?\n"); - if (infoPtr->iGrabbedBand > 0) - band1 = REBAR_GetBand(infoPtr, infoPtr->iGrabbedBand - 1); - band2 = REBAR_GetBand(infoPtr, infoPtr->iGrabbedBand); + band = REBAR_GetBand(infoPtr, infoPtr->iGrabbedBand); /* if mouse did not move much, exit */ if ((abs(ptMove.x - infoPtr->dragNow.x) <= mindragx) && (abs(ptMove.y - infoPtr->dragNow.y) <= mindragy)) return 0; /* Test for valid drag case - must not be first band in row */ - if ((yPtMove < band2->rcBand.top) || - (yPtMove > band2->rcBand.bottom) || - ((infoPtr->iGrabbedBand > 0) && (band1->iRow != band2->iRow))) { + if ((yPtMove < band->rcBand.top) || + (yPtMove > band->rcBand.bottom)) { FIXME("Cannot drag to other rows yet!!\n"); } else {

1 0