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

Eric Pouech : winhelp: Popup' s background color should be inherited from parent.
by Alexandre Julliard April 23, 2008

April 23, 2008

Module: wine Branch: master Commit: b2061c26b8f30ff7ece0a23ca5a35d6aac58771b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2061c26b8f30ff7ece0a23ca… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:01:21 2008 +0200 winhelp: Popup's background color should be inherited from parent. --- programs/winhelp/winhelp.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 22424cb..73b0609 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -203,7 +203,8 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) * * */ -static HLPFILE_WINDOWINFO* WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile, HWND hParentWnd, POINT* mouse) +static HLPFILE_WINDOWINFO* WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile, + WINHELP_WINDOW* parent, POINT* mouse) { static HLPFILE_WINDOWINFO wi; @@ -212,19 +213,20 @@ static HLPFILE_WINDOWINFO* WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile, HWND wi.type[0] = wi.name[0] = wi.caption[0] = '\0'; /* Calculate horizontal size and position of a popup window */ - GetWindowRect(hParentWnd, &parent_rect); + GetWindowRect(parent->hMainWnd, &parent_rect); wi.size.cx = (parent_rect.right - parent_rect.left) / 2; wi.size.cy = 10; /* need a non null value, so that border are taken into account while computing */ wi.origin = *mouse; - ClientToScreen(hParentWnd, &wi.origin); + ClientToScreen(parent->hMainWnd, &wi.origin); wi.origin.x -= wi.size.cx / 2; wi.origin.x = min(wi.origin.x, GetSystemMetrics(SM_CXSCREEN) - wi.size.cx); wi.origin.x = max(wi.origin.x, 0); wi.style = SW_SHOW; wi.win_style = WS_POPUP | WS_BORDER; - wi.sr_color = wi.sr_color = 0xFFFFFF; + wi.sr_color = parent->info->sr_color; + wi.nsr_color = 0xFFFFFF; return &wi; } @@ -1207,7 +1209,7 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, case hlp_link_popup: hlpfile = WINHELP_LookupHelpFile(part->link->lpszString); if (hlpfile) WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, part->link->lHash, - WINHELP_GetPopupWindowInfo(hlpfile, hWnd, &mouse), + WINHELP_GetPopupWindowInfo(hlpfile, win, &mouse), SW_NORMAL); break; case hlp_link_macro:

1 0

Eric Pouech : winhelp: Now use the icon out of hlpfile if any.
by Alexandre Julliard April 23, 2008

April 23, 2008

Module: wine Branch: master Commit: 61cc510623656b537025d03f034fd51e70721545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61cc510623656b537025d03f0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:50 2008 +0200 winhelp: Now use the icon out of hlpfile if any. --- programs/winhelp/hlpfile.c | 10 ++++++++++ programs/winhelp/hlpfile.h | 1 + programs/winhelp/winhelp.c | 5 +++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 815e7f1..92a22df 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1534,6 +1534,15 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) *m = macro; break; + case 5: + if (GET_USHORT(ptr, 4 + 4) != 1) + WINE_FIXME("More than one icon, picking up first\n"); + /* 0x16 is sizeof(CURSORICONDIR), see user32/user_private.h */ + hlpfile->hIcon = CreateIconFromResourceEx(ptr + 4 + 0x16, + GET_USHORT(ptr, 2) - 0x16, TRUE, + 0x30000, 0, 0, 0); + break; + case 6: if (GET_USHORT(ptr, 2) != 90) {WINE_WARN("system6\n");break;} @@ -2261,6 +2270,7 @@ void HLPFILE_FreeHlpFile(HLPFILE* hlpfile) HLPFILE_DeletePage(hlpfile->first_page); HLPFILE_DeleteMacro(hlpfile->first_macro); + DestroyIcon(hlpfile->hIcon); if (hlpfile->numWindows) HeapFree(GetProcessHeap(), 0, hlpfile->windows); HeapFree(GetProcessHeap(), 0, hlpfile->Context); HeapFree(GetProcessHeap(), 0, hlpfile->Map); diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index 8a27205..739ad38 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -162,6 +162,7 @@ typedef struct tagHlpFileFile unsigned numWindows; HLPFILE_WINDOWINFO* windows; + HICON hIcon; } HLPFILE; /* diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 303811f..bb9ea75 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -530,6 +530,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe WINHELP_WINDOW* win = NULL; BOOL bPrimary, bPopup, bReUsed = FALSE; LPSTR name; + HICON hIcon; bPrimary = !lstrcmpi(wpage->wininfo->name, "main"); bPopup = !bPrimary && (wpage->wininfo->win_style & WS_POPUP); @@ -633,6 +634,10 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe 0, 0, 0, 0, win->hMainWnd, (HMENU)CTL_ID_TEXT, Globals.hInstance, win); } + hIcon = (wpage->page) ? wpage->page->file->hIcon : NULL; + if (!hIcon) hIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_WINHELP)); + SendMessage(win->hMainWnd, WM_SETICON, ICON_SMALL, (DWORD_PTR)hIcon); + /* Initialize file specific pushbuttons */ if (!(wpage->wininfo->win_style & WS_POPUP) && wpage->page) {

1 0

Eric Pouech : winhelp: Store reference to the popup (if any) as a WINHELP_WINDOW pointer.
by Alexandre Julliard April 23, 2008

April 23, 2008

Module: wine Branch: master Commit: 6cd9b1a31385388c03bac6a6bb588f495bc64fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd9b1a31385388c03bac6a6b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:01:14 2008 +0200 winhelp: Store reference to the popup (if any) as a WINHELP_WINDOW pointer. --- programs/winhelp/winhelp.c | 34 ++++++++++++++++++++++------------ programs/winhelp/winhelp.h | 2 +- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 797bbae..22424cb 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -56,7 +56,7 @@ static void WINHELP_DeleteButtons(WINHELP_WINDOW*); static void WINHELP_SetupText(HWND hWnd, ULONG relative); static WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW*, WPARAM, LPARAM); -WINHELP_GLOBALS Globals = {3, NULL, NULL, TRUE, NULL, NULL, NULL, NULL, {{{NULL,NULL}},0}}; +WINHELP_GLOBALS Globals = {3, NULL, TRUE, NULL, NULL, NULL, NULL, NULL, {{{NULL,NULL}},0}}; #define CTL_ID_BUTTON 0x700 #define CTL_ID_TEXT 0x701 @@ -593,7 +593,9 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe WINHELP_RememberPage(win, wpage); } - if (!bPopup) + if (bPopup) + Globals.active_popup = win; + else Globals.active_win = win; /* Initialize default pushbuttons */ @@ -649,7 +651,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe } WINHELP_LayoutMainWindow(win); - if (bPopup) Globals.hPopupWnd = win->hMainWnd; ShowWindow(win->hMainWnd, nCmdShow); UpdateWindow(win->hMainWnd); @@ -736,9 +737,9 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, break; } break; - case WM_DESTROY: - if (Globals.hPopupWnd) DestroyWindow(Globals.hPopupWnd); - break; +/* EPP case WM_DESTROY: */ +/* EPP if (Globals.hPopupWnd) DestroyWindow(Globals.hPopupWnd); */ +/* EPP break; */ case WM_COPYDATA: return WINHELP_HandleCommand((HWND)wParam, lParam); @@ -789,7 +790,6 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, { BOOL bExit; win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - if (hWnd == Globals.hPopupWnd) Globals.hPopupWnd = 0; bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->lpszName, "main")); WINHELP_DeleteWindow(win); @@ -1172,8 +1172,12 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_LBUTTONDOWN: win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - hPopupWnd = Globals.hPopupWnd; - Globals.hPopupWnd = 0; + if (Globals.active_popup) + { + hPopupWnd = Globals.active_popup->hMainWnd; + Globals.active_popup = NULL; + } + else hPopupWnd = NULL; part = WINHELP_IsOverLink(win, wParam, lParam); if (part) @@ -1739,7 +1743,9 @@ static BOOL WINHELP_SplitLines(HWND hWnd, LPSIZE newsize) */ static void WINHELP_CheckPopup(UINT msg) { - if (!Globals.hPopupWnd) return; + HWND hPopup; + + if (!Globals.active_popup) return; switch (msg) { @@ -1750,8 +1756,9 @@ static void WINHELP_CheckPopup(UINT msg) case WM_NCLBUTTONDOWN: case WM_NCMBUTTONDOWN: case WM_NCRBUTTONDOWN: - DestroyWindow(Globals.hPopupWnd); - Globals.hPopupWnd = 0; + hPopup = Globals.active_popup->hMainWnd; + Globals.active_popup = NULL; + DestroyWindow(hPopup); } } @@ -1834,6 +1841,9 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) SetActiveWindow(Globals.win_list->hMainWnd); } + if (win == Globals.active_popup) + Globals.active_popup = NULL; + WINHELP_DeleteButtons(win); if (win->hShadowWnd) DestroyWindow(win->hShadowWnd); diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index a8f211e..b3ebac1 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -166,9 +166,9 @@ typedef struct { UINT wVersion; HANDLE hInstance; - HWND hPopupWnd; BOOL isBook; WINHELP_WINDOW* active_win; + WINHELP_WINDOW* active_popup; WINHELP_WINDOW* win_list; WNDPROC button_proc; WINHELP_DLL* dlls;

1 0

Eric Pouech : winhelp: Simplify most of the helpers dealing with window creation.
by Alexandre Julliard April 23, 2008

April 23, 2008

Module: wine Branch: master Commit: 3f1b62f2f76f0c516f0e9e8c239cc57708711950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1b62f2f76f0c516f0e9e8c2… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:01:08 2008 +0200 winhelp: Simplify most of the helpers dealing with window creation. --- programs/winhelp/hlpfile.c | 5 ++- programs/winhelp/macro.c | 25 +++++++---------- programs/winhelp/winhelp.c | 63 +++++++++++-------------------------------- programs/winhelp/winhelp.h | 5 +-- 4 files changed, 32 insertions(+), 66 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 30c678d..c20bead 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -148,13 +148,14 @@ static int comp_PageByHash(void *p, const void *key, /*********************************************************************** * - * HLPFILE_HlpFilePageByHash + * HLPFILE_PageByHash */ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash, ULONG* relative) { BYTE *ptr; - if (!hlpfile) return 0; + if (!hlpfile) return NULL; + if (!lHash) return HLPFILE_Contents(hlpfile, relative); WINE_TRACE("<%s>[%x]\n", hlpfile->lpszPath, lHash); diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index 3681933..66eac0f 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -506,10 +506,7 @@ void CALLBACK MACRO_FileOpen(void) if (WINHELP_GetOpenFileName(szFile, MAX_PATH)) { - HLPFILE* hlpfile = WINHELP_LookupHelpFile(szFile); - - WINHELP_CreateHelpWindowByHash(hlpfile, 0, - WINHELP_GetWindowInfo(hlpfile, "main"), SW_SHOWNORMAL); + MACRO_JumpContents(szFile, "main"); } } @@ -628,10 +625,10 @@ void CALLBACK MACRO_JumpContents(LPCSTR lpszPath, LPCSTR lpszWindow) HLPFILE* hlpfile; WINE_TRACE("(\"%s\", \"%s\")\n", lpszPath, lpszWindow); - hlpfile = WINHELP_LookupHelpFile(lpszPath); - WINHELP_CreateHelpWindowByHash(hlpfile, 0, - WINHELP_GetWindowInfo(hlpfile, lpszWindow), - SW_NORMAL); + if ((hlpfile = WINHELP_LookupHelpFile(lpszPath))) + WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, 0, + WINHELP_GetWindowInfo(hlpfile, lpszWindow), + SW_NORMAL); } void CALLBACK MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context) @@ -641,9 +638,9 @@ void CALLBACK MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context WINE_TRACE("(\"%s\", \"%s\", %d)\n", lpszPath, lpszWindow, context); hlpfile = WINHELP_LookupHelpFile(lpszPath); /* Some madness: what user calls 'context', hlpfile calls 'map' */ - WINHELP_CreateHelpWindowByMap(hlpfile, context, - WINHELP_GetWindowInfo(hlpfile, lpszWindow), - SW_NORMAL); + WINHELP_OpenHelpWindow(HLPFILE_PageByMap, hlpfile, context, + WINHELP_GetWindowInfo(hlpfile, lpszWindow), + SW_NORMAL); } void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash) @@ -652,9 +649,9 @@ void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash) WINE_TRACE("(\"%s\", \"%s\", %u)\n", lpszPath, lpszWindow, lHash); hlpfile = WINHELP_LookupHelpFile(lpszPath); - WINHELP_CreateHelpWindowByHash(hlpfile, lHash, - WINHELP_GetWindowInfo(hlpfile, lpszWindow), - SW_NORMAL); + WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, lHash, + WINHELP_GetWindowInfo(hlpfile, lpszWindow), + SW_NORMAL); } void CALLBACK MACRO_JumpHelpOn(void) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 4981748..797bbae 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -304,8 +304,8 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) if (!hlpfile) return 0; } else hlpfile = NULL; - WINHELP_CreateHelpWindowByHash(hlpfile, lHash, - WINHELP_GetWindowInfo(hlpfile, wndname), show); + WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, lHash, + WINHELP_GetWindowInfo(hlpfile, wndname), show); /* Message loop */ while (GetMessage(&msg, 0, 0, 0)) @@ -657,49 +657,17 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe return TRUE; } -/*********************************************************************** - * - * WINHELP_CreateHelpWindowByHash - */ -BOOL WINHELP_CreateHelpWindowByHash(HLPFILE* hlpfile, LONG lHash, - HLPFILE_WINDOWINFO* wi, int nCmdShow) -{ - WINHELP_WNDPAGE wpage; - - wpage.page = NULL; - if (hlpfile) - wpage.page = lHash ? HLPFILE_PageByHash(hlpfile, lHash, &wpage.relative) : - HLPFILE_Contents(hlpfile, &wpage.relative); - if (wpage.page) wpage.page->file->wRefCount++; - wpage.wininfo = wi; - return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); -} - -/*********************************************************************** - * - * WINHELP_CreateHelpWindowByMap - */ -BOOL WINHELP_CreateHelpWindowByMap(HLPFILE* hlpfile, LONG lMap, - HLPFILE_WINDOWINFO* wi, int nCmdShow) -{ - WINHELP_WNDPAGE wpage; - - wpage.page = HLPFILE_PageByMap(hlpfile, lMap, &wpage.relative); - if (wpage.page) wpage.page->file->wRefCount++; - wpage.wininfo = wi; - return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); -} - -/*********************************************************************** - * - * WINHELP_CreateHelpWindowByOffset +/****************************************************************** + * WINHELP_OpenHelpWindow + * Main function to search for a page and display it in a window */ -BOOL WINHELP_CreateHelpWindowByOffset(HLPFILE* hlpfile, LONG lOffset, - HLPFILE_WINDOWINFO* wi, int nCmdShow) +BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*lookup)(HLPFILE*, LONG, ULONG*), + HLPFILE* hlpfile, LONG val, HLPFILE_WINDOWINFO* wi, + int nCmdShow) { WINHELP_WNDPAGE wpage; - wpage.page = HLPFILE_PageByOffset(hlpfile, lOffset, &wpage.relative); + wpage.page = lookup(hlpfile, val, &wpage.relative); if (wpage.page) wpage.page->file->wRefCount++; wpage.wininfo = wi; return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); @@ -1229,14 +1197,14 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, WINE_WARN("link to window %d/%d\n", part->link->window, hlpfile->numWindows); break; } - WINHELP_CreateHelpWindowByHash(hlpfile, part->link->lHash, wi, - SW_NORMAL); + WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, part->link->lHash, + wi, SW_NORMAL); break; case hlp_link_popup: hlpfile = WINHELP_LookupHelpFile(part->link->lpszString); - if (hlpfile) WINHELP_CreateHelpWindowByHash(hlpfile, part->link->lHash, - WINHELP_GetPopupWindowInfo(hlpfile, hWnd, &mouse), - SW_NORMAL); + if (hlpfile) WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, part->link->lHash, + WINHELP_GetPopupWindowInfo(hlpfile, hWnd, &mouse), + SW_NORMAL); break; case hlp_link_macro: MACRO_ExecuteMacro(part->link->lpszString); @@ -2074,7 +2042,8 @@ BOOL WINHELP_CreateIndexWindow(void) { ret -= 2; WINE_TRACE("got %d as an offset\n", ret); - WINHELP_CreateHelpWindowByOffset(hlpfile, ret, Globals.active_win->info, SW_NORMAL); + WINHELP_OpenHelpWindow(HLPFILE_PageByOffset, hlpfile, ret, + Globals.active_win->info, SW_NORMAL); } return TRUE; } diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index f8ff0c6..a8f211e 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -178,10 +178,9 @@ typedef struct extern WINHELP_GLOBALS Globals; extern FARPROC Callbacks[]; -BOOL WINHELP_CreateHelpWindowByHash(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); -BOOL WINHELP_CreateHelpWindowByMap(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); -BOOL WINHELP_CreateHelpWindowByOffset(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int, BOOL); +BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*)(HLPFILE*, LONG, ULONG*), + HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); BOOL WINHELP_GetOpenFileName(LPSTR, int); BOOL WINHELP_CreateIndexWindow(void); void WINHELP_DeleteBackSet(WINHELP_WINDOW*);

1 0

Eric Pouech : winhelp: Simplified message box handling.
by Alexandre Julliard April 23, 2008

April 23, 2008

Module: wine Branch: master Commit: c631bb0b56fb7c4bd780d0fe4e8a265dfa4e5c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c631bb0b56fb7c4bd780d0fe4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:44 2008 +0200 winhelp: Simplified message box handling. --- programs/winhelp/winhelp.c | 24 ++++-------------------- programs/winhelp/winhelp.h | 1 - 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 0801cd6..303811f 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -759,7 +759,8 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, if (button) MACRO_ExecuteMacro(button->lpszMacro); else if (!HIWORD(wParam)) - WINHELP_MessageBoxIDS(STID_NOT_IMPLEMENTED, 0x121, MB_OK); + MessageBox(0, MAKEINTRESOURCE(STID_NOT_IMPLEMENTED), + MAKEINTRESOURCE(STID_WHERROR), MB_OK); break; } break; @@ -1913,34 +1914,17 @@ static void WINHELP_InitFonts(HWND hWnd) /*********************************************************************** * - * WINHELP_MessageBoxIDS - */ -INT WINHELP_MessageBoxIDS(UINT ids_text, UINT ids_title, WORD type) -{ - CHAR text[MAX_STRING_LEN]; - CHAR title[MAX_STRING_LEN]; - - LoadString(Globals.hInstance, ids_text, text, sizeof(text)); - LoadString(Globals.hInstance, ids_title, title, sizeof(title)); - - return MessageBox(0, text, title, type); -} - -/*********************************************************************** - * - * MAIN_MessageBoxIDS_s + * WINHELP_MessageBoxIDS_s */ INT WINHELP_MessageBoxIDS_s(UINT ids_text, LPCSTR str, UINT ids_title, WORD type) { CHAR text[MAX_STRING_LEN]; - CHAR title[MAX_STRING_LEN]; CHAR newtext[MAX_STRING_LEN + MAX_PATH]; LoadString(Globals.hInstance, ids_text, text, sizeof(text)); - LoadString(Globals.hInstance, ids_title, title, sizeof(title)); wsprintf(newtext, text, str); - return MessageBox(0, newtext, title, type); + return MessageBox(0, newtext, MAKEINTRESOURCE(ids_title), type); } /****************************************************************** diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index 81ce74e..af75261 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -184,7 +184,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int, BOOL); BOOL WINHELP_GetOpenFileName(LPSTR, int); BOOL WINHELP_CreateIndexWindow(void); void WINHELP_DeleteBackSet(WINHELP_WINDOW*); -INT WINHELP_MessageBoxIDS(UINT, UINT, WORD); INT WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD); HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile); HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name);

1 0

Eric Pouech : winhelp: Fixed JumpId and JumpKeyword with correct signature and implementation.
by Alexandre Julliard April 23, 2008

April 23, 2008

Module: wine Branch: master Commit: 7ae1bb28fec6cf6098cd1927ffdc9e6e854c088d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae1bb28fec6cf6098cd1927f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:32 2008 +0200 winhelp: Fixed JumpId and JumpKeyword with correct signature and implementation. --- programs/winhelp/macro.c | 31 ++++++++++++++++++++++++------- programs/winhelp/macro.h | 2 +- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index 85b19ce..2ff1ad2 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -110,7 +110,7 @@ static struct MacroDesc MACRO_Builtins[] = { {"JumpContext", "JC", 0, "SSU", (FARPROC)MACRO_JumpContext}, {"JumpHash", "JH", 0, "SSU", (FARPROC)MACRO_JumpHash}, {"JumpHelpOn", NULL, 0, "", (FARPROC)MACRO_JumpHelpOn}, - {"JumpID", "JI", 0, "SSS", (FARPROC)MACRO_JumpID}, + {"JumpID", "JI", 0, "SS", (FARPROC)MACRO_JumpID}, {"JumpKeyword", "JK", 0, "SSS", (FARPROC)MACRO_JumpKeyword}, {"KLink", "KL", 0, "SUSS", (FARPROC)MACRO_KLink}, {"Menu", "MU", 0, "", (FARPROC)MACRO_Menu}, @@ -654,15 +654,32 @@ void CALLBACK MACRO_JumpHelpOn(void) WINE_FIXME("()\n"); } -/* FIXME: those two macros are wrong - * they should only contain 2 strings, path & window are coded as path>window - */ -void CALLBACK MACRO_JumpID(LPCSTR lpszPath, LPCSTR lpszWindow, LPCSTR topic_id) +void CALLBACK MACRO_JumpID(LPCSTR lpszPathWindow, LPCSTR topic_id) { - WINE_TRACE("(\"%s\", \"%s\", \"%s\")\n", lpszPath, lpszWindow, topic_id); - MACRO_JumpHash(lpszPath, lpszWindow, HLPFILE_Hash(topic_id)); + LPSTR ptr; + + WINE_TRACE("(\"%s\", \"%s\")\n", lpszPathWindow, topic_id); + if ((ptr = strchr(lpszPathWindow, '>')) != NULL) + { + LPSTR tmp; + size_t sz = ptr - lpszPathWindow; + + tmp = HeapAlloc(GetProcessHeap(), 0, sz + 1); + if (tmp) + { + memcpy(tmp, lpszPathWindow, sz); + tmp[sz] = '\0'; + MACRO_JumpHash(tmp, ptr + 1, HLPFILE_Hash(topic_id)); + HeapFree(GetProcessHeap(), 0, tmp); + } + } + else + MACRO_JumpHash(lpszPathWindow, NULL, HLPFILE_Hash(topic_id)); } +/* FIXME: this macros is wrong + * it should only contain 2 strings, path & window are coded as path>window + */ void CALLBACK MACRO_JumpKeyword(LPCSTR lpszPath, LPCSTR lpszWindow, LPCSTR keyword) { WINE_FIXME("(\"%s\", \"%s\", \"%s\")\n", lpszPath, lpszWindow, keyword); diff --git a/programs/winhelp/macro.h b/programs/winhelp/macro.h index b8f736b..ee1fd69 100644 --- a/programs/winhelp/macro.h +++ b/programs/winhelp/macro.h @@ -98,7 +98,7 @@ void CALLBACK MACRO_JumpContents(LPCSTR, LPCSTR); void CALLBACK MACRO_JumpContext(LPCSTR, LPCSTR, LONG); void CALLBACK MACRO_JumpHash(LPCSTR, LPCSTR, LONG); void CALLBACK MACRO_JumpHelpOn(void); -void CALLBACK MACRO_JumpID(LPCSTR, LPCSTR, LPCSTR); +void CALLBACK MACRO_JumpID(LPCSTR, LPCSTR); void CALLBACK MACRO_JumpKeyword(LPCSTR, LPCSTR, LPCSTR); void CALLBACK MACRO_KLink(LPCSTR, LONG, LPCSTR, LPCSTR); void CALLBACK MACRO_Menu(void);

1 0

Eric Pouech : winhelp: Enable/Disable prev/next buttons if there's a prev/ next page.
by Alexandre Julliard April 23, 2008

April 23, 2008

Module: wine Branch: master Commit: 3ae5ad8ede5e71b19df8d86e0555cf800019334c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae5ad8ede5e71b19df8d86e0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:38 2008 +0200 winhelp: Enable/Disable prev/next buttons if there's a prev/next page. --- programs/winhelp/macro.c | 7 +++++++ programs/winhelp/winhelp.c | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index 2ff1ad2..2c38b01 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -245,10 +245,17 @@ void CALLBACK MACRO_BookmarkMore(void) void CALLBACK MACRO_BrowseButtons(void) { + HLPFILE_PAGE* page = Globals.active_win->page; + WINE_TRACE("()\n"); MACRO_CreateButton("BTN_PREV", "&<<", "Prev()"); MACRO_CreateButton("BTN_NEXT", "&>>", "Next()"); + + if (!HLPFILE_PageByOffset(page->file, page->browse_bwd)) + MACRO_DisableButton("BTN_PREV"); + if (!HLPFILE_PageByOffset(page->file, page->browse_fwd)) + MACRO_DisableButton("BTN_NEXT"); } void CALLBACK MACRO_ChangeButtonBinding(LPCSTR id, LPCSTR macro) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 13507d9..0801cd6 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -614,17 +614,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe MACRO_CreateButton("BTN_TOPICS", buffer, "Finder()"); } - /* Initialize file specific pushbuttons */ - if (!(wpage->wininfo->win_style & WS_POPUP) && wpage->page) - { - HLPFILE_MACRO *macro; - for (macro = wpage->page->file->first_macro; macro; macro = macro->next) - MACRO_ExecuteMacro(macro->lpszMacro); - - for (macro = wpage->page->first_macro; macro; macro = macro->next) - MACRO_ExecuteMacro(macro->lpszMacro); - } - if (!bReUsed) { win->hMainWnd = CreateWindowEx((bPopup) ? WS_EX_TOOLWINDOW : 0, MAIN_WIN_CLASS_NAME, @@ -644,6 +633,17 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe 0, 0, 0, 0, win->hMainWnd, (HMENU)CTL_ID_TEXT, Globals.hInstance, win); } + /* Initialize file specific pushbuttons */ + if (!(wpage->wininfo->win_style & WS_POPUP) && wpage->page) + { + HLPFILE_MACRO *macro; + for (macro = wpage->page->file->first_macro; macro; macro = macro->next) + MACRO_ExecuteMacro(macro->lpszMacro); + + for (macro = wpage->page->first_macro; macro; macro = macro->next) + MACRO_ExecuteMacro(macro->lpszMacro); + } + WINHELP_LayoutMainWindow(win); if (bPopup) Globals.hPopupWnd = win->hMainWnd;

1 0

Eric Pouech : winhelp: Don' t add a page to the history when using the back button.
by Alexandre Julliard April 23, 2008

April 23, 2008

Module: wine Branch: master Commit: 4a89d2910496304d9365ade2a30f684eb4b3e50f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a89d2910496304d9365ade2a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:20 2008 +0200 winhelp: Don't add a page to the history when using the back button. --- programs/winhelp/macro.c | 6 +++--- programs/winhelp/winhelp.c | 19 +++++++++---------- programs/winhelp/winhelp.h | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index 877d33f..d43ec9f 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -221,7 +221,7 @@ void CALLBACK MACRO_Back(void) WINE_TRACE("()\n"); if (win && win->back.index >= 2) - WINHELP_CreateHelpWindow(&win->back.set[--win->back.index - 1], SW_SHOW); + WINHELP_CreateHelpWindow(&win->back.set[--win->back.index - 1], SW_SHOW, FALSE); } void CALLBACK MACRO_BackFlush(void) @@ -699,7 +699,7 @@ void CALLBACK MACRO_Next(void) { wp.page->file->wRefCount++; wp.wininfo = Globals.active_win->info; - WINHELP_CreateHelpWindow(&wp, SW_NORMAL); + WINHELP_CreateHelpWindow(&wp, SW_NORMAL, TRUE); } } @@ -739,7 +739,7 @@ void CALLBACK MACRO_Prev(void) { wp.page->file->wRefCount++; wp.wininfo = Globals.active_win->info; - WINHELP_CreateHelpWindow(&wp, SW_NORMAL); + WINHELP_CreateHelpWindow(&wp, SW_NORMAL, TRUE); } } diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index ee7925f..13507d9 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -485,12 +485,10 @@ void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) } -static void WINHELP_AddHistory(WINHELP_WINDOW* win, HLPFILE_PAGE* page) +static void WINHELP_RememberPage(WINHELP_WINDOW* win, HLPFILE_PAGE* page) { unsigned num; - /* FIXME: when using back, we shouldn't update the history... */ - /* add to history only if different from top of history */ if (!Globals.history.index || Globals.history.set[0].page != page) { num = sizeof(Globals.history.set) / sizeof(Globals.history.set[0]); @@ -527,7 +525,7 @@ static void WINHELP_AddHistory(WINHELP_WINDOW* win, HLPFILE_PAGE* page) * * WINHELP_CreateHelpWindow */ -BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) +BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remember) { WINHELP_WINDOW* win = NULL; BOOL bPrimary, bPopup, bReUsed = FALSE; @@ -590,9 +588,9 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) win->hArrowCur = LoadCursorA(0, (LPSTR)IDC_ARROW); win->hHandCur = LoadCursorA(0, (LPSTR)IDC_HAND); - if (!bPopup && wpage->page) + if (!bPopup && wpage->page && remember) { - WINHELP_AddHistory(win, wpage->page); + WINHELP_RememberPage(win, wpage->page); } if (!bPopup) @@ -609,6 +607,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) MACRO_CreateButton("BTN_SEARCH", buffer, "Search()"); LoadString(Globals.hInstance, STID_BACK, buffer, sizeof(buffer)); MACRO_CreateButton("BTN_BACK", buffer, "Back()"); + if (win->back.index <= 1) MACRO_DisableButton("BTN_BACK"); LoadString(Globals.hInstance, STID_HISTORY, buffer, sizeof(buffer)); MACRO_CreateButton("BTN_HISTORY", buffer, "History()"); LoadString(Globals.hInstance, STID_TOPICS, buffer, sizeof(buffer)); @@ -669,7 +668,7 @@ BOOL WINHELP_CreateHelpWindowByHash(HLPFILE* hlpfile, LONG lHash, HLPFILE_Contents(hlpfile); if (wpage.page) wpage.page->file->wRefCount++; wpage.wininfo = wi; - return WINHELP_CreateHelpWindow(&wpage, nCmdShow); + return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); } /*********************************************************************** @@ -684,7 +683,7 @@ BOOL WINHELP_CreateHelpWindowByMap(HLPFILE* hlpfile, LONG lMap, wpage.page = HLPFILE_PageByMap(hlpfile, lMap); if (wpage.page) wpage.page->file->wRefCount++; wpage.wininfo = wi; - return WINHELP_CreateHelpWindow(&wpage, nCmdShow); + return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); } /*********************************************************************** @@ -699,7 +698,7 @@ BOOL WINHELP_CreateHelpWindowByOffset(HLPFILE* hlpfile, LONG lOffset, wpage.page = HLPFILE_PageByOffset(hlpfile, lOffset); if (wpage.page) wpage.page->file->wRefCount++; wpage.wininfo = wi; - return WINHELP_CreateHelpWindow(&wpage, nCmdShow); + return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); } /*********************************************************************** @@ -1293,7 +1292,7 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara GetTextMetrics(hDc, &tm); i = HIWORD(lParam) / tm.tmHeight; if (i < Globals.history.index) - WINHELP_CreateHelpWindow(&Globals.history.set[i], SW_SHOW); + WINHELP_CreateHelpWindow(&Globals.history.set[i], SW_SHOW, TRUE); ReleaseDC(hWnd, hDc); break; case WM_PAINT: diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index f1f67d2..81ce74e 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -180,7 +180,7 @@ extern FARPROC Callbacks[]; BOOL WINHELP_CreateHelpWindowByHash(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); BOOL WINHELP_CreateHelpWindowByMap(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); BOOL WINHELP_CreateHelpWindowByOffset(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); -BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int); +BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int, BOOL); BOOL WINHELP_GetOpenFileName(LPSTR, int); BOOL WINHELP_CreateIndexWindow(void); void WINHELP_DeleteBackSet(WINHELP_WINDOW*);

1 0

Eric Pouech : winhelp: Replaced an erroneous FIXME by a TRACE in MACRO_DisableButton().
by Alexandre Julliard April 23, 2008

April 23, 2008

Module: wine Branch: master Commit: 951926e6e548c0b60018ea6d5bbcc66de57496e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=951926e6e548c0b60018ea6d5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:26 2008 +0200 winhelp: Replaced an erroneous FIXME by a TRACE in MACRO_DisableButton(). --- programs/winhelp/macro.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index d43ec9f..85b19ce 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -418,7 +418,7 @@ void CALLBACK MACRO_DisableButton(LPCSTR id) { WINHELP_BUTTON** b; - WINE_FIXME("(\"%s\")\n", id); + WINE_TRACE("(\"%s\")\n", id); b = MACRO_LookupButton(Globals.active_win, id); if (!*b) {WINE_FIXME("Couldn't find button '%s'\n", id); return;}

1 0

Eric Pouech : winhelp: Properly display the page title.
by Alexandre Julliard April 23, 2008

April 23, 2008

Module: wine Branch: master Commit: 07cf778b2bed2c2dbbfb9408b556850f1d40876b URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cf778b2bed2c2dbbfb9408b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:14 2008 +0200 winhelp: Properly display the page title. --- programs/winhelp/winhelp.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index a33c470..ee7925f 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -112,6 +112,12 @@ BOOL WINHELP_GetOpenFileName(LPSTR lpszFile, int len) return GetOpenFileName(&openfilename); } +static char* WINHELP_GetCaption(WINHELP_WNDPAGE* wpage) +{ + if (wpage->wininfo->caption[0]) return wpage->wininfo->caption; + return wpage->page->file->lpszTitle; +} + /*********************************************************************** * * WINHELP_LookupHelpFile @@ -540,7 +546,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) { WINHELP_DeleteButtons(win); bReUsed = TRUE; - SetWindowText(win->hMainWnd, wpage->wininfo->caption); + SetWindowText(win->hMainWnd, WINHELP_GetCaption(wpage)); if (wpage->wininfo->origin.x != CW_USEDEFAULT && wpage->wininfo->origin.y != CW_USEDEFAULT) SetWindowPos(win->hMainWnd, HWND_TOP, @@ -623,7 +629,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) if (!bReUsed) { win->hMainWnd = CreateWindowEx((bPopup) ? WS_EX_TOOLWINDOW : 0, MAIN_WIN_CLASS_NAME, - wpage->wininfo->caption, + WINHELP_GetCaption(wpage), bPrimary ? WS_OVERLAPPEDWINDOW : wpage->wininfo->win_style, wpage->wininfo->origin.x, wpage->wininfo->origin.y, wpage->wininfo->size.cx, wpage->wininfo->size.cy,

1 0