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

Alexandre Julliard : Wine release 1.6-rc4
by Alexandre Julliard 28 Jun '13

28 Jun '13

Module: website Branch: master Commit: c407592467dfc1c25378ed00bf4a1021b09618d6 URL: http://source.winehq.org/git/website.git/?a=commit;h=c407592467dfc1c25378ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 28 22:02:44 2013 +0200 Wine release 1.6-rc4 --- news/en/2013062801.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/en/2013062801.xml b/news/en/2013062801.xml new file mode 100644 index 0000000..eae6a50 --- /dev/null +++ b/news/en/2013062801.xml @@ -0,0 +1,12 @@ +<news> +<date>June 28, 2013</date> +<title>Wine 1.6-rc4 Released</title> +<body> + The Wine development release 1.6-rc4 is now available. + <a href="{$root}/announce/1.6-rc4">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.6-rc4.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

Alexandre Julliard : Release 1.6-rc4.
by Alexandre Julliard 28 Jun '13

28 Jun '13

Module: wine Branch: master Commit: c592b2f884202a4bfd9f5ee5573b169df1161921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c592b2f884202a4bfd9f5ee55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 28 21:53:55 2013 +0200 Release 1.6-rc4. --- ANNOUNCE | 313 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 ++-- 3 files changed, 167 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c592b2f884202a4bfd9f5…

1 0

Tag wine-1.6-rc4 : Alexandre Julliard : Release 1.6-rc4
by Alexandre Julliard 28 Jun '13

28 Jun '13

Module: wine Branch: refs/tags/wine-1.6-rc4 Tag: 028c06fafe9a6cb54ec78681db42cc36a75f7c3b URL: http://source.winehq.org/git/wine.git/?a=tag;h=028c06fafe9a6cb54ec78681db42… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 28 21:53:55 2013 +0200 Release 1.6-rc4

1 0

André Hentschel : oleaut32/tests: Use BOOL instead of int when appropriate.
by Alexandre Julliard 28 Jun '13

28 Jun '13

Module: wine Branch: master Commit: dc0cf8319cf2e5eb3c342d29a137d256af6b65a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0cf8319cf2e5eb3c342d29a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 27 20:48:16 2013 +0200 oleaut32/tests: Use BOOL instead of int when appropriate. --- dlls/oleaut32/tests/vartest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index e516341..1ee3c4f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -58,7 +58,7 @@ static WCHAR sz12_true[32]; if (!p##func) { win_skip("function " # func " not available, not testing it\n"); return; } /* Has I8/UI8 data type? */ -static int has_i8 = 0; +static BOOL has_i8; /* When comparing floating point values we cannot expect an exact match * because the rounding errors depend on the exact algorithm.

1 0

Marcus Meissner : ole32: Fixed bad sizeof()s in composite moniker (Coverity ).
by Alexandre Julliard 28 Jun '13

28 Jun '13

Module: wine Branch: master Commit: 826bff384d572ada9cc83674547a1aebe0e4f953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=826bff384d572ada9cc836745… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jun 27 23:36:54 2013 +0200 ole32: Fixed bad sizeof()s in composite moniker (Coverity). --- dlls/ole32/compositemoniker.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index ed154f2..fe5b7d4 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -236,7 +236,7 @@ CompositeMonikerImpl_Load(IMoniker* iface,IStream* pStm) if (++This->tabLastIndex==This->tabSize){ This->tabSize+=BLOCK_TAB_SIZE; - This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); + This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0])); if (This->tabMoniker==NULL) return E_OUTOFMEMORY; @@ -1443,7 +1443,7 @@ static HRESULT WINAPI CompositeMonikerMarshalImpl_UnmarshalInterface(IMarshal *i if (This->tabLastIndex + 2 > This->tabSize) { This->tabSize += max(BLOCK_TAB_SIZE, 2); - This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); + This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0])); if (This->tabMoniker==NULL) return E_OUTOFMEMORY; @@ -1658,7 +1658,7 @@ EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker, ULONG tabSize, newEnumMoniker->tabSize=tabSize; newEnumMoniker->currentPos=currentPos; - newEnumMoniker->tabMoniker=HeapAlloc(GetProcessHeap(),0,tabSize*sizeof(IMoniker)); + newEnumMoniker->tabMoniker=HeapAlloc(GetProcessHeap(),0,tabSize*sizeof(newEnumMoniker->tabMoniker[0])); if (newEnumMoniker->tabMoniker==NULL) { HeapFree(GetProcessHeap(), 0, newEnumMoniker); @@ -1765,7 +1765,7 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike This->tabSize=BLOCK_TAB_SIZE; This->tabLastIndex=0; - This->tabMoniker=HeapAlloc(GetProcessHeap(),0,This->tabSize*sizeof(IMoniker)); + This->tabMoniker=HeapAlloc(GetProcessHeap(),0,This->tabSize*sizeof(This->tabMoniker[0])); if (This->tabMoniker==NULL) { HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; @@ -1893,7 +1893,7 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike This->tabSize+=BLOCK_TAB_SIZE; - This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); + This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0])); if (This->tabMoniker==NULL){ HeapFree(GetProcessHeap(), 0, tab_moniker);

1 0

Ken Thomases : winemac: Dispatch key events directly to window to be sure to get key-up events.
by Alexandre Julliard 28 Jun '13

28 Jun '13

Module: wine Branch: master Commit: 0d20ac02f778540844ae37ecc79220f72431a6f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d20ac02f778540844ae37ecc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 27 21:16:35 2013 -0500 winemac: Dispatch key events directly to window to be sure to get key-up events. For keys pressed in combination with Command, -[NSApplication sendEvent:] simply doesn't pass the key-up event through to the window. --- dlls/winemac.drv/cocoa_app.m | 6 ++++++ dlls/winemac.drv/cocoa_window.h | 2 ++ dlls/winemac.drv/cocoa_window.m | 15 +-------------- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 25081db..461472b 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1692,6 +1692,12 @@ int macdrv_err_on; [self handleScrollWheel:anEvent]; ret = mouseCaptureWindow != nil; } + else if (type == NSKeyDown || type == NSKeyUp) + { + WineWindow* window = (WineWindow*)[anEvent window]; + if ([window isKindOfClass:[WineWindow class]]) + [window postKeyEvent:anEvent]; + } return ret; } diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index c5a630f..e0e581b 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -68,4 +68,6 @@ - (NSInteger) minimumLevelForActive:(BOOL)active; - (void) updateFullscreen; + - (void) postKeyEvent:(NSEvent *)theEvent; + @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d0ee81f..da97e6a 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1182,24 +1182,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } } - - (void) sendEvent:(NSEvent*)event - { - /* NSWindow consumes certain key-down events as part of Cocoa's keyboard - interface control. For example, Control-Tab switches focus among - views. We want to bypass that feature, so directly route key-down - events to -keyDown:. */ - if ([event type] == NSKeyDown) - [[self firstResponder] keyDown:event]; - else - [super sendEvent:event]; - } - /* * ---------- NSResponder method overrides ---------- */ - - (void) keyDown:(NSEvent *)theEvent { [self postKeyEvent:theEvent]; } - - (void) keyUp:(NSEvent *)theEvent { [self postKeyEvent:theEvent]; } + - (void) keyDown:(NSEvent *)theEvent { /* Need an implementation to avoid beeps */ } - (void) flagsChanged:(NSEvent *)theEvent {

1 0

Ken Thomases : winemac: Fix ordering of windows owned by same owner when on inactive desktop space .
by Alexandre Julliard 28 Jun '13

28 Jun '13

Module: wine Branch: master Commit: 941ce31adb9264649dd3b6b4f41e35057db464c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=941ce31adb9264649dd3b6b4f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 27 22:14:08 2013 -0500 winemac: Fix ordering of windows owned by same owner when on inactive desktop space. --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index da97e6a..770056e 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -719,7 +719,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) // Get the z-order from the window server and modify it to reflect the // requested window ordering. - windowNumbers = [[[[self class] windowNumbersWithOptions:0] mutableCopy] autorelease]; + windowNumbers = [[[[self class] windowNumbersWithOptions:NSWindowNumberListAllSpaces] mutableCopy] autorelease]; childWindowNumber = [NSNumber numberWithInteger:[child windowNumber]]; [windowNumbers removeObject:childWindowNumber]; otherIndex = [windowNumbers indexOfObject:[NSNumber numberWithInteger:[other windowNumber]]];

1 0

Michael Stefaniuc : po: Update the Romanian translation.
by Alexandre Julliard 28 Jun '13

28 Jun '13

Module: wine Branch: master Commit: b084853700a1517e70ff552d311933fb7e472de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b084853700a1517e70ff552d3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 28 01:20:49 2013 +0200 po: Update the Romanian translation. --- po/ro.po | 352 ++++++++++++++++++++++--------------------------------------- 1 files changed, 127 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b084853700a1517e70ff5…

1 0

Marcus Meissner : winmm: Fix incorrect parameter for test debug (Coverity).
by Alexandre Julliard 28 Jun '13

28 Jun '13

Module: wine Branch: master Commit: faeb9a5bfc1fc7c6811a59769ab3749d569df9cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=faeb9a5bfc1fc7c6811a59769… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jun 28 09:34:19 2013 +0200 winmm: Fix incorrect parameter for test debug (Coverity). --- dlls/winmm/tests/mcicda.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/mcicda.c b/dlls/winmm/tests/mcicda.c index 16c0b1c..7536111 100644 --- a/dlls/winmm/tests/mcicda.c +++ b/dlls/winmm/tests/mcicda.c @@ -227,7 +227,7 @@ static void test_play(HWND hwnd) if(!err) trace("CD length %s\n", buf); if(err) { /* MCIERR_HARDWARE when given a blank disk */ - skip("status length %s (blank disk?)\n", dbg_mcierr(ok_hw)); + skip("status length %s (blank disk?)\n", dbg_mcierr(err)); return; }

1 0

Jacek Caban : secur32: Don't use deprecated gnutls_certificate_credentials.
by Alexandre Julliard 28 Jun '13

28 Jun '13

Module: wine Branch: master Commit: 6c2f7d01c8d8f3c22543fd448f8de1236b8baabe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c2f7d01c8d8f3c22543fd448… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 28 18:04:52 2013 +0200 secur32: Don't use deprecated gnutls_certificate_credentials. --- dlls/secur32/schannel_gnutls.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index ed9bfde..17b4b77 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -441,7 +441,7 @@ again: BOOL schan_imp_allocate_certificate_credentials(schan_credentials *c) { - int ret = pgnutls_certificate_allocate_credentials((gnutls_certificate_credentials*)&c->credentials); + int ret = pgnutls_certificate_allocate_credentials((gnutls_certificate_credentials_t*)&c->credentials); if (ret != GNUTLS_E_SUCCESS) pgnutls_perror(ret); return (ret == GNUTLS_E_SUCCESS);

1 0