wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Zebediah Figura : ole2disp: Implement several IIDs.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 5ccfaa54b17d8fbd458baeeb91df83a27f74062c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccfaa54b17d8fbd458baeeb9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 2 12:27:12 2017 -0600 ole2disp: 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 77d99bbff3c26960aaa18a93f0e1156615a98648) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.dll16.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 4ee52e1..4b8af41 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -30,8 +30,8 @@ 30 stub DISPINVOKE 31 pascal CreateDispTypeInfo(ptr long ptr) CreateDispTypeInfo16 32 pascal CreateStdDispatch(ptr ptr ptr ptr) CreateStdDispatch16 -33 stub _IID_IDISPATCH -34 stub _IID_IENUMVARIANT +33 variable _IID_IDispatch(0x00020400 0x00000000 0x000000c0 0x46000000) +34 variable _IID_IEnumVARIANT(0x00020404 0x00000000 0x000000c0 0x46000000) 35 pascal RegisterActiveObject(ptr ptr long ptr) RegisterActiveObject16 36 stub REVOKEACTIVEOBJECT 37 stub GETACTIVEOBJECT @@ -110,9 +110,9 @@ 110 pascal SetErrorInfo(long ptr) SetErrorInfo16 111 stub GETERRORINFO 112 stub CREATEERRORINFO -113 stub _IID_IERRORINFO -114 stub _IID_ICREATEERRORINFO -115 stub _IID_ISUPPORTERRORINFO +113 variable _IID_IErrorInfo(0x1cf2b120 0x101b547d 0x0008658e 0x19d12b2b) +114 variable _IID_ICreateErrorInfo(0x22f03340 0x101b547d 0x0008658e 0x19d12b2b) +115 variable _IID_ISupportErrorInfo(0xdf0b3d60 0x101b548f 0x0008658e 0x19d12b2b) 116 stub VARUI1FROMI2 117 stub VARUI1FROMI4 118 stub VARUI1FROMR4

1 0

Zebediah Figura : avifile: Implement several IIDs.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 6beb7779e823976f0e368c2ad748f31b9c509e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6beb7779e823976f0e368c2ad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 2 12:27:11 2017 -0600 avifile: 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 e29b1682c2e1c7e97ca0a401e9098ea882b94e96) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/avifile.dll16/avifile.dll16.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/avifile.dll16/avifile.dll16.spec b/dlls/avifile.dll16/avifile.dll16.spec index 71a6c74..239d3a4 100644 --- a/dlls/avifile.dll16/avifile.dll16.spec +++ b/dlls/avifile.dll16/avifile.dll16.spec @@ -7,11 +7,11 @@ 2 stub DLLGETCLASSOBJECT 3 stub DLLCANUNLOADNOW 4 stub ___EXPORTEDSTUB -10 stub _IID_IAVISTREAM -11 stub _IID_IAVIFILE -12 stub _IID_IAVIEDITSTREAM -13 stub _IID_IGETFRAME -14 stub _CLSID_AVISIMPLEUNMARSHAL +10 variable _IID_IAVIStream(0x00020021 0x00000000 0x000000c0 0x46000000) +11 variable _IID_IAVIFile(0x00020020 0x00000000 0x000000c0 0x46000000) +12 variable _IID_IAVIEditStream(0x00020024 0x00000000 0x000000c0 0x46000000) +13 variable _IID_IGetFrame(0x00020023 0x00000000 0x000000c0 0x46000000) +14 variable _CLSID_AVISimpleUnMarshal(0x00020009 0x00000000 0x000000c0 0x46000000) 100 pascal AVIFileInit() AVIFileInit 101 pascal AVIFileExit() AVIFileExit 102 pascal AVIFileOpen(ptr str word ptr) AVIFileOpenA

1 0

Zebediah Figura : ole2: Implement several IIDs.
by Alexandre Julliard 20 Apr '17

20 Apr '17

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 20 Apr '17

20 Apr '17

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

Zebediah Figura : winebuild: Use unsigned int in spec file variable parameters.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: da9b7a5897ee49299ea0370b831081210b1826ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=da9b7a5897ee49299ea0370b8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 1 22:23:53 2017 -0600 winebuild: Use unsigned int in spec file variable parameters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 544ea174a61923a36b0eb2da6620f7f09a066e7f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winebuild/build.h | 2 +- tools/winebuild/parser.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 03b88fa..398d542 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -80,7 +80,7 @@ enum arg_type typedef struct { int n_values; - int *values; + unsigned int *values; } ORD_VARIABLE; typedef struct diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 1d7b84e..2762a8c 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -182,7 +182,7 @@ static ORDDEF *add_entry_point( DLLSPEC *spec ) static int parse_spec_variable( ORDDEF *odp, DLLSPEC *spec ) { char *endptr; - int *value_array; + unsigned int *value_array; int n_values; int value_array_size; const char *token; @@ -214,7 +214,7 @@ static int parse_spec_variable( ORDDEF *odp, DLLSPEC *spec ) if (*token == ')') break; - value_array[n_values++] = strtol(token, &endptr, 0); + value_array[n_values++] = strtoul(token, &endptr, 0); if (n_values == value_array_size) { value_array_size += 25;

1 0

Alex Henrie : user32: Include space for ampersands when determining MessageBox size.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: da833ba30277586be38148612f2199f210d174ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=da833ba30277586be38148612… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 24 01:08:36 2017 -0700 user32: Include space for ampersands when determining MessageBox size. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0a2f9f54ebfef4adc3e0438ffcb9cf531ac1ba73) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/msgbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 2ba98c9..0839f97 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -261,8 +261,8 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* Get the text size */ GetClientRect(GetDlgItem(hwnd, MSGBOX_IDTEXT), &rect); rect.top = rect.left = rect.bottom = 0; - DrawTextW( hdc, lpszText, -1, &rect, - DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK | DT_CALCRECT); + DrawTextW(hdc, lpszText, -1, &rect, + DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK | DT_CALCRECT | DT_NOPREFIX); /* Min text width corresponds to space for the buttons */ tleft = ileft; if (iwidth) tleft += ileft + iwidth;

1 0

Piotr Caban : msvcr120: Add _except1 implementation.
by Alexandre Julliard 20 Apr '17

20 Apr '17

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

Daniel Lehman : msvcrt: Implement nan.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 082394fa65a3d576afa1c6be2dff2b5f191d4eeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=082394fa65a3d576afa1c6be2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 27 12:38:02 2017 +0100 msvcrt: Implement nan. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 09e4fc834dce082b4a69792b55a4b2418e2ac8d3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +++--- 5 files changed, 29 insertions(+), 12 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 6a31197..8ff4c58 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 @@ -288,9 +288,9 @@ @ cdecl lroundl(double) ucrtbase.lroundl @ cdecl modf(double ptr) ucrtbase.modf @ cdecl -arch=arm,x86_64 modff(float ptr) ucrtbase.modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) ucrtbase.nan +@ cdecl nanf(str) ucrtbase.nanf +@ cdecl nanl(str) ucrtbase.nanl @ cdecl nearbyint(double) ucrtbase.nearbyint @ cdecl nearbyintf(float) ucrtbase.nearbyintf @ cdecl nearbyintl(double) ucrtbase.nearbyintl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c11993a..95e9d18 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2293,9 +2293,9 @@ @ cdecl memset(ptr long long) MSVCRT_memset @ cdecl modf(double ptr) MSVCRT_modf @ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) MSVCR120_nan +@ cdecl nanf(str) MSVCR120_nanf +@ cdecl nanl(str) MSVCR120_nan @ cdecl nearbyint(double) MSVCRT_nearbyint @ cdecl nearbyintf(float) MSVCRT_nearbyintf @ cdecl nearbyintl(double) MSVCRT_nearbyint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 15c1441..e71388b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1956,9 +1956,9 @@ @ cdecl memset(ptr long long) msvcr120.memset @ cdecl modf(double ptr) msvcr120.modf @ cdecl -arch=arm,x86_64 modff(float ptr) msvcr120.modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) msvcr120.nan +@ cdecl nanf(str) msvcr120.nanf +@ cdecl nanl(str) msvcr120.nanl @ cdecl nearbyint(double) msvcr120.nearbyint @ cdecl nearbyintf(float) msvcr120.nearbyintf @ cdecl nearbyintl(double) msvcr120.nearbyintl diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 921785d..74685d4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2969,3 +2969,20 @@ LDOUBLE CDECL MSVCR120_lgammal(LDOUBLE x) { return MSVCR120_lgamma(x); } + +/********************************************************************* + * nan (MSVCR120.@) + */ +double CDECL MSVCR120_nan(const char *tagp) +{ + /* Windows ignores input (MSDN) */ + return NAN; +} + +/********************************************************************* + * nanf (MSVCR120.@) + */ +float CDECL MSVCR120_nanf(const char *tagp) +{ + return NAN; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index e4a2201..ffd4333 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2429,9 +2429,9 @@ @ cdecl memset(ptr long long) MSVCRT_memset @ cdecl modf(double ptr) MSVCRT_modf @ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) MSVCR120_nan +@ cdecl nanf(str) MSVCR120_nanf +@ cdecl nanl(str) MSVCR120_nan @ cdecl nearbyint(double) MSVCRT_nearbyint @ cdecl nearbyintf(float) MSVCRT_nearbyintf @ cdecl nearbyintl(double) MSVCRT_nearbyint

1 0

Nikolay Sivov : comdlg32: Expand initial directory path for file open dialog.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: cf4fb7291d9bc315a8ba85087dd505b66c28f371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4fb7291d9bc315a8ba85087… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 21 15:35:15 2017 +0300 comdlg32: Expand initial directory path for file open dialog. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aef84332a2dc3a05a3e1b433158b2e91abc48ed0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/filedlg.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index bcae7d3..6bedf40 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -508,15 +508,17 @@ static BOOL GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType) else fodInfos.filename = NULL; + fodInfos.initdir = NULL; if(ofn->lpstrInitialDir) { /* fodInfos.initdir = strdupW(ofn->lpstrInitialDir); */ - DWORD len = lstrlenW(ofn->lpstrInitialDir)+1; - fodInfos.initdir = MemAlloc(len*sizeof(WCHAR)); - memcpy(fodInfos.initdir,ofn->lpstrInitialDir,len*sizeof(WCHAR)); + DWORD len = ExpandEnvironmentStringsW(ofn->lpstrInitialDir, NULL, 0); + if (len) + { + fodInfos.initdir = MemAlloc(len * sizeof(WCHAR)); + ExpandEnvironmentStringsW(ofn->lpstrInitialDir, fodInfos.initdir, len); + } } - else - fodInfos.initdir = NULL; /* save current directory */ if (ofn->Flags & OFN_NOCHANGEDIR)

1 0

Louis Lenders : wmvcore: Add version resource.
by Alexandre Julliard 20 Apr '17

20 Apr '17

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

← Newer
1
...
31
32
33
34
35
36
37
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017