April 2015 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Add a function for wined3d_gl_resource_type to texture target conversion.
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: 8a101bc1f5a7ee563d68d6029231e51bea18ead4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a101bc1f5a7ee563d68d6029… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 00:28:52 2015 +0200 wined3d: Add a function for wined3d_gl_resource_type to texture target conversion. --- dlls/wined3d/arb_program_shader.c | 106 +++++++++++--------------------------- 1 file changed, 30 insertions(+), 76 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e648cc8..0d4d5e1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6199,6 +6199,25 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta shader_addline(buffer, "MUL_SAT %s%s, %s, const.z;\n", dstreg, dstmask, dstreg); } +static const char *arbfp_texture_target(enum wined3d_gl_resource_type type) +{ + switch(type) + { + case WINED3D_GL_RES_TYPE_TEX_1D: + return "1D"; + case WINED3D_GL_RES_TYPE_TEX_2D: + return "2D"; + case WINED3D_GL_RES_TYPE_TEX_3D: + return "3D"; + case WINED3D_GL_RES_TYPE_TEX_CUBE: + return "CUBE"; + case WINED3D_GL_RES_TYPE_TEX_RECT: + return "RECT"; + default: + return "unexpected_resource_type"; + } +} + static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, const struct wined3d_gl_info *gl_info) { unsigned int stage; @@ -6345,27 +6364,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con if (!tex_read[stage]) continue; - switch(settings->op[stage].tex_type) - { - case WINED3D_GL_RES_TYPE_TEX_1D: - textype = "1D"; - break; - case WINED3D_GL_RES_TYPE_TEX_2D: - textype = "2D"; - break; - case WINED3D_GL_RES_TYPE_TEX_3D: - textype = "3D"; - break; - case WINED3D_GL_RES_TYPE_TEX_CUBE: - textype = "CUBE"; - break; - case WINED3D_GL_RES_TYPE_TEX_RECT: - textype = "RECT"; - break; - default: - textype = "unexpected_textype"; - break; - } + textype = arbfp_texture_target(settings->op[stage].tex_type); if(settings->op[stage].projected == proj_none) { instr = "TEX"; @@ -6910,7 +6909,7 @@ static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, const stru char *luminance) { char chroma; - const char *tex, *texinstr; + const char *tex, *texinstr = "TXP"; if (type->fixup == COMPLEX_FIXUP_UYVY) { @@ -6923,25 +6922,9 @@ static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, const stru *luminance = 'x'; } - switch (type->res_type) - { - case WINED3D_GL_RES_TYPE_TEX_2D: - tex = "2D"; - texinstr = "TXP"; - break; - - case WINED3D_GL_RES_TYPE_TEX_RECT: - tex = "RECT"; - texinstr = "TEX"; - break; - - default: - /* This is more tricky than just replacing the texture type - we have to navigate - * properly in the texture to find the correct chroma values - */ - FIXME("Implement yuv correction for non-2d, non-rect textures\n"); - return FALSE; - } + tex = arbfp_texture_target(type->res_type); + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_RECT) + texinstr = "TEX"; /* First we have to read the chroma values. This means we need at least two pixels(no filtering), * or 4 pixels(with filtering). To get the unmodified chromas, we have to rid ourselves of the @@ -7017,20 +7000,7 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, const struct arb static const float yv12_coef[] = {2.0f / 3.0f, 1.0f / 6.0f, (2.0f / 3.0f) + (1.0f / 6.0f), 1.0f / 3.0f}; - switch (type->res_type) - { - case WINED3D_GL_RES_TYPE_TEX_2D: - tex = "2D"; - break; - - case WINED3D_GL_RES_TYPE_TEX_RECT: - tex = "RECT"; - break; - - default: - FIXME("Implement yv12 correction for non-2d, non-rect textures\n"); - return FALSE; - } + tex = arbfp_texture_target(type->res_type); /* YV12 surfaces contain a WxH sized luminance plane, followed by a (W/2)x(H/2) * V and a (W/2)x(H/2) U plane, each with 8 bit per pixel. So the effective @@ -7179,18 +7149,7 @@ static BOOL gen_nv12_read(struct wined3d_shader_buffer *buffer, const struct arb static const float nv12_coef[] = {2.0f / 3.0f, 1.0f / 3.0f, 1.0f, 1.0f}; - switch (type->res_type) - { - case WINED3D_GL_RES_TYPE_TEX_2D: - tex = "2D"; - break; - case WINED3D_GL_RES_TYPE_TEX_RECT: - tex = "RECT"; - break; - default: - FIXME("Implement nv12 correction for non-2d, non-rect textures\n"); - return FALSE; - } + tex = arbfp_texture_target(type->res_type); /* NV12 surfaces contain a WxH sized luminance plane, followed by a (W/2)x(H/2) * sized plane where each component is an UV pair. So the effective @@ -7326,6 +7285,7 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, GLenum shader; struct wined3d_shader_buffer buffer; GLint pos; + const char *tex_target = arbfp_texture_target(type->res_type); /* Shader header */ if (!shader_buffer_init(&buffer)) @@ -7349,10 +7309,7 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, shader_addline(&buffer, "PARAM constants = { 0.996, 0.00195, 0, 0 };\n"); /* The alpha-component contains the palette index */ - if (type->res_type == WINED3D_GL_RES_TYPE_TEX_RECT) - shader_addline(&buffer, "TEX index, fragment.texcoord[0], texture[0], RECT;\n"); - else - shader_addline(&buffer, "TEX index, fragment.texcoord[0], texture[0], 2D;\n"); + shader_addline(&buffer, "TEX index, fragment.texcoord[0], texture[0], %s;\n", tex_target); /* Scale the index by 255/256 and add a bias of '0.5' in order to sample in the middle */ shader_addline(&buffer, "MAD index.a, index.a, constants.x, constants.y;\n"); @@ -7564,6 +7521,7 @@ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, GLenum shader; struct wined3d_shader_buffer buffer; GLint pos; + const char *tex_target = arbfp_texture_target(type->res_type); /* Shader header */ if (!shader_buffer_init(&buffer)) @@ -7581,11 +7539,7 @@ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)); shader_addline(&buffer, "!!ARBfp1.0\n"); - if (type->res_type == WINED3D_GL_RES_TYPE_TEX_RECT) - shader_addline(&buffer, "TEX result.color, fragment.texcoord[0], texture[0], RECT;\n"); - else - shader_addline(&buffer, "TEX result.color, fragment.texcoord[0], texture[0], 2D;\n"); - + shader_addline(&buffer, "TEX result.color, fragment.texcoord[0], texture[0], %s;\n", tex_target); shader_addline(&buffer, "END\n"); GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,

1 0

Stefan Dösinger : wined3d: Use a shader for unconverted blits.
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: f260c17b347460baf198e9b8a82e8ae001168815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f260c17b347460baf198e9b8a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 00:28:51 2015 +0200 wined3d: Use a shader for unconverted blits. --- dlls/wined3d/arb_program_shader.c | 74 ++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 719e8e5..e648cc8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7558,6 +7558,54 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ } /* Context activation is done by the caller. */ +static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, + const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) +{ + GLenum shader; + struct wined3d_shader_buffer buffer; + GLint pos; + + /* Shader header */ + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } + + GL_EXTCALL(glGenProgramsARB(1, &shader)); + if (!shader) + { + shader_buffer_free(&buffer); + return 0; + } + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)); + + shader_addline(&buffer, "!!ARBfp1.0\n"); + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_RECT) + shader_addline(&buffer, "TEX result.color, fragment.texcoord[0], texture[0], RECT;\n"); + else + shader_addline(&buffer, "TEX result.color, fragment.texcoord[0], texture[0], 2D;\n"); + + shader_addline(&buffer, "END\n"); + + GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, + strlen(buffer.buffer), buffer.buffer)); + checkGLcall("glProgramStringARB()"); + + gl_info->gl_ops.gl.p_glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + if (pos != -1) + { + FIXME("Fragment program error at position %d: %s\n\n", pos, + debugstr_a((const char *)gl_info->gl_ops.gl.p_glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + shader_arb_dump_program_source(buffer.buffer); + } + + shader_buffer_free(&buffer); + + return shader; +} + +/* Context activation is done by the caller. */ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { GLenum shader; @@ -7577,17 +7625,10 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, return WINED3D_OK; } - if (!is_complex_fixup(surface->resource.format->color_fixup)) - { - TRACE("Fixup:\n"); - dump_color_fixup_desc(surface->resource.format->color_fixup); - /* Don't bother setting up a shader for unconverted formats */ - gl_info->gl_ops.gl.p_glEnable(gl_texture_type); - checkGLcall("glEnable(gl_texture_type)"); - return WINED3D_OK; - } - - fixup = get_complex_fixup(surface->resource.format->color_fixup); + if (is_complex_fixup(surface->resource.format->color_fixup)) + fixup = get_complex_fixup(surface->resource.format->color_fixup); + else + fixup = COMPLEX_FIXUP_NONE; switch (gl_texture_type) { @@ -7628,11 +7669,20 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, { switch (fixup) { + case COMPLEX_FIXUP_NONE: + if (!is_identity_fixup(surface->resource.format->color_fixup)) + FIXME("Implement support for sign or swizzle fixups.\n"); + shader = arbfp_gen_plain_shader(priv, gl_info, &type); + break; + case COMPLEX_FIXUP_P8: shader = gen_p8_shader(priv, gl_info, &type); break; - default: + case COMPLEX_FIXUP_YUY2: + case COMPLEX_FIXUP_UYVY: + case COMPLEX_FIXUP_YV12: + case COMPLEX_FIXUP_NV12: shader = gen_yuv_shader(priv, gl_info, &type); break; }

1 0

Nikolay Sivov : shell32: Fix allocation size (Valgrind).
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: 47f8dbcb3669de7a04420b80737682ec0e69cbd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f8dbcb3669de7a04420b807… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 7 12:01:17 2015 +0300 shell32: Fix allocation size (Valgrind). --- dlls/shell32/shellitem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index b1cae7e..f8b083f 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1314,7 +1314,7 @@ HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl, if(cidl == 0) return E_INVALIDARG; - array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IShellItem*)); + array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cidl*sizeof(IShellItem*)); if(!array) return E_OUTOFMEMORY;

1 0

Sebastian Lackner : kernel32: Add stub for PowerSetRequest.
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: 25505995aff73a62cde60353269ec7aaa6c86c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25505995aff73a62cde603532… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 7 03:18:58 2015 +0200 kernel32: Add stub for PowerSetRequest. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/powermgnt.c | 11 +++++++++++ include/winbase.h | 6 ++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5258819..6e28b90 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1136,7 +1136,7 @@ @ stdcall PostQueuedCompletionStatus(long long ptr ptr) # @ stub PowerClearRequest @ stdcall PowerCreateRequest(ptr) -# @ stub PowerSetRequest +@ stdcall PowerSetRequest(long long) @ stdcall PrepareTape(ptr long long) @ stub PrivCopyFileExW @ stub PrivMoveFileIdentityW diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 74ec397..43e086e 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -111,3 +111,14 @@ HANDLE WINAPI PowerCreateRequest(REASON_CONTEXT *context) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return INVALID_HANDLE_VALUE; } + +/*********************************************************************** + * PowerSetRequest (KERNEL32.@) + */ +BOOL WINAPI PowerSetRequest(HANDLE request, POWER_REQUEST_TYPE type) +{ + FIXME("(%p, %u): stub\n", request, type); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/include/winbase.h b/include/winbase.h index 82220c2..f845082 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -865,6 +865,12 @@ typedef struct _SYSTEM_POWER_STATUS DWORD BatteryFullLifeTime; } SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS; +typedef enum _POWER_REQUEST_TYPE +{ + PowerRequestDisplayRequired, + PowerRequestSystemRequired, + PowerRequestAwayModeRequired +} POWER_REQUEST_TYPE, *PPOWER_REQUEST_TYPE; typedef struct _SYSTEM_INFO {

1 0

Sebastian Lackner : user32: Invalidate key state cache globally after running LL hooks.
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: d3be42ab96cf8925bb2abd5c26b8ffa67c8b910c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3be42ab96cf8925bb2abd5c2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 7 02:53:06 2015 +0200 user32: Invalidate key state cache globally after running LL hooks. --- dlls/user32/hook.c | 5 +---- dlls/user32/input.c | 9 ++++++++- dlls/user32/message.c | 7 ++++++- dlls/user32/user_private.h | 3 +++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index f19949c..281b88e 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -437,10 +437,7 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA } if (info->id == WH_KEYBOARD_LL || info->id == WH_MOUSE_LL) - { - struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; - if (key_state_info) key_state_info->time = 0; /* force refreshing the key state cache */ - } + interlocked_xchg_add( &global_key_state_counter, 1 ); /* force refreshing the key state cache */ return ret; } diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 6ea2c2f..57594a7 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -52,6 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); WINE_DECLARE_DEBUG_CHANNEL(keyboard); +INT global_key_state_counter = 0; /*********************************************************************** * get_key_state @@ -369,6 +370,7 @@ static void check_for_events( UINT flags ) SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; + INT counter = global_key_state_counter; SHORT ret; if (key < 0 || key >= 256) return 0; @@ -379,6 +381,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { if (key_state_info && !(key_state_info->state[key] & 0xc0) && + key_state_info->counter == counter && GetTickCount() - key_state_info->time < 50) { /* use cached value */ @@ -401,7 +404,11 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { if (reply->state & 0x40) ret |= 0x0001; if (reply->state & 0x80) ret |= 0x8000; - if (key_state_info) key_state_info->time = GetTickCount(); + if (key_state_info) + { + key_state_info->time = GetTickCount(); + key_state_info->counter = counter; + } } } SERVER_END_REQ; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index fbc11da..2b544de 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3293,6 +3293,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; struct send_message_info info; int prev_x, prev_y, new_x, new_y; + INT counter = global_key_state_counter; NTSTATUS ret; BOOL wait; @@ -3342,7 +3343,11 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) if (!ret) { - if (key_state_info) key_state_info->time = GetTickCount(); + if (key_state_info) + { + key_state_info->time = GetTickCount(); + key_state_info->counter = counter; + } if ((flags & SEND_HWMSG_INJECTED) && (prev_x != new_x || prev_y != new_y)) USER_Driver->pSetCursorPos( new_x, new_y ); } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 9e3a373..445fd40 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -192,9 +192,12 @@ struct user_thread_info C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); +extern INT global_key_state_counter DECLSPEC_HIDDEN; + struct user_key_state_info { UINT time; /* Time of last key state refresh */ + INT counter; /* Counter to invalidate the key state */ BYTE state[256]; /* State for each key */ };

1 0

Sebastian Lackner : kernel32/tests: Add tests for waiting on an job object.
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: 7984fb9fbe881b596d58c6dfa10d853ab0d06b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7984fb9fbe881b596d58c6dfa… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 3 17:20:05 2015 +1100 kernel32/tests: Add tests for waiting on an job object. --- dlls/kernel32/tests/process.c | 85 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index d981ec9..0bd14dc 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2443,6 +2443,90 @@ static void test_KillOnJobClose(void) CloseHandle(pi.hThread); } +static void test_WaitForJobObject(void) +{ + HANDLE job; + PROCESS_INFORMATION pi; + BOOL ret; + DWORD dwret; + + /* test waiting for a job object when the process is killed */ + job = pCreateJobObjectW(NULL, NULL); + ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + + dwret = WaitForSingleObject(job, 100); + ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); + + create_process("wait", &pi); + + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + dwret = WaitForSingleObject(job, 100); + ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); + + ret = pTerminateJobObject(job, 123); + ok(ret, "TerminateJobObject error %u\n", GetLastError()); + + dwret = WaitForSingleObject(job, 500); + todo_wine + ok(dwret == WAIT_OBJECT_0 || broken(dwret == WAIT_TIMEOUT), + "WaitForSingleObject returned %u\n", dwret); + + if (dwret == WAIT_TIMEOUT) /* Win 2000/XP */ + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job); + todo_wine + win_skip("TerminateJobObject doesn't signal job, skipping tests\n"); + return; + } + + /* the object is not reset immediately */ + dwret = WaitForSingleObject(job, 100); + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + /* creating a new process doesn't reset the signalled state */ + create_process("wait", &pi); + + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + dwret = WaitForSingleObject(job, 100); + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + + ret = pTerminateJobObject(job, 123); + ok(ret, "TerminateJobObject error %u\n", GetLastError()); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + CloseHandle(job); + + /* repeat the test, but this time the process terminates properly */ + job = pCreateJobObjectW(NULL, NULL); + ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + + dwret = WaitForSingleObject(job, 100); + ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); + + create_process("exit", &pi); + + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + dwret = WaitForSingleObject(job, 100); + ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job); +} + static HANDLE test_AddSelfToJob(void) { HANDLE job; @@ -2625,6 +2709,7 @@ START_TEST(process) test_QueryInformationJobObject(); test_CompletionPort(); test_KillOnJobClose(); + test_WaitForJobObject(); job = test_AddSelfToJob(); test_jobInheritance(job); test_BreakawayOk(job);

1 0

Stefan Dösinger : wined3d: Add more formats to wined3d_format_convert_color_to_float.
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: b413a4e202de70ada3d753323f55f12489ecddab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b413a4e202de70ada3d753323… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 00:28:54 2015 +0200 wined3d: Add more formats to wined3d_format_convert_color_to_float. --- dlls/wined3d/utils.c | 63 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f3c84ac..215ddd8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3511,11 +3511,48 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, c return 0; } +static float color_to_float(DWORD color, DWORD size, DWORD offset) +{ + DWORD mask = (1 << size) - 1; + + if (!size) + return 1.0f; + + color >>= offset; + color &= mask; + + return (float)color / (float)mask; +} + BOOL wined3d_format_convert_color_to_float(const struct wined3d_format *format, const struct wined3d_palette *palette, DWORD color, struct wined3d_color *float_color) { switch (format->id) { + case WINED3DFMT_B8G8R8_UNORM: + case WINED3DFMT_B8G8R8A8_UNORM: + case WINED3DFMT_B8G8R8X8_UNORM: + case WINED3DFMT_B5G6R5_UNORM: + case WINED3DFMT_B5G5R5X1_UNORM: + case WINED3DFMT_B5G5R5A1_UNORM: + case WINED3DFMT_B4G4R4A4_UNORM: + case WINED3DFMT_B2G3R3_UNORM: + case WINED3DFMT_R8_UNORM: + case WINED3DFMT_A8_UNORM: + case WINED3DFMT_B2G3R3A8_UNORM: + case WINED3DFMT_B4G4R4X4_UNORM: + case WINED3DFMT_R10G10B10A2_UNORM: + case WINED3DFMT_R10G10B10A2_SNORM: + case WINED3DFMT_R8G8B8A8_UNORM: + case WINED3DFMT_R8G8B8X8_UNORM: + case WINED3DFMT_R16G16_UNORM: + case WINED3DFMT_B10G10R10A2_UNORM: + float_color->r = color_to_float(color, format->red_size, format->red_offset); + float_color->g = color_to_float(color, format->green_size, format->green_size); + float_color->b = color_to_float(color, format->blue_size, format->blue_offset); + float_color->a = color_to_float(color, format->alpha_size, format->alpha_offset); + return TRUE; + case WINED3DFMT_P8_UINT: if (palette) { @@ -3530,36 +3567,12 @@ BOOL wined3d_format_convert_color_to_float(const struct wined3d_format *format, float_color->b = 0.0f; } float_color->a = color / 255.0f; - break; - - case WINED3DFMT_B5G6R5_UNORM: - float_color->r = ((color >> 11) & 0x1f) / 31.0f; - float_color->g = ((color >> 5) & 0x3f) / 63.0f; - float_color->b = (color & 0x1f) / 31.0f; - float_color->a = 1.0f; - break; - - case WINED3DFMT_B8G8R8_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - float_color->r = D3DCOLOR_R(color); - float_color->g = D3DCOLOR_G(color); - float_color->b = D3DCOLOR_B(color); - float_color->a = 1.0f; - break; - - case WINED3DFMT_B8G8R8A8_UNORM: - float_color->r = D3DCOLOR_R(color); - float_color->g = D3DCOLOR_G(color); - float_color->b = D3DCOLOR_B(color); - float_color->a = D3DCOLOR_A(color); - break; + return TRUE; default: ERR("Unhandled conversion from %s to floating point.\n", debug_d3dformat(format->id)); return FALSE; } - - return TRUE; } /* DirectDraw stuff */

1 0

Marcus Meissner : d3drm: Avoid potential double free (Coverity).
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: 369cf7118bc074b7bff449c62eaea0b82fa3b715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369cf7118bc074b7bff449c62… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Apr 7 07:31:34 2015 +0200 d3drm: Avoid potential double free (Coverity). --- dlls/d3drm/meshbuilder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index b3c5dbf..e4d6d86 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -356,7 +356,9 @@ static void clean_mesh_builder_data(struct d3drm_mesh_builder *mesh_builder) } mesh_builder->nb_materials = 0; HeapFree(GetProcessHeap(), 0, mesh_builder->materials); + mesh_builder->materials = NULL; HeapFree(GetProcessHeap(), 0, mesh_builder->material_indices); + mesh_builder->material_indices = NULL; } static HRESULT WINAPI d3drm_mesh_builder2_QueryInterface(IDirect3DRMMeshBuilder2 *iface, REFIID riid, void **out)

1 0

Sebastian Lackner : kernel32: Add stub for PowerClearRequest.
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: 4ae0ef44d2c2634d9d580a526c2a64ddd41bd61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae0ef44d2c2634d9d580a526… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 7 03:19:41 2015 +0200 kernel32: Add stub for PowerClearRequest. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/powermgnt.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 6e28b90..bb72041 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1134,7 +1134,7 @@ @ stdcall PeekConsoleInputW(ptr ptr long ptr) @ stdcall PeekNamedPipe(long ptr long ptr ptr ptr) @ stdcall PostQueuedCompletionStatus(long long ptr ptr) -# @ stub PowerClearRequest +@ stdcall PowerClearRequest(long long) @ stdcall PowerCreateRequest(ptr) @ stdcall PowerSetRequest(long long) @ stdcall PrepareTape(ptr long long) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 43e086e..b5bd0d9 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -122,3 +122,14 @@ BOOL WINAPI PowerSetRequest(HANDLE request, POWER_REQUEST_TYPE type) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * PowerClearRequest (KERNEL32.@) + */ +BOOL WINAPI PowerClearRequest(HANDLE request, POWER_REQUEST_TYPE type) +{ + FIXME("(%p, %u): stub\n", request, type); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Bruno Jesus : netapi32: Better stub NetStatisticsGet().
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: 4eff187961e99fc58f0812d37bc9fac79406c330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eff187961e99fc58f0812d37… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Apr 6 22:01:13 2015 -0300 netapi32: Better stub NetStatisticsGet(). --- dlls/netapi32/netapi32.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index f9bfb48..33c0c17 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -1083,8 +1083,51 @@ NET_API_STATUS WINAPI NetStatisticsGet(LMSTR server, LMSTR service, DWORD level, DWORD options, LPBYTE *bufptr) { - TRACE("(%p, %p, %d, %d, %p)\n", server, service, level, options, bufptr); - return NERR_InternalError; + int res; + static const WCHAR SERVICE_WORKSTATION[] = { + 'L', 'a', 'n', 'm', 'a', 'n', + 'W', 'o', 'r', 'k', 's', 't', 'a', 't', 'i', 'o', 'n', '\0'}; + static const WCHAR SERVICE_SERVER[] = { + 'L', 'a', 'n', 'm', 'a', 'n', + 'S', 'e', 'r', 'v', 'e', 'r', '\0'}; + union + { + STAT_WORKSTATION_0 workst; + STAT_SERVER_0 server; + } *stat; + void *dataptr; + + TRACE("(server %s, service %s, level %d, options %d, buffer %p): stub\n", + debugstr_w(server), debugstr_w(service), level, options, bufptr); + + res = NetApiBufferAllocate(sizeof(*stat), &dataptr); + if (res != NERR_Success) return res; + + res = NERR_InternalError; + stat = dataptr; + switch (level) + { + case 0: + if (!lstrcmpW(service, SERVICE_WORKSTATION)) + { + /* Fill the struct STAT_WORKSTATION_0 properly */ + memset(&stat->workst, 0, sizeof(stat->workst)); + res = NERR_Success; + } + else if (!lstrcmpW(service, SERVICE_SERVER)) + { + /* Fill the struct STAT_SERVER_0 properly */ + memset(&stat->server, 0, sizeof(stat->server)); + res = NERR_Success; + } + break; + } + if (res != NERR_Success) + NetApiBufferFree(dataptr); + else + *bufptr = dataptr; + + return res; } NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWORD prefmaxsize,

1 0