wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Alexandre Julliard : oledb32: Return INT_PTR instead of LRESULT in dialog procedures.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 63895aaf2895b61bec5996d86e24b226ea149a42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63895aaf2895b61bec5996d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 16:42:13 2021 +0200 oledb32: Return INT_PTR instead of LRESULT in dialog procedures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index c74fb5133d2..95fd7687560 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -329,7 +329,7 @@ static void add_connections_providers(HWND lv) RegCloseKey(key); } -static LRESULT CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -477,7 +477,7 @@ static void connection_toggle_controls(HWND parent) EnableWindow(GetDlgItem(parent, IDC_BTN_BUILD), !checked); } -static LRESULT CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -549,7 +549,7 @@ static void advanced_fill_permission_list(HWND parent) } } -static LRESULT CALLBACK data_link_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK data_link_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -593,7 +593,7 @@ static void create_page_all_columns(HWND lv) SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); } -static LRESULT CALLBACK data_link_all_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK data_link_all_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp);

1 0

Alexandre Julliard : cryptui: Return INT_PTR instead of LRESULT in dialog procedures.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 4b7f0a5deaf4d9bff7886c6006bde04e4bd49c18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b7f0a5deaf4d9bff7886c60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 16:42:06 2021 +0200 cryptui: Return INT_PTR instead of LRESULT in dialog procedures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 68 ++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index ef4793b19d8..500ed439a5b 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -717,7 +717,7 @@ static void save_cert_mgr_usages(HWND hwnd) HeapFree(GetProcessHeap(), 0, str); } -static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, +static INT_PTR CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { switch (msg) @@ -1110,7 +1110,7 @@ static int CALLBACK cert_mgr_sort_by_friendly_name(LPARAM lp1, LPARAM lp2, return cert_mgr_sort_by_text((HWND)lp, 3, lp1, lp2); } -static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, +static INT_PTR CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { struct CertMgrData *data; @@ -1517,11 +1517,11 @@ struct SelectStoreInfo HCERTSTORE store; }; -static LRESULT CALLBACK select_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, +static INT_PTR CALLBACK select_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { struct SelectStoreInfo *selectInfo; - LRESULT ret = 0; + INT_PTR ret = 0; switch (msg) { @@ -2442,10 +2442,10 @@ static void set_general_info(HWND hwnd, set_cert_validity_period(hwnd, pCertViewInfo->pCertContext); } -static LRESULT CALLBACK user_notice_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, +static INT_PTR CALLBACK user_notice_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - LRESULT ret = 0; + INT_PTR ret = 0; HWND text; struct IssuerStatement *issuerStatement; @@ -2491,7 +2491,7 @@ static void show_user_notice(HWND hwnd, struct IssuerStatement *issuerStatement) user_notice_dlg_proc, (LPARAM)issuerStatement); } -static LRESULT CALLBACK general_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, +static INT_PTR CALLBACK general_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { PROPSHEETPAGEW *page; @@ -3208,10 +3208,10 @@ static BOOL is_oid_in_list(HWND hwnd, LPCSTR oid) #define MAX_PURPOSE 255 -static LRESULT CALLBACK add_purpose_dlg_proc(HWND hwnd, UINT msg, +static INT_PTR CALLBACK add_purpose_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - LRESULT ret = 0; + INT_PTR ret = 0; char buf[MAX_PURPOSE + 1]; switch (msg) @@ -3581,7 +3581,7 @@ static void apply_general_changes(HWND hwnd) *data->pfPropertiesChanged = TRUE; } -static LRESULT CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg, +static INT_PTR CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { PROPSHEETPAGEW *page; @@ -3775,7 +3775,7 @@ static void refresh_details_view(HWND hwnd) set_fields_selection(hwnd, data, curSel); } -static LRESULT CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, +static INT_PTR CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { PROPSHEETPAGEW *page; @@ -4130,12 +4130,12 @@ static void show_dialog_for_selected_cert(HWND hwnd) } } -static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, +static INT_PTR CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { PROPSHEETPAGEW *page; struct hierarchy_data *data; - LRESULT ret = 0; + INT_PTR ret = 0; HWND tree = GetDlgItem(hwnd, IDC_CERTPATH); TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -4846,10 +4846,10 @@ struct ImportWizData BOOL success; }; -static LRESULT CALLBACK import_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, +static INT_PTR CALLBACK import_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - LRESULT ret = 0; + INT_PTR ret = 0; switch (msg) { @@ -5027,10 +5027,10 @@ static BOOL import_validate_filename(HWND hwnd, struct ImportWizData *data, return ret; } -static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, +static INT_PTR CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - LRESULT ret = 0; + INT_PTR ret = 0; struct ImportWizData *data; switch (msg) @@ -5125,10 +5125,10 @@ static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, return ret; } -static LRESULT CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, +static INT_PTR CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - LRESULT ret = 0; + INT_PTR ret = 0; struct ImportWizData *data; switch (msg) @@ -5342,10 +5342,10 @@ static BOOL do_import(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, return ret; } -static LRESULT CALLBACK import_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, +static INT_PTR CALLBACK import_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - LRESULT ret = 0; + INT_PTR ret = 0; struct ImportWizData *data; switch (msg) @@ -5577,10 +5577,10 @@ struct ExportWizData BOOL success; }; -static LRESULT CALLBACK export_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, +static INT_PTR CALLBACK export_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - LRESULT ret = 0; + INT_PTR ret = 0; switch (msg) { @@ -5677,10 +5677,10 @@ static BOOL export_is_key_exportable(HCRYPTPROV hProv, DWORD keySpec) return ret; } -static LRESULT CALLBACK export_private_key_dlg_proc(HWND hwnd, UINT msg, +static INT_PTR CALLBACK export_private_key_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - LRESULT ret = 0; + INT_PTR ret = 0; struct ExportWizData *data; switch (msg) @@ -5807,10 +5807,10 @@ static void export_format_enable_controls(HWND hwnd, const struct ExportWizData } } -static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, +static INT_PTR CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - LRESULT ret = 0; + INT_PTR ret = 0; struct ExportWizData *data; switch (msg) @@ -5930,10 +5930,10 @@ static void export_password_mismatch(HWND hwnd, const struct ExportWizData *data SetFocus(GetDlgItem(hwnd, IDC_EXPORT_PASSWORD)); } -static LRESULT CALLBACK export_password_dlg_proc(HWND hwnd, UINT msg, +static INT_PTR CALLBACK export_password_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - LRESULT ret = 0; + INT_PTR ret = 0; struct ExportWizData *data; switch (msg) @@ -6219,10 +6219,10 @@ static WCHAR *make_export_file_filter(DWORD exportFormat, DWORD subjectChoice) return filter; } -static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, +static INT_PTR CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - LRESULT ret = 0; + INT_PTR ret = 0; struct ExportWizData *data; switch (msg) @@ -6723,10 +6723,10 @@ static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, return ret; } -static LRESULT CALLBACK export_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, +static INT_PTR CALLBACK export_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - LRESULT ret = 0; + INT_PTR ret = 0; struct ExportWizData *data; switch (msg) @@ -7260,7 +7260,7 @@ struct SelectCertParam PCCERT_CONTEXT cert; }; -static LRESULT CALLBACK select_cert_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK select_cert_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { struct SelectCertData *data;

1 0

Alexandre Julliard : comdlg32: Return INT_PTR instead of LRESULT in dialog procedures.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 38d2aa4e923e35060b08fbb7226a9d3a26e8b5d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38d2aa4e923e35060b08fbb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 16:41:39 2021 +0200 comdlg32: Return INT_PTR instead of LRESULT in dialog procedures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index eb85aa10d64..d6957d51a66 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2223,7 +2223,7 @@ static LRESULT on_wm_command(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) return FALSE; } -static LRESULT CALLBACK itemdlg_dlgproc(HWND hwnd, UINT umessage, WPARAM wparam, LPARAM lparam) +static INT_PTR CALLBACK itemdlg_dlgproc(HWND hwnd, UINT umessage, WPARAM wparam, LPARAM lparam) { FileDialogImpl *This = (FileDialogImpl*)GetWindowLongPtrW(hwnd, GWLP_USERDATA);

1 0

Zhiyi Zhang : shell32: Pass size in bytes to RegLoadMUIStringW() and RegQueryValueExW().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 32584bb521bd9dd14030a663671bea1673053cf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32584bb521bd9dd14030a663… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 19 16:31:06 2021 +0800 shell32: Pass size in bytes to RegLoadMUIStringW() and RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/classes.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 0087cc3c276..84784733853 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -212,11 +212,11 @@ static BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey) static BOOL HCR_RegGetDefaultIconW(HKEY hkey, LPWSTR szDest, DWORD len, int* picon_idx) { - DWORD dwType; + DWORD dwType, size = len * sizeof(WCHAR); WCHAR sTemp[MAX_PATH]; WCHAR sNum[5]; - if (!RegQueryValueExW(hkey, NULL, 0, &dwType, (LPBYTE)szDest, &len)) + if (!RegQueryValueExW(hkey, NULL, 0, &dwType, (LPBYTE)szDest, &size)) { if (dwType == REG_EXPAND_SZ) { @@ -316,13 +316,13 @@ BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len) { HKEY hkey; BOOL ret = FALSE; - DWORD buflen = len; + DWORD buflen = len * sizeof(WCHAR); szDest[0] = 0; if (HCR_RegOpenClassIDKey(riid, &hkey)) { - if (!RegLoadMUIStringW(hkey, L"LocalizedString", szDest, len, NULL, 0, NULL) || - !RegQueryValueExW(hkey, L"", 0, NULL, (LPBYTE)szDest, &len)) + if (!RegLoadMUIStringW(hkey, L"LocalizedString", szDest, buflen, NULL, 0, NULL) || + !RegQueryValueExW(hkey, L"", 0, NULL, (LPBYTE)szDest, &buflen)) { ret = TRUE; } @@ -333,12 +333,12 @@ BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len) { if(IsEqualIID(riid, &CLSID_ShellDesktop)) { - if (LoadStringW(shell32_hInstance, IDS_DESKTOP, szDest, buflen)) + if (LoadStringW(shell32_hInstance, IDS_DESKTOP, szDest, len)) ret = TRUE; } else if (IsEqualIID(riid, &CLSID_MyComputer)) { - if(LoadStringW(shell32_hInstance, IDS_MYCOMPUTER, szDest, buflen)) + if(LoadStringW(shell32_hInstance, IDS_MYCOMPUTER, szDest, len)) ret = TRUE; } }

1 0

Zhiyi Zhang : mshtml: Pass size in bytes to RegQueryValueExW().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 17e201b44e011ce011e56e45ae1e75176bc94ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=17e201b44e011ce011e56e45… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 19 16:30:58 2021 +0800 mshtml: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index ae94f224fac..4224d6a2ac4 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -707,7 +707,7 @@ static WCHAR *find_wine_gecko_reg(void) if(res != ERROR_SUCCESS) return NULL; - size = ARRAY_SIZE(buffer); + size = sizeof(buffer); res = RegQueryValueExW(hkey, L"GeckoPath", NULL, &type, (LPBYTE)buffer, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS || type != REG_SZ)

1 0

Zhiyi Zhang : msi: Pass size in bytes to RegQueryValueExW().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 6a6bdd2cee87bb076d57aaa013b2492d8b70506f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a6bdd2cee87bb076d57aaa0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 19 16:30:51 2021 +0800 msi: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 23e938f1759..7488c095080 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -527,7 +527,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!RegCreateKeyExW(netsetup, L"v4\\Client", 0, NULL, 0, KEY_QUERY_VALUE, NULL, &hkey, NULL)) { - size = ARRAY_SIZE(path); + size = sizeof(path); if (!RegQueryValueExW(hkey, L"InstallPath", NULL, &type, (BYTE *)path, &size)) { len = lstrlenW(path) + lstrlenW(L"fusion.dll") + 2; @@ -782,12 +782,12 @@ static VOID set_installer_properties(MSIPACKAGE *package) PathAddBackslashW( pth ); msi_set_property( package->db, L"SystemFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"ProgramFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"ProgramFilesFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"CommonFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"CommonFilesFolder", pth, -1 ); @@ -806,22 +806,22 @@ static VOID set_installer_properties(MSIPACKAGE *package) PathAddBackslashW( pth ); msi_set_property( package->db, L"SystemFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"ProgramFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"ProgramFiles64Folder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"ProgramFilesDir (x86)", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"ProgramFilesFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"CommonFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"CommonFiles64Folder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"CommonFilesDir (x86)", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"CommonFilesFolder", pth, -1 );

1 0

Zhiyi Zhang : msctf: Set size before calling RegQueryValueExW().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 8b64f0a48bd3be2b2079896fe9fed8c72c7fd323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b64f0a48bd3be2b2079896f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 19 16:30:38 2021 +0800 msctf: Set size before calling RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/inputprocessor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index ac7fad67548..5e687f5ccc9 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -432,6 +432,7 @@ static HRESULT WINAPI InputProcessorProfiles_GetDefaultLanguageProfile( } CLSIDFromString(buf,pclsid); + count = sizeof(buf); res = RegQueryValueExW(hkey, szwProfile, 0, NULL, (LPBYTE)buf, &count); if (res == ERROR_SUCCESS) CLSIDFromString(buf,pguidProfile);

1 0

Zhiyi Zhang : appwiz.cpl: Pass size in bytes to RegQueryValueExW().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 65095933fd53dfb40a26530bfeb49e65f6175b69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65095933fd53dfb40a26530b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 19 16:30:31 2021 +0800 appwiz.cpl: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 2bc108b63c6..410de81043d 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -542,7 +542,7 @@ static void SetInfoDialogText(HKEY hKey, LPCWSTR lpKeyName, LPCWSTR lpAltMessage } else { - buflen = MAX_STRING_LEN; + buflen = sizeof(buf); if ((RegQueryValueExW(hKey, lpKeyName, 0, 0, (LPBYTE) buf, &buflen) == ERROR_SUCCESS) && buf[0])

1 0

Rémi Bernon : dinput: Factor all SetProperty implementations together.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 47a821400a7e0cde13e198f2ab1691d50918345d URL: https://source.winehq.org/git/wine.git/?a=commit;h=47a821400a7e0cde13e198f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 19 09:20:06 2021 +0200 dinput: Factor all SetProperty implementations together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 229 ++++++++++++++++++++++++++----------------- dlls/dinput/device_private.h | 2 + dlls/dinput/joystick_hid.c | 113 +++++---------------- dlls/dinput/keyboard.c | 7 ++ dlls/dinput/mouse.c | 7 ++ 5 files changed, 179 insertions(+), 179 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=47a821400a7e0cde13e1…

1 0

Rémi Bernon : dinput: Use the base device state in the keyboard device.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: d94ad65f98acdadb457bb3a1057c455960028b21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94ad65f98acdadb457bb3a1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 19 09:20:05 2021 +0200 dinput: Use the base device state in the keyboard device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index bb1102e38eb..a1764eb64c0 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); -#define WINE_DINPUT_KEYBOARD_MAX_KEYS 256 - static const IDirectInputDevice8WVtbl SysKeyboardWvt; static const struct dinput_device_vtbl keyboard_internal_vtbl; @@ -43,7 +41,6 @@ typedef struct SysKeyboardImpl SysKeyboardImpl; struct SysKeyboardImpl { struct IDirectInputDeviceImpl base; - BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; }; static inline SysKeyboardImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) @@ -115,11 +112,10 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; /* returns now if key event already known */ - if (new_diks == This->DInputKeyState[dik_code]) - return ret; + if (new_diks == This->base.device_state[dik_code]) return ret; - This->DInputKeyState[dik_code] = new_diks; - TRACE(" setting %02X to %02X\n", dik_code, This->DInputKeyState[dik_code]); + This->base.device_state[dik_code] = new_diks; + TRACE( " setting key %02x to %02x\n", dik_code, This->base.device_state[dik_code] ); EnterCriticalSection(&This->base.crit); queue_event(iface, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON, @@ -248,6 +244,8 @@ const struct dinput_device keyboard_device = { static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) { SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + DWORD i; + TRACE("(%p)->(%d,%p)\n", This, len, ptr); if (!This->base.acquired) return DIERR_NOTACQUIRED; @@ -259,15 +257,14 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W ifac EnterCriticalSection(&This->base.crit); - if (TRACE_ON(dinput)) { - int i; - for (i = 0; i < WINE_DINPUT_KEYBOARD_MAX_KEYS; i++) { - if (This->DInputKeyState[i] != 0x00) - TRACE(" - %02X: %02x\n", i, This->DInputKeyState[i]); - } + if (TRACE_ON(dinput)) + { + TRACE( "pressed keys:" ); + for (i = 0; i < len; i++) if (This->base.device_state[i]) TRACE( " %02x", i ); + TRACE( "\n" ); } - fill_DataFormat(ptr, len, This->DInputKeyState, &This->base.data_format); + fill_DataFormat( ptr, len, This->base.device_state, &This->base.data_format ); LeaveCriticalSection(&This->base.crit); return DI_OK; @@ -281,7 +278,7 @@ static HRESULT keyboard_internal_acquire( IDirectInputDevice8W *iface ) static HRESULT keyboard_internal_unacquire( IDirectInputDevice8W *iface ) { SysKeyboardImpl *This = impl_from_IDirectInputDevice8W( iface ); - memset( This->DInputKeyState, 0, sizeof(This->DInputKeyState) ); + memset( This->base.device_state, 0, sizeof(This->base.device_state) ); return DI_OK; }

1 0

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 October 2021