March 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 4.5
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: website Branch: master Commit: 2273983cf90e16fb436dc8abb09fe0677d1c3fcb URL: https://source.winehq.org/git/website.git/?a=commit;h=2273983cf90e16fb436dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 22:32:35 2019 +0100 Wine release 4.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019032901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2019032901.xml b/news/en/2019032901.xml new file mode 100644 index 0000000..59f7f0b --- /dev/null +++ b/news/en/2019032901.xml @@ -0,0 +1,17 @@ +<news> +<date>March 29, 2019</date> +<title>Wine 4.5 Released</title> +<body> + The Wine development release 4.5 is now available. + <a href="{$root}/announce/4.5">What's new</a> in this release: +<ul> + <li>Support for Vulkan 1.1.</li> + <li>Better support for kernel objects in device drivers.</li> + <li>Still more Media Foundation APIs implemented.</li> + <li>Support for SVG elements in MSHTML.</li> + <li>Fixes for case conversion troubles in Turkish locale.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Isira Seneviratne : po: Update Tamil translation.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: a8304e77fb4c28857a2dc6702fca19bcb49568f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8304e77fb4c28857a2dc670… 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> --- po/ta.po | 72 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/po/ta.po b/po/ta.po index 403992d..19465f6 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" @@ -7000,7 +7000,7 @@ msgstr "" #: msacm32.rc:39 winedbg.rc:77 msgid "&Save As..." -msgstr "" +msgstr "இவ்வாறு சேமி... (&S)" #: msacm32.rc:42 msgid "&Format:" @@ -7431,7 +7431,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]" @@ -10944,7 +10944,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" @@ -12096,15 +12096,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 "" @@ -12202,7 +12202,7 @@ msgstr "" #: oleview.rc:82 msgid "&Save as..." -msgstr "" +msgstr "இவ்வாறு சேமி... (&S)" #: oleview.rc:87 msgid "&Group by type kind" @@ -14977,7 +14977,7 @@ msgstr "" #: wineconsole.rc:88 msgid "&Font" -msgstr "" +msgstr "எழுத்துரு (&F)" #: wineconsole.rc:90 msgid "&Color"

1 0

Alexandre Julliard : Release 4.5.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: c6ff0e01224e86c7baa31d019fcb0a7bf03e2f96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6ff0e01224e86c7baa31d01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 22:25:31 2019 +0100 Release 4.5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1091 ++++++++++++++++++++++++++++--------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 517 insertions(+), 597 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c6ff0e01224e86c7baa3…

1 0

Tag wine-4.5 : Alexandre Julliard : Release 4.5
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: refs/tags/wine-4.5 Tag: cd427627da799f942b129aad45e670a28592ddc2 URL: https://source.winehq.org/git/wine.git/?a=tag;h=cd427627da799f942b129aad45e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 22:25:31 2019 +0100 Release 4.5

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: dd484626b1d3b42ea554cb99ef50307eff18fe58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd484626b1d3b42ea554cb99… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Fri Mar 29 09:05:00 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 304 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 155 insertions(+), 149 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd484626b1d3b42ea554…

1 0

Sveinar Søpler : wined3d: Add GPU information for the NVIDIA RTX series.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: ad907fd12ee48b3558a7e499d289cef21e920a08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad907fd12ee48b3558a7e499… 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> --- 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 1b64402..3157c49 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1302,6 +1302,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 7053d70..83fa47a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -330,6 +330,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 f5bf96f..f482bb9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2448,6 +2448,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

Piotr Caban : msvcp140: Don't forward __ExceptionPtrDestroy to msvcr120.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: e7bd1b03da079a4990be37ebdfd536e740548413 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7bd1b03da079a4990be37eb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 29 16:04:59 2019 +0100 msvcp140: Don't forward __ExceptionPtrDestroy to msvcr120. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46800 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/exception.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 1 + 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 20f542e..96dff34 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1701,8 +1701,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX(a)Z(ptr) __ExceptionPtrCreate @ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX(a)Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPAX(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPEAX(a)Z -@ cdecl -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX(a)Z(ptr) msvcr120.?__ExceptionPtrDestroy@@YAXPAX(a)Z -@ cdecl -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX(a)Z(ptr) msvcr120.?__ExceptionPtrDestroy@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX(a)Z(ptr) __ExceptionPtrDestroy +@ cdecl -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX(a)Z(ptr) __ExceptionPtrDestroy @ cdecl -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX(a)Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPBX(a)Z @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPEBX(a)Z @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 5a382e3..142fddf 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -23,7 +23,9 @@ #include "msvcp90.h" #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #define CLASS_IS_SIMPLE_TYPE 1 @@ -956,6 +958,10 @@ typedef struct int *ref; /* not binary compatible with native */ } exception_ptr; +/********************************************************************* + * ?__ExceptionPtrCreate@@YAXPAX(a)Z + * ?__ExceptionPtrCreate@@YAXPEAX(a)Z + */ void __cdecl __ExceptionPtrCreate(exception_ptr *ep) { TRACE("(%p)\n", ep); @@ -963,6 +969,51 @@ void __cdecl __ExceptionPtrCreate(exception_ptr *ep) ep->rec = NULL; ep->ref = NULL; } + +#ifdef __i386__ +extern void call_dtor(const cxx_exception_type *type, void *func, void *object); + +__ASM_GLOBAL_FUNC( call_dtor, + "movl 12(%esp),%ecx\n\t" + "call *8(%esp)\n\t" + "ret" ); +#elif __x86_64__ +static inline void call_dtor(const cxx_exception_type *type, unsigned int dtor, void *object) +{ + char *base = RtlPcToFileHeader((void*)type, (void**)&base); + void (__cdecl *func)(void*) = (void*)(base + dtor); + func(object); +} +#else +#define call_dtor(type, func, object) ((void (__cdecl*)(void*))(func))(object) +#endif + +/********************************************************************* + * ?__ExceptionPtrDestroy@@YAXPAX(a)Z + * ?__ExceptionPtrDestroy@@YAXPEAX(a)Z + */ +void __cdecl __ExceptionPtrDestroy(exception_ptr *ep) +{ + TRACE("(%p)\n", ep); + + if (!ep->rec) + return; + + if (!InterlockedDecrement(ep->ref)) + { + if (ep->rec->ExceptionCode == CXX_EXCEPTION) + { + const cxx_exception_type *type = (void*)ep->rec->ExceptionInformation[2]; + void *obj = (void*)ep->rec->ExceptionInformation[1]; + + if (type && type->destructor) call_dtor(type, type->destructor, obj); + HeapFree(GetProcessHeap(), 0, obj); + } + + HeapFree(GetProcessHeap(), 0, ep->rec); + HeapFree(GetProcessHeap(), 0, ep->ref); + } +} #endif #if _MSVCP_VER >= 70 || defined(_MSVCIRT) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 40fbe4b..77c96e3 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -20,6 +20,7 @@ #include "windef.h" #include "cxx.h" +#define CXX_EXCEPTION 0xe06d7363 #define ALIGNED_SIZE(size, alignment) (((size)+((alignment)-1))/(alignment)*(alignment)) typedef unsigned char MSVCP_bool;

1 0

Piotr Caban : winemapi: Don't use strcasecmp.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: 5cdaf92c4595a10a9577682858a5d7ae07c1ac6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cdaf92c4595a10a95776828… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 29 16:37:46 2019 +0100 winemapi: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemapi/sendmail.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c index 03a29ba..cfb27e5 100644 --- a/dlls/winemapi/sendmail.c +++ b/dlls/winemapi/sendmail.c @@ -34,6 +34,7 @@ #include "winreg.h" #include "shellapi.h" #include "shlwapi.h" +#include "winternl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winemapi); @@ -121,7 +122,7 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, if (address) { - if (!strncasecmp(address, smtp, sizeof(smtp) - 1)) + if (!_strnicmp(address, smtp, sizeof(smtp) - 1)) address += sizeof(smtp) - 1; switch (message->lpRecips[i].ulRecipClass) @@ -213,7 +214,7 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, if (address) { - if (!strncasecmp(address, smtp, sizeof(smtp) - 1)) + if (!_strnicmp(address, smtp, sizeof(smtp) - 1)) address += sizeof(smtp) - 1; switch (message->lpRecips[i].ulRecipClass)

1 0

Piotr Caban : winhttp: Don't use strcasecmp.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: 4104da841dd28a324c0340a4f075949ad8286134 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4104da841dd28a324c0340a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 29 16:34:17 2019 +0100 winhttp: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 64fa8bb..f4f7e41 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -36,6 +36,7 @@ #include "ws2tcpip.h" #include "winhttp.h" #include "winreg.h" +#include "winternl.h" #define COBJMACROS #include "ole2.h" #include "dispex.h" @@ -1331,7 +1332,7 @@ static BOOL is_domain_suffix( const char *domain, const char *suffix ) int len_domain = strlen( domain ), len_suffix = strlen( suffix ); if (len_suffix > len_domain) return FALSE; - if (!strcasecmp( domain + len_domain - len_suffix, suffix )) return TRUE; + if (!_strnicmp( domain + len_domain - len_suffix, suffix, -1 )) return TRUE; return FALSE; } @@ -1737,7 +1738,7 @@ static BOOL parse_script_result( const char *result, WINHTTP_PROXY_INFO *info ) p = result; while (*p == ' ') p++; len = strlen( p ); - if (len >= 5 && !strncasecmp( p, "PROXY", sizeof("PROXY") - 1 )) + if (len >= 5 && !_strnicmp( p, "PROXY", sizeof("PROXY") - 1 )) { p += 5; while (*p == ' ') p++;

1 0

Józef Kucia : wined3d: Get rid of wined3d_check_render_target_format().
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: 80f343e49765bf1aba36402dd6619f39f37e0a4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=80f343e49765bf1aba36402d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 29 13:00:17 2019 +0100 wined3d: Get rid of wined3d_check_render_target_format(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fbbda18..7053d70 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1388,16 +1388,6 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada return adapter->adapter_ops->adapter_check_format(adapter, adapter_format, NULL, ds_format); } -static BOOL wined3d_check_render_target_format(const struct wined3d_adapter *adapter, - const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, - enum wined3d_gl_resource_type gl_type) -{ - if (!(rt_format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) - return FALSE; - - return adapter->adapter_ops->adapter_check_format(adapter, adapter_format, rt_format, NULL); -} - static BOOL wined3d_check_surface_format(const struct wined3d_format *format) { if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] | format->flags[WINED3D_GL_RES_TYPE_RB]) & WINED3DFMT_FLAG_BLIT) @@ -1539,6 +1529,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (bind_flags & WINED3D_BIND_SHADER_RESOURCE) format_flags |= WINED3DFMT_FLAG_TEXTURE; + if (bind_flags & WINED3D_BIND_RENDER_TARGET) + format_flags |= WINED3DFMT_FLAG_RENDERTARGET; if (usage & WINED3DUSAGE_QUERY_FILTER) format_flags |= WINED3DFMT_FLAG_FILTERING; if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) @@ -1568,7 +1560,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } if ((bind_flags & WINED3D_BIND_RENDER_TARGET) - && !wined3d_check_render_target_format(adapter, adapter_format, format, gl_type)) + && !adapter->adapter_ops->adapter_check_format(adapter, adapter_format, format, NULL)) { TRACE("Requested WINED3D_BIND_RENDER_TARGET, but format %s is not supported for render targets.\n", debug_d3dformat(check_format_id));

1 0