September 2019 - Wine-Commits

Hans Leidekker : bcrypt: Add support for generating RSA keys.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: b2bbb6f48f24ada876f952e9c0921ca584fe307d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2bbb6f48f24ada876f952e9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 23 15:48:51 2019 +0200 bcrypt: Add support for generating RSA keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 4 +- dlls/bcrypt/bcrypt_main.c | 24 +++++++--- dlls/bcrypt/gnutls.c | 101 +++++++++++++++++++++++++++++++++++++++--- dlls/bcrypt/macos.c | 3 +- 4 files changed, 118 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2bbb6f48f24ada876f9…

1 0

Jacek Caban : scrobj: Add scriptlet instance stub implementation.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: 4d368c3dabf4d2003e632d393deb923eb679d8f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d368c3dabf4d2003e632d39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 23 17:54:53 2019 +0200 scrobj: Add scriptlet instance stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 213 ++++++++++++++++++++++++++++++++++++++++++++- dlls/scrobj/tests/scrobj.c | 53 +++++++++-- 2 files changed, 259 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d368c3dabf4d2003e63…

1 0

Jactry Zeng : msscript/tests: Initialize custom engine for global.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: 690ff534161ef5c0b671c05795c801391d59f3bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=690ff534161ef5c0b671c057… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Sep 23 17:17:00 2019 +0800 msscript/tests: Initialize custom engine for global. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 2d500d8308..7a1a0f31f8 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -501,6 +501,8 @@ static BOOL register_script_engine(void) return TRUE; } +static BOOL have_custom_engine; + static HRESULT WINAPI OleClientSite_QueryInterface(IOleClientSite *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IOleClientSite) || IsEqualIID(riid, &IID_IUnknown)) @@ -754,7 +756,7 @@ static void test_Language(void) IScriptControl_Release(sc); /* custom script engine */ - if (register_script_engine()) { + if (have_custom_engine) { static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -786,16 +788,12 @@ static void test_Language(void) IActiveScriptSite_Release(site); - init_registry(FALSE); - SET_EXPECT(Close); IScriptControl_Release(sc); CHECK_CALLED(Close); } - else - skip("Could not register TestScript engine\n"); } static void test_connectionpoints(void) @@ -1055,7 +1053,7 @@ static void test_Reset(void) IScriptControl_Release(sc); /* custom script engine */ - if (register_script_engine()) { + if (have_custom_engine) { static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -1086,16 +1084,12 @@ static void test_Reset(void) CHECK_CALLED(SetScriptSite); IActiveScriptSite_Release(site); - init_registry(FALSE); - SET_EXPECT(Close); IScriptControl_Release(sc); CHECK_CALLED(Close); } - else - skip("Could not register TestScript engine\n"); } static HRESULT WINAPI disp_QI(IDispatch *iface, REFIID riid, void **obj) @@ -1193,7 +1187,7 @@ static void test_AddObject(void) IScriptControl_Release(sc); /* custom script engine */ - if (register_script_engine()) { + if (have_custom_engine) { static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -1225,16 +1219,12 @@ static void test_AddObject(void) CHECK_CALLED(SetScriptSite); IActiveScriptSite_Release(site); - init_registry(FALSE); - SET_EXPECT(Close); IScriptControl_Release(sc); CHECK_CALLED(Close); } - else - skip("Could not register TestScript engine\n"); SysFreeString(objname); } @@ -1502,6 +1492,10 @@ START_TEST(msscript) } IUnknown_Release(unk); + have_custom_engine = register_script_engine(); + if (!have_custom_engine) + skip("Could not register TestScript engine.\n"); + test_oleobject(); test_persiststreaminit(); test_olecontrol(); @@ -1518,5 +1512,7 @@ START_TEST(msscript) test_State(); test_IScriptControl_Eval(); + init_registry(FALSE); + CoUninitialize(); }

1 0

Zebediah Figura : wined3d: Reset the CS state before cleaning up the device state.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: 96547e622b04f403bc0c78d649275d1f844ed40e URL: https://source.winehq.org/git/wine.git/?a=commit;h=96547e622b04f403bc0c78d6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 22 21:19:31 2019 -0500 wined3d: Reset the CS state before cleaning up the device state. Otherwise the CS might later try to unbind a resource that has already been freed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c8fae1275c..62341290ff 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1140,6 +1140,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_texture_decref(texture); } + wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) {

1 0

Zhiyi Zhang : winex11.drv: Initialize display devices before getting primary desktop rectangle.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: efbbe66669a060dd01b3ae399f5a9e7328312f03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efbbe66669a060dd01b3ae39… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Sep 20 16:54:31 2019 +0800 winex11.drv: Initialize display devices before getting primary desktop rectangle. Otherwise, the retrieved primary desktop might be from the last explorer instance if we launch new explorer instances before wine server fully shuts down. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index ecbcd6b381..fed8dd32e9 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -147,15 +147,18 @@ static LONG X11DRV_desktop_SetCurrentMode(int mode) */ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) { - RECT primary_rect = get_primary_monitor_rect(); + RECT primary_rect; root_window = win; managed_mode = FALSE; /* no managed windows in desktop mode */ - max_width = primary_rect.right - primary_rect.left; - max_height = primary_rect.bottom - primary_rect.top; + xinerama_init( width, height ); X11DRV_DisplayDevices_Init( TRUE ); + primary_rect = get_primary_monitor_rect(); + max_width = primary_rect.right - primary_rect.left; + max_height = primary_rect.bottom - primary_rect.top; + /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", X11DRV_desktop_GetCurrentMode,

1 0

Jacek Caban : scrobj: Parse scripts in DllInstall.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: 55e01ac01267ca90b99d26450938fe7d0985ea06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e01ac01267ca90b99d2645… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 23 17:55:04 2019 +0200 scrobj: Parse scripts in DllInstall. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/scrobj/tests/scrobj.c | 2 -- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 32aedcd8f9..6b3b3ea6e8 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -117,6 +117,7 @@ struct script_host IActiveScript *active_script; IActiveScriptParse *parser; + SCRIPTSTATE state; BOOL cloned; }; @@ -204,6 +205,16 @@ static WCHAR *heap_strdupW(const WCHAR *str) return ret; } +static HRESULT set_script_state(struct script_host *host, SCRIPTSTATE state) +{ + HRESULT hres; + if (state == host->state) return S_OK; + hres = IActiveScript_SetScriptState(host->active_script, state); + if (FAILED(hres)) return hres; + host->state = state; + return S_OK; +} + static inline struct script_host *impl_from_IActiveScriptSite(IActiveScriptSite *iface) { return CONTAINING_RECORD(iface, struct script_host, IActiveScriptSite_iface); @@ -437,6 +448,46 @@ static struct script_host *find_script_host(struct list *hosts, const WCHAR *lan return NULL; } +static HRESULT parse_scripts(struct scriptlet_factory *factory, struct list *hosts, BOOL start) +{ + DWORD parse_flags = SCRIPTTEXT_ISVISIBLE; + struct scriptlet_script *script; + struct script_host *host; + HRESULT hres; + + if (!start) parse_flags |= SCRIPTITEM_ISPERSISTENT; + + LIST_FOR_EACH_ENTRY(script, &factory->scripts, struct scriptlet_script, entry) + { + host = find_script_host(hosts, script->language); + + if (start && host->state != SCRIPTSTATE_STARTED) + { + hres = set_script_state(host, SCRIPTSTATE_STARTED); + if (FAILED(hres)) return hres; + } + + if (host->cloned) continue; + + hres = IActiveScriptParse_ParseScriptText(host->parser, script->body, NULL, NULL, NULL, 0, 0 /* FIXME */, + parse_flags, NULL, NULL); + if (FAILED(hres)) + { + WARN("ParseScriptText failed: %08x\n", hres); + return hres; + } + } + if (!start) + { + LIST_FOR_EACH_ENTRY(host, hosts, struct script_host, entry) + { + if (host->state != SCRIPTSTATE_UNINITIALIZED) + set_script_state(host, SCRIPTSTATE_UNINITIALIZED); + } + } + return S_OK; +} + static HRESULT init_script_host(struct script_host *host, IActiveScript *clone) { HRESULT hres; @@ -509,6 +560,7 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s host->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; host->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; host->ref = 1; + host->state = SCRIPTSTATE_CLOSED; if (!(host->language = heap_strdupW(language))) { @@ -533,6 +585,7 @@ static void detach_script_hosts(struct list *hosts) while (!list_empty(hosts)) { struct script_host *host = LIST_ENTRY(list_head(hosts), struct script_host, entry); + if (host->state != SCRIPTSTATE_UNINITIALIZED) set_script_state(host, SCRIPTSTATE_UNINITIALIZED); list_remove(&host->entry); if (host->parser) { @@ -1800,6 +1853,7 @@ HRESULT WINAPI DllInstall(BOOL install, const WCHAR *arg) { /* validate scripts */ hres = create_scriptlet_hosts(factory, &factory->hosts); + if (SUCCEEDED(hres)) hres = parse_scripts(factory, &factory->hosts, FALSE); } else { diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index 9afa11d419..f968fe21ce 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -720,9 +720,7 @@ static void register_script_object(BOOL do_register, const WCHAR *file_name) CHECK_CALLED(QI_IActiveScriptParse); CHECK_CALLED(InitNew); CHECK_CALLED(SetScriptSite); - todo_wine CHECK_CALLED(ParseScriptText); - todo_wine CHECK_CALLED(SetScriptState_UNINITIALIZED); CHECK_CALLED(Close); ok(hres == S_OK, "DllInstall failed: %08x\n", hres);

1 0

Henri Verbeet : wined3d: Use wined3d_context_map_bo_address() in wined3d_buffer_gl_map().
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: 47701b7231c14c9434f2c9f3f8e7bb466deed97a URL: https://source.winehq.org/git/wine.git/?a=commit;h=47701b7231c14c9434f2c9f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 15:12:18 2019 +0330 wined3d: Use wined3d_context_map_bo_address() in wined3d_buffer_gl_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 64 ++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f483c52340..b8c5117f89 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -772,8 +772,9 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) /* The caller provides a context and binds the buffer */ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, - DWORD flags, const struct wined3d_gl_info *gl_info) + uint32_t flags, struct wined3d_context_gl *context_gl) { + const struct wined3d_gl_info *gl_info = context_gl->gl_info; enum wined3d_fence_result ret; HRESULT hr; @@ -784,6 +785,8 @@ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, if (flags & WINED3D_MAP_DISCARD) { + wined3d_buffer_gl_bind(buffer_gl, context_gl); + GL_EXTCALL(glBufferData(buffer_gl->buffer_type_hint, buffer_gl->b.resource.size, NULL, buffer_gl->buffer_object_usage)); checkGLcall("glBufferData"); @@ -834,6 +837,7 @@ drop_fence: } gl_info->gl_ops.gl.p_glFinish(); + wined3d_buffer_gl_bind(buffer_gl, context_gl); GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); checkGLcall("glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); buffer_gl->b.flags &= ~WINED3D_BUFFER_APPLESYNC; @@ -964,7 +968,6 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, unsigned int offset, unsigned int size, BYTE **data, DWORD flags) { struct wined3d_device *device = buffer_gl->b.resource.device; - struct wined3d_context_gl *context_gl; struct wined3d_context *context; LONG count; BYTE *base; @@ -976,6 +979,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (buffer_gl->b.buffer_object) { unsigned int dirty_offset = offset, dirty_size = size; + struct wined3d_bo_address addr; /* DISCARD invalidates the entire buffer, regardless of the specified * offset and size. Some applications also depend on the entire buffer @@ -1003,11 +1007,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, } else { - const struct wined3d_gl_info *gl_info; - context = context_acquire(device, NULL, 0); - context_gl = wined3d_context_gl(context); - gl_info = context_gl->gl_info; if (flags & WINED3D_MAP_DISCARD) wined3d_buffer_validate_location(&buffer_gl->b, WINED3D_LOCATION_BUFFER); @@ -1025,8 +1025,6 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (count == 1) { - wined3d_buffer_gl_bind(buffer_gl, context_gl); - /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 * multitexture fill rate test seems to depend on this. When * we map a buffer with GL_MAP_INVALIDATE_BUFFER_BIT, the @@ -1037,28 +1035,19 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (buffer_gl->b.flags & WINED3D_BUFFER_DISCARD) flags &= ~WINED3D_MAP_DISCARD; - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) - { - GLbitfield mapflags = wined3d_resource_gl_map_flags(flags); - buffer_gl->b.map_ptr = GL_EXTCALL(glMapBufferRange(buffer_gl->buffer_type_hint, - 0, buffer_gl->b.resource.size, mapflags)); - checkGLcall("glMapBufferRange"); - } - else - { - if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) - wined3d_buffer_gl_sync_apple(buffer_gl, flags, gl_info); - buffer_gl->b.map_ptr = GL_EXTCALL(glMapBuffer(buffer_gl->buffer_type_hint, - wined3d_resource_gl_legacy_map_flags(flags))); - checkGLcall("glMapBuffer"); - } + if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) + wined3d_buffer_gl_sync_apple(buffer_gl, flags, wined3d_context_gl(context)); + + addr.buffer_object = buffer_gl->b.buffer_object; + addr.addr = 0; + buffer_gl->b.map_ptr = wined3d_context_map_bo_address(context, &addr, + buffer_gl->b.resource.size, buffer_gl->b.resource.bind_flags, flags); if (((DWORD_PTR)buffer_gl->b.map_ptr) & (RESOURCE_ALIGNMENT - 1)) { WARN("Pointer %p is not %u byte aligned.\n", buffer_gl->b.map_ptr, RESOURCE_ALIGNMENT); - GL_EXTCALL(glUnmapBuffer(buffer_gl->buffer_type_hint)); - checkGLcall("glUnmapBuffer"); + wined3d_context_unmap_bo_address(context, &addr, buffer_gl->b.resource.bind_flags, 0, NULL); buffer_gl->b.map_ptr = NULL; if (buffer_gl->b.resource.usage & WINED3DUSAGE_DYNAMIC) @@ -1122,36 +1111,33 @@ static void wined3d_buffer_gl_unmap(struct wined3d_buffer_gl *buffer_gl) if (buffer_gl->b.map_ptr) { struct wined3d_device *device = buffer_gl->b.resource.device; + unsigned int range_count = buffer_gl->b.modified_areas; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; + struct wined3d_bo_address addr; context = context_acquire(device, NULL, 0); context_gl = wined3d_context_gl(context); gl_info = context_gl->gl_info; - wined3d_buffer_gl_bind(buffer_gl, context_gl); - - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) { - for (i = 0; i < buffer_gl->b.modified_areas; ++i) - { - GL_EXTCALL(glFlushMappedBufferRange(buffer_gl->buffer_type_hint, - buffer_gl->b.maps[i].offset, buffer_gl->b.maps[i].size)); - checkGLcall("glFlushMappedBufferRange"); - } - } - else if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) - { - for (i = 0; i < buffer_gl->b.modified_areas; ++i) + wined3d_buffer_gl_bind(buffer_gl, context_gl); + for (i = 0; i < range_count; ++i) { GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->buffer_type_hint, buffer_gl->b.maps[i].offset, buffer_gl->b.maps[i].size)); checkGLcall("glFlushMappedBufferRangeAPPLE"); } + range_count = 0; } - GL_EXTCALL(glUnmapBuffer(buffer_gl->buffer_type_hint)); + addr.buffer_object = buffer_gl->b.buffer_object; + addr.addr = 0; + wined3d_context_unmap_bo_address(context, &addr, + buffer_gl->b.resource.bind_flags, range_count, buffer_gl->b.maps); + context_release(context); buffer_clear_dirty_areas(&buffer_gl->b);

1 0

Francois Gouget : kernel32/tests: Fix the spelling of three ok() messages and comments.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: 98093939d63eca5de5ccc8267a4bb1c25d868915 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98093939d63eca5de5ccc826… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 22 23:22:25 2019 +0200 kernel32/tests: Fix the spelling of three ok() messages and comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/comm.c | 2 +- dlls/kernel32/tests/debugger.c | 2 +- dlls/kernel32/tests/file.c | 2 +- dlls/kernel32/tests/path.c | 4 ++-- dlls/kernel32/tests/pipe.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 97a71358fe..97da932d6c 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -725,7 +725,7 @@ static HANDLE test_OpenComm(BOOL doOverlap) ok(ret, "Unexpected error %u on open\n", GetLastError()); ok(comstat.cbInQue == 0, "Unexpected %d chars in InQueue\n",comstat.cbInQue); - ok(comstat.cbOutQue == 0, "Still pending %d charcters in OutQueue\n", comstat.cbOutQue); + ok(comstat.cbOutQue == 0, "Still pending %d characters in OutQueue\n", comstat.cbOutQue); ok(errors == 0, "Unexpected errors 0x%08x\n", errors); } return hcom; diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 93d12a56eb..8148c396d0 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -170,7 +170,7 @@ static void run_background_thread(void) { DWORD tid; HANDLE thread = CreateThread(NULL, 0, thread_proc, NULL, 0, &tid); - ok(thread != NULL, "CreateThrad failed\n"); + ok(thread != NULL, "CreateThread failed\n"); CloseHandle(thread); } diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 9be4ecd136..5bd168276f 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5229,7 +5229,7 @@ static void test_overlapped_read(void) DWORD ret; ret = GetTempPathA(MAX_PATH, temp_path); - ok(ret, "Unexpect error %u.\n", GetLastError()); + ok(ret, "Unexpected error %u.\n", GetLastError()); ret = GetTempFileNameA(temp_path, prefix, 0, file_name); ok(ret, "Unexpected error %u.\n", GetLastError()); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 60cd26dd60..028853f605 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -309,7 +309,7 @@ static void test_setdir(CHAR *olddir,CHAR *newdir, ok(SetCurrentDirectoryA(olddir), "%s: Couldn't set directory to its original value\n",errstr); } else { -/* else thest that it fails correctly */ +/* else test that it fails correctly */ chklen=lstrlenA(olddir); ok(val==0, "%s: SetCurrentDirectoryA passed when it should have failed\n",errstr); @@ -517,7 +517,7 @@ static void test_CurrentDirectoryA(CHAR *origdir, CHAR *newdir) /* Check that SetCurrentDirectory fails when a nonexistent dir is specified */ sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,NONDIR_SHORT); test_setdir(newdir,tmpstr,NULL,0,"check 3"); -/* Check that SetCurrentDirectory fails for a nonexistent lond directory */ +/* Check that SetCurrentDirectory fails for a nonexistent long directory */ sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,NONDIR_LONG); test_setdir(newdir,tmpstr,NULL,0,"check 4"); /* Check that SetCurrentDirectory passes with a long directory */ diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 11605c2ece..f61d441303 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3071,7 +3071,7 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL test_overlapped_result(writer, &write_overlapped2, 1, FALSE); test_peek_pipe(reader, 0, 0, 0); - /* same as above, but parially read written data before canceling */ + /* same as above, but partially read written data before canceling */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); overlapped_write_async(writer, buf, 1, &write_overlapped2); test_peek_pipe(reader, buf_size + 2000 + (msg_mode ? 0 : 1),

1 0

Francois Gouget : kernel32/tests: Fix the spelling of the exerciseServer() function name.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: 17fbd837e280603211ac3f1dad746c778294bb64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17fbd837e280603211ac3f1d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 22 23:21:01 2019 +0200 kernel32/tests: Fix the spelling of the exerciseServer() function name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index cab069d68b..11605c2ece 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1343,11 +1343,11 @@ static DWORD CALLBACK serverThreadMain5(LPVOID arg) return 0; } -static void exercizeServer(const char *pipename, HANDLE serverThread) +static void exerciseServer(const char *pipename, HANDLE serverThread) { int i; - if (winetest_debug > 1) trace("exercizeServer starting\n"); + if (winetest_debug > 1) trace("exerciseServer starting\n"); for (i = 0; i < NB_SERVER_LOOPS; i++) { HANDLE hFile=INVALID_HANDLE_VALUE; static const char obuf[] = "Bit Bucket"; @@ -1390,7 +1390,7 @@ static void exercizeServer(const char *pipename, HANDLE serverThread) ok(WaitForSingleObject(serverThread,INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject\n"); CloseHandle(hnp); - if (winetest_debug > 1) trace("exercizeServer returning\n"); + if (winetest_debug > 1) trace("exerciseServer returning\n"); } static void test_NamedPipe_2(void) @@ -1416,31 +1416,31 @@ static void test_NamedPipe_2(void) SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain1, (void *)8, 0, &serverThreadId); ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); - exercizeServer(PIPENAME "serverThreadMain1", serverThread); + exerciseServer(PIPENAME "serverThreadMain1", serverThread); /* Try server #2 */ SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain2, 0, 0, &serverThreadId); ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); - exercizeServer(PIPENAME "serverThreadMain2", serverThread); + exerciseServer(PIPENAME "serverThreadMain2", serverThread); /* Try server #3 */ SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain3, 0, 0, &serverThreadId); ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); - exercizeServer(PIPENAME "serverThreadMain3", serverThread); + exerciseServer(PIPENAME "serverThreadMain3", serverThread); /* Try server #4 */ SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain4, 0, 0, &serverThreadId); ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); - exercizeServer(PIPENAME "serverThreadMain4", serverThread); + exerciseServer(PIPENAME "serverThreadMain4", serverThread); /* Try server #5 */ SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain5, 0, 0, &serverThreadId); ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); - exercizeServer(PIPENAME "serverThreadMain5", serverThread); + exerciseServer(PIPENAME "serverThreadMain5", serverThread); ok(SetEvent( alarm_event ), "SetEvent\n"); CloseHandle( alarm_event );

1 0

Alex Henrie : include: Rename Reserved1 to SystemStatusFlag in SYSTEM_POWER_STATUS.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: 7c5ea436af8a6b5a3d2b095bd4697f10b6f78acc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c5ea436af8a6b5a3d2b095b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 22 15:12:09 2019 -0600 include: Rename Reserved1 to SystemStatusFlag in SYSTEM_POWER_STATUS. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/powermgnt.c | 2 +- dlls/kernel32/tests/generated.c | 12 ++++++------ include/winbase.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 190dc016c3..7efd84d410 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -52,7 +52,7 @@ BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS ps) ps->ACLineStatus = 255; ps->BatteryFlag = 255; ps->BatteryLifePercent = 255; - ps->Reserved1 = 0; + ps->SystemStatusFlag = 0; ps->BatteryLifeTime = ~0u; ps->BatteryFullLifeTime = ~0u; return TRUE; diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c index 36053b8491..ae1f96613a 100644 --- a/dlls/kernel32/tests/generated.c +++ b/dlls/kernel32/tests/generated.c @@ -1755,9 +1755,9 @@ static void test_pack_SYSTEM_POWER_STATUS(void) TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, BatteryLifePercent, 1) TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifePercent, 1) TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifePercent, 2) - TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, Reserved1, 1) - TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, Reserved1, 1) - TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, Reserved1, 3) + TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, SystemStatusFlag, 1) + TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, SystemStatusFlag, 1) + TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, SystemStatusFlag, 3) TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, BatteryLifeTime, 4) TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifeTime, 4) TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifeTime, 4) @@ -3612,9 +3612,9 @@ static void test_pack_SYSTEM_POWER_STATUS(void) TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, BatteryLifePercent, 1) TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifePercent, 1) TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifePercent, 2) - TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, Reserved1, 1) - TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, Reserved1, 1) - TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, Reserved1, 3) + TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, SystemStatusFlag, 1) + TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, SystemStatusFlag, 1) + TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, SystemStatusFlag, 3) TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, BatteryLifeTime, 4) TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifeTime, 4) TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifeTime, 4) diff --git a/include/winbase.h b/include/winbase.h index 3a213df4e4..33a2f3e45a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -961,7 +961,7 @@ typedef struct _SYSTEM_POWER_STATUS BYTE ACLineStatus; BYTE BatteryFlag; BYTE BatteryLifePercent; - BYTE Reserved1; + BYTE SystemStatusFlag; DWORD BatteryLifeTime; DWORD BatteryFullLifeTime; } SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS;

1 0