May 2008 - Wine-commits - list.winehq.org

Eric Pouech : winedbg: Added implementation of qSupported request.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 5d90e60ed5e515060f20416e582b6d42bc36853b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d90e60ed5e515060f20416e5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 30 21:28:13 2008 +0200 winedbg: Added implementation of qSupported request. --- programs/winedbg/gdbproxy.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 0f95056..a47f9ca 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1766,6 +1766,12 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) case 'S': if (strncmp(gdbctx->in_packet, "Symbol::", gdbctx->in_packet_len) == 0) return packet_ok; + if (strncmp(gdbctx->in_packet, "Supported", gdbctx->in_packet_len) == 0) + { + packet_reply_open(gdbctx); + packet_reply_close(gdbctx); + return packet_done; + } break; case 'T': if (gdbctx->in_packet_len > 15 &&

1 0

Eric Pouech : winedbg: Try harder to locate a source file.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 6f84b1c640bab6a7b721240517931e74c3dc4ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f84b1c640bab6a7b72124051… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 30 21:26:37 2008 +0200 winedbg: Try harder to locate a source file. --- programs/winedbg/source.c | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/source.c b/programs/winedbg/source.c index eb9576d..41ee6f7 100644 --- a/programs/winedbg/source.c +++ b/programs/winedbg/source.c @@ -122,6 +122,32 @@ static struct open_file_list* source_search_open_file(const char* name) return ol; } +static BOOL source_locate_file(const char* srcfile, char* path) +{ + BOOL found = FALSE; + + if (GetFileAttributes(srcfile) != INVALID_FILE_ATTRIBUTES) + { + strcpy(path, srcfile); + found = TRUE; + } + else if (search_path) + { + const char* spath; + + spath = srcfile; + while (!found) + { + spath = strchr(spath, '\\'); + if (!spath) spath = strchr(spath, '/'); + if (!spath) break; + spath++; + found = SearchPathA(search_path, spath, NULL, MAX_PATH, path, NULL); + } + } + return found; +} + static int source_display(const char* sourcefile, int start, int end) { char* addr; @@ -158,9 +184,7 @@ static int source_display(const char* sourcefile, int start, int end) /* * Crapola. We need to try and open the file. */ - strcpy(tmppath, sourcefile); - if (GetFileAttributes(sourcefile) == INVALID_FILE_ATTRIBUTES && - (!search_path || !SearchPathA(search_path, sourcefile, NULL, MAX_PATH, tmppath, NULL))) + if (!source_locate_file(sourcefile, tmppath)) { if (dbg_interactiveP) { @@ -180,6 +204,7 @@ static int source_display(const char* sourcefile, int start, int end) */ strcat(tmppath, basename); } + else tmppath[0] = '\0'; if (GetFileAttributes(tmppath) == INVALID_FILE_ATTRIBUTES) {

1 0

Eric Pouech : winedump: Print more meaningful information about module list .
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 1185c5123d3f3472b53878237a2e9b304d1fe5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1185c5123d3f3472b53878237… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 30 21:25:41 2008 +0200 winedump: Print more meaningful information about module list. --- tools/winedump/pdb.c | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index d4eb50b..a703369 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -210,8 +210,10 @@ static void pdb_dump_symbols(struct pdb_reader* reader) if (symbols->srcmodule_size) { const PDB_SYMBOL_SOURCE*src; - int i; + int i, j, cfile; + const WORD* indx; const DWORD* offset; + const char* start_cstr; const char* cstr; printf("\t----------src module------------\n"); @@ -219,35 +221,38 @@ static void pdb_dump_symbols(struct pdb_reader* reader) symbols->module_size + symbols->offset_size + symbols->hash_size); printf("\tSource Modules\n" "\t\tnModules: %u\n" - "\t\tnSrcFiles: %u\n" - "\t\ttable:\n", + "\t\tnSrcFiles: %u\n", src->nModules, src->nSrcFiles); /* usage of table seems to be as follows: * two arrays of WORD (src->nModules as size) - * - first array contains index into files for "module" compilation (module = compilation unit ??) - * - second array contains increment in index (if needed) - * - usage of this later is not very clear. it could be that if second array entry is null, then no file - * name is to be used ? - * an array of DWORD (src->nSrcFiles as size) + * - first array contains index into files for "module" compilation + * (module = compilation unit ??) + * - second array contains the number of source files in module + * an array of DWORD (src->nSrcFiles as size) * - contains offset (in following string table) of the source file name - * a string table - * - each string is a pascal string (ie. with its length as first BYTE) or - * 0-terminated string (depending on version) + * a string table + * - each string is a pascal string (ie. with its length as first BYTE) or + * 0-terminated string (depending on version) */ - + indx = &src->table[src->nModules]; offset = (const DWORD*)&src->table[2 * src->nModules]; cstr = (const char*)&src->table[2 * (src->nModules + src->nSrcFiles)]; + start_cstr = cstr; - for (i = 0; i < src->nModules; i++) + for (i = cfile = 0; i < src->nModules; i++) { - /* FIXME: in some cases, it's a p_string but WHEN ? */ - if (cstr + offset[src->table[i]] < (const char*)src + symbols->srcmodule_size) - printf("\t\t\tmodule[%2d]: src=%s (%04x)\n", - i, cstr + offset[src->table[i]], src->table[src->nModules + i]); - else - printf("\t\t\tmodule[%2d]: src=<<out of bounds>> (%04x)\n", - i, src->table[src->nModules + i]); + printf("\t\tModule[%2d]:\n", i); + for (j = 0; j < indx[i]; j++, cfile++) + { + /* FIXME: in some cases, it's a p_string but WHEN ? */ + if (src->table[cfile] < src->nSrcFiles && + cstr + offset[src->table[cfile]] >= (const char*)start_cstr /* wrap around */ && + cstr + offset[src->table[cfile]] < (const char*)src + symbols->srcmodule_size) + printf("\t\t\tSource file: %s\n", cstr + offset[src->table[cfile]]); + else + printf("\t\t\tSource file: <<out of bounds>>\n"); + } } } if (symbols->pdbimport_size)

1 0

Eric Pouech : winedump: Added support for latest versions of Codeview (VC70 ).
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: b0a7c55cde0692526b9de85cab7a4522d22f365b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a7c55cde0692526b9de85ca… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 30 21:26:04 2008 +0200 winedump: Added support for latest versions of Codeview (VC70). --- include/wine/mscvpdb.h | 3 ++- tools/winedump/pdb.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 40174f9..306d893 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1810,7 +1810,8 @@ typedef struct _PDB_SYMBOLS DWORD unknown; DWORD hash1_file; DWORD hash2_file; - DWORD gsym_file; + WORD gsym_file; + WORD unknown1; DWORD module_size; DWORD offset_size; DWORD hash_size; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index a703369..1d9fce0 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -170,6 +170,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader) case 0: /* VC 4.0 */ case 19960307: /* VC 5.0 */ case 19970606: /* VC 6.0 */ + case 19990903: /* VC 7.0 */ break; default: printf("-Unknown symbol info version %d\n", symbols->version); @@ -180,7 +181,8 @@ static void pdb_dump_symbols(struct pdb_reader* reader) "\tunknown: %08x\n" "\thash1_file: %08x\n" "\thash2_file: %08x\n" - "\tgsym_file: %08x\n" + "\tgsym_file: %04x\n" + "\tunknown1: %04x\n" "\tmodule_size: %08x\n" "\toffset_size: %08x\n" "\thash_size: %08x\n" @@ -192,6 +194,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader) symbols->hash1_file, symbols->hash2_file, symbols->gsym_file, + symbols->unknown1, symbols->module_size, symbols->offset_size, symbols->hash_size,

1 0

Alexandre Julliard : exception.h: Preserve registers when calling RtlUnwind .
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 69c29866c19c41e65cc1a0f3f86739cff7690736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69c29866c19c41e65cc1a0f3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 11:07:53 2008 +0200 exception.h: Preserve registers when calling RtlUnwind. --- include/wine/exception.h | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index ad21866..590479c 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -233,7 +233,26 @@ static inline void DECLSPEC_NORETURN __wine_unwind_frame( EXCEPTION_RECORD *reco wine_frame->ExceptionCode = record->ExceptionCode; wine_frame->ExceptionRecord = wine_frame; +#if defined(__GNUC__) && defined(__i386__) + { + /* RtlUnwind clobbers registers on Windows */ + int dummy1, dummy2, dummy3; + __asm__ __volatile__("pushl %%ebp\n\t" + "pushl %%ebx\n\t" + "pushl $0\n\t" + "pushl %2\n\t" + "pushl $0\n\t" + "pushl %1\n\t" + "call *%0\n\t" + "popl %%ebx\n\t" + "popl %%ebp" + : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3) + : "0" (RtlUnwind), "1" (frame), "2" (record) + : "ecx", "edx", "memory" ); + } +#else RtlUnwind( frame, 0, record, 0 ); +#endif __wine_pop_frame( frame ); siglongjmp( wine_frame->jmp, 1 ); }

1 0

Alexandre Julliard : exception.h: Only push the exception frame after sigsetjmp.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: c20e8c90052ccbf4dec850d7cc28daed214870fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20e8c90052ccbf4dec850d7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 11:07:08 2008 +0200 exception.h: Only push the exception frame after sigsetjmp. Otherwise on Windows longjmp may want to mess with the exception frame. --- include/wine/exception.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 1dce217..ad21866 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -96,7 +96,6 @@ } else { \ __f.frame.Handler = __wine_exception_handler; \ __f.u.filter = (func); \ - __wine_push_frame( &__f.frame ); \ if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -108,7 +107,6 @@ break; \ } else { \ __f.frame.Handler = __wine_exception_handler_page_fault; \ - __wine_push_frame( &__f.frame ); \ if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -120,7 +118,6 @@ break; \ } else { \ __f.frame.Handler = __wine_exception_handler_all; \ - __wine_push_frame( &__f.frame ); \ if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -129,6 +126,7 @@ } while (0); \ break; \ } \ + __wine_push_frame( &__f.frame ); \ __first = 0; \ } \ } while (0);

1 0

Alexandre Julliard : ntdll: Make the exception handling functions inline.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 0ee44f5e203fb627392ac2ad03cf822d66da2037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee44f5e203fb627392ac2ad0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 10:57:54 2008 +0200 ntdll: Make the exception handling functions inline. --- dlls/ntdll/exception.c | 63 ------------------------- dlls/ntdll/ntdll.spec | 4 -- include/wine/exception.h | 113 +++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 103 insertions(+), 77 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index c039dd4..8aa906e 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -565,69 +565,6 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) /************************************************************* - * __wine_exception_handler (NTDLL.@) - * - * Exception handler for exception blocks declared in Wine code. - */ -DWORD __wine_exception_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) -{ - __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; - - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) - return ExceptionContinueSearch; - - if (wine_frame->u.filter == (void *)1) /* special hack for page faults */ - { - if (record->ExceptionCode != STATUS_ACCESS_VIOLATION) - return ExceptionContinueSearch; - } - else if (wine_frame->u.filter) - { - EXCEPTION_POINTERS ptrs; - ptrs.ExceptionRecord = record; - ptrs.ContextRecord = context; - switch(wine_frame->u.filter( &ptrs )) - { - case EXCEPTION_CONTINUE_SEARCH: - return ExceptionContinueSearch; - case EXCEPTION_CONTINUE_EXECUTION: - return ExceptionContinueExecution; - case EXCEPTION_EXECUTE_HANDLER: - break; - default: - MESSAGE( "Invalid return value from exception filter\n" ); - assert( FALSE ); - } - } - /* hack to make GetExceptionCode() work in handler */ - wine_frame->ExceptionCode = record->ExceptionCode; - wine_frame->ExceptionRecord = wine_frame; - - RtlUnwind( frame, 0, record, 0 ); - __wine_pop_frame( frame ); - siglongjmp( wine_frame->jmp, 1 ); -} - - -/************************************************************* - * __wine_finally_handler (NTDLL.@) - * - * Exception handler for try/finally blocks declared in Wine code. - */ -DWORD __wine_finally_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) -{ - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) - { - __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; - wine_frame->u.finally_func( FALSE ); - } - return ExceptionContinueSearch; -} - - -/************************************************************* * __wine_spec_unimplemented_stub * * ntdll-specific implementation to avoid depending on kernel functions. diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 23ee968..ed89cbd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1366,10 +1366,6 @@ # All functions must be prefixed with '__wine_' (for internal functions) # or 'wine_' (for user-visible functions) to avoid namespace conflicts. -# Exception handling -@ cdecl -norelay __wine_exception_handler(ptr ptr ptr ptr) -@ cdecl -norelay __wine_finally_handler(ptr ptr ptr ptr) - # Relays @ cdecl -norelay -i386 __wine_call_from_32_regs() @ cdecl -i386 __wine_enter_vm86(ptr) diff --git a/include/wine/exception.h b/include/wine/exception.h index fc90364..1dce217 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -23,6 +23,7 @@ #include <setjmp.h> #include <windef.h> +#include <winternl.h> #include <excpt.h> /* The following definitions allow using exceptions in Wine and Winelib code @@ -100,6 +101,30 @@ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { +/* convenience handler for page fault exceptions */ +#define __EXCEPT_PAGE_FAULT \ + } while(0); \ + __wine_pop_frame( &__f.frame ); \ + break; \ + } else { \ + __f.frame.Handler = __wine_exception_handler_page_fault; \ + __wine_push_frame( &__f.frame ); \ + if (sigsetjmp( __f.jmp, 0 )) { \ + const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ + do { + +/* convenience handler for all exception */ +#define __EXCEPT_ALL \ + } while(0); \ + __wine_pop_frame( &__f.frame ); \ + break; \ + } else { \ + __f.frame.Handler = __wine_exception_handler_all; \ + __wine_push_frame( &__f.frame ); \ + if (sigsetjmp( __f.jmp, 0 )) { \ + const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ + do { + #define __ENDTRY \ } while (0); \ break; \ @@ -125,11 +150,6 @@ typedef LONG (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); typedef void (CALLBACK *__WINE_FINALLY)(BOOL); -/* convenience handler for page fault exceptions */ -#define __EXCEPT_PAGE_FAULT __EXCEPT( (__WINE_FILTER)1 ) -/* convenience handler for all exception */ -#define __EXCEPT_ALL __EXCEPT( NULL ) - #define GetExceptionInformation() (__eptr) #define GetExceptionCode() (__eptr->ExceptionRecord->ExceptionCode) #define AbnormalTermination() (!__normal) @@ -150,11 +170,6 @@ typedef struct __tagWINE_FRAME const struct __tagWINE_FRAME *ExceptionRecord; } __WINE_FRAME; -extern DWORD __wine_exception_handler( PEXCEPTION_RECORD record, EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ); -extern DWORD __wine_finally_handler( PEXCEPTION_RECORD record, EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ); - #endif /* USE_COMPILER_EXCEPTIONS */ static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) @@ -209,4 +224,82 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTR extern void __wine_enter_vm86( CONTEXT *context ); +#ifndef USE_COMPILER_EXCEPTIONS + +static inline void DECLSPEC_NORETURN __wine_unwind_frame( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame ) +{ + __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; + + /* hack to make GetExceptionCode() work in handler */ + wine_frame->ExceptionCode = record->ExceptionCode; + wine_frame->ExceptionRecord = wine_frame; + + RtlUnwind( frame, 0, record, 0 ); + __wine_pop_frame( frame ); + siglongjmp( wine_frame->jmp, 1 ); +} + +static inline DWORD __wine_exception_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; + EXCEPTION_POINTERS ptrs; + + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + return ExceptionContinueSearch; + + ptrs.ExceptionRecord = record; + ptrs.ContextRecord = context; + switch(wine_frame->u.filter( &ptrs )) + { + case EXCEPTION_CONTINUE_SEARCH: + return ExceptionContinueSearch; + case EXCEPTION_CONTINUE_EXECUTION: + return ExceptionContinueExecution; + case EXCEPTION_EXECUTE_HANDLER: + break; + } + __wine_unwind_frame( record, frame ); +} + +static inline DWORD __wine_exception_handler_page_fault( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + return ExceptionContinueSearch; + if (record->ExceptionCode != STATUS_ACCESS_VIOLATION) + return ExceptionContinueSearch; + __wine_unwind_frame( record, frame ); +} + +static inline DWORD __wine_exception_handler_all( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + return ExceptionContinueSearch; + __wine_unwind_frame( record, frame ); +} + +static inline DWORD __wine_finally_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + { + __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; + wine_frame->u.finally_func( FALSE ); + } + return ExceptionContinueSearch; +} + +#endif /* USE_COMPILER_EXCEPTIONS */ + #endif /* __WINE_WINE_EXCEPTION_H */

1 0

Alexandre Julliard : winex11: Register IME classes only when needed.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 4a3730838965b2caffdaa5ca81c93ce9b016a8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3730838965b2caffdaa5ca8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 10:56:34 2008 +0200 winex11: Register IME classes only when needed. --- dlls/winex11.drv/ime.c | 68 +++++++++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 4 +- dlls/winex11.drv/x11drv_main.c | 5 ++- 3 files changed, 42 insertions(+), 35 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 5b5e8f2..c179410 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -123,6 +123,42 @@ static BOOL UnlockRealIMC(HIMC hIMC) return FALSE; } +static void IME_RegisterClasses(void) +{ + static int done; + WNDCLASSW wndClass; + + if (done) return; + done = 1; + + ZeroMemory(&wndClass, sizeof(WNDCLASSW)); + wndClass.style = CS_GLOBALCLASS | CS_IME | CS_HREDRAW | CS_VREDRAW; + wndClass.lpfnWndProc = IME_WindowProc; + wndClass.cbClsExtra = 0; + wndClass.cbWndExtra = 2 * sizeof(LONG); + wndClass.hInstance = x11drv_module; + wndClass.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); + wndClass.hIcon = LoadIconW(NULL, (LPWSTR)IDI_APPLICATION); + wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1); + wndClass.lpszMenuName = 0; + wndClass.lpszClassName = UI_CLASS_NAME; + + RegisterClassW(&wndClass); + + WM_MSIME_SERVICE = RegisterWindowMessageA("MSIMEService"); + WM_MSIME_RECONVERTOPTIONS = RegisterWindowMessageA("MSIMEReconvertOptions"); + WM_MSIME_MOUSE = RegisterWindowMessageA("MSIMEMouseOperation"); + WM_MSIME_RECONVERTREQUEST = RegisterWindowMessageA("MSIMEReconvertRequest"); + WM_MSIME_RECONVERT = RegisterWindowMessageA("MSIMEReconvert"); + WM_MSIME_QUERYPOSITION = RegisterWindowMessageA("MSIMEQueryPosition"); + WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); +} + +void IME_UnregisterClasses(void) +{ + UnregisterClassW(UI_CLASS_NAME, x11drv_module); +} + static HIMCC ImeCreateBlankCompStr(void) { HIMCC rc; @@ -520,6 +556,7 @@ BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) { TRACE("\n"); + IME_RegisterClasses(); lpIMEInfo->dwPrivateDataSize = sizeof (IMEPRIVATE); lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; @@ -907,37 +944,6 @@ DWORD WINAPI ImeGetImeMenuItems(HIMC hIMC, DWORD dwFlags, DWORD dwType, /* Interfaces to XIM and other parts of winex11drv */ -void IME_RegisterClasses(HINSTANCE hImeInst) -{ - WNDCLASSW wndClass; - ZeroMemory(&wndClass, sizeof(WNDCLASSW)); - wndClass.style = CS_GLOBALCLASS | CS_IME | CS_HREDRAW | CS_VREDRAW; - wndClass.lpfnWndProc = (WNDPROC) IME_WindowProc; - wndClass.cbClsExtra = 0; - wndClass.cbWndExtra = 2 * sizeof(LONG); - wndClass.hInstance = hImeInst; - wndClass.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); - wndClass.hIcon = LoadIconW(NULL, (LPWSTR)IDI_APPLICATION); - wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1); - wndClass.lpszMenuName = 0; - wndClass.lpszClassName = UI_CLASS_NAME; - - RegisterClassW(&wndClass); - - WM_MSIME_SERVICE = RegisterWindowMessageA("MSIMEService"); - WM_MSIME_RECONVERTOPTIONS = RegisterWindowMessageA("MSIMEReconvertOptions"); - WM_MSIME_MOUSE = RegisterWindowMessageA("MSIMEMouseOperation"); - WM_MSIME_RECONVERTREQUEST = RegisterWindowMessageA("MSIMEReconvertRequest"); - WM_MSIME_RECONVERT = RegisterWindowMessageA("MSIMEReconvert"); - WM_MSIME_QUERYPOSITION = RegisterWindowMessageA("MSIMEQueryPosition"); - WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); -} - -void IME_UnregisterClasses(HINSTANCE hImeInst) -{ - UnregisterClassW(UI_CLASS_NAME, hImeInst); -} - void IME_SetOpenStatus(BOOL fOpen) { LPINPUTCONTEXT lpIMC; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c543ef8..0033a1f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -274,8 +274,7 @@ extern Drawable get_glxdrawable(X11DRV_PDEVICE *physDev); extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap); /* IME support */ -extern void IME_RegisterClasses(HINSTANCE hImeInst); -extern void IME_UnregisterClasses(HINSTANCE hImeInst); +extern void IME_UnregisterClasses(void); extern void IME_SetOpenStatus(BOOL fOpen); extern LRESULT IME_SendMessageToSelectedHWND(UINT msg, WPARAM wParam, LPARAM lParam); extern INT IME_GetCursorPos(); @@ -555,6 +554,7 @@ extern int primary_monitor; extern int copy_default_colors; extern int alloc_system_colors; extern int xrender_error_base; +extern HMODULE x11drv_module; extern BYTE key_state_table[256]; extern POINT cursor_pos; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 9d64a85..3287fea 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -93,6 +93,7 @@ int copy_default_colors = 128; int alloc_system_colors = 256; DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; int xrender_error_base = 0; +HMODULE x11drv_module = 0; static x11drv_error_callback err_callback; /* current callback for error */ static Display *err_callback_display; /* display callback is set for */ @@ -582,6 +583,7 @@ static void process_detach(void) /* cleanup GDI */ X11DRV_GDI_Finalize(); + IME_UnregisterClasses(); DeleteCriticalSection( &X11DRV_CritSection ); TlsFree( thread_data_tls_index ); } @@ -674,15 +676,14 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: + x11drv_module = hinst; ret = process_attach(); - IME_RegisterClasses(hinst); break; case DLL_THREAD_DETACH: thread_detach(); break; case DLL_PROCESS_DETACH: process_detach(); - IME_UnregisterClasses(hinst); break; } return ret;

1 0

ByeongSik Jeon : user32: Post the WM_KEY{DOWN|UP} message whenWM_IME_KEY{DOWN|UP} message is generated by IME .
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 64e64d657c77ee015d234ef504d57cf702aed356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e64d657c77ee015d234ef50… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Wed Apr 30 20:50:19 2008 +0900 user32: Post the WM_KEY{DOWN|UP} message whenWM_IME_KEY{DOWN|UP} message is generated by IME. --- dlls/user32/defwnd.c | 12 ++++++- dlls/user32/tests/msg.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 9d72f9a..ba07ebb 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -843,11 +843,11 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam break; case WM_IME_KEYDOWN: - result = SendMessageA( hwnd, WM_KEYDOWN, wParam, lParam ); + result = PostMessageA( hwnd, WM_KEYDOWN, wParam, lParam ); break; case WM_IME_KEYUP: - result = SendMessageA( hwnd, WM_KEYUP, wParam, lParam ); + result = PostMessageA( hwnd, WM_KEYUP, wParam, lParam ); break; case WM_IME_STARTCOMPOSITION: @@ -993,6 +993,14 @@ LRESULT WINAPI DefWindowProcW( PostMessageW( hwnd, WM_CHAR, wParam, lParam ); break; + case WM_IME_KEYDOWN: + result = PostMessageW( hwnd, WM_KEYDOWN, wParam, lParam ); + break; + + case WM_IME_KEYUP: + result = PostMessageW( hwnd, WM_KEYUP, wParam, lParam ); + break; + case WM_IME_SETCONTEXT: { HWND hwndIME; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7f54e61..6d1acb1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5067,6 +5067,76 @@ static void test_combobox_messages(void) DestroyWindow(parent); } +/****************** WM_IME_KEYDOWN message test *******************/ + +static const struct message WmImeKeydownMsgSeq_0[] = +{ + { WM_IME_KEYDOWN, wparam, VK_RETURN }, + { WM_CHAR, wparam, 'A' }, + { 0 } +}; + +static const struct message WmImeKeydownMsgSeq_1[] = +{ + { WM_KEYDOWN, wparam, VK_RETURN }, + { WM_CHAR, wparam, VK_RETURN }, + { 0 } +}; + +static LRESULT WINAPI wmime_keydown_procA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct message msg; + + trace("wmime_keydown_procA: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = wparam|lparam; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(&msg); + + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +static void register_wmime_keydown_class(void) +{ + WNDCLASSA cls; + + ZeroMemory(&cls, sizeof(WNDCLASSA)); + cls.lpfnWndProc = wmime_keydown_procA; + cls.hInstance = GetModuleHandleA(0); + cls.lpszClassName = "wmime_keydown_class"; + if (!RegisterClassA(&cls)) assert(0); +} + +void test_wmime_keydown_message(void) +{ + HWND hwnd; + MSG msg; + + trace("Message sequences by WM_IME_KEYDOWN\n"); + + register_wmime_keydown_class(); + hwnd = CreateWindowExA(0, "wmime_keydown_class", NULL, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, + NULL, NULL, 0); + flush_events(); + flush_sequence(); + + SendMessage(hwnd, WM_IME_KEYDOWN, VK_RETURN, 0x1c0001); + SendMessage(hwnd, WM_CHAR, 'A', 1); + ok_sequence(WmImeKeydownMsgSeq_0, "WM_IME_KEYDOWN 0", FALSE); + + while ( PeekMessage(&msg, 0, 0, 0, PM_REMOVE) ) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + ok_sequence(WmImeKeydownMsgSeq_1, "WM_IME_KEYDOWN 1", FALSE); + + DestroyWindow(hwnd); +} + /************* painting message test ********************/ void dump_region(HRGN hrgn) @@ -10353,6 +10423,7 @@ START_TEST(msg) test_static_messages(); test_listbox_messages(); test_combobox_messages(); + test_wmime_keydown_message(); test_paint_messages(); test_interthread_messages(); test_message_conversion();

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLStyle.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 9483760b35355024f892d85af35d1a3034079b9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9483760b35355024f892d85af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 18:20:58 2008 +0200 mshtml: Added IDispatchEx support to HTMLStyle. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlstyle.c | 18 +++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 ++ 4 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 13319cc..9e68461 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -58,6 +58,7 @@ static REFIID tid_ids[] = { &DIID_DispHTMLElementCollection, &DIID_DispHTMLInputElement, &DIID_DispHTMLOptionElement, + &DIID_DispHTMLStyle, &DIID_DispHTMLUnknownElement, &DIID_DispHTMLWindow2, &IID_IHTMLCommentElement, @@ -74,6 +75,7 @@ static REFIID tid_ids[] = { &IID_IHTMLElementCollection, &IID_IHTMLInputElement, &IID_IHTMLOptionElement, + &IID_IHTMLStyle, &IID_IHTMLWindow2, &IID_IHTMLWindow3, &IID_IOmNavigator diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index a955a56..01aa391 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { + DispatchEx dispex; const IHTMLStyleVtbl *lpHTMLStyleVtbl; LONG ref; @@ -40,7 +41,7 @@ typedef struct { nsIDOMCSSStyleDeclaration *nsstyle; } HTMLStyle; -#define HTMLSTYLE(x) ((IHTMLStyle*) &(x)->lpHTMLStyleVtbl); +#define HTMLSTYLE(x) ((IHTMLStyle*) &(x)->lpHTMLStyleVtbl) static const WCHAR attrBackgroundColor[] = {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0}; @@ -213,6 +214,9 @@ static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, v }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = HTMLSTYLE(This); + }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = DISPATCHEX(&This->dispex); }else if(IsEqualGUID(&IID_IHTMLStyle, riid)) { TRACE("(%p)->(IID_IHTMLStyle %p)\n", This, ppv); *ppv = HTMLSTYLE(This); @@ -1841,6 +1845,16 @@ static const IHTMLStyleVtbl HTMLStyleVtbl = { HTMLStyle_toString }; +static dispex_static_data_t HTMLStyle_dispex = { + NULL, + DispHTMLStyle_tid, + NULL, + { + IHTMLStyle_tid, + 0 + } +}; + IHTMLStyle *HTMLStyle_Create(nsIDOMCSSStyleDeclaration *nsstyle) { HTMLStyle *ret = heap_alloc(sizeof(HTMLStyle)); @@ -1851,5 +1865,7 @@ IHTMLStyle *HTMLStyle_Create(nsIDOMCSSStyleDeclaration *nsstyle) nsIDOMCSSStyleDeclaration_AddRef(nsstyle); + init_dispex(&ret->dispex, (IUnknown*)HTMLSTYLE(ret), &HTMLStyle_dispex); + return HTMLSTYLE(ret); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 78f7e05..8ec0497 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -68,6 +68,7 @@ typedef enum { DispHTMLElementCollection_tid, DispHTMLInputElement_tid, DispHTMLOptionElement_tid, + DispHTMLStyle_tid, DispHTMLUnknownElement_tid, DispHTMLWindow2_tid, IHTMLCommentElement_tid, @@ -84,6 +85,7 @@ typedef enum { IHTMLElementCollection_tid, IHTMLInputElement_tid, IHTMLOptionElement_tid, + IHTMLStyle_tid, IHTMLWindow2_tid, IHTMLWindow3_tid, IOmNavigator_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f1c2548..1039ab5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1290,6 +1290,8 @@ static void test_default_style(IHTMLStyle *style) BSTR str; HRESULT hres; + test_disp((IUnknown*)style, &DIID_DispHTMLStyle); + str = (void*)0xdeadbeef; hres = IHTMLStyle_get_fontFamily(style, &str); ok(hres == S_OK, "get_fontFamily failed: %08x\n", hres);

1 0