wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Huw Davies : ole32/tests: Extend the lifecycle tests to objects which expose IExternalConnection.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 14a879085e415c4242819cb0638f60cd317c0a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a879085e415c4242819cb06… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 24 16:16:47 2013 +0100 ole32/tests: Extend the lifecycle tests to objects which expose IExternalConnection. --- dlls/ole32/tests/marshal.c | 236 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 201 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14a879085e415c4242819…

1 0

Stefan Dösinger : ddraw/tests: Test DDLOCK_DISCARDCONTENTS.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: e47edf47fe8c20e1af665d5ff21aa548d15202be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47edf47fe8c20e1af665d5ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 24 14:43:43 2013 +0200 ddraw/tests: Test DDLOCK_DISCARDCONTENTS. --- dlls/ddraw/tests/ddraw1.c | 96 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 96 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 392 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e47edf47fe8c20e1af665…

1 0

Stefan Dösinger : ddraw: Make default pool resources dynamic.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 9e0ba3eab0a20fdcadeb252e793adfcdd221ff36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0ba3eab0a20fdcadeb252e7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 24 14:43:42 2013 +0200 ddraw: Make default pool resources dynamic. To make DDLOCK_DISCARDCONTENTS actually do anything. The MAPPABLE flag is now redundant. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e01f923..964428a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2873,7 +2873,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, * the surface isn't mapped, and that updates done this way will be * visible on the screen. The game Nox is such an application, * Commandos: Behind Enemy Lines is another. */ - const DWORD flags = WINED3D_SURFACE_MAPPABLE | WINED3D_SURFACE_PIN_SYSMEM; + const DWORD flags = WINED3D_SURFACE_PIN_SYSMEM; TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p.\n", ddraw, DDSD, surface, UnkOuter); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e11b633..bbe7d0e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5623,7 +5623,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac } else { - wined3d_desc.usage = WINED3DUSAGE_TEXTURE; + wined3d_desc.usage = WINED3DUSAGE_TEXTURE | WINED3DUSAGE_DYNAMIC; pool = WINED3D_POOL_DEFAULT; } @@ -5771,6 +5771,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, /* Videomemory adds localvidmem. This is mutually exclusive with * systemmemory and texturemanage. */ desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM; + usage |= WINED3DUSAGE_DYNAMIC; } format = wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat);

1 0

Stefan Dösinger : wined3d: Remove SCRATCH and SYSMEM lockability warnings.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 331bb68edb601e95aa307fdfd7064655164ecb41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331bb68edb601e95aa307fdfd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 24 14:43:41 2013 +0200 wined3d: Remove SCRATCH and SYSMEM lockability warnings. They are not needed any more, resource_access_from_pool takes care of this. --- dlls/wined3d/surface.c | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index daa26e2..a4cbd81 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6795,20 +6795,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN * Levels need to be checked too, since they all affect what can be done. */ switch (pool) { - case WINED3D_POOL_SCRATCH: - if (!lockable) - { - FIXME("Called with a pool of SCRATCH and a lockable of FALSE " - "which are mutually exclusive, setting lockable to TRUE.\n"); - lockable = TRUE; - } - break; - - case WINED3D_POOL_SYSTEM_MEM: - if (!lockable) - FIXME("Called with a pool of SYSTEMMEM and a lockable of FALSE, this is acceptable but unexpected.\n"); - break; - case WINED3D_POOL_MANAGED: if (usage & WINED3DUSAGE_DYNAMIC) FIXME("Called with a pool of MANAGED and a usage of DYNAMIC which are mutually exclusive.\n"); @@ -6819,6 +6805,10 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN WARN("Creating a lockable surface with a POOL of DEFAULT, that doesn't specify DYNAMIC usage.\n"); break; + case WINED3D_POOL_SCRATCH: + case WINED3D_POOL_SYSTEM_MEM: + break; + default: FIXME("Unknown pool %#x.\n", pool); break;

1 0

Stefan Dösinger : d3d8/tests: Remove the rtpatch test.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 672e3ee1b4bab50f792cf2e3f6a31805d97143c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=672e3ee1b4bab50f792cf2e3f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 24 14:43:40 2013 +0200 d3d8/tests: Remove the rtpatch test. --- dlls/d3d8/tests/device.c | 115 ---------------------------------------------- 1 files changed, 0 insertions(+), 115 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 7932a7f..9db5335 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4846,120 +4846,6 @@ static void test_swvp_buffer(void) DestroyWindow(window); } -static void test_rtpatch(void) -{ - IDirect3DDevice8 *device; - IDirect3D8 *d3d8; - UINT refcount; - HWND window; - HRESULT hr; - IDirect3DVertexBuffer8 *buffer; - DWORD shader; - static const unsigned int bufsize = 16; - struct - { - float x, y, z; - } *data; - D3DRECTPATCH_INFO patch; - static const float num_segs[] = {1.0f, 1.0f, 1.0f, 1.0f}; - UINT handle = 0x1234; - D3DCAPS8 caps; - - /* Position input, this generates tesselated positions, but do not generate normals - * or texture coordinates. The d3d documentation isn't clear on how to do this */ - static const DWORD decl[] = - { - D3DVSD_STREAM(0), - D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), /* D3DVSDE_POSITION, Register v0 */ - D3DVSD_END() - }; - - if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) - { - skip("Failed to create d3d8 object, skipping tests.\n"); - return; - } - - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); - if (!(device = create_device(d3d8, window, window, TRUE))) - { - skip("Failed to create a D3D device, skipping tests.\n"); - IDirect3D8_Release(d3d8); - DestroyWindow(window); - return; - } - - hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - if (caps.DevCaps & D3DDEVCAPS_RTPATCHES) - { - /* The draw methods return the same values, but the patch handle support - * is different on the refrast, which is the only d3d implementation - * known to support tri/rect patches */ - skip("Device supports patches, skipping unsupported patch test\n"); - IDirect3DDevice8_Release(device); - IDirect3D8_Release(d3d8); - DestroyWindow(window); - return; - } - - hr = IDirect3DDevice8_CreateVertexShader(device, decl, NULL, &shader, 0); - ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetVertexShader(device, shader); - ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); - - hr = IDirect3DDevice8_CreateVertexBuffer(device, bufsize * sizeof(*data), D3DUSAGE_RTPATCHES, 0, - D3DPOOL_MANAGED, &buffer); - ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); - hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, (BYTE **)&data, 0); - ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); - memset(data, 0, bufsize * sizeof(*data)); - hr = IDirect3DVertexBuffer8_Unlock(buffer); - ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); - - hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*data)); - ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - patch.StartVertexOffsetWidth = 0; - patch.StartVertexOffsetHeight = 0; - patch.Width = 4; - patch.Height = 4; - patch.Stride = 4; - patch.Basis = D3DBASIS_BEZIER; - patch.Order = D3DORDER_CUBIC; - hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, &patch); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawRectPatch(device, 0, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - hr = IDirect3DDevice8_DrawRectPatch(device, 0, num_segs, &patch); - ok(SUCCEEDED(hr), "Failed to draw rect patch outside scene, hr %#x.\n", hr); - - hr = IDirect3DDevice8_DeletePatch(device, handle); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - hr = IDirect3DDevice8_DeletePatch(device, 0); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - hr = IDirect3DDevice8_DeletePatch(device, 0x1235); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - - IDirect3DDevice8_DeleteVertexShader(device, shader); - IDirect3DVertexBuffer8_Release(buffer); - refcount = IDirect3DDevice8_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); - IDirect3D8_Release(d3d8); - DestroyWindow(window); -} - static void test_npot_textures(void) { IDirect3DDevice8 *device = NULL; @@ -5928,7 +5814,6 @@ START_TEST(device) test_surface_blocks(); test_set_palette(); test_swvp_buffer(); - test_rtpatch(); test_npot_textures(); test_volume_locking(); test_update_volumetexture();

1 0

Stefan Dösinger : d3d9/tests: Remove the rtpatch test.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 9c19266a247a2f4e1f88a3258026af33c6cd6efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c19266a247a2f4e1f88a3258… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 24 14:43:39 2013 +0200 d3d9/tests: Remove the rtpatch test. It segfaults on Win7 + Nvidia Kepler and apparently returns different return values on Windows 8. Since this functionality isn't supported on any HW I doubt games will care. --- dlls/d3d9/tests/device.c | 113 ---------------------------------------------- 1 files changed, 0 insertions(+), 113 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 02b4174..32fe8c7 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6357,118 +6357,6 @@ static void test_swvp_buffer(void) DestroyWindow(window); } -static void test_rtpatch(void) -{ - IDirect3DDevice9 *device; - IDirect3D9 *d3d9; - UINT refcount; - HWND window; - HRESULT hr; - IDirect3DVertexBuffer9 *buffer; - IDirect3DVertexDeclaration9 *decl; - static const unsigned int bufsize = 16; - struct - { - float x, y, z; - } *data; - D3DRECTPATCH_INFO patch; - static const float num_segs[] = {1.0f, 1.0f, 1.0f, 1.0f}; - UINT handle = 0x1234; - D3DCAPS9 caps; - - /* Position input, this generates tesselated positions, but do not generate normals - * or texture coordinates. The d3d documentation isn't clear on how to do this */ - static const D3DVERTEXELEMENT9 decl_elements[] = { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - D3DDECL_END() - }; - - if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) - { - skip("Failed to create IDirect3D9 object, skipping tests.\n"); - return; - } - - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); - if (!(device = create_device(d3d9, window, window, TRUE))) - { - skip("Failed to create a D3D device, skipping tests.\n"); - IDirect3D9_Release(d3d9); - DestroyWindow(window); - return; - } - - hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - if (caps.DevCaps & D3DDEVCAPS_RTPATCHES) - { - /* The draw methods return the same values, but the patch handle support - * is different on the refrast, which is the only d3d implementation - * known to support tri/rect patches */ - skip("Device supports patches, skipping unsupported patch test\n"); - IDirect3DDevice9_Release(device); - IDirect3D9_Release(d3d9); - DestroyWindow(window); - return; - } - - hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); - ok(SUCCEEDED(hr), "Failed to create vertex declaration, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); - ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); - - hr = IDirect3DDevice9_CreateVertexBuffer(device, bufsize * sizeof(*data), D3DUSAGE_RTPATCHES, 0, - D3DPOOL_MANAGED, &buffer, NULL); - ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); - hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, (void **)&data, 0); - ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); - memset(data, 0, bufsize * sizeof(*data)); - hr = IDirect3DVertexBuffer9_Unlock(buffer); - ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); - - hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(*data)); - ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - patch.StartVertexOffsetWidth = 0; - patch.StartVertexOffsetHeight = 0; - patch.Width = 4; - patch.Height = 4; - patch.Stride = 4; - patch.Basis = D3DBASIS_BEZIER; - patch.Degree = D3DDEGREE_CUBIC; - hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, &patch); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawRectPatch(device, 0, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - hr = IDirect3DDevice9_DrawRectPatch(device, 0, num_segs, &patch); - ok(SUCCEEDED(hr), "Failed to draw rect patch outside scene, hr %#x.\n", hr); - - hr = IDirect3DDevice9_DeletePatch(device, handle); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - hr = IDirect3DDevice9_DeletePatch(device, 0); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - hr = IDirect3DDevice9_DeletePatch(device, 0x1235); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - - IDirect3DVertexDeclaration9_Release(decl); - IDirect3DVertexBuffer9_Release(buffer); - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); - IDirect3D9_Release(d3d9); - DestroyWindow(window); -} - static void test_npot_textures(void) { IDirect3DDevice9 *device = NULL; @@ -7506,7 +7394,6 @@ START_TEST(device) test_surface_blocks(); test_set_palette(); test_swvp_buffer(); - test_rtpatch(); test_npot_textures(); test_vidmem_accounting(); test_volume_locking();

1 0

Jacek Caban : wininet: Compile tests with -D__WINESRC__.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: e857a70ae2c4ddba8b231ee2d3cd98f518b66f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e857a70ae2c4ddba8b231ee2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 24 12:15:43 2013 +0200 wininet: Compile tests with -D__WINESRC__. --- dlls/wininet/tests/Makefile.in | 1 - dlls/wininet/tests/ftp.c | 24 +- dlls/wininet/tests/http.c | 678 ++++++++++++++++++------------------ dlls/wininet/tests/internet.c | 78 +++--- dlls/wininet/tests/url.c | 28 +- dlls/wininet/tests/urlcache.c | 146 ++++---- dlls/wininet/tests/wininet_test.h | 2 +- 7 files changed, 478 insertions(+), 479 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e857a70ae2c4ddba8b231…

1 0

Alexandre Julliard : user32: Set the display device property on the desktop window as soon as it is created .
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: f5113d2d56ceee2502f65183512985a76569c5e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5113d2d56ceee2502f651835… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 24 17:41:28 2013 +0200 user32: Set the display device property on the desktop window as soon as it is created. --- dlls/user32/desktop.c | 33 +++++++++++++++++++++++++++++++-- programs/explorer/desktop.c | 22 ++++++++-------------- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index 563a214..bc91252 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -32,6 +32,7 @@ #include "wingdi.h" #include "winnls.h" #include "controls.h" +#include "wine/unicode.h" static HBRUSH hbrushPattern; static HBITMAP hbitmapWallPaper; @@ -97,8 +98,36 @@ static void init_wallpaper( const WCHAR *wallpaper ) */ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - if (message == WM_NCCREATE) return TRUE; - return 0; /* all other messages are ignored */ + 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 guid_formatW[] = { + '%','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}; + + switch (message) + { + case WM_NCCREATE: + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; + const GUID *guid = cs->lpCreateParams; + + if (guid) + { + ATOM atom; + WCHAR buffer[37]; + + sprintfW( buffer, guid_formatW, 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] ); + atom = GlobalAddAtomW( buffer ); + SetPropW( hwnd, display_device_guid_propW, ULongToHandle( atom ) ); + } + return TRUE; + } + default: + return 0; /* all other messages are ignored */ + } } /*********************************************************************** diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index d85483c..a3bfb5c 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -633,11 +633,8 @@ static BOOL get_default_desktop_size( const WCHAR *name, unsigned int *width, un return found; } -static void set_desktop_guid( HWND desktop, HMODULE driver ) +static void set_desktop_guid( HWND desktop, GUID *guid, HMODULE driver ) { - 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 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','\\', @@ -646,18 +643,11 @@ static void set_desktop_guid( HWND desktop, HMODULE driver ) '{','%','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}; - GUID guid; RPC_WSTR guid_str; - ATOM guid_atom; HKEY hkey; WCHAR key[sizeof(device_keyW)/sizeof(WCHAR) + 39]; - UuidCreate( &guid ); - UuidToStringW( &guid, &guid_str ); - TRACE( "display guid %s\n", debugstr_w(guid_str) ); - - guid_atom = GlobalAddAtomW( guid_str ); - SetPropW( desktop, display_device_guid_propW, ULongToHandle(guid_atom) ); + UuidToStringW( guid, &guid_str ); sprintfW( key, device_keyW, guid_str ); RpcStringFreeW( &guid_str ); @@ -724,6 +714,7 @@ void manage_desktop( WCHAR *arg ) { static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; HDESK desktop = 0; + GUID guid; MSG msg; HDC hdc; HWND hwnd, msg_hwnd; @@ -766,9 +757,12 @@ void manage_desktop( WCHAR *arg ) SetThreadDesktop( desktop ); } + UuidCreate( &guid ); + TRACE( "display guid %s\n", debugstr_guid(&guid) ); + /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, NULL ); + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, &guid ); /* create the HWND_MESSAGE parent */ msg_hwnd = CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, @@ -785,7 +779,7 @@ void manage_desktop( WCHAR *arg ) ReleaseDC( hwnd, hdc ); SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); - set_desktop_guid( hwnd, graphics_driver ); + 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),

1 0

Alexandre Julliard : user32: Register classes once the graphics driver has been loaded, except for the desktop class.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: fe441a0682ce21ba2d379c3c343efb00094f9ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe441a0682ce21ba2d379c3c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 24 17:40:37 2013 +0200 user32: Register classes once the graphics driver has been loaded, except for the desktop class. --- dlls/user32/class.c | 18 +++++++++++++----- dlls/user32/controls.h | 3 ++- dlls/user32/desktop.c | 2 +- dlls/user32/driver.c | 3 +++ dlls/user32/message.c | 2 +- dlls/user32/user_main.c | 2 ++ dlls/user32/win.c | 2 -- 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 333cb76..e03272f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -369,7 +369,7 @@ static void register_builtin( const struct builtin_class_descr *descr ) if (!(classPtr = CLASS_RegisterClass( descr->name, user32_module, FALSE, descr->style, 0, descr->extra ))) return; - classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); + if (descr->cursor) classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); classPtr->hbrBackground = descr->brush; classPtr->winproc = BUILTIN_WINPROC( descr->proc ); release_class_ptr( classPtr ); @@ -381,7 +381,6 @@ static void register_builtin( const struct builtin_class_descr *descr ) */ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **context ) { - register_builtin( &DESKTOP_builtin_class ); register_builtin( &BUTTON_builtin_class ); register_builtin( &COMBO_builtin_class ); register_builtin( &COMBOLBOX_builtin_class ); @@ -391,7 +390,6 @@ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **conte register_builtin( &LISTBOX_builtin_class ); register_builtin( &MDICLIENT_builtin_class ); register_builtin( &MENU_builtin_class ); - register_builtin( &MESSAGE_builtin_class ); register_builtin( &SCROLL_builtin_class ); register_builtin( &STATIC_builtin_class ); return TRUE; @@ -399,15 +397,25 @@ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **conte /*********************************************************************** - * CLASS_RegisterBuiltinClasses + * register_builtin_classes */ -void CLASS_RegisterBuiltinClasses(void) +void register_builtin_classes(void) { InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); } /*********************************************************************** + * register_desktop_class + */ +void register_desktop_class(void) +{ + register_builtin( &DESKTOP_builtin_class ); + register_builtin( &MESSAGE_builtin_class ); +} + + +/*********************************************************************** * get_class_winproc */ WNDPROC get_class_winproc( CLASS *class ) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 32e9815..3ce804f 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -139,7 +139,8 @@ extern ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param ) DECLSPEC_HIDDEN struct tagCLASS; /* opaque structure */ struct tagWND; extern ATOM get_int_atom_value( LPCWSTR name ) DECLSPEC_HIDDEN; -extern void CLASS_RegisterBuiltinClasses(void) DECLSPEC_HIDDEN; +extern void register_builtin_classes(void) DECLSPEC_HIDDEN; +extern void register_desktop_class(void) DECLSPEC_HIDDEN; extern WNDPROC get_class_winproc( struct tagCLASS *class ) DECLSPEC_HIDDEN; extern struct dce *get_class_dce( struct tagCLASS *class ) DECLSPEC_HIDDEN; extern struct dce *set_class_dce( struct tagCLASS *class, struct dce *dce ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index 2204b77..563a214 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -48,7 +48,7 @@ const struct builtin_class_descr DESKTOP_builtin_class = CS_DBLCLKS, /* style */ WINPROC_DESKTOP, /* proc */ 0, /* extra */ - IDC_ARROW, /* cursor */ + 0, /* cursor */ (HBRUSH)(COLOR_BACKGROUND+1) /* brush */ }; diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 18778cd..192eebe 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -28,6 +28,7 @@ #include "wine/gdi_driver.h" #include "user_private.h" +#include "controls.h" static USER_DRIVER null_driver, lazy_load_driver; @@ -119,6 +120,8 @@ static const USER_DRIVER *load_driver(void) } else LdrAddRefDll( 0, graphics_driver ); + register_builtin_classes(); + DeleteDC( hdc ); return driver; } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index d09e5dd..4fc87ad 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -290,7 +290,7 @@ const struct builtin_class_descr MESSAGE_builtin_class = 0, /* style */ WINPROC_MESSAGE, /* proc */ 0, /* extra */ - IDC_ARROW, /* cursor */ + 0, /* cursor */ 0 /* brush */ }; diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index e74ac19..d08a93c 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -262,6 +262,8 @@ static void winstation_init(void) if (handle) SetThreadDesktop( handle ); } HeapFree( GetProcessHeap(), 0, buffer ); + + register_desktop_class(); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d506fee..30a7c6f 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1391,8 +1391,6 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } } - CLASS_RegisterBuiltinClasses(); - /* Find the parent window */ parent = cs->hwndParent;

1 0

Alexandre Julliard : winemac: Don' t try to set the app icon before GDI is properly initialized.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: e4a43cfa1f44b4458bd347ce473846daa18f9326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a43cfa1f44b4458bd347ce4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 24 16:48:12 2013 +0200 winemac: Don't try to set the app icon before GDI is properly initialized. --- dlls/winemac.drv/macdrv_main.c | 15 --------------- dlls/winemac.drv/window.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index df45bb5..5cdd13c 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -91,20 +91,6 @@ const char* debugstr_cf(CFTypeRef t) /*********************************************************************** - * set_app_icon - */ -static void set_app_icon(void) -{ - CFArrayRef images = create_app_icon_images(); - if (images) - { - macdrv_set_application_icon(images); - CFRelease(images); - } -} - - -/*********************************************************************** * get_config_key * * Get a config key from either the app-specific or the default config @@ -208,7 +194,6 @@ static BOOL process_attach(void) return FALSE; } - set_app_icon(); macdrv_clipboard_process_attach(); return TRUE; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 007d5b0..4e132fa 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -929,6 +929,20 @@ void activate_on_following_focus(void) } +/*********************************************************************** + * set_app_icon + */ +static void set_app_icon(void) +{ + CFArrayRef images = create_app_icon_images(); + if (images) + { + macdrv_set_application_icon(images); + CFRelease(images); + } +} + + /********************************************************************** * CreateDesktopWindow (MACDRV.@) */ @@ -968,6 +982,7 @@ BOOL CDECL macdrv_CreateDesktopWindow(HWND hwnd) SERVER_END_REQ; } + set_app_icon(); return TRUE; }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
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