August 2013 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Make cgrect_from_rect() preserve origin of empty rectangles.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 87dd13150a69a57ad524daed72d5405064db39fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=87dd13150a69a57ad524daed7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Aug 20 17:00:27 2013 -0500 winemac: Make cgrect_from_rect() preserve origin of empty rectangles. --- dlls/winemac.drv/macdrv.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 4c74ddc..9bf1b7a 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -44,9 +44,7 @@ extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN; static inline CGRect cgrect_from_rect(RECT rect) { - if (rect.left >= rect.right || rect.top >= rect.bottom) - return CGRectNull; - return CGRectMake(rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top); + return CGRectMake(rect.left, rect.top, max(0, rect.right - rect.left), max(0, rect.bottom - rect.top)); } static inline RECT rect_from_cgrect(CGRect cgrect)

1 0

Ken Thomases : winemac: Create 1x1 Cocoa window with empty shape for zero-sized Win32 window.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 20c3c80257db1e0399c0b7f07f691eeb040e81c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c3c80257db1e0399c0b7f07… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Aug 20 17:00:34 2013 -0500 winemac: Create 1x1 Cocoa window with empty shape for zero-sized Win32 window. --- dlls/winemac.drv/window.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 845fe01..9d83180 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -112,8 +112,9 @@ static void get_cocoa_window_state(struct macdrv_win_data *data, state->no_activate = !can_activate_window(data->hwnd); state->floating = (ex_style & WS_EX_TOPMOST) != 0; state->excluded_by_expose = state->excluded_by_cycle = - !(ex_style & WS_EX_APPWINDOW) && - (GetWindow(data->hwnd, GW_OWNER) || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))); + IsRectEmpty(&data->window_rect) || + (!(ex_style & WS_EX_APPWINDOW) && + (GetWindow(data->hwnd, GW_OWNER) || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE)))); state->minimized = (style & WS_MINIMIZE) != 0; } @@ -331,6 +332,13 @@ static void sync_window_region(struct macdrv_win_data *data, HRGN win_region) if (!data->cocoa_window) return; data->shaped = FALSE; + if (IsRectEmpty(&data->window_rect)) /* set an empty shape */ + { + TRACE("win %p/%p setting empty shape for zero-sized window\n", data->hwnd, data->cocoa_window); + macdrv_set_window_shape(data->cocoa_window, &CGRectZero, 1); + return; + } + if (hrgn == (HRGN)1) /* hack: win_region == 1 means retrieve region from server */ { if (!(hrgn = CreateRectRgn(0, 0, 0, 0))) return; @@ -492,6 +500,8 @@ static void create_cocoa_window(struct macdrv_win_data *data) frame = cgrect_from_rect(data->whole_rect); constrain_window_frame(&frame); + if (frame.size.width < 1 || frame.size.height < 1) + frame.size.width = frame.size.height = 1; TRACE("creating %p window %s whole %s client %s\n", data->hwnd, wine_dbgstr_rect(&data->window_rect), wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_rect(&data->client_rect)); @@ -506,7 +516,7 @@ static void create_cocoa_window(struct macdrv_win_data *data) macdrv_set_cocoa_window_title(data->cocoa_window, text, strlenW(text)); /* set the window region */ - if (win_rgn) sync_window_region(data, win_rgn); + if (win_rgn || IsRectEmpty(&data->window_rect)) sync_window_region(data, win_rgn); /* set the window opacity */ if (!GetLayeredWindowAttributes(data->hwnd, &key, &alpha, &layered_flags)) layered_flags = 0; @@ -704,7 +714,7 @@ RGNDATA *get_region_data(HRGN hrgn, HDC hdc_lptodp) * * Synchronize the Mac window position with the Windows one */ -static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags) +static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, const RECT *old_window_rect) { CGRect frame; @@ -712,9 +722,12 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags) frame = cgrect_from_rect(data->whole_rect); constrain_window_frame(&frame); + if (frame.size.width < 1 || frame.size.height < 1) + frame.size.width = frame.size.height = 1; data->on_screen = macdrv_set_cocoa_window_frame(data->cocoa_window, &frame); - if (data->shaped) sync_window_region(data, (HRGN)1); + if (old_window_rect && IsRectEmpty(old_window_rect) != IsRectEmpty(&data->window_rect)) + sync_window_region(data, (HRGN)1); TRACE("win %p/%p pos %s\n", data->hwnd, data->cocoa_window, wine_dbgstr_rect(&data->whole_rect)); @@ -1236,7 +1249,7 @@ LRESULT CDECL macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) if ((data = get_win_data(hwnd))) { if (data->cocoa_window && data->on_screen) - sync_window_position(data, SWP_NOZORDER | SWP_NOACTIVATE); + sync_window_position(data, SWP_NOZORDER | SWP_NOACTIVATE, NULL); release_win_data(data); } SendMessageW(hwnd, WM_DISPLAYCHANGE, wp, lp); @@ -1422,7 +1435,7 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, thread_data->current_event->type != WINDOW_DID_MINIMIZE && thread_data->current_event->type != WINDOW_DID_UNMINIMIZE)) { - sync_window_position(data, swp_flags); + sync_window_position(data, swp_flags, &old_window_rect); set_cocoa_window_properties(data); } @@ -1533,7 +1546,7 @@ void macdrv_window_frame_changed(HWND hwnd, CGRect frame) if ((data->window_rect.right - data->window_rect.left == width && data->window_rect.bottom - data->window_rect.top == height) || - (IsRectEmpty(&data->window_rect) && width <= 0 && height <= 0)) + (IsRectEmpty(&data->window_rect) && width == 1 && height == 1)) flags |= SWP_NOSIZE; else TRACE("%p resizing from (%dx%d) to (%dx%d)\n", hwnd, data->window_rect.right - data->window_rect.left,

1 0

Ken Thomases : winemac: Remove a redundant memset of a struct.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: d6624ee9f64229b8daa72d8df3d0ae0aca8ce45d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6624ee9f64229b8daa72d8df… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Aug 20 17:00:43 2013 -0500 winemac: Remove a redundant memset of a struct. --- dlls/winemac.drv/window.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 9d83180..36c8570 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -495,7 +495,6 @@ static void create_cocoa_window(struct macdrv_win_data *data) data->whole_rect = data->window_rect; macdrv_window_to_mac_rect(data, style, &data->whole_rect); - memset(&wf, 0, sizeof(wf)); get_cocoa_window_features(data, style, ex_style, &wf); frame = cgrect_from_rect(data->whole_rect);

1 0

Ken Thomases : winemac: Improve tracing in sync_window_position() to include adjusted frame.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 121eb08bae03afdbd2630300b58fa9a3392b90fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=121eb08bae03afdbd2630300b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Aug 20 17:00:47 2013 -0500 winemac: Improve tracing in sync_window_position() to include adjusted frame. --- dlls/winemac.drv/window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 36c8570..e7dd9b1 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -728,8 +728,8 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c if (old_window_rect && IsRectEmpty(old_window_rect) != IsRectEmpty(&data->window_rect)) sync_window_region(data, (HRGN)1); - TRACE("win %p/%p pos %s\n", data->hwnd, data->cocoa_window, - wine_dbgstr_rect(&data->whole_rect)); + TRACE("win %p/%p whole_rect %s frame %s\n", data->hwnd, data->cocoa_window, + wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_cgrect(frame)); if (data->on_screen && (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW))) show_window(data);

1 0

Ken Thomases : winemac: Always trace arguments in macdrv_ShowWindow().
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 251160fef9873ca17d559d9a429bea30ccb49578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=251160fef9873ca17d559d9a4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Aug 20 17:00:51 2013 -0500 winemac: Always trace arguments in macdrv_ShowWindow(). --- dlls/winemac.drv/window.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e7dd9b1..c4da870 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1026,6 +1026,9 @@ UINT CDECL macdrv_ShowWindow(HWND hwnd, INT cmd, RECT *rect, UINT swp) struct macdrv_win_data *data = get_win_data(hwnd); CGRect frame; + TRACE("win %p/%p cmd %d at %s flags %08x\n", + hwnd, data ? data->cocoa_window : NULL, cmd, wine_dbgstr_rect(rect), swp); + if (!data || !data->cocoa_window) goto done; if (IsRectEmpty(rect)) goto done; if (GetWindowLongW(hwnd, GWL_STYLE) & WS_MINIMIZE) @@ -1049,9 +1052,6 @@ UINT CDECL macdrv_ShowWindow(HWND hwnd, INT cmd, RECT *rect, UINT swp) thread_data->current_event->type != WINDOW_DID_UNMINIMIZE) goto done; - TRACE("win %p/%p cmd %d at %s flags %08x\n", - hwnd, data->cocoa_window, cmd, wine_dbgstr_rect(rect), swp); - macdrv_get_cocoa_window_frame(data->cocoa_window, &frame); *rect = rect_from_cgrect(frame); macdrv_mac_to_window_rect(data, rect);

1 0

Henri Verbeet : wined3d: Avoid looking up shaders for shader stages that didn't change.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 62859daf0bcfedcb198642d21a106edbc4b8d49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=62859daf0bcfedcb198642d21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 21 08:29:27 2013 +0200 wined3d: Avoid looking up shaders for shader stages that didn't change. --- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/context.c | 12 +++- dlls/wined3d/glsl_shader.c | 110 ++++++++++++++++++++++-------------- dlls/wined3d/state.c | 12 +++- dlls/wined3d/wined3d_private.h | 3 +- 6 files changed, 88 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62859daf0bcfedcb19864…

1 0

Henri Verbeet : wined3d: Handle NP2 fixup updates in shader_load_constants( ).
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 69e1100c0c9cf92888e78285ffa12da13da97b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=69e1100c0c9cf92888e78285f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 21 08:29:28 2013 +0200 wined3d: Handle NP2 fixup updates in shader_load_constants(). --- dlls/wined3d/arb_program_shader.c | 77 ++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 74 ++++++++++++++--------------------- dlls/wined3d/shader.c | 3 - dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +- 5 files changed, 70 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69e1100c0c9cf92888e78…

1 0

Henri Verbeet : wined3d: Read from stateBlock instead of updateStateBlock in wined3d_device_get_stream_source_freq ().
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: a2e1a3d4f117b75bee2da85b09d1386715d84963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e1a3d4f117b75bee2da85b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 21 08:29:29 2013 +0200 wined3d: Read from stateBlock instead of updateStateBlock in wined3d_device_get_stream_source_freq(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1ab93a3..e16a4b8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1611,7 +1611,7 @@ HRESULT CDECL wined3d_device_get_stream_source_freq(const struct wined3d_device TRACE("device %p, stream_idx %u, divider %p.\n", device, stream_idx, divider); - stream = &device->updateStateBlock->state.streams[stream_idx]; + stream = &device->stateBlock->state.streams[stream_idx]; *divider = stream->flags | stream->frequency; TRACE("Returning %#x.\n", *divider);

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXMATRIX.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 3b4b61f03aae9fdd763bfd25e4d302909089cd2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b4b61f03aae9fdd763bfd25e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 21 08:29:30 2013 +0200 d3dx9: Avoid LPD3DXMATRIX. --- dlls/d3dx9_36/skin.c | 2 +- dlls/d3dx9_36/tests/math.c | 2 +- include/d3dx9mesh.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index c3857d6..85c4d64 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -285,7 +285,7 @@ static HRESULT WINAPI ID3DXSkinInfoImpl_SetBoneOffsetMatrix(ID3DXSkinInfo *iface return D3D_OK; } -static LPD3DXMATRIX WINAPI ID3DXSkinInfoImpl_GetBoneOffsetMatrix(ID3DXSkinInfo *iface, DWORD bone_num) +static D3DXMATRIX * WINAPI ID3DXSkinInfoImpl_GetBoneOffsetMatrix(ID3DXSkinInfo *iface, DWORD bone_num) { ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface); diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 5f92729..9f30f52 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -234,7 +234,7 @@ static void D3DXFresnelTest(void) static void D3DXMatrixTest(void) { D3DXMATRIX expectedmat, gotmat, mat, mat2, mat3; - LPD3DXMATRIX funcpointer; + D3DXMATRIX *funcpointer; D3DXPLANE plane; D3DXQUATERNION q, r; D3DXVECTOR3 at, axis, eye, last; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 8fee738..1347a79 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -529,7 +529,7 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown) STDMETHOD(SetBoneName)(THIS_ DWORD bone, LPCSTR name) PURE; STDMETHOD_(LPCSTR, GetBoneName)(THIS_ DWORD bone) PURE; STDMETHOD(SetBoneOffsetMatrix)(THIS_ DWORD bone, CONST D3DXMATRIX* bone_transform) PURE; - STDMETHOD_(LPD3DXMATRIX, GetBoneOffsetMatrix)(THIS_ DWORD bone) PURE; + STDMETHOD_(D3DXMATRIX *, GetBoneOffsetMatrix)(THIS_ DWORD bone) PURE; STDMETHOD(Clone)(THIS_ ID3DXSkinInfo **skin_info) PURE; STDMETHOD(Remap)(THIS_ DWORD num_vertices, DWORD* vertex_remap) PURE; STDMETHOD(SetFVF)(THIS_ DWORD FVF) PURE;

1 0

Dmitry Timoshkov : ntdll/tests: Add a bunch of overlapped IO tests for files.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: fbe4012eaf5e652b4d7b80cf60de0896979d77be URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe4012eaf5e652b4d7b80cf6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 20 20:23:16 2013 +0900 ntdll/tests: Add a bunch of overlapped IO tests for files. --- dlls/ntdll/tests/file.c | 375 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 375 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbe4012eaf5e652b4d7b8…

1 0