October 2013 - Wine-Commits

Alexandre Julliard : advapi32/tests: Use the function pointer to call RegDeleteKeyExA.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: 8b11533dcf1724512f3fa17bd8650a6cfefbba41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b11533dcf1724512f3fa17bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 10:23:56 2013 +0100 advapi32/tests: Use the function pointer to call RegDeleteKeyExA. --- dlls/advapi32/tests/registry.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 47de094..6c3a5f0 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2105,7 +2105,7 @@ static void test_redirection(void) err = RegOpenKeyExA(HKEY_CLASSES_ROOT, "Interface", 0, KEY_ALL_ACCESS, &native); ok(err == ERROR_SUCCESS, "got %i\n", err); - RegDeleteKeyExA(native, "AWineTest", 0, 0); + pRegDeleteKeyExA(native, "AWineTest", 0, 0); /* write subkey in opposite bit mode */ err = RegOpenKeyExA(HKEY_CLASSES_ROOT, "Interface", 0, KEY_ALL_ACCESS | opposite, &op_key); @@ -2128,7 +2128,7 @@ static void test_redirection(void) broken(err == ERROR_SUCCESS), /* before Win7, HKCR is reflected instead of redirected */ "got %i\n", err); - err = RegDeleteKeyExA(op_key, "AWineTest", opposite, 0); + err = pRegDeleteKeyExA(op_key, "AWineTest", opposite, 0); ok(err == ERROR_SUCCESS, "got %i\n", err); RegCloseKey(op_key);

1 0

Dmitry Timoshkov : ntdll/tests: Add tests for reading 0 bytes at end of file.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: 3a41ebfbf27c33f0c22a5baada44cd6c2adcbd59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a41ebfbf27c33f0c22a5baad… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 29 16:10:02 2013 +0900 ntdll/tests: Add tests for reading 0 bytes at end of file. --- dlls/ntdll/tests/file.c | 147 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 147 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 09a61b8..d9e85fd 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2131,6 +2131,20 @@ todo_wine ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); + bytes = -1; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, 0, &bytes, NULL); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + + bytes = -1; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, NULL, 0, &bytes, NULL); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + S(U(ovl)).Offset = sizeof(contents); S(U(ovl)).OffsetHigh = 0; ovl.Internal = -1; @@ -2146,6 +2160,23 @@ todo_wine ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + S(U(ovl)).Offset = sizeof(contents); + S(U(ovl)).OffsetHigh = 0; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = -1; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, 0, &bytes, &ovl); +todo_wine + ok(ret, "ReadFile error %d\n", GetLastError()); +todo_wine + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); +todo_wine + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + U(iob).Status = -1; iob.Information = -1; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL); @@ -2157,6 +2188,16 @@ todo_wine U(iob).Status = -1; iob.Information = -1; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, NULL, NULL); +todo_wine + ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); +todo_wine + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); +todo_wine + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + + U(iob).Status = -1; + iob.Information = -1; offset.QuadPart = sizeof(contents); status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); @@ -2167,6 +2208,17 @@ todo_wine U(iob).Status = -1; iob.Information = -1; + offset.QuadPart = sizeof(contents); + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); +todo_wine + ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); +todo_wine + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); +todo_wine + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + + U(iob).Status = -1; + iob.Information = -1; offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); @@ -2175,6 +2227,17 @@ todo_wine todo_wine ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + U(iob).Status = -1; + iob.Information = -1; + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); +todo_wine + ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); +todo_wine + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); +todo_wine + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + for (i = -20; i < 0; i++) { if (i == -2) continue; @@ -2392,6 +2455,68 @@ todo_wine off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); ok(off == 0, "expected 0, got %u\n", off); + offset.QuadPart = sizeof(contents); + S(U(ovl)).Offset = offset.u.LowPart; + S(U(ovl)).OffsetHigh = offset.u.HighPart; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, 0, &bytes, &ovl); + /* ReadFile return value depends on Windows version and testing it is not practical */ + if (!ret) +todo_wine + ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ret = GetLastError(); + ok(bytes == 0, "bytes %u\n", bytes); + + off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); + ok(off == 0, "expected 0, got %u\n", off); + + if (ret == ERROR_IO_PENDING) + { + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); + ok(ret, "GetOverlappedResult should report TRUE\n"); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(bytes == 0, "expected 0, read %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + } + + offset.QuadPart = sizeof(contents); + S(U(ovl)).Offset = offset.u.LowPart; + S(U(ovl)).OffsetHigh = offset.u.HighPart; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, NULL, 0, &bytes, &ovl); + /* ReadFile return value depends on Windows version and testing it is not practical */ + if (!ret) +todo_wine + ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ret = GetLastError(); + ok(bytes == 0, "bytes %u\n", bytes); + + off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); + ok(off == 0, "expected 0, got %u\n", off); + + if (ret == ERROR_IO_PENDING) + { + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); + ok(ret, "GetOverlappedResult should report TRUE\n"); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(bytes == 0, "expected 0, read %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + } + U(iob).Status = -1; iob.Information = -1; offset.QuadPart = sizeof(contents); @@ -2411,6 +2536,28 @@ todo_wine off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); ok(off == 0, "expected 0, got %u\n", off); + U(iob).Status = -1; + iob.Information = -1; + offset.QuadPart = sizeof(contents); + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); + if (status == STATUS_PENDING) + { + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + } + else + { +todo_wine + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", status); +todo_wine + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); +todo_wine + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + } + + off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); + ok(off == 0, "expected 0, got %u\n", off); + S(U(ovl)).Offset = 0; S(U(ovl)).OffsetHigh = 0; ovl.Internal = -1;

1 0

Dmitry Timoshkov : atl100: Print file name in the failure message and fix a typo.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: 454243aa54bcab77b9b695ee2b1256965a089065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454243aa54bcab77b9b695ee2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 29 16:08:42 2013 +0900 atl100: Print file name in the failure message and fix a typo. --- dlls/atl100/registrar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/atl100/registrar.c b/dlls/atl100/registrar.c index b255e12..90c5b5b 100644 --- a/dlls/atl100/registrar.c +++ b/dlls/atl100/registrar.c @@ -511,13 +511,13 @@ static HRESULT file_register(Registrar *This, LPCOLESTR fileName, BOOL do_regist HeapFree(GetProcessHeap(), 0, regstrw); }else { - WARN("Failed to read faile\n"); + WARN("Failed to read file %s\n", debugstr_w(fileName)); hres = HRESULT_FROM_WIN32(GetLastError()); } HeapFree(GetProcessHeap(), 0, regstra); CloseHandle(file); }else { - WARN("Could not open file\n"); + WARN("Could not open file %s\n", debugstr_w(fileName)); hres = HRESULT_FROM_WIN32(GetLastError()); }

1 0

Dmitry Timoshkov : kernel32/tests: Add tests for GetLongPathName/ GetShortPathName and relative paths.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: 4befefa94d1f40298812a4e17b3853f26d41507a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4befefa94d1f40298812a4e17… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 29 16:10:07 2013 +0900 kernel32/tests: Add tests for GetLongPathName/GetShortPathName and relative paths. --- dlls/kernel32/tests/path.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index e884c0c..fe699b2 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1930,6 +1930,72 @@ static void init_pointers(void) #undef MAKEFUNC } +static void test_relative_path(void) +{ + char path[MAX_PATH], buf[MAX_PATH]; + HANDLE file; + int ret; + + if (!pGetLongPathNameA) return; + + GetTempPathA(MAX_PATH, path); + ret = SetCurrentDirectoryA(path); + ok(ret, "SetCurrentDirectory error %d\n", GetLastError()); + + ret = CreateDirectoryA("foo", NULL); + ok(ret, "CreateDirectory error %d\n", GetLastError()); + file = CreateFileA("foo\\file", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "failed to create temp file\n"); + CloseHandle(file); + ret = CreateDirectoryA("bar", NULL); + ok(ret, "CreateDirectory error %d\n", GetLastError()); + ret = SetCurrentDirectoryA("bar"); + ok(ret, "SetCurrentDirectory error %d\n", GetLastError()); + + ret = GetFileAttributesA("..\\foo\\file"); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributes error %d\n", GetLastError()); + + strcpy(buf, "deadbeef"); + ret = pGetLongPathNameA(".", buf, MAX_PATH); + ok(ret, "GetLongPathName error %d\n", GetLastError()); +todo_wine + ok(!strcmp(buf, "."), "expected ., got %s\n", buf); + strcpy(buf, "deadbeef"); + ret = GetShortPathNameA(".", buf, MAX_PATH); + ok(ret, "GetShortPathName error %d\n", GetLastError()); +todo_wine + ok(!strcmp(buf, "."), "expected ., got %s\n", buf); + + strcpy(buf, "deadbeef"); + ret = pGetLongPathNameA("..", buf, MAX_PATH); + ok(ret, "GetLongPathName error %d\n", GetLastError()); +todo_wine + ok(!strcmp(buf, ".."), "expected .., got %s\n", buf); + strcpy(buf, "deadbeef"); + ret = GetShortPathNameA("..", buf, MAX_PATH); + ok(ret, "GetShortPathName error %d\n", GetLastError()); +todo_wine + ok(!strcmp(buf, ".."), "expected .., got %s\n", buf); + + strcpy(buf, "deadbeef"); + ret = pGetLongPathNameA("..\\foo\\file", buf, MAX_PATH); +todo_wine + ok(ret, "GetLongPathName error %d\n", GetLastError()); +todo_wine + ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); + strcpy(buf, "deadbeef"); + ret = GetShortPathNameA("..\\foo\\file", buf, MAX_PATH); +todo_wine + ok(ret, "GetShortPathName error %d\n", GetLastError()); +todo_wine + ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); + + SetCurrentDirectoryA(".."); + DeleteFileA("foo\\file"); + RemoveDirectoryA("foo"); + RemoveDirectoryA("bar"); +} + START_TEST(path) { CHAR origdir[MAX_PATH],curdir[MAX_PATH], curDrive, otherDrive; @@ -1944,6 +2010,7 @@ START_TEST(path) if (!pActivateActCtx) win_skip("Activation contexts not supported, some tests will be skipped\n"); + test_relative_path(); test_InitPathA(curdir, &curDrive, &otherDrive); test_CurrentDirectoryA(origdir,curdir); test_PathNameA(curdir, curDrive, otherDrive);

1 0

Frédéric Delanoy : ntdll/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: 81b181fe72b3d605b74a781294f69fa1de7c9cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b181fe72b3d605b74a78129… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 28 22:18:05 2013 +0100 ntdll/tests: Use BOOL type where appropriate. --- dlls/ntdll/tests/error.c | 6 +++--- dlls/ntdll/tests/info.c | 2 +- dlls/ntdll/tests/time.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index d9c83b3..862f0a9 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -50,7 +50,7 @@ static ULONG (WINAPI *pRtlNtStatusToDosError)(NTSTATUS Status); static int strict; -static int prepare_test(void) +static BOOL prepare_test(void) { HMODULE ntdll; int argc; @@ -61,12 +61,12 @@ static int prepare_test(void) if (!pRtlNtStatusToDosError) { win_skip("RtlNtStatusToDosError is not available\n"); - return 0; + return FALSE; } argc = winetest_get_mainargs(&argv); strict=(argc >= 3 && strcmp(argv[2],"strict")==0); - return 1; + return TRUE; } static void cmp_call(NTSTATUS win_nt, ULONG win32, const char* message) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 87f3c9c..d4f1e9e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -259,7 +259,7 @@ static void test_query_process(void) DWORD last_pid; ULONG ReturnLength; int i = 0, k = 0; - int is_nt = 0; + BOOL is_nt = FALSE; SYSTEM_BASIC_INFORMATION sbi; /* Copy of our winternl.h structure turned into a private one */ diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index ff80b84..48f4640 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -33,9 +33,9 @@ static const int MonthLengths[2][12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; -static inline int IsLeapYear(int Year) +static inline BOOL IsLeapYear(int Year) { - return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ? 1 : 0; + return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0); } /* start time of the tests */

1 0

Alexandre Julliard : gdi32: Trigger creation of the desktop window when the display driver is needed.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: 74efeab238558902d1f3f3e8c31035f52d9920d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74efeab238558902d1f3f3e8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 12:43:30 2013 +0100 gdi32: Trigger creation of the desktop window when the display driver is needed. --- dlls/gdi32/driver.c | 67 +++++--------------------------------------- dlls/gdi32/gdi32.spec | 1 - include/wine/gdi_driver.h | 1 - 3 files changed, 8 insertions(+), 61 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 73d11da..99ac146 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -28,7 +28,6 @@ #include <stdio.h> #include "windef.h" #include "winbase.h" -#include "winreg.h" #include "ddrawgdi.h" #include "wine/winbase16.h" @@ -48,7 +47,6 @@ struct graphics_driver static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; -static DWORD display_driver_load_error; const struct gdi_dc_funcs *font_driver = NULL; @@ -101,48 +99,18 @@ static struct graphics_driver *create_driver( HMODULE module ) */ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) { - struct graphics_driver *driver; - char buffer[MAX_PATH], libname[32], *name, *next; - HMODULE module = 0; - HKEY hkey; - - if (display_driver) goto done; - - strcpy( buffer, default_driver ); - /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) - { - DWORD type, count = sizeof(buffer); - RegQueryValueExA( hkey, "Graphics", 0, &type, (LPBYTE) buffer, &count ); - RegCloseKey( hkey ); - } - - name = buffer; - while (name) + if (!display_driver) { - next = strchr( name, ',' ); - if (next) *next++ = 0; + HMODULE user32 = LoadLibraryA( "user32.dll" ); + HWND (WINAPI *pGetDesktopWindow)(void) = (void *)GetProcAddress( user32, "GetDesktopWindow" ); - snprintf( libname, sizeof(libname), "wine%s.drv", name ); - if ((module = LoadLibraryA( libname )) != 0) break; - name = next; + if (!pGetDesktopWindow() || !display_driver) + { + WARN( "failed to load the display driver, falling back to null driver\n" ); + __wine_set_display_driver( 0 ); + } } - if (!module) display_driver_load_error = GetLastError(); - - if (!(driver = create_driver( module ))) - { - MESSAGE( "Could not create graphics driver '%s'\n", buffer ); - FreeLibrary( module ); - ExitProcess(1); - } - if (InterlockedCompareExchangePointer( (void **)&display_driver, driver, NULL )) - { - /* somebody beat us to it */ - FreeLibrary( driver->module ); - HeapFree( GetProcessHeap(), 0, driver ); - } -done: *module_ret = display_driver->module; return display_driver->funcs; } @@ -205,25 +173,6 @@ done: /*********************************************************************** - * __wine_get_driver_module (GDI32.@) - */ -HMODULE CDECL __wine_get_driver_module( HDC hdc ) -{ - DC *dc; - HMODULE ret = 0; - - if ((dc = get_dc_ptr( hdc ))) - { - ret = dc->module; - release_dc_ptr( dc ); - if (!ret) SetLastError( display_driver_load_error ); - } - else SetLastError( ERROR_INVALID_HANDLE ); - return ret; -} - - -/*********************************************************************** * __wine_set_display_driver_module (GDI32.@) */ void CDECL __wine_set_display_driver( HMODULE module ) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index be6410d..6ebad3c 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -514,7 +514,6 @@ @ cdecl __wine_set_visible_region(long long ptr ptr ptr) # Graphics drivers -@ cdecl __wine_get_driver_module(long) @ cdecl __wine_set_display_driver(long) # OpenGL diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index ad9c7c4..06e4caa 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -276,7 +276,6 @@ WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect, const RECT *device_rect, struct window_surface *surface ); -extern HMODULE CDECL __wine_get_driver_module( HDC hdc ); extern void CDECL __wine_set_display_driver( HMODULE module ); extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );

1 0

Alexandre Julliard : user32: Get the graphics driver name from the desktop window registry entry.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: 010769249c667317cd7b93388bb89fa7c34bad80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=010769249c667317cd7b93388… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 12:12:21 2013 +0100 user32: Get the graphics driver name from the desktop window registry entry. --- dlls/user32/driver.c | 66 ++++++++++++++++++++++++++++++++-------------- dlls/user32/misc.c | 3 -- dlls/user32/sysparams.c | 6 ---- 3 files changed, 46 insertions(+), 29 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 192eebe..fdcf853 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -26,20 +26,61 @@ #include "winuser.h" #include "wine/debug.h" #include "wine/gdi_driver.h" +#include "wine/unicode.h" #include "user_private.h" #include "controls.h" +WINE_DEFAULT_DEBUG_CHANNEL(user); + static USER_DRIVER null_driver, lazy_load_driver; const USER_DRIVER *USER_Driver = &lazy_load_driver; -static DWORD driver_load_error; +static char driver_load_error[80]; + +static HMODULE load_desktop_driver( HWND hwnd ) +{ + static const WCHAR display_device_guid_propW[] = { + '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', + 'd','e','v','i','c','e','_','g','u','i','d',0 }; + static const WCHAR key_pathW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'V','i','d','e','o','\\','{',0}; + static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; + static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + HMODULE ret = 0; + HKEY hkey; + DWORD size; + WCHAR path[MAX_PATH]; + WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40]; + UINT guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); + + strcpy( driver_load_error, "The explorer process failed to start." ); /* default error */ + + memcpy( key, key_pathW, sizeof(key_pathW) ); + if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; + strcatW( key, displayW ); + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; + size = sizeof(path); + if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) + { + if (!(ret = LoadLibraryW( path ))) ERR( "failed to load %s\n", debugstr_w(path) ); + TRACE( "%s %p\n", debugstr_w(path), ret ); + } + else + { + size = sizeof(driver_load_error); + RegQueryValueExA( hkey, "DriverError", NULL, NULL, (BYTE *)driver_load_error, &size ); + } + RegCloseKey( hkey ); + return ret; +} /* load the graphics driver */ static const USER_DRIVER *load_driver(void) { - static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; - HDC hdc; void *ptr; HMODULE graphics_driver; USER_DRIVER *driver, *prev; @@ -47,9 +88,7 @@ static const USER_DRIVER *load_driver(void) driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver) ); *driver = null_driver; - hdc = CreateDCW( displayW, NULL, NULL, NULL ); - - graphics_driver = __wine_get_driver_module( hdc ); + graphics_driver = load_desktop_driver( GetDesktopWindow() ); if (graphics_driver) { #define GET_USER_FUNC(name) \ @@ -109,7 +148,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(SystemParametersInfo); #undef GET_USER_FUNC } - else driver_load_error = GetLastError(); prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, &lazy_load_driver ); if (prev != &lazy_load_driver) @@ -122,7 +160,6 @@ static const USER_DRIVER *load_driver(void) register_builtin_classes(); - DeleteDC( hdc ); return driver; } @@ -304,18 +341,7 @@ static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) if (warned++) return FALSE; MESSAGE( "Application tried to create a window, but no driver could be loaded.\n"); - switch (driver_load_error) - { - case ERROR_MOD_NOT_FOUND: - MESSAGE( "The graphics driver is missing. Check your build!\n" ); - break; - case ERROR_DLL_INIT_FAILED: - MESSAGE( "Make sure that your X server is running and that $DISPLAY is set correctly.\n" ); - break; - default: - MESSAGE( "Unknown error (%d).\n", driver_load_error ); - } - + if (driver_load_error[0]) MESSAGE( "%s\n", driver_load_error ); return FALSE; } diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 9177f56..ad3c788 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -441,9 +441,6 @@ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) */ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { - /* make sure the desktop window exists */ - GetDesktopWindow(); - return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); } diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index bdfed38..4b510f2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2792,9 +2792,6 @@ LONG WINAPI ChangeDisplaySettingsExA( LPCSTR devname, LPDEVMODEA devmode, HWND h LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lparam ) { - /* make sure the desktop window is created before mode changing */ - GetDesktopWindow(); - return USER_Driver->pChangeDisplaySettingsEx( devname, devmode, hwnd, flags, lparam ); } @@ -2866,9 +2863,6 @@ BOOL WINAPI EnumDisplaySettingsExA(LPCSTR lpszDeviceName, DWORD iModeNum, BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, LPDEVMODEW lpDevMode, DWORD dwFlags) { - /* make sure the desktop window is created before mode enumeration */ - GetDesktopWindow(); - return USER_Driver->pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags); }

1 0

Alexandre Julliard : explorer: Load the graphics driver specified in the registry instead of relying on gdi32 .
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: 43f042ed9c4702c8f89cc6e05a0c815cfd9d5a49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f042ed9c4702c8f89cc6e05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 12:11:52 2013 +0100 explorer: Load the graphics driver specified in the registry instead of relying on gdi32. --- programs/explorer/desktop.c | 112 ++++++++++++++++++++++++++++++++----------- 1 files changed, 83 insertions(+), 29 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index a3bfb5c..35c3168 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -30,7 +30,6 @@ #include <shlobj.h> #include <shellapi.h> -#include "wine/gdi_driver.h" #include "wine/unicode.h" #include "wine/debug.h" #include "explorer_private.h" @@ -40,6 +39,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorer); #define DESKTOP_CLASS_ATOM ((LPCWSTR)MAKEINTATOM(32769)) #define DESKTOP_ALL_ACCESS 0x01ff +#ifdef __APPLE__ +static const WCHAR default_driver[] = {'m','a','c',',','x','1','1',0}; +#else +static const WCHAR default_driver[] = {'x','1','1',0}; +#endif + static BOOL using_root; struct launcher @@ -633,34 +638,83 @@ static BOOL get_default_desktop_size( const WCHAR *name, unsigned int *width, un return found; } -static void set_desktop_guid( HWND desktop, GUID *guid, HMODULE driver ) +static HMODULE load_graphics_driver( const GUID *guid ) { static const WCHAR device_keyW[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', 'V','i','d','e','o','\\', - '{','%','s','}','\\','0','0','0','0',0}; - static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; - - RPC_WSTR guid_str; - HKEY hkey; + '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', + '%','0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2','x', + '%','0','2','x','%','0','2','x','%','0','2','x','}','\\','0','0','0','0',0}; + static const WCHAR graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + static const WCHAR driversW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\','D','r','i','v','e','r','s',0}; + static const WCHAR graphicsW[] = {'G','r','a','p','h','i','c','s',0}; + static const WCHAR drv_formatW[] = {'w','i','n','e','%','s','.','d','r','v',0}; + + WCHAR buffer[MAX_PATH], libname[32], *name, *next; WCHAR key[sizeof(device_keyW)/sizeof(WCHAR) + 39]; + HMODULE module = 0; + HKEY hkey; + char error[80]; + + strcpyW( buffer, default_driver ); + + /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ + if (!RegOpenKeyW( HKEY_CURRENT_USER, driversW, &hkey )) + { + DWORD count = sizeof(buffer); + RegQueryValueExW( hkey, graphicsW, 0, NULL, (LPBYTE)buffer, &count ); + RegCloseKey( hkey ); + } - UuidToStringW( guid, &guid_str ); - sprintfW( key, device_keyW, guid_str ); - RpcStringFreeW( &guid_str ); + name = buffer; + while (name) + { + next = strchrW( name, ',' ); + if (next) *next++ = 0; + + snprintfW( libname, sizeof(libname)/sizeof(WCHAR), drv_formatW, name ); + if ((module = LoadLibraryW( libname )) != 0) break; + switch (GetLastError()) + { + case ERROR_MOD_NOT_FOUND: + strcpy( error, "The graphics driver is missing. Check your build!" ); + break; + case ERROR_DLL_INIT_FAILED: + strcpy( error, "Make sure that your X server is running and that $DISPLAY is set correctly." ); + break; + default: + sprintf( error, "Unknown error (%u).", GetLastError() ); + break; + } + name = next; + } + + if (module) + { + GetModuleFileNameW( module, buffer, MAX_PATH ); + TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); + } + + sprintfW( key, device_keyW, guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, key, 0, NULL, REG_OPTION_VOLATILE, KEY_SET_VALUE, NULL, &hkey, NULL )) { - WCHAR path[MAX_PATH]; - - GetModuleFileNameW( driver, path, MAX_PATH ); - RegSetValueExW( hkey, driverW, 0, REG_SZ, (BYTE *)path, (strlenW(path) + 1) * sizeof(WCHAR) ); + if (module) + RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, + (BYTE *)buffer, (strlenW(buffer) + 1) * sizeof(WCHAR) ); + else + RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen(error) + 1 ); RegCloseKey( hkey ); } - else ERR( "failed to create %s\n", debugstr_w(key) ); + + return module; } static void initialize_display_settings(void) @@ -716,8 +770,8 @@ void manage_desktop( WCHAR *arg ) HDESK desktop = 0; GUID guid; MSG msg; - HDC hdc; HWND hwnd, msg_hwnd; + HMODULE graphics_driver; unsigned int width, height; WCHAR *cmdline = NULL; WCHAR *p = arg; @@ -759,6 +813,7 @@ void manage_desktop( WCHAR *arg ) UuidCreate( &guid ); TRACE( "display guid %s\n", debugstr_guid(&guid) ); + graphics_driver = load_graphics_driver( &guid ); /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, @@ -770,16 +825,8 @@ void manage_desktop( WCHAR *arg ) if (hwnd == GetDesktopWindow()) { - HMODULE shell32, graphics_driver; - void (WINAPI *pShellDDEInit)( BOOL ); - - hdc = GetDC( hwnd ); - graphics_driver = __wine_get_driver_module( hdc ); using_root = !desktop || !create_desktop( graphics_driver, name, width, height ); - ReleaseDC( hwnd, hdc ); - SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); - set_desktop_guid( hwnd, &guid, graphics_driver ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); SetWindowPos( hwnd, 0, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), @@ -789,13 +836,20 @@ void manage_desktop( WCHAR *arg ) ClipCursor( NULL ); initialize_display_settings(); initialize_appbar(); - initialize_systray( graphics_driver, using_root ); - if (!using_root) initialize_launchers( hwnd ); - if ((shell32 = LoadLibraryA( "shell32.dll" )) && - (pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188))) + if (graphics_driver) { - pShellDDEInit( TRUE ); + HMODULE shell32; + void (WINAPI *pShellDDEInit)( BOOL ); + + initialize_systray( graphics_driver, using_root ); + if (!using_root) initialize_launchers( hwnd ); + + if ((shell32 = LoadLibraryA( "shell32.dll" )) && + (pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188))) + { + pShellDDEInit( TRUE ); + } } } else

1 0

Henri Verbeet : d3d8/tests: Use explicit A calls.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: 45a1aae0a106b192ff854a8fc6a8ec9d59c9cc42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a1aae0a106b192ff854a8fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 29 10:28:05 2013 +0100 d3d8/tests: Use explicit A calls. --- dlls/d3d8/tests/Makefile.in | 1 - dlls/d3d8/tests/device.c | 65 +++++++++++++++++++++++++---------------- dlls/d3d8/tests/stateblock.c | 8 ++-- dlls/d3d8/tests/visual.c | 10 +++--- 4 files changed, 49 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45a1aae0a106b192ff854…

1 0

Henri Verbeet : d3d8/tests: Avoid windowsx.h.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: f70672336e80a0f727284ec896032e490b120a90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70672336e80a0f727284ec89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 29 10:28:04 2013 +0100 d3d8/tests: Avoid windowsx.h. --- dlls/d3d8/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9db5335..2e2a0c0 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -22,11 +22,13 @@ */ #define COBJMACROS -#include <windowsx.h> #include <initguid.h> #include <d3d8.h> #include "wine/test.h" +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) + static INT screen_width; static INT screen_height;

1 0