December 2005 - Wine-commits

Aric Stewart : user: Make the edit control IME aware and implement inline editing.
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: 314f45dcdb866a813800b315aadfb1a72bb6a9ff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=314f45dcdb866a813800b31… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 19 18:17:51 2005 +0100 user: Make the edit control IME aware and implement inline editing. Makes for a significantly better user experience for CJK users. --- dlls/user/Makefile.in | 1 dlls/user/edit.c | 222 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 217 insertions(+), 6 deletions(-) diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in index 2999fd3..fea90ac 100644 --- a/dlls/user/Makefile.in +++ b/dlls/user/Makefile.in @@ -6,6 +6,7 @@ VPATH = @srcdir@ MODULE = user32.dll IMPORTLIB = libuser32.$(IMPLIBEXT) IMPORTS = gdi32 advapi32 kernel32 ntdll +DELAYIMPORTS = imm32 EXTRALIBS = $(LIBUNICODE) SPEC_SRCS16 = \ diff --git a/dlls/user/edit.c b/dlls/user/edit.c index bc67e43..05575bd 100644 --- a/dlls/user/edit.c +++ b/dlls/user/edit.c @@ -53,6 +53,7 @@ #include "winnt.h" #include "wownt32.h" #include "win.h" +#include "imm.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "wine/unicode.h" @@ -151,6 +152,11 @@ typedef struct or EM_SETHANDLE16 */ HLOCAL hloc32A; /* alias for ANSI control receiving EM_GETHANDLE or EM_SETHANDLE */ + /* + * IME Data + */ + UINT composition_len; /* lenght of composition, 0 == no composition */ + int composition_start; /* the character position for the composition */ } EDITSTATE; @@ -280,6 +286,7 @@ static void EDIT_WM_Timer(EDITSTATE *es) static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos); static void EDIT_UpdateText(EDITSTATE *es, LPRECT rc, BOOL bErase); static void EDIT_UpdateTextRegion(EDITSTATE *es, HRGN hrgn, BOOL bErase); +static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es); LRESULT WINAPI EditWndProcA(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); LRESULT WINAPI EditWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -993,6 +1000,52 @@ static LRESULT WINAPI EditWndProc_common } } break; + + + /* IME messages to make the edit control IME aware */ + case WM_IME_SETCONTEXT: + break; + + case WM_IME_STARTCOMPOSITION: + /* + * FIXME in IME: This message is not always sent like it should be + */ + if (es->selection_start != es->selection_end) + { + static const WCHAR empty_stringW[] = {0}; + EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + } + es->composition_start = es->selection_end; + es->composition_len = 0; + break; + + case WM_IME_COMPOSITION: + if (es->composition_len == 0) + { + if (es->selection_start != es->selection_end) + { + static const WCHAR empty_stringW[] = {0}; + EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + } + + es->composition_start = es->selection_end; + } + EDIT_ImeComposition(hwnd,lParam,es); + break; + + case WM_IME_ENDCOMPOSITION: + es->composition_len= 0; + break; + + case WM_IME_COMPOSITIONFULL: + break; + + case WM_IME_SELECT: + break; + + case WM_IME_CONTROL: + break; + default: result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode); break; @@ -2188,6 +2241,9 @@ static INT EDIT_PaintText(EDITSTATE *es, { COLORREF BkColor; COLORREF TextColor; + LOGFONTW underline_font; + HFONT hUnderline = 0; + HFONT old_font = 0; INT ret; INT li; INT BkMode; @@ -2199,9 +2255,20 @@ static INT EDIT_PaintText(EDITSTATE *es, BkColor = GetBkColor(dc); TextColor = GetTextColor(dc); if (rev) { - SetBkColor(dc, GetSysColor(COLOR_HIGHLIGHT)); - SetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT)); - SetBkMode( dc, OPAQUE); + if (es->composition_len == 0) + { + SetBkColor(dc, GetSysColor(COLOR_HIGHLIGHT)); + SetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT)); + SetBkMode( dc, OPAQUE); + } + else + { + HFONT current = GetCurrentObject(dc,OBJ_FONT); + GetObjectW(current,sizeof(LOGFONTW),&underline_font); + underline_font.lfUnderline = TRUE; + hUnderline = CreateFontIndirectW(&underline_font); + old_font = SelectObject(dc,hUnderline); + } } li = EDIT_EM_LineIndex(es, line); if (es->style & ES_MULTILINE) { @@ -2216,9 +2283,19 @@ static INT EDIT_PaintText(EDITSTATE *es, HeapFree(GetProcessHeap(), 0, text); } if (rev) { - SetBkColor(dc, BkColor); - SetTextColor(dc, TextColor); - SetBkMode( dc, BkMode); + if (es->composition_len == 0) + { + SetBkColor(dc, BkColor); + SetTextColor(dc, TextColor); + SetBkMode( dc, BkMode); + } + else + { + if (old_font) + SelectObject(dc,old_font); + if (hUnderline) + DeleteObject(hUnderline); + } } return ret; } @@ -5216,3 +5293,136 @@ static void EDIT_UpdateText(EDITSTATE *e } InvalidateRect(es->hwndSelf, rc, bErase); } + +/******************************************************************** + * + * The Following code is to handle inline editing from IMEs + */ + +static void EDIT_GetCompositionStr(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) +{ + DWORD dwBufLen; + LPWSTR lpCompStr = NULL; + HIMC hIMC; + LPSTR lpCompStrAttr = NULL; + DWORD dwBufLenAttr; + + if (!(hIMC = ImmGetContext(hwnd))) + return; + + dwBufLen = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0); + + if (dwBufLen <= 0) + { + ImmReleaseContext(hwnd, hIMC); + return; + } + + lpCompStr = HeapAlloc(GetProcessHeap(),0,dwBufLen); + if (!lpCompStr) + { + ERR("Unable to allocate IME CompositionString\n"); + ImmReleaseContext(hwnd,hIMC); + return; + } + + ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, dwBufLen); + lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; + + if (CompFlag & GCS_COMPATTR) + { + /* + * We do not use the attributes yet. it would tell us what characters + * are in transition and which are converted or decided upon + */ + dwBufLenAttr = ImmGetCompositionStringW(hIMC, GCS_COMPATTR, NULL, 0); + if (dwBufLenAttr) + { + dwBufLenAttr ++; + lpCompStrAttr = HeapAlloc(GetProcessHeap(),0,dwBufLenAttr); + if (!lpCompStrAttr) + { + ERR("Unable to allocate IME Attribute String\n"); + HeapFree(GetProcessHeap(),0,lpCompStr); + ImmReleaseContext(hwnd,hIMC); + return; + } + ImmGetCompositionStringW(hIMC,GCS_COMPATTR, lpCompStrAttr, + dwBufLenAttr); + lpCompStrAttr[dwBufLenAttr] = 0; + } + else + lpCompStrAttr = NULL; + } + + /* check for change in composition start */ + if (es->selection_end < es->composition_start) + es->composition_start = es->selection_end; + + /* replace existing selection string */ + es->selection_start = es->composition_start; + + if (es->composition_len > 0) + es->selection_end = es->composition_start + es->composition_len; + else + es->selection_end = es->selection_start; + + EDIT_EM_ReplaceSel(es, FALSE, lpCompStr, TRUE, TRUE); + es->composition_len = abs(es->composition_start - es->selection_end); + + es->selection_start = es->composition_start; + es->selection_end = es->selection_start + es->composition_len; + + HeapFree(GetProcessHeap(),0,lpCompStrAttr); + HeapFree(GetProcessHeap(),0,lpCompStr); + ImmReleaseContext(hwnd,hIMC); +} + +static void EDIT_GetResultStr(HWND hwnd, EDITSTATE *es) +{ + DWORD dwBufLen; + LPWSTR lpResultStr; + HIMC hIMC; + + if ( !(hIMC = ImmGetContext(hwnd))) + return; + + dwBufLen = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0); + if (dwBufLen <= 0) + { + ImmReleaseContext(hwnd, hIMC); + return; + } + + lpResultStr = HeapAlloc(GetProcessHeap(),0, dwBufLen); + if (!lpResultStr) + { + ERR("Unable to alloc buffer for IME string\n"); + ImmReleaseContext(hwnd, hIMC); + return; + } + + ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpResultStr, dwBufLen); + lpResultStr[dwBufLen/sizeof(WCHAR)] = 0; + + /* check for change in composition start */ + if (es->selection_end < es->composition_start) + es->composition_start = es->selection_end; + + es->selection_start = es->composition_start; + es->selection_end = es->composition_start + es->composition_len; + EDIT_EM_ReplaceSel(es, TRUE, lpResultStr, TRUE, TRUE); + es->composition_start = es->selection_end; + es->composition_len = 0; + + HeapFree(GetProcessHeap(),0,lpResultStr); + ImmReleaseContext(hwnd, hIMC); +} + +static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) +{ + if (CompFlag & GCS_RESULTSTR) + EDIT_GetResultStr(hwnd,es); + if (CompFlag & GCS_COMPSTR) + EDIT_GetCompositionStr(hwnd, CompFlag, es); +}

1 0

Magnus Olsen : msi: Fixed deformat_environment to not cut off string.
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: a06aa5e9961016c4d7461e705afe00f324c1f5a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a06aa5e9961016c4d7461e7… Author: Magnus Olsen <magnus(a)itkonsult-olsen.com> Date: Mon Dec 19 18:17:28 2005 +0100 msi: Fixed deformat_environment to not cut off string. --- dlls/msi/format.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 2730433..c280541 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -151,7 +151,7 @@ static LPWSTR deformat_environment(MSIPA { sz++; value = msi_alloc(sz * sizeof(WCHAR)); - GetEnvironmentVariableW(&key[1],value,sz); + GetEnvironmentVariableW(key,value,sz); *chunk = (strlenW(value)) * sizeof(WCHAR); } else

1 0

Eric Pouech : dbghelp: Implemented SymMatchString.
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: 17d93f9855380196c0d34f4fedea801aa6a153ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17d93f9855380196c0d34f4… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 18:16:35 2005 +0100 dbghelp: Implemented SymMatchString. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 32 ++++++++++++++++++++++++++------ include/dbghelp.h | 2 ++ 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 0b41cc6..9a0820e 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -81,7 +81,7 @@ @ stdcall SymLoadModule(long long str str long long) @ stdcall SymLoadModuleEx(long long str str double long ptr long) @ stdcall SymMatchFileName(str str ptr ptr) -@ stub SymMatchString +@ stdcall SymMatchString(str str long) @ stdcall SymRegisterCallback64(long ptr double) @ stdcall SymRegisterCallback(long ptr ptr) @ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index c47c04c..29e7d1f 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -81,11 +81,12 @@ static inline void re_append(char** mask * + 1 or more of preceding char * escapes \ on #, ?, [, ], *, +. don't work on - */ -static void compile_regex(const char* str, int numchar, regex_t* re) +static void compile_regex(const char* str, int numchar, regex_t* re, BOOL _case) { char* mask = HeapAlloc(GetProcessHeap(), 0, 1); unsigned len = 1; BOOL in_escape = FALSE; + unsigned flags = REG_NOSUB; re_append(&mask, &len, '^'); @@ -118,7 +119,8 @@ static void compile_regex(const char* st } re_append(&mask, &len, '$'); mask[len - 1] = '\0'; - if (regcomp(re, mask, REG_NOSUB)) FIXME("Couldn't compile %s\n", mask); + if (_case) flags |= REG_ICASE; + if (regcomp(re, mask, flags)) FIXME("Couldn't compile %s\n", mask); HeapFree(GetProcessHeap(), 0, mask); } @@ -733,7 +735,7 @@ static BOOL symt_enum_locals(struct proc BOOL ret; regex_t preg; - compile_regex(mask ? mask : "*", -1, &preg); + compile_regex(mask ? mask : "*", -1, &preg, FALSE); ret = symt_enum_locals_helper(pcs, module, &preg, EnumSymbolsCallback, UserContext, sym_info, &((struct symt_function*)sym)->vchildren); @@ -780,8 +782,8 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce if (bang == Mask) return FALSE; - compile_regex(Mask, bang - Mask, &mod_regex); - compile_regex(bang + 1, -1, &sym_regex); + compile_regex(Mask, bang - Mask, &mod_regex, FALSE); + compile_regex(bang + 1, -1, &sym_regex, FALSE); for (module = pcs->lmodules; module; module = module->next) { @@ -824,7 +826,7 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce Mask = bang + 1; } - compile_regex(Mask ? Mask : "*", -1, &sym_regex); + compile_regex(Mask ? Mask : "*", -1, &sym_regex, FALSE); symt_enum_module(module, &sym_regex, EnumSymbolsCallback, UserContext); regfree(&sym_regex); @@ -1288,3 +1290,21 @@ DWORD WINAPI UnDecorateSymbolName(LPCSTR return 0; return strlen(UnDecoratedName); } + +/****************************************************************** + * SymMatchString (DBGHELP.@) + * + */ +BOOL WINAPI SymMatchString(PCSTR string, PCSTR re, BOOL _case) +{ + regex_t preg; + BOOL ret; + + TRACE("%s %s %c\n", string, re, _case ? 'Y' : 'N'); + + compile_regex(re, -1, &preg, _case); + ret = regexec(&preg, string, 0, NULL, 0) == 0; + regfree(&preg); + return ret; +} + diff --git a/include/dbghelp.h b/include/dbghelp.h index 5cb25c7..c08e214 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -820,6 +820,8 @@ typedef BOOL (CALLBACK *PSYMBOL_REGISTER BOOL WINAPI SymRegisterCallback64(HANDLE, PSYMBOL_REGISTERED_CALLBACK64, ULONG64); BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL, PSTR, DWORD); DWORD WINAPI UnDecorateSymbolName(LPCSTR, LPSTR, DWORD, DWORD); +BOOL WINAPI SymMatchString(PCSTR string, PCSTR re, BOOL _case); +BOOL WINAPI SymMatchStringW(PCWSTR string, PCWSTR re, BOOL _case); /************************* * Source Files *

1 0

Eric Pouech : taskmgr: Fix viewing of debug channels.
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: 2bee5ab04ecdd7c757aa0cde0f1da07df2e1edfa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2bee5ab04ecdd7c757aa0cd… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 18:16:57 2005 +0100 taskmgr: Fix viewing of debug channels. Various internal cleanups. --- programs/taskmgr/dbgchnl.c | 31 +++++-------------------------- 1 files changed, 5 insertions(+), 26 deletions(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index b2335e4..a80aedf 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -180,14 +180,6 @@ static void* get_symbol(HANDLE hProcess, return ret; } -struct dll_option_layout -{ - void* next; - void* prev; - char* const* channels; - int nb_channels; -}; - typedef int (*EnumChannelCB)(HANDLE, void*, struct __wine_debug_channel*, void*); /****************************************************************** @@ -196,21 +188,13 @@ typedef int (*EnumChannelCB)(HANDLE, voi * Enumerates all known channels on process hProcess through callback * ce. */ -static int enum_channel(HANDLE hProcess, EnumChannelCB ce, void* user, unsigned unique) +static int enum_channel(HANDLE hProcess, EnumChannelCB ce, void* user) { struct __wine_debug_channel channel; int ret = 1; - unsigned int j; void* addr; - const char** cache = NULL; - unsigned num_cache, used_cache; if (!(addr = get_symbol(hProcess, "debug_options", "libwine.so"))) return -1; - if (unique) - cache = HeapAlloc(GetProcessHeap(), 0, (num_cache = 32) * sizeof(char*)); - else - num_cache = 0; - used_cache = 0; while (ret && addr && ReadProcessMemory(hProcess, addr, &channel, sizeof(channel), NULL)) { @@ -218,11 +202,6 @@ static int enum_channel(HANDLE hProcess, ret = ce(hProcess, addr, &channel, user); addr = (struct __wine_debug_channel *)addr + 1; } - if (unique) - { - for (j = 0; j < used_cache; j++) HeapFree(GetProcessHeap(), 0, (char*)cache[j]); - HeapFree(GetProcessHeap(), 0, cache); - } return 0; } @@ -232,10 +211,10 @@ static void DebugChannels_FillList(HWND ListView_DeleteAllItems(hChannelLV); - hProcess = OpenProcess(PROCESS_VM_OPERATION | PROCESS_VM_READ, FALSE, get_selected_pid()); + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_OPERATION | PROCESS_VM_READ, FALSE, get_selected_pid()); if (!hProcess) return; /* FIXME messagebox */ SendMessage(hChannelLV, WM_SETREDRAW, FALSE, 0); - enum_channel(hProcess, list_channel_CB, (void*)hChannelLV, TRUE); + enum_channel(hProcess, list_channel_CB, (void*)hChannelLV); SendMessage(hChannelLV, WM_SETREDRAW, TRUE, 0); CloseHandle(hProcess); } @@ -310,14 +289,14 @@ static void DebugChannels_OnNotify(HWND user.value = (val[0] == 'x') ? 0 : bitmask; user.mask = bitmask; user.done = user.notdone = 0; - enum_channel(hProcess, change_channel_CB, &user, FALSE); + enum_channel(hProcess, change_channel_CB, &user); if (user.done) { val[0] ^= ('x' ^ ' '); ListView_SetItemText(hChannelLV, lhti.iItem, lhti.iSubItem, val); } if (user.notdone) - printf("Some channel instance weren't correctly set\n"); + printf("Some channel instances weren't correctly set\n"); } CloseHandle(hProcess); }

1 0

Thomas Weidenmueller : setupapi: Fix comparing the group SIDs in IsUserAdmin.
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: 278bd29b8d48c0713aae5f48da13111791db11bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=278bd29b8d48c0713aae5f4… Author: Thomas Weidenmueller <w3seek(a)reactos.com> Date: Mon Dec 19 18:15:58 2005 +0100 setupapi: Fix comparing the group SIDs in IsUserAdmin. --- dlls/setupapi/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 5a04d7b..f7bd6cf 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -248,7 +248,7 @@ BOOL WINAPI IsUserAdmin(VOID) for (i = 0; i < lpGroups->GroupCount; i++) { - if (EqualSid(lpSid, &lpGroups->Groups[i].Sid)) + if (EqualSid(lpSid, lpGroups->Groups[i].Sid)) { bResult = TRUE; break;

1 0

Vitaliy Margolen : user: Fix LB_GETTEXT unmapping for A<->W.
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: a80d93c5e9f022a38ef41e4a1f96bf974f3392a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a80d93c5e9f022a38ef41e4… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon Dec 19 18:16:18 2005 +0100 user: Fix LB_GETTEXT unmapping for A<->W. --- dlls/user/winproc.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index ff5ceaf..7cfc077 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -956,8 +956,9 @@ LRESULT WINPROC_UnmapMsg32ATo32W( HWND h if ( WINPROC_TestLBForStr( hwnd )) { LPARAM *ptr = (LPARAM *)lParam - 1; - result = WideCharToMultiByte( CP_ACP, 0, (LPWSTR)lParam, -1, - (LPSTR)*ptr, 0x7fffffff, NULL, NULL ) - 1; + if (result >= 0) + result = WideCharToMultiByte( CP_ACP, 0, (LPWSTR)lParam, -1, + (LPSTR)*ptr, 0x7fffffff, NULL, NULL ) - 1; HeapFree( GetProcessHeap(), 0, ptr ); } break; @@ -1224,7 +1225,8 @@ static LRESULT WINPROC_UnmapMsg32WTo32A( if ( WINPROC_TestLBForStr( hwnd )) { LPARAM *ptr = (LPARAM *)lParam - 1; - result = MultiByteToWideChar( CP_ACP, 0, (LPSTR)lParam, -1, (LPWSTR)*ptr, 0x7fffffff ) - 1; + if (result >= 0) + result = MultiByteToWideChar( CP_ACP, 0, (LPSTR)lParam, -1, (LPWSTR)*ptr, 0x7fffffff ) - 1; HeapFree( GetProcessHeap(), 0, ptr ); } break;

1 0

Huw Davies : opengl: Add support for rendering on bitmaps.
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: 412cb77d511fc370932e21e7945d6f902c6992fc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=412cb77d511fc370932e21e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 19 17:45:13 2005 +0100 opengl: Add support for rendering on bitmaps. --- dlls/opengl32/wgl.c | 24 ++++++++++++++++-------- dlls/x11drv/init.c | 1 + dlls/x11drv/opengl.c | 6 ------ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 30ff1d0..55e8242 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -43,10 +43,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl); #define X11DRV_ESCAPE 6789 enum x11drv_escape_codes { - X11DRV_GET_DISPLAY, /* get X11 display for a DC */ - X11DRV_GET_DRAWABLE, /* get current drawable for a DC */ - X11DRV_GET_FONT, /* get current X font for a DC */ - X11DRV_SET_DRAWABLE, /* set current drawable for a DC */ + X11DRV_GET_DISPLAY, /* get X11 display for a DC */ + X11DRV_GET_DRAWABLE, /* get current drawable for a DC */ + X11DRV_GET_FONT, /* get current X font for a DC */ + X11DRV_SET_DRAWABLE, /* set current drawable for a DC */ + X11DRV_START_EXPOSURES, /* start graphics exposures */ + X11DRV_END_EXPOSURES, /* end graphics exposures */ + X11DRV_GET_DCE, /* get the DCE pointer */ + X11DRV_SET_DCE, /* set the DCE pointer */ + X11DRV_GET_GLX_DRAWABLE /* get current glx drawable for a DC */ }; void (*wine_tsx11_lock_ptr)(void) = NULL; @@ -121,11 +126,11 @@ inline static Display *get_display( HDC } -/* retrieve the X drawable to use on a given DC */ +/* retrieve the GLX drawable to use on a given DC */ inline static Drawable get_drawable( HDC hdc ) { - Drawable drawable; - enum x11drv_escape_codes escape = X11DRV_GET_DRAWABLE; + GLXDrawable drawable; + enum x11drv_escape_codes escape = X11DRV_GET_GLX_DRAWABLE; if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, sizeof(drawable), (LPSTR)&drawable )) drawable = 0; @@ -144,7 +149,7 @@ inline static HDC get_hdc_from_Drawable( return NULL; } -/* retrieve the X drawable to use on a given DC */ +/* retrieve the X font to use on a given DC */ inline static Font get_font( HDC hdc ) { Font font; @@ -469,6 +474,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR lp BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) { BOOL ret; + DWORD type = GetObjectType(hdc); TRACE("(%p,%p)\n", hdc, hglrc); @@ -523,6 +529,8 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, } TRACE(" make current for dis %p, drawable %p, ctx %p\n", ctx->display, (void*) drawable, ctx->ctx); ret = glXMakeCurrent(ctx->display, drawable, ctx->ctx); + if(ret && type == OBJ_MEMDC) + glDrawBuffer(GL_FRONT_LEFT); } LEAVE_GL(); TRACE(" returning %s\n", (ret ? "True" : "False")); diff --git a/dlls/x11drv/init.c b/dlls/x11drv/init.c index 69cfa02..c2729b4 100644 --- a/dlls/x11drv/init.c +++ b/dlls/x11drv/init.c @@ -415,6 +415,7 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *ph if(!physDev->bitmap->glxpixmap) physDev->bitmap->glxpixmap = create_glxpixmap(physDev); + X11DRV_CoerceDIBSection(physDev, DIB_Status_GdiMod, FALSE); *(Drawable *)out_data = physDev->bitmap->glxpixmap; } else diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index c119e7c..a2a591e 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -199,12 +199,6 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV dump_PIXELFORMATDESCRIPTOR((const PIXELFORMATDESCRIPTOR *) ppfd); } - if (ppfd->dwFlags & PFD_DRAW_TO_BITMAP) { - ERR("Flag not supported !\n"); - /* Should SetError here... */ - return 0; - } - /* Now, build the request to GLX */ if (ppfd->iPixelType == PFD_TYPE_COLORINDEX) {

1 0

Alexandre Julliard : ole32: Revert exception handler change.
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: dbc14a5cb58db344b7472ca81d497f579795ed2e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dbc14a5cb58db344b7472ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 17:44:56 2005 +0100 ole32: Revert exception handler change. The handler does the opposite of normal page fault handlers. --- dlls/ole32/rpc.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 8c34aa8..c57bab5 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -110,6 +110,13 @@ struct dispatch_params HRESULT hr; /* hresult (out) */ }; +static WINE_EXCEPTION_FILTER(ole_filter) +{ + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) + return EXCEPTION_CONTINUE_SEARCH; + return EXCEPTION_EXECUTE_HANDLER; +} + static HRESULT WINAPI RpcChannelBuffer_QueryInterface(LPRPCCHANNELBUFFER iface, REFIID riid, LPVOID *ppv) { *ppv = NULL; @@ -446,7 +453,7 @@ void RPC_ExecuteCall(struct dispatch_par { params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan); } - __EXCEPT_PAGE_FAULT + __EXCEPT(ole_filter) { params->hr = GetExceptionCode(); }

1 0

Rein Klazes : user: Fix hrgn leaks in win.c test.
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: d076748e22e7c7d4932612b41f8fa954ba27fb3d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d076748e22e7c7d4932612b… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Dec 19 17:43:34 2005 +0100 user: Fix hrgn leaks in win.c test. --- dlls/user/tests/win.c | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index 6cef7a9..64525c4 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -2769,6 +2769,9 @@ static void test_scrollvalidate( HWND pa * hwnd2 because of the WS_CLIPSIBLING style */ HWND hwnd1, hwnd2; + clipping = CreateRectRgn(0,0,0,0); + tmprgn = CreateRectRgn(0,0,0,0); + exprgn = CreateRectRgn(0,0,0,0); hwnd2 = CreateWindowExA(0, "static", NULL, WS_CHILD| WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER , 75, 30, 100, 100, parent, 0, 0, NULL); @@ -2779,17 +2782,17 @@ static void test_scrollvalidate( HWND pa UpdateWindow( parent); GetClientRect( hwnd1, &rc); cliprc=rc; - clipping = CreateRectRgn( 10, 10, 90, 90); + SetRectRgn( clipping, 10, 10, 90, 90); hdc = GetDC( hwnd1); /* for a visual touch */ TextOut( hdc, 0,10, "0123456789", 10); ScrollDC( hdc, -10, -5, &rc, &cliprc, hrgn, &rcu); if (winetest_debug > 0) dump_region(hrgn); /* create a region with what is expected */ - exprgn = CreateRectRgn( 39,0,49,74); - tmprgn = CreateRectRgn( 88,79,98,93); + SetRectRgn( exprgn, 39,0,49,74); + SetRectRgn( tmprgn, 88,79,98,93); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); - tmprgn = CreateRectRgn( 0,93,98,98); + SetRectRgn( tmprgn, 0,93,98,98); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); ok( EqualRgn( exprgn, hrgn), "wrong update region\n"); trace("update rect is %ld,%ld - %ld,%ld\n", @@ -2799,10 +2802,10 @@ static void test_scrollvalidate( HWND pa ScrollDC( hdc, -10, -5, &rc, &cliprc, hrgn, &rcu); if (winetest_debug > 0) dump_region(hrgn); /* create a region with what is expected */ - exprgn = CreateRectRgn( 39,10,49,74); - tmprgn = CreateRectRgn( 80,79,90,85); + SetRectRgn( exprgn, 39,10,49,74); + SetRectRgn( tmprgn, 80,79,90,85); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); - tmprgn = CreateRectRgn( 10,85,90,90); + SetRectRgn( tmprgn, 10,85,90,90); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); ok( EqualRgn( exprgn, hrgn), "wrong update region\n"); trace("update rect is %ld,%ld - %ld,%ld\n", @@ -2819,8 +2822,8 @@ static void test_scrollvalidate( HWND pa ScrollWindowEx( hwnd1, -10, 0, &rc, &cliprc, hrgn, &rcu, SW_SCROLLCHILDREN | SW_INVALIDATE); if (winetest_debug > 0) dump_region(hrgn); - exprgn = CreateRectRgn( 88,0,98,98); - tmprgn = CreateRectRgn( 30, 40, 50, 50); + SetRectRgn( exprgn, 88,0,98,98); + SetRectRgn( tmprgn, 30, 40, 50, 50); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); ok( EqualRgn( exprgn, hrgn), "wrong update region\n"); @@ -2841,8 +2844,8 @@ static void test_scrollvalidate( HWND pa ScrollWindowEx( hwnd1, -10, -10, &rc, &cliprc, hrgn, &rcu, SW_SCROLLCHILDREN | SW_INVALIDATE); if (winetest_debug > 0) dump_region(hrgn); - exprgn = CreateRectRgn( 88,0,98,88); - tmprgn = CreateRectRgn( 0,88,98,98); + SetRectRgn( exprgn, 88,0,98,88); + SetRectRgn( tmprgn, 0,88,98,98); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); ok( EqualRgn( exprgn, hrgn), "wrong update region\n"); @@ -2870,12 +2873,12 @@ static void test_scrollvalidate( HWND pa ValidateRect( hwnd2, NULL); ScrollWindowEx( hwnd1, -10, -10, &rc, &cliprc, hrgn, &rcu, SW_INVALIDATE); if (winetest_debug > 0) dump_region(hrgn); - exprgn = CreateRectRgn( 88,0,98,20); - tmprgn = CreateRectRgn( 20,20,98,30); + SetRectRgn( exprgn, 88,0,98,20); + SetRectRgn( tmprgn, 20,20,98,30); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); - tmprgn = CreateRectRgn( 20,30,30,88); + SetRectRgn( tmprgn, 20,30,30,88); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); - tmprgn = CreateRectRgn( 0,88,30,98); + SetRectRgn( tmprgn, 0,88,30,98); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); ok( EqualRgn( exprgn, hrgn), "wrong update region\n"); @@ -2932,6 +2935,8 @@ static void test_scrolldc( HWND parent) COLORREF colr; hrgn = CreateRectRgn(0,0,0,0); + tmprgn = CreateRectRgn(0,0,0,0); + exprgn = CreateRectRgn(0,0,0,0); hwnd1 = CreateWindowExA(0, "static", NULL, WS_CHILD| WS_VISIBLE, @@ -2964,8 +2969,8 @@ static void test_scrolldc( HWND parent) ok(EqualRect(&rcu, &rc2), "rects do not match (%ld,%ld-%ld,%ld) / (%ld,%ld-%ld,%ld)\n", rcu.left, rcu.top, rcu.right, rcu.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); - exprgn = CreateRectRgn(0, 0, 20, 80); - tmprgn = CreateRectRgn(0, 80, 100, 100); + SetRectRgn( exprgn, 0, 0, 20, 80); + SetRectRgn( tmprgn, 0, 80, 100, 100); CombineRgn(exprgn, exprgn, tmprgn, RGN_OR); if (winetest_debug > 0) dump_region(exprgn); ok(EqualRgn(exprgn, hrgn), "wrong update region\n");

1 0

Dmitry Timoshkov : comctl32: Add a test for the initial tooltip window style settings,
by Alexandre Julliard 19 Dec '05

19 Dec '05

Module: wine Branch: refs/heads/master Commit: f15abf08ac0f9b04b55b23ef556e4cbbf3f6f984 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f15abf08ac0f9b04b55b23e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Dec 19 17:43:10 2005 +0100 comctl32: Add a test for the initial tooltip window style settings, make it pass under Wine. --- dlls/comctl32/tests/.gitignore | 1 + dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/tooltips.c | 68 +++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 2 + 4 files changed, 71 insertions(+), 1 deletions(-) create mode 100644 dlls/comctl32/tests/tooltips.c diff --git a/dlls/comctl32/tests/.gitignore b/dlls/comctl32/tests/.gitignore index 207da2c..5ed31bc 100644 --- a/dlls/comctl32/tests/.gitignore +++ b/dlls/comctl32/tests/.gitignore @@ -9,5 +9,6 @@ subclass.ok tab.ok testlist.c toolbar.ok +tooltips.ok treeview.ok updown.ok diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index fc9881d..1528964 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -15,6 +15,7 @@ CTESTS = \ subclass.c \ tab.c \ toolbar.c \ + tooltips.c \ treeview.c \ updown.c diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c new file mode 100644 index 0000000..ee935b4 --- /dev/null +++ b/dlls/comctl32/tests/tooltips.c @@ -0,0 +1,68 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <assert.h> +#include <windows.h> +#include <commctrl.h> + +#include "wine/test.h" + +static void test_create_tooltip(void) +{ + HWND parent, hwnd; + DWORD style, exp_style; + + parent = CreateWindowEx(0, "static", NULL, WS_POPUP, + 0, 0, 0, 0, + NULL, NULL, NULL, 0); + assert(parent); + + hwnd = CreateWindowEx(0, TOOLTIPS_CLASS, NULL, 0x7fffffff | WS_POPUP, + 10, 10, 300, 100, + parent, NULL, NULL, 0); + assert(hwnd); + + style = GetWindowLong(hwnd, GWL_STYLE); + trace("style = %08lx\n", style); + exp_style = 0x7fffffff | WS_POPUP; + exp_style &= ~(WS_CHILD | WS_MAXIMIZE | WS_BORDER | WS_DLGFRAME); + ok(style == exp_style,"wrong style %08lx/%08lx\n", style, exp_style); + + DestroyWindow(hwnd); + + hwnd = CreateWindowEx(0, TOOLTIPS_CLASS, NULL, 0, + 10, 10, 300, 100, + parent, NULL, NULL, 0); + assert(hwnd); + + style = GetWindowLong(hwnd, GWL_STYLE); + trace("style = %08lx\n", style); + ok(style == (WS_POPUP | WS_CLIPSIBLINGS | WS_BORDER), + "wrong style %08lx\n", style); + + DestroyWindow(hwnd); + + DestroyWindow(parent); +} + +START_TEST(tooltips) +{ + InitCommonControls(); + + test_create_tooltip(); +} diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 39d981b..c16fd7e 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -2400,7 +2400,7 @@ TOOLTIPS_NCCreate (HWND hwnd, WPARAM wPa DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); DWORD dwExStyle = GetWindowLongW (hwnd, GWL_EXSTYLE); - dwStyle &= 0x0000FFFF; + dwStyle &= ~(WS_CHILD | /*WS_MAXIMIZE |*/ WS_BORDER | WS_DLGFRAME); dwStyle |= (WS_POPUP | WS_BORDER | WS_CLIPSIBLINGS); /* WS_BORDER only draws a border round the window rect, not the

1 0