June 2020 - Wine-Commits - list.winehq.org

Chip Davis : msvcrt: Correct return value of ___mb_cur_max_l_func().
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: bac4e49570864538af21582db07735a3715c5aa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bac4e49570864538af21582d… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Jan 26 20:15:16 2020 -0600 msvcrt: Correct return value of ___mb_cur_max_l_func(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b6a6fd987a3046f02bd718df70ffe5b899baffb9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 26 ++++++++++++++++++++++++++ dlls/msvcrt/mbcs.c | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 9e7d280cf8..c8a49f2549 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -136,6 +136,9 @@ static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); static size_t (__cdecl *p___strncnt)(const char *str, size_t count); static int (__cdecl *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); +static int (__cdecl *p____mb_cur_max_l_func)(_locale_t locale); +static _locale_t (__cdecl *p__create_locale)(int, const char*); +static void (__cdecl *p__free_locale)(_locale_t); /* make sure we use the correct errno */ #undef errno @@ -402,6 +405,9 @@ static BOOL init(void) SET(p__vsnwprintf, "_vsnwprintf"); SET(p___strncnt, "__strncnt"); SET(p_swscanf, "swscanf"); + SET(p____mb_cur_max_l_func, "___mb_cur_max_l_func"); + SET(p__create_locale, "_create_locale"); + SET(p__free_locale, "_free_locale"); if (sizeof(void *) == 8) { @@ -1936,6 +1942,25 @@ static void test_swscanf(void) ok( ret == (short)WEOF, "ret = %d\n", ret ); } +static void test____mb_cur_max_l_func(void) +{ + int ret; + _locale_t l; + + ret = p____mb_cur_max_l_func(NULL); + ok( ret == 1, "MB_CUR_MAX_L(NULL) = %d\n", ret ); + + l = p__create_locale(LC_ALL, "chinese-traditional"); + if (!l) + { + skip("DBCS locale not available\n"); + return; + } + ret = p____mb_cur_max_l_func(l); + ok( ret == 2, "MB_CUR_MAX_L(cht) = %d\n", ret ); + p__free_locale(l); +} + START_TEST(msvcr90) { if(!init()) @@ -1975,4 +2000,5 @@ START_TEST(msvcr90) #endif test___strncnt(); test_swscanf(); + test____mb_cur_max_l_func(); } diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index a9dbcfff66..39f94b17a3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -184,7 +184,7 @@ int CDECL MSVCRT____mb_cur_max_func(void) /********************************************************************* * ___mb_cur_max_l_func (MSVCR80.@) */ -int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) +int CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; @@ -193,7 +193,7 @@ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) else locinfo = locale->locinfo; - return &locinfo->mb_cur_max; + return locinfo->mb_cur_max; } #endif

1 0

Kevin Puetz : rpcrt4: Fix ITypeInfo leak in get_iface_info.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 37d3edf9c901694b42a6badb368d71b1bb35c2fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=37d3edf9c901694b42a6badb… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Jan 27 16:02:27 2020 +0100 rpcrt4: Fix ITypeInfo leak in get_iface_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a09c08f17a1ace1205e4c579c4f08b548258d539) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 7cb7da18ad..fb78c9b5ab 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -1265,14 +1265,16 @@ static HRESULT get_iface_info(ITypeInfo *typeinfo, WORD *funcs, WORD *parentfunc if (FAILED(hr)) goto err; hr = ITypeInfo_GetRefTypeInfo(*real_typeinfo, reftype, &parentinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetTypeAttr(parentinfo, &typeattr); + ITypeInfo_Release(parentinfo); + } if (FAILED(hr)) goto err; - hr = ITypeInfo_GetTypeAttr(parentinfo, &typeattr); - if (FAILED(hr)) - goto err; + *parentiid = typeattr->guid; ITypeInfo_ReleaseTypeAttr(parentinfo, typeattr); - ITypeInfo_Release(parentinfo); return S_OK;

1 0

Aaro Altonen : urlmon: Add URLOpenPullStreamW() stub.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: fd6fe42003441abebce7f3f88e0f378c4a747fa2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd6fe42003441abebce7f3f8… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Fri Mar 6 15:25:37 2020 +0100 urlmon: Add URLOpenPullStreamW() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47535 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 626e437c29c43d57a6d1d63f0d0fffca202c16ad) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/umstream.c | 10 ++++++++++ dlls/urlmon/urlmon.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 01cc755c23..83767548cf 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -358,3 +358,13 @@ HRESULT WINAPI URLOpenStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, DWORD dwReserved return hr; } + +/*********************************************************************** + * URLOpenPullStreamW (URLMON.@) + */ +HRESULT WINAPI URLOpenPullStreamW(IUnknown *caller, const WCHAR *url, DWORD reserved, + IBindStatusCallback *callback) +{ + FIXME("%p %s %u %p, stub!\n", caller, debugstr_w(url), reserved, callback); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 0d11ced0d4..ea3cd3814f 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -88,7 +88,7 @@ @ stdcall URLOpenBlockingStreamA(ptr str ptr long ptr) @ stdcall URLOpenBlockingStreamW(ptr wstr ptr long ptr) @ stub URLOpenPullStreamA -@ stub URLOpenPullStreamW +@ stdcall URLOpenPullStreamW(ptr wstr long ptr) @ stdcall URLOpenStreamA(ptr str long ptr) @ stdcall URLOpenStreamW(ptr wstr long ptr) @ stub UrlMkBuildVersion

1 0

Paul Gofman : wined3d: Support sRGB reads for WINED3DFMT_B5G6R5_UNORM.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: aa74261560aa9781f7fb68b75d5556ac4ad899fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa74261560aa9781f7fb68b7… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jan 27 15:55:28 2020 +0330 wined3d: Support sRGB reads for WINED3DFMT_B5G6R5_UNORM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48302 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 941bd46597a8e8f2c40a80a8e429620c050a6fef) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d5fe1c239b..30864a1ea8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1490,15 +1490,15 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE, WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_B5G6R5_UNORM, GL_RGB5, GL_RGB5, GL_RGB8, + {WINED3DFMT_B5G6R5_UNORM, GL_RGB5, GL_SRGB8_EXT, GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_RENDERTARGET, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_B5G6R5_UNORM, GL_RGB565, GL_RGB565, GL_RGB8, + {WINED3DFMT_B5G6R5_UNORM, GL_RGB565, GL_SRGB8_EXT, GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_RENDERTARGET, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ, ARB_ES2_COMPATIBILITY, NULL}, {WINED3DFMT_B5G5R5X1_UNORM, GL_RGB5, GL_RGB5, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0,

1 0

Paul Gofman : include: Add Vista+ PEB_LDR_DATA structure fields.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 1a4eba2353045de0af64e543d43549f571710fc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a4eba2353045de0af64e543… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jan 22 19:08:28 2020 +0300 include: Add Vista+ PEB_LDR_DATA structure fields. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48289 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 34e64876b271f7c2b7ebc474030dbd4b8de322fd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/winternl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index 0122684483..e5aed5acb1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -213,6 +213,8 @@ typedef struct _PEB_LDR_DATA LIST_ENTRY InMemoryOrderModuleList; LIST_ENTRY InInitializationOrderModuleList; PVOID EntryInProgress; + BOOLEAN ShutdownInProgress; + HANDLE ShutdownThreadId; } PEB_LDR_DATA, *PPEB_LDR_DATA; typedef struct _GDI_TEB_BATCH

1 0

Roman Pišl : ole32: Avoid calling QueryContinueDrag recursively.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 0d85e007b9b1676052a61836195fab00471fb9c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d85e007b9b1676052a61836… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Feb 17 23:59:38 2020 +0100 ole32: Avoid calling QueryContinueDrag recursively. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48569 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 808d8b87a040e4de44e2691d3a9e29f871616ca0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/ole2.c | 11 ++++++++++ dlls/ole32/tests/dragdrop.c | 53 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 53 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 757458ad20..6653fac342 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -62,6 +62,7 @@ typedef struct tagTrackerWindowInfo DWORD dwOKEffect; DWORD* pdwEffect; BOOL trackingDone; + BOOL inTrackCall; HRESULT returnValue; BOOL escPressed; @@ -766,6 +767,7 @@ HRESULT WINAPI DoDragDrop ( trackerInfo.dwOKEffect = dwOKEffect; trackerInfo.pdwEffect = pdwEffect; trackerInfo.trackingDone = FALSE; + trackerInfo.inTrackCall = FALSE; trackerInfo.escPressed = FALSE; trackerInfo.curTargetHWND = 0; trackerInfo.curDragTarget = 0; @@ -2284,6 +2286,13 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) HWND hwndNewTarget = 0; POINT pt; + /* + * This method may be called from QueryContinueDrag again, + * (i.e. by running message loop) so avoid recursive call chain. + */ + if (trackerInfo->inTrackCall) return; + trackerInfo->inTrackCall = TRUE; + /* * Get the handle of the window under the mouse */ @@ -2329,6 +2338,8 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) } else drag_end( trackerInfo ); + + trackerInfo->inTrackCall = FALSE; } /*** diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 77e47d723d..62ac15d8fc 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -260,6 +260,7 @@ struct method_call call_lists[][30] = }; static int droptarget_refs; +static int test_reentrance; /* helper macros to make tests a bit leaner */ #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -359,7 +360,34 @@ static HRESULT WINAPI DropSource_QueryContinueDrag( BOOL fEscapePressed, DWORD grfKeyState) { - return check_expect(DS_QueryContinueDrag, 0, NULL); + HRESULT hr = check_expect(DS_QueryContinueDrag, 0, NULL); + if (test_reentrance) + { + MSG msg; + BOOL r; + int num = 0; + + HWND hwnd = GetCapture(); + ok(hwnd != 0, "Expected capture window\n"); + + /* send some fake events that should be ignored */ + r = PostMessageA(hwnd, WM_MOUSEMOVE, 0, 0); + r &= PostMessageA(hwnd, WM_LBUTTONDOWN, 0, 0); + r &= PostMessageA(hwnd, WM_LBUTTONUP, 0, 0); + r &= PostMessageA(hwnd, WM_KEYDOWN, VK_ESCAPE, 0); + ok(r, "Unable to post messages\n"); + + /* run the message loop for this thread */ + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + num++; + } + + ok(num >= 4, "Expected at least 4 messages but %d were processed\n", num); + } + return hr; } static HRESULT WINAPI DropSource_GiveFeedback( @@ -701,17 +729,20 @@ static void test_DoDragDrop(void) GetWindowRect(hwnd, &rect); ok(SetCursorPos(rect.left+50, rect.top+50), "SetCursorPos failed\n"); - for (seq = 0; seq < ARRAY_SIZE(call_lists); seq++) + for (test_reentrance = 0; test_reentrance < 2; test_reentrance++) { - DWORD effect_in; - trace("%d\n", seq); - call_ptr = call_lists[seq]; - effect_in = call_ptr->set_param; - call_ptr++; - - hr = DoDragDrop(&DataObject, &DropSource, effect_in, &effect); - check_expect(DoDragDrop_ret, hr, NULL); - check_expect(DoDragDrop_effect_out, effect, NULL); + for (seq = 0; seq < ARRAY_SIZE(call_lists); seq++) + { + DWORD effect_in; + trace("%d\n", seq); + call_ptr = call_lists[seq]; + effect_in = call_ptr->set_param; + call_ptr++; + + hr = DoDragDrop(&DataObject, &DropSource, effect_in, &effect); + check_expect(DoDragDrop_ret, hr, NULL); + check_expect(DoDragDrop_effect_out, effect, NULL); + } } OleUninitialize();

1 0

Brendan Shanks : include: Fix size of tomConstants enum.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 4aaa9196cdaf04281aff0e9f1b3efa3c1451160e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aaa9196cdaf04281aff0e9f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 11 15:55:53 2020 -0800 include: Fix size of tomConstants enum. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0e408452a4fa8b4b1e02ec4bb16cba6822200b61) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/tom.idl | 342 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 171 insertions(+), 171 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4aaa9196cdaf04281aff…

1 0

Akihiro Sagawa : dsound: Make GlobalHandle() for the sound buffer failed.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 0a0bdbf1dc1d38fa7a5f42bcd563eb46f2291918 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a0bdbf1dc1d38fa7a5f42bc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 6 21:52:46 2020 +0900 dsound: Make GlobalHandle() for the sound buffer failed. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 70aeb7e4b0eb8efefd24c26d1c1442ea6c25d082) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/buffer.c | 15 +++++---------- dlls/dsound/tests/dsound.c | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index f600652914..1a3e3b9526 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1014,6 +1014,7 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds LPWAVEFORMATEX wfex = dsbd->lpwfxFormat; HRESULT err = DS_OK; DWORD capf = 0; + size_t bufsize; TRACE("(%p,%p,%p)\n", device, dsbd, buffer); @@ -1069,19 +1070,15 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds TRACE("capf = 0x%08x, device->drvcaps.dwFlags = 0x%08x\n", capf, device->drvcaps.dwFlags); /* Allocate an empty buffer */ - dsb->buffer = HeapAlloc(GetProcessHeap(),0,sizeof(*(dsb->buffer))); + bufsize = (sizeof(*(dsb->buffer)) + sizeof(void *) - 1) & ~(sizeof(void *) - 1); + dsb->buffer = HeapAlloc(GetProcessHeap(),0,bufsize + dsb->buflen); if (!dsb->buffer) { IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return DSERR_OUTOFMEMORY; } /* Allocate system memory for buffer */ - dsb->buffer->memory = HeapAlloc(GetProcessHeap(),0,dsb->buflen); - if (!dsb->buffer->memory) { - WARN("out of memory\n"); - IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); - return DSERR_OUTOFMEMORY; - } + dsb->buffer->memory = (BYTE *)dsb->buffer + bufsize; dsb->buffer->ref = 1; dsb->buffer->lockedbytes = 0; @@ -1152,10 +1149,8 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) This->buffer->ref--; list_remove(&This->entry); - if (This->buffer->ref == 0) { - HeapFree(GetProcessHeap(), 0, This->buffer->memory); + if (This->buffer->ref == 0) HeapFree(GetProcessHeap(), 0, This->buffer); - } HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This->pwfx); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0e779618a2..2bf87eb857 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1161,7 +1161,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) /* broken apps like Asuka 120% Return BURNING Fest, pass the pointer to GlobalHandle. */ HGLOBAL hmem = GlobalHandle(buf); - todo_wine ok(!hmem,"GlobalHandle should return NULL " + ok(!hmem,"GlobalHandle should return NULL " "for buffer %p, got %p\n",buf,hmem); } ZeroMemory(buf,bufsize);

1 0

Zebediah Figura : setupapi: Implement SetupDiGetSelectedDriver().
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: d133d9c82092198ab11a537ec4e7134d7fb48c45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d133d9c82092198ab11a537e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 8 14:13:14 2020 -0500 setupapi: Implement SetupDiGetSelectedDriver(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48639 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6971dfcfc21e887e4b5724d4f32e29d012e1b5be) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/devinst.c | 90 +++++++++++++++++++++++++++++++------------ dlls/setupapi/setupapi.spec | 4 +- dlls/setupapi/tests/devinst.c | 14 +++++++ 3 files changed, 82 insertions(+), 26 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 25d4040da0..e561fcd996 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4570,16 +4570,42 @@ BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO devinfo, SP_DEVINFO_DATA *device return TRUE; } +static BOOL copy_driver_data(SP_DRVINFO_DATA_W *data, const struct driver *driver) +{ + INFCONTEXT ctx; + HINF hinf; + + if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + data->ProviderName[0] = 0; + if (SetupFindFirstLineW(hinf, L"Version", L"Provider", &ctx)) + SetupGetStringFieldW(&ctx, 1, data->ProviderName, ARRAY_SIZE(data->ProviderName), NULL); + wcscpy(data->Description, driver->description); + wcscpy(data->MfgName, driver->manufacturer); + data->DriverType = SPDIT_COMPATDRIVER; + + SetupCloseInfFile(hinf); + + return TRUE; +} + +static void driver_data_wtoa(SP_DRVINFO_DATA_A *a, const SP_DRVINFO_DATA_W *w) +{ + a->DriverType = w->DriverType; + a->Reserved = w->Reserved; + WideCharToMultiByte(CP_ACP, 0, w->Description, -1, a->Description, sizeof(a->Description), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, w->MfgName, -1, a->MfgName, sizeof(a->MfgName), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, w->ProviderName, -1, a->ProviderName, sizeof(a->ProviderName), NULL, NULL); +} + /*********************************************************************** * SetupDiEnumDriverInfoW (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, DWORD type, DWORD index, SP_DRVINFO_DATA_W *driver_data) { - static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; struct device *device; - INFCONTEXT ctx; - HINF hinf; TRACE("devinfo %p, device_data %p, type %#x, index %u, driver_data %p.\n", devinfo, device_data, type, index, driver_data); @@ -4600,19 +4626,7 @@ BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat return FALSE; } - if ((hinf = SetupOpenInfFileW(device->drivers[index].inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) - return FALSE; - - driver_data->ProviderName[0] = 0; - if (SetupFindFirstLineW(hinf, Version, providerW, &ctx)) - SetupGetStringFieldW(&ctx, 1, driver_data->ProviderName, ARRAY_SIZE(driver_data->ProviderName), NULL); - lstrcpyW(driver_data->Description, device->drivers[index].description); - lstrcpyW(driver_data->MfgName, device->drivers[index].manufacturer); - driver_data->DriverType = SPDIT_COMPATDRIVER; - - SetupCloseInfFile(hinf); - - return TRUE; + return copy_driver_data(driver_data, &device->drivers[index]); } /*********************************************************************** @@ -4626,14 +4640,7 @@ BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat driver_dataW.cbSize = sizeof(driver_dataW); ret = SetupDiEnumDriverInfoW(devinfo, device_data, type, index, &driver_dataW); - driver_data->DriverType = driver_dataW.DriverType; - driver_data->Reserved = driver_dataW.Reserved; - WideCharToMultiByte(CP_ACP, 0, driver_dataW.Description, -1, driver_data->Description, - sizeof(driver_data->Description), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, driver_dataW.MfgName, -1, driver_data->MfgName, - sizeof(driver_data->MfgName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, driver_dataW.ProviderName, -1, driver_data->ProviderName, - sizeof(driver_data->ProviderName), NULL, NULL); + driver_data_wtoa(driver_data, &driver_dataW); return ret; } @@ -4663,6 +4670,41 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device return TRUE; } +/*********************************************************************** + * SetupDiGetSelectedDriverW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetSelectedDriverW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, SP_DRVINFO_DATA_W *driver_data) +{ + struct device *device; + + TRACE("devinfo %p, device_data %p, driver_data %p.\n", devinfo, device_data, driver_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!device->selected_driver) + { + SetLastError(ERROR_NO_DRIVER_SELECTED); + return FALSE; + } + + return copy_driver_data(driver_data, device->selected_driver); +} + +/*********************************************************************** + * SetupDiGetSelectedDriverA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetSelectedDriverA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, SP_DRVINFO_DATA_A *driver_data) +{ + SP_DRVINFO_DATA_W driver_dataW; + BOOL ret; + + driver_dataW.cbSize = sizeof(driver_dataW); + if ((ret = SetupDiGetSelectedDriverW(devinfo, device_data, &driver_dataW))) + driver_data_wtoa(driver_data, &driver_dataW); + return ret; +} + /*********************************************************************** * SetupDiInstallDriverFiles (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 8c4ebcc101..325985dac6 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -359,8 +359,8 @@ @ stdcall SetupDiGetINFClassA(str ptr ptr long ptr) @ stdcall SetupDiGetINFClassW(wstr ptr ptr long ptr) @ stub SetupDiGetSelectedDevice -@ stub SetupDiGetSelectedDriverA -@ stub SetupDiGetSelectedDriverW +@ stdcall SetupDiGetSelectedDriverA(ptr ptr ptr) +@ stdcall SetupDiGetSelectedDriverW(ptr ptr ptr) @ stub SetupDiGetWizardPage @ stdcall SetupDiInstallClassA(long str long ptr) @ stub SetupDiInstallClassExA diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index a02752d2de..1c3c191ba9 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2374,6 +2374,20 @@ static void test_driver_list(void) ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_NO_MORE_ITEMS, "Got unexpected error %#x.\n", GetLastError()); + ret = SetupDiGetSelectedDriverA(set, &device, &driver); + ok(ret /* Win10 1809 */ || GetLastError() == ERROR_NO_DRIVER_SELECTED, + "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiSelectBestCompatDrv(set, &device); + ok(ret, "Failed to select driver, error %#x.\n", GetLastError()); + + ret = SetupDiGetSelectedDriverA(set, &device, &driver); + ok(ret, "Failed to get selected driver, error %#x.\n", GetLastError()); + ok(driver.DriverType == SPDIT_COMPATDRIVER, "Got wrong type %#x.\n", driver.DriverType); + ok(!strcmp(driver.Description, "desc1"), "Got wrong description '%s'.\n", driver.Description); + ok(!strcmp(driver.MfgName, wow64 ? "mfg1_wow" : "mfg1"), "Got wrong manufacturer '%s'.\n", driver.MfgName); + ok(!strcmp(driver.ProviderName, ""), "Got wrong provider '%s'.\n", driver.ProviderName); + SetupDiDestroyDeviceInfoList(set); ret = DeleteFileA(inf_path); ok(ret, "Failed to delete %s, error %u.\n", inf_path, GetLastError());

1 0

Akihiro Sagawa : dsound/tests: Add a test whether the buffer is a valid global memory.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: db754f0f18b594febee229c12e4d39810ba69b23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db754f0f18b594febee229c1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 6 21:52:44 2020 +0900 dsound/tests: Add a test whether the buffer is a valid global memory. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e28638afccdfda3ee44121405d9097d201b61445) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/tests/dsound.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 7fdac9144e..0e779618a2 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1157,6 +1157,13 @@ static HRESULT test_duplicate(LPGUID lpGuid) ok(rc==DS_OK && buf!=NULL, "IDirectSoundBuffer_Lock failed to lock the buffer %08x\n",rc); if (rc==DS_OK && buf!=NULL) { + if (sizeof(void*)==4) { /* crashes on 64-bit */ + /* broken apps like Asuka 120% Return BURNING Fest, + pass the pointer to GlobalHandle. */ + HGLOBAL hmem = GlobalHandle(buf); + todo_wine ok(!hmem,"GlobalHandle should return NULL " + "for buffer %p, got %p\n",buf,hmem); + } ZeroMemory(buf,bufsize); rc=IDirectSoundBuffer_Unlock(original,buf,bufsize, NULL,0);

1 0