wine-commits July 2018

wine-commits@winehq.org

2 participants
405 discussions

André Hentschel : winedbg: Check for visible window station before displaying crash dialog.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 13f9461e99398f4080bf0fdd68a03f57a5427002 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13f9461e99398f4080bf0fdd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 13 19:49:40 2018 +0200 winedbg: Check for visible window station before displaying crash dialog. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35928 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/crashdlg.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index a925378..cda2642 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -48,6 +48,20 @@ int msgbox_res_id(HWND hwnd, UINT textid, UINT captionid, UINT type) return IDCANCEL; } +static BOOL is_visible(void) +{ + USEROBJECTFLAGS flags; + HWINSTA winstation; + + if (!(winstation = GetProcessWindowStation())) + return FALSE; + + if (!(GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL))) + return FALSE; + + return flags.dwFlags & WSF_VISIBLE; +} + static WCHAR *get_program_name(HANDLE hProcess) { WCHAR image_name[MAX_PATH]; @@ -362,7 +376,7 @@ int display_crash_dialog(void) /* dbg_curr_process->handle is not set */ HANDLE hProcess; - if (!DBG_IVAR(ShowCrashDialog)) + if (!DBG_IVAR(ShowCrashDialog) || !is_visible()) return TRUE; hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, dbg_curr_pid);

1 0

Zhiyi Zhang : user32: Send notification for the focused button in IsDialogMessage().
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 608aa7f3d743ffdf4072cfb0cbb7780bda44559d URL: https://source.winehq.org/git/wine.git/?a=commit;h=608aa7f3d743ffdf4072cfb0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 16 15:48:14 2018 +0800 user32: Send notification for the focused button in IsDialogMessage(). When handling WM_KEYDOWN,VK_RETURN messages from a dialog hwnd in IsDialogMessage(), if the focused button is in the dialog, send a BN_CLICKED notification to the dialog proc. This also make it possible for the default button with an id larger than 0xFFFF in the dialog to receive the correct BN_CLICKED notification, which has a null lParam before this. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 8 ++++---- dlls/user32/tests/dialog.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 6f23c74..e584cc1 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1252,10 +1252,11 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) case VK_RETURN: { DWORD dw; - if ((GetFocus() == msg->hwnd) && - (SendMessageW (msg->hwnd, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)) + HWND hwndFocus = GetFocus(); + if (IsChild( hwndDlg, hwndFocus ) && + (SendMessageW( hwndFocus, WM_GETDLGCODE, 0, 0 ) & DLGC_DEFPUSHBUTTON)) { - SendMessageW (hwndDlg, WM_COMMAND, MAKEWPARAM (GetDlgCtrlID(msg->hwnd),BN_CLICKED), (LPARAM)msg->hwnd); + SendMessageW( hwndDlg, WM_COMMAND, MAKEWPARAM( GetDlgCtrlID( hwndFocus ), BN_CLICKED ), (LPARAM)hwndFocus ); } else if (DC_HASDEFID == HIWORD(dw = SendMessageW (hwndDlg, DM_GETDEFID, 0, 0))) { @@ -1266,7 +1267,6 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) else { SendMessageW( hwndDlg, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndDlg, IDOK ) ); - } } return TRUE; diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index e1fe803..0604423 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -55,6 +55,7 @@ static LONG g_styleInitialFocusT1, g_styleInitialFocusT2; static BOOL g_bInitialFocusInitDlgResult, g_bReceivedCommand; static BOOL g_terminated; +static BOOL g_button1Clicked; typedef struct { INT_PTR id; @@ -474,6 +475,10 @@ static LRESULT CALLBACK main_window_procA (HWND hwnd, UINT uiMsg, WPARAM wParam, g_terminated = TRUE; return 0; } + else if ((wParam == 100 || wParam == 0xFFFF) && lParam) + { + g_button1Clicked = TRUE; + } break; } @@ -788,6 +793,33 @@ static void test_IsDialogMessage(void) UnhookWindowsHookEx(hook); DestroyWindow(g_hwndMain); + + g_hwndMain = CreateWindowA("IsDialogMessageWindowClass", "IsDialogMessageWindowClass", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, g_hinst, 0); + SetFocus(g_hwndButton1); + g_button1Clicked = FALSE; + FormEnterMsg(&msg, g_hwndButton1); + ok(IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); + ok(g_button1Clicked, "Did not receive button 1 click notification\n"); + + g_button1Clicked = FALSE; + FormEnterMsg(&msg, g_hwndMain); + ok(IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); + ok(g_button1Clicked, "Did not receive button 1 click notification\n"); + + g_button1Clicked = FALSE; + FormEnterMsg(&msg, g_hwndButton2); + ok(IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); + ok(g_button1Clicked, "Did not receive button 1 click notification\n"); + + /* Button with id larger than 0xFFFF should also work */ + g_button1Clicked = FALSE; + FormEnterMsg(&msg, g_hwndMain); + SetWindowLongPtrW(g_hwndButton1, GWLP_ID, 0x1FFFF); + ok(IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); + ok(g_button1Clicked, "Did not receive button 1 click notification\n"); + + DestroyWindow(g_hwndMain); }

1 0

Zhiyi Zhang : user32/tests: Fix a memory leak.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 8318b11d7f0f1a50be447b515aa6d0b11eb18827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8318b11d7f0f1a50be447b51… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 16 15:35:58 2018 +0800 user32/tests: Fix a memory leak. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 807a85b..e1fe803 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -787,6 +787,7 @@ static void test_IsDialogMessage(void) ok (!IsDialogMessageA(msg.hwnd, &msg), "expected failure\n"); UnhookWindowsHookEx(hook); + DestroyWindow(g_hwndMain); }

1 0

Hugh McMaster : regedit: Do not overwrite a hex data type with REG_BINARY when modifying a value.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 6b620e6d615df5041918b0037fe7fd988c7b20d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b620e6d615df5041918b003… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:50 2018 +0000 regedit: Do not overwrite a hex data type with REG_BINARY when modifying a value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index de96ded..a3cf17b 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -40,6 +40,7 @@ struct edit_params { HKEY hkey; const WCHAR *value_name; + DWORD type; void *data; DWORD size; }; @@ -159,7 +160,7 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara data = heap_xalloc(size); SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)size, (LPARAM)data); - lRet = RegSetValueExW(params->hkey, params->value_name, 0, REG_BINARY, data, size); + lRet = RegSetValueExW(params->hkey, params->value_name, 0, params->type, data, size); heap_free(data); if (lRet == ERROR_SUCCESS) @@ -351,6 +352,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) params.hkey = hKey; params.value_name = valueName; + params.type = type; params.data = stringValueData; params.size = len; result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd,

1 0

Hugh McMaster : regedit: Replace Hungarian notation used with struct edit_params members.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: a131cff7a88e85575b71c15fbb31aa5c861cc839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a131cff7a88e85575b71c15f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:49 2018 +0000 regedit: Replace Hungarian notation used with struct edit_params members. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 63cb869..de96ded 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -38,10 +38,10 @@ static BOOL isDecimal; struct edit_params { - HKEY hKey; - LPCWSTR lpszValueName; - void *pData; - LONG cbData; + HKEY hkey; + const WCHAR *value_name; + void *data; + DWORD size; }; static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, __ms_va_list va_args) @@ -136,31 +136,31 @@ static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { struct edit_params *params; - LPBYTE pData; - LONG cbData; + BYTE *data; + LONG size; LONG lRet; switch(uMsg) { case WM_INITDIALOG: params = (struct edit_params *)lParam; SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params); - if (params->lpszValueName) - SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->lpszValueName); + if (params->value_name) + SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->value_name); else SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName); - SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->cbData, (LPARAM)params->pData); + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->size, (LPARAM)params->data); SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, WM_SETFONT, (WPARAM) GetStockObject(ANSI_FIXED_FONT), TRUE); return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); - cbData = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); - pData = heap_xalloc(cbData); + size = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); + data = heap_xalloc(size); - SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); - lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); - heap_free(pData); + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)size, (LPARAM)data); + lRet = RegSetValueExW(params->hkey, params->value_name, 0, REG_BINARY, data, size); + heap_free(data); if (lRet == ERROR_SUCCESS) EndDialog(hwndDlg, 1); @@ -349,10 +349,10 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { struct edit_params params; - params.hKey = hKey; - params.lpszValueName = valueName; - params.pData = stringValueData; - params.cbData = len; + params.hkey = hKey; + params.value_name = valueName; + params.data = stringValueData; + params.size = len; result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd, bin_modify_dlgproc, (LPARAM)&params); }

1 0

Hugh McMaster : regedit: Always display DWORD values in hexadecimal when initializing the editor dialog.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 32f487bdb2483f96864411f948d35c8f0eaa8bdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=32f487bdb2483f96864411f9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:48 2018 +0000 regedit: Always display DWORD values in hexadecimal when initializing the editor dialog. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 00dcbec..63cb869 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -106,7 +106,8 @@ static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L case WM_INITDIALOG: SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, stringValueData); - CheckRadioButton(hwndDlg, IDC_DWORD_HEX, IDC_DWORD_DEC, isDecimal ? IDC_DWORD_DEC : IDC_DWORD_HEX); + CheckRadioButton(hwndDlg, IDC_DWORD_HEX, IDC_DWORD_DEC, IDC_DWORD_HEX); + isDecimal = FALSE; return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { @@ -280,9 +281,8 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); } } else if ( type == REG_DWORD ) { - const WCHAR u[] = {'%','u',0}; - const WCHAR x[] = {'%','x',0}; - wsprintfW(stringValueData, isDecimal ? u : x, *((DWORD*)stringValueData)); + static const WCHAR x[] = {'%','x',0}; + wsprintfW(stringValueData, x, *((DWORD*)stringValueData)); if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) { DWORD val; CHAR* valueA = GetMultiByteString(stringValueData);

1 0

Hugh McMaster : regedit: Free allocated memory after calling GetValueName( ).
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: a7a08e2927ec5b99b2f97fe2acffca4cdf0ef8d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7a08e2927ec5b99b2f97fe2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:46 2018 +0000 regedit: Free allocated memory after calling GetValueName(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 5 +++-- programs/regedit/listview.c | 2 +- programs/regedit/main.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index ed0c5bb..4d828c0 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -853,10 +853,11 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_EDIT_MODIFY: case ID_EDIT_MODIFY_BIN: { - LPCWSTR valueName = GetValueName(g_pChildWnd->hListWnd); - WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + WCHAR *valueName = GetValueName(g_pChildWnd->hListWnd); + WCHAR *keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); ModifyValue(hWnd, hKeyRoot, keyPath, valueName); heap_free(keyPath); + heap_free(valueName); break; } case ID_EDIT_FIND: diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index f42f9c2..7584828 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -63,7 +63,7 @@ LPWSTR GetItemText(HWND hwndLV, UINT item) return NULL; } -LPCWSTR GetValueName(HWND hwndLV) +WCHAR *GetValueName(HWND hwndLV) { INT item; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index edcc901..ae03440 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -150,7 +150,7 @@ int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); HWND StartValueRename(HWND hwndLV); LPWSTR GetItemText(HWND hwndLV, UINT item); -LPCWSTR GetValueName(HWND hwndLV); +WCHAR *GetValueName(HWND hwndLV); BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); BOOL IsDefaultValue(HWND hwndLV, int i);

1 0

Hugh McMaster : regedit: Don't check if heap_xalloc() succeeded in the caller.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 1291c6ded4d49c3ed44f19352c506ea7fd53580c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1291c6ded4d49c3ed44f1935… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:45 2018 +0000 regedit: Don't check if heap_xalloc() succeeded in the caller. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 3e5b9dd..00dcbec 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -157,14 +157,9 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara cbData = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); pData = heap_xalloc(cbData); - if (pData) - { - SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); - lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); - heap_free(pData); - } - else - lRet = ERROR_OUTOFMEMORY; + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); + lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); + heap_free(pData); if (lRet == ERROR_SUCCESS) EndDialog(hwndDlg, 1);

1 0

Hugh McMaster : regedit: Remove array already present in main.h.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 2686166cc1e07ab65749b21dfaa2734b200deb0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2686166cc1e07ab65749b21d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:44 2018 +0000 regedit: Remove array already present in main.h. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index b938b61..4ef99ec 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -36,8 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); #define REG_VAL_BUF_SIZE 4096 -extern const WCHAR* reg_class_namesW[]; - static HKEY reg_class_keys[] = { HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_CONFIG, HKEY_CURRENT_USER, HKEY_DYN_DATA

1 0

Jacek Caban : mshtml: Use DWORD for event id argument in node-specific event handlers.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: a660f673cb7d6d04e0f2a9a98cff439b5403365b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a660f673cb7d6d04e0f2a9a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 16 12:28:18 2018 +0200 mshtml: Use DWORD for event id argument in node-specific event handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlarea.c | 2 +- dlls/mshtml/htmlform.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 7c845bb..2f53a3b 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -727,7 +727,7 @@ static HRESULT HTMLAnchorElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); nsAString href_str, target_str; diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index 4fe03bf..a5ebfe7 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -403,7 +403,7 @@ static HRESULT HTMLAreaElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -static HRESULT HTMLAreaElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLAreaElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); nsAString href_str, target_str; diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index c22fa9e..4b1b6f6 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -781,7 +781,7 @@ static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface, return S_OK; } -static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLFormElement *This = impl_from_HTMLDOMNode(iface);

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
41
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 July 2018