wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Ken Thomases : winemac: Force swap interval to 0 for single-buffered contexts to avoid vsync' ed flushes.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: 967a49fcb24493dafe9c39ffa49eee3f2bea87e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=967a49fcb24493dafe9c39ffa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jul 2 01:25:00 2013 -0500 winemac: Force swap interval to 0 for single-buffered contexts to avoid vsync'ed flushes. --- dlls/winemac.drv/opengl.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 904158b..69f94e2 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -2901,7 +2901,9 @@ static BOOL macdrv_wglSwapIntervalEXT(int interval) return FALSE; } - if (interval > 1) + if (!pixel_formats[context->format - 1].double_buffer) + interval = 0; + else if (interval > 1) interval = 1; value = interval; @@ -3238,8 +3240,14 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share) } /* According to the WGL_EXT_swap_control docs, the default swap interval for - a context is 1. CGL contexts default to 0, so we need to set it. */ - swap_interval = 1; + a context is 1. CGL contexts default to 0, so we need to set it. This + only make sense for double-buffered contexts, though. In theory, for + single-buffered contexts, there's no such thing as a swap. But OS X + will synchronize flushes of single-buffered contexts if this is set. */ + if (pf->double_buffer) + swap_interval = 1; + else + swap_interval = 0; err = CGLSetParameter(context->cglcontext, kCGLCPSwapInterval, (GLint*)&swap_interval); if (err != kCGLNoError) WARN("CGLSetParameter(kCGLCPSwapInterval) failed with error %d %s; leaving un-vsynced\n", err, CGLErrorString(err));

1 0

Ken Thomases : winemac: Use screen color space for windows covered by OpenGL views.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: d30705bdfe1756aa9ac9102a293d96a05afec7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30705bdfe1756aa9ac9102a2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jul 2 01:24:19 2013 -0500 winemac: Use screen color space for windows covered by OpenGL views. --- dlls/winemac.drv/cocoa_window.m | 55 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 770056e..0e2d7e6 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -158,6 +158,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) @property (assign, nonatomic) void* imeData; @property (nonatomic) BOOL commandDone; + - (void) updateColorSpace; + @end @@ -256,12 +258,14 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) pendingGlContexts = [[NSMutableArray alloc] init]; [pendingGlContexts addObject:context]; [self setNeedsDisplay:YES]; + [(WineWindow*)[self window] updateColorSpace]; } - (void) removeGLContext:(WineOpenGLContext*)context { [glContexts removeObjectIdenticalTo:context]; [pendingGlContexts removeObjectIdenticalTo:context]; + [(WineWindow*)[self window] updateColorSpace]; } - (void) updateGLContexts @@ -270,6 +274,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) context.needsUpdate = TRUE; } + - (BOOL) hasGLContext + { + return [glContexts count] || [pendingGlContexts count]; + } + - (BOOL) acceptsFirstMouse:(NSEvent*)theEvent { return YES; @@ -919,7 +928,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (NSEqualSizes(frame.size, oldFrame.size)) [self setFrameOrigin:frame.origin]; else + { [self setFrame:frame display:YES]; + [self updateColorSpace]; + } [self updateFullscreen]; @@ -1032,6 +1044,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self setFrameTopLeftPoint:NSMakePoint(NSMinX(frame), NSMaxY(frame))]; frame = [self constrainFrameRect:[self frame] toScreen:primaryScreen]; [self setFrame:frame display:YES]; + [self updateColorSpace]; } if (activate) @@ -1182,6 +1195,37 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } } + // We normally use the generic/calibrated RGB color space for the window, + // rather than the device color space, to avoid expensive color conversion + // which slows down drawing. However, for windows displaying OpenGL, having + // a different color space than the screen greatly reduces frame rates, often + // limiting it to the display refresh rate. + // + // To avoid this, we switch back to the screen color space whenever the + // window is covered by a view with an attached OpenGL context. + - (void) updateColorSpace + { + NSRect contentRect = [[self contentView] frame]; + BOOL coveredByGLView = FALSE; + for (WineContentView* view in [[self contentView] subviews]) + { + if ([view hasGLContext]) + { + NSRect frame = [view convertRect:[view bounds] toView:nil]; + if (NSContainsRect(frame, contentRect)) + { + coveredByGLView = TRUE; + break; + } + } + } + + if (coveredByGLView) + [self setColorSpace:nil]; + else + [self setColorSpace:[NSColorSpace genericRGBColorSpace]]; + } + /* * ---------- NSResponder method overrides ---------- @@ -1872,6 +1916,7 @@ macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) name:NSApplicationDidChangeScreenParametersNotification object:NSApp]; [[window contentView] addSubview:view]; + [window updateColorSpace]; }); [pool release]; @@ -1890,6 +1935,7 @@ void macdrv_dispose_view(macdrv_view v) OnMainThread(^{ NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; + WineWindow* window = (WineWindow*)[view window]; [nc removeObserver:view name:NSViewGlobalFrameDidChangeNotification @@ -1899,6 +1945,7 @@ void macdrv_dispose_view(macdrv_view v) object:NSApp]; [view removeFromSuperview]; [view release]; + [window updateColorSpace]; }); [pool release]; @@ -1923,11 +1970,15 @@ void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rec BOOL changedWindow = (window && window != [view window]); NSRect newFrame = NSRectFromCGRect(rect); NSRect oldFrame = [view frame]; + BOOL needUpdateWindowColorSpace = FALSE; if (changedWindow) { + WineWindow* oldWindow = (WineWindow*)[view window]; [view removeFromSuperview]; + [oldWindow updateColorSpace]; [[window contentView] addSubview:view]; + needUpdateWindowColorSpace = TRUE; } if (!NSEqualRects(oldFrame, newFrame)) @@ -1941,7 +1992,11 @@ void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rec else [view setFrame:newFrame]; [view setNeedsDisplay:YES]; + needUpdateWindowColorSpace = TRUE; } + + if (needUpdateWindowColorSpace) + [(WineWindow*)[view window] updateColorSpace]; }); [pool release];

1 0

Dmitry Timoshkov : kernel32/tests: Fix a couple of typos.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: b0a3d93400f90a06da8ba314ed37a9e2b75a9293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a3d93400f90a06da8ba314e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 2 10:24:23 2013 +0900 kernel32/tests: Fix a couple of typos. --- dlls/kernel32/tests/virtual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 521ce6e..e605242 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -712,8 +712,8 @@ static void test_MapViewOfFile(void) ok(info.BaseAddress == ptr, "BaseAddress should have been %p but was %p instead\n", ptr, info.BaseAddress); ok(info.AllocationBase == ptr, "AllocationBase should have been %p but was %p instead\n", ptr, info.AllocationBase); ok(info.RegionSize == 0x10000, "RegionSize should have been 0x10000 but was 0x%lx\n", info.RegionSize); - ok(info.State == MEM_COMMIT, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); - ok(info.Protect == PAGE_READONLY, "Protect should have been 0 instead of 0x%x\n", info.Protect); + ok(info.State == MEM_COMMIT, "State should have been MEM_COMMIT instead of 0x%x\n", info.State); + ok(info.Protect == PAGE_READONLY, "Protect should have been PAGE_READONLY instead of 0x%x\n", info.Protect); if (info.Type == MEM_PRIVATE) /* win9x is different for uncommitted mappings */ { ok(info.AllocationProtect == PAGE_NOACCESS,

1 0

Michael Stefaniuc : dsound/tests: Fix copy&paste error in ok() message.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: a158d42c0fbe3a29268280dc9b7d4ee9867f1046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a158d42c0fbe3a29268280dc9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 2 00:58:27 2013 +0200 dsound/tests: Fix copy&paste error in ok() message. --- dlls/dsound/tests/ds3d8.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 295a406..e5db2de 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -709,7 +709,7 @@ static HRESULT test_secondary8(LPGUID lpGuid, int play, rc=IDirectSoundBuffer_SetPan(secondary,-1000); ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); rc=IDirectSoundBuffer_GetPan(secondary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: %08x\n",rc); ok(pan==-1000,"secondary: wrong pan %d instead of -1000\n", pan);

1 0

Stefan Leichter : msvcp100/tests: Fix dynamically loaded functions for platform arm.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: 4c3e01143dedbce76f4b03db65f1fb6d89b0b0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3e01143dedbce76f4b03db6… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jul 1 22:31:31 2013 +0200 msvcp100/tests: Fix dynamically loaded functions for platform arm. --- dlls/msvcp100/tests/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c index 47f6410..554db2e 100644 --- a/dlls/msvcp100/tests/misc.c +++ b/dlls/msvcp100/tests/misc.c @@ -113,7 +113,7 @@ static BOOL init(void) }else { #ifdef __arm__ SET(p__Container_base12_copy_ctor, "??0_Container_base12@std@@QAA@ABU01@@Z"); - SET(p__Container_base12_ctor, "??0_Container_base12@std@@QAE@XZ"); + SET(p__Container_base12_ctor, "??0_Container_base12@std@@QAA@XZ"); SET(p__Container_base12__Orphan_all, "?_Orphan_all@_Container_base12@std@@QAAXXZ"); SET(p__Container_base12_dtor, "??1_Container_base12@std@@QAA@XZ"); SET(p__Container_base12__Getpfirst, "?_Getpfirst@_Container_base12@std@@QBAPAPAU_Iterator_base12@2@XZ");

1 0

Alexandre Julliard : ntdll/tests: Don't test . and .. masks, they don' t work on Windows.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: 4142fc9b52555d6a273c3a2d14893711e7e841a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4142fc9b52555d6a273c3a2d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 10:03:50 2013 +0200 ntdll/tests: Don't test . and .. masks, they don't work on Windows. --- dlls/ntdll/tests/directory.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index bc5d860..f495fb3 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -261,6 +261,8 @@ static void test_NtQueryDirectoryFile(void) for (i = 0; testfiles[i].name; i++) { UNICODE_STRING mask; + + if (testfiles[i].nameW[0] == '.') continue; /* . and .. as masks are broken on Windows */ mask.Buffer = testfiles[i].nameW; mask.Length = mask.MaximumLength = lstrlenW(testfiles[i].nameW) * sizeof(WCHAR); test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, FALSE, TRUE);

1 0

Qian Hong : rsaenh: Restore key state even after decrypting a block of bad data.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 2d0653e2b2851131540a56d24950746dcca36a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d0653e2b2851131540a56d24… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Jun 29 00:51:30 2013 +0800 rsaenh: Restore key state even after decrypting a block of bad data. --- dlls/rsaenh/rsaenh.c | 2 ++ dlls/rsaenh/tests/rsaenh.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index d0fc5be..b4e4b35 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2380,11 +2380,13 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, *pdwDataLen -= pbData[*pdwDataLen-1]; else { SetLastError(NTE_BAD_DATA); + setup_key(pCryptKey); return FALSE; } } else { SetLastError(NTE_BAD_DATA); + setup_key(pCryptKey); return FALSE; } } diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 9577d8c..f43a4e4 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -840,7 +840,6 @@ static void test_3des112(void) result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); -todo_wine ok(memcmp(pbData,cTestData[i].decstr,cTestData[1].enclen)==0,"decryption incorrect %d\n",i); if((dwLen != cTestData[i].enclen) || memcmp(pbData,cTestData[i].decstr,cTestData[i].enclen)) @@ -1019,7 +1018,6 @@ static void test_3des(void) result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); -todo_wine ok(memcmp(pbData,cTestData[i].decstr,cTestData[1].enclen)==0,"decryption incorrect %d\n",i); if((dwLen != cTestData[i].enclen) || memcmp(pbData,cTestData[i].decstr,cTestData[i].enclen))

1 0

Qian Hong : rsaenh/tests: Added more key state tests.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: b84e11ecbd7c5a419ca4e3e4d4754f2e5ddb531c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84e11ecbd7c5a419ca4e3e4d… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Jun 29 00:50:10 2013 +0800 rsaenh/tests: Added more key state tests. --- dlls/rsaenh/tests/rsaenh.c | 154 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 150 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b84e11ecbd7c5a419ca4e…

1 0

André Hentschel : gdi32: Remove superfluous cast.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 20bf02910b5d6e9b9789097821da36cad89e8442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20bf02910b5d6e9b978909782… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 30 15:35:21 2013 +0200 gdi32: Remove superfluous cast. --- dlls/gdi32/dibdrv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 67cab00..add0b01 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -121,7 +121,7 @@ static BOOL init_opengl(void) goto failed; } } -#define LOAD_FUNCPTR(f) do if (!(p##f = (void *)wine_dlsym( osmesa_handle, #f, buffer, sizeof(buffer) ))) \ +#define LOAD_FUNCPTR(f) do if (!(p##f = wine_dlsym( osmesa_handle, #f, buffer, sizeof(buffer) ))) \ { \ ERR( "%s not found in %s (%s), disabling.\n", #f, SONAME_LIBOSMESA, buffer ); \ goto failed; \

1 0

André Hentschel : netstat: Remove superfluous casts.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 49f550e8ed0b4aeffef9d8e8cb9fc2126873ef7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f550e8ed0b4aeffef9d8e8c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 30 15:35:09 2013 +0200 netstat: Remove superfluous casts. --- programs/netstat/netstat.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 23f2b40..fab39e3 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -189,7 +189,7 @@ static void NETSTAT_eth_stats(void) size = sizeof(MIB_IFTABLE); do { - table = (PMIB_IFTABLE)HeapAlloc(GetProcessHeap(), 0, size); + table = HeapAlloc(GetProcessHeap(), 0, size); err = GetIfTable(table, &size, FALSE); if (err != NO_ERROR) HeapFree(GetProcessHeap(), 0, table); } while (err == ERROR_INSUFFICIENT_BUFFER); @@ -246,7 +246,7 @@ static void NETSTAT_tcp_table(void) size = sizeof(MIB_TCPTABLE); do { - table = (PMIB_TCPTABLE)HeapAlloc(GetProcessHeap(), 0, size); + table = HeapAlloc(GetProcessHeap(), 0, size); err = GetTcpTable(table, &size, TRUE); if (err != NO_ERROR) HeapFree(GetProcessHeap(), 0, table); } while (err == ERROR_INSUFFICIENT_BUFFER); @@ -301,7 +301,7 @@ static void NETSTAT_udp_table(void) size = sizeof(MIB_UDPTABLE); do { - table = (PMIB_UDPTABLE)HeapAlloc(GetProcessHeap(), 0, size); + table = HeapAlloc(GetProcessHeap(), 0, size); err = GetUdpTable(table, &size, TRUE); if (err != NO_ERROR) HeapFree(GetProcessHeap(), 0, table); } while (err == ERROR_INSUFFICIENT_BUFFER);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2013