wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Stefan Dösinger : ddraw/tests: Make caps checking in test_rt_caps() less strict.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 4b39c46fa2faf922083dc95bc33624901ea42f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b39c46fa2faf922083dc95bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 28 23:35:48 2013 +0100 ddraw/tests: Make caps checking in test_rt_caps() less strict. R200 creates P8 3DDEVICE surfaces in video memory, and consequently returns a different error message when trying to create a device. --- dlls/ddraw/tests/ddraw1.c | 13 ++++++++----- dlls/ddraw/tests/ddraw2.c | 13 ++++++++----- dlls/ddraw/tests/ddraw4.c | 9 ++++++--- dlls/ddraw/tests/ddraw7.c | 9 ++++++--- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index de4947b..685b9cd 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3162,7 +3162,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + ~0U /* AMD r200 */ , DDERR_NOPALETTEATTACHED, FALSE, }, @@ -3197,14 +3197,14 @@ static void test_rt_caps(void) { NULL, DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER, - DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + ~0U /* AMD Evergreen */, DDERR_INVALIDCAPS, FALSE, }, { NULL, DDSCAPS_ZBUFFER, - DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + ~0U /* AMD Evergreen */, DDERR_INVALIDCAPS, FALSE, }, @@ -3286,7 +3286,7 @@ static void test_rt_caps(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, + ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, "Test %u: Got unexpected caps %#x, expected %#x.\n", i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); @@ -3298,7 +3298,10 @@ static void test_rt_caps(void) hr = IDirectDrawSurface_SetPalette(surface, palette); ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DHALDevice, (void **)&device); - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); } if (SUCCEEDED(hr)) { diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ae498d4..6bb8ffa 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3770,7 +3770,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + ~0U /* AMD r200 */, DDERR_NOPALETTEATTACHED, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, @@ -3815,7 +3815,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER, - DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + ~0U /* AMD Evergreen */, DDERR_INVALIDCAPS, DDERR_INVALIDPIXELFORMAT, DDERR_INVALIDCAPS, @@ -3824,7 +3824,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_ZBUFFER, - DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + ~0U /* AMD Evergreen */, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, @@ -3912,7 +3912,7 @@ static void test_rt_caps(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, + ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, "Test %u: Got unexpected caps %#x, expected %#x.\n", i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); @@ -3926,7 +3926,10 @@ static void test_rt_caps(void) hr = IDirectDrawSurface_SetPalette(surface, palette); ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); hr = IDirect3D2_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device); - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); } IDirectDrawSurface_Release(surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ac885b4..f880f8e 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4353,7 +4353,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + ~0U /* AMD r200 */, DDERR_NOPALETTEATTACHED, DDERR_INVALIDCAPS, }, @@ -4470,7 +4470,7 @@ static void test_rt_caps(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &surface_desc); ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, + ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, "Test %u: Got unexpected caps %#x, expected %#x.\n", i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); @@ -4484,7 +4484,10 @@ static void test_rt_caps(void) hr = IDirectDrawSurface4_SetPalette(surface, palette); ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); hr = IDirect3D3_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device, NULL); - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); } IDirectDrawSurface4_Release(surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 27555fb..cf69cf9 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4179,7 +4179,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + ~0U /* AMD r200 */, DDERR_NOPALETTEATTACHED, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, @@ -4310,7 +4310,7 @@ static void test_rt_caps(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, + ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, "Test %u: Got unexpected caps %#x, expected %#x.\n", i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); @@ -4324,7 +4324,10 @@ static void test_rt_caps(void) hr = IDirectDrawSurface7_SetPalette(surface, palette); ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); hr = IDirect3D7_CreateDevice(d3d, devtype, surface, &device); - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); } IDirectDrawSurface7_Release(surface);

1 0

Stefan Dösinger : ddraw/tests: Allow some flags to fail surface creation in test_rt_caps.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 3fafd37905e0f26b3c5d96c321ef8fb1d20828b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fafd37905e0f26b3c5d96c32… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 28 23:35:47 2013 +0100 ddraw/tests: Allow some flags to fail surface creation in test_rt_caps. --- dlls/ddraw/tests/ddraw1.c | 26 +++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 26 +++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3fafd37905e0f26b3c5d9…

1 0

Stefan Dösinger : ddraw/tests: Accept nvidia return values in test_rt_caps.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 81ed93d4f7bc3cdb16b2cb9b824b771dd9112f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ed93d4f7bc3cdb16b2cb9b8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 28 23:35:46 2013 +0100 ddraw/tests: Accept nvidia return values in test_rt_caps. --- dlls/ddraw/tests/ddraw2.c | 24 +++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 25 +++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81ed93d4f7bc3cdb16b2c…

1 0

Alexandre Julliard : gdi32: Get rid of the driver module in the DC.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: e650da3570e32645ffc6776a1be1cf3399f26eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e650da3570e32645ffc6776a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 12:43:45 2013 +0100 gdi32: Get rid of the driver module in the DC. --- dlls/gdi32/dc.c | 2 -- dlls/gdi32/gdi_private.h | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 231f197..9d3af57 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -131,7 +131,6 @@ DC *alloc_dc_ptr( WORD magic ) dc->nulldrv.funcs = &null_driver; dc->physDev = &dc->nulldrv; - dc->module = gdi32_module; dc->thread = GetCurrentThreadId(); dc->refcount = 1; dc->hPen = GDI_inc_ref_count( GetStockObject( BLACK_PEN )); @@ -649,7 +648,6 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (!(dc = alloc_dc_ptr( OBJ_DC ))) return 0; hdc = dc->hSelf; - dc->module = module; dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); TRACE("(driver=%s, device=%s, output=%s): returning %p\n", diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index edd4bf6..1d90f6c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -69,7 +69,6 @@ typedef struct tagDC struct tagDC *saved_dc; DWORD_PTR dwHookData; DCHOOKPROC hookProc; /* DC hook */ - HMODULE module; /* module handle of the graphics driver */ BOOL bounds_enabled:1; /* bounds tracking is enabled */ BOOL path_open:1; /* path is currently open (only for saved DCs) */

1 0

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

29 Oct '13

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 : gdi32: Allow user32 to specify the display driver to use.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 9675aa173a779eba5e97ee4bbbde6a6cfeced179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9675aa173a779eba5e97ee4bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 12:39:46 2013 +0100 gdi32: Allow user32 to specify the display driver to use. --- dlls/gdi32/driver.c | 17 +++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/user32/driver.c | 1 + include/wine/gdi_driver.h | 1 + 4 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f625f32..73d11da 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -223,6 +223,23 @@ HMODULE CDECL __wine_get_driver_module( HDC hdc ) } +/*********************************************************************** + * __wine_set_display_driver_module (GDI32.@) + */ +void CDECL __wine_set_display_driver( HMODULE module ) +{ + struct graphics_driver *driver; + + if (!(driver = create_driver( module ))) + { + ERR( "Could not create graphics driver\n" ); + ExitProcess(1); + } + if (InterlockedCompareExchangePointer( (void **)&display_driver, driver, NULL )) + HeapFree( GetProcessHeap(), 0, driver ); +} + + static INT nulldrv_AbortDoc( PHYSDEV dev ) { return 0; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 65f1d0c..be6410d 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -515,6 +515,7 @@ # Graphics drivers @ cdecl __wine_get_driver_module(long) +@ cdecl __wine_set_display_driver(long) # OpenGL @ cdecl __wine_get_wgl_driver(long long) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index fdcf853..37de424 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -158,6 +158,7 @@ static const USER_DRIVER *load_driver(void) } else LdrAddRefDll( 0, graphics_driver ); + __wine_set_display_driver( graphics_driver ); register_builtin_classes(); return driver; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 83f4885..ad9c7c4 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -277,6 +277,7 @@ 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 ); #endif /* __WINE_WINE_GDI_DRIVER_H */

1 0

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

29 Oct '13

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 29 Oct '13

29 Oct '13

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 : d3drm: Get rid of the mesh_group typedef.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: ff08d70f4a421cbc40bdeab2031c0567e54c38bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff08d70f4a421cbc40bdeab20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 29 10:28:07 2013 +0100 d3drm: Get rid of the mesh_group typedef. --- dlls/d3drm/meshbuilder.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 0262284..f01d440 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -34,7 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -typedef struct { +struct mesh_group +{ unsigned nb_vertices; D3DRMVERTEX* vertices; unsigned nb_faces; @@ -44,14 +45,14 @@ typedef struct { D3DCOLOR color; IDirect3DRMMaterial2* material; IDirect3DRMTexture3* texture; -} mesh_group; +}; typedef struct { IDirect3DRMMesh IDirect3DRMMesh_iface; LONG ref; DWORD groups_capacity; DWORD nb_groups; - mesh_group* groups; + struct mesh_group *groups; } IDirect3DRMMeshImpl; typedef struct { @@ -2628,7 +2629,7 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_AddGroup(IDirect3DRMMesh* iface, unsigned *face_data, D3DRMGROUPINDEX *return_id) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - mesh_group* group; + struct mesh_group *group; TRACE("(%p)->(%u,%u,%u,%p,%p)\n", This, vertex_count, face_count, vertex_per_face, face_data, return_id); @@ -2637,18 +2638,18 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_AddGroup(IDirect3DRMMesh* iface, if ((This->nb_groups + 1) > This->groups_capacity) { + struct mesh_group *groups; ULONG new_capacity; - mesh_group* groups; if (!This->groups_capacity) { new_capacity = 16; - groups = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(mesh_group)); + groups = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(*groups)); } else { new_capacity = This->groups_capacity * 2; - groups = HeapReAlloc(GetProcessHeap(), 0, This->groups, new_capacity * sizeof(mesh_group)); + groups = HeapReAlloc(GetProcessHeap(), 0, This->groups, new_capacity * sizeof(*groups)); } if (!groups)

1 0

Henri Verbeet : d3drm: Get rid of the color_rgb typedef.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 0365d7a93b8b27d9deda435c1f39a011debc1025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0365d7a93b8b27d9deda435c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 29 10:28:06 2013 +0100 d3drm: Get rid of the color_rgb typedef. --- dlls/d3drm/material.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index 216d913..8eb40b5 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -29,21 +29,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -typedef struct +struct color_rgb { D3DVALUE r; D3DVALUE g; D3DVALUE b; -} color_rgb; +}; struct d3drm_material { IDirect3DRMMaterial2 IDirect3DRMMaterial2_iface; LONG ref; - color_rgb emissive; - color_rgb specular; + struct color_rgb emissive; + struct color_rgb specular; D3DVALUE power; - color_rgb ambient; + struct color_rgb ambient; }; static inline struct d3drm_material *impl_from_IDirect3DRMMaterial2(IDirect3DRMMaterial2 *iface)

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
76
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 October 2013