June 2012 - Wine-commits - list.winehq.org

Piotr Caban : msvcp90: Added _Stodx implementation.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 1e4d0c4fbf17513a83f4e405cf59d879d8aca212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e4d0c4fbf17513a83f4e405c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 20 13:14:37 2012 +0200 msvcp90: Added _Stodx implementation. --- dlls/msvcp90/locale.c | 26 ++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 8 ++++---- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index e415807..1330d17 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -24,6 +24,7 @@ #include "locale.h" #include "errno.h" #include "limits.h" +#include "math.h" #include "wine/list.h" @@ -3871,6 +3872,31 @@ basic_string_wchar* __thiscall numpunct_wchar_truename(const numpunct_wchar *thi return call_numpunct_wchar_do_truename(this, ret); } +double __cdecl _Stod(const char *buf, char **buf_end, LONG exp) +{ + double ret = strtod(buf, buf_end); + + if(exp) + ret *= pow(10, exp); + return ret; +} + +double __cdecl _Stodx(const char *buf, char **buf_end, LONG exp, int *err) +{ + double ret; + + *err = *_errno(); + *_errno() = 0; + ret = _Stod(buf, buf_end, exp); + if(*_errno()) { + *err = *_errno(); + }else { + *_errno() = *err; + *err = 0; + } + return ret; +} + /* ?id@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@2V0locale(a)2@A */ locale_id num_get_wchar_id = {0}; /* ?id@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@2V0locale(a)2@A */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index a5976e1..3d15518 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5783,12 +5783,12 @@ # extern _Rteps @ stub _Sinh @ extern _Snan -@ stub _Stod -@ stub _Stodx +@ cdecl _Stod(ptr ptr long) +@ cdecl _Stodx(ptr ptr long ptr) @ stub _Stof @ stub _Stofx -@ stub _Stold -@ stub _Stoldx +@ cdecl _Stold(ptr ptr long) _Stod +@ cdecl _Stoldx(ptr ptr long ptr) _Stodx @ stub _Stoll @ stub _Stollx @ stub _Stolx

1 0

Piotr Caban : msvcp90: Added _Stofx implementation.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: dc4e950009c890b82e5630e52d1001fbcdebf93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4e950009c890b82e5630e52… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 20 13:14:55 2012 +0200 msvcp90: Added _Stofx implementation. --- dlls/msvcp90/locale.c | 10 ++++++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1330d17..fc682a1 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -3897,6 +3897,16 @@ double __cdecl _Stodx(const char *buf, char **buf_end, LONG exp, int *err) return ret; } +float __cdecl _Stof(const char *buf, char **buf_end, LONG exp) +{ + return _Stod(buf, buf_end, exp); +} + +float __cdecl _Stofx(const char *buf, char **buf_end, LONG exp, int *err) +{ + return _Stodx(buf, buf_end, exp, err); +} + /* ?id@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@2V0locale(a)2@A */ locale_id num_get_wchar_id = {0}; /* ?id@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@2V0locale(a)2@A */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 3d15518..827f7a7 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5785,8 +5785,8 @@ @ extern _Snan @ cdecl _Stod(ptr ptr long) @ cdecl _Stodx(ptr ptr long ptr) -@ stub _Stof -@ stub _Stofx +@ cdecl _Stof(ptr ptr long) +@ cdecl _Stofx(ptr ptr long ptr) @ cdecl _Stold(ptr ptr long) _Stod @ cdecl _Stoldx(ptr ptr long ptr) _Stodx @ stub _Stoll

1 0

Piotr Caban : msvcp90: Added _Stollx implementation.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: d1b67cea3b56cf32c8130ca020d53a8f18876e68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b67cea3b56cf32c8130ca02… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 20 13:15:11 2012 +0200 msvcp90: Added _Stollx implementation. --- dlls/msvcp90/locale.c | 29 +++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 6 +++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index fc682a1..ac44e1a 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -3907,6 +3907,35 @@ float __cdecl _Stofx(const char *buf, char **buf_end, LONG exp, int *err) return _Stodx(buf, buf_end, exp, err); } +__int64 __cdecl _Stoll(const char *buf, char **buf_end, int base) +{ + return _strtoi64(buf, buf_end, base); +} + +__int64 __cdecl _Stollx(const char *buf, char **buf_end, int base, int *err) +{ + __int64 ret; + + *err = *_errno(); + *_errno() = 0; + ret = _strtoi64(buf, buf_end, base); + if(*_errno()) { + *err = *_errno(); + }else { + *_errno() = *err; + *err = 0; + } + return ret; +} + +LONG __cdecl _Stolx(const char *buf, char **buf_end, int base, int *err) +{ + __int64 i = _Stollx(buf, buf_end, base, err); + if(!*err && i!=(__int64)((LONG)i)) + *err = ERANGE; + return i; +} + /* ?id@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@2V0locale(a)2@A */ locale_id num_get_wchar_id = {0}; /* ?id@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@2V0locale(a)2@A */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 827f7a7..d8bf44f 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5789,9 +5789,9 @@ @ cdecl _Stofx(ptr ptr long ptr) @ cdecl _Stold(ptr ptr long) _Stod @ cdecl _Stoldx(ptr ptr long ptr) _Stodx -@ stub _Stoll -@ stub _Stollx -@ stub _Stolx +@ cdecl -ret64 _Stoll(ptr ptr long) +@ cdecl -ret64 _Stollx(ptr ptr long ptr) +@ cdecl _Stolx(ptr ptr long ptr) @ stub _Stoul @ stub _Stoull @ stub _Stoullx

1 0

Piotr Caban : msvcp90: Added _Stoullx implementation.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: bb6bb0e3944064f0c4ababbbfa5e4f9087f8ff8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6bb0e3944064f0c4ababbbf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 20 13:15:29 2012 +0200 msvcp90: Added _Stoullx implementation. --- dlls/msvcp90/locale.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 8 ++++---- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ac44e1a..9147092 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -3936,6 +3936,44 @@ LONG __cdecl _Stolx(const char *buf, char **buf_end, int base, int *err) return i; } +unsigned __int64 __cdecl _Stoull(const char *buf, char **buf_end, int base) +{ + return _strtoui64(buf, buf_end, base); +} + +unsigned __int64 __cdecl _Stoullx(const char *buf, char **buf_end, int base, int *err) +{ + unsigned __int64 ret; + + *err = *_errno(); + *_errno() = 0; + ret = _strtoui64(buf, buf_end, base); + if(*_errno()) { + *err = *_errno(); + }else { + *_errno() = *err; + *err = 0; + } + return ret; +} + +ULONG __cdecl _Stoul(const char *buf, char **buf_end, int base) +{ + int err; + unsigned __int64 i = _Stoullx(buf[0]=='-' ? buf+1 : buf, buf_end, base, &err); + if(!err && i!=(unsigned __int64)((ULONG)i)) + *_errno() = ERANGE; + return buf[0]=='-' ? -i : i; +} + +ULONG __cdecl _Stoulx(const char *buf, char **buf_end, int base, int *err) +{ + unsigned __int64 i = _Stoullx(buf[0]=='-' ? buf+1 : buf, buf_end, base, err); + if(!*err && i!=(unsigned __int64)((ULONG)i)) + *err = ERANGE; + return buf[0]=='-' ? -i : i; +} + /* ?id@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@2V0locale(a)2@A */ locale_id num_get_wchar_id = {0}; /* ?id@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@2V0locale(a)2@A */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d8bf44f..cd46d9b 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5792,10 +5792,10 @@ @ cdecl -ret64 _Stoll(ptr ptr long) @ cdecl -ret64 _Stollx(ptr ptr long ptr) @ cdecl _Stolx(ptr ptr long ptr) -@ stub _Stoul -@ stub _Stoull -@ stub _Stoullx -@ stub _Stoulx +@ cdecl _Stoul(ptr ptr long) +@ cdecl -ret64 _Stoull(ptr ptr long) +@ cdecl -ret64 _Stoullx(ptr ptr long ptr) +@ cdecl _Stoulx(ptr ptr long ptr) @ cdecl _Strcoll(ptr ptr ptr ptr ptr) @ stub _Strxfrm @ cdecl _Tolower(long ptr)

1 0

Piotr Caban : msvcp90: Fix basic_ios<char>::imbue implementation.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: ef2b4d74326b9f1c5479b510b4341bb08dd3e208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef2b4d74326b9f1c5479b510b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 20 13:15:45 2012 +0200 msvcp90: Fix basic_ios<char>::imbue implementation. --- dlls/msvcp90/ios.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 2b43123..6bafa95 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3174,11 +3174,12 @@ locale *__thiscall basic_ios_char_imbue(basic_ios_char *this, locale *ret, const { TRACE("(%p %p %p)\n", this, ret, loc); - if(this->strbuf) - return basic_streambuf_char_pubimbue(this->strbuf, ret, loc); + if(this->strbuf) { + basic_streambuf_char_pubimbue(this->strbuf, ret, loc); + locale_dtor(ret); + } - locale_copy_ctor(ret, loc); - return ret; + return ios_base_imbue(&this->base, ret, loc); } /* ?narrow@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QBEDDD(a)Z */

1 0

Vincent Povirk : windowscodecs: Report missing component info strings as zero-length.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 9f157e5bfaccb895c969ab656c8b06575169f066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f157e5bfaccb895c969ab656… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 15:25:37 2012 -0500 windowscodecs: Report missing component info strings as zero-length. --- dlls/windowscodecs/info.c | 6 ++++++ dlls/windowscodecs/tests/info.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index a2cc1a7..5b81702 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -59,6 +59,12 @@ static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, ret = RegGetValueW(classkey, NULL, value, RRF_RT_REG_SZ|RRF_NOEXPAND, NULL, buffer, &cbdata); + if (ret == ERROR_FILE_NOT_FOUND) + { + *actual_size = 0; + return S_OK; + } + if (ret == 0 || ret == ERROR_MORE_DATA) *actual_size = cbdata/sizeof(WCHAR); diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index eda21a6..e923999 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -214,8 +214,8 @@ static void test_pixelformat_info(void) len = 0xdeadbeef; hr = IWICComponentInfo_GetVersion(info, 0, NULL, &len); - todo_wine ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); - todo_wine ok(len == 0, "invalid length 0x%x\n", len); /* version does not apply to pixel formats */ + ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); + ok(len == 0, "invalid length 0x%x\n", len); /* version does not apply to pixel formats */ IWICComponentInfo_Release(info); }

1 0

Thomas Faber : wininet: Use the correct type for sock_namelen in FTP_Connect.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 62d6b24e4cb5b4180b110599b5682105869406db URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d6b24e4cb5b4180b110599b… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Jun 20 16:31:36 2012 +0200 wininet: Use the correct type for sock_namelen in FTP_Connect. --- dlls/wininet/ftp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 0c7ca12..54dd655 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2433,7 +2433,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, static const WCHAR szEmpty[] = {'\0'}; struct sockaddr_in socketAddr; INT nsocket = -1; - UINT sock_namelen; + socklen_t sock_namelen; BOOL bSuccess = FALSE; ftp_session_t *lpwfs = NULL; char szaddr[INET_ADDRSTRLEN];

1 0

Henri Verbeet : wined3d: Only filter redundant mode changes in wined3d.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 2a0463ac21bab45a477f1f4a500b315546a85042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0463ac21bab45a477f1f4a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 20 17:45:13 2012 +0200 wined3d: Only filter redundant mode changes in wined3d. --- dlls/ddraw/ddraw.c | 14 -------------- dlls/wined3d/device.c | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 057e6e1..e5bd7d6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1061,20 +1061,6 @@ static HRESULT ddraw_set_display_mode(struct ddraw *ddraw, DWORD Width, DWORD He default: format = WINED3DFMT_UNKNOWN; break; } - if (FAILED(hr = wined3d_device_get_display_mode(ddraw->wined3d_device, 0, &mode))) - { - ERR("Failed to get current display mode, hr %#x.\n", hr); - } - else if (mode.width == Width - && mode.height == Height - && mode.format_id == format - && mode.refresh_rate == RefreshRate) - { - TRACE("Skipping redundant mode setting call.\n"); - wined3d_mutex_unlock(); - return DD_OK; - } - /* Check the exclusive mode if(!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) return DDERR_NOEXCLUSIVEMODE; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3bc623a..8aadbbb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1567,9 +1567,11 @@ HRESULT CDECL wined3d_device_set_display_mode(struct wined3d_device *device, { struct wined3d_adapter *adapter = device->adapter; const struct wined3d_format *format = wined3d_get_format(&adapter->gl_info, mode->format_id); + struct wined3d_display_mode current_mode; DEVMODEW devmode; LONG ret; RECT clip_rc; + HRESULT hr; TRACE("device %p, swapchain_idx %u, mode %p (%ux%u@%u %s).\n", device, swapchain_idx, mode, mode->width, mode->height, mode->refresh_rate, debug_d3dformat(mode->format_id)); @@ -1592,9 +1594,19 @@ HRESULT CDECL wined3d_device_set_display_mode(struct wined3d_device *device, devmode.dmFields |= DM_DISPLAYFREQUENCY; /* Only change the mode if necessary */ - if (adapter->screen_size.cx == mode->width && adapter->screen_size.cy == mode->height - && adapter->screen_format == mode->format_id && !mode->refresh_rate) + if (FAILED(hr = wined3d_device_get_display_mode(device, swapchain_idx, &current_mode))) + { + ERR("Failed to get current display mode, hr %#x.\n", hr); + } + else if (current_mode.width == mode->width + && current_mode.height == mode->height + && current_mode.format_id == mode->format_id + && (current_mode.refresh_rate == mode->refresh_rate + || !mode->refresh_rate)) + { + TRACE("Skipping redundant mode setting call.\n"); return WINED3D_OK; + } ret = ChangeDisplaySettingsExW(NULL, &devmode, NULL, CDS_FULLSCREEN, NULL); if (ret != DISP_CHANGE_SUCCESSFUL)

1 0

Henri Verbeet : wined3d: Lie about the display format in wined3d_get_adapter_display_mode().
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: fdb85423b4ae3ee8454456966b8cc1b0c46da49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb85423b4ae3ee8454456966… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 20 17:45:14 2012 +0200 wined3d: Lie about the display format in wined3d_get_adapter_display_mode(). --- dlls/wined3d/directx.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5183904..df22efd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3029,15 +3029,18 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_display_mode *mode) { + const struct wined3d_adapter *adapter; + TRACE("wined3d %p, adapter_idx %u, display_mode %p.\n", wined3d, adapter_idx, mode); if (!mode || adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; + adapter = &wined3d->adapters[adapter_idx]; + if (!adapter_idx) { DEVMODEW DevModeW; - unsigned int bpp; ZeroMemory(&DevModeW, sizeof(DevModeW)); DevModeW.dmSize = sizeof(DevModeW); @@ -3045,11 +3048,22 @@ HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UI EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &DevModeW, 0); mode->width = DevModeW.dmPelsWidth; mode->height = DevModeW.dmPelsHeight; - bpp = DevModeW.dmBitsPerPel; mode->refresh_rate = DEFAULT_REFRESH_RATE; if (DevModeW.dmFields & DM_DISPLAYFREQUENCY) mode->refresh_rate = DevModeW.dmDisplayFrequency; - mode->format_id = pixelformat_for_depth(bpp); + mode->format_id = pixelformat_for_depth(DevModeW.dmBitsPerPel); + + /* Lie about the format. X11 can't change the color depth, and some + * apps are pretty angry if they SetDisplayMode from 24 to 16 bpp and + * find out that GetDisplayMode still returns 24 bpp. This should + * probably be handled in winex11 instead. */ + if (adapter->screen_format && adapter->screen_format != mode->format_id) + { + WARN("Overriding format %s with stored format %s.\n", + debug_d3dformat(mode->format_id), + debug_d3dformat(adapter->screen_format)); + mode->format_id = adapter->screen_format; + } } else {

1 0

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in ddraw_create_swapchain().
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: bf9b2a89ba075d4df7dbf6066e8b936c089e2f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9b2a89ba075d4df7dbf6066… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 20 17:45:15 2012 +0200 ddraw: Use wined3d_get_adapter_display_mode() in ddraw_create_swapchain(). --- dlls/ddraw/ddraw.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e5bd7d6..f38734b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -670,12 +670,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win struct wined3d_display_mode mode; HRESULT hr = WINED3D_OK; - /* FIXME: wined3d_get_adapter_display_mode() would be more appropriate - * here, since we don't actually have a swapchain yet, but - * wined3d_device_get_display_mode() has some special handling for color - * depth changes. */ - hr = wined3d_device_get_display_mode(ddraw->wined3d_device, 0, &mode); - if (FAILED(hr)) + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) { ERR("Failed to get display mode.\n"); return hr;

1 0