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

Kusanagi Kouichi : winex11: Generate WM_IME_ENDCOMPOSITION when composition string is canceled.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 4baf6e7edca4a377efdd38a3ab966ea4835b1378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4baf6e7edca4a377efdd38a3a… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Thu Apr 24 08:29:54 2008 +0900 winex11: Generate WM_IME_ENDCOMPOSITION when composition string is canceled. --- dlls/winex11.drv/ime.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c3e5ccf..6614213 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -769,25 +769,19 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) case CPS_REVERT: FIXME("CPS_REVERT\n"); break; case CPS_CANCEL: { - BOOL send; - LPCOMPOSITIONSTRING lpCompStr; + LPIMEPRIVATE myPrivate; TRACE("CPS_CANCEL\n"); X11DRV_ForceXIMReset(lpIMC->hWnd); - lpCompStr = ImmLockIMCC(lpIMC->hCompStr); - send = (lpCompStr->dwCompStrLen != 0); - ImmUnlockIMCC(lpIMC->hCompStr); - - if (send) + myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + if (myPrivate->bInComposition) { - HIMCC newCompStr; - newCompStr = updateCompStr(lpIMC->hCompStr, NULL, 0); - ImmDestroyIMCC(lpIMC->hCompStr); - lpIMC->hCompStr = newCompStr; - GenerateIMEMessage(hIMC, WM_IME_COMPOSITION, 0, GCS_COMPSTR); + GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); + myPrivate->bInComposition = FALSE; } + ImmUnlockIMCC(lpIMC->hPrivate); bRet = TRUE; } break;

1 0

Alexandre Julliard : Make.rules: Move the all: target before the implicit rules to avoid confusing FreeBSD make.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: d8e3d181d18cfdfb681e1c3b05b885d07fc04941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8e3d181d18cfdfb681e1c3b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 12:46:43 2008 +0200 Make.rules: Move the all: target before the implicit rules to avoid confusing FreeBSD make. --- Make.rules.in | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 84842d4..76a4d42 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -125,6 +125,15 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_ RCOBJS = $(RC_SRCS:.rc=.res.o) LINTS = $(C_SRCS:.c=.ln) +# 'all' target first in case the enclosing Makefile didn't define any target + +all: + +filter: dummy + @$(TOPSRCDIR)/tools/winapi/make_filter --make $(MAKE) all + +.PHONY: all filter + # Implicit rules .SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c @MAINTAINER_MODE@ .sfd .ttf .svg .ico @@ -193,15 +202,6 @@ LINTS = $(C_SRCS:.c=.ln) $(ICOTOOL) -c -o $@ $*-16.png $*-32.png $*-48.png $(RM) $*-16.png $*-32.png $*-48.png -# 'all' target first in case the enclosing Makefile didn't define any target - -all: - -filter: dummy - @$(TOPSRCDIR)/tools/winapi/make_filter --make $(MAKE) all - -.PHONY: all filter - # Rules for IDL files dlldata.c: $(WIDL) Makefile.in

1 0

Lei Zhang : winex11: control + enter should generate '\n' instead of '\r'.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: a442d2675e20ba1a0d5b8ea3ebded22673fa8f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a442d2675e20ba1a0d5b8ea3e… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 23 23:57:26 2008 -0700 winex11: control + enter should generate '\n' instead of '\r'. --- dlls/winex11.drv/keyboard.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 5d48ce7..40c3e55 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2566,6 +2566,12 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, lpChar[0] = 0; ret = 0; } + else if((lpKeyState[VK_CONTROL] & 0x80) /* Control is pressed */ + && (keysym == XK_Return || keysym == XK_KP_Enter)) + { + lpChar[0] = '\n'; + ret = 1; + } /* Hack to detect an XLookupString hard-coded to Latin1 */ if (ret == 1 && keysym >= 0x00a0 && keysym <= 0x00ff && (BYTE)lpChar[0] == keysym)

1 0

Roderick Colenbrander : wgl: Add a wine specific WGL extension which allows you to change the pixel format multiple times .
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: f0307d93664b67d8ccff8cc2ad4a44773cab30df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0307d93664b67d8ccff8cc2a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Apr 22 22:15:15 2008 +0000 wgl: Add a wine specific WGL extension which allows you to change the pixel format multiple times. --- dlls/gdi32/driver.c | 1 + dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/opengl.c | 22 ++++++++++++++++ dlls/wined3d/context.c | 18 +++++++++++-- dlls/wined3d/directx.c | 4 +++ dlls/winex11.drv/opengl.c | 49 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/window.c | 6 +++- dlls/winex11.drv/winex11.drv.spec | 1 + include/wine/wined3d_gl.h | 6 ++++- 9 files changed, 102 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0307d93664b67d8ccff8…

1 0

Roderick Colenbrander : wgl: Put the core functionality of X11DRV_SetPixelFormat in a separate function .
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 2823e1d2191eb80b724a8bbf26893f3213fd129f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2823e1d2191eb80b724a8bbf2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Apr 23 20:40:43 2008 +0000 wgl: Put the core functionality of X11DRV_SetPixelFormat in a separate function. This is needed for a new X11DRV_SetPixelFormatWINE function which allows you to change the pixel format multiple times. --- dlls/winex11.drv/opengl.c | 102 ++++++++++++++++++++++++-------------------- 1 files changed, 56 insertions(+), 46 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0338d06..5ed354b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1441,41 +1441,29 @@ int X11DRV_GetPixelFormat(X11DRV_PDEVICE *physDev) { return physDev->current_pf; } -/** - * X11DRV_SetPixelFormat - * - * Set the pixel-format id used by this DC - */ -BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev, +/* This function is the core of X11DRV_SetPixelFormat and X11DRV_SetPixelFormatWINE. + * Both functions are the same except that X11DRV_SetPixelFormatWINE allows you to + * set the pixel format multiple times. */ +static BOOL internal_SetPixelFormat(X11DRV_PDEVICE *physDev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) { - WineGLPixelFormat *fmt; - int value; - HWND hwnd; - - TRACE("(%p,%d,%p)\n", physDev, iPixelFormat, ppfd); - - if (!has_opengl()) { - ERR("No libGL on this box - disabling OpenGL support !\n"); - return FALSE; - } - - /* SetPixelFormat is not allowed on the X root_window e.g. GetDC(0) */ - if(get_glxdrawable(physDev) == root_window) - { - ERR("Invalid operation on root_window\n"); - return FALSE; - } + WineGLPixelFormat *fmt; + int value; + HWND hwnd; - /* Check if iPixelFormat is in our list of supported formats to see if it is supported. */ - fmt = ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, FALSE /* Offscreen */, &value); - if(!fmt) { - ERR("Invalid iPixelFormat: %d\n", iPixelFormat); - return FALSE; - } + /* SetPixelFormat is not allowed on the X root_window e.g. GetDC(0) */ + if(get_glxdrawable(physDev) == root_window) + { + ERR("Invalid operation on root_window\n"); + return FALSE; + } - if(physDev->current_pf) /* cannot change it if already set */ - return (physDev->current_pf == iPixelFormat); + /* Check if iPixelFormat is in our list of supported formats to see if it is supported. */ + fmt = ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, FALSE /* Offscreen */, &value); + if(!fmt) { + ERR("Invalid iPixelFormat: %d\n", iPixelFormat); + return FALSE; + } pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); @@ -1507,24 +1495,46 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev, FIXME("called on a non-window, non-bitmap object?\n"); } - physDev->current_pf = iPixelFormat; + physDev->current_pf = iPixelFormat; - if (TRACE_ON(wgl)) { - int gl_test = 0; + if (TRACE_ON(wgl)) { + int gl_test = 0; - gl_test = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_FBCONFIG_ID, &value); - if (gl_test) { - ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); - } else { - TRACE(" FBConfig have :\n"); - TRACE(" - FBCONFIG_ID 0x%x\n", value); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &value); - TRACE(" - VISUAL_ID 0x%x\n", value); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); - TRACE(" - DRAWABLE_TYPE 0x%x\n", value); + gl_test = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_FBCONFIG_ID, &value); + if (gl_test) { + ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); + } else { + TRACE(" FBConfig have :\n"); + TRACE(" - FBCONFIG_ID 0x%x\n", value); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &value); + TRACE(" - VISUAL_ID 0x%x\n", value); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); + TRACE(" - DRAWABLE_TYPE 0x%x\n", value); + } } - } - return TRUE; + return TRUE; +} + + +/** + * X11DRV_SetPixelFormat + * + * Set the pixel-format id used by this DC + */ +BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev, + int iPixelFormat, + const PIXELFORMATDESCRIPTOR *ppfd) { + TRACE("(%p,%d,%p)\n", physDev, iPixelFormat, ppfd); + + if (!has_opengl()) { + ERR("No libGL on this box - disabling OpenGL support !\n"); + return FALSE; + } + + if(physDev->current_pf) /* cannot change it if already set */ + return (physDev->current_pf == iPixelFormat); + + return internal_SetPixelFormat(physDev, iPixelFormat, ppfd); } /**

1 0

Eric Pouech : winhelp: Allow links inside popups to work properly.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: bfa999eaf677f851e3c9a57a489fca2e18cb3fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa999eaf677f851e3c9a57a4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 23 21:38:42 2008 +0200 winhelp: Allow links inside popups to work properly. --- programs/winhelp/winhelp.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index e67000b..047a89e 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -771,28 +771,28 @@ static HLPFILE_LINK* WINHELP_FindLink(WINHELP_WINDOW* win, LPARAM pos) * WINHELP_HandleTextMouse * */ -static BOOL WINHELP_HandleTextMouse(WINHELP_WINDOW* win, const MSGFILTER* msgf) +static BOOL WINHELP_HandleTextMouse(WINHELP_WINDOW* win, UINT msg, LPARAM lParam) { HLPFILE* hlpfile; HLPFILE_LINK* link; BOOL ret = FALSE; - switch (msgf->msg) + switch (msg) { case WM_MOUSEMOVE: - if (WINHELP_FindLink(win, msgf->lParam)) + if (WINHELP_FindLink(win, lParam)) SetCursor(win->hHandCur); else SetCursor(LoadCursor(0, IDC_ARROW)); break; case WM_LBUTTONDOWN: - if ((win->current_link = WINHELP_FindLink(win, msgf->lParam))) + if ((win->current_link = WINHELP_FindLink(win, lParam))) ret = TRUE; break; case WM_LBUTTONUP: - if ((link = WINHELP_FindLink(win, msgf->lParam)) && link == win->current_link) + if ((link = WINHELP_FindLink(win, lParam)) && link == win->current_link) { HLPFILE_WINDOWINFO* wi; @@ -816,7 +816,7 @@ static BOOL WINHELP_HandleTextMouse(WINHELP_WINDOW* win, const MSGFILTER* msgf) case hlp_link_popup: if ((hlpfile = WINHELP_LookupHelpFile(link->string))) WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, link->hash, - WINHELP_GetPopupWindowInfo(hlpfile, win, msgf->lParam), + WINHELP_GetPopupWindowInfo(hlpfile, win, lParam), SW_NORMAL); break; case hlp_link_macro: @@ -955,8 +955,13 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, switch (((NMHDR*)lParam)->code) { case EN_MSGFILTER: - return WINHELP_HandleTextMouse((WINHELP_WINDOW*)GetWindowLong(hWnd, 0), - (const MSGFILTER*)lParam); + { + const MSGFILTER* msgf = (const MSGFILTER*)lParam; + return WINHELP_HandleTextMouse((WINHELP_WINDOW*)GetWindowLong(hWnd, 0), + msgf->msg, msgf->lParam); + } + break; + case EN_REQUESTRESIZE: rc = ((REQRESIZE*)lParam)->rc; win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); @@ -2001,13 +2006,18 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam break; case WM_COMMAND: if (use_richedit) break; - /* fall through */ + goto doit; + case WM_LBUTTONUP: case WM_LBUTTONDOWN: + if (WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam) && msg == WM_LBUTTONDOWN) + return FALSE; + /* fall through */ case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: case WM_NCLBUTTONDOWN: case WM_NCMBUTTONDOWN: case WM_NCRBUTTONDOWN: +doit: hPopup = Globals.active_popup->hMainWnd; Globals.active_popup = NULL; DestroyWindow(hPopup);

1 0

Eric Pouech : winhelp: Setup a better font size for the richedit rendering.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 56a41706c7c533b8f4a4f1652d58091fb6358b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a41706c7c533b8f4a4f1652… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 23 21:38:48 2008 +0200 winhelp: Setup a better font size for the richedit rendering. --- programs/winhelp/hlpfile.c | 8 +++++--- programs/winhelp/winhelp.c | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index aae1385..78a9643 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1113,13 +1113,15 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE case 0x80: { unsigned font = GET_USHORT(format, 1); + unsigned fs; attributes.wFont = font; WINE_TRACE("Changing font to %d\n", attributes.wFont); format += 3; + fs = (4 * page->file->fonts[font].LogFont.lfHeight - 3) / 5; /* FIXME: missing at least colors, also bold attribute looses information */ + sprintf(tmp, "\\f%d\\cf%d\\fs%d%s%s%s%s", - font, font + 2, - -2 * page->file->fonts[font].LogFont.lfHeight, + font, font + 2, fs, page->file->fonts[font].LogFont.lfWeight > 400 ? "\\b" : "\\b0", page->file->fonts[font].LogFont.lfItalic ? "\\i" : "\\i0", page->file->fonts[font].LogFont.lfUnderline ? "\\ul" : "\\ul0", @@ -1530,7 +1532,7 @@ static BOOL HLPFILE_ReadFont(HLPFILE* hlpfile) flag = ref[dscr_offset + i * 11 + 0]; family = ref[dscr_offset + i * 11 + 2]; - hlpfile->fonts[i].LogFont.lfHeight = -ref[dscr_offset + i * 11 + 1] / 2 - 3; + hlpfile->fonts[i].LogFont.lfHeight = ref[dscr_offset + i * 11 + 1]; hlpfile->fonts[i].LogFont.lfWidth = 0; hlpfile->fonts[i].LogFont.lfEscapement = 0; hlpfile->fonts[i].LogFont.lfOrientation = 0; diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 047a89e..fd605a9 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -1803,7 +1803,11 @@ static BOOL WINHELP_SplitLines(HWND hWnd, LPSIZE newsize) HLPFILE* hlpfile = win->page->file; if (!hlpfile->fonts[p->u.text.wFont].hFont) - hlpfile->fonts[p->u.text.wFont].hFont = CreateFontIndirect(&hlpfile->fonts[p->u.text.wFont].LogFont); + { + LOGFONT lf = hlpfile->fonts[p->u.text.wFont].LogFont; + lf.lfHeight = -lf.lfHeight / 2 - 3; + hlpfile->fonts[p->u.text.wFont].hFont = CreateFontIndirect(&lf); + } hFont = hlpfile->fonts[p->u.text.wFont].hFont; color = hlpfile->fonts[p->u.text.wFont].color; }

1 0

Eric Pouech : winhelp: Create the shadow window also for popups handled by RichEdit.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 9d92b76181ea8f672e8abbcab55fc0885b23eac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d92b76181ea8f672e8abbcab… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 23 21:38:36 2008 +0200 winhelp: Create the shadow window also for popups handled by RichEdit. --- programs/winhelp/winhelp.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 2f85553..e67000b 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -686,6 +686,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe if (bPopup && use_richedit) { DWORD mask = SendMessage(hTextWnd, EM_GETEVENTMASK, 0, 0); + RECT rect; WINHELP_SetupText(hTextWnd, win, wpage->relative); @@ -694,6 +695,17 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe SendMessage(hTextWnd, EM_SETEVENTMASK, 0, mask | ENM_REQUESTRESIZE); SendMessage(hTextWnd, EM_REQUESTRESIZE, 0, 0); SendMessage(hTextWnd, EM_SETEVENTMASK, 0, mask); + + GetWindowRect(win->hMainWnd, &rect); + win->hShadowWnd = CreateWindowEx(WS_EX_TOOLWINDOW, SHADOW_WIN_CLASS_NAME, + "", WS_POPUP | WS_VISIBLE, + rect.left + SHADOW_DX, rect.top + SHADOW_DY, + rect.right - rect.left, + rect.bottom - rect.top, + Globals.active_win->hMainWnd, 0, + Globals.hInstance, NULL); + SetWindowPos(win->hMainWnd, win->hShadowWnd, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE); } else { @@ -1541,7 +1553,7 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara static LRESULT CALLBACK WINHELP_ShadowWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { if (WINHELP_CheckPopup(hWnd, msg, wParam, lParam, NULL)) return 0; - return DefWindowProc(hWnd, msg, wParam, lParam); + return WINHELP_CheckPopup(hWnd, msg, wParam, lParam, NULL) ? 0L : DefWindowProc(hWnd, msg, wParam, lParam); } /*********************************************************************** @@ -1984,7 +1996,8 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam break; case WM_ACTIVATE: if (wParam != WA_INACTIVE || (HWND)lParam == Globals.active_win->hMainWnd || - (HWND)lParam == Globals.active_popup->hMainWnd) + (HWND)lParam == Globals.active_popup->hMainWnd || + GetWindow((HWND)lParam, GW_OWNER) == Globals.active_win->hMainWnd) break; case WM_COMMAND: if (use_richedit) break;

1 0

Eric Pouech : winhelp: Correctly compute the popup size and manage the popup when richedit is used .
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: b9848a757db74e58cd0371705df22eea967c4c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9848a757db74e58cd0371705… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 23 21:38:27 2008 +0200 winhelp: Correctly compute the popup size and manage the popup when richedit is used. --- programs/winhelp/winhelp.c | 77 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 65 insertions(+), 12 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 5dc6891..2f85553 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -48,7 +48,7 @@ static LRESULT CALLBACK WINHELP_ButtonBoxWndProc(HWND, UINT, WPARAM, LPARAM); static LRESULT CALLBACK WINHELP_ButtonWndProc(HWND, UINT, WPARAM, LPARAM); static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND, UINT, WPARAM, LPARAM); static LRESULT CALLBACK WINHELP_ShadowWndProc(HWND, UINT, WPARAM, LPARAM); -static void WINHELP_CheckPopup(UINT); +static BOOL WINHELP_CheckPopup(HWND, UINT, WPARAM, LPARAM, LRESULT*); static BOOL WINHELP_SplitLines(HWND hWnd, LPSIZE); static void WINHELP_InitFonts(HWND hWnd); static void WINHELP_DeleteLines(WINHELP_WINDOW*); @@ -683,10 +683,24 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe MACRO_ExecuteMacro(macro->lpszMacro); } - WINHELP_LayoutMainWindow(win); + if (bPopup && use_richedit) + { + DWORD mask = SendMessage(hTextWnd, EM_GETEVENTMASK, 0, 0); + + WINHELP_SetupText(hTextWnd, win, wpage->relative); - ShowWindow(win->hMainWnd, nCmdShow); - WINHELP_SetupText(hTextWnd, win, wpage->relative); + /* we need the window to be shown for richedit to compute the size */ + ShowWindow(win->hMainWnd, nCmdShow); + SendMessage(hTextWnd, EM_SETEVENTMASK, 0, mask | ENM_REQUESTRESIZE); + SendMessage(hTextWnd, EM_REQUESTRESIZE, 0, 0); + SendMessage(hTextWnd, EM_SETEVENTMASK, 0, mask); + } + else + { + WINHELP_SetupText(hTextWnd, win, wpage->relative); + WINHELP_LayoutMainWindow(win); + ShowWindow(win->hMainWnd, nCmdShow); + } return TRUE; } @@ -818,8 +832,9 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, RECT rect; INT curPos, min, max, dy, keyDelta; HWND hTextWnd; + LRESULT ret; - WINHELP_CheckPopup(msg); + if (WINHELP_CheckPopup(hWnd, msg, wParam, lParam, &ret)) return ret; switch (msg) { @@ -923,8 +938,24 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_NOTIFY: if (wParam == CTL_ID_TEXT) { - return WINHELP_HandleTextMouse((WINHELP_WINDOW*)GetWindowLong(hWnd, 0), - (const MSGFILTER*)lParam); + RECT rc; + + switch (((NMHDR*)lParam)->code) + { + case EN_MSGFILTER: + return WINHELP_HandleTextMouse((WINHELP_WINDOW*)GetWindowLong(hWnd, 0), + (const MSGFILTER*)lParam); + case EN_REQUESTRESIZE: + rc = ((REQRESIZE*)lParam)->rc; + win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + AdjustWindowRect(&rc, GetWindowLong(win->hMainWnd, GWL_STYLE), + FALSE); + SetWindowPos(win->hMainWnd, HWND_TOP, 0, 0, + rc.right - rc.left, rc.bottom - rc.top, + SWP_NOMOVE | SWP_NOZORDER); + WINHELP_LayoutMainWindow(win); + break; + } } break; @@ -1003,7 +1034,7 @@ static LRESULT CALLBACK WINHELP_ButtonBoxWndProc(HWND hWnd, UINT msg, WPARAM wPa SIZE button_size; INT x, y; - WINHELP_CheckPopup(msg); + if (WINHELP_CheckPopup(hWnd, msg, wParam, lParam, NULL)) return 0L; switch (msg) { @@ -1080,6 +1111,8 @@ static LRESULT CALLBACK WINHELP_ButtonBoxWndProc(HWND hWnd, UINT msg, WPARAM wPa */ static LRESULT CALLBACK WINHELP_ButtonWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + if (WINHELP_CheckPopup(hWnd, msg, wParam, lParam, NULL)) return 0; + if (msg == WM_KEYDOWN) { switch (wParam) @@ -1112,7 +1145,7 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, HWND hPopupWnd; if (msg != WM_LBUTTONDOWN) - WINHELP_CheckPopup(msg); + WINHELP_CheckPopup(hWnd, msg, wParam, lParam, NULL); switch (msg) { @@ -1507,7 +1540,7 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara */ static LRESULT CALLBACK WINHELP_ShadowWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - WINHELP_CheckPopup(msg); + if (WINHELP_CheckPopup(hWnd, msg, wParam, lParam, NULL)) return 0; return DefWindowProc(hWnd, msg, wParam, lParam); } @@ -1929,15 +1962,33 @@ static BOOL WINHELP_SplitLines(HWND hWnd, LPSIZE newsize) * * WINHELP_CheckPopup */ -static void WINHELP_CheckPopup(UINT msg) +static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT* lret) { HWND hPopup; - if (!Globals.active_popup) return; + if (!Globals.active_popup) return FALSE; switch (msg) { + case WM_NOTIFY: + { + MSGFILTER* msgf = (MSGFILTER*)lParam; + if (msgf->nmhdr.code == EN_MSGFILTER) + { + if (!WINHELP_CheckPopup(hWnd, msgf->msg, msgf->wParam, msgf->lParam, NULL)) + return FALSE; + if (lret) *lret = 1; + return TRUE; + } + } + break; + case WM_ACTIVATE: + if (wParam != WA_INACTIVE || (HWND)lParam == Globals.active_win->hMainWnd || + (HWND)lParam == Globals.active_popup->hMainWnd) + break; case WM_COMMAND: + if (use_richedit) break; + /* fall through */ case WM_LBUTTONDOWN: case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: @@ -1947,7 +1998,9 @@ static void WINHELP_CheckPopup(UINT msg) hPopup = Globals.active_popup->hMainWnd; Globals.active_popup = NULL; DestroyWindow(hPopup); + return TRUE; } + return FALSE; } /***********************************************************************

1 0

Eric Pouech : winhelp: Added proper RTF conversion for non breakable space and hyphen.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 1e5199af352ea45f5f6785c325cbbff99f66ff5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5199af352ea45f5f6785c32… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 23 21:38:09 2008 +0200 winhelp: Added proper RTF conversion for non breakable space and hyphen. --- programs/winhelp/hlpfile.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 92bcb1b..e327b54 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1200,9 +1200,16 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE break; case 0x8B: + if (!HLPFILE_RtfAddControl(rd, "\\~")) goto done; + format += 1; + if (rd) /* FIXME: TEMP */ rd->char_pos++; + break; + case 0x8C: - WINE_FIXME("NIY non-break space/hyphen\n"); + if (!HLPFILE_RtfAddControl(rd, "\\_")) goto done; + /* FIXME: it could be that hypen is also in input stream !! */ format += 1; + if (rd) /* FIXME: TEMP */ rd->char_pos++; break; #if 0

1 0