wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Ken Thomases : winemac: Scale cursors for Retina mode, now that user32 scales them with DPI.
by Alexandre Julliard 31 Jul '17

31 Jul '17

Module: wine Branch: master Commit: 611c15953e8297ac1762abfb5aeca6665985fc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=611c15953e8297ac1762abfb5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 31 14:44:08 2017 -0500 winemac: Scale cursors for Retina mode, now that user32 scales them with DPI. When they were always 32x32, treating that size as though it were in Cocoa's virtual "points" rather than pixels produced good results even though it wasn't really correct. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 2cf67f1..46176f7 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -992,12 +992,14 @@ static NSString* WineLocalizedString(unsigned int stringID) { NSDictionary* frame = [cursorFrames objectAtIndex:cursorFrame]; CGImageRef cgimage = (CGImageRef)[frame objectForKey:@"image"]; - NSImage* image = [[NSImage alloc] initWithCGImage:cgimage size:NSZeroSize]; + CGSize size = CGSizeMake(CGImageGetWidth(cgimage), CGImageGetHeight(cgimage)); + NSImage* image = [[NSImage alloc] initWithCGImage:cgimage size:NSSizeFromCGSize(cgsize_mac_from_win(size))]; CFDictionaryRef hotSpotDict = (CFDictionaryRef)[frame objectForKey:@"hotSpot"]; CGPoint hotSpot; if (!CGPointMakeWithDictionaryRepresentation(hotSpotDict, &hotSpot)) hotSpot = CGPointZero; + hotSpot = cgpoint_mac_from_win(hotSpot); self.cursor = [[[NSCursor alloc] initWithImage:image hotSpot:NSPointFromCGPoint(hotSpot)] autorelease]; [image release]; [self unhideCursor];

1 0

Jacek Caban : ws2_32: Added GetAddrInfoExOverlappedResult stub implementation.
by Alexandre Julliard 31 Jul '17

31 Jul '17

Module: wine Branch: master Commit: cbfa90c39070d1d757a44cc7bf1d25ed4fd713e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbfa90c39070d1d757a44cc7b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 31 18:04:21 2017 +0200 ws2_32: Added GetAddrInfoExOverlappedResult stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 9 +++++++++ dlls/ws2_32/ws2_32.spec | 1 + include/ws2tcpip.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3f4691f..620b19b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6836,6 +6836,15 @@ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namesp } /*********************************************************************** + * GetAddrInfoExOverlappedResult (WS2_32.@) + */ +int WINAPI GetAddrInfoExOverlappedResult(OVERLAPPED *overlapped) +{ + FIXME("(%p)\n", overlapped); + return SOCKET_ERROR; +} + +/*********************************************************************** * GetAddrInfoExCancel (WS2_32.@) */ int WINAPI GetAddrInfoExCancel(HANDLE *handle) diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index db34fc1..ae3eaf0 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -53,6 +53,7 @@ @ stdcall FreeAddrInfoExW(ptr) @ stdcall FreeAddrInfoW(ptr) @ stdcall GetAddrInfoExCancel(ptr) +@ stdcall GetAddrInfoExOverlappedResult(ptr) @ stdcall GetAddrInfoExW(wstr wstr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall GetNameInfoW(ptr long ptr long ptr long long) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 337383b..2d509be 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -182,6 +182,7 @@ int WINAPI GetAddrInfoExA(const char*,const char*,DWORD,GUID*,const ADDRINFOEXA int WINAPI GetAddrInfoExW(const WCHAR*,const WCHAR*,DWORD,GUID*, const ADDRINFOEXW*,ADDRINFOEXW**,struct timeval*, OVERLAPPED*,LPLOOKUPSERVICE_COMPLETION_ROUTINE,HANDLE*); #define GetAddrInfoEx WINELIB_NAME_AW(GetAddrInfoExW) +int WINAPI GetAddrInfoExOverlappedResult(OVERLAPPED*); int WINAPI GetAddrInfoExCancel(HANDLE*); int WINAPI WS(getnameinfo)(const SOCKADDR*,WS(socklen_t),PCHAR,DWORD,PCHAR,DWORD,INT); #define GetNameInfoA WS(getnameinfo)

1 0

Alexandre Julliard : wineandroid: Also set WINEDLLPATH.
by Alexandre Julliard 31 Jul '17

31 Jul '17

Module: wine Branch: master Commit: d1abe867713ae79073029c2418f4f52742e6261d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1abe867713ae79073029c241… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 31 19:48:24 2017 +0200 wineandroid: Also set WINEDLLPATH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 800d8d4..3345e18 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -78,6 +78,7 @@ public class WineActivity extends Activity { File bindir = new File( getFilesDir(), Build.CPU_ABI + "/bin" ); File libdir = new File( getFilesDir(), Build.CPU_ABI + "/lib" ); + File dlldir = new File( libdir, "wine" ); File prefix = new File( getFilesDir(), "prefix" ); File loader = new File( bindir, "wine" ); String locale = Locale.getDefault().getLanguage() + "_" + @@ -88,6 +89,7 @@ public class WineActivity extends Activity HashMap<String,String> env = new HashMap<String,String>(); env.put( "WINELOADER", loader.toString() ); env.put( "WINEPREFIX", prefix.toString() ); + env.put( "WINEDLLPATH", dlldir.toString() ); env.put( "LD_LIBRARY_PATH", libdir.toString() + ":" + getApplicationInfo().nativeLibraryDir ); env.put( "LC_ALL", locale ); env.put( "LANG", locale );

1 0

Alexandre Julliard : wineandroid: Update the views z-order based on the window hierarchy.
by Alexandre Julliard 31 Jul '17

31 Jul '17

Module: wine Branch: master Commit: 56fbca4f44ce8c715137b18a2a4c044bf64c217b URL: http://source.winehq.org/git/wine.git/?a=commit;h=56fbca4f44ce8c715137b18a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 31 19:16:17 2017 +0200 wineandroid: Update the views z-order based on the window hierarchy. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 108 +++++++++++++++++++++++++-------- dlls/wineandroid.drv/window.c | 7 ++- 2 files changed, 87 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56fbca4f44ce8c715137b…

1 0

Hugh McMaster : regedit: Pass memcpy() the correct destination address.
by Alexandre Julliard 31 Jul '17

31 Jul '17

Module: wine Branch: master Commit: 744d53850965306f1a9bb0026c676185af812571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=744d53850965306f1a9bb0026… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Jul 30 10:45:53 2017 +0000 regedit: Pass memcpy() the correct destination address. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index e1e8c7f..4c2ec36 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -170,7 +170,7 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR if (ValBuf && dwCount) { linfo->val = heap_xalloc(dwCount); - memcpy(&linfo->val, ValBuf, dwCount); + memcpy(linfo->val, ValBuf, dwCount); } else linfo->val = NULL;

1 0

Alex Henrie : msvcrt: Don't set errno in sinh(f), cosh(f), or atan2(f) if x is ±INF.
by Alexandre Julliard 31 Jul '17

31 Jul '17

Module: wine Branch: master Commit: 6e73ef2091d4b08f6210d55020ff0c8f8d223550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e73ef2091d4b08f6210d5502… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 27 02:26:25 2017 -0600 msvcrt: Don't set errno in sinh(f), cosh(f), or atan2(f) if x is ±INF. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 82f56ca..2001d44 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -183,7 +183,7 @@ float CDECL MSVCRT_atanf( float x ) */ float CDECL MSVCRT_atan2f( float x, float y ) { - if (!finitef(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if (isnanf(x)) *MSVCRT__errno() = MSVCRT_EDOM; return atan2f(x,y); } @@ -201,7 +201,7 @@ float CDECL MSVCRT_cosf( float x ) */ float CDECL MSVCRT_coshf( float x ) { - if (!finitef(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if (isnanf(x)) *MSVCRT__errno() = MSVCRT_EDOM; return coshf(x); } @@ -270,7 +270,7 @@ float CDECL MSVCRT_sinf( float x ) */ float CDECL MSVCRT_sinhf( float x ) { - if (!finitef(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if (isnanf(x)) *MSVCRT__errno() = MSVCRT_EDOM; return sinhf(x); } @@ -380,7 +380,7 @@ double CDECL MSVCRT_atan( double x ) */ double CDECL MSVCRT_atan2( double x, double y ) { - if (!isfinite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if (isnan(x)) *MSVCRT__errno() = MSVCRT_EDOM; return atan2(x,y); } @@ -398,7 +398,7 @@ double CDECL MSVCRT_cos( double x ) */ double CDECL MSVCRT_cosh( double x ) { - if (!isfinite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if (isnan(x)) *MSVCRT__errno() = MSVCRT_EDOM; return cosh(x); } @@ -467,7 +467,7 @@ double CDECL MSVCRT_sin( double x ) */ double CDECL MSVCRT_sinh( double x ) { - if (!isfinite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if (isnan(x)) *MSVCRT__errno() = MSVCRT_EDOM; return sinh(x); }

1 0

Alex Henrie : msvcrt: Don't set errno in _logb(f) if x is ±INF.
by Alexandre Julliard 31 Jul '17

31 Jul '17

Module: wine Branch: master Commit: 70c338c27ad5b82ffa5540f8ee3fd81cdc5615f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c338c27ad5b82ffa5540f8e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 27 02:26:24 2017 -0600 msvcrt: Don't set errno in _logb(f) if x is ±INF. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2433376..82f56ca 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -141,7 +141,7 @@ INT CDECL MSVCRT__isnanf( float num ) */ float CDECL MSVCRT__logbf( float num ) { - if (!finitef(num)) *MSVCRT__errno() = MSVCRT_EDOM; + if (isnanf(num)) *MSVCRT__errno() = MSVCRT_EDOM; else if (!num) *MSVCRT__errno() = MSVCRT_ERANGE; return logbf(num); } @@ -789,7 +789,7 @@ __int64 CDECL _abs64( __int64 n ) */ double CDECL MSVCRT__logb(double num) { - if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; + if (isnan(num)) *MSVCRT__errno() = MSVCRT_EDOM; else if (!num) *MSVCRT__errno() = MSVCRT_ERANGE; return logb(num); }

1 0

Alex Henrie : msvcrt: Set errno in _logb(f) if x is 0.
by Alexandre Julliard 31 Jul '17

31 Jul '17

Module: wine Branch: master Commit: 9e3b3c9bac63fba8396d788ac93197f82e392a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3b3c9bac63fba8396d788ac… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 27 02:26:23 2017 -0600 msvcrt: Set errno in _logb(f) if x is 0. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 1d61396..2433376 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -142,6 +142,7 @@ INT CDECL MSVCRT__isnanf( float num ) float CDECL MSVCRT__logbf( float num ) { if (!finitef(num)) *MSVCRT__errno() = MSVCRT_EDOM; + else if (!num) *MSVCRT__errno() = MSVCRT_ERANGE; return logbf(num); } @@ -789,6 +790,7 @@ __int64 CDECL _abs64( __int64 n ) double CDECL MSVCRT__logb(double num) { if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; + else if (!num) *MSVCRT__errno() = MSVCRT_ERANGE; return logb(num); }

1 0

Alistair Leslie-Hughes : wmp: Ignore IMarshal/ IRunnableObject interfaces in IOleObject_QueryInterface.
by Alexandre Julliard 31 Jul '17

31 Jul '17

Module: wine Branch: master Commit: f9e995de42e1a248e2e86e34f8b9b7949b100dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e995de42e1a248e2e86e34f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 31 05:59:21 2017 +0000 wmp: Ignore IMarshal/IRunnableObject interfaces in IOleObject_QueryInterface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/oleobj.c | 9 ++++++++- dlls/wmp/tests/oleobj.c | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 8dcdfbd..acf38f3 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -219,6 +219,8 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v { WindowsMediaPlayer *This = impl_from_IOleObject(iface); + *ppv = NULL; + if(IsEqualGUID(riid, &IID_IUnknown)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IOleObject_iface; @@ -267,9 +269,14 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v }else if(IsEqualGUID(riid, &IID_IOleControl)) { TRACE("(%p)->(IID_IOleControl %p)\n", This, ppv); *ppv = &This->IOleControl_iface; + }else if(IsEqualGUID(riid, &IID_IMarshal)) { + TRACE("(%p)->(IID_IMarshal %p)\n", This, ppv); + return E_NOINTERFACE; + }else if(IsEqualGUID(riid, &IID_IQuickActivate)) { + TRACE("(%p)->(IID_IQuickActivate %p)\n", This, ppv); + return E_NOINTERFACE; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - *ppv = NULL; return E_NOINTERFACE; } diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index b008af1..3242d0c 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -848,6 +848,9 @@ static void test_QI(IUnknown *unk) hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&tmp); ok(hres == E_NOINTERFACE, "Got IQuickActivate iface when no expected\n"); + hres = IUnknown_QueryInterface(unk, &IID_IMarshal, (void**)&tmp); + ok(hres == E_NOINTERFACE, "Could not get IMarshal iface: %08x\n", hres); + hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObjectWindowless, (void**)&tmp); ok(hres == S_OK, "Could not get IOleInPlaceObjectWindowless iface: %08x\n", hres); IUnknown_Release(tmp);

1 0

Huw Davies : packager: Add the ProgID.
by Alexandre Julliard 31 Jul '17

31 Jul '17

Module: wine Branch: master Commit: 75d030ed136b202cd43046f8322188236a61c0e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d030ed136b202cd43046f83… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 31 09:06:46 2017 +0100 packager: Add the ProgID. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/packager/packager_classes.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/packager/packager_classes.idl b/dlls/packager/packager_classes.idl index d57ac29..4ae1058 100644 --- a/dlls/packager/packager_classes.idl +++ b/dlls/packager/packager_classes.idl @@ -19,7 +19,7 @@ #pragma makedep register [ - helpstring("Package"), + progid("Package"), threading(apartment), uuid(F20DA720-C02F-11CE-927B-0800095AE340) ]

1 0

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 July 2017