July 2015 - Wine-commits - list.winehq.org

Aaryaman Vasishta : d3drm/tests: Add version specific tests for CreateDeviceFrom* methods.
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: 59e41ab912cd1492131f5484572d55dcb8a954d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e41ab912cd1492131f54845… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Jul 30 17:04:33 2015 +0530 d3drm/tests: Add version specific tests for CreateDeviceFrom* methods. --- dlls/d3drm/tests/d3drm.c | 1452 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 1266 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59e41ab912cd1492131f5…

1 0

Jacek Caban : widl: Renamed --rt option to --winrt for midl compatibility.
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: fc761cb9352d185d1fe009c08a083aa63c5e814a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc761cb9352d185d1fe009c08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 30 14:14:57 2015 +0200 widl: Renamed --rt option to --winrt for midl compatibility. --- tools/widl/parser.l | 2 +- tools/widl/widl.c | 8 ++++---- tools/widl/widl.h | 2 +- tools/widl/widl.man.in | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index b911186..b4f2af5 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -419,7 +419,7 @@ static int kw_token(const char *kw) struct keyword key, *kwp; key.kw = kw; kwp = bsearch(&key, keywords, NKEYWORDS, sizeof(keywords[0]), kw_cmp_func); - if (kwp && (do_rt_extension || kwp->token != tNAMESPACE)) { + if (kwp && (winrt_mode || kwp->token != tNAMESPACE)) { parser_lval.str = xstrdup(kwp->kw); return kwp->token; } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index eace69f..788c45e 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -72,7 +72,7 @@ static const char usage[] = " --prefix-client=p Prefix names of client stubs with 'p'\n" " --prefix-server=p Prefix names of server functions with 'p'\n" " -r Generate registration script\n" -" --rt Enable WinRT's language extensions for IDL\n" +" --winrt Enable Windows Runtime mode\n" " -s Generate server stub\n" " -t Generate typelib\n" " -u Generate interface identifiers file\n" @@ -114,7 +114,7 @@ int do_win32 = 1; int do_win64 = 1; int win32_packing = 8; int win64_packing = 8; -int do_rt_extension = 0; +int winrt_mode = 0; static enum stub_mode stub_mode = MODE_Os; char *input_name; @@ -175,7 +175,7 @@ static const struct option long_options[] = { { "prefix-all", 1, NULL, PREFIX_ALL_OPTION }, { "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, NULL, PREFIX_SERVER_OPTION }, - { "rt", 0, NULL, RT_OPTION }, + { "winrt", 0, NULL, RT_OPTION }, { "win32", 0, NULL, WIN32_OPTION }, { "win64", 0, NULL, WIN64_OPTION }, { "win32-align", 1, NULL, WIN32_ALIGN_OPTION }, @@ -578,7 +578,7 @@ int main(int argc,char *argv[]) fprintf(stderr, "%s", usage); return 0; case RT_OPTION: - do_rt_extension = 1; + winrt_mode = 1; break; case WIN32_OPTION: do_win32 = 1; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 9e09f76..d046f28 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -49,7 +49,7 @@ extern int do_win32; extern int do_win64; extern int win32_packing; extern int win64_packing; -extern int do_rt_extension; +extern int winrt_mode; extern char *input_name; extern char *input_idl_name; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 3ee5403..179ffba 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -83,8 +83,8 @@ Only generate 32-bit or 64-bit code respectively (the default is to generate both 32-bit and 64-bit versions into the same destination file). .PP -.IP "\fB--rt\fR" -Enable additional language extensions for IDL to support WinRT. +.IP "\fB--winrt\fR" +Enable Windows Runtime mode. .PP .B Registration script options: .IP "\fB-r\fR"

1 0

Piotr Caban : ole32: Don' t pump all messages in CoWaitForMultipleHandles in threads without apartment window.
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: fbf7046ae86f03b839c414748af8c0259dcdff8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf7046ae86f03b839c414748… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 30 17:02:51 2015 +0200 ole32: Don't pump all messages in CoWaitForMultipleHandles in threads without apartment window. --- dlls/ole32/compobj.c | 2 +- dlls/ole32/tests/compobj.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 762f011..6a30d7d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4388,7 +4388,7 @@ HRESULT WINAPI CoRevertToSelf(void) static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) { /* first try to retrieve messages for incoming COM calls to the apartment window */ - return PeekMessageW(msg, apt->win, 0, 0, PM_REMOVE|PM_NOYIELD) || + return (apt->win && PeekMessageW(msg, apt->win, 0, 0, PM_REMOVE|PM_NOYIELD)) || /* next retrieve other messages necessary for the app to remain responsive */ PeekMessageW(msg, NULL, WM_DDE_FIRST, WM_DDE_LAST, PM_REMOVE|PM_NOYIELD) || PeekMessageW(msg, NULL, 0, 0, PM_QS_PAINT|PM_QS_SENDMESSAGE|PM_REMOVE|PM_NOYIELD); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index c96d63a..1dc3af0 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2126,9 +2126,45 @@ static DWORD CALLBACK post_message_thread(LPVOID arg) return 0; } +static const char cls_name[] = "cowait_test_class"; +static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) +{ + HANDLE *handles = arg; + BOOL success; + DWORD index; + HRESULT hr; + HWND hWnd; + MSG msg; + + hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); + + hWnd = CreateWindowExA(0, cls_name, "Test (thread)", WS_TILEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); + ok(hWnd != 0, "CreateWindowExA failed %u\n", GetLastError()); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected S_OK, got 0x%08x\n", hr); + ok(index == 0, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_USER, 0, 0); + hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected S_OK, got 0x%08x\n", hr); + ok(index == 0, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_USER, WM_USER, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + + DestroyWindow(hWnd); + CoUninitialize(); + return 0; +} + static void test_CoWaitForMultipleHandles(void) { - static const char cls_name[] = "cowait_test_class"; HANDLE handles[2], thread; DWORD index, tid; WNDCLASSEXA wc; @@ -2431,6 +2467,12 @@ static void test_CoWaitForMultipleHandles(void) CloseHandle(thread); } + /* test message pumping when CoWaitForMultipleHandles is called from non main apartment thread */ + thread = CreateThread(NULL, 0, test_CoWaitForMultipleHandles_thread, handles, 0, &tid); + index = WaitForSingleObject(thread, 500); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + CloseHandle(handles[0]); CloseHandle(handles[1]); DestroyWindow(hWnd);

1 0

Andrew Eikum : x3daudio1_7: Stub X3DAudioInitialize.
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: f529a5aaae85329f3a148943191be8bcbba2c51e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f529a5aaae85329f3a1489431… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jul 30 10:58:46 2015 -0500 x3daudio1_7: Stub X3DAudioInitialize. --- dlls/x3daudio1_7/main.c | 10 ++++++++++ dlls/x3daudio1_7/x3daudio1_7.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/x3daudio1_7/main.c b/dlls/x3daudio1_7/main.c index 672cb1c..2488e03 100644 --- a/dlls/x3daudio1_7/main.c +++ b/dlls/x3daudio1_7/main.c @@ -21,6 +21,10 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(x3daudio); + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason) @@ -34,3 +38,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, void *handle) +{ + FIXME("0x%x, %f, %p: Stub!\n", chanmask, speedofsound, handle); + return S_OK; +} diff --git a/dlls/x3daudio1_7/x3daudio1_7.spec b/dlls/x3daudio1_7/x3daudio1_7.spec index 9a51f1b..2b93838 100644 --- a/dlls/x3daudio1_7/x3daudio1_7.spec +++ b/dlls/x3daudio1_7/x3daudio1_7.spec @@ -1,2 +1,2 @@ @ stub X3DAudioCalculate -@ stub X3DAudioInitialize +@ cdecl X3DAudioInitialize(long float ptr)

1 0

Stefan Dösinger : wined3d: Try to detect the polygon offset scale value.
by Alexandre Julliard 30 Jul '15

30 Jul '15

Module: wine Branch: master Commit: 34d8b987c493544f640bf5ca0a5a6cbb3d3f4e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d8b987c493544f640bf5ca0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 30 18:50:15 2015 +0200 wined3d: Try to detect the polygon offset scale value. FEAR draws the same geometry twice, the second time using zfunc=equal. In both cases it sets a huge depth bias of -0.5, presumably to get better precision for the fragile Z comparison. The GL polygon offset we set ends up being so large that it pulls the geometry into the negative Z range. It isn't clipped (or no longer, older NV drivers probably had a separate bug there), but the Z value gets clamped to 0.0 in the first draw and doesn't match the incoming Z in the second draw. --- dlls/wined3d/cs.c | 3 +- dlls/wined3d/directx.c | 4 ++ dlls/wined3d/state.c | 25 +++++++---- dlls/wined3d/utils.c | 94 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 + 5 files changed, 119 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 39e78e1..459fd56 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -446,7 +446,8 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); } - else if (prev && prev->format->depth_size != op->view->format->depth_size) + else if (prev && (prev->format_flags & WINED3DFMT_FLAG_FLOAT) + != (op->view->format_flags & WINED3DFMT_FLAG_FLOAT)) { device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ce23c47..8e4448d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5903,6 +5903,10 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) return FALSE; } + gl_info->fixed_polyoffset_scale = wined3d_adapter_find_polyoffset_scale(&caps_gl_ctx, GL_DEPTH_COMPONENT); + if (gl_info->supported[ARB_DEPTH_BUFFER_FLOAT]) + gl_info->float_polyoffset_scale = wined3d_adapter_find_polyoffset_scale(&caps_gl_ctx, GL_DEPTH32F_STENCIL8); + adapter->vram_bytes = adapter->driver_info.vram_bytes; adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e39b7b4..3225aa6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1632,11 +1632,17 @@ static void state_scissor(struct wined3d_context *context, const struct wined3d_ * OpenGL the bias is specified in units of "the smallest value that is * guaranteed to produce a resolvable offset for a given implementation". To * convert from D3D to GL we need to divide the D3D depth bias by that value. - * There's no practical way to retrieve that value from a given GL - * implementation, but the D3D application has essentially the same problem, - * which makes a guess of the depth buffer format's highest possible value a - * reasonable guess. Note that SLOPESCALEDEPTHBIAS is a scaling factor for the - * depth slope, and doesn't need to be scaled. */ + * We try to detect the value from GL with test draws. On most drivers (r300g, + * 600g, Nvidia, i965 on Mesa) the value is 2^23 for fixed point depth buffers, + * for r200 and i965 on OSX it is 2^24, for r500 on OSX it is 2^22. For floating + * point buffers it is 2^22, 2^23 or 2^24 depending on the GPU. The value does + * not depend on the depth buffer precision on any driver. + * + * Two games that are picky regarding depth bias are Mass Effect 2 (flickering + * decals) and F.E.A.R and F.E.A.R. 2 (semi-transparent guns). + * + * Note that SLOPESCALEDEPTHBIAS is a scaling factor for the depth slope, and + * doesn't need to be scaled to account for GL vs D3D differences. */ static void state_depthbias(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -1669,10 +1675,13 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 { if (depth) { - const struct wined3d_format *fmt = depth->format; - scale = powf(2, fmt->depth_size) - 1; + if (depth->format_flags & WINED3DFMT_FLAG_FLOAT) + scale = gl_info->float_polyoffset_scale; + else + scale = gl_info->fixed_polyoffset_scale; + TRACE("Depth format %s, using depthbias scale of %.8e.\n", - debug_d3dformat(fmt->id), scale); + debug_d3dformat(depth->format->id), scale); } else { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e57db99..30ad0e0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2707,6 +2707,100 @@ fail: return FALSE; } +float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *ctx, GLenum format) +{ + const struct wined3d_gl_info *gl_info = ctx->gl_info; + static const struct wined3d_color blue = {0.0f, 0.0f, 1.0f, 1.0f}; + GLuint fbo, color, depth; + unsigned int low = 0, high = 32, cur; + DWORD readback[256]; + static const struct wined3d_vec3 geometry[] = + { + {-1.0f, -1.0f, -1.0f}, + { 1.0f, -1.0f, 0.0f}, + {-1.0f, 1.0f, -1.0f}, + { 1.0f, 1.0f, 0.0f}, + }; + + /* Most drivers want 2^23 for fixed point depth buffers, including r300g, r600g, + * Nvidia. Use this as a fallback if the detection fails. */ + unsigned int fallback = 23; + + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) + { + FIXME("No FBOs, assuming polyoffset scale of 2^%u.\n", fallback); + return (float)(1 << fallback); + } + + gl_info->gl_ops.gl.p_glGenTextures(1, &color); + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, color); + gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); + gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 256, 1, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0); + + gl_info->fbo_ops.glGenRenderbuffers(1, &depth); + gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, depth); + gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, format, 256, 1); + + gl_info->fbo_ops.glGenFramebuffers(1, &fbo); + gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, fbo); + gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, color, 0); + gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depth); + checkGLcall("Setup framebuffer"); + + gl_info->gl_ops.gl.p_glClearColor(0.0f, 0.0f, 0.5f, 0.0f); + gl_info->gl_ops.gl.p_glClearDepth(0.5f); + gl_info->gl_ops.gl.p_glEnable(GL_DEPTH_TEST); + gl_info->gl_ops.gl.p_glEnable(GL_POLYGON_OFFSET_FILL); + gl_info->gl_ops.gl.p_glViewport(0, 0, 256, 1); + checkGLcall("Misc parameters"); + + for (;;) + { + if (high - low <= 1) + { + ERR("PolygonOffset scale factor detection failed, using fallback value 2^%u.\n", fallback); + cur = fallback; + break; + } + cur = (low + high) / 2; + + gl_info->gl_ops.gl.p_glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + /* The post viewport transform Z of the geometry runs from 0.0 to 0.5. We want to push it another + * 0.25 so that the Z buffer content (0.5) cuts the quad off at half the screen. */ + gl_info->gl_ops.gl.p_glPolygonOffset(0.0f, (float)(1 << cur) * 0.25f); + draw_test_quad(ctx, geometry, &blue); + checkGLcall("Test draw"); + + /* Rebinding texture to workaround a fglrx bug. */ + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, color); + gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); + checkGLcall("readback"); + + TRACE("low %02u, high %02u, cur %2u, 0=0x%08x, 125=0x%08x, 131=0x%08x, 255=0x%08x\n", + low, high, cur, readback[0], readback[125], readback[131], readback[255]); + + if ((readback[125] & 0xff) < 0xa0) + high = cur; + else if ((readback[131] & 0xff) > 0xa0) + low = cur; + else + { + TRACE("Found scale factor 2^%u for format %x\n", cur, format); + break; + } + } + + gl_info->gl_ops.gl.p_glDeleteTextures(1, &color); + gl_info->fbo_ops.glDeleteRenderbuffers(1, &depth); + gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); + gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, 0); + checkGLcall("Delete framebuffer"); + + gl_info->gl_ops.gl.p_glDisable(GL_DEPTH_TEST); + gl_info->gl_ops.gl.p_glDisable(GL_POLYGON_OFFSET_FILL); + return (float)(1 << cur); +} + const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl_info, enum wined3d_format_id format_id) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a1331d3..c22fe33 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1723,6 +1723,7 @@ struct wined3d_gl_info DWORD quirks; BOOL supported[WINED3D_GL_EXT_COUNT]; GLint wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP + 1]; + float fixed_polyoffset_scale, float_polyoffset_scale; HGLRC (WINAPI *p_wglCreateContextAttribsARB)(HDC dc, HGLRC share, const GLint *attribs); struct opengl_funcs gl_ops; @@ -1812,6 +1813,7 @@ struct wined3d_caps_gl_ctx GLuint test_program_id; }; +float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *ctx, GLenum format) DECLSPEC_HIDDEN; BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Implement Win32_DesktopMonitor.PixelsPerXLogicalInch.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: deaf036992ba6aeb811ee77219ab862ad29ceb4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=deaf036992ba6aeb811ee7721… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 29 11:39:28 2015 +0200 wbemprox: Implement Win32_DesktopMonitor.PixelsPerXLogicalInch. --- dlls/wbemprox/builtin.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f1e5c4a..1c960eb 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -60,6 +60,8 @@ static const WCHAR class_compsysproductW[] = {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m','P','r','o','d','u','c','t',0}; static const WCHAR class_datafileW[] = {'C','I','M','_','D','a','t','a','F','i','l','e',0}; +static const WCHAR class_desktopmonitorW[] = + {'W','i','n','3','2','_','D','e','s','k','t','o','p','M','o','n','i','t','o','r',0}; static const WCHAR class_directoryW[] = {'W','i','n','3','2','_','D','i','r','e','c','t','o','r','y',0}; static const WCHAR class_diskdriveW[] = @@ -267,6 +269,8 @@ static const WCHAR prop_parameterW[] = {'P','a','r','a','m','e','t','e','r',0}; static const WCHAR prop_physicaladapterW[] = {'P','h','y','s','i','c','a','l','A','d','a','p','t','e','r',0}; +static const WCHAR prop_pixelsperxlogicalinchW[] = + {'P','i','x','e','l','s','P','e','r','X','L','o','g','i','c','a','l','I','n','c','h',0}; static const WCHAR prop_pnpdeviceidW[] = {'P','N','P','D','e','v','i','c','e','I','D',0}; static const WCHAR prop_pprocessidW[] = @@ -406,6 +410,10 @@ static const struct column col_datafile[] = { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } }; +static const struct column col_desktopmonitor[] = +{ + { prop_pixelsperxlogicalinchW, CIM_UINT32 } +}; static const struct column col_directory[] = { { prop_accessmaskW, CIM_UINT32 }, @@ -789,6 +797,10 @@ struct record_datafile const WCHAR *name; const WCHAR *version; }; +struct record_desktopmonitor +{ + UINT32 pixelsperxlogicalinch; +}; struct record_directory { UINT32 accessmask; @@ -1658,6 +1670,35 @@ done: return status; } +static UINT32 get_pixelsperxlogicalinch(void) +{ + HDC hdc = GetDC( NULL ); + UINT32 ret; + + if (!hdc) return 96; + ret = GetDeviceCaps( hdc, LOGPIXELSX ); + ReleaseDC( NULL, hdc ); + return ret; +} + +static enum fill_status fill_desktopmonitor( struct table *table, const struct expr *cond ) +{ + struct record_desktopmonitor *rec; + enum fill_status status = FILL_STATUS_UNFILTERED; + UINT row = 0; + + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + rec = (struct record_desktopmonitor *)table->data; + rec->pixelsperxlogicalinch = get_pixelsperxlogicalinch(); + + if (match_row( table, row, cond, &status )) row++; + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + static enum fill_status fill_directory( struct table *table, const struct expr *cond ) { static const WCHAR dotW[] = {'.',0}, dotdotW[] = {'.','.',0}; @@ -2859,6 +2900,7 @@ static struct table builtin_classes[] = { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, 0, NULL, fill_compsys }, { class_compsysproductW, SIZEOF(col_compsysproduct), col_compsysproduct, SIZEOF(data_compsysproduct), 0, (BYTE *)data_compsysproduct }, { class_datafileW, SIZEOF(col_datafile), col_datafile, 0, 0, NULL, fill_datafile }, + { class_desktopmonitorW, SIZEOF(col_desktopmonitor), col_desktopmonitor, 0, 0, NULL, fill_desktopmonitor }, { class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, 0, 0, NULL, fill_diskdrive }, { class_diskpartitionW, SIZEOF(col_diskpartition), col_diskpartition, 0, 0, NULL, fill_diskpartition },

1 0

Bruno Jesus : ws2_32: Map IPPROTO_IPV6 protocol option.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: b6a095b9000b814ee0eeb9c75dafdc5b0389a062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a095b9000b814ee0eeb9c75… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 29 14:48:30 2015 -0300 ws2_32: Map IPPROTO_IPV6 protocol option. --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d7e5276..b06d7e7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -687,6 +687,7 @@ static const int ws_proto_map[][2] = MAP_OPTION( IPPROTO_IP ), MAP_OPTION( IPPROTO_TCP ), MAP_OPTION( IPPROTO_UDP ), + MAP_OPTION( IPPROTO_IPV6 ), MAP_OPTION( IPPROTO_ICMP ), MAP_OPTION( IPPROTO_IGMP ), MAP_OPTION( IPPROTO_RAW ),

1 0

Sebastian Lackner : server: Use a separate wineserver call to fetch thread times.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 6156cf31342e0aac45a5d15d89642fe6779332c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6156cf31342e0aac45a5d15d8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 18:30:53 2015 +0200 server: Use a separate wineserver call to fetch thread times. --- dlls/ntdll/thread.c | 6 ++---- include/wine/server_protocol.h | 23 +++++++++++++++++++---- server/protocol.def | 11 +++++++++-- server/request.h | 17 +++++++++++------ server/thread.c | 14 +++++++++++++- server/trace.c | 16 ++++++++++++++-- 6 files changed, 68 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 3696c8e..2781827 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -962,12 +962,10 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadTimes: { KERNEL_USER_TIMES kusrt; - /* We need to do a server call to get the creation time or exit time */ - /* This works on any thread */ - SERVER_START_REQ( get_thread_info ) + + SERVER_START_REQ( get_thread_times ) { req->handle = wine_server_obj_handle( handle ); - req->tid_in = 0; status = wine_server_call( req ); if (status == STATUS_SUCCESS) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8b186fa..ac0d2d0 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -893,12 +893,24 @@ struct get_thread_info_reply thread_id_t tid; client_ptr_t teb; affinity_t affinity; - timeout_t creation_time; - timeout_t exit_time; int exit_code; int priority; int last; - char __pad_60[4]; + char __pad_44[4]; +}; + + + +struct get_thread_times_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_thread_times_reply +{ + struct reply_header __header; + timeout_t creation_time; + timeout_t exit_time; }; @@ -5295,6 +5307,7 @@ enum request REQ_get_process_info, REQ_set_process_info, REQ_get_thread_info, + REQ_get_thread_times, REQ_set_thread_info, REQ_get_dll_info, REQ_suspend_thread, @@ -5568,6 +5581,7 @@ union generic_request struct get_process_info_request get_process_info_request; struct set_process_info_request set_process_info_request; struct get_thread_info_request get_thread_info_request; + struct get_thread_times_request get_thread_times_request; struct set_thread_info_request set_thread_info_request; struct get_dll_info_request get_dll_info_request; struct suspend_thread_request suspend_thread_request; @@ -5839,6 +5853,7 @@ union generic_reply struct get_process_info_reply get_process_info_reply; struct set_process_info_reply set_process_info_reply; struct get_thread_info_reply get_thread_info_reply; + struct get_thread_times_reply get_thread_times_reply; struct set_thread_info_reply set_thread_info_reply; struct get_dll_info_reply get_dll_info_reply; struct suspend_thread_reply suspend_thread_reply; @@ -6096,6 +6111,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 481 +#define SERVER_PROTOCOL_VERSION 482 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 0ff1a6b..3d7f7be 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -842,14 +842,21 @@ struct rawinput_device thread_id_t tid; /* server thread id */ client_ptr_t teb; /* thread teb pointer */ affinity_t affinity; /* thread affinity mask */ - timeout_t creation_time; /* thread creation time */ - timeout_t exit_time; /* thread exit time */ int exit_code; /* thread exit code */ int priority; /* thread priority level */ int last; /* last thread in process */ @END +/* Retrieve information about thread times */ +(a)REQ(get_thread_times) + obj_handle_t handle; /* thread handle */ +(a)REPLY + timeout_t creation_time; /* thread creation time */ + timeout_t exit_time; /* thread exit time */ +(a)END + + /* Set a thread information */ @REQ(set_thread_info) obj_handle_t handle; /* thread handle */ diff --git a/server/request.h b/server/request.h index 760466c..299b4ad 100644 --- a/server/request.h +++ b/server/request.h @@ -117,6 +117,7 @@ DECL_HANDLER(terminate_thread); DECL_HANDLER(get_process_info); DECL_HANDLER(set_process_info); DECL_HANDLER(get_thread_info); +DECL_HANDLER(get_thread_times); DECL_HANDLER(set_thread_info); DECL_HANDLER(get_dll_info); DECL_HANDLER(suspend_thread); @@ -389,6 +390,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_process_info, (req_handler)req_set_process_info, (req_handler)req_get_thread_info, + (req_handler)req_get_thread_times, (req_handler)req_set_thread_info, (req_handler)req_get_dll_info, (req_handler)req_suspend_thread, @@ -767,12 +769,15 @@ C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, pid) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, teb) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, affinity) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, creation_time) == 32 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_time) == 40 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_code) == 48 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, priority) == 52 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, last) == 56 ); -C_ASSERT( sizeof(struct get_thread_info_reply) == 64 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_code) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, priority) == 36 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, last) == 40 ); +C_ASSERT( sizeof(struct get_thread_info_reply) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_times_request, handle) == 12 ); +C_ASSERT( sizeof(struct get_thread_times_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_times_reply, creation_time) == 8 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_times_reply, exit_time) == 16 ); +C_ASSERT( sizeof(struct get_thread_times_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, mask) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, priority) == 20 ); diff --git a/server/thread.c b/server/thread.c index 8471651..b8c73c6 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1374,9 +1374,21 @@ DECL_HANDLER(get_thread_info) reply->exit_code = (thread->state == TERMINATED) ? thread->exit_code : STATUS_PENDING; reply->priority = thread->priority; reply->affinity = thread->affinity; + reply->last = thread->process->running_threads == 1; + + release_object( thread ); + } +} + +/* fetch information about thread times */ +DECL_HANDLER(get_thread_times) +{ + struct thread *thread; + + if ((thread = get_thread_from_handle( req->handle, THREAD_QUERY_INFORMATION ))) + { reply->creation_time = thread->creation_time; reply->exit_time = thread->exit_time; - reply->last = thread->process->running_threads == 1; release_object( thread ); } diff --git a/server/trace.c b/server/trace.c index 42cff99..3aa5271 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1301,13 +1301,22 @@ static void dump_get_thread_info_reply( const struct get_thread_info_reply *req fprintf( stderr, ", tid=%04x", req->tid ); dump_uint64( ", teb=", &req->teb ); dump_uint64( ", affinity=", &req->affinity ); - dump_timeout( ", creation_time=", &req->creation_time ); - dump_timeout( ", exit_time=", &req->exit_time ); fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority ); fprintf( stderr, ", last=%d", req->last ); } +static void dump_get_thread_times_request( const struct get_thread_times_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_get_thread_times_reply( const struct get_thread_times_reply *req ) +{ + dump_timeout( " creation_time=", &req->creation_time ); + dump_timeout( ", exit_time=", &req->exit_time ); +} + static void dump_set_thread_info_request( const struct set_thread_info_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4256,6 +4265,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_process_info_request, (dump_func)dump_set_process_info_request, (dump_func)dump_get_thread_info_request, + (dump_func)dump_get_thread_times_request, (dump_func)dump_set_thread_info_request, (dump_func)dump_get_dll_info_request, (dump_func)dump_suspend_thread_request, @@ -4525,6 +4535,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_process_info_reply, NULL, (dump_func)dump_get_thread_info_reply, + (dump_func)dump_get_thread_times_reply, NULL, (dump_func)dump_get_dll_info_reply, (dump_func)dump_suspend_thread_reply, @@ -4794,6 +4805,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_process_info", "set_process_info", "get_thread_info", + "get_thread_times", "set_thread_info", "get_dll_info", "suspend_thread",

1 0

Sebastian Lackner : ntdll: Implement ThreadQuerySetWin32StartAddress info class in NtSetInformationThread.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 6ab494ceb566c105f58ea713ad6f067f4409089f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab494ceb566c105f58ea713a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 18:31:11 2015 +0200 ntdll: Implement ThreadQuerySetWin32StartAddress info class in NtSetInformationThread. --- dlls/ntdll/thread.c | 16 ++++++++++++++-- include/wine/server_protocol.h | 12 +++++++----- server/protocol.def | 8 +++++--- server/request.h | 5 +++-- server/thread.c | 4 ++++ server/thread.h | 1 + server/trace.c | 1 + 7 files changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 2781827..3e95fd4 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1203,14 +1203,26 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadHideFromDebugger: /* pretend the call succeeded to satisfy some code protectors */ return STATUS_SUCCESS; - + case ThreadQuerySetWin32StartAddress: + { + const PRTL_THREAD_START_ROUTINE *entry = data; + if (length != sizeof(PRTL_THREAD_START_ROUTINE)) return STATUS_INVALID_PARAMETER; + SERVER_START_REQ( set_thread_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->mask = SET_THREAD_INFO_ENTRYPOINT; + req->entry_point = wine_server_client_ptr( *entry ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + } + return status; case ThreadBasicInformation: case ThreadTimes: case ThreadPriority: case ThreadDescriptorTableEntry: case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable: - case ThreadQuerySetWin32StartAddress: case ThreadPerformanceCount: case ThreadAmILastThread: case ThreadIdealProcessor: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ac0d2d0..200b27a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -922,16 +922,18 @@ struct set_thread_info_request int mask; int priority; affinity_t affinity; + client_ptr_t entry_point; obj_handle_t token; - char __pad_36[4]; + char __pad_44[4]; }; struct set_thread_info_reply { struct reply_header __header; }; -#define SET_THREAD_INFO_PRIORITY 0x01 -#define SET_THREAD_INFO_AFFINITY 0x02 -#define SET_THREAD_INFO_TOKEN 0x04 +#define SET_THREAD_INFO_PRIORITY 0x01 +#define SET_THREAD_INFO_AFFINITY 0x02 +#define SET_THREAD_INFO_TOKEN 0x04 +#define SET_THREAD_INFO_ENTRYPOINT 0x08 @@ -6111,6 +6113,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 482 +#define SERVER_PROTOCOL_VERSION 483 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 3d7f7be..4279cb6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -863,11 +863,13 @@ struct rawinput_device int mask; /* setting mask (see below) */ int priority; /* priority class */ affinity_t affinity; /* affinity mask */ + client_ptr_t entry_point; /* thread entry point */ obj_handle_t token; /* impersonation token */ @END -#define SET_THREAD_INFO_PRIORITY 0x01 -#define SET_THREAD_INFO_AFFINITY 0x02 -#define SET_THREAD_INFO_TOKEN 0x04 +#define SET_THREAD_INFO_PRIORITY 0x01 +#define SET_THREAD_INFO_AFFINITY 0x02 +#define SET_THREAD_INFO_TOKEN 0x04 +#define SET_THREAD_INFO_ENTRYPOINT 0x08 /* Retrieve information about a module */ diff --git a/server/request.h b/server/request.h index 299b4ad..2ba8b45 100644 --- a/server/request.h +++ b/server/request.h @@ -782,8 +782,9 @@ C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, mask) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, priority) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, affinity) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, token) == 32 ); -C_ASSERT( sizeof(struct set_thread_info_request) == 40 ); +C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, entry_point) == 32 ); +C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, token) == 40 ); +C_ASSERT( sizeof(struct set_thread_info_request) == 48 ); C_ASSERT( FIELD_OFFSET(struct get_dll_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_dll_info_request, base_address) == 16 ); C_ASSERT( sizeof(struct get_dll_info_request) == 24 ); diff --git a/server/thread.c b/server/thread.c index b8c73c6..f020908 100644 --- a/server/thread.c +++ b/server/thread.c @@ -175,6 +175,7 @@ static inline void init_thread_structure( struct thread *thread ) thread->context = NULL; thread->suspend_context = NULL; thread->teb = 0; + thread->entry_point = 0; thread->debug_ctx = NULL; thread->debug_event = NULL; thread->debug_break = 0; @@ -497,6 +498,8 @@ static void set_thread_info( struct thread *thread, } if (req->mask & SET_THREAD_INFO_TOKEN) security_set_thread_token( thread, req->token ); + if (req->mask & SET_THREAD_INFO_ENTRYPOINT) + thread->entry_point = req->entry_point; } /* stop a thread (at the Unix level) */ @@ -1284,6 +1287,7 @@ DECL_HANDLER(init_thread) current->unix_pid = req->unix_pid; current->unix_tid = req->unix_tid; current->teb = req->teb; + current->entry_point = req->entry; if (!process->peb) /* first thread, initialize the process too */ { diff --git a/server/thread.h b/server/thread.h index 996d95b..2821991 100644 --- a/server/thread.h +++ b/server/thread.h @@ -79,6 +79,7 @@ struct thread context_t *context; /* current context if in an exception handler */ context_t *suspend_context; /* current context if suspended */ client_ptr_t teb; /* TEB address (in client address space) */ + client_ptr_t entry_point; /* entry point (in client address space) */ affinity_t affinity; /* affinity mask */ int priority; /* priority level */ int suspend; /* suspend count */ diff --git a/server/trace.c b/server/trace.c index 3aa5271..da4f5b8 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1323,6 +1323,7 @@ static void dump_set_thread_info_request( const struct set_thread_info_request * fprintf( stderr, ", mask=%d", req->mask ); fprintf( stderr, ", priority=%d", req->priority ); dump_uint64( ", affinity=", &req->affinity ); + dump_uint64( ", entry_point=", &req->entry_point ); fprintf( stderr, ", token=%04x", req->token ); }

1 0

Sebastian Lackner : ntdll: Implement ThreadQuerySetWin32StartAddress info class in NtQueryInformationThread.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 845164004b4b6f2e0c64a588fe858d5a26664980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=845164004b4b6f2e0c64a588f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 18:31:33 2015 +0200 ntdll: Implement ThreadQuerySetWin32StartAddress info class in NtQueryInformationThread. --- dlls/ntdll/thread.c | 18 +++++++++++++++++- include/wine/server_protocol.h | 5 +++-- server/protocol.def | 1 + server/request.h | 11 ++++++----- server/thread.c | 1 + server/trace.c | 1 + 6 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 3e95fd4..0a8a7b9 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1086,12 +1086,28 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, SERVER_END_REQ; return status; } + case ThreadQuerySetWin32StartAddress: + { + SERVER_START_REQ( get_thread_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->tid_in = 0; + status = wine_server_call( req ); + if (status == STATUS_SUCCESS) + { + PRTL_THREAD_START_ROUTINE entry = wine_server_get_ptr( reply->entry_point ); + if (data) memcpy( data, &entry, min( length, sizeof(entry) ) ); + if (ret_len) *ret_len = min( length, sizeof(entry) ); + } + } + SERVER_END_REQ; + return status; + } case ThreadPriority: case ThreadBasePriority: case ThreadImpersonationToken: case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable: - case ThreadQuerySetWin32StartAddress: case ThreadZeroTlsCell: case ThreadPerformanceCount: case ThreadIdealProcessor: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 200b27a..36f6378 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -892,11 +892,12 @@ struct get_thread_info_reply process_id_t pid; thread_id_t tid; client_ptr_t teb; + client_ptr_t entry_point; affinity_t affinity; int exit_code; int priority; int last; - char __pad_44[4]; + char __pad_52[4]; }; @@ -6113,6 +6114,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 483 +#define SERVER_PROTOCOL_VERSION 484 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 4279cb6..ffee0c0 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -841,6 +841,7 @@ struct rawinput_device process_id_t pid; /* server process id */ thread_id_t tid; /* server thread id */ client_ptr_t teb; /* thread teb pointer */ + client_ptr_t entry_point; /* thread entry point */ affinity_t affinity; /* thread affinity mask */ int exit_code; /* thread exit code */ int priority; /* thread priority level */ diff --git a/server/request.h b/server/request.h index 2ba8b45..10e4c9b 100644 --- a/server/request.h +++ b/server/request.h @@ -768,11 +768,12 @@ C_ASSERT( sizeof(struct get_thread_info_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, pid) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, teb) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, affinity) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_code) == 32 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, priority) == 36 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, last) == 40 ); -C_ASSERT( sizeof(struct get_thread_info_reply) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, entry_point) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, affinity) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_code) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, priority) == 44 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, last) == 48 ); +C_ASSERT( sizeof(struct get_thread_info_reply) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_thread_times_request, handle) == 12 ); C_ASSERT( sizeof(struct get_thread_times_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_thread_times_reply, creation_time) == 8 ); diff --git a/server/thread.c b/server/thread.c index f020908..981bcc1 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1375,6 +1375,7 @@ DECL_HANDLER(get_thread_info) reply->pid = get_process_id( thread->process ); reply->tid = get_thread_id( thread ); reply->teb = thread->teb; + reply->entry_point = thread->entry_point; reply->exit_code = (thread->state == TERMINATED) ? thread->exit_code : STATUS_PENDING; reply->priority = thread->priority; reply->affinity = thread->affinity; diff --git a/server/trace.c b/server/trace.c index da4f5b8..3eb8583 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1300,6 +1300,7 @@ static void dump_get_thread_info_reply( const struct get_thread_info_reply *req fprintf( stderr, " pid=%04x", req->pid ); fprintf( stderr, ", tid=%04x", req->tid ); dump_uint64( ", teb=", &req->teb ); + dump_uint64( ", entry_point=", &req->entry_point ); dump_uint64( ", affinity=", &req->affinity ); fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority );

1 0