May 2016 - Wine-Commits - list.winehq.org

Nikolay Sivov : user32/tests: Fix a leak when creating test icons ( Valgrind).
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: 59ee884bdf4947f5939499456539fca7a5806939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ee884bdf4947f5939499456… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 14:43:22 2016 +0300 user32/tests: Fix a leak when creating test icons (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 5138c56..5f2306a 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1192,6 +1192,8 @@ static void create_ico_file(const char *filename, const test_icon_entries_t *tes ret = WriteFile(file, buf, icon_size, &bytes_written, NULL); ok(ret && bytes_written == icon_size, "icon.ico created improperly.\n"); CloseHandle(file); + + HeapFree(GetProcessHeap(), 0, buf); } static void test_LoadImage(void)

1 0

Andrey Gusev : wineps.drv: Fix typos.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: 4baef89f66aee501b788177ca80d9122cc411b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4baef89f66aee501b788177ca… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 26 18:15:27 2016 +0300 wineps.drv: Fix typos. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/data/COPYRIGHTS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/data/COPYRIGHTS b/dlls/wineps.drv/data/COPYRIGHTS index b5d4f63..5d3fa79 100644 --- a/dlls/wineps.drv/data/COPYRIGHTS +++ b/dlls/wineps.drv/data/COPYRIGHTS @@ -19,7 +19,7 @@ International Typeface Corporation. Windows metrics derived from Century Gothic Bold. Typeface copyright The Monotype Corporation plc. Data copyright The Monotype Corporation plc/Type -Solutions Inc. 1990-1991. All rights reserved. Centyry Gothic is a trademark +Solutions Inc. 1990-1991. All rights reserved. Century Gothic is a trademark of The Monotype Corporation plc. @@ -155,7 +155,7 @@ reserved. Helvetica is a trademark of Linotype AG and/or its subsidiaries. Windows metrics derived from Arial. Typeface copyright The Monotype Corporation plc. Data copyright The Monotype Corporation plc/Type Solutions Inc. 1990-1992. All rights reserved. Arial is a registered trademark of The Monotype -Corporation plc, registered in the United Stated Patent and Trademark Office and +Corporation plc, registered in the United States Patent and Trademark Office and elsewhere.

1 0

Alexandre Julliard : explorer: Display buttons on the task bar for running applications.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: 9da34d943eea1180b265b41e01eee17eed9e2d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da34d943eea1180b265b41e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 31 14:01:33 2016 +0900 explorer: Display buttons on the task bar for running applications. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 178 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 163 insertions(+), 15 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 8406ad2..1ed16ed 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -80,6 +80,18 @@ struct icon }; static struct list icon_list = LIST_INIT( icon_list ); + +struct taskbar_button +{ + struct list entry; + HWND hwnd; + HWND button; + BOOL active; + BOOL visible; +}; + +static struct list taskbar_buttons = LIST_INIT( taskbar_buttons ); + static HWND tray_window; static unsigned int alloc_displayed; @@ -88,13 +100,12 @@ static struct icon **displayed; /* array of currently displayed icons */ static BOOL hide_systray, enable_shell; static int icon_cx, icon_cy, tray_width, tray_height; +static int start_button_width, taskbar_button_width; static WCHAR start_label[50]; static struct icon *balloon_icon; static HWND balloon_window; -static HWND start_button; - #define MIN_DISPLAYED 8 #define ICON_BORDER 2 @@ -461,6 +472,47 @@ static void cleanup_systray_window( HWND hwnd ) } } +/* update the taskbar buttons when something changed */ +static void sync_taskbar_buttons(void) +{ + struct taskbar_button *win; + int pos = 0, count = 0; + int width = taskbar_button_width; + int right = tray_width - nb_displayed * icon_cx; + HWND foreground = GetAncestor( GetForegroundWindow(), GA_ROOTOWNER ); + + LIST_FOR_EACH_ENTRY( win, &taskbar_buttons, struct taskbar_button, entry ) + { + if (!win->hwnd) /* start button */ + { + SetWindowPos( win->button, 0, pos, 0, start_button_width, tray_height, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); + pos += start_button_width; + continue; + } + win->active = (win->hwnd == foreground); + win->visible = IsWindowVisible( win->hwnd ) && !GetWindow( win->hwnd, GW_OWNER ); + if (win->visible) count++; + } + + /* shrink buttons if space is tight */ + if (count && (count * width > right - pos)) + width = max( taskbar_button_width / 4, (right - pos) / count ); + + LIST_FOR_EACH_ENTRY( win, &taskbar_buttons, struct taskbar_button, entry ) + { + if (!win->hwnd) continue; /* start button */ + if (win->visible && right - pos >= width) + { + SetWindowPos( win->button, 0, pos, 0, width, tray_height, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); + InvalidateRect( win->button, NULL, TRUE ); + pos += width; + } + else SetWindowPos( win->button, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_HIDEWINDOW ); + } +} + static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) { struct icon *icon = NULL; @@ -535,17 +587,106 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) } if (nid.hIcon) DestroyIcon( nid.hIcon ); + sync_taskbar_buttons(); return ret; } +static void add_taskbar_button( HWND hwnd ) +{ + struct taskbar_button *win; + + /* ignore our own windows */ + if (hwnd) + { + DWORD process; + if (!GetWindowThreadProcessId( hwnd, &process ) || process == GetCurrentProcessId()) return; + } + + if (!(win = HeapAlloc( GetProcessHeap(), 0, sizeof(*win) ))) return; + win->hwnd = hwnd; + win->button = CreateWindowW( WC_BUTTONW, NULL, WS_CHILD | BS_OWNERDRAW, + 0, 0, 0, 0, tray_window, (HMENU)hwnd, 0, 0 ); + list_add_tail( &taskbar_buttons, &win->entry ); +} + +static struct taskbar_button *find_taskbar_button( HWND hwnd ) +{ + struct taskbar_button *win; + + LIST_FOR_EACH_ENTRY( win, &taskbar_buttons, struct taskbar_button, entry ) + if (win->hwnd == hwnd) return win; + + return NULL; +} + +static void remove_taskbar_button( HWND hwnd ) +{ + struct taskbar_button *win = find_taskbar_button( hwnd ); + + if (!win) return; + list_remove( &win->entry ); + DestroyWindow( win->button ); + HeapFree( GetProcessHeap(), 0, win ); +} + static void paint_taskbar_button( const DRAWITEMSTRUCT *dis ) { RECT rect; + UINT flags = DC_TEXT; + struct taskbar_button *win = find_taskbar_button( LongToHandle( dis->CtlID )); + if (!win) return; GetClientRect( dis->hwndItem, &rect ); DrawFrameControl( dis->hDC, &rect, DFC_BUTTON, DFCS_BUTTONPUSH | DFCS_ADJUSTRECT | ((dis->itemState & ODS_SELECTED) ? DFCS_PUSHED : 0 )); - DrawCaptionTempW( 0, dis->hDC, &rect, 0, 0, start_label, DC_TEXT | DC_INBUTTON | DC_ICON ); + if (win->hwnd) + { + flags |= win->active ? DC_ACTIVE : DC_INBUTTON; + DrawCaptionTempW( win->hwnd, dis->hDC, &rect, 0, 0, NULL, flags ); + } + else /* start button */ + DrawCaptionTempW( 0, dis->hDC, &rect, 0, 0, start_label, flags | DC_INBUTTON | DC_ICON ); +} + +static void click_taskbar_button( HWND button ) +{ + LONG_PTR id = GetWindowLongPtrW( button, GWLP_ID ); + HWND hwnd = (HWND)id; + + if (!hwnd) /* start button */ + { + do_startmenu( tray_window ); + return; + } + + if (IsIconic( hwnd )) + { + SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + return; + } + + if (IsWindowEnabled( hwnd )) + { + if (hwnd == GetForegroundWindow()) + { + SendMessageW( hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0 ); + return; + } + } + else /* look for an enabled window owned by this one */ + { + HWND owned = GetWindow( GetDesktopWindow(), GW_CHILD ); + while (owned && owned != hwnd) + { + if (IsWindowVisible( owned ) && + IsWindowEnabled( owned ) && + (GetWindow( owned, GW_OWNER ) == hwnd)) + break; + owned = GetWindow( owned, GW_HWNDNEXT ); + } + hwnd = owned; + } + SetForegroundWindow( hwnd ); } static void do_hide_systray(void) @@ -558,7 +699,7 @@ static void do_hide_systray(void) static void do_show_systray(void) { - SIZE start_button_size; + SIZE size; NONCLIENTMETRICSW ncm; HFONT font; HDC hdc = GetDC( 0 ); @@ -568,17 +709,19 @@ static void do_show_systray(void) font = CreateFontIndirectW( &ncm.lfCaptionFont ); /* FIXME: Implement BCM_GETIDEALSIZE and use that instead. */ SelectObject( hdc, font ); - GetTextExtentPointW( hdc, start_label, lstrlenW(start_label), &start_button_size ); + GetTextExtentPointA( hdc, "abcdefghijklmnopqrstuvwxyz", 26, &size ); + taskbar_button_width = size.cx; + GetTextExtentPointW( hdc, start_label, lstrlenW(start_label), &size ); /* add some margins (FIXME) */ - start_button_size.cx += 12 + GetSystemMetrics( SM_CXSMICON ); - start_button_size.cy += 4; + size.cx += 12 + GetSystemMetrics( SM_CXSMICON ); + size.cy += 4; ReleaseDC( 0, hdc ); DeleteObject( font ); tray_width = GetSystemMetrics( SM_CXSCREEN ); - tray_height = max( icon_cy, start_button_size.cy ); - SetWindowPos( start_button, 0, 0, 0, start_button_size.cx, tray_height, - SWP_NOACTIVATE | SWP_NOZORDER ); + tray_height = max( icon_cy, size.cy ); + start_button_width = size.cx; + sync_taskbar_buttons(); SetWindowPos( tray_window, HWND_TOPMOST, 0, GetSystemMetrics( SM_CYSCREEN ) - tray_height, tray_width, tray_height, SWP_NOACTIVATE | SWP_SHOWWINDOW ); } @@ -666,10 +809,12 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l break; case WM_COMMAND: - if ((HWND)lparam == start_button && HIWORD(wparam) == BN_CLICKED) - do_startmenu(hwnd); + if (HIWORD(wparam) == BN_CLICKED) click_taskbar_button( (HWND)lparam ); break; + case WM_MOUSEACTIVATE: + return MA_NOACTIVATE; + case WM_INITMENUPOPUP: case WM_MENUCOMMAND: return menu_wndproc(hwnd, msg, wparam, lparam); @@ -685,10 +830,15 @@ void handle_parent_notify( HWND hwnd, WPARAM wp ) { switch (LOWORD(wp)) { + case WM_CREATE: + add_taskbar_button( hwnd ); + break; case WM_DESTROY: + remove_taskbar_button( hwnd ); cleanup_systray_window( hwnd ); break; } + sync_taskbar_buttons(); } /* this function creates the listener window */ @@ -696,7 +846,6 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab { WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; - static const WCHAR button_class[] = {'B','u','t','t','o','n',0}; wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); @@ -732,8 +881,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab LoadStringW( NULL, IDS_START_LABEL, start_label, sizeof(start_label)/sizeof(WCHAR) ); - start_button = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE | BS_OWNERDRAW, - 0, 0, 0, 0, tray_window, 0, 0, 0 ); + add_taskbar_button( 0 ); if (hide_systray) do_hide_systray(); else if (enable_shell) do_show_systray();

1 0

Alexandre Julliard : user32: Post notification to the desktop window for window creation/activation.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: 596c16cc13f9f2af24d0e8e88519de9f1d1a3a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=596c16cc13f9f2af24d0e8e88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 31 13:53:15 2016 +0900 user32: Post notification to the desktop window for window creation/activation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 9 +++++++++ dlls/user32/win.c | 3 +++ 2 files changed, 12 insertions(+) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 3352e46..a9de812 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1102,6 +1102,7 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip ) */ LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) { + HWND parent = GetAncestor( hwnd, GA_PARENT ); DWORD dwStyle = GetWindowLongW( hwnd, GWL_STYLE ); if( dwStyle & WS_VISIBLE ) @@ -1110,6 +1111,9 @@ LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) WINPOS_RedrawIconTitle( hwnd ); else NC_DoNCPaint( hwnd, clip ); + + if (parent == GetDesktopWindow()) + PostMessageW( parent, WM_PARENTNOTIFY, WM_NCPAINT, (LPARAM)hwnd ); } return 0; } @@ -1122,6 +1126,7 @@ LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) */ LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) { + HWND parent; WND* wndPtr = WIN_GetPtr( hwnd ); if (!wndPtr || wndPtr == WND_OTHER_PROCESS) return FALSE; @@ -1133,6 +1138,7 @@ LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) */ if (wParam) wndPtr->flags |= WIN_NCACTIVATED; else wndPtr->flags &= ~WIN_NCACTIVATED; + parent = wndPtr->parent; WIN_ReleasePtr( wndPtr ); /* This isn't documented but is reproducible in at least XP SP2 and @@ -1144,6 +1150,9 @@ LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) WINPOS_RedrawIconTitle( hwnd ); else NC_DoNCPaint( hwnd, (HRGN)1 ); + + if (parent == GetDesktopWindow()) + PostMessageW( parent, WM_PARENTNOTIFY, WM_NCACTIVATE, (LPARAM)hwnd ); } return TRUE; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8474e2d..eb1aeda 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1659,6 +1659,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, send_parent_notify( hwnd, WM_CREATE ); if (!IsWindow( hwnd )) return 0; + if (parent == GetDesktopWindow()) + PostMessageW( parent, WM_PARENTNOTIFY, WM_CREATE, (LPARAM)hwnd ); + if (cs->style & WS_VISIBLE) { if (cs->style & WS_MAXIMIZE)

1 0

Lauri Kenttä : winefile: Fix horizontal scrolling.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: c1ab903f22d267abd6186ae4f5e1c856027bae31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ab903f22d267abd6186ae4f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon May 30 20:42:53 2016 +0300 winefile: Fix horizontal scrolling. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index f8247a7..5709c8e 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -118,6 +118,7 @@ typedef struct { #define COLUMNS 10 int widths[COLUMNS]; + int widths_shown[COLUMNS]; int positions[COLUMNS+1]; BOOL treePane; @@ -2355,6 +2356,7 @@ static HWND create_header(HWND parent, Pane* pane, UINT id) hdi.pszText = g_pos_names[idx]; hdi.fmt = HDF_STRING | g_pos_align[idx]; hdi.cxy = pane->widths[idx]; + pane->widths_shown[idx] = hdi.cxy; SendMessageW(hwnd, HDM_INSERTITEMW, idx, (LPARAM)&hdi); } @@ -3168,17 +3170,20 @@ static void set_header(Pane* pane) for(; (i < COLUMNS) && (x+pane->widths[i] < scroll_pos); i++) { x += pane->widths[i]; + pane->widths_shown[i] = item.cxy; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item); } if (i < COLUMNS) { x += pane->widths[i]; item.cxy = x - scroll_pos; + pane->widths_shown[i] = item.cxy; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i++, (LPARAM)&item); for(; i < COLUMNS; i++) { item.cxy = pane->widths[i]; x += pane->widths[i]; + pane->widths_shown[i] = item.cxy; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item); } } @@ -3190,13 +3195,14 @@ static LRESULT pane_notify(Pane* pane, NMHDR* pnmh) case HDN_ITEMCHANGEDW: { LPNMHEADERW phdn = (LPNMHEADERW)pnmh; int idx = phdn->iItem; - int dx = phdn->pitem->cxy - pane->widths[idx]; + int dx = phdn->pitem->cxy - pane->widths_shown[idx]; int i; RECT clnt; GetClientRect(pane->hwnd, &clnt); pane->widths[idx] += dx; + pane->widths_shown[idx] += dx; for(i=idx; ++i<=COLUMNS; ) pane->positions[i] += dx;

1 0

Paul Gofman : d3dx9/tests: Add test for IsParameterUsed function.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: 571119a585c929fcada80dfab88ed0d9311f2355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=571119a585c929fcada80dfab… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu May 26 21:18:37 2016 +0300 d3dx9/tests: Add test for IsParameterUsed function. 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/tests/effect.c | 539 ++++++++++++++++++++++++++----------------- 1 file changed, 323 insertions(+), 216 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=571119a585c929fcada80…

1 0

Paul Gofman : d3dx9: Implement IsParameterUsed function in effect.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: fe1a89d14f43f2a56ec05bae475b6496dafd681b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1a89d14f43f2a56ec05bae4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu May 26 21:18:36 2016 +0300 d3dx9: Implement IsParameterUsed function in effect. 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/effect.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 109 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7d5e612..7772406 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -188,6 +188,8 @@ static HRESULT d3dx9_parse_state(struct d3dx9_base_effect *base, struct d3dx_sta const char *data, const char **ptr, struct d3dx_object *objects); static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child); +typedef BOOL (*walk_parameter_dep_func)(void *data, struct d3dx_parameter *param); + static const struct { enum STATE_CLASS class; @@ -3545,15 +3547,119 @@ static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect* iface, return E_NOTIMPL; } +static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func, + void *data); + +static BOOL walk_param_eval_dep(struct d3dx_param_eval *param_eval, walk_parameter_dep_func param_func, + void *data) +{ + struct d3dx_parameter **params; + unsigned int i, param_count; + + if (!param_eval) + return FALSE; + + params = param_eval->shader_inputs.inputs_param; + param_count = param_eval->shader_inputs.input_count; + for (i = 0; i < param_count; ++i) + { + if (walk_parameter_dep(params[i], param_func, data)) + return TRUE; + } + + params = param_eval->pres.inputs.inputs_param; + param_count = param_eval->pres.inputs.input_count; + for (i = 0; i < param_count; ++i) + { + if (walk_parameter_dep(params[i], param_func, data)) + return TRUE; + } + return FALSE; +} + +static BOOL walk_state_dep(struct d3dx_state *state, walk_parameter_dep_func param_func, + void *data) +{ + if (state->type == ST_CONSTANT && is_param_type_sampler(state->parameter.type)) + { + if (walk_parameter_dep(&state->parameter, param_func, data)) + return TRUE; + } + else if (state->type == ST_ARRAY_SELECTOR || state->type == ST_PARAMETER) + { + if (walk_parameter_dep(state->parameter.referenced_param, param_func, data)) + return TRUE; + } + return walk_param_eval_dep(state->parameter.param_eval, param_func, data); +} + +static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func, + void *data) +{ + unsigned int i; + unsigned int member_count; + + if (param_func(data, param)) + return TRUE; + + if (walk_param_eval_dep(param->param_eval, param_func, data)) + return TRUE; + + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) + { + struct d3dx_sampler *sampler; + + sampler = (struct d3dx_sampler *)param->data; + for (i = 0; i < sampler->state_count; ++i) + { + if (walk_state_dep(&sampler->states[i], param_func, data)) + return TRUE; + } + return FALSE; + } + + member_count = param->element_count ? param->element_count : param->member_count; + for (i = 0; i < member_count; ++i) + { + if (walk_param_eval_dep(param->members[i].param_eval, param_func, data)) + return TRUE; + } + + return FALSE; +} + +static BOOL compare_param_ptr(void *param_comp, struct d3dx_parameter *param) +{ + return param_comp == param; +} + static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + unsigned int i, j; struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); + struct d3dx_pass *pass; - FIXME("iface %p, parameter %p, technique %p stub.\n", iface, parameter, technique); - TRACE("param %p (%s).\n", param, param ? debugstr_a(param->name) : ""); + TRACE("iface %p, parameter %p, technique %p.\n", iface, parameter, technique); + TRACE("param %p, name %s, tech %p.\n", param, param ? debugstr_a(param->name) : "", tech); + if (!tech || !param) + return FALSE; - return TRUE; + for (i = 0; i < tech->pass_count; ++i) + { + pass = &tech->passes[i]; + for (j = 0; j < pass->state_count; ++j) + { + if (walk_state_dep(&pass->states[j], compare_param_ptr, param)) + { + TRACE("Returning TRUE.\n"); + return TRUE; + } + } + } + TRACE("Returning FALSE.\n"); + return FALSE; } static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags)

1 0

Francois Gouget : ole32: Spelling fixes.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: e0a9e5ae26f888af90b6e0ed7b7a977e94e2cf7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a9e5ae26f888af90b6e0ed7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:41:43 2016 +0200 ole32: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 2 +- dlls/ole32/compobj.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index b871bbc..2cc1cfa 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1818,7 +1818,7 @@ void OLEClipbrd_UnInitialize(void) * * Enumerate all formats supported by the source and make * those formats available using delayed rendering using SetClipboardData. - * Cache the enumeration list and make that list visibile as the + * Cache the enumeration list and make that list visible as the * 'Ole Private Data' format on the clipboard. * */ diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ced6f7d..9050f0a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4989,8 +4989,8 @@ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) context->IComThreadingInfo_iface.lpVtbl = &Context_Threading_Vtbl; context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; - /* Context token does not take a reference, it's always zero until - interface is explicitely requested with CoGetObjectContext(). */ + /* Context token does not take a reference, it's always zero until the + interface is explicitly requested with CoGetObjectContext(). */ context->refs = 0; info->context_token = &context->IObjContext_iface;

1 0

Alistair Leslie-Hughes : inetcomm: Add support for PID ids in MimeBody Get /SetProp.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: 4c92dd98a4f7972eb1042668df3ba0454a1d8e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c92dd98a4f7972eb1042668d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 30 10:19:16 2016 +0000 inetcomm: Add support for PID ids in MimeBody Get/SetProp. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 73 ++++++++++++++++++++++++++++++++++++++++--- dlls/inetcomm/tests/mimeole.c | 41 ++++++++++++++++++++++++ include/mimeole.idl | 4 +++ 3 files changed, 113 insertions(+), 5 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 71dc712..5280798 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -496,7 +496,15 @@ static HRESULT find_prop(MimeBody *body, const char *name, header_t **prop) LIST_FOR_EACH_ENTRY(header, &body->headers, header_t, entry) { - if(!lstrcmpiA(name, header->prop->name)) + if(ISPIDSTR(name)) + { + if(STRTOPID(name) == header->prop->id) + { + *prop = header; + return S_OK; + } + } + else if(!lstrcmpiA(name, header->prop->name)) { *prop = header; return S_OK; @@ -506,6 +514,33 @@ static HRESULT find_prop(MimeBody *body, const char *name, header_t **prop) return MIME_E_NOT_FOUND; } +static const property_t *find_default_prop(const char *name) +{ + const property_t *prop_def = NULL; + + for(prop_def = default_props; prop_def->name; prop_def++) + { + if(ISPIDSTR(name)) + { + if(STRTOPID(name) == prop_def->id) + { + break; + } + } + else if(!lstrcmpiA(name, prop_def->name)) + { + break; + } + } + + if(prop_def->id) + TRACE("%s: found match with default property id %d\n", prop_def->name, prop_def->id); + else + prop_def = NULL; + + return prop_def; +} + static HRESULT WINAPI MimeBody_QueryInterface(IMimeBody* iface, REFIID riid, void** ppvObject) @@ -650,7 +685,7 @@ static HRESULT WINAPI MimeBody_GetProp( if(!pszName || !pValue) return E_INVALIDARG; - if(!lstrcmpiA(pszName, "att:pri-content-type")) + if(!ISPIDSTR(pszName) && !lstrcmpiA(pszName, "att:pri-content-type")) { PropVariantClear(pValue); pValue->vt = VT_LPSTR; @@ -690,7 +725,16 @@ static HRESULT WINAPI MimeBody_SetProp( LIST_FOR_EACH_ENTRY(prop_entry, &This->new_props, property_list_entry_t, entry) { - if(!lstrcmpiA(pszName, prop_entry->prop.name)) + if(ISPIDSTR(pszName)) + { + if(STRTOPID(pszName) == prop_entry->prop.id) + { + TRACE("Found match with already added new property id %d\n", prop_entry->prop.id); + prop = &prop_entry->prop; + break; + } + } + else if(!lstrcmpiA(pszName, prop_entry->prop.name)) { TRACE("Found match with already added new property id %d\n", prop_entry->prop.id); prop = &prop_entry->prop; @@ -704,14 +748,33 @@ static HRESULT WINAPI MimeBody_SetProp( if(!prop) { + const property_t *prop_def = NULL; prop_entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*prop_entry)); if(!prop_entry) { HeapFree(GetProcessHeap(), 0, header); return E_OUTOFMEMORY; } - prop_entry->prop.name = strdupA(pszName); - prop_entry->prop.id = This->next_prop_id++; + + prop_def = find_default_prop(pszName); + if(prop_def) + { + prop_entry->prop.name = strdupA(prop_def->name); + prop_entry->prop.id = prop_def->id; + } + else + { + if(ISPIDSTR(pszName)) + { + HeapFree(GetProcessHeap(), 0, prop_entry); + HeapFree(GetProcessHeap(), 0, header); + return MIME_E_NOT_FOUND; + } + + prop_entry->prop.name = strdupA(pszName); + prop_entry->prop.id = This->next_prop_id++; + } + prop_entry->prop.flags = 0; prop_entry->prop.default_vt = pValue->vt; list_add_tail(&This->new_props, &prop_entry->entry); diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index f0fac08..29ab6d8 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -379,6 +379,47 @@ static void test_MessageSetProp(void) PropVariantClear(&prop); } + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(topic)+1); + strcpy(prop.u.pszVal, topic); + hr = IMimeBody_SetProp(body, PIDTOSTR(PID_HDR_SUBJECT), 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + hr = IMimeBody_GetProp(body, PIDTOSTR(PID_HDR_SUBJECT), 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + if(hr == S_OK) + { + ok(prop.vt == VT_LPSTR, "type %d\n", prop.vt); + ok(!strcmp(prop.u.pszVal, topic), "got %s\n", prop.u.pszVal); + PropVariantClear(&prop); + } + + /* Using the name or PID returns the same result. */ + hr = IMimeBody_GetProp(body, "Subject", 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + if(hr == S_OK) + { + ok(prop.vt == VT_LPSTR, "type %d\n", prop.vt); + ok(!strcmp(prop.u.pszVal, topic), "got %s\n", prop.u.pszVal); + PropVariantClear(&prop); + } + + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(topic)+1); + strcpy(prop.u.pszVal, topic); + hr = IMimeBody_SetProp(body, PIDTOSTR(PID_HDR_TO), 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + /* Out of Range PID */ + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(topic)+1); + strcpy(prop.u.pszVal, topic); + hr = IMimeBody_SetProp(body, PIDTOSTR(124), 0, &prop); + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); + PropVariantClear(&prop); + IMimeBody_Release(body); IMimeMessage_Release(msg); } diff --git a/include/mimeole.idl b/include/mimeole.idl index 4a0d86c..437781d 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -153,6 +153,10 @@ cpp_quote(" PID_ATT_ACCOUNTNAME = 78,") cpp_quote(" PID_LAST = 79,") cpp_quote("} MIMEPROPID;") +cpp_quote("#define ISPIDSTR(_name) (((DWORD_PTR)(_name) >> 16) == 0)") +cpp_quote("#define STRTOPID(_name) ((DWORD)((DWORD_PTR)((LPCSTR)(_name))))") +cpp_quote("#define PIDTOSTR(_id) ((LPCSTR)((DWORD_PTR)(_id)))") + cpp_quote("#define TYPEDID_ID(_typedid) (((ULONG)(_typedid))>>16)") cpp_quote("#define TYPEDID_MASK ((ULONG)0xffff)") cpp_quote("#define TYPEDID_TYPE(t) ((VARTYPE)((t) & TYPEDID_MASK))")

1 0

Lauri Kenttä : winefile: Clarify header width calculations.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: a3547a1359f9bf0f0603ff44c5eaf7972723d21a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3547a1359f9bf0f0603ff44c… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon May 30 20:42:54 2016 +0300 winefile: Clarify header width calculations. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 5709c8e..327e92a 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -3163,29 +3163,20 @@ static void set_header(Pane* pane) { HDITEMW item; int scroll_pos = GetScrollPos(pane->hwnd, SB_HORZ); - int i=0, x=0; + int i; item.mask = HDI_WIDTH; - item.cxy = 0; - for(; (i < COLUMNS) && (x+pane->widths[i] < scroll_pos); i++) { - x += pane->widths[i]; - pane->widths_shown[i] = item.cxy; - SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item); - } - - if (i < COLUMNS) { - x += pane->widths[i]; - item.cxy = x - scroll_pos; - pane->widths_shown[i] = item.cxy; - SendMessageW(pane->hwndHeader, HDM_SETITEMW, i++, (LPARAM)&item); - - for(; i < COLUMNS; i++) { + for (i = 0; i < COLUMNS; ++i) { + if (pane->positions[i] >= scroll_pos) { item.cxy = pane->widths[i]; - x += pane->widths[i]; - pane->widths_shown[i] = item.cxy; - SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item); + } else if (pane->positions[i+1] <= scroll_pos) { + item.cxy = 0; + } else { + item.cxy = pane->positions[i+1] - scroll_pos; } + pane->widths_shown[i] = item.cxy; + SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item); } }

1 0