wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Sven Baars : sane.ds: Fix Dutch translation.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 54132d97e324b486c0341f6e10cf7d02643539fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=54132d97e324b486c0341f6e1… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun May 23 12:23:10 2010 +0200 sane.ds: Fix Dutch translation. --- dlls/sane.ds/sane_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/sane_Nl.rc b/dlls/sane.ds/sane_Nl.rc index ded7061..8f3f347 100644 --- a/dlls/sane.ds/sane_Nl.rc +++ b/dlls/sane.ds/sane_Nl.rc @@ -27,7 +27,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTE CAPTION "Scannen" FONT 8, "MS Sans Serif" BEGIN - LTEXT "SCANNEN... Even geduld",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "SCANNEN... Even geduld a.u.b.",IDC_STATIC,5,19,176,8, SS_CENTER END STRINGTABLE DISCARDABLE

1 0

Austin English : kernel32/tests: Check return value of alarmThread in test_NamedPipe_2().
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 3fd4f68827de87b97795dc440c59d9ac4a166941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd4f68827de87b97795dc440… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 14:06:32 2010 -0500 kernel32/tests: Check return value of alarmThread in test_NamedPipe_2(). --- dlls/kernel32/tests/pipe.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 5abfd85..f5a56c6 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -804,31 +804,37 @@ static void test_NamedPipe_2(void) trace("test_NamedPipe_2 starting\n"); /* Set up a twenty second timeout */ alarm_event = CreateEvent( NULL, TRUE, FALSE, NULL ); + SetLastError(0xdeadbeef); alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 20000, 0, &alarmThreadId); + ok(alarmThread != NULL, "CreateThread failed: %d\n", GetLastError()); - /* The servers we're about to exercize do try to clean up carefully, - * but to reduce the change of a test failure due to a pipe handle + /* The servers we're about to exercise do try to clean up carefully, + * but to reduce the chance of a test failure due to a pipe handle * leak in the test code, we'll use a different pipe name for each server. */ /* Try server #1 */ + SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain1, (void *)8, 0, &serverThreadId); - ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); + ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); exercizeServer(PIPENAME "serverThreadMain1", serverThread); /* Try server #2 */ + SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain2, 0, 0, &serverThreadId); - ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); + ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); exercizeServer(PIPENAME "serverThreadMain2", serverThread); /* Try server #3 */ + SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain3, 0, 0, &serverThreadId); - ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); + ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); exercizeServer(PIPENAME "serverThreadMain3", serverThread); /* Try server #4 */ + SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain4, 0, 0, &serverThreadId); - ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); + ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); exercizeServer(PIPENAME "serverThreadMain4", serverThread); ok(SetEvent( alarm_event ), "SetEvent\n");

1 0

Austin English : usp10/tests: Check return value of SelectObject.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 21dac9f6cd47ca66a1a9c203bbd0086e7a07f4d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21dac9f6cd47ca66a1a9c203b… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 03:45:33 2010 -0500 usp10/tests: Check return value of SelectObject. --- dlls/usp10/tests/usp10.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 41c9035..e47d7c5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1734,6 +1734,7 @@ START_TEST(usp10) lf.lfWidth = 10; hfont = SelectObject(hdc, CreateFontIndirectA(&lf)); + ok(hfont != NULL, "SelectObject failed: %p\n", hfont); test_ScriptItemize(); test_ScriptItemIzeShapePlace(hdc,pwOutGlyphs);

1 0

Austin English : kernel32/tests: Use ret in load_blackbox().
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: e0c7fb66c412eb1b2437ee5414af827fe0ac2d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0c7fb66c412eb1b2437ee541… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 03:38:05 2010 -0500 kernel32/tests: Use ret in load_blackbox(). --- dlls/kernel32/tests/debugger.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index e116c9d..fa96767 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -143,7 +143,9 @@ static int load_blackbox(const char* logfile, void* blackbox, int size) ok(0, "unable to open '%s'\n", logfile); return 0; } + SetLastError(0xdeadbeef); ret=ReadFile(hFile, blackbox, size, &read, NULL); + ok(ret, "ReadFile failed: %d\n", GetLastError()); ok(read == size, "wrong size for '%s': read=%d\n", logfile, read); CloseHandle(hFile); return 1;

1 0

Austin English : gdi32/tests: Use ret in test_CreateFontIndirect().
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 00ddfc804aaf11f5e9f3120fc998fedd0a902e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ddfc804aaf11f5e9f3120fc… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 03:35:07 2010 -0500 gdi32/tests: Use ret in test_CreateFontIndirect(). --- dlls/gdi32/tests/font.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 72cf9be..6ef98c8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3095,7 +3095,9 @@ static void test_CreateFontIndirect(void) lstrcpyA(lf.lfFaceName, TestName[i]); hfont = CreateFontIndirectA(&lf); ok(hfont != 0, "CreateFontIndirectA failed\n"); + SetLastError(0xdeadbeef); ret = GetObject(hfont, sizeof(getobj_lf), &getobj_lf); + ok(ret, "GetObject failed: %d\n", GetLastError()); ok(lf.lfItalic == getobj_lf.lfItalic, "lfItalic: expect %02x got %02x\n", lf.lfItalic, getobj_lf.lfItalic); ok(lf.lfWeight == getobj_lf.lfWeight || broken((SHORT)lf.lfWeight == getobj_lf.lfWeight), /* win9x */

1 0

Austin English : user32/tests: Check return value of DdeClientTransaction in test_initialisation().
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 5396713c2bed6bd8020013903ffa161277babffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5396713c2bed6bd8020013903… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 03:17:37 2010 -0500 user32/tests: Check return value of DdeClientTransaction in test_initialisation(). --- dlls/user32/tests/dde.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 3a0d656..92bee45 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1447,6 +1447,7 @@ static void test_initialisation(void) res = 0xdeadbeef; DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); + ok(hdata == NULL, "Expected NULL, got %p\n", hdata); ret = DdeGetLastError(client_pid); todo_wine ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret);

1 0

Austin English : user32: Add test for drop down width in test_changesize().
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 8ee8806773f7d6b883991b7514f0ae5fc6f672ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ee8806773f7d6b883991b751… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 02:25:13 2010 -0500 user32: Add test for drop down width in test_changesize(). --- dlls/user32/tests/combo.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index faf2145..b7fa63f 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -384,6 +384,8 @@ static void test_changesize( DWORD style) rc.right - rc.left, clwidth - 2); ok( rc.bottom - rc.top == ddheight, "drop-down rect height is %d vs %d\n", rc.bottom - rc.top, ddheight); + ok( rc.right - rc.left == ddwidth -2, "drop-down rect width is %d vs %d\n", + rc.right - rc.left, ddwidth - 2); /* new cx, cy is slightly bigger than the initial values */ MoveWindow( hCombo, 10, 10, clwidth + 2, clheight + 2, TRUE); GetClientRect( hCombo, &rc);

1 0

Andrey Turkin : server: Connect named pipe synchronously when overlapped param is NULL.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 85cc2c13f6f4309993b0daf5a51942228fbac0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=85cc2c13f6f4309993b0daf5a… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat May 22 22:00:59 2010 +0400 server: Connect named pipe synchronously when overlapped param is NULL. --- dlls/kernel32/tests/pipe.c | 48 +++++++++++++++++++++++++------------------ dlls/ntdll/file.c | 2 +- server/named_pipe.c | 2 +- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index b48ceec..5abfd85 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -547,28 +547,36 @@ static DWORD CALLBACK serverThreadMain3(LPVOID arg) oOverlap.hEvent = hEvent; /* Wait for client to connect */ - trace("Server calling overlapped ConnectNamedPipe...\n"); - success = ConnectNamedPipe(hnp, &oOverlap); - err = GetLastError(); - ok(!success && (err == ERROR_IO_PENDING || err == ERROR_PIPE_CONNECTED), "overlapped ConnectNamedPipe\n"); - trace("overlapped ConnectNamedPipe returned.\n"); - if (!success && (err == ERROR_IO_PENDING)) { - if (letWFSOEwait) - { - DWORD ret; - do { - ret = WaitForSingleObjectEx(hEvent, INFINITE, TRUE); - } while (ret == WAIT_IO_COMPLETION); - ok(ret == 0, "wait ConnectNamedPipe returned %x\n", ret); - } - success = GetOverlappedResult(hnp, &oOverlap, &dummy, letGORwait); - if (!letGORwait && !letWFSOEwait && !success) { - ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult\n"); - success = GetOverlappedResult(hnp, &oOverlap, &dummy, TRUE); + if (i == 0) { + trace("Server calling non-overlapped ConnectNamedPipe on overlapped pipe...\n"); + success = ConnectNamedPipe(hnp, NULL); + err = GetLastError(); + ok(success || (err == ERROR_PIPE_CONNECTED), "ConnectNamedPipe failed: %d\n", err); + trace("ConnectNamedPipe operation complete.\n"); + } else { + trace("Server calling overlapped ConnectNamedPipe...\n"); + success = ConnectNamedPipe(hnp, &oOverlap); + err = GetLastError(); + ok(!success && (err == ERROR_IO_PENDING || err == ERROR_PIPE_CONNECTED), "overlapped ConnectNamedPipe\n"); + trace("overlapped ConnectNamedPipe returned.\n"); + if (!success && (err == ERROR_IO_PENDING)) { + if (letWFSOEwait) + { + DWORD ret; + do { + ret = WaitForSingleObjectEx(hEvent, INFINITE, TRUE); + } while (ret == WAIT_IO_COMPLETION); + ok(ret == 0, "wait ConnectNamedPipe returned %x\n", ret); + } + success = GetOverlappedResult(hnp, &oOverlap, &dummy, letGORwait); + if (!letGORwait && !letWFSOEwait && !success) { + ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult\n"); + success = GetOverlappedResult(hnp, &oOverlap, &dummy, TRUE); + } } + ok(success || (err == ERROR_PIPE_CONNECTED), "GetOverlappedResult ConnectNamedPipe\n"); + trace("overlapped ConnectNamedPipe operation complete.\n"); } - ok(success || (err == ERROR_PIPE_CONNECTED), "GetOverlappedResult ConnectNamedPipe\n"); - trace("overlapped ConnectNamedPipe operation complete.\n"); /* Echo bytes once */ memset(buf, 0, sizeof(buf)); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 741395d..b5d1c14 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1227,7 +1227,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, SERVER_START_REQ( ioctl ) { req->code = code; - req->blocking = !apc && !event; + req->blocking = !apc && !event && !cvalue; req->async.handle = wine_server_obj_handle( handle ); req->async.callback = wine_server_client_ptr( ioctl_completion ); req->async.iosb = wine_server_client_ptr( io ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 54ce823..95f06b9 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -613,7 +613,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a { case ps_idle_server: case ps_wait_connect: - if (blocking && !is_overlapped( get_fd_options(fd) )) + if (blocking) { async_data_t new_data = *async_data; if (!(wait_handle = alloc_wait_event( current->process ))) break;

1 0

Alexandre Julliard : winex11: Allow the Xft configuration to override both registry and fontconfig parameters .
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: c30688c4d2e265216e4a30a809b6116e23297648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30688c4d2e265216e4a30a80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 12:34:55 2010 +0200 winex11: Allow the Xft configuration to override both registry and fontconfig parameters. --- dlls/winex11.drv/xrender.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 087da2b..b13f2e4 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -964,6 +964,30 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) pFcPatternDestroy( pattern ); } #endif /* SONAME_LIBFONTCONFIG */ + + /* now check Xft resources */ + { + char *value; + BOOL antialias = TRUE; + + wine_tsx11_lock(); + if ((value = XGetDefault( gdi_display, "Xft", "antialias" ))) + { + if (tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || + value[0] == '0' || !strcasecmp( value, "off" )) + antialias = FALSE; + } + if ((value = XGetDefault( gdi_display, "Xft", "rgba" ))) + { + TRACE( "Xft resource returned rgba '%s' antialias %u\n", value, antialias ); + if (!strcmp( value, "rgb" )) entry->aa_default = AA_RGB; + else if (!strcmp( value, "bgr" )) entry->aa_default = AA_BGR; + else if (!strcmp( value, "vrgb" )) entry->aa_default = AA_VRGB; + else if (!strcmp( value, "vbgr" )) entry->aa_default = AA_VBGR; + else if (!strcmp( value, "none" )) entry->aa_default = antialias ? AA_Grey : AA_None; + } + wine_tsx11_unlock(); + } } else entry->aa_default = AA_None;

1 0

Alexandre Julliard : winex11: Fetch the antialias parameter from fontconfig too.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 4c206326913706788644e8f4ebc11dcede368d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c206326913706788644e8f4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 12:34:28 2010 +0200 winex11: Fetch the antialias parameter from fontconfig too. --- dlls/winex11.drv/xrender.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cc0b2b5..087da2b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -193,6 +193,7 @@ MAKE_FUNCPTR(FcPatternCreate) MAKE_FUNCPTR(FcPatternDestroy) MAKE_FUNCPTR(FcPatternAddInteger) MAKE_FUNCPTR(FcPatternAddString) +MAKE_FUNCPTR(FcPatternGetBool) MAKE_FUNCPTR(FcPatternGetInteger) MAKE_FUNCPTR(FcPatternGetString) static void *fontconfig_handle; @@ -408,6 +409,7 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) LOAD_FUNCPTR(FcPatternDestroy); LOAD_FUNCPTR(FcPatternAddInteger); LOAD_FUNCPTR(FcPatternAddString); + LOAD_FUNCPTR(FcPatternGetBool); LOAD_FUNCPTR(FcPatternGetInteger); LOAD_FUNCPTR(FcPatternGetString); #undef LOAD_FUNCPTR @@ -936,14 +938,17 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) if ((match = pFcFontMatch( NULL, pattern, &result ))) { int rgba; + FcBool antialias; + if (pFcPatternGetBool( match, FC_ANTIALIAS, 0, &antialias ) != FcResultMatch) + antialias = TRUE; if (pFcPatternGetInteger( match, FC_RGBA, 0, &rgba ) == FcResultMatch) { FcChar8 *file; if (pFcPatternGetString( match, FC_FILE, 0, &file ) != FcResultMatch) file = NULL; - TRACE( "fontconfig returned rgba %u for font %s file %s\n", - rgba, debugstr_w(plfsz->lf.lfFaceName), debugstr_a((char *)file) ); + TRACE( "fontconfig returned rgba %u antialias %u for font %s file %s\n", + rgba, antialias, debugstr_w(plfsz->lf.lfFaceName), debugstr_a((char *)file) ); switch (rgba) { @@ -951,7 +956,7 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) case FC_RGBA_BGR: entry->aa_default = AA_BGR; break; case FC_RGBA_VRGB: entry->aa_default = AA_VRGB; break; case FC_RGBA_VBGR: entry->aa_default = AA_VBGR; break; - case FC_RGBA_NONE: entry->aa_default = AA_None; break; + case FC_RGBA_NONE: entry->aa_default = antialias ? AA_Grey : AA_None; break; } } pFcPatternDestroy( match );

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
96
Older →

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 May 2010