September 2011 - Wine-Commits

Gerald Pfeifer : comctl32: Remove dead code from MONTHCAL_HitTest.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: a17463b1e4b3498fb8ba9dc7a69a61b35776d152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17463b1e4b3498fb8ba9dc7a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Sep 8 00:23:15 2011 +0200 comctl32: Remove dead code from MONTHCAL_HitTest. --- dlls/comctl32/monthcal.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index c0c8810..ae9bdcd 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1665,13 +1665,9 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) MCHITTESTINFO htinfo; SYSTEMTIME ht_month; INT day, calIdx; - UINT x, y; if(!lpht || lpht->cbSize < MCHITTESTINFO_V1_SIZE) return -1; - x = lpht->pt.x; - y = lpht->pt.y; - htinfo.st = st_null; /* we should preserve passed fields if hit area doesn't need them */

1 0

André Hentschel : ntdll/tests: Tests for _wcslwr and _wcsupr.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: ca8d7652f68d564c5e2404048090c345568a8329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8d7652f68d564c5e2404048… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 7 18:03:17 2011 +0200 ntdll/tests: Tests for _wcslwr and _wcsupr. --- dlls/ntdll/tests/string.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 14464d9..9422d41 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -51,8 +51,8 @@ static LPWSTR (WINAPIV *p_ultow)(ULONG, LPWSTR, INT); static LPWSTR (WINAPIV *p_i64tow)(LONGLONG, LPWSTR, INT); static LPWSTR (WINAPIV *p_ui64tow)(ULONGLONG, LPWSTR, INT); -static long (WINAPIV *pwcstol)(LPCWSTR, LPWSTR *, INT); -static ULONG (WINAPIV *pwcstoul)(LPCWSTR, LPWSTR *, INT); +static LPWSTR (__cdecl *p_wcslwr)(LPWSTR); +static LPWSTR (__cdecl *p_wcsupr)(LPWSTR); static LPWSTR (WINAPIV *p_wcschr)(LPCWSTR, WCHAR); static LPWSTR (WINAPIV *p_wcsrchr)(LPCWSTR, WCHAR); @@ -89,8 +89,8 @@ static void InitFunctionPtrs(void) p_i64tow = (void *)GetProcAddress(hntdll, "_i64tow"); p_ui64tow = (void *)GetProcAddress(hntdll, "_ui64tow"); - pwcstol = (void *)GetProcAddress(hntdll, "wcstol"); - pwcstoul = (void *)GetProcAddress(hntdll, "wcstoul"); + p_wcslwr = (void *)GetProcAddress(hntdll, "_wcslwr"); + p_wcsupr = (void *)GetProcAddress(hntdll, "_wcsupr"); p_wcschr= (void *)GetProcAddress(hntdll, "wcschr"); p_wcsrchr= (void *)GetProcAddress(hntdll, "wcsrchr"); @@ -1143,6 +1143,28 @@ static void test_wcsrchr(void) "wcsrchr should have returned NULL\n"); } +static void test_wcslwrupr(void) +{ + static WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; + static WCHAR emptyW[1] = {0}; + static const WCHAR constemptyW[1] = {0}; + + if (0) /* crashes on native */ + { + static const WCHAR conststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; + ok(p_wcslwr((LPWSTR)conststringW) == conststringW, "p_wcslwr returned different string\n"); + ok(p_wcsupr((LPWSTR)conststringW) == conststringW, "p_wcsupr returned different string\n"); + ok(p_wcslwr(NULL) == NULL, "p_wcslwr didn't returned NULL\n"); + ok(p_wcsupr(NULL) == NULL, "p_wcsupr didn't returned NULL\n"); + } + ok(p_wcslwr(teststringW) == teststringW, "p_wcslwr returned different string\n"); + ok(p_wcsupr(teststringW) == teststringW, "p_wcsupr returned different string\n"); + ok(p_wcslwr(emptyW) == emptyW, "p_wcslwr returned different string\n"); + ok(p_wcsupr(emptyW) == emptyW, "p_wcsupr returned different string\n"); + ok(p_wcslwr((LPWSTR)constemptyW) == constemptyW, "p_wcslwr returned different string\n"); + ok(p_wcsupr((LPWSTR)constemptyW) == constemptyW, "p_wcsupr returned different string\n"); +} + static __cdecl int intcomparefunc(const void *a, const void *b) { const int *p = a, *q = b; @@ -1272,6 +1294,8 @@ START_TEST(string) test_wcschr(); if (p_wcsrchr) test_wcsrchr(); + if (p_wcslwr && p_wcsupr) + test_wcslwrupr(); if (patoi) test_atoi(); if (patol)

1 0

Alexandre Julliard : libwine: Avoid converting the final null in strlwrW and struprW.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: f7c98b036c5b7b177d56652ae3f9a153a3783328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c98b036c5b7b177d56652ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 8 11:16:51 2011 +0200 libwine: Avoid converting the final null in strlwrW and struprW. --- include/wine/unicode.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index b685e43..35c6166 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -265,15 +265,15 @@ WINE_UNICODE_INLINE size_t strcspnW( const WCHAR *str, const WCHAR *reject ) WINE_UNICODE_INLINE WCHAR *strlwrW( WCHAR *str ) { - WCHAR *ret = str; - while ((*str = tolowerW(*str))) str++; + WCHAR *ret; + for (ret = str; *str; str++) *str = tolowerW(*str); return ret; } WINE_UNICODE_INLINE WCHAR *struprW( WCHAR *str ) { - WCHAR *ret = str; - while ((*str = toupperW(*str))) str++; + WCHAR *ret; + for (ret = str; *str; str++) *str = toupperW(*str); return ret; }

1 0

Alexandre Julliard : winex11: Make sure the bitmap created from a packed DIB is owned by x11drv before getting its pixmap .
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: da0327917c36a428b6c5e593f156f64b9c25c0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0327917c36a428b6c5e593f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 22:55:12 2011 +0200 winex11: Make sure the bitmap created from a packed DIB is owned by x11drv before getting its pixmap. --- dlls/winex11.drv/dib.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index b466e69..62aea3c 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4323,10 +4323,11 @@ HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc) */ Pixmap X11DRV_DIB_CreatePixmapFromDIB( HGLOBAL hPackedDIB, HDC hdc ) { - Pixmap pixmap; + Pixmap pixmap = 0; X_PHYSBITMAP *physBitmap; HBITMAP hBmp; LPBITMAPINFO pbmi; + HDC memdc; /* Create a DDB from the DIB */ @@ -4336,10 +4337,17 @@ Pixmap X11DRV_DIB_CreatePixmapFromDIB( HGLOBAL hPackedDIB, HDC hdc ) pbmi, DIB_RGB_COLORS); GlobalUnlock(hPackedDIB); + /* make sure it's owned by x11drv */ + memdc = CreateCompatibleDC( hdc ); + SelectObject( memdc, hBmp ); + DeleteDC( memdc ); + /* clear the physBitmap so that we can steal its pixmap */ - physBitmap = X11DRV_get_phys_bitmap( hBmp ); - pixmap = physBitmap->pixmap; - physBitmap->pixmap = 0; + if ((physBitmap = X11DRV_get_phys_bitmap( hBmp ))) + { + pixmap = physBitmap->pixmap; + physBitmap->pixmap = 0; + } /* Delete the DDB we created earlier now that we have stolen its pixmap */ DeleteObject(hBmp);

1 0

Alexandre Julliard : winex11: Make sure the bitmap of the brush pattern is owned by x11drv before getting its pixmap .
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: d7ed2457b0c5a873f4ee2273b168e4b163839d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ed2457b0c5a873f4ee2273b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 22:54:49 2011 +0200 winex11: Make sure the bitmap of the brush pattern is owned by x11drv before getting its pixmap. --- dlls/winex11.drv/brush.c | 43 +++++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 6909d52..e16380a 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -252,14 +252,40 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) /*********************************************************************** + * BRUSH_SelectDIBPatternBrush + */ +static BOOL BRUSH_SelectDIBPatternBrush( X11DRV_PDEVICE *physDev, HGLOBAL mem ) +{ + BOOL ret; + HDC memdc; + BITMAPINFO *info = GlobalLock( mem ); + HBITMAP bitmap = CreateDIBitmap( physDev->dev.hdc, &info->bmiHeader, CBM_INIT, + (LPBYTE)info + bitmap_info_size( info, DIB_RGB_COLORS ), + info, DIB_RGB_COLORS ); + + /* make sure it's owned by x11drv */ + memdc = CreateCompatibleDC( physDev->dev.hdc ); + SelectObject( memdc, bitmap ); + DeleteDC( memdc ); + + if ((ret = BRUSH_SelectPatternBrush( physDev, bitmap ))) + { + X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( bitmap ); + physBitmap->pixmap = 0; /* so it doesn't get freed */ + } + DeleteObject( bitmap ); + GlobalUnlock( mem ); + return ret; +} + + +/*********************************************************************** * SelectBrush (X11DRV.@) */ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); LOGBRUSH logbrush; - HBITMAP hBitmap; - BITMAPINFO * bmpInfo; if (!GetObjectA( hbrush, sizeof(logbrush), &logbrush )) return 0; @@ -304,18 +330,7 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) case BS_DIBPATTERN: TRACE("BS_DIBPATTERN\n"); - if ((bmpInfo = GlobalLock( (HGLOBAL)logbrush.lbHatch ))) - { - int size = bitmap_info_size( bmpInfo, logbrush.lbColor ); - hBitmap = CreateDIBitmap( dev->hdc, &bmpInfo->bmiHeader, - CBM_INIT, ((char *)bmpInfo) + size, - bmpInfo, - (WORD)logbrush.lbColor ); - BRUSH_SelectPatternBrush( physDev, hBitmap ); - DeleteObject( hBitmap ); - GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); - } - + if (!BRUSH_SelectDIBPatternBrush( physDev, (HGLOBAL)logbrush.lbHatch )) return 0; break; } return hbrush;

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 1c404ef443cf8e61a385a481abf97bb78045f061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c404ef443cf8e61a385a481a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 7 23:46:08 2011 +0200 po: Update German translation. --- po/de.po | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/po/de.po b/po/de.po index 12bd5a7..a691c8a 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-09-06 08:07+0200\n" +"PO-Revision-Date: 2011-09-07 23:43+0200\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -2017,14 +2017,12 @@ msgid "Default MidiOut Device" msgstr "Standard MidiOut - Gerät" #: dinput.rc:34 -#, fuzzy msgid "Action" -msgstr "Aktivierung" +msgstr "Aktion" #: dinput.rc:35 -#, fuzzy msgid "Object" -msgstr "&Objekt" +msgstr "Objekt" #: dxdiagn.rc:25 msgid "Regional Setting" @@ -10552,7 +10550,6 @@ msgstr "" "Laufwerk C neu zu erstellen!" #: winecfg.rc:80 -#, fuzzy msgctxt "Drive letter" msgid "Letter" msgstr "Buchst." @@ -10795,7 +10792,6 @@ msgstr "" "Optionen:\n" #: wineconsole.rc:49 -#, fuzzy msgid "" " --backend={user|curses} Choosing user will spawn a new window, curses " "will\n" @@ -10805,16 +10801,14 @@ msgstr "" " --backend={user|curses} Auswahl von ‚user‘ erstellt ein neues Fenster,\n" " ‚curses‘ versucht das aktuelle Terminal als " "Wine-\n" -" Konsole einzurichten\n" +" Konsole einzurichten.\n" #: wineconsole.rc:51 -#, fuzzy msgid " <command> The Wine program to launch in the console.\n" msgstr "" -" <Befehl> Das in der Konsole zu startende Wine-Programm\n" +" <Befehl> Das in der Konsole zu startende Wine-Programm.\n" #: wineconsole.rc:52 -#, fuzzy msgid "" "\n" "Example:\n" @@ -10825,7 +10819,7 @@ msgstr "" "\n" "Bespiel:\n" " wineconsole cmd\n" -"Startet die Wine-Befehlszeile in einer Wine-Konsole\n" +"Startet die Wine-Befehlszeile in einer Wine-Konsole.\n" "\n" #: winedbg.rc:35

1 0

André Hentschel : ntdll: Fix a comment.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 322c2f45f87f20f6ab84f933841c9f00de73f11a URL: http://source.winehq.org/git/wine.git/?a=commit;h=322c2f45f87f20f6ab84f9338… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 7 22:31:39 2011 +0200 ntdll: Fix a comment. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index dda1f37..6699de1 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1460,7 +1460,7 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) /*********************************************************************** - * virtual_create_system_view + * virtual_create_builtin_view */ NTSTATUS virtual_create_builtin_view( void *module ) {

1 0

André Hentschel : ntdll/tests: Run the execution test only on x86 platforms.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 94a9db6383f5915826267b2641ced193a661b2f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a9db6383f5915826267b264… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 7 18:54:45 2011 +0200 ntdll/tests: Run the execution test only on x86 platforms. --- dlls/ntdll/tests/info.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 2d5c94f..ec1ce3d 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1194,10 +1194,12 @@ static void test_mapprotection(void) addr = NULL; status = pNtMapViewOfSection ( h, GetCurrentProcess(), &addr, 0, 0, &offset, &count, ViewShare, 0, PAGE_READWRITE); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); +#if defined(__x86_64__) || defined(__i386__) memset (addr, 0xc3, 1); /* lret ... in both i386 and x86_64 */ trace("trying to execute code in the readwrite only mapped anon file...\n"); f = addr;f(); trace("...done.\n"); +#endif status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_sampler_state() const.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 919d3ab9e426dd43c9634f20936e321d83fcfc03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=919d3ab9e426dd43c9634f209… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 7 20:22:00 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_sampler_state() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4a8b5c6..1b722f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2550,7 +2550,7 @@ HRESULT CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_sampler_state(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device, UINT sampler_idx, WINED3DSAMPLERSTATETYPE state, DWORD *value) { TRACE("device %p, sampler_idx %u, state %s, value %p.\n", diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2039398..ddf6561 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2243,7 +2243,7 @@ HRESULT __cdecl wined3d_device_get_render_state(const struct wined3d_device *dev WINED3DRENDERSTATETYPE state, DWORD *value); HRESULT __cdecl wined3d_device_get_render_target(struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface **render_target); -HRESULT __cdecl wined3d_device_get_sampler_state(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, UINT sampler_idx, WINED3DSAMPLERSTATETYPE state, DWORD *value); HRESULT __cdecl wined3d_device_get_scissor_rect(struct wined3d_device *device, RECT *rect); BOOL __cdecl wined3d_device_get_software_vertex_processing(struct wined3d_device *device);

1 0

Henri Verbeet : ddraw: Introduce a function for creating the swapchain.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: bbfbd66d9ff07623237aff04bf7c06dd0be8aa31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfbd66d9ff07623237aff04b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 7 20:21:59 2011 +0200 ddraw: Introduce a function for creating the swapchain. --- dlls/ddraw/ddraw.c | 78 ++++++++++++++++++++++++++++------------------------ 1 files changed, 42 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7dd0f2d..001a2be 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2833,6 +2833,47 @@ static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSur return hr; } +static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *surface) +{ + HRESULT hr = WINED3D_OK; + + /* If the implementation is OpenGL and there's no d3ddevice, attach a + * d3ddevice. But attach the d3ddevice only if the currently created + * surface was a primary surface (2D app in 3D mode) or a 3DDEVICE surface + * (3D app). The only case I can think of where this doesn't apply is when + * a 2D app was configured by the user to run with OpenGL and it didn't + * create the render target as first surface. In this case the render + * target creation will cause the 3D init. */ + if (DefaultSurfaceType == SURFACE_OPENGL) + { + IDirectDrawSurfaceImpl *target = surface, *primary; + struct list *entry; + + /* Search for the primary to use as render target. */ + LIST_FOR_EACH(entry, &ddraw->surface_list) + { + primary = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); + if ((primary->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) + == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) + { + TRACE("Using primary %p as render target.\n", target); + target = primary; + break; + } + } + + TRACE("Attaching a D3DDevice, rendertarget = %p.\n", target); + hr = ddraw_attach_d3d_device(ddraw, target); + } + else if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + hr = ddraw_create_gdi_swapchain(ddraw, surface); + } + + return hr; + +} + /***************************************************************************** * IDirectDraw7::CreateSurface * @@ -3211,42 +3252,7 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, if (!ddraw->d3d_initialized && desc2.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE)) { - HRESULT hr = WINED3D_OK; - - /* If the implementation is OpenGL and there's no d3ddevice, attach a - * d3ddevice. But attach the d3ddevice only if the currently created - * surface was a primary surface (2D app in 3D mode) or a 3DDEVICE - * surface (3D app). The only case I can think of where this doesn't - * apply is when a 2D app was configured by the user to run with - * OpenGL and it didn't create the render target as first surface. In - * this case the render target creation will cause the 3D init. */ - if (DefaultSurfaceType == SURFACE_OPENGL) - { - IDirectDrawSurfaceImpl *target = object, *surface; - struct list *entry; - - /* Search for the primary to use as render target. */ - LIST_FOR_EACH(entry, &ddraw->surface_list) - { - surface = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); - if ((surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) - == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) - { - TRACE("Using primary %p as render target.\n", target); - target = surface; - break; - } - } - - TRACE("Attaching a D3DDevice, rendertarget = %p.\n", target); - hr = ddraw_attach_d3d_device(ddraw, target); - } - else if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - hr = ddraw_create_gdi_swapchain(ddraw, object); - } - - if (FAILED(hr)) + if (FAILED(hr = ddraw_create_swapchain(ddraw, object))) { IDirectDrawSurfaceImpl *release_surf; ERR("Failed to create swapchain, hr %#x.\n", hr);

1 0