March 2018 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_load_drawable().
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 798439ba31ee155f88b25f31bcd13f7bcf078698 URL: https://source.winehq.org/git/wine.git/?a=commit;h=798439ba31ee155f88b25f31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 6 10:26:29 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_load_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 24d1f59..1824a98 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2106,12 +2106,11 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res } /* Context activation is done by the caller. */ -BOOL surface_load_drawable(struct wined3d_surface *surface, - struct wined3d_context *context) +BOOL texture2d_load_drawable(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context) { - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; struct wined3d_surface *restore_rt = NULL; + struct wined3d_surface *surface; struct wined3d_device *device; unsigned int level; RECT r; @@ -2127,11 +2126,12 @@ BOOL surface_load_drawable(struct wined3d_surface *surface, if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && wined3d_resource_is_offscreen(&texture->resource)) { - ERR("Trying to load offscreen surface into WINED3D_LOCATION_DRAWABLE.\n"); + ERR("Trying to load offscreen texture into WINED3D_LOCATION_DRAWABLE.\n"); return FALSE; } device = texture->resource.device; + surface = texture->sub_resources[sub_resource_idx].u.surface; restore_rt = context_get_rt_surface(context); if (restore_rt != surface) context = context_acquire(device, texture, sub_resource_idx); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0368550..9add4a3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1806,7 +1806,7 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in return texture2d_load_sysmem(texture, sub_resource_idx, context, location); case WINED3D_LOCATION_DRAWABLE: - return surface_load_drawable(surface, context); + return texture2d_load_drawable(texture, sub_resource_idx, context); case WINED3D_LOCATION_RB_RESOLVED: case WINED3D_LOCATION_RB_MULTISAMPLE: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f0e7680..d2addfb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3234,6 +3234,8 @@ static inline unsigned int wined3d_texture_get_level_pow2_height(const struct wi return max(1, texture->pow2_height >> level); } +BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; @@ -3340,8 +3342,6 @@ static inline struct wined3d_texture_sub_resource *surface_get_sub_resource(stru HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -BOOL surface_load_drawable(struct wined3d_surface *surface, - struct wined3d_context *context) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL surface_load_renderbuffer(struct wined3d_surface *surface,

1 0

Henri Verbeet : usp10: Use heap_calloc() in ScriptShape().
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 315be161ce0ae73775085c1bae6bacdbf3432349 URL: https://source.winehq.org/git/wine.git/?a=commit;h=315be161ce0ae73775085c1b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 6 10:26:30 2018 +0330 usp10: Use heap_calloc() in ScriptShape(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 411d19f..983eb83 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3333,10 +3333,10 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, if (!psva || !pcGlyphs) return E_INVALIDARG; if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; - charProps = heap_alloc_zero(sizeof(SCRIPT_CHARPROP)*cChars); - if (!charProps) return E_OUTOFMEMORY; - glyphProps = heap_alloc_zero(sizeof(SCRIPT_GLYPHPROP)*cMaxGlyphs); - if (!glyphProps) + if (!(charProps = heap_calloc(cChars, sizeof(*charProps)))) + return E_OUTOFMEMORY; + + if (!(glyphProps = heap_calloc(cMaxGlyphs, sizeof(*glyphProps)))) { heap_free(charProps); return E_OUTOFMEMORY;

1 0

Dmitry Timoshkov : taskschd: Implement IExecAction::put_WorkingDirectory.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 6dbee463a797b3e24bc96a2bc7e04b299036750b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dbee463a797b3e24bc96a2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 6 11:32:55 2018 +0800 taskschd: Implement IExecAction::put_WorkingDirectory. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index a8b819c..f7ea013 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1677,6 +1677,7 @@ typedef struct IExecAction IExecAction_iface; LONG ref; WCHAR *path; + WCHAR *directory; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1699,6 +1700,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) { TRACE("destroying %p\n", iface); heap_free(action->path); + heap_free(action->directory); heap_free(action); } @@ -1824,8 +1826,16 @@ static HRESULT WINAPI ExecAction_get_WorkingDirectory(IExecAction *iface, BSTR * static HRESULT WINAPI ExecAction_put_WorkingDirectory(IExecAction *iface, BSTR directory) { - FIXME("%p,%s: stub\n", iface, debugstr_w(directory)); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(directory)); + + if (directory && !(str = heap_strdupW((directory)))) return E_OUTOFMEMORY; + heap_free(action->directory); + action->directory = str; + + return S_OK; } static const IExecActionVtbl Action_vtbl = @@ -1858,6 +1868,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->IExecAction_iface.lpVtbl = &Action_vtbl; action->ref = 1; action->path = NULL; + action->directory = NULL; *obj = &action->IExecAction_iface;

1 0

Dmitry Timoshkov : taskschd: Implement IExecAction::get_WorkingDirectory.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 439a4b1ee1c5e2f3e6d505f92a84dbe63779708f URL: https://source.winehq.org/git/wine.git/?a=commit;h=439a4b1ee1c5e2f3e6d505f9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 6 11:32:58 2018 +0800 taskschd: Implement IExecAction::get_WorkingDirectory. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index f7ea013..2b0283e 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1820,8 +1820,16 @@ static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR argument static HRESULT WINAPI ExecAction_get_WorkingDirectory(IExecAction *iface, BSTR *directory) { - FIXME("%p,%p: stub\n", iface, directory); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, directory); + + if (!directory) return E_POINTER; + + if (!action->directory) *directory = NULL; + else if (!(*directory = SysAllocString(action->directory))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI ExecAction_put_WorkingDirectory(IExecAction *iface, BSTR directory)

1 0

Dmitry Timoshkov : taskschd: Implement IExecAction::put_Arguments.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: daf2d98e683a9fd2bd0410b4a0c57c5d196e2862 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daf2d98e683a9fd2bd0410b4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 6 11:33:00 2018 +0800 taskschd: Implement IExecAction::put_Arguments. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 2b0283e..a4cc3be 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1678,6 +1678,7 @@ typedef struct LONG ref; WCHAR *path; WCHAR *directory; + WCHAR *args; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1701,6 +1702,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) TRACE("destroying %p\n", iface); heap_free(action->path); heap_free(action->directory); + heap_free(action->args); heap_free(action); } @@ -1814,7 +1816,15 @@ static HRESULT WINAPI ExecAction_get_Arguments(IExecAction *iface, BSTR *argumen static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR arguments) { - FIXME("%p,%s: stub\n", iface, debugstr_w(arguments)); + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(arguments)); + + if (arguments && !(str = heap_strdupW((arguments)))) return E_OUTOFMEMORY; + heap_free(action->args); + action->args = str; + return S_OK; } @@ -1877,6 +1887,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->ref = 1; action->path = NULL; action->directory = NULL; + action->args = NULL; *obj = &action->IExecAction_iface;

1 0

Dmitry Timoshkov : taskschd: Implement IExecAction::get_Arguments.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 1884714569b0121bb8c7eda928211ca9d4123923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1884714569b0121bb8c7eda9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 6 11:33:02 2018 +0800 taskschd: Implement IExecAction::get_Arguments. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index a4cc3be..1b6a701 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1810,8 +1810,16 @@ static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) static HRESULT WINAPI ExecAction_get_Arguments(IExecAction *iface, BSTR *arguments) { - FIXME("%p,%p: stub\n", iface, arguments); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, arguments); + + if (!arguments) return E_POINTER; + + if (!action->args) *arguments = NULL; + else if (!(*arguments = SysAllocString(action->args))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR arguments)

1 0

Dmitry Timoshkov : taskschd/tests: Add more tests for actions.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 2c925f2320f1b0716a7f3730b71db9317e539887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c925f2320f1b0716a7f3730… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 6 11:33:05 2018 +0800 taskschd/tests: Add more tests for actions. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/tests/scheduler.c | 55 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c60fd1d..80bc1c9 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1304,6 +1304,8 @@ static void test_daily_trigger(ITrigger *trigger) static void create_action(ITaskDefinition *taskdef) { static WCHAR task1_exe[] = { 't','a','s','k','1','.','e','x','e',0 }; + static WCHAR workdir[] = { 'w','o','r','k','d','i','r',0 }; + static WCHAR args[] = { 'a','r','g','u','m','e','n','s',0 }; HRESULT hr; IActionCollection *actions; IAction *action; @@ -1311,6 +1313,9 @@ static void create_action(ITaskDefinition *taskdef) TASK_ACTION_TYPE type; BSTR path; + hr = ITaskDefinition_get_Actions(taskdef, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + hr = ITaskDefinition_get_Actions(taskdef, &actions); ok(hr == S_OK, "get_Actions error %#x\n", hr); @@ -1325,11 +1330,17 @@ static void create_action(ITaskDefinition *taskdef) ok(hr == S_OK, "get_Type error %#x\n", hr); ok(type == TASK_ACTION_EXEC, "got %u\n", type ); + hr = IExecAction_get_Path(exec_action, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + path = (BSTR)0xdeadbeef; hr = IExecAction_get_Path(exec_action, &path); ok(hr == S_OK, "get_Path error %#x\n", hr); ok(path == NULL, "path not set\n"); + hr = IExecAction_put_Path(exec_action, NULL); + ok(hr == S_OK, "put_Path error %#x\n", hr); + hr = IExecAction_put_Path(exec_action, task1_exe); ok(hr == S_OK, "put_Path error %#x\n", hr); @@ -1337,7 +1348,49 @@ static void create_action(ITaskDefinition *taskdef) hr = IExecAction_get_Path(exec_action, &path); ok(hr == S_OK, "get_Path error %#x\n", hr); ok(path != NULL, "path not set\n"); - ok(!lstrcmpW(path, task1_exe), "wrong path\n" ); + ok(!lstrcmpW(path, task1_exe), "got %s\n", wine_dbgstr_w(path)); + SysFreeString(path); + + hr = IExecAction_get_WorkingDirectory(exec_action, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + + path = (BSTR)0xdeadbeef; + hr = IExecAction_get_WorkingDirectory(exec_action, &path); + ok(hr == S_OK, "get_WorkingDirectory error %#x\n", hr); + ok(path == NULL, "workdir not set\n"); + + hr = IExecAction_put_WorkingDirectory(exec_action, NULL); + ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + + hr = IExecAction_put_WorkingDirectory(exec_action, workdir); + ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + + path = NULL; + hr = IExecAction_get_WorkingDirectory(exec_action, &path); + ok(hr == S_OK, "get_WorkingDirectory error %#x\n", hr); + ok(path != NULL, "workdir not set\n"); + ok(!lstrcmpW(path, workdir), "got %s\n", wine_dbgstr_w(path)); + SysFreeString(path); + + hr = IExecAction_get_Arguments(exec_action, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + + path = (BSTR)0xdeadbeef; + hr = IExecAction_get_Arguments(exec_action, &path); + ok(hr == S_OK, "get_Arguments error %#x\n", hr); + ok(path == NULL, "args not set\n"); + + hr = IExecAction_put_Arguments(exec_action, NULL); + ok(hr == S_OK, "put_Arguments error %#x\n", hr); + + hr = IExecAction_put_Arguments(exec_action, args); + ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + + path = NULL; + hr = IExecAction_get_Arguments(exec_action, &path); + ok(hr == S_OK, "get_Arguments error %#x\n", hr); + ok(path != NULL, "args not set\n"); + ok(!lstrcmpW(path, args), "got %s\n", wine_dbgstr_w(path)); SysFreeString(path); IExecAction_Release(exec_action);

1 0

Zhiyi Zhang : kernel32: Fix handling lines with only values in GetPrivateProfileSection.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: aa16304c191ab19a60577f02f42b904df584acaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa16304c191ab19a60577f02… Author: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Date: Tue Mar 6 16:13:20 2018 +0800 kernel32: Fix handling lines with only values in GetPrivateProfileSection. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 2 +- dlls/kernel32/tests/profile.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 721808c..0974aaf 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -879,7 +879,7 @@ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, for (key = section->key; key; key = key->next) { if (len <= 2) break; - if (!*key->name) continue; /* Skip empty lines */ + if (!*key->name && !key->value) continue; /* Skip empty lines */ if (IS_ENTRY_COMMENT(key->name)) continue; /* Skip comments */ if (!return_values && !key->value) continue; /* Skip lines w.o. '=' */ PROFILE_CopyEntry( buffer, key->name, len - 1, 0 ); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 17ba124..64ffc17 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -171,7 +171,7 @@ static void test_profile_sections(void) DWORD count; char buf[100]; char *p; - static const char content[]="[section1]\r\nname1=val1\r\nname2=\r\nname3\r\nname4=val4\r\n[section2]\r\n"; + static const char content[]="[section1]\r\nname1=val1\r\nname2=\r\nname3\r\nname4=val4\r\n[section2]\r\n[section3]\r\n=val5\r\n"; static const char testfile4[]=".\\testwine4.ini"; BOOL on_win98 = FALSE; @@ -241,6 +241,19 @@ static void test_profile_sections(void) broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ "expected ERROR_SUCCESS, got %d\n", GetLastError()); + /* Existing section with no keys but has values */ + SetLastError(0xdeadbeef); + ret=GetPrivateProfileSectionA("section3", buf, sizeof(buf), testfile4); + trace("section3 return: %s\n", buf); + for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1) + p[-1] = ','; + ok( ret == 6 && !strcmp( buf, "=val5"), "wrong section returned(%d): %s\n", + ret, buf); + ok( buf[ret-1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); + ok( GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "expected ERROR_SUCCESS, got %d\n", GetLastError()); + /* Overflow*/ ret=GetPrivateProfileSectionA("section1", buf, 24, testfile4); for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1)

1 0

Alistair Leslie-Hughes : kernel32: Add SetUmsThreadInformation stub.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: 408500115d927ff34db488f6c16a7cb2ecf6260e URL: https://source.winehq.org/git/wine.git/?a=commit;h=408500115d927ff34db488f6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 04:00:08 2018 +0000 kernel32: Add SetUmsThreadInformation stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 11 +++++++++++ include/winbase.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e358075..b30db7b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1464,7 +1464,7 @@ @ stdcall SetThreadpoolWait(ptr long ptr) @ stdcall SetTimeZoneInformation(ptr) @ stub SetTimerQueueTimer -# @ stub -arch=x86_64 SetUmsThreadInformation +@ stdcall -arch=x86_64 SetUmsThreadInformation(ptr long ptr long) @ stdcall SetUnhandledExceptionFilter(ptr) @ stdcall SetUserGeoID(long) @ stub SetVDMCurrentDirectories diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b26fb93..3526b97 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4343,6 +4343,17 @@ BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS cl return FALSE; } +/*********************************************************************** + * SetUmsThreadInformation (KERNEL32.@) + */ +BOOL WINAPI SetUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS class, + void *buf, ULONG length) +{ + FIXME( "%p,%08x,%p,%08x: stub\n", ctx, class, buf, length ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index cff15b0..d4b23dd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2620,6 +2620,7 @@ WINBASEAPI BOOL WINAPI SetVolumeMountPointW(LPCWSTR,LPCWSTR); #define SetVolumeMountPoint WINELIB_NAME_AW(SetVolumeMountPoint) WINBASEAPI BOOL WINAPI SetWaitableTimer(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,LPVOID,BOOL); WINBASEAPI BOOL WINAPI SetWaitableTimerEx(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,LPVOID,REASON_CONTEXT*,ULONG); +WINBASEAPI BOOL WINAPI SetUmsThreadInformation(PUMS_CONTEXT,UMS_THREAD_INFO_CLASS,void *,ULONG); WINBASEAPI BOOL WINAPI SetupComm(HANDLE,DWORD,DWORD); WINBASEAPI DWORD WINAPI SignalObjectAndWait(HANDLE,HANDLE,DWORD,BOOL); WINBASEAPI DWORD WINAPI SizeofResource(HMODULE,HRSRC);

1 0

Alistair Leslie-Hughes : kernel32: Add UmsThreadYield stub.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: aca044139d397d114a137d18a5a14bfbabb693b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aca044139d397d114a137d18… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 04:00:09 2018 +0000 kernel32: Add UmsThreadYield stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b30db7b..60809f4 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1524,7 +1524,7 @@ # @ stub -arch=x86_64 uaw_wcsicmp # @ stub -arch=x86_64 uaw_wcslen # @ stub -arch=x86_64 uaw_wcsrchr -# @ stub -arch=x86_64 UmsThreadYield +@ stdcall -arch=x86_64 UmsThreadYield(ptr) # @ stub -arch=x86_64 __misaligned_access @ stdcall -i386 -private UTRegister(long str str str ptr ptr ptr) krnl386.exe16.UTRegister @ stdcall -i386 -private UTUnRegister(long) krnl386.exe16.UTUnRegister diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 3526b97..4798100 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4354,6 +4354,16 @@ BOOL WINAPI SetUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS clas return FALSE; } +/*********************************************************************** + * UmsThreadYield (KERNEL32.@) + */ +BOOL WINAPI UmsThreadYield(void *param) +{ + FIXME( "%p: stub\n", param ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index d4b23dd..c99993a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2654,6 +2654,7 @@ WINBASEAPI BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED #define UnlockResource(handle) ((handle), 0) #define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle)) WINBASEAPI BOOL WINAPI UnmapViewOfFile(LPCVOID); +WINBASEAPI BOOL WINAPI UmsThreadYield(void *); WINBASEAPI HRESULT WINAPI UnregisterApplicationRestart(void); WINBASEAPI BOOL WINAPI UnregisterWait(HANDLE); WINBASEAPI BOOL WINAPI UnregisterWaitEx(HANDLE,HANDLE);

1 0