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

Maarten Lankhorst : quartz: Make acmwrapper respect preroll samples.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 172347341ae4b9e23704b7cb3f6888b9f84452cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=172347341ae4b9e23704b7cb3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 18 16:07:05 2008 -0700 quartz: Make acmwrapper respect preroll samples. --- dlls/quartz/acmwrapper.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 35e154c..4d42980 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -58,7 +58,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte LPBYTE pbDstStream; LPBYTE pbSrcStream = NULL; ACMSTREAMHEADER ash; - BOOL unprepare_header = FALSE; + BOOL unprepare_header = FALSE, preroll; MMRESULT res; HRESULT hr; LONGLONG tStart = -1, tStop = -1, tMed; @@ -70,6 +70,8 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte return hr; } + preroll = (IMediaSample_IsPreroll(pSample) == S_OK); + IMediaSample_GetTime(pSample, &tStart, &tStop); cbSrcStream = IMediaSample_GetActualDataLength(pSample); @@ -91,6 +93,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte ERR("Unable to get delivery buffer (%x)\n", hr); return hr; } + IMediaSample_SetPreroll(pOutSample, preroll); hr = IMediaSample_SetActualDataLength(pOutSample, 0); assert(hr == S_OK);

1 0

Maarten Lankhorst : quartz: Make the video renderer drop preroll samples.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 458b09a84dc168ca4a1cde927226b93ba4afff2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=458b09a84dc168ca4a1cde927… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 17 11:16:13 2008 -0700 quartz: Make the video renderer drop preroll samples. --- dlls/quartz/videorenderer.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 48faf55..5179bd0 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -362,6 +362,10 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) TRACE("%p %p\n", iface, pSample); + /* Preroll means the sample isn't shown, this is used for key frames and things like that */ + if (IMediaSample_IsPreroll(pSample) == S_OK) + return S_OK; + hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) {

1 0

Eric Pouech : winhelp: Silencing the copyright system record entry while parsing help files.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 7ca4a034280bb98f5d41f1f6758389a857cb9d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca4a034280bb98f5d41f1f67… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:48 2008 +0200 winhelp: Silencing the copyright system record entry while parsing help files. --- programs/winhelp/hlpfile.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 2dd0822..7e6a0f1 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1572,6 +1572,9 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) wi->size.cx, wi->size.cy); } break; + case 8: + WINE_WARN("Citation: '%s'\n", ptr + 4); + break; default: WINE_WARN("Unsupported SystemRecord[%d]\n", GET_USHORT(ptr, 0)); }

1 0

Eric Pouech : winhelp: When no help file is passed on command line, we should open then file pickup dialog.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: f3730ccc006267a7e0d472ec3776d54d9afa003f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3730ccc006267a7e0d472ec3… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:42 2008 +0200 winhelp: When no help file is passed on command line, we should open then file pickup dialog. --- programs/winhelp/winhelp.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index dfae0b4..7c8aa28 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -742,6 +742,8 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_NCCREATE: win = (WINHELP_WINDOW*) ((LPCREATESTRUCT) lParam)->lpCreateParams; SetWindowLongPtr(hWnd, 0, (ULONG_PTR) win); + if (!win->page && Globals.isBook) + PostMessage(hWnd, WM_COMMAND, MNID_FILE_OPEN, 0); win->hMainWnd = hWnd; break;

1 0

Eric Pouech : winhelp: Instead of loading all pages at once, allow to browse them one by one.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 84f0968acdbb005e559b17a158f97db24d28bdc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f0968acdbb005e559b17a15… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:36 2008 +0200 winhelp: Instead of loading all pages at once, allow to browse them one by one. --- programs/winhelp/hlpfile.c | 128 ++++++++++++++++++++++++++++++++++++-------- programs/winhelp/hlpfile.h | 3 + programs/winhelp/winhelp.c | 2 + 3 files changed, 110 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84f0968acdbb005e559b1…

1 0

Eric Pouech : winhelp: Removed a couple of internal windows' handle and replaced them with control IDs.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 7eba95de27a413a57590e2a9fdf987c7bfe13a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eba95de27a413a57590e2a9f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:29 2008 +0200 winhelp: Removed a couple of internal windows' handle and replaced them with control IDs. --- programs/winhelp/winhelp.c | 44 +++++++++++++++++++++++--------------------- programs/winhelp/winhelp.h | 2 -- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 003e6a3..fe23e18 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -457,19 +457,21 @@ void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) { RECT rect, button_box_rect; INT text_top = 0; + HWND hButtonBoxWnd = GetDlgItem(win->hMainWnd, CTL_ID_BUTTON); + HWND hTextWnd = GetDlgItem(win->hMainWnd, CTL_ID_TEXT); GetClientRect(win->hMainWnd, &rect); /* Update button box and text Window */ - SetWindowPos(win->hButtonBoxWnd, HWND_TOP, + SetWindowPos(hButtonBoxWnd, HWND_TOP, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 0); - if (GetWindowRect(win->hButtonBoxWnd, &button_box_rect)) + if (GetWindowRect(hButtonBoxWnd, &button_box_rect)) text_top = rect.top + button_box_rect.bottom - button_box_rect.top; - SetWindowPos(win->hTextWnd, HWND_TOP, + SetWindowPos(hTextWnd, HWND_TOP, rect.left, text_top, rect.right - rect.left, rect.bottom - text_top, 0); @@ -484,17 +486,16 @@ void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) static BOOL WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin, HLPFILE_PAGE* page, int nCmdShow) { + HWND hTextWnd = GetDlgItem(oldwin->hMainWnd, CTL_ID_TEXT); unsigned int i; win->hMainWnd = oldwin->hMainWnd; - win->hButtonBoxWnd = oldwin->hButtonBoxWnd; - win->hTextWnd = oldwin->hTextWnd; win->hHistoryWnd = oldwin->hHistoryWnd; - oldwin->hMainWnd = oldwin->hButtonBoxWnd = oldwin->hTextWnd = oldwin->hHistoryWnd = 0; + oldwin->hMainWnd = oldwin->hHistoryWnd = 0; win->hBrush = CreateSolidBrush(win->info->sr_color); SetWindowLongPtr(win->hMainWnd, 0, (ULONG_PTR)win); - SetWindowLongPtr(win->hTextWnd, 0, (ULONG_PTR)win); + SetWindowLongPtr(hTextWnd, 0, (ULONG_PTR)win); SetWindowLongPtr(win->hHistoryWnd, 0, (ULONG_PTR)win); WINHELP_InitFonts(win->hMainWnd); @@ -502,11 +503,11 @@ static BOOL WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin, if (page) SetWindowText(win->hMainWnd, page->file->lpszTitle); - WINHELP_SetupText(win->hTextWnd); - InvalidateRect(win->hTextWnd, NULL, TRUE); + WINHELP_SetupText(hTextWnd); + InvalidateRect(hTextWnd, NULL, TRUE); WINHELP_LayoutMainWindow(win); ShowWindow(win->hMainWnd, nCmdShow); - UpdateWindow(win->hTextWnd); + UpdateWindow(hTextWnd); if (!(win->info->win_style & WS_POPUP)) { @@ -661,8 +662,8 @@ BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, HLPFILE_WINDOWINFO* wi, Globals.hInstance, win); /* Create button box and text Window */ if (!bPopup) - win->hButtonBoxWnd = CreateWindow(BUTTON_BOX_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, - 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_BUTTON, Globals.hInstance, NULL); + CreateWindow(BUTTON_BOX_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_BUTTON, Globals.hInstance, NULL); CreateWindow(TEXT_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_TEXT, Globals.hInstance, win); @@ -730,6 +731,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, WINHELP_BUTTON *button; RECT rect; INT curPos, min, max, dy, keyDelta; + HWND hTextWnd; WINHELP_CheckPopup(msg); @@ -799,12 +801,13 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, case VK_PRIOR: case VK_NEXT: win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - curPos = GetScrollPos(win->hTextWnd, SB_VERT); - GetScrollRange(win->hTextWnd, SB_VERT, &min, &max); + hTextWnd = GetDlgItem(win->hMainWnd, CTL_ID_TEXT); + curPos = GetScrollPos(hTextWnd, SB_VERT); + GetScrollRange(hTextWnd, SB_VERT, &min, &max); if (keyDelta == 0) { - GetClientRect(win->hTextWnd, &rect); + GetClientRect(hTextWnd, &rect); keyDelta = (rect.bottom - rect.top) / 2; if (wParam == VK_PRIOR) keyDelta = -keyDelta; @@ -816,10 +819,10 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, else if (curPos < min) curPos = min; - dy = GetScrollPos(win->hTextWnd, SB_VERT) - curPos; - SetScrollPos(win->hTextWnd, SB_VERT, curPos, TRUE); - ScrollWindow(win->hTextWnd, 0, dy, NULL, NULL); - UpdateWindow(win->hTextWnd); + dy = GetScrollPos(hTextWnd, SB_VERT) - curPos; + SetScrollPos(hTextWnd, SB_VERT, curPos, TRUE); + ScrollWindow(hTextWnd, 0, dy, NULL, NULL); + UpdateWindow(hTextWnd); return 0; case VK_ESCAPE: @@ -973,7 +976,6 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_NCCREATE: win = (WINHELP_WINDOW*) ((LPCREATESTRUCT) lParam)->lpCreateParams; SetWindowLongPtr(hWnd, 0, (ULONG_PTR) win); - win->hTextWnd = hWnd; win->hBrush = CreateSolidBrush(win->info->sr_color); WINHELP_InitFonts(hWnd); break; @@ -1926,7 +1928,7 @@ WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW* win, WPARAM wParam, LPARAM POINT mouse; WINHELP_LINE *line; WINHELP_LINE_PART *part; - int scroll_pos = GetScrollPos(win->hTextWnd, SB_VERT); + int scroll_pos = GetScrollPos(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), SB_VERT); mouse.x = LOWORD(lParam); mouse.y = HIWORD(lParam); diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index b07044c..551b880 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -100,8 +100,6 @@ typedef struct tagWinHelp WINHELP_LINE* first_line; HWND hMainWnd; - HWND hButtonBoxWnd; - HWND hTextWnd; HWND hShadowWnd; HWND hHistoryWnd;

1 0

Eric Pouech : winhelp: No longer store the WINHELP_WINDOW* inside the button box.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 8169f0ff9d1d76627e7fe29a94ff670a1bcbeb92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8169f0ff9d1d76627e7fe29a9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:23 2008 +0200 winhelp: No longer store the WINHELP_WINDOW* inside the button box. --- programs/winhelp/winhelp.c | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 27c2ead..003e6a3 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -334,20 +334,22 @@ static BOOL WINHELP_RegisterWinClasses(void) class_button_box = class_main; class_button_box.lpfnWndProc = WINHELP_ButtonBoxWndProc; + class_button_box.cbWndExtra = 0; class_button_box.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); class_button_box.lpszClassName = BUTTON_BOX_WIN_CLASS_NAME; - class_text = class_main; + class_text = class_main; class_text.lpfnWndProc = WINHELP_TextWndProc; class_text.hbrBackground = 0; class_text.lpszClassName = TEXT_WIN_CLASS_NAME; - class_shadow = class_main; + class_shadow = class_main; class_shadow.lpfnWndProc = WINHELP_ShadowWndProc; + class_shadow.cbWndExtra = 0; class_shadow.hbrBackground = (HBRUSH)(COLOR_3DDKSHADOW+1); class_shadow.lpszClassName = SHADOW_WIN_CLASS_NAME; - class_history = class_main; + class_history = class_main; class_history.lpfnWndProc = WINHELP_HistoryWndProc; class_history.lpszClassName = HISTORY_WIN_CLASS_NAME; @@ -492,7 +494,6 @@ static BOOL WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin, win->hBrush = CreateSolidBrush(win->info->sr_color); SetWindowLongPtr(win->hMainWnd, 0, (ULONG_PTR)win); - SetWindowLongPtr(win->hButtonBoxWnd, 0, (ULONG_PTR)win); SetWindowLongPtr(win->hTextWnd, 0, (ULONG_PTR)win); SetWindowLongPtr(win->hHistoryWnd, 0, (ULONG_PTR)win); @@ -660,8 +661,8 @@ BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, HLPFILE_WINDOWINFO* wi, Globals.hInstance, win); /* Create button box and text Window */ if (!bPopup) - CreateWindow(BUTTON_BOX_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, - 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_BUTTON, Globals.hInstance, win); + win->hButtonBoxWnd = CreateWindow(BUTTON_BOX_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_BUTTON, Globals.hInstance, NULL); CreateWindow(TEXT_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_TEXT, Globals.hInstance, win); @@ -859,15 +860,9 @@ static LRESULT CALLBACK WINHELP_ButtonBoxWndProc(HWND hWnd, UINT msg, WPARAM wPa switch (msg) { - case WM_NCCREATE: - win = (WINHELP_WINDOW*) ((LPCREATESTRUCT) lParam)->lpCreateParams; - SetWindowLongPtr(hWnd, 0, (ULONG_PTR) win); - win->hButtonBoxWnd = hWnd; - break; - case WM_WINDOWPOSCHANGING: winpos = (WINDOWPOS*) lParam; - win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(GetParent(hWnd), 0); /* Update buttons */ button_size.cx = 0;

1 0

Eric Pouech : winhelp: Fixed the parsing of a link containing both a . hlp file and a window name.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 7ceb62f90a308632539d1a76fd7483b2a91b5864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ceb62f90a308632539d1a76f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:11 2008 +0200 winhelp: Fixed the parsing of a link containing both a .hlp file and a window name. --- programs/winhelp/hlpfile.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 80bf7b8..96542fd 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1143,28 +1143,33 @@ static BOOL HLPFILE_AddParagraph(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigne char* ptr = (char*) format + 8; BYTE type = format[3]; int wnd = -1; - char* str; - if (type == 1) wnd = *ptr++; - if (type == 4 || type == 6) - { - str = ptr; - ptr += strlen(ptr) + 1; - } - else - str = hlpfile->lpszPath; - if (type == 6) + switch (type) { + case 1: + wnd = *ptr; + /* fall through */ + case 0: + ptr = hlpfile->lpszPath; + break; + case 6: for (wnd = hlpfile->numWindows - 1; wnd >= 0; wnd--) { if (!strcmp(ptr, hlpfile->windows[wnd].name)) break; } if (wnd == -1) WINE_WARN("Couldn't find window info for %s\n", ptr); + ptr += strlen(ptr) + 1; + /* fall through */ + case 4: + break; + default: + WINE_WARN("Unknown link type %d\n", type); + break; } HLPFILE_FreeLink(attributes.link); attributes.link = HLPFILE_AllocLink((*format & 4) ? hlp_link_link : hlp_link_popup, - str, GET_UINT(format, 4), + ptr, GET_UINT(format, 4), !(*format & 1), wnd); } format += 3 + GET_USHORT(format, 1);

1 0

Eric Pouech : winhelp: Always create a main window, even for popups.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: b9862369040384c42959a41206d9344830f306d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9862369040384c42959a4120… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:17 2008 +0200 winhelp: Always create a main window, even for popups. --- programs/winhelp/winhelp.c | 83 +++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 42 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 75559b2..27c2ead 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -3,7 +3,7 @@ * * Copyright 1996 Ulrich Schmid <uschmid(a)mail.hh.provi.de> * 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * 2002 Eric Pouech <eric.pouech(a)wanadoo.fr> + * 2002, 2008 Eric Pouech <eric.pouech(a)wanadoo.fr> * 2004 Ken Belleau <jamez(a)ivic.qc.ca> * * This library is free software; you can redistribute it and/or @@ -57,6 +57,8 @@ static WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW*, WPARAM, LPARAM); WINHELP_GLOBALS Globals = {3, NULL, NULL, TRUE, NULL, NULL, NULL, NULL}; +#define CTL_ID_BUTTON 0x700 +#define CTL_ID_TEXT 0x701 /*********************************************************************** * @@ -452,7 +454,7 @@ static LRESULT WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam) void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) { RECT rect, button_box_rect; - INT text_top; + INT text_top = 0; GetClientRect(win->hMainWnd, &rect); @@ -462,8 +464,8 @@ void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) rect.right - rect.left, rect.bottom - rect.top, 0); - GetWindowRect(win->hButtonBoxWnd, &button_box_rect); - text_top = rect.top + button_box_rect.bottom - button_box_rect.top; + if (GetWindowRect(win->hButtonBoxWnd, &button_box_rect)) + text_top = rect.top + button_box_rect.bottom - button_box_rect.top; SetWindowPos(win->hTextWnd, HWND_TOP, rect.left, text_top, @@ -578,7 +580,7 @@ BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, HLPFILE_WINDOWINFO* wi, DWORD ex_style; bPrimary = !lstrcmpi(wi->name, "main"); - bPopup = wi->win_style & WS_POPUP; + bPopup = !bPrimary && (wi->win_style & WS_POPUP); /* Initialize WINHELP_WINDOW struct */ win = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -650,12 +652,22 @@ BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, HLPFILE_WINDOWINFO* wi, ex_style = 0; if (bPopup) ex_style = WS_EX_TOOLWINDOW; - hWnd = CreateWindowEx(ex_style, bPopup ? TEXT_WIN_CLASS_NAME : MAIN_WIN_CLASS_NAME, - wi->caption, - bPrimary ? WS_OVERLAPPEDWINDOW : wi->win_style, - wi->origin.x, wi->origin.y, wi->size.cx, wi->size.cy, - NULL, bPrimary ? LoadMenu(Globals.hInstance, MAKEINTRESOURCE(MAIN_MENU)) : 0, - Globals.hInstance, win); + hWnd = CreateWindowEx(ex_style, MAIN_WIN_CLASS_NAME, + wi->caption, + bPrimary ? WS_OVERLAPPEDWINDOW : wi->win_style, + wi->origin.x, wi->origin.y, wi->size.cx, wi->size.cy, + NULL, bPrimary ? LoadMenu(Globals.hInstance, MAKEINTRESOURCE(MAIN_MENU)) : 0, + Globals.hInstance, win); + /* Create button box and text Window */ + if (!bPopup) + CreateWindow(BUTTON_BOX_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_BUTTON, Globals.hInstance, win); + + CreateWindow(TEXT_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_TEXT, Globals.hInstance, win); + + WINHELP_LayoutMainWindow(win); + if (bPopup) Globals.hPopupWnd = hWnd; ShowWindow(hWnd, nCmdShow); UpdateWindow(hWnd); @@ -728,23 +740,12 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, win->hMainWnd = hWnd; break; - case WM_CREATE: - win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - - /* Create button box and text Window */ - CreateWindow(BUTTON_BOX_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, - 0, 0, 0, 0, hWnd, 0, Globals.hInstance, win); - - CreateWindow(TEXT_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, - 0, 0, 0, 0, hWnd, 0, Globals.hInstance, win); - - /* Fall through */ case WM_WINDOWPOSCHANGED: WINHELP_LayoutMainWindow((WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0)); break; case WM_COMMAND: - Globals.active_win = win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); switch (wParam) { /* Menu FILE */ @@ -772,7 +773,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, if (wParam == button->wParam) break; if (button) MACRO_ExecuteMacro(button->lpszMacro); - else + else if (!HIWORD(wParam)) WINHELP_MessageBoxIDS(STID_NOT_IMPLEMENTED, 0x121, MB_OK); break; } @@ -825,6 +826,19 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, return 0; } break; + case WM_NCDESTROY: + { + 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); + + if (bExit) MACRO_Exit(); + if (!Globals.win_list) + PostQuitMessage(0); + } + break; } return DefWindowProc(hWnd, msg, wParam, lParam); } @@ -955,7 +969,6 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, POINT mouse; INT scroll_pos; HWND hPopupWnd; - BOOL bExit; if (msg != WM_LBUTTONDOWN) WINHELP_CheckPopup(msg); @@ -967,7 +980,6 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, SetWindowLongPtr(hWnd, 0, (ULONG_PTR) win); win->hTextWnd = hWnd; win->hBrush = CreateSolidBrush(win->info->sr_color); - if (win->info->win_style & WS_POPUP) Globals.hPopupWnd = win->hMainWnd = hWnd; WINHELP_InitFonts(hWnd); break; @@ -985,12 +997,13 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, SIZE new_client_size; SIZE new_window_size; - GetWindowRect(hWnd, &old_window_rect); + GetWindowRect(GetParent(hWnd), &old_window_rect); origin.x = old_window_rect.left; origin.y = old_window_rect.top; old_window_size.cx = old_window_rect.right - old_window_rect.left; old_window_size.cy = old_window_rect.bottom - old_window_rect.top; + WINHELP_LayoutMainWindow(win); GetClientRect(hWnd, &old_client_rect); old_client_size.cx = old_client_rect.right - old_client_rect.left; old_client_size.cy = old_client_rect.bottom - old_client_rect.top; @@ -1012,7 +1025,7 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, new_window_size.cx, new_window_size.cy, 0, 0, Globals.hInstance, 0); - SetWindowPos(hWnd, HWND_TOP, origin.x, origin.y, + SetWindowPos(GetParent(hWnd), HWND_TOP, origin.x, origin.y, new_window_size.cx, new_window_size.cy, 0); SetWindowPos(win->hShadowWnd, hWnd, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); @@ -1253,20 +1266,6 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, DestroyWindow(hPopupWnd); break; - case WM_NCDESTROY: - win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - - if (hWnd == Globals.hPopupWnd) Globals.hPopupWnd = 0; - - bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->lpszName, "main")); - - WINHELP_DeleteWindow(win); - - if (bExit) MACRO_Exit(); - - if (!Globals.win_list) - PostQuitMessage(0); - break; } return DefWindowProc(hWnd, msg, wParam, lParam);

1 0

Eric Pouech : winhelp: Removed no longer needed field (wStringTableOffset) in Globals.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 4c236530efab5cb49f96fae512646c59115bf125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c236530efab5cb49f96fae51… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:05 2008 +0200 winhelp: Removed no longer needed field (wStringTableOffset) in Globals. --- programs/winhelp/winhelp.c | 2 +- programs/winhelp/winhelp.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 92c1e79..75559b2 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -55,7 +55,7 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW*); static void WINHELP_SetupText(HWND hWnd); static WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW*, WPARAM, LPARAM); -WINHELP_GLOBALS Globals = {3, NULL, NULL, 0, TRUE, NULL, NULL, NULL, NULL}; +WINHELP_GLOBALS Globals = {3, NULL, NULL, TRUE, NULL, NULL, NULL, NULL}; /*********************************************************************** diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index 0628c7d..b07044c 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -159,7 +159,6 @@ typedef struct UINT wVersion; HANDLE hInstance; HWND hPopupWnd; - UINT wStringTableOffset; BOOL isBook; WINHELP_WINDOW* active_win; WINHELP_WINDOW* win_list;

1 0