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

Jacek Caban : win32u: Pass module name before packed lparam in win_hook_params.
by Alexandre Julliard 17 Jul '23

17 Jul '23

Module: wine Branch: master Commit: 36384097c7e8c4420eaedfac271e10b23b90df4f URL: https://gitlab.winehq.org/wine/wine/-/commit/36384097c7e8c4420eaedfac271e10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 11 16:03:26 2023 +0200 win32u: Pass module name before packed lparam in win_hook_params. --- dlls/user32/hook.c | 15 ++++++++------- dlls/win32u/hook.c | 49 +++++++++++++++++++++++++------------------------ dlls/wow64win/user.c | 32 ++++++++++++++++++-------------- include/ntuser.h | 2 +- 4 files changed, 52 insertions(+), 46 deletions(-)

1 0

Jeff Smith : gdiplus/tests: Fix mangled test output when dumping data in hex format.
by Alexandre Julliard 17 Jul '23

17 Jul '23

Module: wine Branch: master Commit: a55c89dba63c9965be4eb9d1d24f0d45c764f3b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/a55c89dba63c9965be4eb9d1d24f0d… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jul 12 09:19:39 2023 -0500 gdiplus/tests: Fix mangled test output when dumping data in hex format. --- dlls/gdiplus/tests/image.c | 105 +++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 76 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index e32b4c81240..41a5441a199 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -112,6 +112,24 @@ static BOOL get_encoder_clsid(LPCWSTR mime, GUID *format, CLSID *clsid) return ret; } +static const char * dbgstr_hexdata(const BYTE *data, UINT len) +{ + UINT i, offset = 0; + char buffer[770]; + const UINT max_len = 256; + const UINT output_len = (len <= max_len) ? len : max_len - 1; + + if (!len) return ""; + + for (i = 0; i < output_len; i++) + offset += sprintf(buffer + offset, " %02x", data[i]); + + if (len > output_len) + offset += sprintf(buffer + offset, " ..."); + + return __wine_dbg_strdup( buffer ); +} + static void test_bufferrawformat(void* buff, int size, REFGUID expected, int line, BOOL todo) { LPSTREAM stream; @@ -4043,14 +4061,7 @@ static void test_tiff_properties(void) int match = memcmp(td[i].value, prop_item->value, td[i].length) == 0; ok(match || broken(td[i].length <= 4 && !match), "%u: data mismatch\n", i); if (!match) - { - UINT j; - BYTE *data = prop_item->value; - trace("id %#lx:", prop_item->id); - for (j = 0; j < prop_item->length; j++) - trace(" %02x", data[j]); - trace("\n"); - } + trace("id %#lx:%s\n", prop_item->id, dbgstr_hexdata(prop_item->value, prop_item->length)); } HeapFree(GetProcessHeap(), 0, prop_item); } @@ -4149,14 +4160,7 @@ static void test_GdipGetAllPropertyItems(void) int match = memcmp(td[i].value, prop_item->value, td[i].length) == 0; ok(match, "%u: data mismatch\n", i); if (!match) - { - UINT j; - BYTE *data = prop_item->value; - trace("id %#lx:", prop_item->id); - for (j = 0; j < prop_item->length; j++) - trace(" %02x", data[j]); - trace("\n"); - } + trace("id %#lx:%s\n", prop_item->id, dbgstr_hexdata(prop_item->value, prop_item->length)); } HeapFree(GetProcessHeap(), 0, prop_item); } @@ -4211,14 +4215,7 @@ static void test_GdipGetAllPropertyItems(void) int match = memcmp(td[i].value, prop_item[i].value, td[i].length) == 0; ok(match, "%u: data mismatch\n", i); if (!match) - { - UINT j; - BYTE *data = prop_item[i].value; - trace("id %#lx:", prop_item[i].id); - for (j = 0; j < prop_item[i].length; j++) - trace(" %02x", data[j]); - trace("\n"); - } + trace("id %#lx:%s\n", prop_item[i].id, dbgstr_hexdata(prop_item[i].value, prop_item[i].length)); } item_data += prop_item[i].length; } @@ -4444,13 +4441,8 @@ static void test_bitmapbits(void) ok(match, "%u: data should match\n", i); if (!match) - { - BYTE *bits = data.Scan0; - trace("%u: data mismatch for format %#x:", i, td[i].format); - for (j = 0; j < td[i].size; j++) - trace(" %02x", bits[j]); - trace("\n"); - } + trace("%u: data mismatch for format %#x:%s\n", i, td[i].format, + dbgstr_hexdata(data.Scan0, td[i].size)); } else ok(!match, "%u: data shouldn't match\n", i); @@ -4474,14 +4466,7 @@ static void test_bitmapbits(void) int match = memcmp(data.Scan0, td[i].pixels_unlocked, 48) == 0; ok(match, "%u: data should match\n", i); if (!match) - { - UINT j; - BYTE *bits = data.Scan0; - trace("%u: data mismatch for format %#x:", i, td[i].format); - for (j = 0; j < 48; j++) - trace(" %02x", bits[j]); - trace("\n"); - } + trace("%u: data mismatch for format %#x:%s\n", i, td[i].format, dbgstr_hexdata(data.Scan0, 48)); } status = GdipBitmapUnlockBits(bitmap, &data); @@ -4528,13 +4513,7 @@ static void test_DrawImage(void) match = memcmp(white_2x2, black_2x2, sizeof(black_2x2)) == 0; ok(match, "data should match\n"); if (!match) - { - UINT i, size = sizeof(white_2x2); - BYTE *bits = white_2x2; - for (i = 0; i < size; i++) - trace(" %02x", bits[i]); - trace("\n"); - } + trace("%s\n", dbgstr_hexdata(white_2x2, sizeof(white_2x2))); status = GdipDeleteGraphics(graphics); expect(Ok, status); @@ -4624,13 +4603,7 @@ static void test_GdipDrawImagePointRect(void) match = memcmp(white_2x2, black_2x2, sizeof(black_2x2)) == 0; ok(match, "data should match\n"); if (!match) - { - UINT i, size = sizeof(white_2x2); - BYTE *bits = white_2x2; - for (i = 0; i < size; i++) - trace(" %02x", bits[i]); - trace("\n"); - } + trace("%s\n", dbgstr_hexdata(white_2x2, sizeof(white_2x2))); status = GdipDeleteGraphics(graphics); expect(Ok, status); @@ -4830,13 +4803,7 @@ static void test_DrawImage_scale(void) todo_wine_if (!match && td[i].todo) ok(match, "%d: data should match\n", i); if (!match) - { - UINT i, size = sizeof(dst_8x1); - const BYTE *bits = dst_8x1; - for (i = 0; i < size; i++) - trace(" %02x", bits[i]); - trace("\n"); - } + trace("%s\n", dbgstr_hexdata(dst_8x1, sizeof(dst_8x1))); } status = GdipDeleteGraphics(graphics); @@ -4957,14 +4924,7 @@ static void test_gif_properties(void) int match = memcmp(td[i].value, prop_item->value, td[i].length) == 0; ok(match, "%u: data mismatch\n", i); if (!match) - { - UINT j; - BYTE *data = prop_item->value; - trace("id %#lx:", prop_item->id); - for (j = 0; j < prop_item->length; j++) - trace(" %02x", data[j]); - trace("\n"); - } + trace("id %#lx:%s\n", prop_item->id, dbgstr_hexdata(prop_item->value, prop_item->length)); } HeapFree(GetProcessHeap(), 0, prop_item); } @@ -5019,14 +4979,7 @@ static void test_gif_properties(void) int match = memcmp(td[i].value, prop_item[i].value, td[i].length) == 0; ok(match, "%u: data mismatch\n", i); if (!match) - { - UINT j; - BYTE *data = prop_item[i].value; - trace("id %#lx:", prop_item[i].id); - for (j = 0; j < prop_item[i].length; j++) - trace(" %02x", data[j]); - trace("\n"); - } + trace("id %#lx:%s\n", prop_item[i].id, dbgstr_hexdata(prop_item[i].value, prop_item[i].length)); } item_data += prop_item[i].length; }

1 0

Biswapriyo Nath : include: Add more CLSIDs in d2d1effects.idl.
by Alexandre Julliard 17 Jul '23

17 Jul '23

Module: wine Branch: master Commit: 900dfca3899d52f3085c713e26af06aa5aea37a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/900dfca3899d52f3085c713e26af06… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Jul 18 00:23:01 2023 +0530 include: Add more CLSIDs in d2d1effects.idl. --- include/d2d1effects.idl | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index d448aec162a..00bf323ecba 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -18,9 +18,45 @@ cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") cpp_quote("DEFINE_GUID(CLSID_D2D13DPerspectiveTransform, 0xc2844d0b,0x3d86,0x46e7,0x85,0xba,0x52,0x6c,0x92,0x40,0xf3,0xfb);") +cpp_quote("DEFINE_GUID(CLSID_D2D13DTransform, 0xe8467b04,0xec61,0x4b8a,0xb5,0xde,0xd4,0xd7,0x3d,0xeb,0xea,0x5a);") +cpp_quote("DEFINE_GUID(CLSID_D2D1ArithmeticComposite, 0xfc151437,0x049a,0x4784,0xa2,0x4a,0xf1,0xc4,0xda,0xf2,0x09,0x87);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Atlas, 0x913e2be4,0xfdcf,0x4fe2,0xa5,0xf0,0x24,0x54,0xf1,0x4f,0xf4,0x08);") +cpp_quote("DEFINE_GUID(CLSID_D2D1BitmapSource, 0x5fb6c24d,0xc6dd,0x4231,0x94,0x04,0x50,0xf4,0xd5,0xc3,0x25,0x2d);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Blend, 0x81c5b77b,0x13f8,0x4cdd,0xad,0x20,0xc8,0x90,0x54,0x7a,0xc6,0x5d);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Border, 0x2a2d49c0,0x4acf,0x43c7,0x8c,0x6a,0x7c,0x4a,0x27,0x87,0x4d,0x27);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Brightness, 0x8cea8d1e,0x77b0,0x4986,0xb3,0xb9,0x2f,0x0c,0x0e,0xae,0x78,0x87);") +cpp_quote("DEFINE_GUID(CLSID_D2D1ColorManagement, 0x1a28524c,0xfdd6,0x4aa4,0xae,0x8f,0x83,0x7e,0xb8,0x26,0x7b,0x37);") +cpp_quote("DEFINE_GUID(CLSID_D2D1ColorMatrix, 0x921f03d6,0x641c,0x47df,0x85,0x2d,0xb4,0xbb,0x61,0x53,0xae,0x11);") cpp_quote("DEFINE_GUID(CLSID_D2D1Composite, 0x48fc9f51,0xf6ac,0x48f1,0x8b,0x58,0x3b,0x28,0xac,0x46,0xf7,0x6d);") +cpp_quote("DEFINE_GUID(CLSID_D2D1ConvolveMatrix, 0x407f8c08,0x5533,0x4331,0xa3,0x41,0x23,0xcc,0x38,0x77,0x84,0x3e);") cpp_quote("DEFINE_GUID(CLSID_D2D1Crop, 0xe23f7110,0x0e9a,0x4324,0xaf,0x47,0x6a,0x2c,0x0c,0x46,0xf3,0x5b);") +cpp_quote("DEFINE_GUID(CLSID_D2D1DirectionalBlur, 0x174319a6,0x58e9,0x49b2,0xbb,0x63,0xca,0xf2,0xc8,0x11,0xa3,0xdb);") +cpp_quote("DEFINE_GUID(CLSID_D2D1DiscreteTransfer, 0x90866fcd,0x488e,0x454b,0xaf,0x06,0xe5,0x04,0x1b,0x66,0xc3,0x6c);") +cpp_quote("DEFINE_GUID(CLSID_D2D1DisplacementMap, 0xedc48364,0x0417,0x4111,0x94,0x50,0x43,0x84,0x5f,0xa9,0xf8,0x90);") +cpp_quote("DEFINE_GUID(CLSID_D2D1DistantDiffuse, 0x3e7efd62,0xa32d,0x46d4,0xa8,0x3c,0x52,0x78,0x88,0x9a,0xc9,0x54);") +cpp_quote("DEFINE_GUID(CLSID_D2D1DistantSpecular, 0x428c1ee5,0x77b8,0x4450,0x8a,0xb5,0x72,0x21,0x9c,0x21,0xab,0xda);") +cpp_quote("DEFINE_GUID(CLSID_D2D1DpiCompensation, 0x6c26c5c7,0x34e0,0x46fc,0x9c,0xfd,0xe5,0x82,0x37,0x6, 0xe2,0x28);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Flood, 0x61c23c20,0xae69,0x4d8e,0x94,0xcf,0x50,0x07,0x8d,0xf6,0x38,0xf2);") +cpp_quote("DEFINE_GUID(CLSID_D2D1GammaTransfer, 0x409444c4,0xc419,0x41a0,0xb0,0xc1,0x8c,0xd0,0xc0,0xa1,0x8e,0x42);") +cpp_quote("DEFINE_GUID(CLSID_D2D1GaussianBlur, 0x1feb6d69,0x2fe6,0x4ac9,0x8c,0x58,0x1d,0x7f,0x93,0xe7,0xa6,0xa5);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Scale, 0x9daf9369,0x3846,0x4d0e,0xa4,0x4e,0xc, 0x60,0x79,0x34,0xa5,0xd7);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Histogram, 0x881db7d0,0xf7ee,0x4d4d,0xa6,0xd2,0x46,0x97,0xac,0xc6,0x6e,0xe8);") +cpp_quote("DEFINE_GUID(CLSID_D2D1HueRotation, 0x0f4458ec,0x4b32,0x491b,0x9e,0x85,0xbd,0x73,0xf4,0x4d,0x3e,0xb6);") +cpp_quote("DEFINE_GUID(CLSID_D2D1LinearTransfer, 0xad47c8fd,0x63ef,0x4acc,0x9b,0x51,0x67,0x97,0x9c,0x03,0x6c,0x06);") +cpp_quote("DEFINE_GUID(CLSID_D2D1LuminanceToAlpha, 0x41251ab7,0x0beb,0x46f8,0x9d,0xa7,0x59,0xe9,0x3f,0xcc,0xe5,0xde);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Morphology, 0xeae6c40d,0x626a,0x4c2d,0xbf,0xcb,0x39,0x10,0x01,0xab,0xe2,0x02);") +cpp_quote("DEFINE_GUID(CLSID_D2D1OpacityMetadata, 0x6c53006a,0x4450,0x4199,0xaa,0x5b,0xad,0x16,0x56,0xfe,0xce,0x5e);") +cpp_quote("DEFINE_GUID(CLSID_D2D1PointDiffuse, 0xb9e303c3,0xc08c,0x4f91,0x8b,0x7b,0x38,0x65,0x6b,0xc4,0x8c,0x20);") +cpp_quote("DEFINE_GUID(CLSID_D2D1PointSpecular, 0x09c3ca26,0x3ae2,0x4f09,0x9e,0xbc,0xed,0x38,0x65,0xd5,0x3f,0x22);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Premultiply, 0x06eab419,0xdeed,0x4018,0x80,0xd2,0x3e,0x1d,0x47,0x1a,0xde,0xb2);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Saturation, 0x5cb2d9cf,0x327d,0x459f,0xa0,0xce,0x40,0xc0,0xb2,0x08,0x6b,0xf7);") cpp_quote("DEFINE_GUID(CLSID_D2D1Shadow, 0xc67ea361,0x1863,0x4e69,0x89,0xdb,0x69,0x5d,0x3e,0x9a,0x5b,0x6b);") +cpp_quote("DEFINE_GUID(CLSID_D2D1SpotDiffuse, 0x818a1105,0x7932,0x44f4,0xaa,0x86,0x08,0xae,0x7b,0x2f,0x2c,0x93);") +cpp_quote("DEFINE_GUID(CLSID_D2D1SpotSpecular, 0xedae421e,0x7654,0x4a37,0x9d,0xb8,0x71,0xac,0xc1,0xbe,0xb3,0xc1);") +cpp_quote("DEFINE_GUID(CLSID_D2D1TableTransfer, 0x5bf818c3,0x5e43,0x48cb,0xb6,0x31,0x86,0x83,0x96,0xd6,0xa1,0xd4);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Tile, 0xb0784138,0x3b76,0x4bc5,0xb1,0x3b,0x0f,0xa2,0xad,0x02,0x65,0x9f);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Turbulence, 0xcf2bb6ae,0x889a,0x4ad7,0xba,0x29,0xa2,0xfd,0x73,0x2c,0x9f,0xc9);") +cpp_quote("DEFINE_GUID(CLSID_D2D1UnPremultiply, 0xfb9ac489,0xad8d,0x41ed,0x99,0x99,0xbb,0x63,0x47,0xd1,0x10,0xf7);") typedef enum D2D1_BORDER_MODE {

1 0

Jacob Czekalla : comdlg32: Add parent folder button to IFileDialog.
by Alexandre Julliard 17 Jul '23

17 Jul '23

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 mmaudio SetObjectToken.
by Alexandre Julliard 17 Jul '23

17 Jul '23

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

Shaun Ren : sapi: Invoke AddRef in ISpVoice::SetVoice.
by Alexandre Julliard 17 Jul '23

17 Jul '23

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

Shaun Ren : sapi/tests: Fix intermittent duration test failure in mmaudio.
by Alexandre Julliard 17 Jul '23

17 Jul '23

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

Shaun Ren : sapi/tests: Fix ISpObjectToken::CreateInstance E_ACCESSDENIED error.
by Alexandre Julliard 17 Jul '23

17 Jul '23

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

Zhao Yi : comctl32/tests: Add a test case to get syslinkid.
by Alexandre Julliard 17 Jul '23

17 Jul '23

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

Zhao Yi : comctl32/syslink: Check item type before increasing link ID in SYSLINK_LinkAtPt().
by Alexandre Julliard 17 Jul '23

17 Jul '23

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