May 2017 - Wine-commits - list.winehq.org

Nikolay Sivov : comdlg32: Use existing symbol for Help button id.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 3c33ebd662c7b05d3a4be68a11dbe063baa229e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c33ebd662c7b05d3a4be68a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 11 12:13:05 2017 +0300 comdlg32: Use existing symbol for Help button id. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/colordlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 5e67499..bead9ba 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -865,7 +865,7 @@ static LRESULT CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) SetPropW( hDlg, szColourDialogProp, lpp ); if (!(lpp->lpcc->Flags & CC_SHOWHELP)) - ShowWindow( GetDlgItem(hDlg,0x40e), SW_HIDE); + ShowWindow(GetDlgItem(hDlg, pshHelp), SW_HIDE); lpp->msetrgb = RegisterWindowMessageA(SETRGBSTRINGA); #if 0 @@ -1041,7 +1041,7 @@ static LRESULT CC_WMCommand(CCPRIV *lpp, WPARAM wParam, LPARAM lParam, WORD noti CC_PaintTriangle(lpp); break; - case 0x40e: /* Help! */ /* The Beatles, 1965 ;-) */ + case pshHelp: /* Help! */ /* The Beatles, 1965 ;-) */ i = RegisterWindowMessageA(HELPMSGSTRINGA); if (lpp->lpcc->hwndOwner) SendMessageA(lpp->lpcc->hwndOwner, i, 0, (LPARAM)lpp->lpcc);

1 0

Jacek Caban : kernel32/tests: Use shorter timeout for wait that we expect to time out.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 0be75640f512892eb241905f883f1f17a9094c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be75640f512892eb241905f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 11 13:49:01 2017 +0200 kernel32/tests: Use shorter timeout for wait that we expect to time out. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 0546e96..77450e3 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -213,7 +213,7 @@ static void test_CreateNamedPipe(int pipemode) hFile = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError()); - ok(!WaitNamedPipeA(PIPENAME, 1000), "WaitNamedPipe succeeded\n"); + ok(!WaitNamedPipeA(PIPENAME, 100), "WaitNamedPipe succeeded\n"); ok(GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError());

1 0

Bruno Jesus : ws2_32: Use unsigned interface index on interface_bind_check.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 1639c23cae273acd5977c454d1c8f29201e4480f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1639c23cae273acd5977c454d… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Wed May 10 22:46:31 2017 -0300 ws2_32: Use unsigned interface index on interface_bind_check. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9d27fab..f6db832 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3671,7 +3671,8 @@ static void interface_bind_check(int fd, struct sockaddr_in *addr) #if !defined(IP_BOUND_IF) && !defined(LINUX_BOUND_IF) return; #else - int ifindex; + unsigned int ifindex; + int ret; socklen_t len; /* Check for IPv4, address 0.0.0.0 and UDP socket */ @@ -3680,15 +3681,14 @@ static void interface_bind_check(int fd, struct sockaddr_in *addr) if (_get_fd_type(fd) != SOCK_DGRAM) return; - ifindex = -1; len = sizeof(ifindex); #if defined(IP_BOUND_IF) - getsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &ifindex, &len); + ret = getsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &ifindex, &len); #elif defined(LINUX_BOUND_IF) - getsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, &len); - if (ifindex > 0) ifindex = ntohl(ifindex); + ret = getsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, &len); + if (!ret) ifindex = ntohl(ifindex); #endif - if (ifindex > 0) + if (!ret) { PIP_ADAPTER_INFO adapters, adapter; DWORD adap_size;

1 0

Józef Kucia : d3dx9: Fix compilation on systems that don't support nameless unions.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 1bef693767197eaf8a847bab8d8ea2d7d649436f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bef693767197eaf8a847bab8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 11 16:36:29 2017 +0200 d3dx9: Fix compilation on systems that don't support nameless unions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 2 +- dlls/d3dx9_36/effect.c | 50 +++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index e28798a..49c351f 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -224,7 +224,7 @@ struct d3dx_parameter { struct d3dx_parameter *referenced_param; struct d3dx_shared_data *shared_data; - }; + } u; }; static inline BOOL is_param_dirty(struct d3dx_parameter *param) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6cc098d..30855a6 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1032,7 +1032,7 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta switch (state->type) { case ST_PARAMETER: - param = param->referenced_param; + param = param->u.referenced_param; *param_dirty = is_param_dirty(param); /* fallthrough */ case ST_CONSTANT: @@ -1062,7 +1062,7 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta { array_idx = state->index; } - ref_param = param->referenced_param; + ref_param = param->u.referenced_param; TRACE("Array index %u, stored array index %u, element_count %u.\n", array_idx, state->index, ref_param->element_count); @@ -1478,7 +1478,7 @@ static void set_dirty(struct d3dx_parameter *param) struct d3dx_shared_data *shared_data; unsigned int i; - if ((shared_data = param->top_level_param->shared_data)) + if ((shared_data = param->top_level_param->u.shared_data)) { for (i = 0; i < shared_data->count; ++i) shared_data->parameters[i]->runtime_flags |= PARAMETER_FLAG_DIRTY; @@ -3204,7 +3204,7 @@ static HRESULT d3dx_pool_sync_shared_parameter(struct d3dx_effect_pool *pool, st for (j = 0; j < pool->size; ++j) for (k = 0; k < new_alloc[j].count; ++k) - new_alloc[j].parameters[k]->shared_data = &new_alloc[j]; + new_alloc[j].parameters[k]->u.shared_data = &new_alloc[j]; } } pool->shared_data = new_alloc; @@ -3235,7 +3235,7 @@ static HRESULT d3dx_pool_sync_shared_parameter(struct d3dx_effect_pool *pool, st pool->shared_data[i].size = new_size; } - param->shared_data = &pool->shared_data[i]; + param->u.shared_data = &pool->shared_data[i]; pool->shared_data[i].parameters[new_count - 1] = param; TRACE("name %s, parameter idx %u, new refcount %u.\n", param->name, i, @@ -3254,11 +3254,11 @@ static void d3dx_pool_release_shared_parameter(struct d3dx_parameter *param) { unsigned int new_count; - if (!(param->flags & PARAMETER_FLAG_SHARED) || !param->shared_data) + if (!(param->flags & PARAMETER_FLAG_SHARED) || !param->u.shared_data) return; - new_count = --param->shared_data->count; + new_count = --param->u.shared_data->count; - TRACE("param %p, param->shared_param %p, new_count %d.\n", param, param->shared_data, new_count); + TRACE("param %p, param->u.shared_data %p, new_count %d.\n", param, param->u.shared_data, new_count); if (new_count) { @@ -3266,11 +3266,11 @@ static void d3dx_pool_release_shared_parameter(struct d3dx_parameter *param) for (i = 0; i < new_count; ++i) { - if (param->shared_data->parameters[i] == param) + if (param->u.shared_data->parameters[i] == param) { - memmove(&param->shared_data->parameters[i], - &param->shared_data->parameters[i + 1], - sizeof(param->shared_data->parameters[i]) * (new_count - i)); + memmove(&param->u.shared_data->parameters[i], + &param->u.shared_data->parameters[i + 1], + sizeof(param->u.shared_data->parameters[i]) * (new_count - i)); break; } } @@ -3278,10 +3278,10 @@ static void d3dx_pool_release_shared_parameter(struct d3dx_parameter *param) } else { - HeapFree(GetProcessHeap(), 0, param->shared_data->parameters); + HeapFree(GetProcessHeap(), 0, param->u.shared_data->parameters); /* Zeroing table size is required as the entry in pool parameters table can be reused. */ - param->shared_data->size = 0; - param->shared_data = NULL; + param->u.shared_data->size = 0; + param->u.shared_data = NULL; } } @@ -3971,7 +3971,7 @@ static BOOL walk_state_dep(struct d3dx_state *state, walk_parameter_dep_func par } else if (state->type == ST_ARRAY_SELECTOR || state->type == ST_PARAMETER) { - if (walk_parameter_dep(state->parameter.referenced_param, param_func, data)) + if (walk_parameter_dep(state->parameter.u.referenced_param, param_func, data)) return TRUE; } return walk_param_eval_dep(state->parameter.param_eval, param_func, data); @@ -5929,10 +5929,10 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct TRACE("Parsing array entry selection state for parameter %p.\n", param); string_size = *(DWORD *)ptr; - param->referenced_param = get_parameter_by_name(base, NULL, ptr + 4); - if (param->referenced_param) + param->u.referenced_param = get_parameter_by_name(base, NULL, ptr + 4); + if (param->u.referenced_param) { - TRACE("Mapping to parameter %s.\n", debugstr_a(param->referenced_param->name)); + TRACE("Mapping to parameter %s.\n", debugstr_a(param->u.referenced_param->name)); } else { @@ -5946,7 +5946,7 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct d3dx_create_param_eval(base, (DWORD *)(ptr + string_size) + 1, object->size - (string_size + sizeof(DWORD)), D3DXPT_INT, &param->param_eval); ret = D3D_OK; - param = param->referenced_param; + param = param->u.referenced_param; if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER) { unsigned int i; @@ -6101,10 +6101,10 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * return hr; TRACE("Looking for parameter %s.\n", debugstr_a(object->data)); - param->referenced_param = get_parameter_by_name(base, NULL, object->data); - if (param->referenced_param) + param->u.referenced_param = get_parameter_by_name(base, NULL, object->data); + if (param->u.referenced_param) { - struct d3dx_parameter *refpar = param->referenced_param; + struct d3dx_parameter *refpar = param->u.referenced_param; TRACE("Mapping to parameter %p, having object id %u.\n", refpar, refpar->object_id); if (refpar->type == D3DXPT_VERTEXSHADER || refpar->type == D3DXPT_PIXELSHADER) @@ -6570,12 +6570,12 @@ static void free_effect_pool(struct d3dx_effect_pool *pool) WARN("Releasing pool with referenced parameters.\n"); param_set_data_pointer(pool->shared_data[i].parameters[0], NULL, FALSE, TRUE); - pool->shared_data[i].parameters[0]->shared_data = NULL; + pool->shared_data[i].parameters[0]->u.shared_data = NULL; for (j = 1; j < pool->shared_data[i].count; ++j) { walk_parameter_tree(pool->shared_data[i].parameters[j], param_zero_data_func, NULL); - pool->shared_data[i].parameters[j]->shared_data = NULL; + pool->shared_data[i].parameters[j]->u.shared_data = NULL; } HeapFree(GetProcessHeap(), 0, pool->shared_data[i].parameters); }

1 0

Paul Gofman : d3dx9: Sort preshader opcode table.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 6a06baee60a4561d3a6dfcc25c35e3f63d59d2ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a06baee60a4561d3a6dfcc25… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 8 18:39:35 2017 +0300 d3dx9: Sort preshader opcode table. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index b17d0b5..a4e5e3a 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -29,21 +29,21 @@ enum pres_ops { PRESHADER_OP_NOP, PRESHADER_OP_MOV, - PRESHADER_OP_ADD, - PRESHADER_OP_MUL, - PRESHADER_OP_DOT, PRESHADER_OP_NEG, PRESHADER_OP_RCP, - PRESHADER_OP_LT, PRESHADER_OP_FRC, + PRESHADER_OP_EXP, + PRESHADER_OP_RSQ, + PRESHADER_OP_SIN, + PRESHADER_OP_COS, PRESHADER_OP_MIN, PRESHADER_OP_MAX, + PRESHADER_OP_LT, PRESHADER_OP_GE, + PRESHADER_OP_ADD, + PRESHADER_OP_MUL, PRESHADER_OP_CMP, - PRESHADER_OP_SIN, - PRESHADER_OP_COS, - PRESHADER_OP_RSQ, - PRESHADER_OP_EXP, + PRESHADER_OP_DOT, PRESHADER_OP_DOTSWIZ6, PRESHADER_OP_DOTSWIZ8, }; @@ -120,21 +120,21 @@ static const struct op_info pres_op_info[] = { {0x000, "nop", 0, 0, NULL }, /* PRESHADER_OP_NOP */ {0x100, "mov", 1, 0, pres_mov}, /* PRESHADER_OP_MOV */ - {0x204, "add", 2, 0, pres_add}, /* PRESHADER_OP_ADD */ - {0x205, "mul", 2, 0, pres_mul}, /* PRESHADER_OP_MUL */ - {0x500, "dot", 2, 1, pres_dot}, /* PRESHADER_OP_DOT */ {0x101, "neg", 1, 0, pres_neg}, /* PRESHADER_OP_NEG */ {0x103, "rcp", 1, 0, pres_rcp}, /* PRESHADER_OP_RCP */ - {0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */ {0x104, "frc", 1, 0, pres_frc}, /* PRESHADER_OP_FRC */ + {0x105, "exp", 1, 0, pres_exp}, /* PRESHADER_OP_EXP */ + {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ + {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ + {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ {0x200, "min", 2, 0, pres_min}, /* PRESHADER_OP_MIN */ {0x201, "max", 2, 0, pres_max}, /* PRESHADER_OP_MAX */ + {0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */ {0x203, "ge", 2, 0, pres_ge }, /* PRESHADER_OP_GE */ + {0x204, "add", 2, 0, pres_add}, /* PRESHADER_OP_ADD */ + {0x205, "mul", 2, 0, pres_mul}, /* PRESHADER_OP_MUL */ {0x300, "cmp", 3, 0, pres_cmp}, /* PRESHADER_OP_CMP */ - {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ - {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ - {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ - {0x105, "exp", 1, 0, pres_exp}, /* PRESHADER_OP_EXP */ + {0x500, "dot", 2, 1, pres_dot}, /* PRESHADER_OP_DOT */ {0x70e, "d3ds_dotswiz", 6, 0, pres_dotswiz6}, /* PRESHADER_OP_DOTSWIZ6 */ {0x70e, "d3ds_dotswiz", 8, 0, pres_dotswiz8}, /* PRESHADER_OP_DOTSWIZ8 */ };

1 0

Paul Gofman : d3dx9: Add 'log' preshader opcode.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 651e8bfaee90870d430a7fb045382a803037c260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=651e8bfaee90870d430a7fb04… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 8 18:39:36 2017 +0300 d3dx9: Add 'log' preshader opcode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 12 ++++++++++++ dlls/d3dx9_36/tests/effect.c | 2 ++ 2 files changed, 14 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index a4e5e3a..fbd99ac 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -33,6 +33,7 @@ enum pres_ops PRESHADER_OP_RCP, PRESHADER_OP_FRC, PRESHADER_OP_EXP, + PRESHADER_OP_LOG, PRESHADER_OP_RSQ, PRESHADER_OP_SIN, PRESHADER_OP_COS, @@ -95,6 +96,16 @@ static double pres_rsq(double *args, int n) return 1.0 / sqrt(v); } static double pres_exp(double *args, int n) {return pow(2.0, args[0]);} +static double pres_log(double *args, int n) +{ + double v; + + v = fabs(args[0]); + if (v == 0.0) + return 0.0; + else + return log2(v); +} #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 @@ -124,6 +135,7 @@ static const struct op_info pres_op_info[] = {0x103, "rcp", 1, 0, pres_rcp}, /* PRESHADER_OP_RCP */ {0x104, "frc", 1, 0, pres_frc}, /* PRESHADER_OP_FRC */ {0x105, "exp", 1, 0, pres_exp}, /* PRESHADER_OP_EXP */ + {0x106, "log", 1, 0, pres_log}, /* PRESHADER_OP_LOG */ {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 7b39e31..a1cdfc2 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4554,6 +4554,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) { {"exp", 0x10500001, 1, {0x3f800000, 0x3f800000, 0x3e5edc66, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, + {"log", 0x10600001, 1, {0, 0x40000000, 0x3f9199b7, 0x43000000}, + {0.0f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"0 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, };

1 0

Stefan Dösinger : winemac.drv: Implement systray version 1-4 notifications.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 7003ec34c9578bf90f9198b3d8dc64ec65d2b249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7003ec34c9578bf90f9198b3d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 11 13:34:59 2017 -0500 winemac.drv: Implement systray version 1-4 notifications. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_status_item.m | 11 +++++++ dlls/winemac.drv/macdrv_cocoa.h | 4 +++ dlls/winemac.drv/systray.c | 60 ++++++++++++++++++++++++++---------- 3 files changed, 58 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/cocoa_status_item.m b/dlls/winemac.drv/cocoa_status_item.m index c38dc51..23d7805 100644 --- a/dlls/winemac.drv/cocoa_status_item.m +++ b/dlls/winemac.drv/cocoa_status_item.m @@ -110,12 +110,17 @@ { macdrv_event* event; NSUInteger typeMask = NSEventMaskFromType([nsevent type]); + CGPoint point = CGEventGetLocation([nsevent CGEvent]); + + point = cgpoint_win_from_mac(point); event = macdrv_create_event(STATUS_ITEM_MOUSE_BUTTON, nil); event->status_item_mouse_button.item = (macdrv_status_item)self; event->status_item_mouse_button.button = [nsevent buttonNumber]; event->status_item_mouse_button.down = (typeMask & (NSLeftMouseDownMask | NSRightMouseDownMask | NSOtherMouseDownMask)) != 0; event->status_item_mouse_button.count = [nsevent clickCount]; + event->status_item_mouse_button.x = floor(point.x); + event->status_item_mouse_button.y = floor(point.y); [queue postEvent:event]; macdrv_release_event(event); } @@ -164,8 +169,14 @@ - (void) mouseMoved:(NSEvent*)nsevent { macdrv_event* event; + CGPoint point = CGEventGetLocation([nsevent CGEvent]); + + point = cgpoint_win_from_mac(point); + event = macdrv_create_event(STATUS_ITEM_MOUSE_MOVE, nil); event->status_item_mouse_move.item = (macdrv_status_item)self; + event->status_item_mouse_move.x = floor(point.x); + event->status_item_mouse_move.y = floor(point.y); [queue postEvent:event]; macdrv_release_event(event); } diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 3ffeb01..c4d3a53 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -371,9 +371,13 @@ typedef struct macdrv_event { int button; int down; int count; + int x; + int y; } status_item_mouse_button; struct { macdrv_status_item item; + int x; + int y; } status_item_mouse_move; struct { int no_activate; diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 16d2e6c..9351d77 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -46,6 +46,7 @@ struct tray_icon WCHAR tiptext[128]; /* tooltip text */ DWORD state; /* state flags */ macdrv_status_item status_item; + UINT version; }; static struct list icon_list = LIST_INIT(icon_list); @@ -263,6 +264,13 @@ int CDECL wine_notify_icon(DWORD msg, NOTIFYICONDATAW *data) case 0xdead: /* Wine extension: owner window has died */ cleanup_icons(data->hWnd); break; + case NIM_SETVERSION: + if ((icon = get_icon(data->hWnd, data->uID))) + { + icon->version = data->uVersion; + ret = TRUE; + } + break; default: FIXME("unhandled tray message: %u\n", msg); break; @@ -270,6 +278,27 @@ int CDECL wine_notify_icon(DWORD msg, NOTIFYICONDATAW *data) return ret; } +static BOOL notify_owner(struct tray_icon *icon, UINT msg, int x, int y) +{ + WPARAM wp = icon->id; + LPARAM lp = msg; + + if (icon->version >= NOTIFY_VERSION_4) + { + wp = MAKEWPARAM(x, y); + lp = MAKELPARAM(msg, icon->id); + } + + TRACE("posting msg 0x%04x to hwnd %p id 0x%x\n", msg, icon->owner, icon->id); + if (!PostMessageW(icon->owner, icon->callback_message, wp, lp) && + (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) + { + WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); + delete_icon(icon); + return FALSE; + } + return TRUE; +} /*********************************************************************** * macdrv_status_item_mouse_button @@ -280,9 +309,10 @@ void macdrv_status_item_mouse_button(const macdrv_event *event) { struct tray_icon *icon; - TRACE("item %p button %d down %d count %d\n", event->status_item_mouse_button.item, + TRACE("item %p button %d down %d count %d pos %d,%d\n", event->status_item_mouse_button.item, event->status_item_mouse_button.button, event->status_item_mouse_button.down, - event->status_item_mouse_button.count); + event->status_item_mouse_button.count, event->status_item_mouse_button.x, + event->status_item_mouse_button.y); LIST_FOR_EACH_ENTRY(icon, &icon_list, struct tray_icon, entry) { @@ -313,13 +343,15 @@ void macdrv_status_item_mouse_button(const macdrv_event *event) return; } - TRACE("posting msg 0x%04x to hwnd %p id 0x%x\n", msg, icon->owner, icon->id); - if (!PostMessageW(icon->owner, icon->callback_message, icon->id, msg) && - GetLastError() == ERROR_INVALID_WINDOW_HANDLE) - { - WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); - delete_icon(icon); + if (!notify_owner(icon, msg, event->status_item_mouse_button.x, event->status_item_mouse_button.y)) return; + + if (icon->version) + { + if (msg == WM_LBUTTONUP) + notify_owner(icon, NIN_SELECT, event->status_item_mouse_button.x, event->status_item_mouse_button.y); + else if (msg == WM_RBUTTONUP) + notify_owner(icon, WM_CONTEXTMENU, event->status_item_mouse_button.x, event->status_item_mouse_button.y); } break; @@ -337,20 +369,14 @@ void macdrv_status_item_mouse_move(const macdrv_event *event) { struct tray_icon *icon; - TRACE("item %p\n", event->status_item_mouse_move.item); + TRACE("item %p pos %d,%d\n", event->status_item_mouse_move.item, + event->status_item_mouse_move.x, event->status_item_mouse_move.y); LIST_FOR_EACH_ENTRY(icon, &icon_list, struct tray_icon, entry) { if (icon->status_item == event->status_item_mouse_move.item) { - if (!PostMessageW(icon->owner, icon->callback_message, icon->id, WM_MOUSEMOVE) && - GetLastError() == ERROR_INVALID_WINDOW_HANDLE) - { - WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); - delete_icon(icon); - return; - } - + notify_owner(icon, WM_MOUSEMOVE, event->status_item_mouse_move.x, event->status_item_mouse_move.y); break; } }

1 0

Alistair Leslie-Hughes : include: Add drmexternals.idl and wmdrmsdk.idl.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: d5930db829680734ac0a6b10b1a2125cf24dba15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5930db829680734ac0a6b10b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 10 21:51:42 2017 -0600 include: Add drmexternals.idl and wmdrmsdk.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 2 ++ include/drmexternals.idl | 19 ++++++++++++ include/wmdrmsdk.idl | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ include/wmsdkidl.idl | 2 +- 4 files changed, 103 insertions(+), 1 deletion(-) diff --git a/include/Makefile.in b/include/Makefile.in index 497c76f..7846d67 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -58,6 +58,7 @@ IDL_SRCS = \ docobj.idl \ docobjectservice.idl \ downloadmgr.idl \ + drmexternals.idl \ dwrite.idl \ dwrite_1.idl \ dwrite_2.idl \ @@ -177,6 +178,7 @@ IDL_SRCS = \ wine/svcctl.idl \ wine/winedxgi.idl \ winsxs.idl \ + wmdrmsdk.idl \ wmiutils.idl \ wmp.idl \ wmsbuffer.idl \ diff --git a/include/drmexternals.idl b/include/drmexternals.idl new file mode 100644 index 0000000..88826ad --- /dev/null +++ b/include/drmexternals.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "wmdrmsdk.idl"; diff --git a/include/wmdrmsdk.idl b/include/wmdrmsdk.idl new file mode 100644 index 0000000..8de3b35 --- /dev/null +++ b/include/wmdrmsdk.idl @@ -0,0 +1,81 @@ +/* + * Copyright 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "mfobjects.idl"; +import "mfidl.idl"; + +typedef struct _DRM_MINIMUM_OUTPUT_PROTECTION_LEVELS +{ + WORD wCompressedDigitalVideo; + WORD wUncompressedDigitalVideo; + WORD wAnalogVideo; + WORD wCompressedDigitalAudio; + WORD wUncompressedDigitalAudio; +} DRM_MINIMUM_OUTPUT_PROTECTION_LEVELS; + +typedef struct _DRM_VIDEO_OUTPUT_PROTECTION +{ + GUID guidId; + BYTE bConfigData; +} DRM_VIDEO_OUTPUT_PROTECTION; + +typedef struct _DRM_VIDEO_OUTPUT_PROTECTION_IDS +{ + WORD cEntries; + DRM_VIDEO_OUTPUT_PROTECTION *rgVop; +} DRM_VIDEO_OUTPUT_PROTECTION_IDS; + +typedef struct _DRM_OPL_OUTPUT_IDS +{ + WORD cIds; + GUID *rgIds; +} DRM_OPL_OUTPUT_IDS; + +typedef struct __tagDRM_COPY_OPL +{ + WORD wMinimumCopyLevel; + DRM_OPL_OUTPUT_IDS oplIdIncludes; + DRM_OPL_OUTPUT_IDS oplIdExcludes; +} DRM_COPY_OPL; + +typedef struct __tagDRM_PLAY_OPL +{ + DRM_MINIMUM_OUTPUT_PROTECTION_LEVELS minOPL; + DRM_OPL_OUTPUT_IDS oplIdReserved; + DRM_VIDEO_OUTPUT_PROTECTION_IDS vopi; +} DRM_PLAY_OPL; + + +[ + uuid(82435be0-f7c1-4df9-8103-eeabebf3d6e1), + version(1.0) +] +library WMDRMContentEnablerLib +{ + importlib("stdole2.tlb"); + + [ + uuid(82435bdf-f7c1-4df9-8103-eeabebf3d6e1) + ] + coclass WMDRMContentEnablerActivate + { + [default] interface IPersistStream; + }; +}; diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 5ce849f..433ec46 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -18,7 +18,7 @@ import "oaidl.idl"; import "wmsbuffer.idl"; -/* import "drmexternals.idl"; */ +import "drmexternals.idl"; typedef unsigned __int64 QWORD;

1 0

Alistair Leslie-Hughes : include/wmsdkidl.idl: Add more interfaces.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 3dd254fd6ee7597cca5de0268d0f4a1b1ebfe2d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd254fd6ee7597cca5de0268… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 10 21:51:43 2017 -0600 include/wmsdkidl.idl: Add more interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 399 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 399 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3dd254fd6ee7597cca5de…

1 0

Alistair Leslie-Hughes : wmvcore/tests: Add more interface tests.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: b77688102a84e1c7b7278340c46f53db3e1cda00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77688102a84e1c7b7278340c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 10 21:51:44 2017 -0600 wmvcore/tests: Add more interface tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index ef77aff..4ceef77 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -66,6 +66,19 @@ static void test_wmreader_interfaces(void) IWMHeaderInfo2 *header2; IWMHeaderInfo3 *header3; IWMProfile *profile; + IWMProfile2 *profile2; + IWMProfile3 *profile3; + IWMPacketSize *packet; + IWMPacketSize2 *packet2; + IWMReaderAccelerator *accel; + IWMReaderTimecode *timecode; + IWMReaderNetworkConfig *netconfig; + IWMReaderNetworkConfig2 *netconfig2; + IWMReaderStreamClock *clock; + IWMReaderTypeNegotiation *negotiation; + IWMDRMReader *drmreader; + IWMDRMReader2 *drmreader2; + IWMDRMReader3 *drmreader3; hr = WMCreateReader( NULL, 0, &reader ); ok(hr == S_OK, "WMCreateReader failed 0x%08x\n", hr); @@ -93,18 +106,77 @@ static void test_wmreader_interfaces(void) hr = IWMReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + hr = IWMReader_QueryInterface(reader, &IID_IWMProfile2, (void **)&profile2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMProfile3, (void **)&profile3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMPacketSize, (void **)&packet); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMPacketSize2, (void **)&packet2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAccelerator, (void **)&accel); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderNetworkConfig, (void **)&netconfig); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderNetworkConfig2, (void **)&netconfig2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderStreamClock, (void **)&clock); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTypeNegotiation, (void **)&negotiation); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader, (void **)&drmreader); + ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader2, (void **)&drmreader2); + ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader3, (void **)&drmreader3); + ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); + + if(packet) + IWMPacketSize_Release(packet); + if(packet2) + IWMPacketSize2_Release(packet2); if(advanced) IWMReaderAdvanced_Release(advanced); if(advanced2) IWMReaderAdvanced2_Release(advanced2); if(profile) IWMProfile_Release(profile); + if(profile2) + IWMProfile2_Release(profile2); + if(profile3) + IWMProfile3_Release(profile3); if(header) IWMHeaderInfo_Release(header); if(header2) IWMHeaderInfo2_Release(header2); if(header3) IWMHeaderInfo3_Release(header3); + if(accel) + IWMReaderAccelerator_Release(accel); + if(timecode) + IWMReaderTimecode_Release(timecode); + if(netconfig) + IWMReaderNetworkConfig_Release(netconfig); + if(netconfig2) + IWMReaderNetworkConfig2_Release(netconfig2); + if(clock) + IWMReaderStreamClock_Release(clock); + if(negotiation) + IWMReaderTypeNegotiation_Release(negotiation); IWMReader_Release(reader); }

1 0