wine-commits December 2016

wine-commits@winehq.org

2 participants
342 discussions

Piotr Caban : msvcrt: Add _fpieee_flt stub.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 63d80c3108322bb8795c5f5189c78d119e1bf490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d80c3108322bb8795c5f518… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 13:57:55 2016 +0200 msvcrt: Add _fpieee_flt stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dc0e3d0a9c3ffa085d1cbcc53940d1876005af1a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except_arm.c | 10 +++ dlls/msvcrt/except_i386.c | 11 +++ dlls/msvcrt/except_x86_64.c | 11 +++ dlls/msvcrt/msvcrt.h | 90 ++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 19 files changed, 137 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63d80c3108322bb8795c5…

1 0

Michael Müller : msvfw32: Use case insensitive compare in ICInfo for fourcc codes.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: a4e39fcbf253a36b546219fc8fe2a8731364c14a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e39fcbf253a36b546219fc8… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Nov 22 03:52:55 2016 -0200 msvfw32: Use case insensitive compare in ICInfo for fourcc codes. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 02fa1d4cc2f99909d62565e1760bc0158e36d700) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 5 ++--- dlls/msvfw32/tests/msvfw.c | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 4f1a2bf..6650b8f 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -299,9 +299,8 @@ static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) ICINFO *lpicinfo = param; DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0); - /* exact match of fccHandler or nth driver found */ - if ((lpicinfo->fccHandler != nr) && (lpicinfo->fccHandler != fccHandler)) - return FALSE; + if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler)) + return FALSE; lpicinfo->fccHandler = fccHandler; lpicinfo->dwFlags = 0; diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 507d003..0b0c9dc 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -306,14 +306,12 @@ static void test_ICInfo(void) if (fcc[0] & 0x20) { fcc[0] &= ~0x20; -todo_wine ok(ICInfo(info.fccType, info.fccHandler, &info2), "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler); } else { fcc[0] |= 0x20; -todo_wine ok(ICInfo(info.fccType, info.fccHandler, &info2), "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); }

1 0

Bruno Jesus : msvfw32/tests: Add tests for ICInfo().
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 065f67360e592ab005e04e09ec0083e73eca15a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=065f67360e592ab005e04e09e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 22 03:52:53 2016 -0200 msvfw32/tests: Add tests for ICInfo(). Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 90e4ad3b144b44805e21b8549129c29e75b797e2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 125cac5..507d003 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -285,9 +285,47 @@ static void test_ICSeqCompress(void) ok(err == ICERR_BADHANDLE, "Expected -8, got %d\n", err); } +static void test_ICInfo(void) +{ + ICINFO info, info2; + DWORD i, found; + unsigned char *fcc; + + for (i = found = 0; ICInfo(0, i, &info); i++) + { + trace("Codec name: %s, fccHandler: 0x%08x\n", wine_dbgstr_w(info.szName), info.fccHandler); + + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x\n", info.fccHandler); + + fcc = (unsigned char *)&info.fccHandler; + if (!isalpha(fcc[0])) continue; + + found++; + /* Test getting info with a different case - bug 41602 */ + if (fcc[0] & 0x20) + { + fcc[0] &= ~0x20; +todo_wine + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler); + } + else + { + fcc[0] |= 0x20; +todo_wine + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); + } + } +todo_wine + ok(found != 0, "expected at least one codec\n"); +} + START_TEST(msvfw) { test_OpenCase(); test_Locate(); test_ICSeqCompress(); + test_ICInfo(); }

1 0

Andrew Eikum : mmdevapi: Implement IAudioEndpointVolume::GetVolumeRange.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 6fbcd1db4a9e1d787bc1a978ad870d5af14f9f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fbcd1db4a9e1d787bc1a978a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 9 12:41:22 2016 -0600 mmdevapi: Implement IAudioEndpointVolume::GetVolumeRange. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 89de040e4f2567df48af1cfcad33c34e2a54d9cb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/audiovolume.c | 15 ++++++++++----- dlls/mmdevapi/devenum.c | 5 +++-- dlls/mmdevapi/mmdevapi.h | 2 +- dlls/mmdevapi/tests/mmdevenum.c | 1 + dlls/mmdevapi/tests/render.c | 24 ++++++++++++++++++++++++ 5 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 7dddbdf..a49d2e9 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -233,10 +233,15 @@ static HRESULT WINAPI AEV_QueryHardwareSupport(IAudioEndpointVolumeEx *iface, DW static HRESULT WINAPI AEV_GetVolumeRange(IAudioEndpointVolumeEx *iface, float *mindb, float *maxdb, float *inc) { TRACE("(%p)->(%p,%p,%p)\n", iface, mindb, maxdb, inc); + if (!mindb || !maxdb || !inc) return E_POINTER; - FIXME("stub\n"); - return E_NOTIMPL; + + *mindb = -100.f; + *maxdb = 0.f; + *inc = 1.f; + + return S_OK; } static HRESULT WINAPI AEV_GetVolumeRangeChannel(IAudioEndpointVolumeEx *iface, UINT chan, float *mindb, float *maxdb, float *inc) @@ -273,17 +278,17 @@ static const IAudioEndpointVolumeExVtbl AEVImpl_Vtbl = { AEV_GetVolumeRangeChannel }; -HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) +HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) { AEVImpl *This; *ppv = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IAudioEndpointVolumeEx_iface.lpVtbl = &AEVImpl_Vtbl; This->ref = 1; - *ppv = (IAudioEndpointVolume*)&This->IAudioEndpointVolumeEx_iface; + *ppv = &This->IAudioEndpointVolumeEx_iface; return S_OK; } diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 1d838e3..f21019c 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -596,8 +596,9 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls if (IsEqualIID(riid, &IID_IAudioClient)){ hr = drvs.pGetAudioEndpoint(&This->devguid, iface, (IAudioClient**)ppv); - }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume)) - hr = AudioEndpointVolume_Create(This, (IAudioEndpointVolume**)ppv); + }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume) || + IsEqualIID(riid, &IID_IAudioEndpointVolumeEx)) + hr = AudioEndpointVolume_Create(This, (IAudioEndpointVolumeEx**)ppv); else if (IsEqualIID(riid, &IID_IAudioSessionManager) || IsEqualIID(riid, &IID_IAudioSessionManager2)) { diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 2b40a05..b85c757 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -74,6 +74,6 @@ typedef struct MMDevice { } MMDevice; extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC_HIDDEN; -extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) DECLSPEC_HIDDEN; +extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN; extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN; diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 12e2156..4f8c848 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "initguid.h" +#include "endpointvolume.h" #include "mmdeviceapi.h" #include "audioclient.h" #include "audiopolicy.h" diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 298c886..1476adc 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -39,6 +39,7 @@ #include "mmsystem.h" #include "audioclient.h" #include "audiopolicy.h" +#include "endpointvolume.h" static const unsigned int win_formats[][4] = { { 8000, 8, 1}, { 8000, 8, 2}, { 8000, 16, 1}, { 8000, 16, 2}, @@ -2242,6 +2243,28 @@ static void test_marshal(void) } +static void test_endpointvolume(void) +{ + HRESULT hr; + IAudioEndpointVolume *aev; + float mindb, maxdb, increment; + + hr = IMMDevice_Activate(dev, &IID_IAudioEndpointVolume, + CLSCTX_INPROC_SERVER, NULL, (void**)&aev); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, NULL, NULL); + ok(hr == E_POINTER, "GetVolumeRange should have failed with E_POINTER: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, &maxdb, &increment); + ok(hr == S_OK, "GetVolumeRange failed: 0x%08x\n", hr); + trace("got range: [%f,%f]/%f\n", mindb, maxdb, increment); + + IAudioEndpointVolume_Release(aev); +} + START_TEST(render) { HRESULT hr; @@ -2283,6 +2306,7 @@ START_TEST(render) test_volume_dependence(); test_session_creation(); test_worst_case(); + test_endpointvolume(); IMMDevice_Release(dev);

1 0

Piotr Caban : ucrtbase: Add __intrinsic_setjmp implementation.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 138fec0b534b39fa8e4983573be99605a34e0ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138fec0b534b39fa8e4983573… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 16 15:31:01 2016 -0600 ucrtbase: Add __intrinsic_setjmp implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f8683fc8c42095f23e26a76b978e1180b60e1048) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index b77b73e..e71bd78 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -38,7 +38,7 @@ @ stub __dcrt_get_wide_environment_from_os @ stub __dcrt_initial_narrow_environment @ stub __intrinsic_abnormal_termination -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ stub __intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index aa4e7e0..8571295 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -93,7 +93,7 @@ @ cdecl __fpecode() @ stub __initialize_lconv_for_unsigned_char @ stub __intrinsic_abnormal_termination -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp @ stub __intrinsic_setjmpex @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index feb94ac..6c147ce 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -32,7 +32,7 @@ @ stub __TypeMatch @ stub __current_exception @ stub __current_exception_context -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ stub __intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure

1 0

Bernhard Übelacker : ntoskrnl.exe: Make IoAllocateIrp not crash on negative values.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 7a09ac7f94fb7fbb07fa6359cd406daa48d38d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a09ac7f94fb7fbb07fa6359c… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Mar 29 22:13:16 2016 +0200 ntoskrnl.exe: Make IoAllocateIrp not crash on negative values. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 64aec5d8dbae329958b9b677d3289de78142e289) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 904d66a..1a5fe11 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -592,15 +592,20 @@ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) { SIZE_T size; PIRP irp; + CCHAR loc_count = stack_size; TRACE( "%d, %d\n", stack_size, charge_quota ); - size = sizeof(IRP) + stack_size * sizeof(IO_STACK_LOCATION); + if (loc_count < 8 && loc_count != 1) + loc_count = 8; + + size = sizeof(IRP) + loc_count * sizeof(IO_STACK_LOCATION); irp = ExAllocatePool( NonPagedPool, size ); if (irp == NULL) return NULL; IoInitializeIrp( irp, size, stack_size ); - irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; + if (stack_size >= 1 && stack_size <= 8) + irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; if (charge_quota) irp->AllocationFlags |= IRP_LOOKASIDE_ALLOCATION; return irp;

1 0

Alistair Leslie-Hughes : dpnet: Header files cleanup.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 0b1c912060613b44782fe5d11941b646b59e3305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b1c912060613b44782fe5d11… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 15 06:59:13 2016 +0000 dpnet: Header files cleanup. Stops error of SOCKADDR being redefined on older compilers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5cd33bf892f3a7599f37dba64b1046f22b95af6a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dpnet/address.c | 1 - dlls/dpnet/client.c | 1 - dlls/dpnet/lobbiedapp.c | 2 -- dlls/dpnet/peer.c | 1 - dlls/dpnet/server.c | 1 - dlls/dpnet/threadpool.c | 1 - include/dpaddr.h | 2 ++ 7 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index d87d4e7..e6b82fd 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -33,7 +33,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index bf2b8d2..765a1bc 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -31,7 +31,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index 507a895..c7b49b9 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -31,8 +31,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" -#include "dplobby8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index a07a59a..f0a6467 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -33,7 +33,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 3e026fc..65128b4 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -32,7 +32,6 @@ #include "ocidl.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" typedef struct IDirectPlay8ServerImpl diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c index 274789d..9e13ffb 100644 --- a/dlls/dpnet/threadpool.c +++ b/dlls/dpnet/threadpool.c @@ -32,7 +32,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/include/dpaddr.h b/include/dpaddr.h index 576caaf..d47dd26 100644 --- a/include/dpaddr.h +++ b/include/dpaddr.h @@ -27,7 +27,9 @@ extern "C" { #endif /* defined(__cplusplus) */ typedef REFIID DPNAREFIID; +#ifndef _WINSOCK2API_ typedef struct sockaddr SOCKADDR; +#endif /***************************************************************************** * DirectPlay8Addr defines

1 0

Alistair Leslie-Hughes : comdlg32/tests: Test when a directory is passed to OpenFileName Dialog.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 5226773d53dbbdff8c51946fae0bdc234490d0ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=5226773d53dbbdff8c51946fa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 27 06:53:39 2016 +0000 comdlg32/tests: Test when a directory is passed to OpenFileName Dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3126d9ca4c29737af1526ea8aae92a2dadf62665) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/tests/filedlg.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0a4c509..e14aa2f 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1243,6 +1243,46 @@ static void test_null_filename(void) ok(ofnW.nFileExtension == 0, "ofnW.nFileExtension is 0x%x, should be 0\n", ofnW.nFileExtension); } +static void test_directory_filename(void) +{ + OPENFILENAMEA ofnA = {0}; + OPENFILENAMEW ofnW = {0}; + WCHAR filterW[] = {'t','e','x','t','\0','*','.','t','x','t','\0', + 'A','l','l','\0','*','\0','\0'}; + char szInitialDir[MAX_PATH] = {0}; + WCHAR szInitialDirW[MAX_PATH] = {0}; + DWORD ret; + + GetWindowsDirectoryA(szInitialDir, MAX_PATH); + GetWindowsDirectoryW(szInitialDirW, MAX_PATH); + + szInitialDir[strlen(szInitialDir)] = '\\'; + szInitialDirW[lstrlenW(szInitialDirW)] = '\\'; + + ofnA.lStructSize = OPENFILENAME_SIZE_VERSION_400A; + ofnA.lpstrFile = szInitialDir; + ofnA.nMaxFile = MAX_PATH; + ofnA.lpfnHook = test_null_wndproc; + ofnA.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ofnA.hInstance = GetModuleHandleA(NULL); + ofnA.lpstrFilter = "text\0*.txt\0All\0*\0\0"; + ofnA.lpstrDefExt = NULL; + ret = GetOpenFileNameA(&ofnA); + todo_wine ok(!ret, "GetOpenFileNameA returned %#x\n", ret); + + /* unicode tests */ + ofnW.lStructSize = OPENFILENAME_SIZE_VERSION_400W; + ofnW.lpstrFile = szInitialDirW; + ofnW.nMaxFile = MAX_PATH; + ofnW.lpfnHook = test_null_wndproc; + ofnW.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ofnW.hInstance = GetModuleHandleW(NULL); + ofnW.lpstrFilter = filterW; + ofnW.lpstrDefExt = NULL; + ret = GetOpenFileNameW(&ofnW); + todo_wine ok(!ret, "GetOpenFileNameW returned %#x\n", ret); +} + START_TEST(filedlg) { test_DialogCancel(); @@ -1256,4 +1296,5 @@ START_TEST(filedlg) if( resizesupported) test_resizable2(); test_extension(); test_null_filename(); + test_directory_filename(); }

1 0

Bruno Jesus : comdlg32: Avoid crash when a path is passed into Open File Dialog.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 673bafaa7ad5c7c9f8b380739fb3601085a2a044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=673bafaa7ad5c7c9f8b380739… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 27 06:53:27 2016 +0000 comdlg32: Avoid crash when a path is passed into Open File Dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 58091188929f9786b408912c991420f54f489f6a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/filedlg.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 1453396..1b9ad43 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1564,10 +1564,16 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) result = GetFullPathNameW(fodInfos->filename, MAX_PATH, tmpBuf, &nameBit); if (result) { - /* nameBit is always shorter than the original filename */ - lstrcpyW(fodInfos->filename,nameBit); + /* nameBit is always shorter than the original filename. It may be NULL + * when the filename contains only a drive name instead of file name */ + if (nameBit) + { + lstrcpyW(fodInfos->filename,nameBit); + *nameBit = 0x00; + } + else + *fodInfos->filename = '\0'; - *nameBit = 0x00; MemFree(fodInfos->initdir); fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf) + 1)*sizeof(WCHAR)); lstrcpyW(fodInfos->initdir, tmpBuf);

1 0

Jacek Caban : secur32: Use %LATEST_RECORD_VERSION gnutls priority.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: c02915d0dde1094106783db93c84020a582d40c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02915d0dde1094106783db93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 12:42:05 2016 +0200 secur32: Use %LATEST_RECORD_VERSION gnutls priority. It's based on [1], where it's reported to fix issues with older gnutls. I tested what client hello packages Windows reports for different sets of used protocol versions, and it always uses newest possible version. There may be a concern about not using SSL3 client hello, which still may negotiate newer protocol and was recommended for compatibility reasons, but it's known to be problematic the other way those days and recent gnutls won't use it by default anyway [2]. [1] http://us.battle.net/wow/en/forum/topic/20742995286?page=11 [2] https://gitlab.com/gnutls/gnutls/commit/25ed2750438178ff65d555a49212dc7b5a3… Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f198b5a45a52aa0bcf79f1909c8f6dc4e56c4143) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 4f95e4d..bcadd47 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -159,7 +159,7 @@ DWORD schan_imp_enabled_protocols(void) BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; - char priority[64] = "NORMAL", *p; + char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p; unsigned i; int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT);

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
35
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 December 2016