October 2021 - Wine-commits

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

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

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

Alex Henrie : ws2_32: Set WSAEFAULT if the bind address is null.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: a990e25bf029913b08590d89841ec4faa89236b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a990e25bf029913b08590d89… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 17 23:45:29 2021 -0600 ws2_32: Set WSAEFAULT if the bind address is null. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 50ea15c5b0e..2db441bee3c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1068,7 +1068,7 @@ int WINAPI bind( SOCKET s, const struct sockaddr *addr, int len ) if (!addr) { - SetLastError( WSAEAFNOSUPPORT ); + SetLastError( WSAEFAULT ); return -1; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index eadc47a8ea6..63f8149f160 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10794,7 +10794,18 @@ static void test_bind(void) WSASetLastError(0xdeadbeef); ret = bind(s, NULL, 0); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = bind(s, NULL, sizeof(addr)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + addr.sa_family = AF_INET; + WSASetLastError(0xdeadbeef); + ret = bind(s, &addr, 0); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); addr.sa_family = 0xdead; WSASetLastError(0xdeadbeef);

1 0

Francois Gouget : ctype.h: Add _isctype_l() declaration.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 91851e3e45f4147d4818fee3c7cc606cfcf380a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91851e3e45f4147d4818fee3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 18 17:58:11 2021 +0200 ctype.h: Add _isctype_l() declaration. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/ctype.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/ctype.h b/include/msvcrt/ctype.h index be99f7409e4..312888c3cfc 100644 --- a/include/msvcrt/ctype.h +++ b/include/msvcrt/ctype.h @@ -24,6 +24,7 @@ _ACRTIMP int __cdecl __iscsymf(int); _ACRTIMP int __cdecl __toascii(int); _ACRTIMP int __cdecl _isblank_l(int,_locale_t); _ACRTIMP int __cdecl _isctype(int,int); +_ACRTIMP int __cdecl _isctype_l(int,int,_locale_t); _ACRTIMP int __cdecl _tolower(int); _ACRTIMP int __cdecl _tolower_l(int,_locale_t); _ACRTIMP int __cdecl _toupper(int);

1 0

Rémi Bernon : winebus.sys: Define BUS_BLUETOOTH if it is missing.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 92c4cccb4318a3c724dfbae7e35830720e535dbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=92c4cccb4318a3c724dfbae7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 18 15:58:48 2021 +0200 winebus.sys: Define BUS_BLUETOOTH if it is missing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index b857ba25df8..e137299df77 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -59,6 +59,10 @@ # endif #endif +#ifndef BUS_BLUETOOTH +# define BUS_BLUETOOTH 5 +#endif + #include <pthread.h> #include "ntstatus.h"

1 0

Rémi Bernon : winebus.sys: Only use SDL_JoystickRumble as a fallback.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 2369cdc180e59fac82569e5e087cf490860bfd02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2369cdc180e59fac82569e5e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 18 17:16:44 2021 +0200 winebus.sys: Only use SDL_JoystickRumble as a fallback. If nothing else is supported, and pass the duration_ms parameter too. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 16e7a2f6f30..f1c20692b29 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -192,7 +192,8 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) pSDL_HapticRumbleInit(impl->sdl_haptic); } - if (pSDL_JoystickRumble && !pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) + if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) && pSDL_JoystickRumble && + !pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) impl->effect_support |= WINE_SDL_JOYSTICK_RUMBLE; if (impl->effect_support & EFFECT_SUPPORT_HAPTICS) @@ -394,9 +395,10 @@ NTSTATUS sdl_device_haptics_start(struct unix_device *iface, DWORD duration_ms, effect.leftright.large_magnitude = rumble_intensity; effect.leftright.small_magnitude = buzz_intensity; - if (impl->sdl_haptic) pSDL_HapticStopAll(impl->sdl_haptic); if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0); + else if (impl->sdl_haptic) + pSDL_HapticStopAll(impl->sdl_haptic); if (!effect.leftright.large_magnitude && !effect.leftright.small_magnitude) return STATUS_SUCCESS; @@ -416,7 +418,7 @@ NTSTATUS sdl_device_haptics_start(struct unix_device *iface, DWORD duration_ms, else if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) { pSDL_JoystickRumble(impl->sdl_joystick, effect.leftright.large_magnitude, - effect.leftright.small_magnitude, -1); + effect.leftright.small_magnitude, duration_ms); } return STATUS_SUCCESS;

1 0