wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

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: 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: 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: 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

Eric Pouech : winhelp: Moved all static data used when parsing HLP files into the internal structures .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a1072794107e54927df6f56f7e94b737bc8dc0aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1072794107e54927df6f56f7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:33:57 2008 +0200 winhelp: Moved all static data used when parsing HLP files into the internal structures. --- programs/winhelp/hlpfile.c | 209 ++++++++++++++++++++------------------------ programs/winhelp/hlpfile.h | 11 ++- 2 files changed, 104 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1072794107e54927df6f…

1 0

Eric Pouech : winhelp: Add an (ugly) icon.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 077964a8d4dd9c695196f43cdef32437f2468087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=077964a8d4dd9c695196f43cd… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:33:45 2008 +0200 winhelp: Add an (ugly) icon. --- programs/winhelp/rsrc.rc | 3 +++ programs/winhelp/winhelp.c | 2 +- programs/winhelp/winhelp.ico | Bin 0 -> 766 bytes programs/winhelp/winhelp_res.h | 2 ++ 4 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/rsrc.rc b/programs/winhelp/rsrc.rc index c8a6417..4dc7d23 100644 --- a/programs/winhelp/rsrc.rc +++ b/programs/winhelp/rsrc.rc @@ -25,6 +25,9 @@ #include "winhelp.h" #include "winhelp_res.h" +/* @makedep: winhelp.ico */ +IDI_WINHELP ICON DISCARDABLE winhelp.ico + #include "Bg.rc" #include "Cs.rc" #include "Da.rc" diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index b9c435f..65c7e20 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -324,7 +324,7 @@ static BOOL WINHELP_RegisterWinClasses(void) class_main.cbClsExtra = 0; class_main.cbWndExtra = sizeof(LONG); class_main.hInstance = Globals.hInstance; - class_main.hIcon = LoadIcon(0, IDI_APPLICATION); + class_main.hIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_WINHELP)); class_main.hCursor = LoadCursor(0, IDC_ARROW); class_main.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); class_main.lpszMenuName = 0; diff --git a/programs/winhelp/winhelp.ico b/programs/winhelp/winhelp.ico new file mode 100644 index 0000000..7e5c6d6 Binary files /dev/null and b/programs/winhelp/winhelp.ico differ diff --git a/programs/winhelp/winhelp_res.h b/programs/winhelp/winhelp_res.h index 14ec13f..d58de61 100644 --- a/programs/winhelp/winhelp_res.h +++ b/programs/winhelp/winhelp_res.h @@ -33,3 +33,5 @@ #define IDD_INDEX 0x150 #define IDC_INDEXLIST 0x151 + +#define IDI_WINHELP 0xF00

1 0

Eric Pouech : winhelp: Get rid of the WM_USER message.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: d58ab515dfef1406fbf746665101b3a1d9a6370d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58ab515dfef1406fbf746665… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:33:51 2008 +0200 winhelp: Get rid of the WM_USER message. --- programs/winhelp/macro.c | 4 +- programs/winhelp/winhelp.c | 48 ++++++++++++++++++++++++------------------- programs/winhelp/winhelp.h | 1 + 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index 68863bf..1f824f8 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -300,7 +300,7 @@ void CALLBACK MACRO_ChangeButtonBinding(LPCSTR id, LPCSTR macro) *b = button; - SendMessage(win->hMainWnd, WM_USER, 0, 0); + WINHELP_LayoutMainWindow(win); } void CALLBACK MACRO_ChangeEnable(LPCSTR id, LPCSTR macro) @@ -407,7 +407,7 @@ void CALLBACK MACRO_CreateButton(LPCSTR id, LPCSTR name, LPCSTR macro) button->wParam = max(button->wParam, (*b)->wParam + 1); *b = button; - SendMessage(win->hMainWnd, WM_USER, 0, 0); + WINHELP_LayoutMainWindow(win); } void CALLBACK MACRO_DeleteItem(LPCSTR str) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 65c7e20..92c1e79 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -449,6 +449,29 @@ static LRESULT WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam) return 1; } +void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) +{ + RECT rect, button_box_rect; + INT text_top; + + GetClientRect(win->hMainWnd, &rect); + + /* Update button box and text Window */ + SetWindowPos(win->hButtonBoxWnd, HWND_TOP, + rect.left, rect.top, + 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; + + SetWindowPos(win->hTextWnd, HWND_TOP, + rect.left, text_top, + rect.right - rect.left, + rect.bottom - text_top, 0); + +} + /****************************************************************** * WINHELP_ReuseWindow * @@ -478,7 +501,7 @@ static BOOL WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin, WINHELP_SetupText(win->hTextWnd); InvalidateRect(win->hTextWnd, NULL, TRUE); - SendMessage(win->hMainWnd, WM_USER, 0, 0); + WINHELP_LayoutMainWindow(win); ShowWindow(win->hMainWnd, nCmdShow); UpdateWindow(win->hTextWnd); @@ -692,8 +715,8 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, { WINHELP_WINDOW *win; WINHELP_BUTTON *button; - RECT rect, button_box_rect; - INT text_top, curPos, min, max, dy, keyDelta; + RECT rect; + INT curPos, min, max, dy, keyDelta; WINHELP_CheckPopup(msg); @@ -716,25 +739,8 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, 0, 0, 0, 0, hWnd, 0, Globals.hInstance, win); /* Fall through */ - case WM_USER: case WM_WINDOWPOSCHANGED: - win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - GetClientRect(hWnd, &rect); - - /* Update button box and text Window */ - SetWindowPos(win->hButtonBoxWnd, HWND_TOP, - rect.left, rect.top, - 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; - - SetWindowPos(win->hTextWnd, HWND_TOP, - rect.left, text_top, - rect.right - rect.left, - rect.bottom - text_top, 0); - + WINHELP_LayoutMainWindow((WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0)); break; case WM_COMMAND: diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index abe68ea..0628c7d 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -180,6 +180,7 @@ 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); +void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win); extern const char MAIN_WIN_CLASS_NAME[]; extern const char BUTTON_BOX_WIN_CLASS_NAME[];

1 0

Rob Shearman : widl: Add support for '%' operator in expressions.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: ea9932557af5d30dc652d27edc3548664cb879c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9932557af5d30dc652d27ed… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:16:10 2008 +0100 widl: Add support for '%' operator in expressions. --- tools/widl/header.c | 2 ++ tools/widl/parser.y | 10 +++++++++- tools/widl/typegen.c | 3 +++ tools/widl/widltypes.h | 1 + 4 files changed, 15 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 6989149..e1dccce 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -520,6 +520,7 @@ void write_expr(FILE *h, const expr_t *e, int brackets) break; case EXPR_SHL: case EXPR_SHR: + case EXPR_MOD: case EXPR_MUL: case EXPR_DIV: case EXPR_ADD: @@ -533,6 +534,7 @@ void write_expr(FILE *h, const expr_t *e, int brackets) switch (e->type) { case EXPR_SHL: fprintf(h, " << "); break; case EXPR_SHR: fprintf(h, " >> "); break; + case EXPR_MOD: fprintf(h, " %% "); break; case EXPR_MUL: fprintf(h, " * "); break; case EXPR_DIV: fprintf(h, " / "); break; case EXPR_ADD: fprintf(h, " + "); break; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 32752bf..31f631f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -293,7 +293,7 @@ static void add_explicit_handle_if_necessary(func_t *func); %left '|' %left '&' %left '-' '+' -%left '*' '/' +%left '*' '/' '%' %left SHL SHR %left '.' MEMBERPTR '[' ']' %right '~' @@ -632,6 +632,7 @@ expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | expr '&' expr { $$ = make_expr2(EXPR_AND, $1, $3); } | expr '+' expr { $$ = make_expr2(EXPR_ADD, $1, $3); } | expr '-' expr { $$ = make_expr2(EXPR_SUB, $1, $3); } + | expr '%' expr { $$ = make_expr2(EXPR_MOD, $1, $3); } | expr '*' expr { $$ = make_expr2(EXPR_MUL, $1, $3); } | expr '/' expr { $$ = make_expr2(EXPR_DIV, $1, $3); } | expr SHL expr { $$ = make_expr2(EXPR_SHL, $1, $3); } @@ -1238,6 +1239,13 @@ static expr_t *make_expr2(enum expr_type type, expr_t *expr1, expr_t *expr2) case EXPR_SUB: e->cval = expr1->cval - expr2->cval; break; + case EXPR_MOD: + if (expr2->cval == 0) { + error_loc("divide by zero in expression\n"); + e->cval = 0; + } else + e->cval = expr1->cval % expr2->cval; + break; case EXPR_MUL: e->cval = expr1->cval * expr2->cval; break; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index da5c95a..575f06c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -352,6 +352,7 @@ static int compare_expr(const expr_t *a, const expr_t *b) case EXPR_AND: case EXPR_ADD: case EXPR_SUB: + case EXPR_MOD: case EXPR_MUL: case EXPR_DIV: case EXPR_SHL: @@ -3148,6 +3149,7 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, break; case EXPR_SHL: case EXPR_SHR: + case EXPR_MOD: case EXPR_MUL: case EXPR_DIV: case EXPR_ADD: @@ -3161,6 +3163,7 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, switch (e->type) { case EXPR_SHL: fprintf(h, " << "); break; case EXPR_SHR: fprintf(h, " >> "); break; + case EXPR_MOD: fprintf(h, " %% "); break; case EXPR_MUL: fprintf(h, " * "); break; case EXPR_DIV: fprintf(h, " / "); break; case EXPR_ADD: fprintf(h, " + "); break; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 31c7599..879c7a9 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -164,6 +164,7 @@ enum expr_type EXPR_MEMBERPTR, EXPR_MEMBER, EXPR_ARRAY, + EXPR_MOD, }; enum type_kind

1 0

Roderick Colenbrander : wined3d: Add palette re-upload support for cards with hardware palette support.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: f2753d71898547dbca6d12429e4de552b7edd666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2753d71898547dbca6d12429… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Apr 20 14:50:00 2008 +0000 wined3d: Add palette re-upload support for cards with hardware palette support. Before it was broken and when it worked it was slow due to unneeded gpu -> cpu -> gpu copying. --- dlls/wined3d/surface.c | 51 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 31c8e4f..7da9d92 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey); +static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert); static inline void clear_unused_channels(IWineD3DSurfaceImpl *This); static void surface_remove_pbo(IWineD3DSurfaceImpl *This); @@ -3638,12 +3639,49 @@ HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { if(This->resource.format == WINED3DFMT_P8 || This->resource.format == WINED3DFMT_A8P8) { - if(!(This->Flags & SFLAG_INSYSMEM)) { - TRACE("Palette changed with surface that does not have an up to date system memory copy\n"); - IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + int bpp; + GLenum format, internal, type; + CONVERT_TYPES convert; + + /* Check if we are using a RTL mode which uses texturing for uploads */ + BOOL use_texture = (wined3d_settings.rendertargetlock_mode == RTL_READTEX || wined3d_settings.rendertargetlock_mode == RTL_TEXTEX); + + /* Check if we have hardware palette conversion if we have convert is set to NO_CONVERSION */ + d3dfmt_get_conv(This, TRUE, use_texture, &format, &internal, &type, &convert, &bpp, This->srgb); + + if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && (convert == NO_CONVERSION)) + { + ENTER_GL(); + if (This->glDescription.textureName == 0) { + glGenTextures(1, &This->glDescription.textureName); + checkGLcall("glGenTextures"); + } + glBindTexture(This->glDescription.target, This->glDescription.textureName); + checkGLcall("glBindTexture(This->glDescription.target, This->glDescription.textureName)"); + LEAVE_GL(); + + /* Make sure the texture is up to date. This call doesn't do anything if the texture is already up to date. */ + IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL); + + /* We want to force a palette refresh, so mark the drawable as not being up to date */ + IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); + + /* Re-upload the palette */ + d3dfmt_p8_upload_palette(iface, convert); + + /* Without this some palette updates are missed. This at least happens on Nvidia drivers but + * it works fine using Mesa. */ + ENTER_GL(); + glFlush(); + LEAVE_GL(); + } else { + if(!(This->Flags & SFLAG_INSYSMEM)) { + TRACE("Palette changed with surface that does not have an up to date system memory copy\n"); + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + } + TRACE("Dirtifying surface\n"); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); } - TRACE("Dirtifying surface\n"); - IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); } if(This->Flags & SFLAG_DIBSECTION) { @@ -3657,8 +3695,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { SetDIBColorTable(This->hDC, 0, 256, col); } - /* Propagate the changes to the drawable when we have a palette. - * TODO: in case of hardware p8 palettes we should only upload the palette. */ + /* Propagate the changes to the drawable when we have a palette. */ if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, NULL);

1 0

ByeongSik Jeon : winecfg: Update Korean translation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 69e525022f04cee47b0c8ea6e2d7bf01279bfe87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69e525022f04cee47b0c8ea6e… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Mon Apr 21 10:58:15 2008 +0900 winecfg: Update Korean translation. --- programs/winecfg/Ko.rc | 82 ++++++++++++++++++++++++------------------------ 1 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69e525022f04cee47b0c8…

1 0

Rob Shearman : widl: Issue an error instead of crashing for dividing by zero in a constant expression .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: efd10742ec02ec14fe080f8b69244ecbae920798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd10742ec02ec14fe080f8b6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:36 2008 +0100 widl: Issue an error instead of crashing for dividing by zero in a constant expression. --- tools/widl/parser.y | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6f5dbdd..c7fbe42 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1237,7 +1237,11 @@ static expr_t *make_expr2(enum expr_type type, expr_t *expr1, expr_t *expr2) e->cval = expr1->cval * expr2->cval; break; case EXPR_DIV: - e->cval = expr1->cval / expr2->cval; + if (expr2->cval == 0) { + error_loc("divide by zero in expression\n"); + e->cval = 0; + } else + e->cval = expr1->cval / expr2->cval; break; case EXPR_OR: e->cval = expr1->cval | expr2->cval;

1 0

Rob Shearman : widl: Add support for "->" and "." operators in expressions.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 03d5017416adfd47fe86d8ecf97af8a028ca7748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d5017416adfd47fe86d8ecf… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:43 2008 +0100 widl: Add support for "->" and "." operators in expressions. --- tools/widl/header.c | 4 ++++ tools/widl/parser.l | 1 + tools/widl/parser.y | 6 +++++- tools/widl/typegen.c | 6 ++++++ tools/widl/widltypes.h | 2 ++ 5 files changed, 18 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 3c89d61..d2f7ca7 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -526,6 +526,8 @@ void write_expr(FILE *h, const expr_t *e, int brackets) case EXPR_SUB: case EXPR_AND: case EXPR_OR: + case EXPR_MEMBERPTR: + case EXPR_MEMBER: if (brackets) fprintf(h, "("); write_expr(h, e->ref, 1); switch (e->type) { @@ -537,6 +539,8 @@ void write_expr(FILE *h, const expr_t *e, int brackets) case EXPR_SUB: fprintf(h, " - "); break; case EXPR_AND: fprintf(h, " & "); break; case EXPR_OR: fprintf(h, " | "); break; + case EXPR_MEMBERPTR: fprintf(h, "->"); break; + case EXPR_MEMBER: fprintf(h, "."); break; default: break; } write_expr(h, e->u.ext, 1); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 5b24b26..3439ea6 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -162,6 +162,7 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; <INITIAL,ATTR>{ws} <INITIAL,ATTR>\<\< return SHL; <INITIAL,ATTR>\>\> return SHR; +<INITIAL,ATTR>\-\> return MEMBERPTR; <INITIAL,ATTR>. return yytext[0]; <<EOF>> { if (import_stack_ptr) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c7fbe42..61a1252 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -180,6 +180,7 @@ static void add_explicit_handle_if_necessary(func_t *func); %token <uuid> aUUID %token aEOF %token SHL SHR +%token MEMBERPTR %token tAGGREGATABLE tALLOCATE tAPPOBJECT tASYNC tASYNCUUID %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS @@ -294,6 +295,7 @@ static void add_explicit_handle_if_necessary(func_t *func); %left '-' '+' %left '*' '/' %left SHL SHR +%left '.' MEMBERPTR %right '~' %right CAST %right PPTR @@ -636,8 +638,10 @@ expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | expr SHR expr { $$ = make_expr2(EXPR_SHR, $1, $3); } | '~' expr { $$ = make_expr1(EXPR_NOT, $2); } | '-' expr %prec NEG { $$ = make_expr1(EXPR_NEG, $2); } - | '&' expr %prec ADDRESSOF { $$ = make_expr1(EXPR_ADDRESSOF, $2); } + | '&' expr %prec ADDRESSOF { $$ = make_expr1(EXPR_ADDRESSOF, $2); } | '*' expr %prec PPTR { $$ = make_expr1(EXPR_PPTR, $2); } + | expr MEMBERPTR expr { $$ = make_expr2(EXPR_MEMBERPTR, $1, $3); } + | expr '.' expr { $$ = make_expr2(EXPR_MEMBER, $1, $3); } | '(' type ')' expr %prec CAST { $$ = make_exprt(EXPR_CAST, $2, $4); } | tSIZEOF '(' type ')' { $$ = make_exprt(EXPR_SIZEOF, $3, NULL); } | '(' expr ')' { $$ = $2; } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 32e557f..b298403 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -356,6 +356,8 @@ static int compare_expr(const expr_t *a, const expr_t *b) case EXPR_DIV: case EXPR_SHL: case EXPR_SHR: + case EXPR_MEMBERPTR: + case EXPR_MEMBER: ret = compare_expr(a->ref, b->ref); if (ret != 0) return ret; @@ -3151,6 +3153,8 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, case EXPR_SUB: case EXPR_AND: case EXPR_OR: + case EXPR_MEMBERPTR: + case EXPR_MEMBER: if (brackets) fprintf(h, "("); write_struct_expr(h, e->ref, 1, fields, structvar); switch (e->type) { @@ -3162,6 +3166,8 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, case EXPR_SUB: fprintf(h, " - "); break; case EXPR_AND: fprintf(h, " & "); break; case EXPR_OR: fprintf(h, " | "); break; + case EXPR_MEMBERPTR: fprintf(h, "->"); break; + case EXPR_MEMBER: fprintf(h, "."); break; default: break; } write_struct_expr(h, e->u.ext, 1, fields, structvar); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index dfae4dd..256a3ad 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -161,6 +161,8 @@ enum expr_type EXPR_COND, EXPR_TRUEFALSE, EXPR_ADDRESSOF, + EXPR_MEMBERPTR, + EXPR_MEMBER, }; enum type_kind

1 0

Rob Shearman : widl: Add support for arrays in expressions.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: d27c7601e5d1e4b6107aae11a0273a91235f6a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d27c7601e5d1e4b6107aae11a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:16:00 2008 +0100 widl: Add support for arrays in expressions. --- tools/widl/header.c | 8 ++++++++ tools/widl/parser.y | 3 ++- tools/widl/typegen.c | 9 +++++++++ tools/widl/widltypes.h | 1 + 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index d2f7ca7..6989149 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -559,6 +559,14 @@ void write_expr(FILE *h, const expr_t *e, int brackets) fprintf(h, "&"); write_expr(h, e->ref, 1); break; + case EXPR_ARRAY: + if (brackets) fprintf(h, "("); + write_expr(h, e->ref, 1); + fprintf(h, "["); + write_expr(h, e->u.ext, 1); + fprintf(h, "]"); + if (brackets) fprintf(h, ")"); + break; } } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 61a1252..32752bf 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -295,7 +295,7 @@ static void add_explicit_handle_if_necessary(func_t *func); %left '-' '+' %left '*' '/' %left SHL SHR -%left '.' MEMBERPTR +%left '.' MEMBERPTR '[' ']' %right '~' %right CAST %right PPTR @@ -644,6 +644,7 @@ expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | expr '.' expr { $$ = make_expr2(EXPR_MEMBER, $1, $3); } | '(' type ')' expr %prec CAST { $$ = make_exprt(EXPR_CAST, $2, $4); } | tSIZEOF '(' type ')' { $$ = make_exprt(EXPR_SIZEOF, $3, NULL); } + | expr '[' expr ']' { $$ = make_expr2(EXPR_ARRAY, $1, $3); } | '(' expr ')' { $$ = $2; } ; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b298403..da5c95a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -358,6 +358,7 @@ static int compare_expr(const expr_t *a, const expr_t *b) case EXPR_SHR: case EXPR_MEMBERPTR: case EXPR_MEMBER: + case EXPR_ARRAY: ret = compare_expr(a->ref, b->ref); if (ret != 0) return ret; @@ -3186,6 +3187,14 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, fprintf(h, "&"); write_struct_expr(h, e->ref, 1, fields, structvar); break; + case EXPR_ARRAY: + if (brackets) fprintf(h, "("); + write_struct_expr(h, e->ref, 1, fields, structvar); + fprintf(h, "["); + write_struct_expr(h, e->u.ext, 1, fields, structvar); + fprintf(h, "]"); + if (brackets) fprintf(h, ")"); + break; } } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 256a3ad..31c7599 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -163,6 +163,7 @@ enum expr_type EXPR_ADDRESSOF, EXPR_MEMBERPTR, EXPR_MEMBER, + EXPR_ARRAY, }; enum type_kind

1 0

Rob Shearman : widl: Automatically add "handle_t IDL_handle" parameter to functions with no explicit handle specified whose containing interface has the explicit_handle attribute .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: c46fcfb356b31431cc34de1f9c6a7599db317abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46fcfb356b31431cc34de1f9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:29 2008 +0100 widl: Automatically add "handle_t IDL_handle" parameter to functions with no explicit handle specified whose containing interface has the explicit_handle attribute. --- tools/widl/client.c | 20 -------------------- tools/widl/header.c | 14 ++++++++++++++ tools/widl/header.h | 1 + tools/widl/parser.y | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 20 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index b3f89a7..d15dfdc 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -70,25 +70,10 @@ static void check_pointers(const func_t *func) } } -const var_t* get_context_handle_var(const func_t* func) -{ - const var_t* var; - - if (!func->args) - return NULL; - - LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) - if (is_attr(var->attrs, ATTR_IN) && is_context_handle(var->type)) - return var; - - return NULL; -} - static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { const func_t *func; const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); const var_t *var; int method_count = 0; @@ -110,12 +95,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { explicit_generic_handle_var = get_explicit_generic_handle_var(func); if (!explicit_generic_handle_var) - { context_handle_var = get_context_handle_var(func); - if (!context_handle_var && explicit_handle) - /* FIXME: should use automatically added IDL_handle parameter */ - error("explicit_handle attribute specified and %s() does not define an explicit binding handle - not implemented yet\n", def->name); - } } write_type_decl_left(client, get_func_return_type(func)); diff --git a/tools/widl/header.c b/tools/widl/header.c index 8668ce9..3c89d61 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -618,6 +618,20 @@ const var_t* get_explicit_generic_handle_var(const func_t* func) return NULL; } +const var_t* get_context_handle_var(const func_t* func) +{ + const var_t* var; + + if (!func->args) + return NULL; + + LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) + if (is_attr(var->attrs, ATTR_IN) && is_context_handle(var->type)) + return var; + + return NULL; +} + int has_out_arg_or_return(const func_t *func) { const var_t *var; diff --git a/tools/widl/header.h b/tools/widl/header.h index 3f4fee2..e8fdbc9 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -66,6 +66,7 @@ extern void write_generic_handle_routines(void); extern const var_t* get_explicit_handle_var(const func_t* func); extern const type_t* get_explicit_generic_handle_type(const var_t* var); extern const var_t* get_explicit_generic_handle_var(const func_t* func); +extern const var_t* get_context_handle_var(const func_t* func); extern int has_out_arg_or_return(const func_t *func); extern void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4d04546..6f5dbdd 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -142,6 +142,7 @@ static attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs); static const attr_list_t *check_module_attrs(const char *name, const attr_list_t *attrs); static const attr_list_t *check_coclass_attrs(const char *name, const attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); +static void add_explicit_handle_if_necessary(func_t *func); #define tsENUM 1 #define tsSTRUCT 2 @@ -2482,8 +2483,48 @@ static void check_remoting_args(const func_t *func) } } +static void add_explicit_handle_if_necessary(func_t *func) +{ + const var_t* explicit_handle_var; + const var_t* explicit_generic_handle_var = NULL; + const var_t* context_handle_var = NULL; + + /* check for a defined binding handle */ + explicit_handle_var = get_explicit_handle_var(func); + if (!explicit_handle_var) + { + explicit_generic_handle_var = get_explicit_generic_handle_var(func); + if (!explicit_generic_handle_var) + { + context_handle_var = get_context_handle_var(func); + if (!context_handle_var) + { + /* no explicit handle specified so add + * "[in] handle_t IDL_handle" as the first parameter to the + * function */ + var_t *idl_handle = make_var(xstrdup("IDL_handle")); + idl_handle->attrs = append_attr(NULL, make_attr(ATTR_IN)); + idl_handle->type = find_type("handle_t", 0); + if (!func->def->type->fields_or_args) + { + func->def->type->fields_or_args = xmalloc( sizeof(*func->def->type->fields_or_args) ); + list_init( func->def->type->fields_or_args ); + } + list_add_head( func->def->type->fields_or_args, &idl_handle->entry ); + func->args = func->def->type->fields_or_args; + } + } + } +} + static void check_functions(const type_t *iface) { + if (is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE) && iface->funcs) + { + func_t *func; + LIST_FOR_EACH_ENTRY( func, iface->funcs, func_t, entry ) + add_explicit_handle_if_necessary(func); + } if (!is_inside_library && !is_attr(iface->attrs, ATTR_LOCAL)) { const func_t *func;

1 0

Rob Shearman : widl: The implicit_handle attribute is allowed with a handle explicitly specified in the function parameters .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: c4ca32bbdafb87a01ca6047ca033bde32859f8de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ca32bbdafb87a01ca6047ca… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:24 2008 +0100 widl: The implicit_handle attribute is allowed with a handle explicitly specified in the function parameters. In that case, that handle is used instead of the implicit handle. Fix the check for the explicit_handle attribute being specified without a handle being specified in the function parameters, even though issuing an error is wrong. (Thanks to Marcus Meissner & Coverity for spotting that the check didn't do what it was supposed to do.) --- tools/widl/client.c | 31 ++++++++++--------------------- tools/widl/header.c | 19 ------------------- tools/widl/server.c | 18 ------------------ 3 files changed, 10 insertions(+), 58 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index eb1ade2..b3f89a7 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -110,22 +110,11 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { explicit_generic_handle_var = get_explicit_generic_handle_var(func); if (!explicit_generic_handle_var) - context_handle_var = get_context_handle_var(func); - } - if (explicit_handle) - { - if (!explicit_handle_var || !explicit_generic_handle_var || !context_handle_var) { - error("%s() does not define an explicit binding handle!\n", def->name); - return; - } - } - else if (implicit_handle) - { - if (explicit_handle_var) - { - error("%s() must not define a binding handle!\n", def->name); - return; + context_handle_var = get_context_handle_var(func); + if (!context_handle_var && explicit_handle) + /* FIXME: should use automatically added IDL_handle parameter */ + error("explicit_handle attribute specified and %s() does not define an explicit binding handle - not implemented yet\n", def->name); } } @@ -196,12 +185,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) fprintf(client, ");\n\n"); } - if (implicit_handle) - { - print_client("_Handle = %s;\n", implicit_handle); - fprintf(client, "\n"); - } - else if (explicit_handle_var) + if (explicit_handle_var) { print_client("_Handle = %s;\n", explicit_handle_var->name); fprintf(client, "\n"); @@ -225,6 +209,11 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) indent--; fprintf(client, "\n"); } + else if (implicit_handle) + { + print_client("_Handle = %s;\n", implicit_handle); + fprintf(client, "\n"); + } write_remoting_arguments(client, indent, func, PASS_IN, PHASE_BUFFERSIZE); diff --git a/tools/widl/header.c b/tools/widl/header.c index dcc3480..8668ce9 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -896,31 +896,12 @@ static void write_function_proto(const type_t *iface, const func_t *fun, const c static void write_function_protos(const type_t *iface) { - const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); - const var_t* explicit_handle_var; const func_t *cur; int prefixes_differ = strcmp(prefix_client, prefix_server); if (!iface->funcs) return; LIST_FOR_EACH_ENTRY( cur, iface->funcs, const func_t, entry ) { - var_t *def = cur->def; - - /* check for a defined binding handle */ - explicit_handle_var = get_explicit_handle_var(cur); - if (explicit_handle) { - if (!explicit_handle_var) { - error("%s() does not define an explicit binding handle!\n", def->name); - return; - } - } else if (implicit_handle) { - if (explicit_handle_var) { - error("%s() must not define a binding handle!\n", def->name); - return; - } - } - if (prefixes_differ) { fprintf(header, "/* client prototype */\n"); write_function_proto(iface, cur, prefix_client); diff --git a/tools/widl/server.c b/tools/widl/server.c index 2efb712..bb16c54 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -50,8 +50,6 @@ static void print_server(const char *format, ...) static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { - char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); const func_t *func; const var_t *var; const var_t* explicit_handle_var; @@ -64,22 +62,6 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); - if (explicit_handle) - { - if (!explicit_handle_var) - { - error("%s() does not define an explicit binding handle!\n", def->name); - return; - } - } - else if (implicit_handle) - { - if (explicit_handle_var) - { - error("%s() must not define a binding handle!\n", def->name); - return; - } - } fprintf(server, "void __RPC_STUB\n"); fprintf(server, "%s_", iface->name);

1 0

Rob Shearman : widl: Check that fields in structures and unions referenced by non-local functions can be marshalled and that their attributes are consistent .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 15612e60fd20138baa0fe20c24ff3f2c447ad40f URL: http://source.winehq.org/git/wine.git/?a=commit;h=15612e60fd20138baa0fe20c2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:16 2008 +0100 widl: Check that fields in structures and unions referenced by non-local functions can be marshalled and that their attributes are consistent. --- tools/widl/parser.y | 95 +++++++++++++++++++++++++++++++++++++++++------- tools/widl/widltypes.h | 1 + 2 files changed, 82 insertions(+), 14 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d4ba87a..4d04546 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1352,6 +1352,7 @@ static type_t *make_type(unsigned char type, type_t *ref) t->written = FALSE; t->user_types_registered = FALSE; t->tfswrite = FALSE; + t->checked = FALSE; t->typelib_idx = -1; return t; } @@ -2359,6 +2360,83 @@ static const attr_list_t *check_coclass_attrs(const char *name, const attr_list_ return attrs; } +static void check_remoting_fields(type_t *type); + +/* checks that properties common to fields and arguments are consistent */ +static void check_field_common(const char *container_type, + const char *container_name, const var_t *arg) +{ + type_t *type = arg->type; + int is_wire_marshal = 0; + int is_context_handle = 0; + + if (is_attr(arg->attrs, ATTR_LENGTHIS) && + (is_attr(arg->attrs, ATTR_STRING) || is_aliaschain_attr(arg->type, ATTR_STRING))) + error_loc_info(&arg->loc_info, + "string and length_is specified for argument %s are mutually exclusive attributes\n", + arg->name); + + /* get fundamental type for the argument */ + for (;;) + { + if (is_attr(type->attrs, ATTR_WIREMARSHAL)) + { + is_wire_marshal = 1; + break; + } + if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) + { + is_context_handle = 1; + break; + } + if (type->kind == TKIND_ALIAS) + type = type->orig; + else if (is_ptr(type) || is_array(type)) + type = type->ref; + else + break; + } + + if (type->type == 0 && !is_attr(arg->attrs, ATTR_IIDIS) && !is_wire_marshal && !is_context_handle) + error_loc_info(&arg->loc_info, "parameter \'%s\' of %s \'%s\' cannot derive from void *\n", arg->name, container_type, container_name); + else if (type->type == RPC_FC_FUNCTION) + error_loc_info(&arg->loc_info, "parameter \'%s\' of %s \'%s\' cannot be a function pointer\n", arg->name, container_type, container_name); + else if (!is_wire_marshal && (is_struct(type->type) || is_union(type->type))) + check_remoting_fields(type); +} + +static void check_remoting_fields(type_t *type) +{ + const char *container_type = NULL; + const var_t *field; + const var_list_t *fields = NULL; + + if (type->checked) + return; + + type->checked = TRUE; + + if (is_struct(type->type)) + { + fields = type->fields_or_args; + container_type = "structure"; + } + else if (is_union(type->type)) + { + if (type->type == RPC_FC_ENCAPSULATED_UNION) + { + const var_t *uv = LIST_ENTRY(list_tail(type->fields_or_args), const var_t, entry); + fields = uv->type->fields_or_args; + } + else + fields = type->fields_or_args; + container_type = "union"; + } + + if (fields) LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry ) + if (field->type) check_field_common(container_type, type->name, field); +} + /* checks that arguments for a function make sense for marshalling and unmarshalling */ static void check_remoting_args(const func_t *func) { @@ -2369,22 +2447,14 @@ static void check_remoting_args(const func_t *func) { int ptr_level = 0; const type_t *type = arg->type; - int is_wire_marshal = 0; - int is_context_handle = 0; /* get pointer level and fundamental type for the argument */ for (;;) { - if (!is_wire_marshal && is_attr(type->attrs, ATTR_WIREMARSHAL)) - { - is_wire_marshal = 1; + if (is_attr(type->attrs, ATTR_WIREMARSHAL)) break; - } - if (!is_context_handle && is_attr(type->attrs, ATTR_CONTEXTHANDLE)) - { - is_context_handle = 1; + if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) break; - } if (type->kind == TKIND_ALIAS) type = type->orig; else if (is_ptr(type)) @@ -2408,10 +2478,7 @@ static void check_remoting_args(const func_t *func) } } - if (type->type == 0 && !is_attr(arg->attrs, ATTR_IIDIS) && !is_wire_marshal && !is_context_handle) - error_loc_info(&arg->loc_info, "parameter \'%s\' of function \'%s\' cannot derive from void *\n", arg->name, funcname); - else if (type->type == RPC_FC_FUNCTION) - error_loc_info(&arg->loc_info, "parameter \'%s\' of function \'%s\' cannot be a function pointer\n", arg->name, funcname); + check_field_common("function", funcname, arg); } } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 89d593a..dfae4dd 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -239,6 +239,7 @@ struct _type_t { unsigned int written : 1; unsigned int user_types_registered : 1; unsigned int tfswrite : 1; /* if the type needs to be written to the TFS */ + unsigned int checked : 1; int sign : 2; };

1 0

Rob Shearman : widl: Stop looping in check_remoting_args when a context_handle or wire_marshal type is found as they are in effect fundamental types .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 6e27e7840f49253f068fb175faf25e42a949ad77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e27e7840f49253f068fb175f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:06 2008 +0100 widl: Stop looping in check_remoting_args when a context_handle or wire_marshal type is found as they are in effect fundamental types. --- tools/widl/parser.y | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 45471bb..d4ba87a 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2376,9 +2376,15 @@ static void check_remoting_args(const func_t *func) for (;;) { if (!is_wire_marshal && is_attr(type->attrs, ATTR_WIREMARSHAL)) + { is_wire_marshal = 1; + break; + } if (!is_context_handle && is_attr(type->attrs, ATTR_CONTEXTHANDLE)) + { is_context_handle = 1; + break; + } if (type->kind == TKIND_ALIAS) type = type->orig; else if (is_ptr(type))

1 0

James Hawkins : shdocvw: Fix a test that fails on all platforms.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 03599dbab6e7ee8fc13a340cfa24bc0b25ed2091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03599dbab6e7ee8fc13a340cf… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 20:59:51 2008 -0500 shdocvw: Fix a test that fails on all platforms. --- dlls/shdocvw/tests/shortcut.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/tests/shortcut.c b/dlls/shdocvw/tests/shortcut.c index 202a331..5a740dc 100644 --- a/dlls/shdocvw/tests/shortcut.c +++ b/dlls/shdocvw/tests/shortcut.c @@ -179,12 +179,18 @@ static void test_ShortcutFolder(void) { /* Convert the wszWineTestFolder string to an ITEMIDLIST. */ hr = IShellFolder_ParseDisplayName(pDesktopFolder, NULL, NULL, wszWineTestFolder, NULL, &pidlWineTestFolder, NULL); - ok (SUCCEEDED(hr), "IShellFolder::ParseDisplayName failed! hr = %08x\n", hr); + todo_wine + { + ok (hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), + "Expected %08x, got %08x\n", HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), hr); + } if (FAILED(hr)) { IShellFolder_Release(pDesktopFolder); goto cleanup; } + /* FIXME: these tests are never run */ + /* Bind to a WineTest folder object. There has to be some support for this in shdocvw.dll. * This isn't implemented in wine yet.*/ hr = IShellFolder_BindToObject(pDesktopFolder, pidlWineTestFolder, NULL, &IID_IShellFolder,

1 0

James Hawkins : msi: Fix a few tests that fail in win9x.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a5d15b3b609625ba3b55573d256a6a0f31611b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d15b3b609625ba3b55573d2… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Apr 20 03:07:15 2008 -0500 msi: Fix a few tests that fail in win9x. --- dlls/msi/tests/install.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a85cdd4..fac57c3 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1956,8 +1956,9 @@ static void test_concurrentinstall(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + if (!delete_pf("msitest\\augustus", TRUE)) + trace("concurrent installs not supported\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); DeleteFile(path); @@ -1978,6 +1979,10 @@ static void test_concurrentinstall(void) static void test_setpropertyfolder(void) { UINT r; + CHAR path[MAX_PATH]; + + lstrcpyA(path, PROG_FILES_DIR); + lstrcatA(path, "\\msitest\\added"); CreateDirectoryA("msitest", NULL); create_file("msitest\\maximus", 500); @@ -1988,9 +1993,18 @@ static void test_setpropertyfolder(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\added", FALSE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); + if (GetFileAttributesA(path) == FILE_ATTRIBUTE_DIRECTORY) + { + ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\added", FALSE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + } + else + { + trace("changing folder property not supported\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + } /* Delete the files in the temp (current) folder */ DeleteFile(msifile);

1 0

James Hawkins : advapi32: Fix a test that fails in win2k3.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: d3bbc0231a9a90fa0f29ca1569aaeab5de160555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3bbc0231a9a90fa0f29ca156… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 03:00:42 2008 -0500 advapi32: Fix a test that fails in win2k3. --- dlls/advapi32/tests/registry.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 5d86d9b..e027a97 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -786,9 +786,13 @@ static void test_get_value(void) ret = pRegGetValueA(hkey_main, NULL, "TP1_ZB_SZ", RRF_RT_REG_SZ, &type, buf, &size); ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); /* v5.2.3790.1830 (2003 SP1) returns sTestpath1 length + 2 here. */ - ok(size == 0, "size=%d\n", size); + ok(size == 0 || + size == 1, /* win2k3 */ + "size=%d\n", size); ok(type == REG_SZ, "type=%d\n", type); - ok(!strcmp(sTestpath1, buf), "sTestpath=\"%s\" buf=\"%s\"\n", sTestpath1, buf); + ok(!strcmp(sTestpath1, buf) || + !strcmp(buf, ""), + "Expected \"%s\" or \"\", got \"%s\"\n", sTestpath1, buf); /* Query REG_SZ using RRF_RT_REG_SZ|RRF_NOEXPAND (ok) */ buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf);

1 0

James Hawkins : kernel32: Fix a test that fails in win9x.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 99949cb21a3c2ee413cfb6eb9002209fecb5e88c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99949cb21a3c2ee413cfb6eb9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 15:33:27 2008 -0500 kernel32: Fix a test that fails in win9x. --- dlls/kernel32/tests/atom.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index 2977416..fcf60e2 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -222,7 +222,9 @@ static void test_get_atom_name(void) memset( buf, '.', sizeof(buf) ); len = GlobalGetAtomNameA( atom, buf, 6 ); - ok( len == 0, "bad length %d\n", len ); + ok( len == 0 || + len == 5, /* win9x */ + "bad length %d\n", len ); ok( !memcmp( buf, "fooba\0....", 10 ), "bad buffer contents\n"); if (unicode_OS) {

1 0

James Hawkins : kernel32: Fix two tests that fail in win9x.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 603822ca8bacb75bf69caffce0ce375c4a0893a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=603822ca8bacb75bf69caffce… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 15:40:25 2008 -0500 kernel32: Fix two tests that fail in win9x. --- dlls/kernel32/tests/change.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 7c90ccd..cdba120 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -98,7 +98,9 @@ static void test_FindFirstChangeNotification(void) /* pathetic checks */ change = FindFirstChangeNotificationA("not-a-file", FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); - ok(change == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND, + ok(change == INVALID_HANDLE_VALUE, "Expected INVALID_HANDLE_VALUE, got %p\n", change); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_NO_MORE_FILES, /* win95 */ "FindFirstChangeNotification error: %d\n", GetLastError()); if (0) /* This documents win2k behavior. It crashes on win98. */ @@ -152,17 +154,15 @@ static void test_FindFirstChangeNotification(void) thread = StartNotificationThread(dirname1, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = MoveFileA(dirname1, dirname2); ok(ret, "MoveFileA error: %d\n", GetLastError()); - ret = FinishNotificationThread(thread); - ok(!ret, "Unexpected notification\n"); + /* win9x and win2k behave differently here, don't check result */ + FinishNotificationThread(thread); /* What if we remove the directory we registered notification for? */ thread = StartNotificationThread(dirname2, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = RemoveDirectoryA(dirname2); ok(ret, "RemoveDirectoryA error: %d\n", GetLastError()); - - /* win98 and win2k behave differently here */ - ret = FinishNotificationThread(thread); - ok(ret || !ret, "You'll never read this\n"); + /* win9x and win2k behave differently here, don't check result */ + FinishNotificationThread(thread); /* functional checks */

1 0

James Hawkins : imm32: Fix a test that fails on all systems.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 8422c98df76c6e1eff26037df69d28b4ae084b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8422c98df76c6e1eff26037df… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 20:49:44 2008 -0500 imm32: Fix a test that fails on all systems. --- dlls/imm32/tests/imm32.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index d948f54..a5d09ca 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -177,12 +177,16 @@ static int test_ImmNotifyIME(void) { static const char string[] = "wine"; char resstr[16] = ""; HIMC imc; + BOOL ret; imc = ImmGetContext(hwnd); msg_spy_flush_msgs(); - ok(ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " - "empty composition string succeeds.\n"); + todo_wine + { + ok(!ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " + "empty composition string should fail.\n"); + } ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n"); @@ -191,16 +195,24 @@ static int test_ImmNotifyIME(void) { ImmSetCompositionString(imc, SCS_SETSTR, string, sizeof(string), NULL, 0); ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0); - ok(msg_spy_find_msg(WM_IME_COMPOSITION) != NULL, "Windows does post " - "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " - "the composition string being canceled is non empty.\n"); - ok(!ImmGetCompositionString(imc, GCS_COMPSTR, resstr, sizeof(resstr)), - "After being canceled the composition string is empty.\n"); + todo_wine + { + ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " + "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " + "the composition string being canceled is non empty.\n"); + } + + /* behavior differs between win9x and NT */ + ret = ImmGetCompositionString(imc, GCS_COMPSTR, resstr, sizeof(resstr)); + ok(ret || !ret, "You'll never read this.\n"); msg_spy_flush_msgs(); - ok(ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " - "empty composition string succeeds.\n"); + todo_wine + { + ok(!ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " + "empty composition string should fail.\n"); + } ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n");

1 0

James Hawkins : inetcomm: Fix a test that fails on all systems.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: b8ffcbc35b30d320a4f096ba5c105f0cc0632e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ffcbc35b30d320a4f096ba5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 19 22:06:10 2008 -0500 inetcomm: Fix a test that fails on all systems. --- dlls/inetcomm/tests/mimeole.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index d286b74..bfa721e 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -216,7 +216,6 @@ static void test_CreateMessage(void) ULONG count; FINDBODY find_struct; HCHARSET hcs; - INETCSETINFO csi; char text[] = "text"; HBODY *body_list; @@ -274,7 +273,10 @@ static void test_CreateMessage(void) hr = IMimeBody_GetCharset(body, &hcs); ok(hr == S_OK, "ret %08x\n", hr); - ok(hcs == NULL, "ret %p\n", hcs); + todo_wine + { + ok(hcs != NULL, "Expected non-NULL charset\n"); + } IMimeBody_Release(body); @@ -309,9 +311,10 @@ static void test_CreateMessage(void) hr = IMimeMessage_GetCharset(body, &hcs); ok(hr == S_OK, "ret %08x\n", hr); - ok(hcs == NULL, "ret %p\n", hcs); - hr = MimeOleGetCharsetInfo(hcs, &csi); - ok(hr == E_INVALIDARG, "ret %08x\n", hr); + todo_wine + { + ok(hcs != NULL, "Expected non-NULL charset\n"); + } IMimeMessage_Release(msg);

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008