September 2012 - Wine-Commits

Alexandre Julliard : winex11: Store the window display connection in the window structure.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: ba926faf919ac5b069363534755d366f868cd07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba926faf919ac5b0693635347… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 16:29:24 2012 +0200 winex11: Store the window display connection in the window structure. --- dlls/winex11.drv/desktop.c | 7 +- dlls/winex11.drv/event.c | 5 +- dlls/winex11.drv/window.c | 177 +++++++++++++++++++++----------------------- dlls/winex11.drv/x11drv.h | 3 +- 4 files changed, 91 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba926faf919ac5b069363…

1 0

Alexandre Julliard : winex11: Move the support for making the owner window managed to a separate function .
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: d82082c14ffe0aad6a9abd82ebaf425104b7952f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82082c14ffe0aad6a9abd82e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 11:31:28 2012 +0200 winex11: Move the support for making the owner window managed to a separate function. --- dlls/winex11.drv/window.c | 111 +++++++++++++++++++++++++------------------- 1 files changed, 63 insertions(+), 48 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 94edb81..d4f3f9b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -160,15 +160,21 @@ struct has_popup_result BOOL found; }; +static BOOL is_managed( HWND hwnd ) +{ + struct x11drv_win_data *data = get_win_data( hwnd ); + BOOL ret = data && data->managed; + release_win_data( data ); + return ret; +} + static BOOL CALLBACK has_managed_popup( HWND hwnd, LPARAM lparam ) { struct has_popup_result *result = (struct has_popup_result *)lparam; - struct x11drv_win_data *data; if (hwnd == result->hwnd) return FALSE; /* popups are always above owner */ - if (!(data = X11DRV_get_win_data( hwnd ))) return TRUE; if (GetWindow( hwnd, GW_OWNER ) != result->hwnd) return TRUE; - result->found = data->managed; + result->found = is_managed( hwnd ); return !result->found; } @@ -733,6 +739,46 @@ static void set_mwm_hints( Display *display, struct x11drv_win_data *data, DWORD /*********************************************************************** + * set_style_hints + */ +static void set_style_hints( Display *display, struct x11drv_win_data *data, DWORD style, DWORD ex_style ) +{ + Window group_leader = data->whole_window; + HWND owner = GetWindow( data->hwnd, GW_OWNER ); + Window owner_win = X11DRV_get_whole_window( owner ); + Atom window_type; + + if (owner_win) + { + XSetTransientForHint( display, data->whole_window, owner_win ); + group_leader = owner_win; + } + + /* Only use dialog type for owned popups. Metacity allows making fullscreen + * only normal windows, and doesn't handle correctly TRANSIENT_FOR hint for + * dialogs owned by fullscreen windows. + */ + if (((style & WS_POPUP) || (ex_style & WS_EX_DLGMODALFRAME)) && owner) + window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); + else + window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); + + XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), + XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1); + + /* wm hints */ + if (data->wm_hints) + { + data->wm_hints->flags |= InputHint | StateHint | WindowGroupHint; + data->wm_hints->input = !use_take_focus && !(style & WS_DISABLED); + data->wm_hints->initial_state = (style & WS_MINIMIZE) ? IconicState : NormalState; + data->wm_hints->window_group = group_leader; + XSetWMHints( display, data->whole_window, data->wm_hints ); + } +} + + +/*********************************************************************** * get_process_name * * get the name of the current process for setting class hints @@ -823,83 +869,50 @@ static void set_initial_wm_hints( HWND hwnd ) /*********************************************************************** - * get_owner_whole_window + * make_owner_managed * - * Retrieve an owner's window, creating it if necessary. + * If the window is managed, make sure its owner window is too. */ -static Window get_owner_whole_window( HWND owner, BOOL force_managed ) +static void make_owner_managed( HWND hwnd ) { - struct x11drv_win_data *data; - - if (!owner) return 0; + HWND owner; - if (!(data = X11DRV_get_win_data( owner ))) return (Window)GetPropA( owner, whole_window_prop ); + if (!(owner = GetWindow( hwnd, GW_OWNER ))) return; + if (is_managed( owner )) return; + if (!is_managed( hwnd )) return; - if (!data->managed && force_managed) /* make it managed */ - { - SetWindowPos( owner, 0, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE | - SWP_NOREDRAW | SWP_DEFERERASE | SWP_NOSENDCHANGING | SWP_STATECHANGED ); - } - return data->whole_window; + SetWindowPos( owner, 0, 0, 0, 0, 0, + SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE | + SWP_NOREDRAW | SWP_DEFERERASE | SWP_NOSENDCHANGING | SWP_STATECHANGED ); } /*********************************************************************** * set_wm_hints * - * Set the window manager hints for a newly-created window + * Set all the window manager hints for a window. */ static void set_wm_hints( HWND hwnd ) { Display *display = thread_display(); struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); - Window group_leader = data->whole_window; - Window owner_win = 0; - Atom window_type; DWORD style, ex_style; - HWND owner; if (hwnd == GetDesktopWindow()) { /* force some styles for the desktop to get the correct decorations */ style = WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; ex_style = WS_EX_APPWINDOW; - owner = 0; } else { style = GetWindowLongW( hwnd, GWL_STYLE ); ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); - owner = GetWindow( hwnd, GW_OWNER ); - if ((owner_win = get_owner_whole_window( owner, data->managed ))) group_leader = owner_win; } - if (owner_win) XSetTransientForHint( display, data->whole_window, owner_win ); - - /* size hints */ set_size_hints( display, data, style ); set_mwm_hints( display, data, style, ex_style ); - - /* Only use dialog type for owned popups. Metacity allows making fullscreen - * only normal windows, and doesn't handle correctly TRANSIENT_FOR hint for - * dialogs owned by fullscreen windows. - */ - if (((style & WS_POPUP) || (ex_style & WS_EX_DLGMODALFRAME)) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); - else window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - - XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), - XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1); - - /* wm hints */ - if (data->wm_hints) - { - data->wm_hints->flags |= InputHint | StateHint | WindowGroupHint; - data->wm_hints->input = !use_take_focus && !(style & WS_DISABLED); - data->wm_hints->initial_state = (style & WS_MINIMIZE) ? IconicState : NormalState; - data->wm_hints->window_group = group_leader; - XSetWMHints( display, data->whole_window, data->wm_hints ); - } + set_style_hints( display, data, style, ex_style ); } @@ -2157,6 +2170,8 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if ((new_style & WS_VISIBLE) && ((new_style & WS_MINIMIZE) || is_window_rect_mapped( rectWindow ))) { + if (!data->mapped) make_owner_managed( hwnd ); + if (!data->mapped || (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED))) set_wm_hints( hwnd ); if (!data->mapped)

1 0

Henri Verbeet : wined3d: Just return the declaration from wined3d_device_get_vertex_declaration().
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 2f03ad1a40e48884d1d4ddeb6edfa3991f785faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f03ad1a40e48884d1d4ddeb6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 20 22:59:21 2012 +0200 wined3d: Just return the declaration from wined3d_device_get_vertex_declaration(). --- dlls/d3d8/device.c | 19 +++++-------------- dlls/d3d9/device.c | 23 +++++------------------ dlls/wined3d/device.c | 11 +++-------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 +-- 5 files changed, 15 insertions(+), 43 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 244e4c0..baa8b63 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2153,33 +2153,24 @@ static HRESULT WINAPI d3d8_device_GetVertexShader(IDirect3DDevice8 *iface, DWORD struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_vertex_declaration *wined3d_declaration; struct d3d8_vertex_declaration *d3d8_declaration; - HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_device_get_vertex_declaration(device->wined3d_device, &wined3d_declaration))) + if ((wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) { - wined3d_mutex_unlock(); - WARN("Failed to get wined3d vertex declaration, hr %#x.\n", hr); - return hr; + d3d8_declaration = wined3d_vertex_declaration_get_parent(wined3d_declaration); + *shader = d3d8_declaration->shader_handle; } - - if (!wined3d_declaration) + else { - wined3d_mutex_unlock(); *shader = 0; - return D3D_OK; } - - d3d8_declaration = wined3d_vertex_declaration_get_parent(wined3d_declaration); - wined3d_vertex_declaration_decref(wined3d_declaration); wined3d_mutex_unlock(); - *shader = d3d8_declaration->shader_handle; TRACE("Returning %#x.\n", *shader); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_DeleteVertexShader(IDirect3DDevice8 *iface, DWORD shader) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ea2fd1f..b1b7b80 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2088,22 +2088,19 @@ static HRESULT WINAPI d3d9_device_GetVertexDeclaration(IDirect3DDevice9Ex *iface IDirect3DVertexDeclaration9 **declaration) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - struct wined3d_vertex_declaration *wined3d_declaration = NULL; + struct wined3d_vertex_declaration *wined3d_declaration; struct d3d9_vertex_declaration *declaration_impl; - HRESULT hr; TRACE("iface %p, declaration %p.\n", iface, declaration); if (!declaration) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_device_get_vertex_declaration(device->wined3d_device, &wined3d_declaration); - if (SUCCEEDED(hr) && wined3d_declaration) + if ((wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) { declaration_impl = wined3d_vertex_declaration_get_parent(wined3d_declaration); *declaration = &declaration_impl->IDirect3DVertexDeclaration9_iface; IDirect3DVertexDeclaration9_AddRef(*declaration); - wined3d_vertex_declaration_decref(wined3d_declaration); } else { @@ -2112,7 +2109,7 @@ static HRESULT WINAPI d3d9_device_GetVertexDeclaration(IDirect3DDevice9Ex *iface wined3d_mutex_unlock(); TRACE("Returning %p.\n", *declaration); - return hr; + return D3D_OK; } static struct wined3d_vertex_declaration *device_get_fvf_declaration(struct d3d9_device *device, DWORD fvf) @@ -2215,24 +2212,14 @@ static HRESULT WINAPI d3d9_device_GetFVF(IDirect3DDevice9Ex *iface, DWORD *fvf) struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_vertex_declaration *wined3d_declaration; struct d3d9_vertex_declaration *d3d9_declaration; - HRESULT hr; TRACE("iface %p, fvf %p.\n", iface, fvf); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_device_get_vertex_declaration(device->wined3d_device, &wined3d_declaration))) - { - wined3d_mutex_unlock(); - WARN("Failed to get vertex declaration, hr %#x.\n", hr); - *fvf = 0; - return hr; - } - - if (wined3d_declaration) + if ((wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) { d3d9_declaration = wined3d_vertex_declaration_get_parent(wined3d_declaration); *fvf = d3d9_declaration->fvf; - wined3d_vertex_declaration_decref(wined3d_declaration); } else { @@ -2242,7 +2229,7 @@ static HRESULT WINAPI d3d9_device_GetFVF(IDirect3DDevice9Ex *iface, DWORD *fvf) TRACE("Returning FVF %#x.\n", *fvf); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_CreateVertexShader(IDirect3DDevice9Ex *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4d6d03c..1b63104 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2442,16 +2442,11 @@ void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, device_invalidate_state(device, STATE_VDECL); } -HRESULT CDECL wined3d_device_get_vertex_declaration(const struct wined3d_device *device, - struct wined3d_vertex_declaration **declaration) +struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration(const struct wined3d_device *device) { - TRACE("device %p, declaration %p.\n", device, declaration); - - *declaration = device->stateBlock->state.vertex_declaration; - if (*declaration) - wined3d_vertex_declaration_incref(*declaration); + TRACE("device %p.\n", device); - return WINED3D_OK; + return device->stateBlock->state.vertex_declaration; } HRESULT CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c50dd29..091f6d5 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -88,7 +88,7 @@ @ cdecl wined3d_device_get_texture(ptr long ptr) @ cdecl wined3d_device_get_texture_stage_state(ptr long long ptr) @ cdecl wined3d_device_get_transform(ptr long ptr) -@ cdecl wined3d_device_get_vertex_declaration(ptr ptr) +@ cdecl wined3d_device_get_vertex_declaration(ptr) @ cdecl wined3d_device_get_vertex_shader(ptr) @ cdecl wined3d_device_get_viewport(ptr ptr) @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 90e71c0..bf16b55 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2164,8 +2164,7 @@ HRESULT __cdecl wined3d_device_get_texture_stage_state(const struct wined3d_devi UINT stage, enum wined3d_texture_stage_state state, DWORD *value); void __cdecl wined3d_device_get_transform(const struct wined3d_device *device, enum wined3d_transform_state state, struct wined3d_matrix *matrix); -HRESULT __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device, - struct wined3d_vertex_declaration **declaration); +struct wined3d_vertex_declaration * __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport); HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device,

1 0

Dmitry Timoshkov : windowscodecs: Avoid unnecessary memory allocations.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 6715b186f66b14e70a7c587311861fbc3cc887c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6715b186f66b14e70a7c58731… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 21 09:42:37 2012 +0900 windowscodecs: Avoid unnecessary memory allocations. --- dlls/windowscodecs/gifformat.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 1dce11d..81bde20 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -413,10 +413,7 @@ static HRESULT load_APE_metadata(IStream *stream, const GUID *vendor, DWORD opti result[1].id.u.pwszVal = strdupAtoW("Data"); result[1].value.vt = VT_UI1|VT_VECTOR; result[1].value.u.caub.cElems = data_size; - result[1].value.u.caub.pElems = HeapAlloc(GetProcessHeap(), 0, data_size); - memcpy(result[1].value.u.caub.pElems, data, data_size); - - HeapFree(GetProcessHeap(), 0, data); + result[1].value.u.caub.pElems = data; *items = result; *count = 2; @@ -449,7 +446,7 @@ static HRESULT load_GifComment_metadata(IStream *stream, const GUID *vendor, DWO ULONG bytesread, data_size; MetadataItem *result; BYTE subblock_size; - BYTE *data; + char *data; *items = NULL; *count = 0; @@ -474,10 +471,10 @@ static HRESULT load_GifComment_metadata(IStream *stream, const GUID *vendor, DWO if (!subblock_size) break; if (!data) - data = HeapAlloc(GetProcessHeap(), 0, subblock_size); + data = HeapAlloc(GetProcessHeap(), 0, subblock_size + 1); else { - BYTE *new_data = HeapReAlloc(GetProcessHeap(), 0, data, data_size + subblock_size); + char *new_data = HeapReAlloc(GetProcessHeap(), 0, data, data_size + subblock_size + 1); if (!new_data) { HeapFree(GetProcessHeap(), 0, data); @@ -494,6 +491,8 @@ static HRESULT load_GifComment_metadata(IStream *stream, const GUID *vendor, DWO data_size += subblock_size; } + data[data_size] = 0; + result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem)); if (!result) { @@ -508,11 +507,7 @@ static HRESULT load_GifComment_metadata(IStream *stream, const GUID *vendor, DWO result->id.vt = VT_LPWSTR; result->id.u.pwszVal = strdupAtoW("TextEntry"); result->value.vt = VT_LPSTR; - result->value.u.pszVal = HeapAlloc(GetProcessHeap(), 0, data_size + 1); - memcpy(result->value.u.pszVal, data, data_size); - result->value.u.pszVal[data_size] = 0; - - HeapFree(GetProcessHeap(), 0, data); + result->value.u.pszVal = data; *items = result; *count = 1;

1 0

André Hentschel : iphlpapi: Improved GetTcpStatisticsEx stub.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 07316882a55c14f6ab68a668f0e838611e2a85fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=07316882a55c14f6ab68a668f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 20 23:57:33 2012 +0200 iphlpapi: Improved GetTcpStatisticsEx stub. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/ipstats.c | 30 +++++++++++++++++++++++++++--- dlls/iphlpapi/tests/iphlpapi.c | 10 +++++++--- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 368159a..36ba13f 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -134,7 +134,7 @@ #@ stub GetSessionCompartmentId @ stdcall GetTcp6Table( ptr ptr long ) @ stdcall GetTcp6Table2( ptr ptr long ) -#@ stub GetTcpStatisticsEx +@ stdcall GetTcpStatisticsEx( ptr long ) @ stdcall GetTcpStatistics( ptr ) @ stub GetTcpStatsFromStack @ stdcall GetTcpTable( ptr ptr long ) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 79dac58..a56e753 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -975,24 +975,32 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) } /****************************************************************** - * GetTcpStatistics (IPHLPAPI.@) + * GetTcpStatisticsEx (IPHLPAPI.@) * - * Get the TCP statistics for the local computer. + * Get the IPv4 and IPv6 TCP statistics for the local computer. * * PARAMS * stats [Out] buffer for TCP statistics + * family [In] specifies wether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h */ -DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) +DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) { DWORD ret = ERROR_NOT_SUPPORTED; if (!stats) return ERROR_INVALID_PARAMETER; + if (family != WS_AF_INET && family != WS_AF_INET6) return ERROR_INVALID_PARAMETER; memset( stats, 0, sizeof(*stats) ); + if (family == WS_AF_INET6) + { + FIXME( "unimplemented for IPv6\n" ); + return ret; + } + #ifdef __linux__ { FILE *fp; @@ -1111,6 +1119,22 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) return ret; } +/****************************************************************** + * GetTcpStatistics (IPHLPAPI.@) + * + * Get the TCP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for TCP statistics + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) +{ + return GetTcpStatisticsEx(stats, WS_AF_INET); +} /****************************************************************** * GetUdpStatistics (IPHLPAPI.@) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index eb96189..26bf26e 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -659,7 +659,7 @@ static void testGetTcpStatisticsEx(void) if (!pGetTcpStatisticsEx) { - skip( "GetTcpStatisticsEx not available\n" ); + win_skip( "GetTcpStatisticsEx not available\n" ); return; } @@ -667,6 +667,10 @@ static void testGetTcpStatisticsEx(void) ok(apiReturn == ERROR_INVALID_PARAMETER, "GetTcpStatisticsEx(NULL, AF_INET); returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + apiReturn = pGetTcpStatisticsEx(&stats, AF_BAN); + ok(apiReturn == ERROR_INVALID_PARAMETER || apiReturn == ERROR_NOT_SUPPORTED, + "GetTcpStatisticsEx(&stats, AF_BAN) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + apiReturn = pGetTcpStatisticsEx(&stats, AF_INET); ok(apiReturn == NO_ERROR, "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) @@ -690,8 +694,8 @@ static void testGetTcpStatisticsEx(void) } apiReturn = pGetTcpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), - "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + todo_wine ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { trace( "TCP IPv6 Ex stats:\n" );

1 0

Alexandre Julliard : winex11: Separate fetching the window icon bits and setting the WM hints.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 16410ead78e35b74c95f9b5c0fdbba0c9a066271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16410ead78e35b74c95f9b5c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 11:52:29 2012 +0200 winex11: Separate fetching the window icon bits and setting the WM hints. --- dlls/winex11.drv/window.c | 109 ++++++++++++++++++++++----------------------- dlls/winex11.drv/x11drv.h | 7 ++- 2 files changed, 57 insertions(+), 59 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d4f3f9b..d07be48 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -527,7 +527,7 @@ failed: /*********************************************************************** * create_icon_pixmaps */ -static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, struct x11drv_win_data *data ) +static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, Pixmap *icon_ret, Pixmap *mask_ret ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; @@ -573,8 +573,8 @@ static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, struct x11drv_wi bits.ptr = NULL; if (!mask_pixmap) goto failed; - data->icon_pixmap = color_pixmap; - data->icon_mask = mask_pixmap; + *icon_ret = color_pixmap; + *mask_ret = mask_pixmap; return TRUE; failed: @@ -586,18 +586,16 @@ failed: /*********************************************************************** - * set_icon_hints - * - * Set the icon wm hints + * fetch_icon_data */ -static void set_icon_hints( HWND hwnd, HICON icon_big, HICON icon_small ) +static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) { - Display *display = thread_display(); struct x11drv_win_data *data; ICONINFO ii, ii_small; HDC hDC; unsigned int size; unsigned long *bits; + Pixmap icon_pixmap, mask_pixmap; if (!icon_big) { @@ -611,13 +609,6 @@ static void set_icon_hints( HWND hwnd, HICON icon_big, HICON icon_small ) if (!icon_small) icon_small = (HICON)GetClassLongPtrW( hwnd, GCLP_HICONSM ); } - if (!(data = X11DRV_get_win_data( hwnd ))) return; - - if (data->icon_pixmap) XFreePixmap( gdi_display, data->icon_pixmap ); - if (data->icon_mask) XFreePixmap( gdi_display, data->icon_mask ); - data->icon_pixmap = data->icon_mask = 0; - data->wm_hints->flags &= ~(IconPixmapHint | IconMaskHint); - if (!GetIconInfo(icon_big, &ii)) return; hDC = CreateCompatibleDC(0); @@ -642,22 +633,30 @@ static void set_icon_hints( HWND hwnd, HICON icon_big, HICON icon_small ) DeleteObject( ii_small.hbmColor ); DeleteObject( ii_small.hbmMask ); } - if (bits) - XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON), - XA_CARDINAL, 32, PropModeReplace, (unsigned char *)bits, size ); - else - XDeleteProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON) ); - HeapFree( GetProcessHeap(), 0, bits ); - if (create_icon_pixmaps( hDC, &ii, data )) - { - data->wm_hints->icon_pixmap = data->icon_pixmap; - data->wm_hints->icon_mask = data->icon_mask; - data->wm_hints->flags |= IconPixmapHint | IconMaskHint; - } + if (!create_icon_pixmaps( hDC, &ii, &icon_pixmap, &mask_pixmap )) icon_pixmap = mask_pixmap = 0; + DeleteObject( ii.hbmColor ); DeleteObject( ii.hbmMask ); DeleteDC(hDC); + + if ((data = get_win_data( hwnd ))) + { + if (data->icon_pixmap) XFreePixmap( gdi_display, data->icon_pixmap ); + if (data->icon_mask) XFreePixmap( gdi_display, data->icon_mask ); + HeapFree( GetProcessHeap(), 0, data->icon_bits ); + data->icon_pixmap = icon_pixmap; + data->icon_mask = mask_pixmap; + data->icon_bits = bits; + data->icon_size = size; + release_win_data( data ); + } + else + { + if (icon_pixmap) XFreePixmap( gdi_display, icon_pixmap ); + if (mask_pixmap) XFreePixmap( gdi_display, mask_pixmap ); + HeapFree( GetProcessHeap(), 0, bits ); + } } @@ -746,6 +745,7 @@ static void set_style_hints( Display *display, struct x11drv_win_data *data, DWO Window group_leader = data->whole_window; HWND owner = GetWindow( data->hwnd, GW_OWNER ); Window owner_win = X11DRV_get_whole_window( owner ); + XWMHints *wm_hints; Atom window_type; if (owner_win) @@ -766,15 +766,29 @@ static void set_style_hints( Display *display, struct x11drv_win_data *data, DWO XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1); - /* wm hints */ - if (data->wm_hints) + if ((wm_hints = XAllocWMHints())) { - data->wm_hints->flags |= InputHint | StateHint | WindowGroupHint; - data->wm_hints->input = !use_take_focus && !(style & WS_DISABLED); - data->wm_hints->initial_state = (style & WS_MINIMIZE) ? IconicState : NormalState; - data->wm_hints->window_group = group_leader; - XSetWMHints( display, data->whole_window, data->wm_hints ); + wm_hints->flags = InputHint | StateHint | WindowGroupHint; + wm_hints->input = !use_take_focus && !(style & WS_DISABLED); + wm_hints->initial_state = (style & WS_MINIMIZE) ? IconicState : NormalState; + wm_hints->window_group = group_leader; + if (data->icon_pixmap) + { + wm_hints->icon_pixmap = data->icon_pixmap; + wm_hints->icon_mask = data->icon_mask; + wm_hints->flags |= IconPixmapHint | IconMaskHint; + } + XSetWMHints( display, data->whole_window, wm_hints ); + XFree( wm_hints ); } + + if (data->icon_bits) + XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON), + XA_CARDINAL, 32, PropModeReplace, + (unsigned char *)data->icon_bits, data->icon_size ); + else + XDeleteProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON) ); + } @@ -858,13 +872,6 @@ static void set_initial_wm_hints( HWND hwnd ) if (user_time_window) XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_USER_TIME_WINDOW), XA_WINDOW, 32, PropModeReplace, (unsigned char *)&user_time_window, 1 ); - - data->wm_hints = XAllocWMHints(); - if (data->wm_hints) - { - data->wm_hints->flags = 0; - set_icon_hints( hwnd, 0, 0 ); - } } @@ -1378,6 +1385,7 @@ static Window create_whole_window( HWND hwnd ) if (!data->whole_window) goto done; set_initial_wm_hints( hwnd ); + fetch_icon_data( hwnd, 0, 0 ); set_wm_hints( hwnd ); XSaveContext( display, data->whole_window, winContext, (char *)data->hwnd ); @@ -1444,8 +1452,6 @@ static void destroy_whole_window( Display *display, struct x11drv_win_data *data } /* Outlook stops processing messages after destroying a dialog, so we need an explicit flush */ XFlush( display ); - XFree( data->wm_hints ); - data->wm_hints = NULL; if (data->surface) window_surface_release( data->surface ); data->surface = NULL; RemovePropA( data->hwnd, whole_window_prop ); @@ -1507,6 +1513,7 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) if (thread_data->last_xic_hwnd == hwnd) thread_data->last_xic_hwnd = 0; if (data->icon_pixmap) XFreePixmap( gdi_display, data->icon_pixmap ); if (data->icon_mask) XFreePixmap( gdi_display, data->icon_mask ); + HeapFree( GetProcessHeap(), 0, data->icon_bits ); XDeleteContext( gdi_display, (XID)hwnd, win_data_context ); release_win_data( data ); HeapFree( GetProcessHeap(), 0, data ); @@ -2245,26 +2252,16 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) * hIcon or hIconSm has changed (or is being initialised for the * first time). Complete the X11 driver-specific initialisation * and set the window hints. - * - * This is not entirely correct, may need to create - * an icon window and set the pixmap as a background */ void CDECL X11DRV_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) { - Display *display = thread_display(); struct x11drv_win_data *data; - if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->whole_window) return; - if (!data->managed) return; - - if (data->wm_hints) - { - if (type == ICON_BIG) set_icon_hints( hwnd, icon, 0 ); - else set_icon_hints( hwnd, 0, icon ); - XSetWMHints( display, data->whole_window, data->wm_hints ); - } + if (type == ICON_BIG) fetch_icon_data( hwnd, icon, 0 ); + else fetch_icon_data( hwnd, 0, icon ); + set_wm_hints( hwnd ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 28cbe6a..4f355ad 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -538,7 +538,6 @@ struct x11drv_win_data RECT whole_rect; /* X window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to parent */ XIC xic; /* X input context */ - XWMHints *wm_hints; /* window manager hints */ BOOL managed : 1; /* is window managed? */ BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */ BOOL iconic : 1; /* is window in iconic state? */ @@ -549,8 +548,10 @@ struct x11drv_win_data Window embedder; /* window id of embedder */ unsigned long configure_serial; /* serial number of last configure request */ struct window_surface *surface; - Pixmap icon_pixmap; - Pixmap icon_mask; + Pixmap icon_pixmap; + Pixmap icon_mask; + unsigned long *icon_bits; + unsigned int icon_size; }; extern struct x11drv_win_data *get_win_data( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Add window data structure locking to the window region functions.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 9ac774b88d8c5097f885e117a7b8cd914192a17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac774b88d8c5097f885e117a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 15:53:48 2012 +0200 winex11: Add window data structure locking to the window region functions. --- dlls/winex11.drv/window.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index abbdb98..5eab698 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2269,9 +2269,10 @@ int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { struct x11drv_win_data *data; - if ((data = X11DRV_get_win_data( hwnd ))) + if ((data = get_win_data( hwnd ))) { sync_window_region( thread_display(), data, hrgn ); + release_win_data( data ); } else if (X11DRV_get_whole_window( hwnd )) { @@ -2324,7 +2325,11 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_X11DRV_SET_WIN_FORMAT: return set_win_format( hwnd, (XID)wp ); case WM_X11DRV_SET_WIN_REGION: - if ((data = X11DRV_get_win_data( hwnd ))) sync_window_region( thread_display(), data, (HRGN)1 ); + if ((data = get_win_data( hwnd ))) + { + sync_window_region( thread_display(), data, (HRGN)1 ); + release_win_data( data ); + } return 0; case WM_X11DRV_RESIZE_DESKTOP: X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) );

1 0

Vincent Povirk : gdiplus: Implement LineCapSquare in GdipWidenPath.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 47c433de8ce9fd894b83a0b96d1963b2ce7ffc16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c433de8ce9fd894b83a0b96… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 20 15:16:58 2012 -0500 gdiplus: Implement LineCapSquare in GdipWidenPath. --- dlls/gdiplus/graphicspath.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 16f5e2d..0515175 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1774,6 +1774,31 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, if (add_last_point) add_bevel_point(endpoint, nextpoint, pen, 0, last_point); break; + case LineCapSquare: + { + REAL segment_dy = nextpoint->Y-endpoint->Y; + REAL segment_dx = nextpoint->X-endpoint->X; + REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL distance = pen->width/2.0; + REAL bevel_dx, bevel_dy; + REAL extend_dx, extend_dy; + + extend_dx = -distance * segment_dx / segment_length; + extend_dy = -distance * segment_dy / segment_length; + + bevel_dx = -distance * segment_dy / segment_length; + bevel_dy = distance * segment_dx / segment_length; + + if (add_first_points) + *last_point = add_path_list_node(*last_point, endpoint->X + extend_dx + bevel_dx, + endpoint->Y + extend_dy + bevel_dy, PathPointTypeLine); + + if (add_last_point) + *last_point = add_path_list_node(*last_point, endpoint->X + extend_dx - bevel_dx, + endpoint->Y + extend_dy - bevel_dy, PathPointTypeLine); + + break; + } } } @@ -1878,10 +1903,10 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, { last_point = points; - if (pen->endcap != LineCapFlat) + if (pen->endcap > LineCapSquare) FIXME("unimplemented end cap %x\n", pen->endcap); - if (pen->startcap != LineCapFlat) + if (pen->startcap > LineCapSquare) FIXME("unimplemented start cap %x\n", pen->startcap); if (pen->dashcap != DashCapFlat)

1 0

Vincent Povirk : gdiplus: Properly set the first point to start when widening open figures.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 8871af7ea563725fb92b75ec88a1fa946dccb574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8871af7ea563725fb92b75ec8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 20 16:44:47 2012 -0500 gdiplus: Properly set the first point to start when widening open figures. --- dlls/gdiplus/graphicspath.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 0515175..8b3a132 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1806,15 +1806,16 @@ static void widen_open_figure(GpPath *path, GpPen *pen, int start, int end, path_list_node_t **last_point) { int i; + path_list_node_t *prev_point; if (end <= start) return; + prev_point = *last_point; + widen_cap(&path->pathdata.Points[start], &path->pathdata.Points[start+1], pen, pen->startcap, pen->customstart, FALSE, TRUE, last_point); - (*last_point)->type = PathPointTypeStart; - for (i=start+1; i<end; i++) widen_joint(&path->pathdata.Points[i-1], &path->pathdata.Points[i], &path->pathdata.Points[i+1], pen, last_point); @@ -1829,6 +1830,7 @@ static void widen_open_figure(GpPath *path, GpPen *pen, int start, int end, widen_cap(&path->pathdata.Points[start], &path->pathdata.Points[start+1], pen, pen->startcap, pen->customstart, TRUE, FALSE, last_point); + prev_point->next->type = PathPointTypeStart; (*last_point)->type |= PathPointTypeCloseSubpath; }

1 0

Charles Davis : loader: On Mac OS with Clang, don' t use external symbols for the DOS and shared heap segments.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: b51c2ba9f74c18268eedf6597b9c4e914abacd07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51c2ba9f74c18268eedf6597… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Sep 21 01:51:34 2012 -0600 loader: On Mac OS with Clang, don't use external symbols for the DOS and shared heap segments. --- loader/main.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/loader/main.c b/loader/main.c index edbf4f7..74a8eb8 100644 --- a/loader/main.c +++ b/loader/main.c @@ -43,9 +43,16 @@ #ifdef __APPLE__ +#ifndef __clang__ __asm__(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x40000000"); __asm__(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP, ___wine_shared_heap, 0x03000000"); extern char __wine_dos[0x40000000], __wine_shared_heap[0x03000000]; +#else +__asm__(".zerofill WINE_DOS, WINE_DOS"); +__asm__(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP"); +static char __wine_dos[0x40000000] __attribute__((section("WINE_DOS, WINE_DOS"))); +static char __wine_shared_heap[0x03000000] __attribute__((section("WINE_SHAREDHEAP, WINE_SHAREDHEAP"))); +#endif static const struct wine_preload_info wine_main_preload_info[] = {

1 0