July 2017 - Wine-commits - list.winehq.org

Zebediah Figura : wincodecs: Add encoder options for JPEG.
by Alexandre Julliard 31 Jul '17

31 Jul '17

Module: wine Branch: master Commit: 8648aaf86d6417950e8e0501e53edacfbb6461a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8648aaf86d6417950e8e0501e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 28 14:41:13 2017 -0500 wincodecs: Add encoder options for JPEG. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/jpegformat.c | 29 ++++++++++++++++++++++++++++- dlls/windowscodecs/tests/converter.c | 28 ++++++++++++++++++++++++++++ include/wincodec.idl | 8 ++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index acc262e..014620f 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -60,6 +60,13 @@ WINE_DECLARE_DEBUG_CHANNEL(jpeg); static void *libjpeg_handle; +static const WCHAR wszImageQuality[] = {'I','m','a','g','e','Q','u','a','l','i','t','y',0}; +static const WCHAR wszBitmapTransform[] = {'B','i','t','m','a','p','T','r','a','n','s','f','o','r','m',0}; +static const WCHAR wszLuminance[] = {'L','u','m','i','n','a','n','c','e',0}; +static const WCHAR wszChrominance[] = {'C','h','r','o','m','i','n','a','n','c','e',0}; +static const WCHAR wszJpegYCrCbSubsampling[] = {'J','p','e','g','Y','C','r','C','b','S','u','b','s','a','m','p','l','i','n','g',0}; +static const WCHAR wszSuppressApp0[] = {'S','u','p','p','r','e','s','s','A','p','p','0',0}; + #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(jpeg_CreateCompress); MAKE_FUNCPTR(jpeg_CreateDecompress); @@ -1407,6 +1414,7 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, { JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; + PROPBAG2 opts[6] = {{0}}; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); @@ -1424,7 +1432,26 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + opts[0].pstrName = (LPOLESTR)wszImageQuality; + opts[0].vt = VT_R4; + opts[0].dwType = PROPBAG2_TYPE_DATA; + opts[1].pstrName = (LPOLESTR)wszBitmapTransform; + opts[1].vt = VT_UI1; + opts[1].dwType = PROPBAG2_TYPE_DATA; + opts[2].pstrName = (LPOLESTR)wszLuminance; + opts[2].vt = VT_I4|VT_ARRAY; + opts[2].dwType = PROPBAG2_TYPE_DATA; + opts[3].pstrName = (LPOLESTR)wszChrominance; + opts[3].vt = VT_I4|VT_ARRAY; + opts[3].dwType = PROPBAG2_TYPE_DATA; + opts[4].pstrName = (LPOLESTR)wszJpegYCrCbSubsampling; + opts[4].vt = VT_UI1; + opts[4].dwType = PROPBAG2_TYPE_DATA; + opts[5].pstrName = (LPOLESTR)wszSuppressApp0; + opts[5].vt = VT_BOOL; + opts[5].dwType = PROPBAG2_TYPE_DATA; + + hr = CreatePropertyBag2(opts, 6, ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index fba7fc7..041ca96 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -429,6 +429,12 @@ static const WCHAR wszTiffCompressionMethod[] = {'T','i','f','f','C','o','m','p' static const WCHAR wszCompressionQuality[] = {'C','o','m','p','r','e','s','s','i','o','n','Q','u','a','l','i','t','y',0}; static const WCHAR wszInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; static const WCHAR wszFilterOption[] = {'F','i','l','t','e','r','O','p','t','i','o','n',0}; +static const WCHAR wszImageQuality[] = {'I','m','a','g','e','Q','u','a','l','i','t','y',0}; +static const WCHAR wszBitmapTransform[] = {'B','i','t','m','a','p','T','r','a','n','s','f','o','r','m',0}; +static const WCHAR wszLuminance[] = {'L','u','m','i','n','a','n','c','e',0}; +static const WCHAR wszChrominance[] = {'C','h','r','o','m','i','n','a','n','c','e',0}; +static const WCHAR wszJpegYCrCbSubsampling[] = {'J','p','e','g','Y','C','r','C','b','S','u','b','s','a','m','p','l','i','n','g',0}; +static const WCHAR wszSuppressApp0[] = {'S','u','p','p','r','e','s','s','A','p','p','0',0}; static const struct property_opt_test_data testdata_tiff_props[] = { { wszTiffCompressionMethod, VT_UI1, VT_UI1, WICTiffCompressionDontCare }, @@ -442,6 +448,16 @@ static const struct property_opt_test_data testdata_png_props[] = { { NULL } }; +static const struct property_opt_test_data testdata_jpeg_props[] = { + { wszImageQuality, VT_R4, VT_EMPTY }, + { wszBitmapTransform, VT_UI1, VT_UI1, WICBitmapTransformRotate0 }, + { wszLuminance, VT_I4|VT_ARRAY, VT_EMPTY }, + { wszChrominance, VT_I4|VT_ARRAY, VT_EMPTY }, + { wszJpegYCrCbSubsampling, VT_UI1, VT_UI1, WICJpegYCrCbSubsamplingDefault, 0.0f, TRUE }, /* not supported on XP/2k3 */ + { wszSuppressApp0, VT_BOOL, VT_BOOL, FALSE }, + { NULL } +}; + static int find_property_index(const WCHAR* name, PROPBAG2* all_props, int all_prop_cnt) { int i; @@ -566,6 +582,8 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o test_specific_encoder_properties(options, testdata_tiff_props, all_props, cProperties2); else if (IsEqualCLSID(clsid_encoder, &CLSID_WICPngEncoder)) test_specific_encoder_properties(options, testdata_png_props, all_props, cProperties2); + else if (IsEqualCLSID(clsid_encoder, &CLSID_WICJpegEncoder)) + test_specific_encoder_properties(options, testdata_jpeg_props, all_props, cProperties2); for (i=0; i < cProperties2; i++) { @@ -727,6 +745,13 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls i++; } + if (clsid_decoder == NULL) + { + IStream_Release(stream); + IWICBitmapEncoder_Release(encoder); + return; + } + if (SUCCEEDED(hr)) { hr = IWICBitmapEncoder_Commit(encoder); @@ -868,6 +893,9 @@ START_TEST(converter) test_encoder(&testdata_24bppBGR, &CLSID_WICTiffEncoder, &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); + test_encoder(&testdata_24bppBGR, &CLSID_WICJpegEncoder, + &testdata_24bppBGR, NULL, "JPEG encoder 24bppBGR"); + test_multi_encoder(multiple_frames, &CLSID_WICTiffEncoder, multiple_frames, &CLSID_WICTiffDecoder, NULL, NULL, "TIFF encoder multi-frame"); diff --git a/include/wincodec.idl b/include/wincodec.idl index 1bbdab9..e727cbd 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -148,6 +148,14 @@ typedef enum WICComponentEnumerateOptions { WICComponentEnumerateDisabled = 0x80000000 } WICComponentEnumerateOptions; +typedef enum WICJpegYCrCbSubsamplingOption { + WICJpegYCrCbSubsamplingDefault = 0x00000000, + WICJpegYCrCbSubsampling420 = 0x00000001, + WICJpegYCrCbSubsampling422 = 0x00000002, + WICJpegYCrCbSubsampling444 = 0x00000003, + WICJpegYCrCbSubsampling440 = 0x00000004 +} WICJpegYCrCbSubsamplingOption; + typedef enum WICPixelFormatNumericRepresentation { WICPixelFormatNumericRepresentationUnspecified = 0x00000000, WICPixelFormatNumericRepresentationIndexed = 0x00000001,

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

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

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

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: 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

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

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

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

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