wine-commits December 2020

wine-commits@winehq.org

1 participants
414 discussions

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 26 Dec '20

26 Dec '20

Module: wine Branch: master Commit: 0a467acf31bc18b4272e91f6e73b2e59687b90ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a467acf31bc18b4272e91f6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 25 21:05:14 2020 +0200 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 727 +++++++++++++++++++++++++++------------------------------------ 1 file changed, 314 insertions(+), 413 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a467acf31bc18b4272e…

1 0

Zebediah Figura : d3dcompiler/tests: Avoid initializing nameless unions in designated initializers.
by Alexandre Julliard 26 Dec '20

26 Dec '20

Module: wine Branch: master Commit: 464b2dc6613207afa888334fabee8f205a0885b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=464b2dc6613207afa888334f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 25 10:06:36 2020 -0600 d3dcompiler/tests: Avoid initializing nameless unions in designated initializers. Old versions of gcc can't handle this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50397 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index 7a1243b9ccf..53dbd3e2df7 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -526,6 +526,7 @@ static void test_trig(void) static void test_sampling(void) { + D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc = {0}; struct test_context test_context; ID3D11ShaderResourceView *srv; ID3D11SamplerState *sampler; @@ -592,13 +593,6 @@ static void test_sampling(void) static const D3D11_SUBRESOURCE_DATA resource_data = {&texture_data, sizeof(texture_data) / 2}; - static const D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc = - { - .Format = DXGI_FORMAT_R32G32B32A32_FLOAT, - .ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D, - .Texture2D.MipLevels = 1, - }; - static const D3D11_SAMPLER_DESC sampler_desc = { .Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR, @@ -614,6 +608,9 @@ static void test_sampling(void) hr = ID3D11Device_CreateTexture2D(test_context.device, &texture_desc, &resource_data, &texture); ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; + srv_desc.Texture2D.MipLevels = 1; hr = ID3D11Device_CreateShaderResourceView(test_context.device, (ID3D11Resource *)texture, &srv_desc, &srv); ok(hr == S_OK, "Failed to create SRV, hr %#x.\n", hr); ID3D11DeviceContext_PSSetShaderResources(test_context.immediate_context, 0, 1, &srv);

1 0

Zebediah Figura : ucrtbase: Do not add MSVCRT_ prefix to the exported function name of _lrot*.
by Alexandre Julliard 26 Dec '20

26 Dec '20

Module: wine Branch: master Commit: 59e0c9e94d6c39a7e588f511923b3410cce0dcf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59e0c9e94d6c39a7e588f511… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 24 11:44:55 2020 -0600 ucrtbase: Do not add MSVCRT_ prefix to the exported function name of _lrot*. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 078cf2c5083..2631299d24c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -568,8 +568,8 @@ @ cdecl _logb(double) @ cdecl -arch=!i386 _logbf(float) @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp -@ cdecl MSVCRT__lrotl(long long) MSVCRT__lrotl -@ cdecl MSVCRT__lrotr(long long) MSVCRT__lrotr +@ cdecl _lrotl(long long) MSVCRT__lrotl +@ cdecl _lrotr(long long) MSVCRT__lrotr @ cdecl _lsearch(ptr ptr ptr long ptr) @ stub _lsearch_s @ cdecl _lseek(long long long)

1 0

Alexandre Julliard : dwrite: Avoid a compiler warning when FreeType is missing.
by Alexandre Julliard 23 Dec '20

23 Dec '20

Module: wine Branch: master Commit: 9d7a710fc0d1a0ecea17a68675d3899aff63ae0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d7a710fc0d1a0ecea17a686… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 20:15:15 2020 +0100 dwrite: Avoid a compiler warning when FreeType is missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 260d87b7ac6..91e44d82f2b 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -36,10 +36,10 @@ #include "dwrite_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(dwrite); - #ifdef HAVE_FREETYPE +WINE_DEFAULT_DEBUG_CHANNEL(dwrite); + static CRITICAL_SECTION freetype_cs; static CRITICAL_SECTION_DEBUG critsect_debug = {

1 0

Dmitry Timoshkov : shell32/tests: Remove workarounds for shell32 < 5.0.
by Alexandre Julliard 23 Dec '20

23 Dec '20

Module: wine Branch: master Commit: 11b797bb8391594006f8e235f553c9939c516bfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=11b797bb8391594006f8e235… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 23 17:02:37 2020 +0300 shell32/tests: Remove workarounds for shell32 < 5.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 39 ++++++++------------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 4f650d801d0..20c48814f1d 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -454,9 +454,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) /* test GetCurFile before ::Save */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); - lok(r == S_FALSE || - broken(r == S_OK), /* shell32 < 5.0 */ - "got 0x%08x\n", r); + lok(r == S_FALSE, "got 0x%08x\n", r); lok(str == NULL, "got %p\n", str); r = IPersistFile_Save(pf, path, TRUE); @@ -465,16 +463,9 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str); lok(r == S_OK, "got 0x%08x\n", r); - lok(str != NULL || - broken(str == NULL), /* shell32 < 5.0 */ - "Didn't expect NULL\n"); - if (str) - { - lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); - CoTaskMemFree(str); - } - else - win_skip("GetCurFile fails on shell32 < 5.0\n"); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); IPersistFile_Release(pf); } @@ -507,9 +498,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) /* test GetCurFile before ::Load */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); - lok(r == S_FALSE || - broken(r == S_OK), /* shell32 < 5.0 */ - "got 0x%08x\n", r); + lok(r == S_FALSE, "got 0x%08x\n", r); lok(str == NULL, "got %p\n", str); r = IPersistFile_Load(pf, path, STGM_READ); @@ -518,23 +507,11 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str); lok(r == S_OK, "got 0x%08x\n", r); - lok(str != NULL || - broken(str == NULL), /* shell32 < 5.0 */ - "Didn't expect NULL\n"); - if (str != NULL) - { - lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); - CoTaskMemFree(str); - } - else - win_skip("GetCurFile fails on shell32 < 5.0\n"); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); IPersistFile_Release(pf); - if (r != S_OK) - { - IShellLinkA_Release(sl); - return; - } if (desc->description) {

1 0

Dmitry Timoshkov : shell32/tests: Remove no longer used parameter.
by Alexandre Julliard 23 Dec '20

23 Dec '20

Module: wine Branch: master Commit: d468dd2eb7e1e0a61a03191fbfa93f4b7ad64f69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d468dd2eb7e1e0a61a03191f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 23 17:02:32 2020 +0300 shell32/tests: Remove no longer used parameter. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shell32_test.h | 4 ++-- dlls/shell32/tests/shelllink.c | 23 +++++++++++------------ dlls/shell32/tests/shlexec.c | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/tests/shell32_test.h b/dlls/shell32/tests/shell32_test.h index 42a74fb2d5f..89d08e70c0f 100644 --- a/dlls/shell32/tests/shell32_test.h +++ b/dlls/shell32/tests/shell32_test.h @@ -33,5 +33,5 @@ typedef struct WORD hotkey; } lnk_desc_t; -#define create_lnk(a,b,c) create_lnk_(__LINE__, (a), (b), (c)) -void create_lnk_(int,const WCHAR*,lnk_desc_t*,int); +#define create_lnk(a,b) create_lnk_(__LINE__, (a), (b)) +void create_lnk_(int,const WCHAR*,lnk_desc_t*); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index e4f176237f4..4f650d801d0 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -386,7 +386,7 @@ static void test_get_set(void) #define lok ok_(__FILE__, line) #define check_lnk(a,b,c) check_lnk_(__LINE__, (a), (b), (c)) -void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) +void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) { HRESULT r; IShellLinkA *sl; @@ -460,8 +460,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) lok(str == NULL, "got %p\n", str); r = IPersistFile_Save(pf, path, TRUE); - todo_wine_if (save_fails) - lok(r == S_OK, "save failed (0x%08x)\n", r); + lok(r == S_OK, "save failed (0x%08x)\n", r); /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str); @@ -628,7 +627,7 @@ static void test_load_save(void) /* Save an empty .lnk file */ memset(&desc, 0, sizeof(desc)); - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); /* It should come back as a bunch of empty strings */ desc.description=""; @@ -648,7 +647,7 @@ static void test_load_save(void) desc.icon="c:\\nonexistent\\icon\\file"; desc.icon_id=1234; desc.hotkey=0; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); check_lnk(lnkfile, &desc, 0x0); r=GetModuleFileNameA(NULL, mypath, sizeof(mypath)); @@ -672,7 +671,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); check_lnk(lnkfile, &desc, 0x0); /* Test omitting .exe from an absolute path */ @@ -689,7 +688,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); strcat(realpath, ".exe"); check_lnk(lnkfile, &desc, 0x4); @@ -703,7 +702,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); /* Check that link is created to proper location */ SearchPathA( NULL, desc.path, NULL, MAX_PATH, realpath, NULL); desc.path=realpath; @@ -719,7 +718,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); /* Check that link is created to proper location */ SearchPathA( NULL, "rundll32", NULL, MAX_PATH, realpath, NULL); desc.path=realpath; @@ -750,7 +749,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); check_lnk(lnkfile, &desc, 0x0); r = GetShortPathNameA(mydir, mypath, sizeof(mypath)); @@ -770,7 +769,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); desc.path=realpath; check_lnk(lnkfile, &desc, 0x0); @@ -800,7 +799,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); desc.path = realpath; check_lnk(lnkfile, &desc, 0x4); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 8ee662321d1..2481fb6faa2 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2742,7 +2742,7 @@ static void init_test(void) desc.icon=NULL; desc.icon_id=0; desc.hotkey=0; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); sprintf(filename, "%s\\test_shortcut_exe.lnk", tmpdir); MultiByteToWideChar(CP_ACP, 0, filename, -1, lnkfile, ARRAY_SIZE(lnkfile)); @@ -2756,7 +2756,7 @@ static void init_test(void) desc.icon=NULL; desc.icon_id=0; desc.hotkey=0; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); /* Create a basic association suitable for most tests */ if (!create_test_association(".shlexec"))

1 0

Paul Gofman : ntdll: Preserve syscall frame when calling async IO system APC.
by Alexandre Julliard 23 Dec '20

23 Dec '20

Module: wine Branch: master Commit: 8b8ddffa2152832908ced42191fa19dcb64d900e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b8ddffa2152832908ced421… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 23 14:51:03 2020 +0300 ntdll: Preserve syscall frame when calling async IO system APC. The frame can currently be reset from ws2_32.dll async IO callbacks which are still in the user part and are calling 'syscall' functions. If the user APC is processed after that during the same call to server_select(), the call_user_apc_dispatcher() faults. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49782 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 16 ++++++++++++++++ dlls/ntdll/unix/signal_arm.c | 9 +++++++++ dlls/ntdll/unix/signal_arm64.c | 10 ++++++++++ dlls/ntdll/unix/signal_i386.c | 10 ++++++++++ dlls/ntdll/unix/signal_x86_64.c | 9 +++++++++ dlls/ntdll/unix/unix_private.h | 3 +++ 6 files changed, 57 insertions(+) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 87dd4b10b83..a9608abfb73 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -389,8 +389,24 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) { IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); NTSTATUS (**user)(void *, IO_STATUS_BLOCK *, NTSTATUS) = wine_server_get_ptr( call->async_io.user ); + void *saved_frame = get_syscall_frame(); + void *frame; + result->type = call->type; result->async_io.status = (*user)( user, iosb, call->async_io.status ); + + if ((frame = get_syscall_frame()) != saved_frame) + { + /* The frame can be altered by syscalls from ws2_32 async callbacks + * which are currently in the user part. */ + static unsigned int once; + + if (!once++) + FIXME( "syscall frame changed in APC function, frame %p, saved_frame %p.\n", frame, saved_frame ); + + set_syscall_frame( saved_frame ); + } + if (result->async_io.status != STATUS_PENDING) result->async_io.total = iosb->Information; break; diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index e8971d22dbd..487c8501cc7 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -203,6 +203,15 @@ static inline struct arm_thread_data *arm_thread_data(void) return (struct arm_thread_data *)ntdll_get_thread_data()->cpu_data; } +void *get_syscall_frame(void) +{ + return arm_thread_data()->syscall_frame; +} + +void set_syscall_frame(void *frame) +{ + arm_thread_data()->syscall_frame = frame; +} /*********************************************************************** * unwind_builtin_dll diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 3beef729dca..95042de45e1 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -157,6 +157,16 @@ static inline struct arm64_thread_data *arm64_thread_data(void) return (struct arm64_thread_data *)ntdll_get_thread_data()->cpu_data; } +void *get_syscall_frame(void) +{ + return arm64_thread_data()->syscall_frame; +} + +void set_syscall_frame(void *frame) +{ + arm64_thread_data()->syscall_frame = frame; +} + extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, void *dispatcher ); /*********************************************************************** diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index c8690b51f2f..ff9d8a12c14 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -495,6 +495,16 @@ static inline struct x86_thread_data *x86_thread_data(void) return (struct x86_thread_data *)ntdll_get_thread_data()->cpu_data; } +void *get_syscall_frame(void) +{ + return x86_thread_data()->syscall_frame; +} + +void set_syscall_frame(void *frame) +{ + x86_thread_data()->syscall_frame = frame; +} + static inline WORD get_cs(void) { WORD res; __asm__( "movw %%cs,%0" : "=r" (res) ); return res; } static inline WORD get_ds(void) { WORD res; __asm__( "movw %%ds,%0" : "=r" (res) ); return res; } static inline WORD get_fs(void) { WORD res; __asm__( "movw %%fs,%0" : "=r" (res) ); return res; } diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 837cd9ed654..1fd26d5bd76 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -306,6 +306,15 @@ static inline struct amd64_thread_data *amd64_thread_data(void) return (struct amd64_thread_data *)ntdll_get_thread_data()->cpu_data; } +void *get_syscall_frame(void) +{ + return amd64_thread_data()->syscall_frame; +} + +void set_syscall_frame(void *frame) +{ + amd64_thread_data()->syscall_frame = frame; +} /*********************************************************************** * Definitions for Dwarf unwind tables diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 23731f0fdc6..f8f50d0ab27 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -247,6 +247,9 @@ extern void WINAPI DECLSPEC_NORETURN call_user_exception_dispatcher( EXCEPTION_R NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*) ) DECLSPEC_HIDDEN; extern void WINAPI DECLSPEC_NORETURN call_raise_user_exception_dispatcher( NTSTATUS (WINAPI *dispatcher)(void) ) DECLSPEC_HIDDEN; +extern void *get_syscall_frame(void) DECLSPEC_HIDDEN; +extern void set_syscall_frame(void *frame) DECLSPEC_HIDDEN; + #define TICKSPERSEC 10000000 #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)86400)

1 0

Alistair Leslie-Hughes : msado15/tests: Add test for interface ADOConnectionConstruction15.
by Alexandre Julliard 23 Dec '20

23 Dec '20

Module: wine Branch: master Commit: a23c54288ec975fde4d08a4759f227c9278cde60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a23c54288ec975fde4d08a47… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 23 20:13:57 2020 +1100 msado15/tests: Add test for interface ADOConnectionConstruction15. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/tests/msado15.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index cafb73d64e4..8b08e8af193 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -1024,6 +1024,7 @@ static void test_Connection(void) IRunnableObject *runtime; ISupportErrorInfo *errorinfo; IConnectionPointContainer *pointcontainer; + ADOConnectionConstruction15 *construct; LONG state, timeout; BSTR str, str2, str3; ConnectModeEnum mode; @@ -1044,6 +1045,11 @@ static void test_Connection(void) ok(hr == S_OK, "Failed to get IConnectionPointContainer interface %08x\n", hr); IConnectionPointContainer_Release(pointcontainer); + hr = _Connection_QueryInterface(connection, &IID_ADOConnectionConstruction15, (void**)&construct); + todo_wine ok(hr == S_OK, "Failed to get ADOConnectionConstruction15 interface %08x\n", hr); + if (hr == S_OK) + ADOConnectionConstruction15_Release(construct); + if (0) /* Crashes on windows */ { hr = _Connection_get_State(connection, NULL);

1 0

Alistair Leslie-Hughes : msado15: Set row_set point to NULL on close.
by Alexandre Julliard 23 Dec '20

23 Dec '20

Module: wine Branch: master Commit: df2c595181b4d885b99a7b30da650b9f81bb3673 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df2c595181b4d885b99a7b30… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 23 20:13:58 2020 +1100 msado15: Set row_set point to NULL on close. Stops a crash when Close then Release is called on a Recordset. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 17200d73790..e915922fdc4 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -760,6 +760,7 @@ static void close_recordset( struct recordset *recordset ) ULONG row, col, col_count; if ( recordset->row_set ) IRowset_Release( recordset->row_set ); + recordset->row_set = NULL; if (!recordset->fields) return; col_count = get_column_count( recordset );

1 0

Akihiro Sagawa : d3dx9: Avoid closing invalid handles.
by Alexandre Julliard 22 Dec '20

22 Dec '20

Module: wine Branch: master Commit: e27a95e92097a601baa9b0e9dd6fcc5013c863fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e27a95e92097a601baa9b0e9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 21 22:44:00 2020 +0900 d3dx9: Avoid closing invalid handles. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50373 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 5be9083360a..39afe6740c0 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -134,8 +134,10 @@ HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) return S_OK; error: - CloseHandle(hmapping); - CloseHandle(hfile); + if (hmapping) + CloseHandle(hmapping); + if (hfile != INVALID_HANDLE_VALUE) + CloseHandle(hfile); return HRESULT_FROM_WIN32(GetLastError()); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2020