wine-devel October 2019

wine-devel@winehq.org

80 participants
669 discussions

[PATCH v2] msvcrt: Implement %u format for strftime
by Vijay Kiran Kamuju 18 Oct '19

18 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 5 +++++ dlls/ucrtbase/tests/misc.c | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 0eecfd6796f..cf79e5971ec 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -653,6 +653,11 @@ static void test_strftime(void) ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%u", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(NULL, 0, "copy", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b299976d3f3..588f724cf79 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1264,6 +1264,11 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) return 0; break; + case 'u': + tmp = mstm->tm_wday ? mstm->tm_wday : 7; + if(!strftime_int(str, &ret, max, tmp, 0, 1, 7)) + return 0; + break; #endif case 'w': if(!strftime_int(str, &ret, max, mstm->tm_wday, 0, 0, 6)) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index fe59e300623..83e1bdda888 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -901,6 +901,7 @@ static void test_asctime(void) static void test_strftime(void) { const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; + const struct tm tm1 = { 0, 0, 0, 1, 0, 117, 0, 0, 0 }; char bufA[256]; size_t retA; @@ -948,6 +949,10 @@ static void test_strftime(void) ok(retA == 5, "expected 5, got %d\n", (int)retA); ok(!strcmp(bufA, "0:0:0"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%u", &tm1); + ok(retA == 1, "expected 1, got %d\n", (int)retA); + ok(!strcmp(bufA, "7"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%h", &epoch); ok(retA == 3, "expected 3, got %d\n", (int)retA); ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); -- 2.21.0

2 1

[PATCH] msvcrt: Implement %u format for strftime
by Vijay Kiran Kamuju 18 Oct '19

18 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 5 +++++ dlls/ucrtbase/tests/misc.c | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 0eecfd6796f..cf79e5971ec 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -653,6 +653,11 @@ static void test_strftime(void) ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%u", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(NULL, 0, "copy", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b299976d3f3..588f724cf79 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1264,6 +1264,11 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) return 0; break; + case 'u': + tmp = mstm->tm_wday ? mstm->tm_wday : 7; + if(!strftime_int(str, &ret, max, tmp, 0, 1, 7)) + return 0; + break; #endif case 'w': if(!strftime_int(str, &ret, max, mstm->tm_wday, 0, 0, 6)) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index fe59e300623..83e1bdda888 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -901,6 +901,7 @@ static void test_asctime(void) static void test_strftime(void) { const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; + const struct tm epoch2 = { 0, 0, 0, 1, 0, 117, 0, 0, 0 }; char bufA[256]; size_t retA; @@ -948,6 +949,10 @@ static void test_strftime(void) ok(retA == 5, "expected 5, got %d\n", (int)retA); ok(!strcmp(bufA, "0:0:0"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%u", &epoch2); + ok(retA == 1, "expected 1, got %d\n", (int)retA); + ok(!strcmp(bufA, "7"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%h", &epoch); ok(retA == 3, "expected 3, got %d\n", (int)retA); ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); -- 2.21.0

2 1

[RFC] Automatically set GeoID on process startup
by João Diogo Ferreira 18 Oct '19

18 Oct '19

... basically like we already do for locale. Hello all. So for my first contribution to Wine I've been wanting to tackle this issue, reported and suggested in bug #46196. I'd like to hear everyone's opinions on it and also have one question answered. The bug: https://bugs.winehq.org/show_bug.cgi?id=46196 The mechanism is fairly simple, just asking Wine for the country code of the current locale and calling the appopriate Win32 functions to set that. My main question is how to allow a user to disable this mechanism easily (say, with a registry key or with winecfg). Plenty of countries are simply not represented by either Linux or Wine locales, chiefly former colonies in Africa and Asia with European official languages. Think Angola, Mozambique, Macao, Morocco, etc. Or if anyone has any better suggestion, this is the thread to send them in. -- João Ferreira

2 3

[PATCH v3] include: Add COM_DECLSPEC_NOTHROW define
by Alistair Leslie-Hughes 18 Oct '19

18 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/basetyps.h | 7 +++++-- include/objbase.h | 10 ++++++---- include/winnt.h | 10 ++++++++++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/include/basetyps.h b/include/basetyps.h index 94875334b0..0a30ee1cc2 100644 --- a/include/basetyps.h +++ b/include/basetyps.h @@ -40,9 +40,12 @@ #define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE #if defined(__cplusplus) && !defined(CINTERFACE) + +#define COM_DECLSPEC_NOTHROW DECLSPEC_NOTHROW + # define interface struct -# define STDMETHOD(m) virtual HRESULT STDMETHODCALLTYPE m -# define STDMETHOD_(t,m) virtual t STDMETHODCALLTYPE m +# define STDMETHOD(m) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE m +# define STDMETHOD_(t,m) virtual COM_DECLSPEC_NOTHROW t STDMETHODCALLTYPE m # define PURE =0 # define THIS_ # define THIS void diff --git a/include/objbase.h b/include/objbase.h index a241b71199..0f910f5da5 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -172,12 +172,14 @@ #if defined(__cplusplus) && !defined(CINTERFACE) +#define COM_DECLSPEC_NOTHROW DECLSPEC_NOTHROW + /* C++ interface */ -#define STDMETHOD(method) virtual HRESULT STDMETHODCALLTYPE method -#define STDMETHOD_(type,method) virtual type STDMETHODCALLTYPE method -#define STDMETHODV(method) virtual HRESULT STDMETHODVCALLTYPE method -#define STDMETHODV_(type,method) virtual type STDMETHODVCALLTYPE method +#define STDMETHOD(method) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE method +#define STDMETHOD_(type,method) virtual COM_DECLSPEC_NOTHROW type STDMETHODCALLTYPE method +#define STDMETHODV(method) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODVCALLTYPE method +#define STDMETHODV_(type,method) virtual COM_DECLSPEC_NOTHROW type STDMETHODVCALLTYPE method #define PURE = 0 #define THIS_ diff --git a/include/winnt.h b/include/winnt.h index 3f59bd9f30..9c39eb7e4d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -76,6 +76,16 @@ extern "C" { # endif #endif +#ifndef DECLSPEC_NOTHROW +# if defined(_MSC_VER) && (_MSC_VER >= 1200) && !defined(MIDL_PASS) +# define DECLSPEC_NOTHROW __declspec(nothrow) +# elif defined(__GNUC__) +# define DECLSPEC_NOTHROW __attribute__((nothrow)) +# else +# define DECLSPEC_NOTHROW +# endif +#endif + #ifndef DECLSPEC_CACHEALIGN # define DECLSPEC_CACHEALIGN DECLSPEC_ALIGN(128) #endif -- 2.17.1

1 0

[PATCH v2] include: Add COM_DECLSPEC_NOTHROW define
by Alistair Leslie-Hughes 17 Oct '19

17 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/basetyps.h | 7 +++++-- include/objbase.h | 10 ++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/include/basetyps.h b/include/basetyps.h index 94875334b0..be4c37e5a7 100644 --- a/include/basetyps.h +++ b/include/basetyps.h @@ -40,9 +40,12 @@ #define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE #if defined(__cplusplus) && !defined(CINTERFACE) + +#define COM_DECLSPEC_NOTHROW DECLSPEC_NORETURN + # define interface struct -# define STDMETHOD(m) virtual HRESULT STDMETHODCALLTYPE m -# define STDMETHOD_(t,m) virtual t STDMETHODCALLTYPE m +# define STDMETHOD(m) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE m +# define STDMETHOD_(t,m) virtual COM_DECLSPEC_NOTHROW t STDMETHODCALLTYPE m # define PURE =0 # define THIS_ # define THIS void diff --git a/include/objbase.h b/include/objbase.h index a241b71199..d54f0edb25 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -172,12 +172,14 @@ #if defined(__cplusplus) && !defined(CINTERFACE) +#define COM_DECLSPEC_NOTHROW DECLSPEC_NORETURN + /* C++ interface */ -#define STDMETHOD(method) virtual HRESULT STDMETHODCALLTYPE method -#define STDMETHOD_(type,method) virtual type STDMETHODCALLTYPE method -#define STDMETHODV(method) virtual HRESULT STDMETHODVCALLTYPE method -#define STDMETHODV_(type,method) virtual type STDMETHODVCALLTYPE method +#define STDMETHOD(method) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE method +#define STDMETHOD_(type,method) virtual COM_DECLSPEC_NOTHROW type STDMETHODCALLTYPE method +#define STDMETHODV(method) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODVCALLTYPE method +#define STDMETHODV_(type,method) virtual COM_DECLSPEC_NOTHROW type STDMETHODVCALLTYPE method #define PURE = 0 #define THIS_ -- 2.17.1

1 0

[PATCH] winemac: Fix redirection of OpenGL extension functions.
by Ken Thomases 17 Oct '19

17 Oct '19

This never worked. opengl_funcs.ext.p_<func> would always be NULL at the time it was checked, so nothing would be changed. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/opengl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 8625350b2cc..5197e15fbb8 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -4277,6 +4277,9 @@ static BOOL init_opengl(void) } } + if (!init_gl_info()) + goto failed; + /* redirect some standard OpenGL functions */ #define REDIRECT(func) \ do { p##func = opengl_funcs.gl.p_##func; opengl_funcs.gl.p_##func = macdrv_##func; } while(0) @@ -4292,13 +4295,10 @@ static BOOL init_opengl(void) /* redirect some OpenGL extension functions */ #define REDIRECT(func) \ - do { if (opengl_funcs.ext.p_##func) { p##func = opengl_funcs.ext.p_##func; opengl_funcs.ext.p_##func = macdrv_##func; } } while(0) + do { if ((p##func = wine_dlsym(opengl_handle, #func, NULL, 0))) { opengl_funcs.ext.p_##func = macdrv_##func; } } while(0) REDIRECT(glCopyColorTable); #undef REDIRECT - if (!init_gl_info()) - goto failed; - if (gluCheckExtension((GLubyte*)"GL_APPLE_flush_render", (GLubyte*)gl_info.glExtensions)) pglFlushRenderAPPLE = wine_dlsym(opengl_handle, "glFlushRenderAPPLE", NULL, 0); -- 2.21.0

1 0

[PATCH v2] kernel32/tests: Test loading system DLLs with WoW64 redirection disabled
by Brendan Shanks 17 Oct '19

17 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47912 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: * Use broken() for the Vista/2008 case * Use GetModuleHandle() to ensure library isn't already loaded * Test loading the path returned by GetModuleFileName() * Test wlanapi.dll instead of bcrypt.dll (bcrypt was already loaded in the process for newer Win10 versions) dlls/kernel32/tests/loader.c | 49 ++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 65184887b8..8ad1fde299 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -84,6 +84,8 @@ static BOOL (WINAPI *pFlsSetValue)(DWORD, PVOID); static PVOID (WINAPI *pFlsGetValue)(DWORD); static BOOL (WINAPI *pFlsFree)(DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -3812,6 +3814,50 @@ static void test_InMemoryOrderModuleList(void) ok(entry2 == mark2, "expected entry2 == mark2, got %p and %p\n", entry2, mark2); } +static void test_wow64_redirection_for_dll(const char *libname) +{ + HMODULE lib; + char buf[256]; + + if (!GetModuleHandleA(libname)) + { + lib = LoadLibraryExA(libname, NULL, 0); + todo_wine ok (broken(lib == NULL) /* Vista/2008 */ || + lib != NULL, "Loading %s should succeed with WOW64 redirection disabled\n", libname); + if (lib) + { + /* Win 7/2008R2 return the un-redirected path (i.e. c:\windows\system32\dwrite.dll), test loading it. */ + GetModuleFileNameA(lib, buf, sizeof(buf)); + FreeLibrary(lib); + lib = LoadLibraryExA(buf, NULL, 0); + ok(lib != NULL, "Loading %s from full path should succeed with WOW64 redirection disabled\n", libname); + if (lib) + FreeLibrary(lib); + } + } + else + { + skip("%s was already loaded in the process\n", libname); + } +} + +static void test_wow64_redirection(void) +{ + VOID *OldValue; + + if (!is_wow64) + return; + + /* Disable FS redirection, then test loading system libraries (pick ones that shouldn't + * already be loaded in this process). + */ + ok(pWow64DisableWow64FsRedirection(&OldValue), "Disabling FS redirection failed\n"); + test_wow64_redirection_for_dll("wlanapi.dll"); + test_wow64_redirection_for_dll("dxgi.dll"); + test_wow64_redirection_for_dll("dwrite.dll"); + ok(pWow64RevertWow64FsRedirection(OldValue), "Re-enabling FS redirection failed\n"); +} + static void test_dll_file( const char *name ) { HMODULE module = GetModuleHandleA( name ); @@ -3897,6 +3943,8 @@ START_TEST(loader) pFlsGetValue = (void *)GetProcAddress(kernel32, "FlsGetValue"); pFlsFree = (void *)GetProcAddress(kernel32, "FlsFree"); pIsWow64Process = (void *)GetProcAddress(kernel32, "IsWow64Process"); + pWow64DisableWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64DisableWow64FsRedirection"); + pWow64RevertWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64RevertWow64FsRedirection"); pResolveDelayLoadedAPI = (void *)GetProcAddress(kernel32, "ResolveDelayLoadedAPI"); if (pIsWow64Process) pIsWow64Process( GetCurrentProcess(), &is_wow64 ); @@ -3930,6 +3978,7 @@ START_TEST(loader) test_import_resolution(); test_ExitProcess(); test_InMemoryOrderModuleList(); + test_wow64_redirection(); test_dll_file( "ntdll.dll" ); test_dll_file( "kernel32.dll" ); test_dll_file( "advapi32.dll" ); -- 2.17.1

2 1

[PATCH 10/10] vbscript/tests: Added Err object IDispatch tests.
by Jacek Caban 17 Oct '19

17 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/api.vbs | 5 +++ dlls/vbscript/tests/run.c | 86 ++++++++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-)

1 0

[PATCH 09/10] vbscript: Get rid of no longer needed ITypeInfo in BuiltinDisp.
by Jacek Caban 17 Oct '19

17 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 17 ++-------- dlls/vbscript/vbscript.h | 13 -------- dlls/vbscript/vbscript_main.c | 61 ----------------------------------- 3 files changed, 3 insertions(+), 88 deletions(-)

1 0

[PATCH 08/10] vbscript: Don't use ITypeInfo for builtin function dispids.
by Jacek Caban 17 Oct '19

17 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 439 +++++++++++++++++++++-------------------- 1 file changed, 220 insertions(+), 219 deletions(-)

1 0

[PATCH 07/10] vbscript: Use separated IDispatch implementation for objects exposing builtin functions.
by Jacek Caban 17 Oct '19

17 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 302 ++++++++++++++++++++++++++++++++++----- dlls/vbscript/interp.c | 4 +- dlls/vbscript/vbdisp.c | 103 +------------ dlls/vbscript/vbscript.h | 33 ++--- 4 files changed, 279 insertions(+), 163 deletions(-)

1 0

[PATCH 06/10] vbscript: Introduce get_builtin_id.
by Jacek Caban 17 Oct '19

17 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 5 +++++ dlls/vbscript/interp.c | 2 +- dlls/vbscript/vbscript.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-)

1 0

[PATCH 05/10] vbscript: Factor out detach_global_objects.
by Jacek Caban 17 Oct '19

17 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 21 +++++++++++++++++++++ dlls/vbscript/vbscript.c | 19 +------------------ dlls/vbscript/vbscript.h | 1 + 3 files changed, 23 insertions(+), 18 deletions(-)

1 0

[PATCH 04/10] vbscript: Introduce new type for object with builtin functions.
by Jacek Caban 17 Oct '19

17 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 232 +++++++++++++++++++-------------------- dlls/vbscript/vbscript.h | 6 +- 2 files changed, 120 insertions(+), 118 deletions(-)

1 0

[PATCH 03/10] vbscript: Create class description for procedure object in compiler.
by Jacek Caban 17 Oct '19

17 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 26 ++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 39 --------------------------------------- dlls/vbscript/vbscript.c | 12 +++++++++--- dlls/vbscript/vbscript.h | 2 +- 4 files changed, 36 insertions(+), 43 deletions(-)

1 0

[PATCH 02/10] vbscript: Don't use IDispatchEx for internal calls.
by Jacek Caban 17 Oct '19

17 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/run.c | 2 -- dlls/vbscript/vbdisp.c | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-)

1 0

[PATCH 01/10] vbscript: Factor out invoke_vbdisp.
by Jacek Caban 17 Oct '19

17 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 164 +++++++++++++++++++++-------------------- 1 file changed, 86 insertions(+), 78 deletions(-)

1 0

[PATCH] user32: Fix coords in WINDOWPOS for WM_NCCALCSIZE sent from SetWindowPos().
by Paul Gofman 17 Oct '19

17 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40777 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/user32/tests/msg.c | 82 ++++++++++++++++++++++++++++++++++++----- dlls/user32/winpos.c | 12 ++++++ 2 files changed, 84 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2766e7f5fb..8bca7c35fd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2186,9 +2186,27 @@ static void add_message_(int line, const struct recvd_message *msg) seq->wParam = winpos->flags & 0xffff; /* We are not interested in the flags that don't match under XP and Win9x */ seq->wParam &= ~SWP_NOZORDER; + seq->lParam = (!!winpos->cx) | ((!!winpos->cy) << 1) + | ((!!winpos->x) << 2) | ((!!winpos->y) << 3); break; } + case WM_NCCALCSIZE: + if (msg->wParam) + { + NCCALCSIZE_PARAMS *p = (NCCALCSIZE_PARAMS *)msg->lParam; + WINDOWPOS *winpos = p->lppos; + + sprintf(seq->output, "%s: %p WM_NCCALCSIZE: winpos->cx %u, winpos->cy %u", + msg->descr, msg->hwnd, winpos->cx, winpos->cy); + seq->lParam = (!!winpos->cx) | ((!!winpos->cy) << 1) + | ((!!winpos->x) << 2) | ((!!winpos->y) << 3); + } + else + { + seq->lParam = 0; + } + break; case WM_DRAWITEM: { DRAW_ITEM_STRUCT di; @@ -5664,32 +5682,72 @@ done: flush_sequence(); } +static const struct message WmFrameChanged[] = { + { WM_WINDOWPOSCHANGING, sent|wparam|lparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE, 0, 3 }, + { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0xf }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOREDRAW + |SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_GETTEXT, sent|optional }, + { 0 } +}; + +static const struct message WmFrameChanged_move[] = { + { WM_WINDOWPOSCHANGING, sent|wparam|lparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE, 0, 3 }, + { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0x3 }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOREDRAW + |SWP_NOSIZE|SWP_NOCLIENTSIZE }, + { WM_MOVE, sent|defwinproc, 0 }, + { WM_GETTEXT, sent|optional }, + { 0 } +}; + static void test_setwindowpos(void) { HWND hwnd; RECT rc; LRESULT res; + const INT X = 50; + const INT Y = 50; const INT winX = 100; const INT winY = 100; const INT sysX = GetSystemMetrics(SM_CXMINTRACK); hwnd = CreateWindowExA(0, "TestWindowClass", NULL, 0, - 0, 0, winX, winY, 0, + X, Y, winX, winY, 0, NULL, NULL, 0); GetWindowRect(hwnd, &rc); - expect(sysX, rc.right); - expect(winY, rc.bottom); + expect(sysX + X, rc.right); + expect(winY + Y, rc.bottom); flush_events(); flush_sequence(); - res = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, winX, winY, 0); + res = SetWindowPos(hwnd, HWND_TOPMOST, 50, 50, winX, winY, 0); ok_sequence(WmZOrder, "Z-Order", TRUE); ok(res == TRUE, "SetWindowPos expected TRUE, got %ld\n", res); + GetWindowRect(hwnd, &rc); + expect(sysX + X, rc.right); + expect(winY + Y, rc.bottom); + + res = SetWindowPos( hwnd, 0, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); + ok_sequence(WmFrameChanged, "FrameChanged", FALSE); + ok(res == TRUE, "SetWindowPos expected TRUE, got %ld.\n", res); + + GetWindowRect(hwnd, &rc); + expect(sysX + X, rc.right); + expect(winY + Y, rc.bottom); + + res = SetWindowPos( hwnd, 0, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); + ok_sequence(WmFrameChanged_move, "FrameChanged", FALSE); + ok(res == TRUE, "SetWindowPos expected TRUE, got %ld.\n", res); + GetWindowRect(hwnd, &rc); expect(sysX, rc.right); expect(winY, rc.bottom); + DestroyWindow(hwnd); } @@ -12884,8 +12942,9 @@ static void test_TrackMouseEvent(void) static const struct message WmSetWindowRgn[] = { - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE }, - { WM_NCCALCSIZE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent|wparam|lparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE + |SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE, 0 }, + { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0xf }, { WM_NCPAINT, sent|optional }, /* wparam != 1 */ { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, @@ -12895,16 +12954,19 @@ static const struct message WmSetWindowRgn[] = { }; static const struct message WmSetWindowRgn_no_redraw[] = { - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW }, - { WM_NCCALCSIZE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent|wparam|lparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE + |SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW, 0 }, + { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0xf }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; static const struct message WmSetWindowRgn_clear[] = { - { WM_WINDOWPOSCHANGING, sent/*|wparam*/, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE/*|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE only on some Windows versions */ }, - { WM_NCCALCSIZE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent/*|wparam|lparam*/, SWP_NOACTIVATE|SWP_FRAMECHANGED + |SWP_NOSIZE|SWP_NOMOVE/*|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE only on some Windows versions */, 0xf + /* Some newer Windows versions set window coordinates instead of zeros in WINDOWPOS structure */}, + { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0xf }, { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, /* FIXME: remove optional once Wine is fixed */ diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index bbbab60fbe..aad5274973 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1873,6 +1873,18 @@ static UINT SWP_DoNCCalcSize( WINDOWPOS *pWinpos, const RECT *old_window_rect, c params.lppos = &winposCopy; winposCopy = *pWinpos; + if (pWinpos->flags & SWP_NOMOVE) + { + winposCopy.x = old_window_rect->left; + winposCopy.y = old_window_rect->top; + } + + if (pWinpos->flags & SWP_NOSIZE) + { + winposCopy.cx = old_window_rect->right - old_window_rect->left; + winposCopy.cy = old_window_rect->bottom - old_window_rect->top; + } + wvrFlags = SendMessageW( pWinpos->hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params ); *new_client_rect = params.rgrc[0]; -- 2.21.0

2 1

[PATCH v4] dwmapi: Implement DwmIsCompositionEnabled
by Joel Leclerc 17 Oct '19

17 Oct '19

Signed-off-by: Joel Leclerc <meerkatanonymous(a)gmail.com> --- v4: Add dwmapi component name to the commit message, sorry for the noise --- dlls/dwmapi/dwmapi_main.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6378a091f0..812cf4597d 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -51,16 +51,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) { - static int once; - if (!once) - { - FIXME("%p\n", enabled); - once = 1; - } - else - TRACE("%p\n", enabled); + TRACE("%p\n", enabled); - *enabled = FALSE; + *enabled = TRUE; return S_OK; } -- 2.23.0

2 1

[PATCH] oledb32: Support Milliseconds when converting BSTR -> DBTIMESTAMP
by Alistair Leslie-Hughes 17 Oct '19

17 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/convert.c | 30 ++++++++++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 29 +++++++++++++++++++++++++---- 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index a5bbdbc2456..c4ee59996a1 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -30,11 +30,25 @@ #include "oledb_private.h" +#include <stdio.h> #include "wine/debug.h" #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); +static inline char *strdupWtoA( LPCWSTR str ) +{ + LPSTR ret = NULL; + DWORD len; + + if (!str) return ret; + len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); + ret = heap_alloc( len ); + if (ret) + WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); + return ret; +} + typedef struct { IDataConvert IDataConvert_iface; @@ -566,6 +580,22 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, d->second = st.wSecond; d->fraction = st.wMilliseconds * 1000000; } + else + { + char *buff = strdupWtoA(s); + static const char *format = "%d-%d-%d %d:%d:%d.%d"; + + if(sscanf( buff, format, &d->year, &d->month, &d->day, &d->hour, &d->minute, &d->second, &d->fraction) != 7) + { + hr = DISP_E_TYPEMISMATCH; + *dst_status = DBSTATUS_E_CANTCONVERTVALUE; + *dst_len = get_length(dst_type); + } + else + hr = S_OK; + + heap_free(buff); + } VariantClear(&var); } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 51fd2f7fa37..73c9430bfd3 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3919,8 +3919,12 @@ static void test_converttovar(void) static void test_converttotimestamp(void) { static const WCHAR strW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2',0}; + static const WCHAR str1W[] = {'2','0','1','3','/','0','5','/','1','4',' ','0','2','.','0','4','.','1','2',0}; static const WCHAR strFullW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2', '.','0','1','7','0','0','0','0','0','0',0}; + static const WCHAR strFull1W[] = {'2','0','1','3','/','0','5','/','1','4',' ','0','2',':','0','4',':','1','2', + '.','0','1','7',0}; + DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; DBTIMESTAMP ts1 = {2013, 5, 14, 2, 4, 12, 17000000}; DATE date; @@ -3950,13 +3954,30 @@ static void test_converttotimestamp(void) ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); SysFreeString(bstr); + bstr = SysAllocString(str1W); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); + SysFreeString(bstr); + bstr = SysAllocString(strFullW); dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); - todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); - todo_wine ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + SysFreeString(bstr); + + bstr = SysAllocString(strFull1W); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DISP_E_TYPEMISMATCH, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_CANTCONVERTVALUE, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); SysFreeString(bstr); V_VT(&var) = VT_NULL; -- 2.17.1

2 1

[PATCH resend 1/8] advapi32: Replace usage of internal SERV_ functions with exported functions
by Micah N Gorrell 17 Oct '19

17 Oct '19

This is in preparation for moving the services RPC functions into sechost. Signed-off-by: Micah N Gorrell <mgorrell(a)codeweavers.com> --- dlls/advapi32/advapi32_misc.h | 3 --- dlls/advapi32/security.c | 32 +++++++++++++++++++++++++------- dlls/advapi32/service.c | 6 +++--- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 4ced1e8a64..77b56420ba 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -32,9 +32,6 @@ BOOL ADVAPI_GetComputerSid(PSID sid) DECLSPEC_HIDDEN; BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; WCHAR *SERV_dup(const char *str) DECLSPEC_HIDDEN; -DWORD SERV_OpenSCManagerW(LPCWSTR, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; -DWORD SERV_OpenServiceW(SC_HANDLE, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; -NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; /* memory allocation functions */ diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a7707f15d3..74eda93282 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -416,15 +416,19 @@ static inline DWORD get_security_file( LPCWSTR full_file_name, DWORD access, HAN static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access, HANDLE *service ) { SC_HANDLE manager = 0; - DWORD err; - err = SERV_OpenSCManagerW( NULL, NULL, access, (SC_HANDLE *)&manager ); - if (err == ERROR_SUCCESS) + manager = OpenSCManagerW( NULL, NULL, access ); + if (manager) { - err = SERV_OpenServiceW( manager, full_service_name, access, (SC_HANDLE *)service ); + *service = OpenServiceW( manager, full_service_name, access); CloseServiceHandle( manager ); + + if (*service) + { + return ERROR_SUCCESS; + } } - return err; + return GetLastError(); } /* helper function for SE_REGISTRY_KEY objects in [Get|Set]NamedSecurityInfo */ @@ -1804,7 +1808,14 @@ DWORD WINAPI GetSecurityInfo( switch (ObjectType) { case SE_SERVICE: - status = SERV_QueryServiceObjectSecurity(hObject, SecurityInfo, NULL, 0, &n1); + if (QueryServiceObjectSecurity(hObject, SecurityInfo, NULL, 0, &n1)) + { + status = STATUS_SUCCESS; + } + else + { + status = RtlGetLastNtStatus(); + } break; default: status = NtQuerySecurityObject(hObject, SecurityInfo, NULL, 0, &n1); @@ -1820,7 +1831,14 @@ DWORD WINAPI GetSecurityInfo( switch (ObjectType) { case SE_SERVICE: - status = SERV_QueryServiceObjectSecurity(hObject, SecurityInfo, sd, n1, &n2); + if (QueryServiceObjectSecurity(hObject, SecurityInfo, sd, n1, &n2)) + { + status = STATUS_SUCCESS; + } + else + { + status = RtlGetLastNtStatus(); + } break; default: status = NtQuerySecurityObject(hObject, SecurityInfo, sd, n1, &n2); diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 231f0267e9..2781a12823 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -897,7 +897,7 @@ SC_HANDLE WINAPI OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName, * * See OpenSCManagerA. */ -DWORD SERV_OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, +static DWORD SERV_OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, DWORD dwDesiredAccess, SC_HANDLE *handle ) { DWORD r; @@ -1049,7 +1049,7 @@ SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, * * See OpenServiceA. */ -DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, +static DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, DWORD dwDesiredAccess, SC_HANDLE *handle ) { DWORD err; @@ -2484,7 +2484,7 @@ BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, return err == ERROR_SUCCESS; } -NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE hService, +static NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE hService, SECURITY_INFORMATION dwSecurityInformation, PSECURITY_DESCRIPTOR lpSecurityDescriptor, DWORD cbBufSize, LPDWORD pcbBytesNeeded) -- 2.23.0

3 15

[PATCH 2/2] kernelbase: Update SetNamedPipeHandleState debug trace.
by Jacek Caban 17 Oct '19

17 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/sync.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

1 0

[PATCH 1/2] kernel32/tests: Add message mode non-blocking pipe test.
by Jacek Caban 17 Oct '19

17 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-)

1 0

[PATCH] advapi32/tests: Fix test_process_security with non-English locale.
by Gijs Vermeulen 17 Oct '19

17 Oct '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- Fixes https://test.winehq.org/data/6a976801b1117d95128b4c098be1d5e60d4eab83/win8_… dlls/advapi32/tests/security.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index aee4587425..5f65ed385d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3004,7 +3004,10 @@ static void test_process_security(void) ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use ); ok(ret, "LookupAccountSid failed with %d\n", ret); todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use); - todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account); + if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH) + skip("Non-English locale (test with hardcoded 'None')\n"); + else + todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account); res = GetTokenInformation( token, TokenUser, NULL, 0, &size ); ok(!res, "Expected failure, got %d\n", res); -- 2.23.0

1 0

[PATCH] msvcrt: Add Concurrency::details::_Context::_Yield stub.
by Gijs Vermeulen 17 Oct '19

17 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46279 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- This allows Darkest Dungeon and Noita to work. dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/scheduler.c | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 1535456097..9a8ef13aae 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -468,7 +468,7 @@ @ stub -arch=win64 ?_TryAcquireWrite@_ReaderWriterLock@details@Concurrency@@QEAA_NXZ @ stub ?_UnderlyingYield@details@Concurrency@@YAXXZ @ cdecl ?_Value@_SpinCount@details@Concurrency@@SAIXZ() msvcr120.?_Value@_SpinCount@details@Concurrency@@SAIXZ -@ stub ?_Yield@_Context@details@Concurrency@@SAXXZ +@ cdecl ?_Yield@_Context@details@Concurrency@@SAXXZ() msvcr120.?_Yield@_Context@details@Concurrency@@SAXXZ @ stub -arch=i386 ?cancel@agent@Concurrency@@QAE_NXZ @ stub -arch=win64 ?cancel@agent@Concurrency@@QEAA_NXZ @ stub ?current@location@Concurrency@@SA?AV12@XZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4f48997183..af894cc7d4 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -685,7 +685,7 @@ @ stub -arch=win32 ?_ValidateWrite@@YAHPAXI@Z @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI@Z @ cdecl ?_Value@_SpinCount@details@Concurrency@@SAIXZ() SpinCount__Value -@ stub ?_Yield@_Context@details@Concurrency@@SAXXZ +@ cdecl ?_Yield@_Context@details@Concurrency@@SAXXZ() Context_Yield @ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX@Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX@Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z(ptr ptr) __ExceptionPtrCompare diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 19d5bce0d3..0a47f5a925 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -667,7 +667,7 @@ @ stub -arch=win32 ?_ValidateWrite@@YAHPAXI@Z @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI@Z @ cdecl ?_Value@_SpinCount@details@Concurrency@@SAIXZ() SpinCount__Value -@ stub ?_Yield@_Context@details@Concurrency@@SAXXZ +@ cdecl ?_Yield@_Context@details@Concurrency@@SAXXZ() Context_Yield @ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX@Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX@Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z(ptr ptr) __ExceptionPtrCompare diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 538bbfdfa8..d05126f280 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -663,7 +663,7 @@ @ stub -arch=win32 ?_ValidateWrite@@YAHPAXI@Z @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI@Z @ cdecl ?_Value@_SpinCount@details@Concurrency@@SAIXZ() msvcr120.?_Value@_SpinCount@details@Concurrency@@SAIXZ -@ stub ?_Yield@_Context@details@Concurrency@@SAXXZ +@ cdecl ?_Yield@_Context@details@Concurrency@@SAXXZ() msvcr120.?_Yield@_Context@details@Concurrency@@SAXXZ @ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX@Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPAXPBX@Z @ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX@Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPEAXPEBX@Z @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0@Z diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 53a9669fea..08a3242e6b 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -237,6 +237,7 @@ void __cdecl Context_Block(void) } /* ?Yield@Context@Concurrency@@SAXXZ */ +/* ?_Yield@_Context@details@Concurrency@@SAXXZ */ void __cdecl Context_Yield(void) { FIXME("()\n"); -- 2.23.0

2 1

← Newer
1
...
15
16
17
18
19
20
21
...
27
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-devel October 2019