September 2013 - Wine-commits

Jacek Caban : mshtml: Try to not use nsIDOMHTMLFormElement:: Submit for IHTMLFormElelement::submit implementation.
by Alexandre Julliard 27 Sep '13

27 Sep '13

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

Jacek Caban : mshtml: Added IHTMLFormElement::sumit tests.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 66988a681a6bf8d04eb93d75dd33e6665b9099b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66988a681a6bf8d04eb93d75d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 27 15:22:43 2013 +0200 mshtml: Added IHTMLFormElement::sumit tests. --- dlls/mshtml/tests/htmldoc.c | 228 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 216 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66988a681a6bf8d04eb93…

1 0

Aric Stewart : imm32: ImmGetDescriptionA return does not include NULL byte.
by Alexandre Julliard 27 Sep '13

27 Sep '13

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

Henri Verbeet : d3dx9: Get rid of the ID3DXFileDataImpl typedef.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: be1dbc0dbb41176c4b840ae36a5c4ffa767ee254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be1dbc0dbb41176c4b840ae36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 27 00:15:16 2013 +0200 d3dx9: Get rid of the ID3DXFileDataImpl typedef. --- dlls/d3dx9_36/xfile.c | 182 +++++++++++++++++++++++-------------------------- 1 files changed, 85 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be1dbc0dbb41176c4b840…

1 0

Henri Verbeet : d3dx9: Get rid of the SPRITEVERTEX typedef.
by Alexandre Julliard 27 Sep '13

27 Sep '13

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

Michael Stefaniuc : dplayx/tests: Fix typo in ok() message.
by Alexandre Julliard 27 Sep '13

27 Sep '13

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

Michael Stefaniuc : include: Avoid using CONST in the d3dx9 headers.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 81de7e15117738ee4b59adda113c3397706b4a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81de7e15117738ee4b59adda1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 27 00:28:43 2013 +0200 include: Avoid using CONST in the d3dx9 headers. --- include/d3dx9anim.h | 7 ++-- include/d3dx9core.h | 12 +++--- include/d3dx9effect.h | 88 ++++++++++++++++++++++++------------------------ include/d3dx9mesh.h | 62 ++++++++++++++++++++-------------- 4 files changed, 91 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81de7e15117738ee4b59a…

1 0

Michael Stefaniuc : include: Replace the remaining CONSTs.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 23b86eb44eb9ba9bae2026c01430187be9fffa56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b86eb44eb9ba9bae2026c01… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 27 00:30:19 2013 +0200 include: Replace the remaining CONSTs. --- include/dde.h | 2 +- include/ddk/imm.h | 4 ++-- include/ddk/wdm.h | 4 ++-- include/setupapi.h | 8 ++++---- include/sspi.h | 4 ++-- include/winbase.h | 2 +- include/wincon.h | 6 +++--- include/wincrypt.h | 14 +++++++------- include/wine/gdi_driver.h | 2 +- include/wine/winbase16.h | 2 +- include/wingdi.h | 6 +++--- include/winhttp.h | 2 +- include/wininet.h | 4 ++-- include/winreg.h | 4 ++-- include/winternl.h | 2 +- include/winuser.h | 16 ++++++++-------- 16 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23b86eb44eb9ba9bae202…

1 0

Michael Stefaniuc : include: Forbid the use of CONST in Wine.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: f78ffb374d53a92c86772cc3a238db738ac4328b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78ffb374d53a92c86772cc3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 27 09:59:20 2013 +0200 include: Forbid the use of CONST in Wine. --- include/windef.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/windef.h b/include/windef.h index 17c0fba..9322c41 100644 --- a/include/windef.h +++ b/include/windef.h @@ -167,7 +167,7 @@ extern "C" { #define _CDECL __cdecl #define WINAPIV __cdecl #define APIENTRY WINAPI -#define CONST const +#define CONST __ONLY_IN_WINELIB(const) /* Misc. constants. */

1 0

Ken Thomases : winemac: Fix hiding windows that are minimized using -close instead of -orderOut:.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: d7f4d67514b3febac084d48d22fef67fd328fdce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f4d67514b3febac084d48d2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 26 23:46:31 2013 -0500 winemac: Fix hiding windows that are minimized using -close instead of -orderOut:. Cocoa won't order a minimized window out of the screen list using -orderOut:. This leaves a window that should be hidden still visible in the Dock, where it can be unminimized. --- dlls/winemac.drv/cocoa_app.m | 2 ++ dlls/winemac.drv/cocoa_window.h | 2 ++ dlls/winemac.drv/cocoa_window.m | 14 ++++++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index afe0608..e6e5c2e 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1809,6 +1809,8 @@ int macdrv_err_on; queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note){ NSWindow* window = [note object]; + if ([window isKindOfClass:[WineWindow class]] && [(WineWindow*)window isFakingClose]) + return; [keyWindows removeObjectIdenticalTo:window]; if (window == lastTargetWindow) lastTargetWindow = nil; diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 8893f85..8f60275 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -60,6 +60,7 @@ BOOL ignore_windowMiniaturize; BOOL ignore_windowDeminiaturize; + BOOL fakingClose; } @property (retain, readonly, nonatomic) WineEventQueue* queue; @@ -67,6 +68,7 @@ @property (readonly, nonatomic) BOOL noActivate; @property (readonly, nonatomic) BOOL floating; @property (readonly, getter=isFullscreen, nonatomic) BOOL fullscreen; +(a)property (readonly, getter=isFakingClose, nonatomic) BOOL fakingClose; - (NSInteger) minimumLevelForActive:(BOOL)active; - (void) updateFullscreen; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 43be5d5..74bbdc7 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -139,6 +139,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) @property (readwrite, nonatomic) BOOL disabled; @property (readwrite, nonatomic) BOOL noActivate; @property (readwrite, nonatomic) BOOL floating; +(a)property (readwrite, getter=isFakingClose, nonatomic) BOOL fakingClose; @property (retain, nonatomic) NSWindow* latentParentWindow; @property (nonatomic) void* hwnd; @@ -466,7 +467,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) static WineWindow* causing_becomeKeyWindow; - @synthesize disabled, noActivate, floating, fullscreen, latentParentWindow, hwnd, queue; + @synthesize disabled, noActivate, floating, fullscreen, fakingClose, latentParentWindow, hwnd, queue; @synthesize surface, surface_mutex; @synthesize shape, shapeChangedSinceLastDraw; @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @@ -497,6 +498,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [window setHidesOnDeactivate:NO]; [window setReleasedWhenClosed:NO]; + [window setOneShot:YES]; [window disableCursorRects]; [window setShowsResizeIndicator:NO]; [window setHasShadow:wf->shadow]; @@ -1039,7 +1041,14 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) pendingMinimize = TRUE; [self becameIneligibleParentOrChild]; - [self orderOut:nil]; + if ([self isMiniaturized]) + { + fakingClose = TRUE; + [self close]; + fakingClose = FALSE; + } + else + [self orderOut:nil]; if (wasVisible && wasOnActiveSpace && fullscreen) [controller updateFullscreenWindows]; [controller adjustWindowLevels]; @@ -1548,6 +1557,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { WineWindow* child; + if (fakingClose) return; if (latentParentWindow) { [latentParentWindow->latentChildWindows removeObjectIdenticalTo:self];

1 0