April 2017 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Disallow upload conversion from compressed formats in surface_convert_format ().
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 9e47cf696bb499f99f9f3c6437dafba34bc80180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e47cf696bb499f99f9f3c643… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 8 16:46:36 2017 +0100 wined3d: Disallow upload conversion from compressed formats in surface_convert_format(). The underlying issue is that glCompressedTexSubImage2D() needs the upload format to match the texture's internal format. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5a6efe632918fd18758897c39910d52791d46053) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 18b008c..7d26709 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1519,7 +1519,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr if (!(conv = find_converter(src_format->id, dst_format->id)) && (!device->d3d_initialized || !is_identity_fixup(src_format->color_fixup) || src_format->convert - || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert)) + || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert + || (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED))) { FIXME("Cannot find a conversion function from format %s to %s.\n", debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id));

1 0

Austin English : dhcpsvc: Add DhcpRequestParams stub.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 232adfc880c08146455850e9d7164bd926e4a0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=232adfc880c08146455850e9d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 2 06:53:30 2017 +0000 dhcpsvc: Add DhcpRequestParams stub. Based on a patch by Mike Ellery. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a2ff4f37fd10f95e8ebcd18cbe2fd477ba18523c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dhcpcsvc/dhcpcsvc.c | 10 ++++++++++ dlls/dhcpcsvc/dhcpcsvc.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/dhcpcsvc/dhcpcsvc.c b/dlls/dhcpcsvc/dhcpcsvc.c index 3600680..20ff589 100644 --- a/dlls/dhcpcsvc/dhcpcsvc.c +++ b/dlls/dhcpcsvc/dhcpcsvc.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "dhcpcsdk.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dhcpcsvc); @@ -37,3 +38,12 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adaptername, DHCPCAPI_CLASSID *classid, + DHCPCAPI_PARAMS_ARRAY sendparams, DHCPCAPI_PARAMS_ARRAY recdparams, + BYTE *buffer, DWORD *size, WCHAR *requestidstr ) +{ + FIXME("(%08x, %p, %s, %p, %u, %u, %p, %p, %s): stub\n", flags, reserved, debugstr_w(adaptername), classid, + sendparams.nParams, recdparams.nParams, buffer, size, debugstr_w(requestidstr)); + return ERROR_SUCCESS; +} diff --git a/dlls/dhcpcsvc/dhcpcsvc.spec b/dlls/dhcpcsvc/dhcpcsvc.spec index 97194a6..3e85cb2 100644 --- a/dlls/dhcpcsvc/dhcpcsvc.spec +++ b/dlls/dhcpcsvc/dhcpcsvc.spec @@ -31,7 +31,7 @@ @ stub DhcpRenewIpAddressLeaseEx @ stub DhcpRequestCachedParams @ stub DhcpRequestOptions -@ stub DhcpRequestParams +@ stdcall DhcpRequestParams(long ptr wstr ptr int64 int64 ptr ptr wstr) @ stub DhcpSetMSFTVendorSpecificOptions @ stub DhcpStaticRefreshParams @ stub DhcpUndoRequestParams

1 0

Alistair Leslie-Hughes : include: Add dhcpcsdk.h.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: bfe71e63769f640dfb1650e470d0d3a4c33bf8fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe71e63769f640dfb1650e47… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 2 06:53:17 2017 +0000 include: Add dhcpcsdk.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c84e6fb3e50946fa235d69e0275ea6ace77a013b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/Makefile.in | 1 + include/dhcpcsdk.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 401b02b..9f615cd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -313,6 +313,7 @@ HEADER_SRCS = \ devguid.h \ devpkey.h \ devpropdef.h \ + dhcpcsdk.h \ difxapi.h \ digitalv.h \ dinput.h \ diff --git a/include/dhcpcsdk.h b/include/dhcpcsdk.h new file mode 100644 index 0000000..93c7af6 --- /dev/null +++ b/include/dhcpcsdk.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _DHCPCSDK_ +#define _DHCPCSDK_ + +typedef struct _DHCPAPI_PARAMS +{ + ULONG Flags; + ULONG OptionId; + BOOL IsVendor; + BYTE *Data; + DWORD nBytesData; +} DHCPAPI_PARAMS, *PDHCPAPI_PARAMS, *LPDHCPAPI_PARAMS; + +typedef struct _DHCPAPI_PARAMS DHCPCAPI_PARAMS, *PDHCPCAPI_PARAMS, *LPDHCPCAPI_PARAMS; + +typedef struct _DHCPCAPI_PARAMS_ARARAY +{ + ULONG nParams; + LPDHCPCAPI_PARAMS Params; +} DHCPCAPI_PARAMS_ARRAY, *PDHCPCAPI_PARAMS_ARRAY, *LPDHCPCAPI_PARAMS_ARRAY; + +typedef struct _DHCPCAPI_CLASSID +{ + ULONG Flags; + BYTE *Data; + ULONG nBytesData; +} DHCPCAPI_CLASSID, *PDHCPCAPI_CLASSID, *LPDHCPCAPI_CLASSID; + + +DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adaptername, DHCPCAPI_CLASSID *classid, + DHCPCAPI_PARAMS_ARRAY sendparams, DHCPCAPI_PARAMS_ARRAY recdparams, + BYTE *buffer, DWORD *size, WCHAR *requestidstr ); + +#endif

1 0

Zebediah Figura : ole2: Implement several IIDs.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 4f1c32a4024242ea1be2d8587c0f04c839477f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1c32a4024242ea1be2d8587… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 2 12:27:10 2017 -0600 ole2: Implement several IIDs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 72df9e3c0ff1a7193258a1855c2701e146219a79) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2.dll16/ole2.dll16.spec | 84 ++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/ole2.dll16/ole2.dll16.spec b/dlls/ole2.dll16/ole2.dll16.spec index ed5e917..108c3ee 100644 --- a/dlls/ole2.dll16/ole2.dll16.spec +++ b/dlls/ole2.dll16/ole2.dll16.spec @@ -102,48 +102,48 @@ 113 stub VALIDATEALLOBJECTS 114 stub DBGDUMPCLASSNAME 115 stub DBGDUMPEXTERNALOBJECT -120 stub _IID_IENUMUNKNOWN -121 stub _IID_IENUMSTRING -122 stub _IID_IENUMMONIKER -123 stub _IID_IENUMFORMATETC -124 stub _IID_IENUMOLEVERB -125 stub _IID_IENUMSTATDATA -126 stub _IID_IENUMGENERIC -127 stub _IID_IENUMHOLDER -128 stub _IID_IENUMCALLBACK -129 stub _IID_IPERSISTSTREAM -130 stub _IID_IPERSISTSTORAGE -131 stub _IID_IPERSISTFILE -132 stub _IID_IPERSIST -133 stub _IID_IVIEWOBJECT -134 stub _IID_IDATAOBJECT -135 stub _IID_IADVISESINK -136 stub _IID_IDATAADVISEHOLDER -137 stub _IID_IOLEADVISEHOLDER -138 stub _IID_IOLEOBJECT -139 stub _IID_IOLEINPLACEOBJECT -140 stub _IID_IOLEWINDOW -141 stub _IID_IOLEINPLACEUIWINDOW -142 stub _IID_IOLEINPLACEFRAME -143 stub _IID_IOLEINPLACEACTIVEOBJECT -144 stub _IID_IOLECLIENTSITE -145 stub _IID_IOLEINPLACESITE -146 stub _IID_IPARSEDISPLAYNAME -147 stub _IID_IOLECONTAINER -148 stub _IID_IOLEITEMCONTAINER -149 stub _IID_IOLELINK -150 stub _IID_IOLECACHE -151 stub _IID_IOLEMANAGER -152 stub _IID_IOLEPRESOBJ -153 stub _IID_IDROPSOURCE -154 stub _IID_IDROPTARGET -155 stub _IID_IDEBUG -156 stub _IID_IDEBUGSTREAM -157 stub _IID_IADVISESINK2 -158 stub _IID_IVIEWOBJECT2 -159 stub _IID_IOLECACHE2 -160 stub _IID_IOLECACHECONTROL -161 stub _IID_IRUNNABLEOBJECT +120 variable _IID_IEnumUnknown(0x00000100 0x00000000 0x000000c0 0x46000000) +121 variable _IID_IEnumString(0x00000101 0x00000000 0x000000c0 0x46000000) +122 variable _IID_IEnumMoniker(0x00000102 0x00000000 0x000000c0 0x46000000) +123 variable _IID_IEnumFORMATETC(0x00000103 0x00000000 0x000000c0 0x46000000) +124 variable _IID_IEnumOLEVERB(0x00000104 0x00000000 0x000000c0 0x46000000) +125 variable _IID_IEnumSTATDATA(0x00000105 0x00000000 0x000000c0 0x46000000) +126 variable _IID_IEnumGeneric(0x00000106 0x00000000 0x000000c0 0x46000000) +127 variable _IID_IEnumHolder(0x00000107 0x00000000 0x000000c0 0x46000000) +128 variable _IID_IEnumCallback(0x00000108 0x00000000 0x000000c0 0x46000000) +129 variable _IID_IPersistStream(0x00000109 0x00000000 0x000000c0 0x46000000) +130 variable _IID_IPersistStorage(0x0000010a 0x00000000 0x000000c0 0x46000000) +131 variable _IID_IPersistFile(0x0000010b 0x00000000 0x000000c0 0x46000000) +132 variable _IID_IPersist(0x0000010c 0x00000000 0x000000c0 0x46000000) +133 variable _IID_IViewObject(0x0000010d 0x00000000 0x000000c0 0x46000000) +134 variable _IID_IDataObject(0x0000010e 0x00000000 0x000000c0 0x46000000) +135 variable _IID_IAdviseSink(0x0000010f 0x00000000 0x000000c0 0x46000000) +136 variable _IID_IDataAdviseHolder(0x00000110 0x00000000 0x000000c0 0x46000000) +137 variable _IID_IOleAdviseHolder(0x00000111 0x00000000 0x000000c0 0x46000000) +138 variable _IID_IOleObject(0x00000112 0x00000000 0x000000c0 0x46000000) +139 variable _IID_IOleInPlaceObject(0x00000113 0x00000000 0x000000c0 0x46000000) +140 variable _IID_IOleWindow(0x00000114 0x00000000 0x000000c0 0x46000000) +141 variable _IID_IOleInPlaceUIWindow(0x00000115 0x00000000 0x000000c0 0x46000000) +142 variable _IID_IOleInPlaceFrame(0x00000116 0x00000000 0x000000c0 0x46000000) +143 variable _IID_IOleInPlaceActiveObject(0x00000117 0x00000000 0x000000c0 0x46000000) +144 variable _IID_IOleClientSite(0x00000118 0x00000000 0x000000c0 0x46000000) +145 variable _IID_IOleInPlaceSite(0x00000119 0x00000000 0x000000c0 0x46000000) +146 variable _IID_IParseDisplayName(0x0000011a 0x00000000 0x000000c0 0x46000000) +147 variable _IID_IOleContainer(0x0000011b 0x00000000 0x000000c0 0x46000000) +148 variable _IID_IOleItemContainer(0x0000011c 0x00000000 0x000000c0 0x46000000) +149 variable _IID_IOleLink(0x0000011d 0x00000000 0x000000c0 0x46000000) +150 variable _IID_IOleCache(0x0000011e 0x00000000 0x000000c0 0x46000000) +151 variable _IID_IOleManager(0x0000011f 0x00000000 0x000000c0 0x46000000) +152 variable _IID_IOlePresObj(0x00000120 0x00000000 0x000000c0 0x46000000) +153 variable _IID_IDropSource(0x00000121 0x00000000 0x000000c0 0x46000000) +154 variable _IID_IDropTarget(0x00000122 0x00000000 0x000000c0 0x46000000) +155 variable _IID_IDebug(0x00000123 0x00000000 0x000000c0 0x46000000) +156 variable _IID_IDebugStream(0x00000124 0x00000000 0x000000c0 0x46000000) +157 variable _IID_IAdviseSink2(0x00000125 0x00000000 0x000000c0 0x46000000) +158 variable _IID_IViewObject2(0x00000127 0x00000000 0x000000c0 0x46000000) +159 variable _IID_IOleCache2(0x00000128 0x00000000 0x000000c0 0x46000000) +160 variable _IID_IOleCacheControl(0x00000129 0x00000000 0x000000c0 0x46000000) +161 variable _IID_IRunnableObject(0x00000126 0x00000000 0x000000c0 0x46000000) # WINE MemLockBytes implementation. 500 cdecl HGLOBALLockBytesImpl16_QueryInterface(segptr ptr ptr) HGLOBALLockBytesImpl16_QueryInterface

1 0

Zebediah Figura : compobj: Implement several IIDs.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 34d37691405c4e0145c30a01ccbd05d08050c298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d37691405c4e0145c30a01c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 2 12:27:09 2017 -0600 compobj: Implement several IIDs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d150d08fb00b29065230f6b5a43005bedf296e9d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/compobj.dll16/compobj.dll16.spec | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/compobj.dll16/compobj.dll16.spec b/dlls/compobj.dll16/compobj.dll16.spec index 03cf925..85dfc42 100644 --- a/dlls/compobj.dll16/compobj.dll16.spec +++ b/dlls/compobj.dll16/compobj.dll16.spec @@ -34,42 +34,42 @@ 34 pascal CoGetCurrentProcess() CoGetCurrentProcess16 35 stub SHRCREATE 36 stub COISOLE1CLASS -37 stub _GUID_NULL -38 stub _IID_IUNKNOWN -39 stub _IID_ICLASSFACTORY -40 stub _IID_IMALLOC -41 stub _IID_IMARSHAL -42 stub _IID_IRPCCHANNEL -43 stub _IID_IRPCSTUB -44 stub _IID_ISTUBMANAGER -45 stub _IID_IRPCPROXY -46 stub _IID_IPROXYMANAGER -47 stub _IID_IPSFACTORY -48 stub _IID_ILOCKBYTES -49 stub _IID_ISTORAGE -50 stub _IID_ISTREAM -51 stub _IID_IENUMSTATSTG -52 stub _IID_IBINDCTX -53 stub _IID_IMONIKER -54 stub _IID_IRUNNINGOBJECTTABLE -55 stub _IID_IINTERNALMONIKER -56 stub _IID_IROOTSTORAGE -57 stub _IID_IDFRESERVED1 -58 stub _IID_IDFRESERVED2 -59 stub _IID_IDFRESERVED3 -60 stub _IID_IMESSAGEFILTER +37 variable _GUID_NULL(0x00000000 0x00000000 0x00000000 0x00000000) +38 variable _IID_IUnknown(0x00000000 0x00000000 0x000000c0 0x46000000) +39 variable _IID_IClassFactory(0x00000001 0x00000000 0x000000c0 0x46000000) +40 variable _IID_IMalloc(0x00000002 0x00000000 0x000000c0 0x46000000) +41 variable _IID_IMarshal(0x00000003 0x00000000 0x000000c0 0x46000000) +42 variable _IID_IRpcChannel(0x00000004 0x00000000 0x000000c0 0x46000000) +43 variable _IID_IRpcStub(0x00000005 0x00000000 0x000000c0 0x46000000) +44 variable _IID_IStubManager(0x00000006 0x00000000 0x000000c0 0x46000000) +45 variable _IID_IRpcProxy(0x00000007 0x00000000 0x000000c0 0x46000000) +46 variable _IID_IProxyManager(0x00000008 0x00000000 0x000000c0 0x46000000) +47 variable _IID_IPSFactory(0x00000009 0x00000000 0x000000c0 0x46000000) +48 variable _IID_ILockBytes(0x0000000a 0x00000000 0x000000c0 0x46000000) +49 variable _IID_IStorage(0x0000000b 0x00000000 0x000000c0 0x46000000) +50 variable _IID_IStream(0x0000000c 0x00000000 0x000000c0 0x46000000) +51 variable _IID_IEnumSTATSTG(0x0000000d 0x00000000 0x000000c0 0x46000000) +52 variable _IID_IBindCtx(0x0000000e 0x00000000 0x000000c0 0x46000000) +53 variable _IID_IMoniker(0x0000000f 0x00000000 0x000000c0 0x46000000) +54 variable _IID_IRunningObjectTable(0x00000010 0x00000000 0x000000c0 0x46000000) +55 variable _IID_IInternalMoniker(0x00000011 0x00000000 0x000000c0 0x46000000) +56 variable _IID_IRootStorage(0x00000012 0x00000000 0x000000c0 0x46000000) +57 variable _IID_IDfReserved1(0x00000013 0x00000000 0x000000c0 0x46000000) +58 variable _IID_IDfReserved2(0x00000014 0x00000000 0x000000c0 0x46000000) +59 variable _IID_IDfReserved3(0x00000015 0x00000000 0x000000c0 0x46000000) +60 variable _IID_IMessageFilter(0x00000016 0x00000000 0x000000c0 0x46000000) 61 pascal CLSIDFromProgID(str ptr) CLSIDFromProgID16 62 pascal ProgIDFromCLSID(ptr ptr) ProgIDFromCLSID16 63 pascal CoLockObjectExternal(segptr word word) CoLockObjectExternal16 -64 stub _CLSID_STDMARSHAL +64 variable _CLSID_StdMarshal(0x00000017 0x00000000 0x000000c0 0x46000000) 65 stub COGETTREATASCLASS 66 stub COTREATASCLASS 67 stub COGETSTANDARDMARSHAL 68 stub PROPAGATERESULT 69 stub IIDFROMSTRING -70 stub _IID_ISTDMARSHALINFO +70 variable _IID_IStdMarshalInfo(0x00000018 0x00000000 0x000000c0 0x46000000) 71 pascal CoCreateStandardMalloc(long ptr) CoCreateStandardMalloc16 -72 stub _IID_IEXTERNALCONNECTION +72 variable _IID_IExternalConnection(0x00000019 0x00000000 0x000000c0 0x46000000) 73 pascal CoCreateGuid(ptr) CoCreateGuid16 75 stub FNASSERT 76 pascal -ret16 StringFromGUID2(ptr ptr word) StringFromGUID216

1 0

Piotr Caban : msvcr120: Add _except1 implementation.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 8d280f3a8e606959e301b1200c512d0ad4b4df2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d280f3a8e606959e301b1200… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 17 15:54:25 2017 +0100 msvcr120: Add _except1 implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 10200af74142c786ca8c7594bfc1fb3ad9cb0ab3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 92 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 5 files changed, 96 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 8ff4c58..d5ade42 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -62,7 +62,7 @@ @ stub _dsin @ cdecl _dtest(ptr) ucrtbase._dtest @ stub _dunscale -@ stub _except1 +@ cdecl _except1(long long double double long ptr) ucrtbase._except1 @ stub _fd_int @ cdecl _fdclass(float) ucrtbase._fdclass @ stub _fdexp diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 95e9d18..d09c711 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1124,7 +1124,7 @@ @ extern _environ MSVCRT__environ @ cdecl _eof(long) MSVCRT__eof @ cdecl _errno() MSVCRT__errno -@ stub _except1 +@ cdecl _except1(long long double double long ptr) @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e71388b..d51f5d3 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1060,7 +1060,7 @@ @ extern _environ msvcr120._environ @ cdecl _eof(long) msvcr120._eof @ cdecl _errno() msvcr120._errno -@ stub _except1 +@ cdecl _except1(long long double double long ptr) msvcr120._except1 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) msvcr120._except_handler2 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) msvcr120._except_handler3 @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) msvcr120._except_handler4_common diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 74685d4..857561b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2986,3 +2986,95 @@ float CDECL MSVCR120_nanf(const char *tagp) { return NAN; } + +/********************************************************************* + * _except1 (MSVCR120.@) + * TODO: + * - find meaning of ignored cw and operation bits + * - unk parameter + */ +double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, DWORD cw, void *unk) +{ + ULONG_PTR exception_arg; + DWORD exception = 0; + MSVCRT_fenv_t env; + DWORD fpword = 0; + WORD operation; + + TRACE("(%x %x %lf %lf %x %p)\n", fpe, op, arg, res, cw, unk); + +#ifdef _WIN64 + cw = ((cw >> 7) & 0x3f) | ((cw >> 3) & 0xc00); +#endif + operation = op << 5; + exception_arg = (ULONG_PTR)&operation; + + MSVCRT_fegetenv(&env); + + if (fpe & 0x1) { /* overflow */ + if ((fpe == 0x1 && (cw & 0x8)) || (fpe==0x11 && (cw & 0x28))) { + /* 32-bit version also sets SW_INEXACT here */ + env.status |= MSVCRT__SW_OVERFLOW; + if (fpe & 0x10) env.status |= MSVCRT__SW_INEXACT; + res = signbit(res) ? -INFINITY : INFINITY; + } else { + exception = EXCEPTION_FLT_OVERFLOW; + } + } else if (fpe & 0x2) { /* underflow */ + if ((fpe == 0x2 && (cw & 0x10)) || (fpe==0x12 && (cw & 0x30))) { + env.status |= MSVCRT__SW_UNDERFLOW; + if (fpe & 0x10) env.status |= MSVCRT__SW_INEXACT; + res = signbit(res) ? -0.0 : 0.0; + } else { + exception = EXCEPTION_FLT_UNDERFLOW; + } + } else if (fpe & 0x4) { /* zerodivide */ + if ((fpe == 0x4 && (cw & 0x4)) || (fpe==0x14 && (cw & 0x24))) { + env.status |= MSVCRT__SW_ZERODIVIDE; + if (fpe & 0x10) env.status |= MSVCRT__SW_INEXACT; + } else { + exception = EXCEPTION_FLT_DIVIDE_BY_ZERO; + } + } else if (fpe & 0x8) { /* invalid */ + if (fpe == 0x8 && (cw & 0x1)) { + env.status |= MSVCRT__SW_INVALID; + } else { + exception = EXCEPTION_FLT_INVALID_OPERATION; + } + } else if (fpe & 0x10) { /* inexact */ + if (fpe == 0x10 && (cw & 0x20)) { + env.status |= MSVCRT__SW_INEXACT; + } else { + exception = EXCEPTION_FLT_INEXACT_RESULT; + } + } + + if (exception) + env.status = 0; + MSVCRT_fesetenv(&env); + if (exception) + RaiseException(exception, 0, 1, &exception_arg); + + if (cw & 0x1) fpword |= MSVCRT__EM_INVALID; + if (cw & 0x2) fpword |= MSVCRT__EM_DENORMAL; + if (cw & 0x4) fpword |= MSVCRT__EM_ZERODIVIDE; + if (cw & 0x8) fpword |= MSVCRT__EM_OVERFLOW; + if (cw & 0x10) fpword |= MSVCRT__EM_UNDERFLOW; + if (cw & 0x20) fpword |= MSVCRT__EM_INEXACT; + switch (cw & 0xc00) + { + case 0xc00: fpword |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x800: fpword |= MSVCRT__RC_UP; break; + case 0x400: fpword |= MSVCRT__RC_DOWN; break; + } + switch (cw & 0x300) + { + case 0x0: fpword |= MSVCRT__PC_24; break; + case 0x200: fpword |= MSVCRT__PC_53; break; + case 0x300: fpword |= MSVCRT__PC_64; break; + } + if (cw & 0x1000) fpword |= MSVCRT__IC_AFFINE; + _control87(fpword, 0xffffffff); + + return res; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ffd4333..b66a4fe 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -271,7 +271,7 @@ @ cdecl _endthreadex(long) @ cdecl _eof(long) MSVCRT__eof @ cdecl _errno() MSVCRT__errno -@ stub _except1 +@ cdecl _except1(long long double double long ptr) @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr)

1 0

Louis Lenders : wmvcore: Add version resource.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 04460ab0734c1577441e5dabc94ebc8bf63ba3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04460ab0734c1577441e5dabc… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Mar 1 19:53:06 2017 +0100 wmvcore: Add version resource. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 55fa550a02991b94c2981a630746a9fd45f5dc84) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmvcore/Makefile.in | 2 ++ dlls/wmvcore/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index bec1032..ba3539b 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -4,3 +4,5 @@ IMPORTS = kernel32 C_SRCS = \ wmvcore_main.c \ writer.c + +RC_SRCS = version.rc diff --git a/dlls/wmvcore/version.rc b/dlls/wmvcore/version.rc new file mode 100644 index 0000000..445a399 --- /dev/null +++ b/dlls/wmvcore/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2017 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Media Playback dll" +#define WINE_FILENAME_STR "wmvcore.dll" +#define WINE_FILEVERSION 12,0,7601,17514 +#define WINE_FILEVERSION_STR "12.0.7601.17514" +#define WINE_PRODUCTVERSION 12,0,7601,17514 +#define WINE_PRODUCTVERSION_STR "12.0.7601.17514" + +#include "wine/wine_common_ver.rc"

1 0

Henri Verbeet : wined3d: Allow decompression blits on system memory resources in arbfp_blit_supported ().
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 1fd7e669b3fd95d4dcde6dbc70bdf5806c2b93ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fd7e669b3fd95d4dcde6dbc7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 8 16:46:34 2017 +0100 wined3d: Allow decompression blits on system memory resources in arbfp_blit_supported(). In general we prefer to do blits between system memory resources on the CPU, but decompressing DXTn formats in particular is problematic. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f576e5c02857a506e63c33e3303e2a0a4bc24e1a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 210b2f9..7e30aa3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7885,6 +7885,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { enum complex_fixup src_fixup; + BOOL decompress; if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) return FALSE; @@ -7907,7 +7908,9 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, return FALSE; } - if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) + decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); + if (!decompress && (dst_pool == WINED3D_POOL_SYSTEM_MEM || src_pool == WINED3D_POOL_SYSTEM_MEM)) return FALSE; src_fixup = get_complex_fixup(src_format->color_fixup);

1 0

Alex Henrie : comdlg32: Don' t crash if an IShellFolder could not be created.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 0a2abcee3d76f1e88cbb21c7f9d542a8e2d5c6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2abcee3d76f1e88cbb21c7f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 14 00:00:48 2017 -0700 comdlg32: Don't crash if an IShellFolder could not be created. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e07d20f3f39220d5f1d2a2e5c85cc4d624060f2f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/filedlg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index d0d00b3..bcae7d3 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2951,7 +2951,8 @@ static void FILEDLG95_SHELL_Clean(HWND hwnd) IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView); IShellView_Release(fodInfos->Shell.FOIShellView); } - IShellFolder_Release(fodInfos->Shell.FOIShellFolder); + if (fodInfos->Shell.FOIShellFolder) + IShellFolder_Release(fodInfos->Shell.FOIShellFolder); IShellBrowser_Release(fodInfos->Shell.FOIShellBrowser); if (fodInfos->Shell.FOIDataObject) IDataObject_Release(fodInfos->Shell.FOIDataObject);

1 0

Julian Rüger : readme: Update German translation.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: b0953061fd7762ed966a6c0daa035f45b3817ec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0953061fd7762ed966a6c0da… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 17:15:07 2017 +0100 readme: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e2f677212a4b417fcb97cde2119f22b6b9ee423b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.de | 131 ++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0953061fd7762ed966a6…

1 0