wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Zebediah Figura : d3dcompiler: Handle loops in free_instr().
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: efec4f90aa9328e8b59dd9b66e826ffa5431f03d URL: https://source.winehq.org/git/wine.git/?a=commit;h=efec4f90aa9328e8b59dd9b6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 11 22:54:18 2020 -0600 d3dcompiler: Handle loops in free_instr(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 3f5a57ffa4..a1470cd0f5 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2202,6 +2202,12 @@ static void free_ir_if(struct hlsl_ir_if *if_node) d3dcompiler_free(if_node); } +static void free_ir_loop(struct hlsl_ir_loop *loop) +{ + free_instr_list(loop->body); + d3dcompiler_free(loop); +} + static void free_ir_jump(struct hlsl_ir_jump *jump) { d3dcompiler_free(jump); @@ -2232,6 +2238,9 @@ void free_instr(struct hlsl_ir_node *node) case HLSL_IR_IF: free_ir_if(if_from_node(node)); break; + case HLSL_IR_LOOP: + free_ir_loop(loop_from_node(node)); + break; case HLSL_IR_JUMP: free_ir_jump(jump_from_node(node)); break;

1 0

Zebediah Figura : d3dcompiler: Return an instruction list instead of a single instruction from nodes representing expressions.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: c5aa0feec73d8315ab4e920adbb01afbdfee4a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5aa0feec73d8315ab4e920a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 12 21:57:18 2020 -0600 d3dcompiler: Return an instruction list instead of a single instruction from nodes representing expressions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 6 + dlls/d3dcompiler_43/hlsl.y | 328 ++++++++++++++++-------------- dlls/d3dcompiler_43/utils.c | 46 +---- 3 files changed, 185 insertions(+), 195 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5aa0feec73d8315ab4e…

1 0

Rémi Bernon : msi/tests: Fix some format-overflow warnings.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: f961817710edd81b5d91bb7cb3f78975c307bfa2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f961817710edd81b5d91bb7c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:28 2020 +0100 msi/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 2 +- dlls/msi/tests/install.c | 6 +++--- dlls/msi/tests/msi.c | 2 +- dlls/msi/tests/package.c | 20 ++++++++++---------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 89706249e4..48866e36f4 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -4623,7 +4623,7 @@ error: static void test_move_files(void) { UINT r; - char props[MAX_PATH]; + char props[4 * MAX_PATH + 74]; if (is_process_limited()) { diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index f7fd83cfc0..99d53e5657 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3816,7 +3816,7 @@ error: static void test_currentworkingdir(void) { UINT r; - CHAR drive[MAX_PATH], path[MAX_PATH]; + CHAR drive[MAX_PATH], path[MAX_PATH + 12]; LPSTR ptr; if (is_process_limited()) @@ -4778,7 +4778,7 @@ error: static void test_sourcedirprop(void) { UINT r; - CHAR props[MAX_PATH]; + CHAR props[MAX_PATH + 18]; if (is_process_limited()) { @@ -6112,7 +6112,7 @@ static void check_file_matches(const char *filename, const char *text) static void test_deferred_action(void) { - char path[200], file[200], buffer[200]; + char path[200], file[200], buffer[211]; UINT r; GetTempPathA(sizeof(path), path); diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 39a6638118..eb547c98dc 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -827,7 +827,7 @@ static UINT set_summary_info(MSIHANDLE hdb, LPSTR prodcode) static MSIHANDLE create_package_db(LPSTR prodcode) { MSIHANDLE hdb = 0; - CHAR query[MAX_PATH]; + CHAR query[MAX_PATH + 72]; UINT res; DeleteFileA(msifile); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3b7b11d81e..bf83c116ff 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -269,7 +269,7 @@ static void set_component_path(LPCSTR filename, MSIINSTALLCONTEXT context, WCHAR guidW[MAX_PATH]; WCHAR squashedW[MAX_PATH]; CHAR squashed[MAX_PATH]; - CHAR comppath[MAX_PATH]; + CHAR comppath[MAX_PATH + 81]; CHAR prodpath[MAX_PATH]; CHAR path[MAX_PATH]; LPCSTR prod = NULL; @@ -335,7 +335,7 @@ static void delete_component_path(LPCSTR guid, MSIINSTALLCONTEXT context, LPSTR WCHAR squashedW[MAX_PATH]; WCHAR substrW[MAX_PATH]; CHAR squashed[MAX_PATH]; - CHAR comppath[MAX_PATH]; + CHAR comppath[MAX_PATH + 81]; CHAR prodpath[MAX_PATH]; REGSAM access = KEY_ALL_ACCESS; @@ -1223,7 +1223,7 @@ static void query_file_path(MSIHANDLE hpkg, LPCSTR file, LPSTR buff) static void test_settargetpath(void) { - char tempdir[MAX_PATH+8], buffer[MAX_PATH], file[MAX_PATH]; + char tempdir[MAX_PATH+8], buffer[MAX_PATH], file[MAX_PATH + 20]; DWORD sz; MSIHANDLE hpkg; UINT r; @@ -2759,9 +2759,9 @@ static void test_formatrecord2(void) static void test_formatrecord_tables(void) { MSIHANDLE hdb, hrec, hpkg = 0; - CHAR buf[MAX_PATH]; + CHAR buf[MAX_PATH + 41]; CHAR curr_dir[MAX_PATH]; - CHAR expected[MAX_PATH]; + CHAR expected[MAX_PATH + 45]; CHAR root[MAX_PATH]; DWORD size; UINT r; @@ -4142,7 +4142,7 @@ done: static void test_appsearch_complocator(void) { MSIHANDLE hpkg, hdb; - char path[MAX_PATH], expected[MAX_PATH], prop[MAX_PATH]; + char path[MAX_PATH + 15], expected[MAX_PATH], prop[MAX_PATH]; LPSTR usersid; DWORD size; UINT r; @@ -4391,7 +4391,7 @@ error: static void test_appsearch_reglocator(void) { MSIHANDLE hpkg, hdb; - char path[MAX_PATH], expected[MAX_PATH], prop[MAX_PATH]; + char path[MAX_PATH + 20], expected[MAX_PATH], prop[MAX_PATH]; DWORD binary[2], size, val; BOOL space, version, is_64bit = sizeof(void *) > sizeof(int); HKEY hklm, classes, hkcu, users; @@ -4973,7 +4973,7 @@ static void delete_win_ini(LPCSTR file) static void test_appsearch_inilocator(void) { MSIHANDLE hpkg, hdb; - char path[MAX_PATH], expected[MAX_PATH], prop[MAX_PATH]; + char path[MAX_PATH + 14], expected[MAX_PATH], prop[MAX_PATH]; BOOL version; LPSTR ptr; DWORD size; @@ -5210,7 +5210,7 @@ static void search_absolute_directory(LPSTR absolute, LPCSTR relative) static void test_appsearch_drlocator(void) { MSIHANDLE hpkg, hdb; - char path[MAX_PATH], expected[MAX_PATH], prop[MAX_PATH]; + char path[MAX_PATH + 27], expected[MAX_PATH], prop[MAX_PATH]; BOOL version; DWORD size; UINT r; @@ -7968,7 +7968,7 @@ static void test_MsiGetProductProperty(void) MSIHANDLE hprod, hdb; CHAR val[MAX_PATH]; CHAR path[MAX_PATH]; - CHAR query[MAX_PATH]; + CHAR query[MAX_PATH + 17]; CHAR keypath[MAX_PATH*2]; CHAR prodcode[MAX_PATH]; WCHAR prodcodeW[MAX_PATH];

1 0

Nikolay Sivov : wincodecs: Return WINCODEC_ERR_PALETTEUNAVAILABLE for jpeg decoder frame.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: 5f6851fb291d08471a8473fd3efe813b8ee11ebf URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f6851fb291d08471a8473fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 14 16:20:47 2020 +0300 wincodecs: Return WINCODEC_ERR_PALETTEUNAVAILABLE for jpeg decoder frame. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/jpegformat.c | 5 +++-- dlls/windowscodecs/tests/jpegformat.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 1df898f28c..0ecbbf48fc 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -635,8 +635,9 @@ static HRESULT WINAPI JpegDecoder_Frame_GetResolution(IWICBitmapFrameDecode *ifa static HRESULT WINAPI JpegDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, pIPalette); + + return WINCODEC_ERR_PALETTEUNAVAILABLE; } static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/tests/jpegformat.c b/dlls/windowscodecs/tests/jpegformat.c index c1e46c4869..341e42c28c 100644 --- a/dlls/windowscodecs/tests/jpegformat.c +++ b/dlls/windowscodecs/tests/jpegformat.c @@ -47,6 +47,8 @@ static void test_decode_adobe_cmyk(void) { IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *framedecode; + IWICImagingFactory *factory; + IWICPalette *palette; HRESULT hr; HGLOBAL hjpegdata; char *jpegdata; @@ -77,6 +79,10 @@ static void test_decode_adobe_cmyk(void) ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); if (FAILED(hr)) return; + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + hjpegdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(jpeg_adobe_cmyk_1x5)); ok(hjpegdata != 0, "GlobalAlloc failed\n"); if (hjpegdata) @@ -125,13 +131,27 @@ static void test_decode_adobe_cmyk(void) broken(!memcmp(imagedata, expected_imagedata_24bpp, sizeof(expected_imagedata))), /* xp/2003 */ "unexpected image data\n"); } + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(framedecode, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(framedecode); } IStream_Release(jpegstream); } GlobalFree(hjpegdata); } + IWICBitmapDecoder_Release(decoder); + IWICImagingFactory_Release(factory); }

1 0

Jacek Caban : user32: Initialize module handle to NULL for null driver.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: be6e6fb23c2ca48def5e0c6916f4eeae097916e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be6e6fb23c2ca48def5e0c69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 14 12:04:26 2020 +0100 user32: Initialize module handle to NULL for null driver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 07be6a9a4a..8f3e1b3597 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -77,7 +77,8 @@ static BOOL load_desktop_driver( HWND hwnd, HMODULE *module ) size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) { - ret = !strcmpW( path, nullW ) || (*module = LoadLibraryW( path )); + if ((ret = !strcmpW( path, nullW ))) *module = NULL; + else ret = (*module = LoadLibraryW( path )) != NULL; if (!ret) ERR( "failed to load %s\n", debugstr_w(path) ); TRACE( "%s %p\n", debugstr_w(path), *module ); }

1 0

Nikolay Sivov : mfplat/tests: Add some tests for COM initialization in work queues threads.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: dcae1afa0529285e9a3768cbb4d4874923d122af URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcae1afa0529285e9a3768cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 14 13:01:10 2020 +0300 mfplat/tests: Add some tests for COM initialization in work queues threads. Based on patch by Derek Lesho. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 158 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 66524f1b48..ec84c6c261 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -63,6 +63,8 @@ static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TY const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); +static HRESULT (WINAPI *pCoGetApartmentType)(APTTYPE *type, APTTYPEQUALIFIER *qualifier); + static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); @@ -86,6 +88,7 @@ static HRESULT (WINAPI *pMFTRegisterLocalByCLSID)(REFCLSID clsid, REFGUID catego const MFT_REGISTER_TYPE_INFO *output_types); static HRESULT (WINAPI *pMFTUnregisterLocal)(IClassFactory *factory); static HRESULT (WINAPI *pMFTUnregisterLocalByCLSID)(CLSID clsid); +static HRESULT (WINAPI *pMFAllocateWorkQueueEx)(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; static const WCHAR fileschemeW[] = {'f','i','l','e',':','/','/',0}; @@ -122,6 +125,7 @@ struct test_callback { IMFAsyncCallback IMFAsyncCallback_iface; HANDLE event; + DWORD param; }; static struct test_callback *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) @@ -651,6 +655,7 @@ static void init_functions(void) #define X(f) p##f = (void*)GetProcAddress(mod, #f) X(MFAddPeriodicCallback); X(MFAllocateSerialWorkQueue); + X(MFAllocateWorkQueueEx); X(MFCopyImage); X(MFCreateDXGIDeviceManager); X(MFCreateSourceResolver); @@ -666,13 +671,17 @@ static void init_functions(void) X(MFTRegisterLocalByCLSID); X(MFTUnregisterLocal); X(MFTUnregisterLocalByCLSID); -#undef X if ((mod = LoadLibraryA("d3d11.dll"))) { - pD3D11CreateDevice = (void *)GetProcAddress(mod, "D3D11CreateDevice"); + X(D3D11CreateDevice); } + mod = GetModuleHandleA("ole32.dll"); + + X(CoGetApartmentType); +#undef X + is_win8_plus = pMFPutWaitingWorkItem != NULL; } @@ -4079,12 +4088,154 @@ static void test_MFTRegisterLocal(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); } +static void test_queue_com(void) +{ + static int system_queues[] = + { + MFASYNC_CALLBACK_QUEUE_STANDARD, + MFASYNC_CALLBACK_QUEUE_RT, + MFASYNC_CALLBACK_QUEUE_IO, + MFASYNC_CALLBACK_QUEUE_TIMER, + MFASYNC_CALLBACK_QUEUE_MULTITHREADED, + MFASYNC_CALLBACK_QUEUE_LONG_FUNCTION, + }; + + static int user_queues[] = + { + MF_STANDARD_WORKQUEUE, + MF_WINDOW_WORKQUEUE, + MF_MULTITHREADED_WORKQUEUE, + }; + + char path_name[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + char **argv; + int i; + + if (!pCoGetApartmentType) + { + win_skip("CoGetApartmentType() is not available.\n"); + return; + } + + winetest_get_mainargs(&argv); + + for (i = 0; i < ARRAY_SIZE(system_queues); ++i) + { + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + sprintf(path_name, "%s mfplat s%d", argv[0], system_queues[i]); + ok(CreateProcessA( NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + "CreateProcess failed.\n" ); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + } + + for (i = 0; i < ARRAY_SIZE(user_queues); ++i) + { + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + sprintf(path_name, "%s mfplat u%d", argv[0], user_queues[i]); + ok(CreateProcessA( NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + "CreateProcess failed.\n" ); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + } +} + +static HRESULT WINAPI test_queue_com_state_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct test_callback *callback = impl_from_IMFAsyncCallback(iface); + APTTYPEQUALIFIER qualifier; + APTTYPE com_type; + HRESULT hr; + + hr = pCoGetApartmentType(&com_type, &qualifier); + ok(SUCCEEDED(hr), "Failed to get apartment type, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + todo_wine { + if (callback->param == MFASYNC_CALLBACK_QUEUE_LONG_FUNCTION) + ok(com_type == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, + "%#x: unexpected type %u, qualifier %u.\n", callback->param, com_type, qualifier); + else + ok(com_type == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_NONE, + "%#x: unexpected type %u, qualifier %u.\n", callback->param, com_type, qualifier); + } + } + + SetEvent(callback->event); + return S_OK; +} + +static const IMFAsyncCallbackVtbl test_queue_com_state_callback_vtbl = +{ + testcallback_QueryInterface, + testcallback_AddRef, + testcallback_Release, + testcallback_GetParameters, + test_queue_com_state_callback_Invoke, +}; + +static void test_queue_com_state(const char *name) +{ + struct test_callback callback = { { &test_queue_com_state_callback_vtbl } }; + DWORD queue, queue_type; + HRESULT hr; + + callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + if (name[0] == 's') + { + callback.param = name[1] - '0'; + hr = MFPutWorkItem(callback.param, &callback.IMFAsyncCallback_iface, NULL); + ok(SUCCEEDED(hr), "Failed to queue work item, hr %#x.\n", hr); + WaitForSingleObject(callback.event, INFINITE); + } + else if (name[0] == 'u') + { + queue_type = name[1] - '0'; + + hr = pMFAllocateWorkQueueEx(queue_type, &queue); + ok(hr == S_OK, "Failed to allocate a queue, hr %#x.\n", hr); + + callback.param = queue; + hr = MFPutWorkItem(queue, &callback.IMFAsyncCallback_iface, NULL); + ok(SUCCEEDED(hr), "Failed to queue work item, hr %#x.\n", hr); + WaitForSingleObject(callback.event, INFINITE); + + hr = MFUnlockWorkQueue(queue); + ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + } + + CloseHandle(callback.event); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + START_TEST(mfplat) { - CoInitialize(NULL); + char **argv; + int argc; init_functions(); + argc = winetest_get_mainargs(&argv); + if (argc >= 3) + { + test_queue_com_state(argv[2]); + return; + } + + CoInitialize(NULL); + test_startup(); test_register(); test_media_type(); @@ -4119,6 +4270,7 @@ START_TEST(mfplat) test_dxgi_device_manager(); test_MFCreateTransformActivate(); test_MFTRegisterLocal(); + test_queue_com(); CoUninitialize(); }

1 0

Nikolay Sivov : rtworkq: Initialize MTA on startup.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: 4c4c893c3025f8760a0a69ff4beea8c7d41ecec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c4c893c3025f8760a0a69ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 14 13:01:09 2020 +0300 rtworkq: Initialize MTA on startup. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/rtworkq/Makefile.in | 1 + dlls/rtworkq/queue.c | 9 ++++ dlls/rtworkq/tests/Makefile.in | 5 ++ dlls/rtworkq/tests/rtworkq.c | 107 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 124 insertions(+) diff --git a/configure b/configure index cb85fb8b8f..1d20d141c1 100755 --- a/configure +++ b/configure @@ -20864,6 +20864,7 @@ wine_fn_config_makefile dlls/rsaenh/tests enable_tests wine_fn_config_makefile dlls/rstrtmgr enable_rstrtmgr wine_fn_config_makefile dlls/rtutils enable_rtutils wine_fn_config_makefile dlls/rtworkq enable_rtworkq +wine_fn_config_makefile dlls/rtworkq/tests enable_tests wine_fn_config_makefile dlls/samlib enable_samlib wine_fn_config_makefile dlls/sane.ds enable_sane_ds wine_fn_config_makefile dlls/sapi enable_sapi diff --git a/configure.ac b/configure.ac index b3389b796b..2e102990b5 100644 --- a/configure.ac +++ b/configure.ac @@ -3609,6 +3609,7 @@ WINE_CONFIG_MAKEFILE(dlls/rsaenh/tests) WINE_CONFIG_MAKEFILE(dlls/rstrtmgr) WINE_CONFIG_MAKEFILE(dlls/rtutils) WINE_CONFIG_MAKEFILE(dlls/rtworkq) +WINE_CONFIG_MAKEFILE(dlls/rtworkq/tests) WINE_CONFIG_MAKEFILE(dlls/samlib) WINE_CONFIG_MAKEFILE(dlls/sane.ds) WINE_CONFIG_MAKEFILE(dlls/sapi) diff --git a/dlls/rtworkq/Makefile.in b/dlls/rtworkq/Makefile.in index a224198986..345fad1c1e 100644 --- a/dlls/rtworkq/Makefile.in +++ b/dlls/rtworkq/Makefile.in @@ -1,5 +1,6 @@ MODULE = rtworkq.dll IMPORTLIB = rtworkq +IMPORTS = ole32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 65007602c7..70af6a7658 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -69,6 +69,7 @@ static CRITICAL_SECTION_DEBUG queues_critsect_debug = static CRITICAL_SECTION queues_section = { &queues_critsect_debug, -1, 0, 0, 0, 0 }; static LONG platform_lock; +static CO_MTA_USAGE_COOKIE mta_cookie; static struct queue_handle *get_queue_obj(DWORD handle) { @@ -1117,6 +1118,7 @@ HRESULT WINAPI RtwqUnlockPlatform(void) static void init_system_queues(void) { struct queue_desc desc; + HRESULT hr; /* Always initialize standard queue, keep the rest lazy. */ @@ -1128,6 +1130,9 @@ static void init_system_queues(void) return; } + if (FAILED(hr = CoIncrementMTAUsage(&mta_cookie))) + WARN("Failed to initialize MTA, hr %#x.\n", hr); + desc.queue_type = RTWQ_STANDARD_WORKQUEUE; desc.ops = &pool_queue_ops; desc.target_queue = 0; @@ -1149,6 +1154,7 @@ HRESULT WINAPI RtwqStartup(void) static void shutdown_system_queues(void) { unsigned int i; + HRESULT hr; EnterCriticalSection(&queues_section); @@ -1157,6 +1163,9 @@ static void shutdown_system_queues(void) shutdown_queue(&system_queues[i]); } + if (FAILED(hr = CoDecrementMTAUsage(mta_cookie))) + WARN("Failed to uninitialize MTA, hr %#x.\n", hr); + LeaveCriticalSection(&queues_section); } diff --git a/dlls/rtworkq/tests/Makefile.in b/dlls/rtworkq/tests/Makefile.in new file mode 100644 index 0000000000..8354cd810d --- /dev/null +++ b/dlls/rtworkq/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = rtworkq.dll +IMPORTS = rtworkq ole32 + +C_SRCS = \ + rtworkq.c diff --git a/dlls/rtworkq/tests/rtworkq.c b/dlls/rtworkq/tests/rtworkq.c new file mode 100644 index 0000000000..627e024d76 --- /dev/null +++ b/dlls/rtworkq/tests/rtworkq.c @@ -0,0 +1,107 @@ +/* + * Copyright 2020 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "rtworkq.h" + +#include "wine/test.h" + +static void test_platform_init(void) +{ + APTTYPEQUALIFIER qualifier; + APTTYPE apttype; + HRESULT hr; + + /* Startup initializes MTA. */ + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = RtwqStartup(); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, + "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); + + hr = RtwqShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + /* Try with STA initialized before startup. */ + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, + "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); + + hr = RtwqStartup(); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, + "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); + + hr = RtwqShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + CoUninitialize(); + + /* Startup -> init main STA -> uninitialize -> shutdown */ + hr = RtwqStartup(); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, + "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, + "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); + + CoUninitialize(); + + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, + "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); + + hr = RtwqShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + +START_TEST(rtworkq) +{ + test_platform_init(); +}

1 0

Nikolay Sivov : ole32: Fix CoGetApartmentType() return value for implicit MTA case.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: 90a6c9bd53973fdae3287fe6fcbd5d78e7f5c6be URL: https://source.winehq.org/git/wine.git/?a=commit;h=90a6c9bd53973fdae3287fe6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 14 13:01:08 2020 +0300 ole32: Fix CoGetApartmentType() return value for implicit MTA case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 1 + dlls/ole32/tests/compobj.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index aeed3b85fa..bd28f42b33 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -5264,6 +5264,7 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) apartment_release(apt); *type = APTTYPE_MTA; *qualifier = APTTYPEQUALIFIER_IMPLICIT_MTA; + return S_OK; } return info->apt ? S_OK : CO_E_NOTINITIALIZED; diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 7eb25af9e6..624120890d 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -648,7 +648,8 @@ static void _test_apt_type(APTTYPE expected_type, APTTYPEQUALIFIER expected_qual return; hr = pCoGetApartmentType(&type, &qualifier); - ok_(__FILE__, line)(hr == S_OK || hr == CO_E_NOTINITIALIZED, "Unexpected return code: 0x%08x\n", hr); + ok_(__FILE__, line)(hr == S_OK || (type == APTTYPE_CURRENT && hr == CO_E_NOTINITIALIZED), + "Unexpected hr %#x.\n", hr); ok_(__FILE__, line)(type == expected_type, "Wrong apartment type %d, expected %d\n", type, expected_type); ok_(__FILE__, line)(qualifier == expected_qualifier, "Wrong apartment qualifier %d, expected %d\n", qualifier, expected_qualifier);

1 0

Nikolay Sivov : dwrite/tests: Use wide string literals for some tests.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: c18d2d1c0d80bb644b9ca336895e8c9fd444ed3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c18d2d1c0d80bb644b9ca336… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 14 11:17:50 2020 +0300 dwrite/tests: Use wide string literals for some tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 99 +++--- dlls/dwrite/tests/font.c | 113 +++---- dlls/dwrite/tests/layout.c | 736 +++++++++++++++++++++---------------------- 3 files changed, 449 insertions(+), 499 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c18d2d1c0d80bb644b9c…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: 56c5b064b835361d1987fa584d7c600530a2af99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56c5b064b835361d1987fa58… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Feb 14 08:13:01 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 7d50b4be25..f7cf2fbf54 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-02-13 10:10+0200\n" +"PO-Revision-Date: 2020-02-14 08:12+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -9647,16 +9647,12 @@ msgid "Cape Verde Daylight Time" msgstr "Žaliojo Kyšulio vasaros laikas" #: tzres.rc:114 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Haiti Standard Time" -msgstr "Havajų juostinis laikas" +msgstr "Haičio juostinis laikas" #: tzres.rc:115 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Haiti Daylight Time" -msgstr "Havajų vasaros laikas" +msgstr "Haičio vasaros laikas" #: tzres.rc:74 msgid "Central European Standard Time"

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
88
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 February 2020