- Wine-Commits - list.winehq.org

Jacek Caban : wow64win: Convert parameters in place in wow64_NtUserCallWinProc.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: 2149bdfda785937329a5baeddb5d84e3a74434f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/2149bdfda785937329a5baeddb5d84… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 16 17:56:05 2023 +0200 wow64win: Convert parameters in place in wow64_NtUserCallWinProc. --- dlls/wow64win/user.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 553d40a8f29..c5506304718 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -615,19 +615,15 @@ static NTSTATUS WINAPI wow64_NtUserCallWinEventHook( void *arg, ULONG size ) static NTSTATUS WINAPI wow64_NtUserCallWinProc( void *arg, ULONG size ) { struct win_proc_params *params = arg; - struct win_proc_params32 params32_buf, *params32 = &params32_buf; + struct win_proc_params32 *params32 = arg; LRESULT result = 0; void *ret_ptr; ULONG ret_len; NTSTATUS status; - if (size > sizeof(*params)) - { - if (!(params32 = Wow64AllocateTemp( size - sizeof(*params) + sizeof(*params32) ))) - return 0; - memcpy( params32 + 1, params + 1, size - sizeof(*params) ); - } win_proc_params_64to32( params, params32 ); + if (size > sizeof(*params)) + memmove( params32 + 1, params + 1, size - sizeof(*params) ); status = Wow64KiUserCallbackDispatcher( NtUserCallWinProc, params32, size - sizeof(*params) + sizeof(*params32),

1 0

Zhao Yi : comctl32/syslink: Check item type before increasing link ID in SYSLINK_LinkAtPt().
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: ff951dc8434a0cbdb3991fa743acef7b8bd5f5f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff951dc8434a0cbdb3991fa743acef… Author: Zhao Yi <zhaoyi(a)uniontech.com> Date: Wed Jul 12 09:56:17 2023 +0800 comctl32/syslink: Check item type before increasing link ID in SYSLINK_LinkAtPt(). Signed-off-by: Zhaoyi <zhaoyi(a)uniontech.com> --- dlls/comctl32/syslink.c | 14 ++++++++------ dlls/comctl32/tests/syslink.c | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 8130bf19641..6af516ea1e6 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1320,16 +1320,18 @@ static PDOC_ITEM SYSLINK_LinkAtPt (const SYSLINK_INFO *infoPtr, const POINT *pt, LIST_FOR_EACH_ENTRY(Current, &infoPtr->Items, DOC_ITEM, entry) { - if((Current->Type == slLink) && SYSLINK_PtInDocItem(Current, *pt) && - (!MustBeEnabled || (Current->u.Link.state & LIS_ENABLED))) + if(Current->Type == slLink) { - if(LinkId != NULL) + if(SYSLINK_PtInDocItem(Current, *pt) && (!MustBeEnabled || (Current->u.Link.state & LIS_ENABLED))) { - *LinkId = id; + if(LinkId != NULL) + { + *LinkId = id; + } + return Current; } - return Current; + id++; } - id++; } return NULL; diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c index c0bdfdaf0b9..f6c31d92981 100644 --- a/dlls/comctl32/tests/syslink.c +++ b/dlls/comctl32/tests/syslink.c @@ -264,13 +264,13 @@ static void test_link_id(void) g_link_id = 0; SendMessageA(hwnd, WM_LBUTTONDOWN, 1, MAKELPARAM(50, 10)); SendMessageA(hwnd, WM_LBUTTONUP, 0, MAKELPARAM(50, 10)); - todo_wine ok(g_link_id == 0, "Got unexpected link id %d.\n", g_link_id); + ok(g_link_id == 0, "Got unexpected link id %d.\n", g_link_id); /* test link2 at (25, 25) */ g_link_id = 0; SendMessageA(hwnd, WM_LBUTTONDOWN, 1, MAKELPARAM(25, 25)); SendMessageA(hwnd, WM_LBUTTONUP, 0, MAKELPARAM(25, 25)); - todo_wine ok(g_link_id == 1, "Got unexpected link id %d.\n", g_link_id); + ok(g_link_id == 1, "Got unexpected link id %d.\n", g_link_id); DestroyWindow(hwnd); }

1 0

Shaun Ren : sapi/tests: Fix ISpObjectToken::CreateInstance E_ACCESSDENIED error.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: 327667a620b1d0c9f8dd47b9a85343a7badd4b20 URL: https://gitlab.winehq.org/wine/wine/-/commit/327667a620b1d0c9f8dd47b9a85343… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Jul 14 14:17:26 2023 -0400 sapi/tests: Fix ISpObjectToken::CreateInstance E_ACCESSDENIED error. --- dlls/sapi/tests/token.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 5a3bc0e340e..8befd98c2a5 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -601,7 +601,7 @@ static IClassFactory test_class_cf = { &ClassFactoryVtbl }; static void test_object_token(void) { - static const WCHAR test_token_id[] = L"HKEY_CURRENT_USER\\Software\\Winetest\\sapi\\TestToken"; + static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Wine\\Winetest\\sapi\\TestToken"; ISpObjectToken *token; ISpDataKey *sub_key; @@ -742,7 +742,12 @@ static void test_object_token(void) ok( hr == S_OK, "got %08lx\n", hr ); hr = ISpObjectToken_SetId( token, NULL, test_token_id, TRUE ); - ok( hr == S_OK, "got %08lx\n", hr ); + ok( hr == S_OK || broken(hr == E_ACCESSDENIED) /* win1064_adm */, "got %08lx\n", hr ); + if (hr == E_ACCESSDENIED) { + win_skip( "token SetId access denied\n" ); + ISpObjectToken_Release( token ); + return; + } hr = ISpObjectToken_CreateKey( token, L"Attributes", &sub_key ); ok( hr == S_OK, "got %08lx\n", hr ); @@ -763,10 +768,6 @@ static void test_object_token(void) test_class_token = NULL; hr = ISpObjectToken_CreateInstance( token, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&obj ); - if ( hr == E_ACCESSDENIED ) { - win_skip( "ISpObjectToken_CreateInstance returned E_ACCESSDENIED\n" ); - return; - } ok( hr == S_OK, "got %08lx\n", hr ); ok( test_class_token != NULL, "test_class_token not set\n" );

1 0

Shaun Ren : sapi/tests: Fix intermittent duration test failure in mmaudio.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: bc479f2a19d3f094a7002c74302f200a9c5bb993 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc479f2a19d3f094a7002c74302f20… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Jul 14 14:10:22 2023 -0400 sapi/tests: Fix intermittent duration test failure in mmaudio. --- dlls/sapi/tests/mmaudio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/sapi/tests/mmaudio.c b/dlls/sapi/tests/mmaudio.c index 7c72fb112bf..a990430d784 100644 --- a/dlls/sapi/tests/mmaudio.c +++ b/dlls/sapi/tests/mmaudio.c @@ -167,7 +167,7 @@ static void test_audio_out(void) UINT devid; char *buf = NULL; ULONG written; - DWORD start, end; + DWORD start, duration; HANDLE event = NULL; HRESULT hr; @@ -256,6 +256,7 @@ static void test_audio_out(void) ok(hr == S_OK, "got %#lx.\n", hr); written = 0xdeadbeef; + start = GetTickCount(); hr = ISpMMSysAudio_Write(mmaudio, buf, wfx->nAvgBytesPerSec * 200 / 1000, &written); ok(hr == S_OK, "got %#lx.\n", hr); ok(written == wfx->nAvgBytesPerSec * 200 / 1000, "got %lu.\n", written); @@ -263,7 +264,8 @@ static void test_audio_out(void) hr = ISpMMSysAudio_Write(mmaudio, buf, wfx->nAvgBytesPerSec * 200 / 1000, NULL); ok(hr == S_OK, "got %#lx.\n", hr); - start = GetTickCount(); + hr = ISpMMSysAudio_Commit(mmaudio, STGC_DEFAULT); + todo_wine ok(hr == S_OK, "got %#lx.\n", hr); event = ISpMMSysAudio_EventHandle(mmaudio); ok(event != NULL, "event == NULL.\n"); @@ -271,8 +273,8 @@ static void test_audio_out(void) hr = WaitForSingleObject(event, 1000); ok(hr == WAIT_OBJECT_0, "got %#lx.\n", hr); - end = GetTickCount(); - ok(end - start <= 500, "waited for %lu ms.\n", end - start); + duration = GetTickCount() - start; + ok(duration > 200 && duration < 800, "took %lu ms.\n", duration); hr = ISpMMSysAudio_SetState(mmaudio, SPAS_CLOSED, 0); ok(hr == S_OK, "got %#lx.\n", hr);

1 0

Zhao Yi : comctl32/tests: Add a test case to get syslinkid.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: 53fd667eeb37e3e352f230b5c40292e49ef26083 URL: https://gitlab.winehq.org/wine/wine/-/commit/53fd667eeb37e3e352f230b5c40292… Author: Zhao Yi <zhaoyi(a)uniontech.com> Date: Tue Jun 20 14:01:30 2023 +0800 comctl32/tests: Add a test case to get syslinkid. Signed-off-by: Zhaoyi <zhaoyi(a)uniontech.com> --- dlls/comctl32/tests/syslink.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c index d5192c26b5c..c0bdfdaf0b9 100644 --- a/dlls/comctl32/tests/syslink.c +++ b/dlls/comctl32/tests/syslink.c @@ -30,6 +30,7 @@ #define SYSLINK_SEQ_INDEX 1 static HWND hWndParent; +static int g_link_id; static struct msg_sequence *sequences[NUM_MSG_SEQUENCE]; @@ -99,6 +100,20 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP add_message(sequences, PARENT_SEQ_INDEX, &msg); } + switch(message) + { + case WM_NOTIFY: + { + NMLINK *nml = ((NMLINK *)lParam); + if (nml && NM_CLICK == nml->hdr.code) + { + g_link_id = nml->item.iLink; + } + break; + } + default: + break; + } defwndproc_counter++; ret = DefWindowProcW(hwnd, message, wParam, lParam); defwndproc_counter--; @@ -238,6 +253,28 @@ static void test_LM_GETIDEALSIZE(void) DestroyWindow(hwnd); } +static void test_link_id(void) +{ + HWND hwnd; + + hwnd = create_syslink(WS_CHILD | WS_TABSTOP | WS_VISIBLE, hWndParent); + ok(hwnd != NULL, "Failed to create SysLink window.\n"); + + /* test link1 at (50, 10) */ + g_link_id = 0; + SendMessageA(hwnd, WM_LBUTTONDOWN, 1, MAKELPARAM(50, 10)); + SendMessageA(hwnd, WM_LBUTTONUP, 0, MAKELPARAM(50, 10)); + todo_wine ok(g_link_id == 0, "Got unexpected link id %d.\n", g_link_id); + + /* test link2 at (25, 25) */ + g_link_id = 0; + SendMessageA(hwnd, WM_LBUTTONDOWN, 1, MAKELPARAM(25, 25)); + SendMessageA(hwnd, WM_LBUTTONUP, 0, MAKELPARAM(25, 25)); + todo_wine ok(g_link_id == 1, "Got unexpected link id %d.\n", g_link_id); + + DestroyWindow(hwnd); +} + START_TEST(syslink) { ULONG_PTR ctx_cookie; @@ -266,6 +303,7 @@ START_TEST(syslink) test_create_syslink(); test_LM_GETIDEALHEIGHT(); test_LM_GETIDEALSIZE(); + test_link_id(); DestroyWindow(hWndParent); unload_v6_module(ctx_cookie, hCtx);

1 0

Shaun Ren : sapi: Invoke AddRef in mmaudio SetObjectToken.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: 5fccc408c66717166b42f6ec5dd508b73193b0aa URL: https://gitlab.winehq.org/wine/wine/-/commit/5fccc408c66717166b42f6ec5dd508… Author: Shaun Ren <sren(a)codeweavers.com> Date: Thu Jul 13 19:15:24 2023 -0400 sapi: Invoke AddRef in mmaudio SetObjectToken. --- dlls/sapi/mmaudio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/sapi/mmaudio.c b/dlls/sapi/mmaudio.c index d99bcb13672..7452d9a7257 100644 --- a/dlls/sapi/mmaudio.c +++ b/dlls/sapi/mmaudio.c @@ -293,6 +293,7 @@ static HRESULT WINAPI objwithtoken_SetObjectToken(ISpObjectWithToken *iface, ISp if (This->token) return SPERR_ALREADY_INITIALIZED; + ISpObjectToken_AddRef(token); This->token = token; return S_OK; }

1 0

Jacob Czekalla : comdlg32: Add parent folder button to IFileDialog.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: 186d949703fd47ea9066cb850d6cc9c0d8ce907f URL: https://gitlab.winehq.org/wine/wine/-/commit/186d949703fd47ea9066cb850d6cc9… Author: Jacob Czekalla <jacobczekalla(a)gmail.com> Date: Fri Jun 16 12:21:05 2023 -0400 comdlg32: Add parent folder button to IFileDialog. --- dlls/comdlg32/itemdlg.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 337c74494ee..1a598046dff 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -38,6 +38,7 @@ #define IDC_NAV_TOOLBAR 200 #define IDC_NAVBACK 201 #define IDC_NAVFORWARD 202 +#define IDC_NAVUP 203 #include <initguid.h> /* This seems to be another version of IID_IFileDialogCustomize. If @@ -1965,8 +1966,9 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) { HWND htoolbar; TBADDBITMAP tbab; - TBBUTTON button[2]; + TBBUTTON button[3]; int height; + int navUpImgIndex; htoolbar = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, TBSTYLE_FLAT | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, @@ -1975,6 +1977,9 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) tbab.hInst = HINST_COMMCTRL; tbab.nID = IDB_HIST_LARGE_COLOR; SendMessageW(htoolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); + tbab.nID = IDB_VIEW_LARGE_COLOR; + navUpImgIndex = SendMessageW(htoolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); + navUpImgIndex += VIEW_PARENTFOLDER; button[0].iBitmap = HIST_BACK; button[0].idCommand = IDC_NAVBACK; @@ -1990,7 +1995,14 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) button[1].dwData = 0; button[1].iString = 0; - SendMessageW(htoolbar, TB_ADDBUTTONSW, 2, (LPARAM)button); + button[2].iBitmap = navUpImgIndex; + button[2].idCommand = IDC_NAVUP; + button[2].fsState = TBSTATE_ENABLED; + button[2].fsStyle = BTNS_BUTTON; + button[2].dwData = 0; + button[2].iString = 0; + + SendMessageW(htoolbar, TB_ADDBUTTONSW, 3, (LPARAM)button); height = MulDiv(24, This->dpi_y, USER_DEFAULT_SCREEN_DPI); SendMessageW(htoolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(height, height)); SendMessageW(htoolbar, TB_AUTOSIZE, 0, 0); @@ -2281,6 +2293,13 @@ static LRESULT on_command_filetype(FileDialogImpl *This, WPARAM wparam, LPARAM l return FALSE; } +static LRESULT on_browse_up(FileDialogImpl *This) +{ + TRACE("%p\n", This); + IExplorerBrowser_BrowseToIDList(This->peb, NULL, SBSP_PARENT); + return FALSE; +} + static LRESULT on_wm_command(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) { switch(LOWORD(wparam)) @@ -2291,6 +2310,7 @@ static LRESULT on_wm_command(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) case IDC_NAVBACK: return on_browse_back(This); case IDC_NAVFORWARD: return on_browse_forward(This); case IDC_FILETYPE: return on_command_filetype(This, wparam, lparam); + case IDC_NAVUP: return on_browse_up(This); default: TRACE("Unknown command.\n"); } return FALSE;

1 0

Shaun Ren : sapi: Invoke AddRef in ISpVoice::SetVoice.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: 9941a716493a4049ef85c691b851513be10dd99d URL: https://gitlab.winehq.org/wine/wine/-/commit/9941a716493a4049ef85c691b85151… Author: Shaun Ren <sren(a)codeweavers.com> Date: Thu Jul 13 19:20:13 2023 -0400 sapi: Invoke AddRef in ISpVoice::SetVoice. --- dlls/sapi/tts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 147734cc9a9..b0b3bbd2eff 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -641,7 +641,6 @@ static HRESULT WINAPI spvoice_SetVoice(ISpVoice *iface, ISpObjectToken *token) ISpTTSEngine *engine; HRESULT hr; - TRACE("(%p, %p).\n", iface, token); if (!token) @@ -649,6 +648,8 @@ static HRESULT WINAPI spvoice_SetVoice(ISpVoice *iface, ISpObjectToken *token) if (FAILED(hr = create_default_token(SPCAT_VOICES, &token))) return hr; } + else + ISpObjectToken_AddRef(token); hr = ISpObjectToken_CreateInstance(token, NULL, CLSCTX_ALL, &IID_ISpTTSEngine, (void **)&engine); ISpObjectToken_Release(token);

1 0

Alexandre Julliard : winemac.drv: Use nameless unions/structs.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: bb9030cb7808551dd4b6860d279d4c11e5e3b03d URL: https://gitlab.winehq.org/wine/wine/-/commit/bb9030cb7808551dd4b6860d279d4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 11:35:47 2023 +0200 winemac.drv: Use nameless unions/structs. --- dlls/winemac.drv/dragdrop.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index 45615c68b71..bbf74ac80c2 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "ntstatus.h" #define WIN32_NO_STATUS #include "macdrv_dll.h" @@ -167,9 +165,9 @@ static HRESULT WINAPI dddo_GetData(IDataObject* iface, FORMATETC* formatEtc, STG if (SUCCEEDED(hr)) { medium->tymed = TYMED_HGLOBAL; - medium->u.hGlobal = get_pasteboard_data(This->pasteboard, formatEtc->cfFormat); + medium->hGlobal = get_pasteboard_data(This->pasteboard, formatEtc->cfFormat); medium->pUnkForRelease = NULL; - hr = medium->u.hGlobal ? S_OK : E_OUTOFMEMORY; + hr = medium->hGlobal ? S_OK : E_OUTOFMEMORY; } return hr;

1 0

Alexandre Julliard : wineandroid.drv: Use nameless unions/structs.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: wine Branch: master Commit: 744237ecf694dc59c4fae5e8b6ce37f43a7e04a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/744237ecf694dc59c4fae5e8b6ce37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 11:35:34 2023 +0200 wineandroid.drv: Use nameless unions/structs. --- dlls/wineandroid.drv/device.c | 13 +++---- dlls/wineandroid.drv/init.c | 12 +++---- dlls/wineandroid.drv/keyboard.c | 33 ++++++++---------- dlls/wineandroid.drv/window.c | 77 ++++++++++++++++++++--------------------- 4 files changed, 62 insertions(+), 73 deletions(-)

1 0