February 2008 - Wine-commits

Alexandre Julliard : winex11: Only update the virtual screen rect once in xinerama_init to minimize race conditions .
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: e00840cf57907746f6fa1f0350773af0bcc63bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00840cf57907746f6fa1f035… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 6 20:38:20 2008 +0100 winex11: Only update the virtual screen rect once in xinerama_init to minimize race conditions. --- dlls/winex11.drv/xinerama.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 782c779..ee735e6 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -138,14 +138,15 @@ void xinerama_init( unsigned int width, unsigned int height ) { MONITORINFOEXW *primary; int i; + RECT rect; wine_tsx11_lock(); - SetRect( &virtual_screen_rect, 0, 0, width, height ); + SetRect( &rect, 0, 0, width, height ); if (root_window != DefaultRootWindow( gdi_display ) || !query_screens()) { - default_monitor.rcWork = default_monitor.rcMonitor = virtual_screen_rect; + default_monitor.rcWork = default_monitor.rcMonitor = rect; nb_monitors = 1; monitors = &default_monitor; } @@ -153,20 +154,21 @@ void xinerama_init( unsigned int width, unsigned int height ) primary = get_primary(); /* coordinates (0,0) have to point to the primary monitor origin */ - OffsetRect( &virtual_screen_rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); + OffsetRect( &rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); for (i = 0; i < nb_monitors; i++) { - OffsetRect( &monitors[i].rcMonitor, virtual_screen_rect.left, virtual_screen_rect.top ); - OffsetRect( &monitors[i].rcWork, virtual_screen_rect.left, virtual_screen_rect.top ); + OffsetRect( &monitors[i].rcMonitor, rect.left, rect.top ); + OffsetRect( &monitors[i].rcWork, rect.left, rect.top ); TRACE( "monitor %p: %s%s\n", index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } + virtual_screen_rect = rect; screen_width = primary->rcMonitor.right - primary->rcMonitor.left; screen_height = primary->rcMonitor.bottom - primary->rcMonitor.top; TRACE( "virtual size: %s primary size: %dx%d\n", - wine_dbgstr_rect(&virtual_screen_rect), screen_width, screen_height ); + wine_dbgstr_rect(&rect), screen_width, screen_height ); wine_tsx11_unlock(); ClipCursor( NULL ); /* reset the cursor clip rectangle */

1 0

Chris Morgan : Merge branch 'master' of git://winehq.org/git/appdb
by Chris Morgan 07 Feb '08

07 Feb '08

Module: appdb Branch: master Commit: 86ced92c4c6a92aa34be91c11ffadc445cc9f816 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=86ced92c4c6a92aa34be91c1… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Wed Feb 6 23:35:46 2008 -0500 Merge branch 'master' of git://winehq.org/git/appdb ---

1 0

Alexander Nicolaysen Sørnes : cron scripts: Disable updateRatings()
by Chris Morgan 07 Feb '08

07 Feb '08

Module: appdb Branch: master Commit: d5bcd65a74fe5671205da21eb6baf7b56b98f8d8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d5bcd65a74fe5671205da21e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Feb 4 14:26:24 2008 +0100 cron scripts: Disable updateRatings() --- cron/cleanup.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cron/cleanup.php b/cron/cleanup.php index 473b057..18d5d92 100644 --- a/cron/cleanup.php +++ b/cron/cleanup.php @@ -34,7 +34,7 @@ removeScreenshotsWithMissingFiles(); maintainerCheck(); /* Updates the rating info for all versions based on test results */ -updateRatings(); +//updateRatings(); /* * Warn users that have been inactive for some number of months

1 0

Paul Vriens : wintrust/tests: Use GetModuleHandleA instead of LoadLibraryA.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 533b15d6ea1499735cdc2f30efe46390d0ab648c URL: http://source.winehq.org/git/wine.git/?a=commit;h=533b15d6ea1499735cdc2f30e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 6 12:04:30 2008 +0100 wintrust/tests: Use GetModuleHandleA instead of LoadLibraryA. --- dlls/wintrust/tests/crypt.c | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 600299a..887d57a 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -30,33 +30,25 @@ static char selfname[MAX_PATH]; static CHAR CURR_DIR[MAX_PATH]; -static HMODULE hWintrust = 0; - static BOOL (WINAPI * pCryptCATAdminAcquireContext)(HCATADMIN*, const GUID*, DWORD); static BOOL (WINAPI * pCryptCATAdminReleaseContext)(HCATADMIN, DWORD); static BOOL (WINAPI * pCryptCATAdminCalcHashFromFileHandle)(HANDLE hFile, DWORD*, BYTE*, DWORD); +static void InitFunctionPtrs(void) +{ + HMODULE hWintrust = GetModuleHandleA("wintrust.dll"); + #define WINTRUST_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hWintrust, #func); \ if(!p ## func) { \ trace("GetProcAddress(%s) failed\n", #func); \ } -static BOOL InitFunctionPtrs(void) -{ - hWintrust = LoadLibraryA("wintrust.dll"); - - if(!hWintrust) - { - skip("Could not load wintrust.dll\n"); - return FALSE; - } - WINTRUST_GET_PROC(CryptCATAdminAcquireContext) WINTRUST_GET_PROC(CryptCATAdminReleaseContext) WINTRUST_GET_PROC(CryptCATAdminCalcHashFromFileHandle) - return TRUE; +#undef WINTRUST_GET_PROC } static void test_context(void) @@ -290,8 +282,7 @@ START_TEST(crypt) int myARGC; char** myARGV; - if(!InitFunctionPtrs()) - return; + InitFunctionPtrs(); myARGC = winetest_get_mainargs(&myARGV); strcpy(selfname, myARGV[0]); @@ -300,6 +291,4 @@ START_TEST(crypt) test_context(); test_calchash(); - - FreeLibrary(hWintrust); }

1 0

Kirill K. Smirnov : systray: Add support for NIS_HIDDEN flag.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 43083236c428e968a7fa1c54470a67cd89674034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43083236c428e968a7fa1c544… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Tue Feb 5 14:19:40 2008 +0000 systray: Add support for NIS_HIDDEN flag. --- programs/explorer/systray.c | 135 ++++++++++++++++++++++++++----------------- 1 files changed, 82 insertions(+), 53 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 75872b0..9ddfd4d 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -64,6 +64,7 @@ struct icon HWND tooltip; /* Icon tooltip */ UINT id; /* the unique id given by the app */ UINT callback_message; + BOOL hidden; /* icon display state */ }; static struct tray tray; @@ -182,6 +183,69 @@ static void set_tooltip(struct icon *icon, WCHAR *szTip, BOOL modify) SendMessageW(icon->tooltip, TTM_ADDTOOLW, 0, (LPARAM)&ti); } +static BOOL display_icon(struct icon *icon, BOOL hide) +{ + HMODULE x11drv = GetModuleHandleA("winex11.drv"); + RECT rect; + static const WCHAR adaptor_windowname[] = /* Wine System Tray Adaptor */ {'W','i','n','e',' ','S','y','s','t','e','m',' ','T','r','a','y',' ','A','d','a','p','t','o','r',0}; + static BOOL tooltps_initialized = FALSE; + + WINE_TRACE("id=0x%x, hwnd=%p, hide=%d\n", icon->id, icon->owner, hide); + + if (icon->hidden == hide || (!icon->hidden) == (!hide)) return TRUE; + icon->hidden = hide; + if (hide) + { + DestroyWindow(icon->window); + DestroyWindow(icon->tooltip); + return TRUE; + } + + rect.left = 0; + rect.top = 0; + rect.right = GetSystemMetrics(SM_CXSMICON) + ICON_BORDER; + rect.bottom = GetSystemMetrics(SM_CYSMICON) + ICON_BORDER; + AdjustWindowRect(&rect, WS_CLIPSIBLINGS | WS_CAPTION, FALSE); + + /* create the adaptor window */ + icon->window = CreateWindowEx(0, adaptor_classname, + adaptor_windowname, + WS_CLIPSIBLINGS | WS_CAPTION, + CW_USEDEFAULT, CW_USEDEFAULT, + rect.right - rect.left, + rect.bottom - rect.top, + NULL, NULL, NULL, icon); + if (x11drv) + { + void (*make_systray_window)(HWND) = (void *)GetProcAddress(x11drv, "wine_make_systray_window"); + if (make_systray_window) make_systray_window(icon->window); + } + + if (!hide_systray) + ShowWindow(icon->window, SW_SHOWNA); + + /* create icon tooltip */ + + /* Register tooltip classes if this is the first icon */ + if (!tooltps_initialized) + { + INITCOMMONCONTROLSEX init_tooltip; + + init_tooltip.dwSize = sizeof(INITCOMMONCONTROLSEX); + init_tooltip.dwICC = ICC_TAB_CLASSES; + + InitCommonControlsEx(&init_tooltip); + tooltps_initialized = TRUE; + } + + icon->tooltip = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL, + WS_POPUP | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + icon->window, NULL, NULL, NULL); + return TRUE; +} + static BOOL modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) { struct icon *icon; @@ -196,12 +260,23 @@ static BOOL modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) return FALSE; } + if (nid->uFlags & NIF_STATE) + { + if (nid->dwStateMask & NIS_HIDDEN) + display_icon(icon, !!(nid->dwState & NIS_HIDDEN)); + else + display_icon(icon, FALSE); + } + else + display_icon(icon, FALSE); + if (nid->uFlags & NIF_ICON) { if (icon->image) DestroyIcon(icon->image); icon->image = CopyIcon(nid->hIcon); - RedrawWindow(icon->window, NULL, NULL, RDW_ERASE | RDW_INVALIDATE | RDW_UPDATENOW); + if (!icon->hidden) + RedrawWindow(icon->window, NULL, NULL, RDW_ERASE | RDW_INVALIDATE | RDW_UPDATENOW); } if (nid->uFlags & NIF_MESSAGE) @@ -221,11 +296,7 @@ static BOOL modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) static BOOL add_icon(NOTIFYICONDATAW *nid) { - HMODULE x11drv = GetModuleHandleA( "winex11.drv" ); - RECT rect; struct icon *icon; - static const WCHAR adaptor_windowname[] = /* Wine System Tray Adaptor */ {'W','i','n','e',' ','S','y','s','t','e','m',' ','T','r','a','y',' ','A','d','a','p','t','o','r',0}; - static BOOL tooltps_initialized = FALSE; WINE_TRACE("id=0x%x, hwnd=%p\n", nid->uID, nid->hWnd); @@ -241,52 +312,11 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) return FALSE; } - icon->id = nid->uID; - icon->owner = nid->hWnd; - icon->image = NULL; - - rect.left = 0; - rect.top = 0; - rect.right = GetSystemMetrics(SM_CXSMICON) + ICON_BORDER; - rect.bottom = GetSystemMetrics(SM_CYSMICON) + ICON_BORDER; - AdjustWindowRect(&rect, WS_CLIPSIBLINGS | WS_CAPTION, FALSE); - - /* create the adaptor window */ - icon->window = CreateWindowEx(0, adaptor_classname, - adaptor_windowname, - WS_CLIPSIBLINGS | WS_CAPTION, - CW_USEDEFAULT, CW_USEDEFAULT, - rect.right - rect.left, - rect.bottom - rect.top, - NULL, NULL, NULL, icon); - if (x11drv) - { - void (*make_systray_window)(HWND) = (void *)GetProcAddress( x11drv, "wine_make_systray_window" ); - if (make_systray_window) make_systray_window( icon->window ); - } - - if (!hide_systray) - ShowWindow(icon->window, SW_SHOWNA); - - /* create icon tooltip */ - - /* Register tooltip classes if this is the first icon */ - if (!tooltps_initialized) - { - INITCOMMONCONTROLSEX init_tooltip; - - init_tooltip.dwSize = sizeof(INITCOMMONCONTROLSEX); - init_tooltip.dwICC = ICC_TAB_CLASSES; - - InitCommonControlsEx(&init_tooltip); - tooltps_initialized = TRUE; - } - - icon->tooltip = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL, - WS_POPUP | TTS_ALWAYSTIP, - CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, - icon->window, NULL, NULL, NULL); + icon->id = nid->uID; + icon->owner = nid->hWnd; + icon->image = NULL; + icon->window = NULL; + icon->hidden = TRUE; list_add_tail(&tray.icons, &icon->entry); @@ -305,8 +335,7 @@ static BOOL delete_icon(const NOTIFYICONDATAW *nid) return FALSE; } - DestroyWindow(icon->tooltip); - DestroyWindow(icon->window); + display_icon(icon, TRUE); return TRUE; }

1 0

Jens Nestler : kernel32: Don' t fail unconditionally in MoveFile for directories with flag MOVEFILE_REPLACE_EXISTING .
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 6d59ddf67b6beb8862a4b784c9a52e8a34b5c13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d59ddf67b6beb8862a4b784c… Author: Jens Nestler <nessi(a)nessi-online.de> Date: Tue Jan 29 09:37:53 2008 +0100 kernel32: Don't fail unconditionally in MoveFile for directories with flag MOVEFILE_REPLACE_EXISTING. --- dlls/kernel32/path.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 7681880..f0f713f 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1042,15 +1042,6 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, goto error; } - if (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - if (flag & MOVEFILE_REPLACE_EXISTING) /* cannot replace directory */ - { - SetLastError( ERROR_INVALID_PARAMETER ); - goto error; - } - } - /* we must have write access to the destination, and it must */ /* not exist except if MOVEFILE_REPLACE_EXISTING is set */ @@ -1061,7 +1052,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE, &attr, &io, 0, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); - if (status == STATUS_SUCCESS) + if (status == STATUS_SUCCESS) /* destination exists */ { NtClose( dest_handle ); if (!(flag & MOVEFILE_REPLACE_EXISTING)) @@ -1070,6 +1061,11 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, RtlFreeUnicodeString( &nt_name ); goto error; } + else if (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) /* cannot replace directory */ + { + SetLastError( ERROR_ACCESS_DENIED ); + goto error; + } } else if (status != STATUS_OBJECT_NAME_NOT_FOUND) {

1 0

Reece H. Dunn : cabinet: Make the fdi tests pass on Vista.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 0edae1c9eaf7d49fb524e3a392b7ed2949c7edce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edae1c9eaf7d49fb524e3a39… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Sat Jan 26 10:34:45 2008 +0000 cabinet: Make the fdi tests pass on Vista. --- dlls/cabinet/tests/fdi.c | 73 +++++++++++++++++++++++++++++---------------- 1 files changed, 47 insertions(+), 26 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 7c10b3d..18745f2 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -92,10 +92,6 @@ static void test_FDICreate(void) HFDI hfdi; ERF erf; - erf.erfOper = 0xcafefeed; - erf.erfType = 0xdeadbabe; - erf.fError = 0xdecaface; - /* native crashes if pfnalloc is NULL */ /* FDICreate does not crash with a NULL pfnfree, @@ -104,6 +100,9 @@ static void test_FDICreate(void) if (0) { SetLastError(0xdeadbeef); + erf.erfOper = 0xcafefeed; + erf.erfType = 0xdeadbabe; + erf.fError = 0xdecaface; hfdi = FDICreate(fdi_alloc, NULL, fdi_open, fdi_read, fdi_write, fdi_close, fdi_seek, cpuUNKNOWN, &erf); @@ -118,99 +117,121 @@ static void test_FDICreate(void) } SetLastError(0xdeadbeef); + erf.erfOper = 0xcafefeed; + erf.erfType = 0xdeadbabe; + erf.fError = 0xdecaface; hfdi = FDICreate(fdi_alloc, fdi_free, NULL, fdi_read, fdi_write, fdi_close, fdi_seek, cpuUNKNOWN, &erf); ok(hfdi != NULL, "Expected non-NULL context\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(erf.erfOper == 0xcafefeed, "Expected 0xcafefeed, got %d\n", erf.erfOper); - ok(erf.erfType == 0xdeadbabe, "Expected 0xdeadbabe, got %d\n", erf.erfType); - ok(erf.fError == 0xdecaface, "Expected 0xdecaface, got %d\n", erf.fError); + ok((erf.erfOper == 0xcafefeed || erf.erfOper == 0 /* Vista */), "Expected 0xcafefeed or 0, got %d\n", erf.erfOper); + ok((erf.erfType == 0xdeadbabe || erf.erfType == 0 /* Vista */), "Expected 0xdeadbabe or 0, got %d\n", erf.erfType); + ok((erf.fError == 0xdecaface || erf.fError == 0 /* Vista */), "Expected 0xdecaface or 0, got %d\n", erf.fError); FDIDestroy(hfdi); SetLastError(0xdeadbeef); + erf.erfOper = 0xcafefeed; + erf.erfType = 0xdeadbabe; + erf.fError = 0xdecaface; hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, NULL, fdi_write, fdi_close, fdi_seek, cpuUNKNOWN, &erf); ok(hfdi != NULL, "Expected non-NULL context\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(erf.erfOper == 0xcafefeed, "Expected 0xcafefeed, got %d\n", erf.erfOper); - ok(erf.erfType == 0xdeadbabe, "Expected 0xdeadbabe, got %d\n", erf.erfType); - ok(erf.fError == 0xdecaface, "Expected 0xdecaface, got %d\n", erf.fError); + ok((erf.erfOper == 0xcafefeed || erf.erfOper == 0 /* Vista */), "Expected 0xcafefeed or 0, got %d\n", erf.erfOper); + ok((erf.erfType == 0xdeadbabe || erf.erfType == 0 /* Vista */), "Expected 0xdeadbabe or 0, got %d\n", erf.erfType); + ok((erf.fError == 0xdecaface || erf.fError == 0 /* Vista */), "Expected 0xdecaface or 0, got %d\n", erf.fError); FDIDestroy(hfdi); SetLastError(0xdeadbeef); + erf.erfOper = 0xcafefeed; + erf.erfType = 0xdeadbabe; + erf.fError = 0xdecaface; hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, fdi_read, NULL, fdi_close, fdi_seek, cpuUNKNOWN, &erf); ok(hfdi != NULL, "Expected non-NULL context\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(erf.erfOper == 0xcafefeed, "Expected 0xcafefeed, got %d\n", erf.erfOper); - ok(erf.erfType == 0xdeadbabe, "Expected 0xdeadbabe, got %d\n", erf.erfType); - ok(erf.fError == 0xdecaface, "Expected 0xdecaface, got %d\n", erf.fError); + ok((erf.erfOper == 0xcafefeed || erf.erfOper == 0 /* Vista */), "Expected 0xcafefeed or 0, got %d\n", erf.erfOper); + ok((erf.erfType == 0xdeadbabe || erf.erfType == 0 /* Vista */), "Expected 0xdeadbabe or 0, got %d\n", erf.erfType); + ok((erf.fError == 0xdecaface || erf.fError == 0 /* Vista */), "Expected 0xdecaface or 0, got %d\n", erf.fError); FDIDestroy(hfdi); SetLastError(0xdeadbeef); + erf.erfOper = 0xcafefeed; + erf.erfType = 0xdeadbabe; + erf.fError = 0xdecaface; hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, fdi_read, fdi_write, NULL, fdi_seek, cpuUNKNOWN, &erf); ok(hfdi != NULL, "Expected non-NULL context\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(erf.erfOper == 0xcafefeed, "Expected 0xcafefeed, got %d\n", erf.erfOper); - ok(erf.erfType == 0xdeadbabe, "Expected 0xdeadbabe, got %d\n", erf.erfType); - ok(erf.fError == 0xdecaface, "Expected 0xdecaface, got %d\n", erf.fError); + ok((erf.erfOper == 0xcafefeed || erf.erfOper == 0 /* Vista */), "Expected 0xcafefeed or 0, got %d\n", erf.erfOper); + ok((erf.erfType == 0xdeadbabe || erf.erfType == 0 /* Vista */), "Expected 0xdeadbabe or 0, got %d\n", erf.erfType); + ok((erf.fError == 0xdecaface || erf.fError == 0 /* Vista */), "Expected 0xdecaface or 0, got %d\n", erf.fError); FDIDestroy(hfdi); SetLastError(0xdeadbeef); + erf.erfOper = 0xcafefeed; + erf.erfType = 0xdeadbabe; + erf.fError = 0xdecaface; hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, fdi_read, fdi_write, fdi_close, NULL, cpuUNKNOWN, &erf); ok(hfdi != NULL, "Expected non-NULL context\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(erf.erfOper == 0xcafefeed, "Expected 0xcafefeed, got %d\n", erf.erfOper); - ok(erf.erfType == 0xdeadbabe, "Expected 0xdeadbabe, got %d\n", erf.erfType); - ok(erf.fError == 0xdecaface, "Expected 0xdecaface, got %d\n", erf.fError); + ok((erf.erfOper == 0xcafefeed || erf.erfOper == 0 /* Vista */), "Expected 0xcafefeed or 0, got %d\n", erf.erfOper); + ok((erf.erfType == 0xdeadbabe || erf.erfType == 0 /* Vista */), "Expected 0xdeadbabe or 0, got %d\n", erf.erfType); + ok((erf.fError == 0xdecaface || erf.fError == 0 /* Vista */), "Expected 0xdecaface or 0, got %d\n", erf.fError); FDIDestroy(hfdi); SetLastError(0xdeadbeef); + erf.erfOper = 0xcafefeed; + erf.erfType = 0xdeadbabe; + erf.fError = 0xdecaface; hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, fdi_read, fdi_write, fdi_close, fdi_seek, cpuUNKNOWN, NULL); - ok(hfdi != NULL, "Expected non-NULL context\n"); + /* XP sets hfdi to a non-NULL value, but Vista sets it to NULL! */ ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(erf.erfOper == 0xcafefeed, "Expected 0xcafefeed, got %d\n", erf.erfOper); - ok(erf.erfType == 0xdeadbabe, "Expected 0xdeadbabe, got %d\n", erf.erfType); - ok(erf.fError == 0xdecaface, "Expected 0xdecaface, got %d\n", erf.fError); + /* NULL is passed to FDICreate instead of &erf, so don't retest the erf member values. */ FDIDestroy(hfdi); /* bad cpu type */ SetLastError(0xdeadbeef); + erf.erfOper = 0xcafefeed; + erf.erfType = 0xdeadbabe; + erf.fError = 0xdecaface; hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, fdi_read, fdi_write, fdi_close, fdi_seek, 0xcafebabe, &erf); ok(hfdi != NULL, "Expected non-NULL context\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(erf.erfOper == 0xcafefeed, "Expected 0xcafefeed, got %d\n", erf.erfOper); - ok(erf.erfType == 0xdeadbabe, "Expected 0xdeadbabe, got %d\n", erf.erfType); - ok(erf.fError == 0xdecaface, "Expected 0xdecaface, got %d\n", erf.fError); + ok((erf.erfOper == 0xcafefeed || erf.erfOper == 0 /* Vista */), "Expected 0xcafefeed or 0, got %d\n", erf.erfOper); + ok((erf.erfType == 0xdeadbabe || erf.erfType == 0 /* Vista */), "Expected 0xdeadbabe or 0, got %d\n", erf.erfType); + ok((erf.fError == 0xdecaface || erf.fError == 0 /* Vista */), "Expected 0xdecaface or 0, got %d\n", erf.fError); FDIDestroy(hfdi); /* pfnalloc fails */ SetLastError(0xdeadbeef); + erf.erfOper = 0xcafefeed; + erf.erfType = 0xdeadbabe; + erf.fError = 0xdecaface; hfdi = FDICreate(fdi_alloc_bad, fdi_free, fdi_open, fdi_read, fdi_write, fdi_close, fdi_seek, cpuUNKNOWN, &erf);

1 0

Reece H. Dunn : ddraw: Spelling fixes in the d3d test output.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 83549954820a7cfecc55421cc1665ce17e8bc9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83549954820a7cfecc55421cc… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Sun Jan 27 09:01:35 2008 +0000 ddraw: Spelling fixes in the d3d test output. --- dlls/ddraw/tests/d3d.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d92f36b..fb9e51e 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1049,7 +1049,7 @@ static void Direct3D1Test(void) ok(cmp[i].x == out[i].x && cmp[i].y == out[i].y && cmp[i].z == out[i].z && cmp[i].rhw == out[i].rhw, - "Vertex %d differs. Got %f %f %f %f, expexted %f %f %f %f\n", i + 1, + "Vertex %d differs. Got %f %f %f %f, expected %f %f %f %f\n", i + 1, out[i].x, out[i].y, out[i].z, out[i].rhw, cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } @@ -1078,7 +1078,7 @@ static void Direct3D1Test(void) }; ok(cmp[i].x == out[i].x && cmp[i].y == out[i].y && cmp[i].z == out[i].z && cmp[i].rhw == out[i].rhw, - "Vertex %d differs. Got %f %f %f %f, expexted %f %f %f %f\n", i + 1, + "Vertex %d differs. Got %f %f %f %f, expected %f %f %f %f\n", i + 1, out[i].x, out[i].y, out[i].z, out[i].rhw, cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } @@ -1099,7 +1099,7 @@ static void Direct3D1Test(void) }; ok(cmp[i].x == out[i].x && cmp[i].y == out[i].y && cmp[i].z == out[i].z && cmp[i].rhw == out[i].rhw, - "Vertex %d differs. Got %f %f %f %f, expexted %f %f %f %f\n", i + 1, + "Vertex %d differs. Got %f %f %f %f, expected %f %f %f %f\n", i + 1, out[i].x, out[i].y, out[i].z, out[i].rhw, cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } @@ -1118,7 +1118,7 @@ static void Direct3D1Test(void) }; ok(U1(cmpH[i]).hx == U1(outH[i]).hx && U2(cmpH[i]).hy == U2(outH[i]).hy && U3(cmpH[i]).hz == U3(outH[i]).hz && cmpH[i].dwFlags == outH[i].dwFlags, - "HVertex %d differs. Got %08x %f %f %f, expexted %08x %f %f %f\n", i + 1, + "HVertex %d differs. Got %08x %f %f %f, expected %08x %f %f %f\n", i + 1, outH[i].dwFlags, U1(outH[i]).hx, U2(outH[i]).hy, U3(outH[i]).hz, cmpH[i].dwFlags, U1(cmpH[i]).hx, U2(cmpH[i]).hy, U3(cmpH[i]).hz); @@ -1135,7 +1135,7 @@ static void Direct3D1Test(void) }; ok(cmp[i].x == out[i].x && cmp[i].y == out[i].y && cmp[i].z == out[i].z && cmp[i].rhw == out[i].rhw, - "Vertex %d differs. Got %f %f %f %f, expexted %f %f %f %f\n", i + 1, + "Vertex %d differs. Got %f %f %f %f, expected %f %f %f %f\n", i + 1, out[i].x, out[i].y, out[i].z, out[i].rhw, cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } @@ -1161,7 +1161,7 @@ static void Direct3D1Test(void) D3DCLIP_LEFT | D3DCLIP_BOTTOM | D3DCLIP_FRONT, }; ok(Flags[i] == outH[i].dwFlags, - "Cliptest %d differs. Got %08x expexted %08x\n", i + 1, + "Cliptest %d differs. Got %08x expected %08x\n", i + 1, outH[i].dwFlags, Flags[i]); } @@ -1184,7 +1184,7 @@ static void Direct3D1Test(void) D3DCLIP_LEFT | D3DCLIP_FRONT, }; ok(Flags[i] == outH[i].dwFlags, - "Cliptest %d differs. Got %08x expexted %08x\n", i + 1, + "Cliptest %d differs. Got %08x expected %08x\n", i + 1, outH[i].dwFlags, Flags[i]); } vp_data.dwWidth = 256; @@ -1207,7 +1207,7 @@ static void Direct3D1Test(void) D3DCLIP_FRONT, }; ok(Flags[i] == outH[i].dwFlags, - "Cliptest %d differs. Got %08x expexted %08x\n", i + 1, + "Cliptest %d differs. Got %08x expected %08x\n", i + 1, outH[i].dwFlags, Flags[i]); }

1 0

Reece H. Dunn : gdi32: Improve the failure reporting in the bitmap tests.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: dc267e75b4a341ef0da75d5719a71ae1f0333012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc267e75b4a341ef0da75d571… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Sat Jan 26 11:14:43 2008 +0000 gdi32: Improve the failure reporting in the bitmap tests. --- dlls/gdi32/tests/bitmap.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 573fe56..c31d367 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1699,12 +1699,12 @@ static void test_mono_1x1_bmp_dbg(HBITMAP hbmp, int line) ok_(__FILE__, line)(ret == sizeof(BITMAP) || ret == sizeof(DIBSECTION) /* Win9x, only for curObj2 */, "GetObject returned %d, error %u\n", ret, GetLastError()); - ok_(__FILE__, line)(bm.bmType == 0, "wrong bmType %d\n", bm.bmType); - ok_(__FILE__, line)(bm.bmWidth == 1, "wrong bmWidth %d\n", bm.bmWidth); - ok_(__FILE__, line)(bm.bmHeight == 1, "wrong bmHeight %d\n", bm.bmHeight); - ok_(__FILE__, line)(bm.bmWidthBytes == 2, "wrong bmWidthBytes %d\n", bm.bmWidthBytes); - ok_(__FILE__, line)(bm.bmPlanes == 1, "wrong bmPlanes %u\n", bm.bmPlanes); - ok_(__FILE__, line)(bm.bmBitsPixel == 1, "wrong bmBitsPixel %d\n", bm.bmBitsPixel); + ok_(__FILE__, line)(bm.bmType == 0, "wrong bmType, expected 0 got %d\n", bm.bmType); + ok_(__FILE__, line)(bm.bmWidth == 1, "wrong bmWidth, expected 1 got %d\n", bm.bmWidth); + ok_(__FILE__, line)(bm.bmHeight == 1, "wrong bmHeight, expected 1 got %d\n", bm.bmHeight); + ok_(__FILE__, line)(bm.bmWidthBytes == 2, "wrong bmWidthBytes, expected 2 got %d\n", bm.bmWidthBytes); + ok_(__FILE__, line)(bm.bmPlanes == 1, "wrong bmPlanes, expected 1 got %u\n", bm.bmPlanes); + ok_(__FILE__, line)(bm.bmBitsPixel == 1, "wrong bmBitsPixel, expected 1 got %d\n", bm.bmBitsPixel); ok_(__FILE__, line)(!bm.bmBits, "wrong bmBits %p\n", bm.bmBits); }

1 0

Paul Chitescu : ntoskrnl.exe: Implement MmPageEntireDriver and MmResetDriverPaging.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 4e511d9e8c7d358c42ce4e73e2e5c6d9611b550c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e511d9e8c7d358c42ce4e73e… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Feb 5 20:19:52 2008 +0200 ntoskrnl.exe: Implement MmPageEntireDriver and MmResetDriverPaging. --- dlls/ntoskrnl.exe/ntoskrnl.c | 17 +++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index dcc2769..149cb51 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -562,6 +562,23 @@ void WINAPI MmFreeNonCachedMemory( void *addr, SIZE_T size ) } /*********************************************************************** + * MmPageEntireDriver (NTOSKRNL.EXE.@) + */ +PVOID WINAPI MmPageEntireDriver(PVOID AddrInSection) +{ + TRACE("%p\n", AddrInSection); + return AddrInSection; +} + +/*********************************************************************** + * MmResetDriverPaging (NTOSKRNL.EXE.@) + */ +void WINAPI MmResetDriverPaging(PVOID AddrInSection) +{ + TRACE("%p\n", AddrInSection); +} + +/*********************************************************************** * PsCreateSystemThread (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI PsCreateSystemThread(PHANDLE ThreadHandle, ULONG DesiredAccess, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7d509af..dbe2152 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -700,7 +700,7 @@ @ stub MmMapViewOfSection @ stub MmMarkPhysicalMemoryAsBad @ stub MmMarkPhysicalMemoryAsGood -@ stub MmPageEntireDriver +@ stdcall MmPageEntireDriver(ptr) @ stub MmPrefetchPages @ stub MmProbeAndLockPages @ stub MmProbeAndLockProcessPages @@ -708,7 +708,7 @@ @ stub MmProtectMdlSystemAddress @ stub MmQuerySystemSize @ stub MmRemovePhysicalMemory -@ stub MmResetDriverPaging +@ stdcall MmResetDriverPaging(ptr) @ stub MmSectionObjectType @ stub MmSecureVirtualMemory @ stub MmSetAddressRangeModified

1 0