May 2019 - Wine-commits - list.winehq.org

Isira Seneviratne : po: Update Tamil translation.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 6cec11156851bda3897874cf64fd22c671e660d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cec11156851bda3897874cf… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Fri Mar 29 18:56:42 2019 +0530 po: Update Tamil translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a8304e77fb4c28857a2dc6702fca19bcb49568f6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/ta.po | 72 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/po/ta.po b/po/ta.po index 2809d5b..3282378 100644 --- a/po/ta.po +++ b/po/ta.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-03-19 09:17+0530\n" +"PO-Revision-Date: 2019-03-29 20:31+0530\n" "Last-Translator: Isira Seneviratne <isirasen96(a)gmail.com>\n" "Language-Team: Tamil\n" "Language: ta\n" @@ -200,7 +200,7 @@ msgstr "பதிப்பு" #: appwiz.rc:41 msgid "Installation programs" -msgstr "" +msgstr "நிறுவல் நிரல்கள்" #: appwiz.rc:42 msgid "Programs (*.exe)" @@ -209,7 +209,7 @@ msgstr "நிரல்கள் (*.exe)" #: appwiz.rc:43 avifil32.rc:33 cryptui.rc:83 shell32.rc:199 notepad.rc:76 #: oleview.rc:103 progman.rc:82 regedit.rc:225 winedbg.rc:43 winhlp32.rc:90 msgid "All files (*.*)" -msgstr "" +msgstr "அனைத்து கோப்புகள் (*.*)" #: appwiz.rc:46 msgid "&Modify/Remove" @@ -217,11 +217,11 @@ msgstr "" #: appwiz.rc:51 msgid "Downloading..." -msgstr "" +msgstr "பதிவிறக்குகிறது..." #: appwiz.rc:52 msgid "Installing..." -msgstr "" +msgstr "நிறுவுகிறது..." #: appwiz.rc:53 msgid "" @@ -331,7 +331,7 @@ msgstr "" #: comctl32.rc:86 msgid "Finish" -msgstr "" +msgstr "முடிப்பு" #: comctl32.rc:97 msgid "Customize Toolbar" @@ -340,11 +340,11 @@ msgstr "" #: comctl32.rc:100 comctl32.rc:57 cryptui.rc:356 ieframe.rc:43 oleview.rc:83 #: oleview.rc:187 oleview.rc:200 oleview.rc:212 taskmgr.rc:139 msgid "&Close" -msgstr "" +msgstr "மூடு (&C)" #: comctl32.rc:101 msgid "R&eset" -msgstr "" +msgstr "மீட்டமை (&E)" #: comctl32.rc:102 comdlg32.rc:172 comdlg32.rc:194 comdlg32.rc:265 #: comdlg32.rc:329 comdlg32.rc:349 comdlg32.rc:390 comdlg32.rc:424 @@ -382,7 +382,7 @@ msgstr "" #: comctl32.rc:42 msgid "Separator" -msgstr "" +msgstr "பிரிப்பான்" #: comctl32.rc:47 progman.rc:81 msgctxt "hotkey" @@ -412,11 +412,11 @@ msgstr "" #: comctl32.rc:31 cryptui.rc:235 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 msgid "Close" -msgstr "" +msgstr "மூடு" #: comctl32.rc:36 msgid "Today:" -msgstr "" +msgstr "இன்று:" #: comctl32.rc:37 msgid "Go to today" @@ -425,7 +425,7 @@ msgstr "" #: comdlg32.rc:157 comdlg32.rc:170 comdlg32.rc:460 comdlg32.rc:485 #: comdlg32.rc:512 shell32.rc:167 oleview.rc:101 msgid "Open" -msgstr "" +msgstr "திற" #: comdlg32.rc:160 comdlg32.rc:182 msgid "File &Name:" @@ -450,11 +450,11 @@ msgstr "" #: comdlg32.rc:179 msgid "Save As..." -msgstr "" +msgstr "இவ்வாறு சேமி..." #: comdlg32.rc:192 comdlg32.rc:145 msgid "Save As" -msgstr "" +msgstr "இவ்வாறு சேமி" #: comdlg32.rc:201 comdlg32.rc:210 comdlg32.rc:356 comdlg32.rc:54 hhctrl.rc:49 #: wordpad.rc:173 @@ -551,11 +551,11 @@ msgstr "" #: comdlg32.rc:250 wineconsole.rc:85 msgid "Font" -msgstr "" +msgstr "எழுத்துரு" #: comdlg32.rc:253 msgid "&Font:" -msgstr "" +msgstr "எழுத்துரு (&F):" #: comdlg32.rc:256 msgid "Font St&yle:" @@ -579,7 +579,7 @@ msgstr "" #: comdlg32.rc:269 winecfg.rc:292 msgid "&Color:" -msgstr "" +msgstr "நிறம் (&C):" #: comdlg32.rc:272 msgid "Sample" @@ -810,7 +810,7 @@ msgstr "" #: comdlg32.rc:478 comdlg32.rc:504 comdlg32.rc:522 shdoclc.rc:127 shell32.rc:99 msgid "&Open" -msgstr "" +msgstr "திற (&O)" #: comdlg32.rc:515 msgid "File name:" @@ -1028,7 +1028,7 @@ msgstr "" #: comdlg32.rc:142 ieframe.rc:35 msgid "&Save" -msgstr "" +msgstr "சேமி (&S)" #: comdlg32.rc:143 msgid "Save &in:" @@ -1036,7 +1036,7 @@ msgstr "" #: comdlg32.rc:144 msgid "Save" -msgstr "" +msgstr "சேமி" #: comdlg32.rc:146 msgid "Open File" @@ -1959,11 +1959,11 @@ msgstr "" #: crypt32.rc:222 cryptui.rc:166 oleaut32.rc:32 wininet.rc:83 ipconfig.rc:47 msgid "Yes" -msgstr "" +msgstr "ஆம்" #: crypt32.rc:223 cryptui.rc:167 oleaut32.rc:33 wininet.rc:84 ipconfig.rc:48 msgid "No" -msgstr "" +msgstr "இல்லை" #: crypt32.rc:224 msgid "Digital Signature" @@ -2584,7 +2584,7 @@ msgstr "" #: cryptui.rc:82 msgid "CMS/PKCS #7 Messages (*.spc; *.p7b)" -msgstr "" +msgstr "CMS/PKCS #7 செய்திகள் (*.spc; *.p7b)" #: cryptui.rc:84 msgid "Please select a file." @@ -2628,7 +2628,7 @@ msgstr "" #: cryptui.rc:96 msgid "CMS/PKCS #7 Message" -msgstr "" +msgstr "CMS/PKCS #7 செய்தி" #: cryptui.rc:97 msgid "Personal Information Exchange" @@ -2644,7 +2644,7 @@ msgstr "" #: cryptui.rc:101 msgid "Arial" -msgstr "" +msgstr "Arial" #: cryptui.rc:103 msgid "<Advanced Purposes>" @@ -2814,7 +2814,7 @@ msgstr "" #: cryptui.rc:160 msgid "CMS/PKCS #7 Messages (*.p7b)" -msgstr "" +msgstr "CMS/PKCS #7 செய்திகள் (*.p7b)" #: cryptui.rc:161 msgid "Personal Information Exchange (*.pfx)" @@ -3184,7 +3184,7 @@ msgstr "" #: ieframe.rc:34 view.rc:33 winhlp32.rc:32 msgid "&Open..." -msgstr "" +msgstr "திற... (&O)" #: ieframe.rc:36 notepad.rc:33 wordpad.rc:34 msgid "Save &as..." @@ -3236,7 +3236,7 @@ msgstr "" #: ieframe.rc:94 msgid "Open:" -msgstr "" +msgstr "திற:" #: ieframe.rc:70 msgctxt "home page" @@ -6716,7 +6716,7 @@ msgstr "" #: msacm32.rc:39 winedbg.rc:77 msgid "&Save As..." -msgstr "" +msgstr "இவ்வாறு சேமி... (&S)" #: msacm32.rc:42 msgid "&Format:" @@ -7147,7 +7147,7 @@ msgstr "" #: msi.rc:183 msi.rc:204 msgid "Font: [1]" -msgstr "" +msgstr "எழுத்துரு: [1]" #: msi.rc:184 msi.rc:205 msgid "MIME Content Type: [1], Extension: [2]" @@ -10660,7 +10660,7 @@ msgstr "" #: clock.rc:35 notepad.rc:53 winecfg.rc:307 winefile.rc:63 wordpad.rc:84 msgid "&Font..." -msgstr "" +msgstr "எழுத்துரு... (&F)" #: clock.rc:37 msgid "&Without Titlebar" @@ -11812,15 +11812,15 @@ msgstr "" #: notepad.rc:85 msgid "Unicode (UTF-16)" -msgstr "" +msgstr "யூனிகோட் (UTF-16)" #: notepad.rc:86 msgid "Unicode (UTF-16 big-endian)" -msgstr "" +msgstr "யூனிகோட் (UTF-16 big-endian)" #: notepad.rc:87 msgid "Unicode (UTF-8)" -msgstr "" +msgstr "யூனிகோட் (UTF-8)" #: notepad.rc:94 msgid "" @@ -11918,7 +11918,7 @@ msgstr "" #: oleview.rc:82 msgid "&Save as..." -msgstr "" +msgstr "இவ்வாறு சேமி... (&S)" #: oleview.rc:87 msgid "&Group by type kind" @@ -14693,7 +14693,7 @@ msgstr "" #: wineconsole.rc:88 msgid "&Font" -msgstr "" +msgstr "எழுத்துரு (&F)" #: wineconsole.rc:90 msgid "&Color"

1 0

Sveinar Søpler : wined3d: Add GPU information for the NVIDIA RTX series.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 1ad3a179f6da9656364eaa227ddcb7e837d90a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ad3a179f6da9656364eaa22… Author: Sveinar Søpler <cybermax(a)dexter.no> Date: Sat Mar 30 00:52:34 2019 +0430 wined3d: Add GPU information for the NVIDIA RTX series. Signed-off-by: Sveinar Søpler <cybermax(a)dexter.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ad907fd12ee48b3558a7e499d289cef21e920a08) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 4 ++++ dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index af0db3e..5b37477 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1301,6 +1301,10 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"RTX 2080 Ti", CARD_NVIDIA_GEFORCE_RTX2080TI}, /* GeForce 2000 - highend */ + {"RTX 2080", CARD_NVIDIA_GEFORCE_RTX2080}, /* GeForce 2000 - highend */ + {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ + {"RTX 2060", CARD_NVIDIA_GEFORCE_RTX2060}, /* GeForce 2000 - highend */ {"TITAN V", CARD_NVIDIA_TITANV}, /* GeForce 1000 - highend */ {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ {"GTX 1080 Ti", CARD_NVIDIA_GEFORCE_GTX1080TI}, /* GeForce 1000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index aaafd31..51320e6588 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -329,6 +329,10 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_GEFORCE8, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_GEFORCE8, 12288}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2060, "NVIDIA GeForce RTX 2060", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2070, "NVIDIA GeForce RTX 2070", DRIVER_NVIDIA_GEFORCE8, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080, "NVIDIA GeForce RTX 2080", DRIVER_NVIDIA_GEFORCE8, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080TI, "NVIDIA GeForce RTX 2080 Ti", DRIVER_NVIDIA_GEFORCE8, 11264}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a300f11..c71c371 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2435,6 +2435,10 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_NVIDIA_TITANV = 0x1d81, + CARD_NVIDIA_GEFORCE_RTX2060 = 0x1f08, + CARD_NVIDIA_GEFORCE_RTX2070 = 0x1f07, + CARD_NVIDIA_GEFORCE_RTX2080 = 0x1e87, + CARD_NVIDIA_GEFORCE_RTX2080TI = 0x1e07, CARD_REDHAT_VIRGL = 0x1010,

1 0

Zhiyi Zhang : kernel32: Add DECLSPEC_HOTPATCH to VirtualAllocEx().
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 1d6a633a26aad5525ab2928201d000a25e96c9d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d6a633a26aad5525ab29282… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Mar 24 18:47:06 2019 +0800 kernel32: Add DECLSPEC_HOTPATCH to VirtualAllocEx(). Fix Tom Clancy's The Devision uplay version startup crash. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit df3dd6612c2098e347cad88c90853cf3892e4301) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 7f0a562..42da7f0 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -86,7 +86,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc( void *addr, SIZE_T size, DWORD typ * Success: Base address of allocated region of pages. * Failure: NULL. */ -LPVOID WINAPI VirtualAllocEx( HANDLE hProcess, LPVOID addr, SIZE_T size, +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocEx( HANDLE hProcess, LPVOID addr, SIZE_T size, DWORD type, DWORD protect ) { LPVOID ret = addr;

1 0

Gijs Vermeulen : kernel32: Add DECLSPEC_HOTPATCH to SizeofResource().
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 97b0486be70acab50725cb1ee89afd15a7329ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97b0486be70acab50725cb1e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Apr 2 18:46:15 2019 +0200 kernel32: Add DECLSPEC_HOTPATCH to SizeofResource(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28140 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 002a19599be273b9f947425a820897816317c378) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index a04fe62..5c9383d 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -617,7 +617,7 @@ BOOL WINAPI FreeResource( HGLOBAL handle ) /********************************************************************** * SizeofResource (KERNEL32.@) */ -DWORD WINAPI SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) +DWORD WINAPI DECLSPEC_HOTPATCH SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) { if (!hRsrc) return 0; return ((PIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->Size;

1 0

Paul Gofman : kernel32: Add DECLSPEC_HOTPATCH to FindClose().
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: ea33e9e51b5dd827e71156f301c4a2ab6270fab1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea33e9e51b5dd827e71156f3… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 5 11:26:28 2019 +0300 kernel32: Add DECLSPEC_HOTPATCH to FindClose(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28140 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d62187105e37c0729775ae45d161ba74302ce5a5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 3214d72..c66073b 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2236,7 +2236,7 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) /************************************************************************* * FindClose (KERNEL32.@) */ -BOOL WINAPI FindClose( HANDLE handle ) +BOOL WINAPI DECLSPEC_HOTPATCH FindClose( HANDLE handle ) { FIND_FIRST_INFO *info = handle;

1 0

Dmitry Timoshkov : wpcap: Fix compilation with recent pcap/ pcap.h versions.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 2a532f4809fc0328877c1f8219609c526daaba8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a532f4809fc0328877c1f82… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 28 20:37:47 2019 +0300 wpcap: Fix compilation with recent pcap/pcap.h versions. Recent libpcap versions have added inclusion of pcap/socket.h to pcap.h that includes sys/socket.h and other system .h files that lead to conflicts with winsock2.h. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 40c9b46500c3606e966d5404d45b68a48609b6ea) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wpcap/wpcap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index e7908cd..f163235 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -24,6 +24,7 @@ #undef SOCKET #undef INVALID_SOCKET +#define USE_WS_PREFIX #include "winsock2.h" #include "windef.h" #include "winbase.h"

1 0

Zhiyi Zhang : d3d8: Fix building on Mac.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: d76718e438760a6f7bd7d56ca374b3fb89505ef6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d76718e438760a6f7bd7d56c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 30 22:25:07 2019 +0800 d3d8: Fix building on Mac. bool is a reserved word in c99. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 13cca44d20239612a23fa9b3fe51e072a2073a60) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/d3d8_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 92c5032..6165971 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -60,16 +60,16 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) * ValidateVertexShader (D3D8.@) * * I've seen reserved1 and reserved2 always passed as 0's - * bool seems always passed as 0 or 1, but other values work as well... + * boolean seems always passed as 0 or 1, but other values work as well... * toto result? */ -HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto) +HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL boolean, DWORD* toto) { HRESULT ret; static BOOL warned; if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, bool, toto); + FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, boolean, toto); warned = TRUE; } @@ -98,13 +98,13 @@ HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD * PARAMS * toto result? */ -HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL bool, DWORD* toto) +HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL boolean, DWORD* toto) { HRESULT ret; static BOOL warned; if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, bool, toto); + FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, boolean, toto); warned = TRUE; }

1 0

Alexandre Julliard : dinput: Add error check to silence a compiler warning.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 7973e1374a7c8e3b022b32c0e89be5a7309f0792 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7973e1374a7c8e3b022b32c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 13 19:38:36 2019 +0100 dinput: Add error check to silence a compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6925fb0bb6e9dfdc641295908cc6ed68f69f2e28) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/config.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 885f1f4..db5878b 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -298,10 +298,11 @@ static void assign_action(HWND dialog) int obj = lv_get_cur_item(dialog); int old_action = lv_get_item_data(dialog, obj); int used_obj; - - DIDEVICEOBJECTINSTANCEW ddo = device->ddo[obj]; + DWORD type; if (old_action == action) return; + if (obj < 0) return; + type = device->ddo[obj].dwType; /* Clear old action */ if (old_action != -1) @@ -320,7 +321,7 @@ static void assign_action(HWND dialog) lv_set_action(dialog, used_obj, -1, lpdiaf); /* Set new action */ - lpdiaf->rgoAction[action].dwObjID = ddo.dwType; + lpdiaf->rgoAction[action].dwObjID = type; lpdiaf->rgoAction[action].guidInstance = device->ddi.guidInstance; lpdiaf->rgoAction[action].dwHow = DIAH_USERCONFIG;

1 0

Andrew Eikum : winhttp: Don't crash setting up secure proxy.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 4614f5acb67e9e822f45e7a17a4be3ae6a273913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4614f5acb67e9e822f45e7a1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 8 11:52:01 2019 -0600 winhttp: Don't crash setting up secure proxy. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e87f2c399dc9cf0666ef7d4e5e41548bef2e8169) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/request.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5525c1c..1a03f5c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1670,6 +1670,9 @@ static BOOL open_connection( struct request *request ) } netconn_set_timeout( netconn, TRUE, request->send_timeout ); netconn_set_timeout( netconn, FALSE, request->receive_response_timeout ); + + request->netconn = netconn; + if (is_secure) { if (connect->session->proxy_server && @@ -1677,6 +1680,7 @@ static BOOL open_connection( struct request *request ) { if (!secure_proxy_connect( request )) { + request->netconn = NULL; heap_free( addressW ); netconn_close( netconn ); return FALSE; @@ -1690,13 +1694,13 @@ static BOOL open_connection( struct request *request ) !netconn_secure_connect( netconn, connect->hostname, request->security_flags, &connect->session->cred_handle, request->check_revocation )) { + request->netconn = NULL; heap_free( addressW ); netconn_close( netconn ); return FALSE; } } - request->netconn = netconn; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, addressW, strlenW(addressW) + 1 ); } else

1 0

Zebediah Figura : hid: Handle overlapped file handles.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 3b051c8e4e85003db74e11853810a7058707cb9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b051c8e4e85003db74e1185… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 23:52:09 2019 -0500 hid: Handle overlapped file handles. This fixes a crash in the hid:device tests for me, and likely helps with bug 46711. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ea7b8ad9241559d5b9a0ab9082a7665928f86c9d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hid/hidd.c | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 614e7c4..4b703ca 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -38,6 +38,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); +static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len, DWORD *ret_len) +{ + OVERLAPPED ovl = {0}; + BOOL ret; + + ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, ret_len, &ovl); + if (!ret && GetLastError() == ERROR_IO_PENDING) + ret = GetOverlappedResult(file, &ovl, ret_len, TRUE); + CloseHandle(ovl.hEvent); + return ret; +} + BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData) { TRACE("(%p)\n", PreparsedData); @@ -52,7 +65,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) TRACE("(%p %p)\n", HidDeviceObject, Attr); - ret = DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL); + ret = sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL); if (ret) { @@ -66,7 +79,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL); } void WINAPI HidD_GetHidGuid(LPGUID guid) @@ -78,43 +91,43 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL); } BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers) { TRACE("(%p %p)\n", HidDeviceObject, NumberBuffers); - return DeviceIoControl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL); } BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL); } BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffers) { TRACE("(%p %i)\n", HidDeviceObject, NumberBuffers); - return DeviceIoControl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL); } BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData) @@ -124,14 +137,14 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT TRACE("(%p %p)\n", HidDeviceObject, PreparsedData); - if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, - &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, + &info, sizeof(HID_COLLECTION_INFORMATION), NULL)) return FALSE; if (!(data = HeapAlloc(GetProcessHeap(), 0, info.DescriptorSize))) return FALSE; - if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, - data, info.DescriptorSize, NULL, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, + data, info.DescriptorSize, NULL)) { HeapFree( GetProcessHeap(), 0, data ); return FALSE; @@ -143,5 +156,5 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL); }

1 0