September 2013 - Wine-Commits

André Hentschel : wwn: Use protocol relative urls
by Jeremy Newman Sept. 27, 2013

Sept. 27, 2013

1 0

Alexandre Julliard : Wine release 1.7.3
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: website Branch: master Commit: 8b972afe3a692a2f400c4e3caa041b743ea3208e URL: http://source.winehq.org/git/website.git/?a=commit;h=8b972afe3a692a2f400c4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 20:40:27 2013 +0200 Wine release 1.7.3 --- news/en/2013092701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2013092701.xml b/news/en/2013092701.xml new file mode 100644 index 0000000..3dce258 --- /dev/null +++ b/news/en/2013092701.xml @@ -0,0 +1,16 @@ +<news> +<date>September 27, 2013</date> +<title>Wine 1.7.3 Released</title> +<body> + The Wine development release 1.7.3 is now available. + <a href="{$root}/announce/1.7.3">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine based on Firefox 24.</li> + <li>Preparation work for the Direct3D command stream.</li> + <li>Window management fixes in the Mac driver.</li> + <li>Support for IPHLPAPI functions on Android.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.3.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.3 : Alexandre Julliard : Release 1.7.3
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: wine Branch: refs/tags/wine-1.7.3 Tag: 9171214231c86e5a6fc84912dc78ec58d93af7d5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=9171214231c86e5a6fc84912dc78… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 20:32:14 2013 +0200 Release 1.7.3

1 0

Alexandre Julliard : Release 1.7.3.
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: wine Branch: master Commit: d9cd943056f5ca6e3a616475ad71bc92ce8f5a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9cd943056f5ca6e3a616475a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 20:32:14 2013 +0200 Release 1.7.3. --- ANNOUNCE | 760 ++++++++++++++++++++++++++++++------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 385 insertions(+), 397 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9cd943056f5ca6e3a616…

1 0

Ken Thomases : winemac: Implement support for global hot keys.
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: wine Branch: master Commit: 6bae7cf7965bec9a5e53d561719935884f9acf23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bae7cf7965bec9a5e53d5617… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 25 17:10:37 2013 -0500 winemac: Implement support for global hot keys. Partially based on a patch for winex11 previously submitted by Vincent Povirk. --- dlls/winemac.drv/cocoa_event.h | 3 + dlls/winemac.drv/cocoa_event.m | 167 ++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 7 ++ dlls/winemac.drv/keyboard.c | 171 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 16 ++++ dlls/winemac.drv/winemac.drv.spec | 2 + 7 files changed, 367 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bae7cf7965bec9a5e53d…

1 0

Ken Thomases : winemac: Re-sync the window region whenever factors affecting its conversion to Cocoa coordinates change .
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: wine Branch: master Commit: 5a859655d737856bbae57b79035f49e4ba09dcfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a859655d737856bbae57b790… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 26 23:46:36 2013 -0500 winemac: Re-sync the window region whenever factors affecting its conversion to Cocoa coordinates change. --- dlls/winemac.drv/window.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 4cb8082..7b01fe3 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -836,7 +836,8 @@ 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, const RECT *old_window_rect) +static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, const RECT *old_window_rect, + const RECT *old_whole_rect) { CGRect frame; @@ -848,7 +849,10 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c frame.size.width = frame.size.height = 1; data->on_screen = macdrv_set_cocoa_window_frame(data->cocoa_window, &frame); - if (old_window_rect && IsRectEmpty(old_window_rect) != IsRectEmpty(&data->window_rect)) + if (old_window_rect && old_whole_rect && + (IsRectEmpty(old_window_rect) != IsRectEmpty(&data->window_rect) || + old_window_rect->left - old_whole_rect->left != data->window_rect.left - data->whole_rect.left || + old_window_rect->top - old_whole_rect->top != data->window_rect.top - data->whole_rect.top)) sync_window_region(data, (HRGN)1); TRACE("win %p/%p whole_rect %s frame %s\n", data->hwnd, data->cocoa_window, @@ -1120,6 +1124,9 @@ void CDECL macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) sync_window_opacity(data, 0, 0, FALSE, 0); if (data->surface) set_surface_use_alpha(data->surface, FALSE); } + + if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYOUTRTL)) + sync_window_region(data, (HRGN)1); } release_win_data(data); @@ -1371,7 +1378,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, NULL); + sync_window_position(data, SWP_NOZORDER | SWP_NOACTIVATE, NULL, NULL); release_win_data(data); } SendMessageW(hwnd, WM_DISPLAYCHANGE, wp, lp); @@ -1557,7 +1564,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, &old_window_rect); + sync_window_position(data, swp_flags, &old_window_rect, &old_whole_rect); set_cocoa_window_properties(data); }

1 0

Michael Stefaniuc : dplayx/tests: Fix typo in ok() message.
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: wine Branch: master Commit: e22d33e683d727b76ca7dcf2c5314f1d44967ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e22d33e683d727b76ca7dcf2c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 27 00:26:32 2013 +0200 dplayx/tests: Fix typo in ok() message. --- dlls/dplayx/tests/dplayx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 17ab59d..44c9b50 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6470,7 +6470,7 @@ static void test_COM_dplobby(void) &IID_IUnknown, (void**)&dpl); ok(hr == CLASS_E_NOAGGREGATION || broken(hr == E_INVALIDARG), "DirectPlayLobby create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); - ok(!dpl || dpl == (IDirectPlayLobby*)0xdeadbeef, "dp4 = %p\n", dpl); + ok(!dpl || dpl == (IDirectPlayLobby*)0xdeadbeef, "dpl = %p\n", dpl); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectPlayLobby, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay,

1 0

Henri Verbeet : d3dx9: Get rid of the SPRITEVERTEX typedef.
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: wine Branch: master Commit: be2e845cb316979e07ea89de09aca8843274656c URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2e845cb316979e07ea89de0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 27 00:15:17 2013 +0200 d3dx9: Get rid of the SPRITEVERTEX typedef. --- dlls/d3dx9_36/sprite.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index f0e6718..580289f 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -25,11 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); /* the combination of all possible D3DXSPRITE flags */ #define D3DXSPRITE_FLAGLIMIT 511 -typedef struct _SPRITEVERTEX { +struct sprite_vertex +{ D3DXVECTOR3 pos; DWORD col; D3DXVECTOR2 tex; -} SPRITEVERTEX; +}; typedef struct _SPRITE { IDirect3DTexture9 *texture; @@ -315,7 +316,7 @@ D3DXSPRITE_SORT_TEXTURE: sort by texture (so that it doesn't change too often) set_states(This); IDirect3DDevice9_SetVertexDeclaration(This->device, This->vdecl); - IDirect3DDevice9_SetStreamSource(This->device, 0, NULL, 0, sizeof(SPRITEVERTEX)); + IDirect3DDevice9_SetStreamSource(This->device, 0, NULL, 0, sizeof(struct sprite_vertex)); IDirect3DDevice9_SetIndices(This->device, NULL); IDirect3DDevice9_SetTexture(This->device, 0, NULL); @@ -398,7 +399,7 @@ static HRESULT WINAPI d3dx9_sprite_Draw(ID3DXSprite *iface, IDirect3DTexture9 *t static HRESULT WINAPI d3dx9_sprite_Flush(ID3DXSprite *iface) { struct d3dx9_sprite *This = impl_from_ID3DXSprite(iface); - SPRITEVERTEX *vertices; + struct sprite_vertex *vertices; int i, count=0, start; TRACE("iface %p.\n", iface); @@ -407,7 +408,7 @@ static HRESULT WINAPI d3dx9_sprite_Flush(ID3DXSprite *iface) if(!This->sprite_count) return D3D_OK; /* TODO: use of a vertex buffer here */ - vertices=HeapAlloc(GetProcessHeap(), 0, sizeof(SPRITEVERTEX)*6*This->sprite_count); + vertices = HeapAlloc(GetProcessHeap(), 0, sizeof(*vertices) * 6 * This->sprite_count); for(start=0;start<This->sprite_count;start+=count,count=0) { i=start; @@ -444,9 +445,8 @@ static HRESULT WINAPI d3dx9_sprite_Flush(ID3DXSprite *iface) vertices[6*i+4]=vertices[6*i]; vertices[6*i+5]=vertices[6*i+2]; - D3DXVec3TransformCoordArray(&vertices[6*i].pos, sizeof(SPRITEVERTEX), - &vertices[6*i].pos, sizeof(SPRITEVERTEX), - &This->sprites[i].transform, 6); + D3DXVec3TransformCoordArray(&vertices[6 * i].pos, sizeof(*vertices), + &vertices[6 * i].pos, sizeof(*vertices), &This->sprites[i].transform, 6); count++; i++; } @@ -454,7 +454,8 @@ static HRESULT WINAPI d3dx9_sprite_Flush(ID3DXSprite *iface) IDirect3DDevice9_SetTexture(This->device, 0, (struct IDirect3DBaseTexture9 *)This->sprites[start].texture); IDirect3DDevice9_SetVertexDeclaration(This->device, This->vdecl); - IDirect3DDevice9_DrawPrimitiveUP(This->device, D3DPT_TRIANGLELIST, 2*count, vertices+6*start, sizeof(SPRITEVERTEX)); + IDirect3DDevice9_DrawPrimitiveUP(This->device, D3DPT_TRIANGLELIST, + 2 * count, vertices + 6 * start, sizeof(*vertices)); } HeapFree(GetProcessHeap(), 0, vertices);

1 0

Aric Stewart : imm32: ImmGetDescriptionA return does not include NULL byte.
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: wine Branch: master Commit: cae71ef219420b0e6d3340593e88511cb3d61295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae71ef219420b0e6d3340593… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 26 13:47:32 2013 -0500 imm32: ImmGetDescriptionA return does not include NULL byte. --- dlls/imm32/imm.c | 5 ++++- dlls/imm32/tests/imm32.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 29bf4af..93e71af 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1540,7 +1540,10 @@ UINT WINAPI ImmGetDescriptionA( HeapFree( GetProcessHeap(), 0, buf ); - return len; + if (len == 0) + return 0; + + return len - 1; } /*********************************************************************** diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7162f82..f92b2c1 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -665,13 +665,16 @@ static void test_ImmGetDescription(void) lret = ImmGetDescriptionA(hkl, descA, ret + 1); ok(lret, "ImmGetDescriptionA failed, expected != 0 received 0.\n"); - todo_wine ok(lret == ret, "ImmGetDescriptionA failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); + ok(lret == ret, "ImmGetDescriptionA failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); ret /= 2; /* try to copy partially */ lret = ImmGetDescriptionW(hkl, descW, ret + 1); ok(lret, "ImmGetDescriptionW failed, expected != 0 received 0.\n"); ok(lret == ret, "ImmGetDescriptionW failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); + lret = ImmGetDescriptionA(hkl, descA, ret + 1); + ok(!lret, "ImmGetDescriptionA should fail\n"); + ret = ImmGetDescriptionW(hkl, descW, 1); ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret);

1 0

Jacek Caban : mshtml: Try to not use nsIDOMHTMLFormElement:: Submit for IHTMLFormElelement::submit implementation.
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: wine Branch: master Commit: e61de218ee3f0924252ea690be72f01d8c9bfb05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e61de218ee3f0924252ea690b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 27 15:22:30 2013 +0200 mshtml: Try to not use nsIDOMHTMLFormElement::Submit for IHTMLFormElelement::submit implementation. --- dlls/mshtml/binding.h | 2 + dlls/mshtml/htmlform.c | 55 ++++++++++++++++-- dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/navigate.c | 127 +++++++++++++++++++++++++++++------------- dlls/mshtml/persist.c | 50 ++++++++++++++++- 5 files changed, 191 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e61de218ee3f0924252ea…

1 0