November 2014 - Wine-Commits

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_GetOpacity().
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 5cc7996b1f207c41d940e4a926e098dfc7ee89a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc7996b1f207c41d940e4a92… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:22 2014 +0100 d2d1: Implement d2d_solid_color_brush_GetOpacity(). --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 8837cee..6366086 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -226,9 +226,11 @@ static void STDMETHODCALLTYPE d2d_solid_color_brush_SetTransform(ID2D1SolidColor static float STDMETHODCALLTYPE d2d_solid_color_brush_GetOpacity(ID2D1SolidColorBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); - return 0.0f; + TRACE("iface %p.\n", iface); + + return brush->opacity; } static void STDMETHODCALLTYPE d2d_solid_color_brush_GetTransform(ID2D1SolidColorBrush *iface,

1 0

Henri Verbeet : d3d10core/tests: Port alpha_test() to d3d10core.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 1c116c35279dac5396734757b7ee434a0629201e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c116c35279dac5396734757b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:25 2014 +0100 d3d10core/tests: Port alpha_test() to d3d10core. --- dlls/d3d10core/tests/device.c | 253 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/tests/visual.c | 4 +- dlls/d3d9/tests/visual.c | 4 +- dlls/ddraw/tests/visual.c | 4 +- 4 files changed, 259 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c116c35279dac5396734…

1 0

Henri Verbeet : wined3d: Explicitly convert the condition to bool shader_glsl_if().
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 8681999eee64221f230d34e74608382886de0980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8681999eee64221f230d34e74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:23 2014 +0100 wined3d: Explicitly convert the condition to bool shader_glsl_if(). In SM4 shaders the condition is likely to be an integer instead of a bool uniform like in SM3. --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7379ba2..9a0a43b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3360,7 +3360,7 @@ static void shader_glsl_if(const struct wined3d_shader_instruction *ins) struct glsl_src_param src0_param; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); - shader_addline(ins->ctx->buffer, "if (%s) {\n", src0_param.param_str); + shader_addline(ins->ctx->buffer, "if (bool(%s)) {\n", src0_param.param_str); } static void shader_glsl_ifc(const struct wined3d_shader_instruction *ins)

1 0

Henri Verbeet : wined3d: Recognize the SM4 uge opcode.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 8c18ebf66a75d77d884499f2e31809f930803fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c18ebf66a75d77d884499f2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:24 2014 +0100 wined3d: Recognize the SM4 uge opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 8 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a7bc23d..f5e614e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5279,6 +5279,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2GB */ pshader_hw_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, /* WINED3DSIH_UDIV */ NULL, + /* WINED3DSIH_UGE */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, /* WINED3DSIH_XOR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9a0a43b..98239ef 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2348,6 +2348,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_EQ: op = "equal"; break; case WINED3DSIH_GE: op = "greaterThanEqual"; break; case WINED3DSIH_IGE: op = "greaterThanEqual"; break; + case WINED3DSIH_UGE: op = "greaterThanEqual"; break; case WINED3DSIH_LT: op = "lessThan"; break; default: op = "<unhandled operator>"; @@ -2365,6 +2366,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_EQ: op = "=="; break; case WINED3DSIH_GE: op = ">="; break; case WINED3DSIH_IGE: op = ">="; break; + case WINED3DSIH_UGE: op = ">="; break; case WINED3DSIH_LT: op = "<"; break; default: op = "<unhandled operator>"; @@ -6764,6 +6766,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, /* WINED3DSIH_UDIV */ shader_glsl_udiv, + /* WINED3DSIH_UGE */ shader_glsl_relop, /* WINED3DSIH_USHR */ shader_glsl_binop, /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7a98dd8..f32d248 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -150,6 +150,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_TEXREG2GB */ "texreg2gb", /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", /* WINED3DSIH_UDIV */ "udiv", + /* WINED3DSIH_UGE */ "uge", /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", /* WINED3DSIH_XOR */ "xor", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index cba55ad..ac0fab5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -117,6 +117,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_SQRT = 0x4b, WINED3D_SM4_OP_SINCOS = 0x4d, WINED3D_SM4_OP_UDIV = 0x4e, + WINED3D_SM4_OP_UGE = 0x50, WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, @@ -259,6 +260,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_SQRT, WINED3DSIH_SQRT, "F", "F"}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, "FF", "F"}, {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, "UU", "UU"}, + {WINED3D_SM4_OP_UGE, WINED3DSIH_UGE, "U", "UU"}, {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "U", "UU"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "F", "U"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "U", "UU"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cba20f4..b7803c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -547,6 +547,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TEXREG2GB, WINED3DSIH_TEXREG2RGB, WINED3DSIH_UDIV, + WINED3DSIH_UGE, WINED3DSIH_USHR, WINED3DSIH_UTOF, WINED3DSIH_XOR,

1 0

Henri Verbeet : d3d9: Remove some incorrect constants from d3d9types.h.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 82f70e25c1e476d35d60268df9cb0d22f6dc0e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f70e25c1e476d35d60268df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:21 2014 +0100 d3d9: Remove some incorrect constants from d3d9types.h. D3DPRESENT_BACK_BUFFER_MAX doesn't exist at all and D3DPRESENT_BACK_BUFFERS_MAX is in d3d9.h. --- include/d3d9types.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 4cc1195..fd7c4ce 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -206,7 +206,6 @@ #define D3DPRESENTFLAG_NOAUTOROTATE 0x00000020 /* d3d9ex, ignore display rotation */ #define D3DPRESENTFLAG_UNPRUNEDMODE 0x00000040 /* d3d9ex, specify invalid display modes */ -#define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) #define D3DPRESENT_RATE_DEFAULT 0x00000000 /**************************** @@ -643,8 +642,6 @@ typedef enum _D3DBACKBUFFER_TYPE { D3DBACKBUFFER_TYPE_FORCE_DWORD = 0x7fffffff } D3DBACKBUFFER_TYPE; -#define D3DPRESENT_BACK_BUFFER_MAX __MSABI_LONG(3) - typedef enum _D3DBASISTYPE { D3DBASIS_BEZIER = 0, D3DBASIS_BSPLINE = 1,

1 0

Michael Stefaniuc : advpack: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 88725cb27903ee3d947a0fa05b6544a8196d411d URL: http://source.winehq.org/git/wine.git/?a=commit;h=88725cb27903ee3d947a0fa05… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 17 11:05:58 2014 +0100 advpack: Simplify the check for an empty string (PVS-Studio). --- dlls/advpack/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 1e555f7..c5efbb2 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -567,7 +567,7 @@ static LPSTR convert_file_list(LPCSTR FileList, DWORD *dwNumFiles) szConvertedList[dwLen - 1] = '\0'; /* empty list */ - if (!lstrlenA(szConvertedList)) + if (!szConvertedList[0]) { HeapFree(GetProcessHeap(), 0, szConvertedList); return NULL;

1 0

Michael Stefaniuc : mscms/tests: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: de092c6bd397aa9d9a72947b1d24d7a2393db62b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de092c6bd397aa9d9a72947b1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 17 10:59:05 2014 +0100 mscms/tests: Simplify the check for an empty string (PVS-Studio). --- dlls/mscms/tests/profile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index fd35193..012a7dc 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -1364,10 +1364,10 @@ START_TEST(profile) /* See if we can find the standard color profile */ ret = GetSystemDirectoryA( profilefile1, sizeof(profilefile1) ); ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %d\n", ret, GetLastError()); - ok( lstrlenA(profilefile1) > 0 && lstrlenA(profilefile1) < MAX_PATH, + ok(profilefile1[0] && lstrlenA(profilefile1) < MAX_PATH, "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(profilefile1)); MultiByteToWideChar(CP_ACP, 0, profilefile1, -1, profilefile1W, MAX_PATH); - ok( lstrlenW(profilefile1W) > 0 && lstrlenW(profilefile1W) < MAX_PATH, + ok(profilefile1W[0] && lstrlenW(profilefile1W) < MAX_PATH, "Expected length between 0 and MAX_PATH, got %d\n", lstrlenW(profilefile1W)); lstrcpyA(profilefile2, profilefile1); lstrcpyW(profilefile2W, profilefile1W);

1 0

Stefan Dösinger : wined3d: Minimize device windows on focus loss.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 45d530461bf29c953f5f4532cc0e917b4c4fc296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d530461bf29c953f5f4532c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 13 20:39:25 2014 +0100 wined3d: Minimize device windows on focus loss. --- dlls/wined3d/device.c | 5 +++++ dlls/wined3d/swapchain.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ee3636e..0de444b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4983,6 +4983,11 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL } else if (message == WM_ACTIVATEAPP) { + UINT i; + + for (i = 0; i < device->swapchain_count; i++) + wined3d_swapchain_activate(device->swapchains[i], wparam); + device->device_parent->ops->activate(device->device_parent, wparam); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 25e2107..4c0948f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1175,3 +1175,9 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) wined3d_resource_update_draw_binding(&swapchain->back_buffers[i]->resource); } } + +void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) +{ + if (!activate && !(swapchain->device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) + ShowWindow(swapchain->device_window, SW_MINIMIZE); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4210d26..cba20f4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2702,6 +2702,7 @@ struct wined3d_swapchain void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) DECLSPEC_HIDDEN; +void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

Sebastian Lackner : server: Close fd if there is no space in thread inflight fd list.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 749e2aa36fb8fb5c252905f58680b3f854d8be46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=749e2aa36fb8fb5c252905f58… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 15 01:04:29 2014 +0100 server: Close fd if there is no space in thread inflight fd list. --- server/thread.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/thread.c b/server/thread.c index 50d6940..97860ee 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1047,6 +1047,8 @@ int thread_add_inflight_fd( struct thread *thread, int client, int server ) thread->inflight[i].server = server; return i; } + + close( server ); return -1; }

1 0

Michael Stefaniuc : mciseq: Simplify the check for an empty string.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 560a78dd40fefc1c5b62dda1bf70b487e7a2373d URL: http://source.winehq.org/git/wine.git/?a=commit;h=560a78dd40fefc1c5b62dda1b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 17 11:07:02 2014 +0100 mciseq: Simplify the check for an empty string. --- dlls/mciseq/mcimidi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 4fcfb48..62b3192 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -683,7 +683,7 @@ static DWORD MIDI_mciOpen(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_OPEN_PARMSW lp if (dwFlags & MCI_OPEN_ELEMENT) { TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(lpParms->lpstrElementName)); - if (lpParms->lpstrElementName && strlenW(lpParms->lpstrElementName) > 0) { + if (lpParms->lpstrElementName && lpParms->lpstrElementName[0]) { wmm->hFile = mmioOpenW((LPWSTR)lpParms->lpstrElementName, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); if (wmm->hFile == 0) {

1 0