May 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : oleaut32/tests: Remove some unnecessary constants.
by Alexandre Julliard May 19, 2011

May 19, 2011

Module: wine Branch: master Commit: 25627ad445de8b829837b756a4ba6820162c125b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25627ad445de8b829837b756a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 19 09:56:46 2011 +0200 oleaut32/tests: Remove some unnecessary constants. --- dlls/oleaut32/tests/usrmarshal.c | 634 ++++++++++++++++---------------------- 1 files changed, 267 insertions(+), 367 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25627ad445de8b829837b…

1 0

Marcus Meissner : infosoft: Mark internal symbol with hidden visibility.
by Alexandre Julliard May 19, 2011

May 19, 2011

Module: wine Branch: master Commit: ac1550bdaa9c3068838e1d7114016ae976f4dbef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac1550bdaa9c3068838e1d711… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:16:53 2011 +0200 infosoft: Mark internal symbol with hidden visibility. --- dlls/infosoft/infosoft_main.c | 2 +- dlls/infosoft/wordbreaker.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index 619eca2..518e44c 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -56,7 +56,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return TRUE; } -extern HRESULT WINAPI wb_Constructor(IUnknown*, REFIID, LPVOID *); +DECLSPEC_HIDDEN extern HRESULT WINAPI wb_Constructor(IUnknown*, REFIID, LPVOID *); typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown*, REFIID, LPVOID*); diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index 69e2eb8..1789766 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -183,7 +183,7 @@ static const IWordBreakerVtbl wordbreaker_vtbl = wb_GetLicenseToUse, }; -HRESULT WINAPI wb_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOID *ppvObject) +DECLSPEC_HIDDEN HRESULT WINAPI wb_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOID *ppvObject) { wordbreaker_impl *This; IWordBreaker *wb;

1 0

Andrew Nguyen : kernel32: Suppress constness warnings for tigetstr parameter.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: f5e555660dacb24781c78a563211c64cfab82690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e555660dacb24781c78a563… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:17:44 2011 -0500 kernel32: Suppress constness warnings for tigetstr parameter. --- dlls/kernel32/term.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index 18eb4b2..5123090 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -376,7 +376,7 @@ static BOOL TERM_BuildKeyDB(void) for (i = 0; i < sizeof(TERM_dbkey_init) / sizeof(TERM_dbkey_init[0]); i++) { - if (!TERM_AddKeyDescr(tigetstr(TERM_dbkey_init[i].string_normal), &TERM_dbkey_init[i].descr)) + if (!TERM_AddKeyDescr(tigetstr((char *)TERM_dbkey_init[i].string_normal), &TERM_dbkey_init[i].descr)) return FALSE; if (TERM_dbkey_init[i].string_xterm) { @@ -421,7 +421,7 @@ BOOL TERM_Init(void) TERM_init_done = TRUE; TERM_BuildKeyDB(); /* set application key mode */ - putp(tigetstr("smkx")); + putp(tigetstr((char *)"smkx")); return TRUE; } @@ -430,7 +430,7 @@ BOOL TERM_Exit(void) if (TERM_init_done) { /* put back the cursor key mode */ - putp(tigetstr("rmkx")); + putp(tigetstr((char *)"rmkx")); } return TRUE; }

1 0

Andrew Nguyen : advapi32/tests: Use a matching enumeration value for the trustee form member.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 163dfad5a18c5a8598eef98893584d0c22b94934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163dfad5a18c5a8598eef9889… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:17:58 2011 -0500 advapi32/tests: Use a matching enumeration value for the trustee form member. --- dlls/advapi32/tests/security.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7040add..4b7473f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2782,7 +2782,7 @@ static void test_SetEntriesInAclW(void) } else { - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME; ExplicitAccess.Trustee.ptstrName = (LPWSTR)wszEveryone; res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); @@ -2798,7 +2798,7 @@ static void test_SetEntriesInAclW(void) broken(NewAcl != NULL), /* NT4 */ "returned acl wasn't NULL: %p\n", NewAcl); - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME; ExplicitAccess.Trustee.MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE; res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_INVALID_PARAMETER || @@ -2816,7 +2816,7 @@ static void test_SetEntriesInAclW(void) LocalFree(NewAcl); } - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME; ExplicitAccess.Trustee.ptstrName = (LPWSTR)wszCurrentUser; res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); @@ -2913,7 +2913,7 @@ static void test_SetEntriesInAclA(void) } else { - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME; ExplicitAccess.Trustee.ptstrName = (LPSTR)szEveryone; res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_SUCCESS, "SetEntriesInAclA failed: %u\n", res); @@ -2929,7 +2929,7 @@ static void test_SetEntriesInAclA(void) broken(NewAcl != NULL), /* NT4 */ "returned acl wasn't NULL: %p\n", NewAcl); - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME; ExplicitAccess.Trustee.MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE; res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_INVALID_PARAMETER || @@ -2947,7 +2947,7 @@ static void test_SetEntriesInAclA(void) LocalFree(NewAcl); } - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME; ExplicitAccess.Trustee.ptstrName = (LPSTR)szCurrentUser; res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_SUCCESS, "SetEntriesInAclA failed: %u\n", res);

1 0

Andrew Nguyen : winedbg: Convert the CRLF newline to LF newline when reading interactive input.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 9981938486ad131cc0badaca75bd25f45a7ed7bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9981938486ad131cc0badaca7… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:09:11 2011 -0500 winedbg: Convert the CRLF newline to LF newline when reading interactive input. --- programs/winedbg/debug.l | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 41db76c..dfb75b4 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -78,10 +78,19 @@ static int read_input(const char* pfx, char* buf, int size) lexeme_flush(); len = input_fetch_entire_line(pfx, &tmp); if (len < 0) return 0; /* eof */ + + /* remove carriage return in newline */ + if (len >= 2 && tmp[len - 2] == '\r') + { + tmp[len - 2] = '\n'; + tmp[len - 1] = '\0'; + len--; + } + /* FIXME: should have a pair of buffers, and switch between the two, instead of * reallocating a new one for each line */ - if (last_line && (len == 0 || (len == 1 && tmp[0] == '\n') || (len == 2 && tmp[0] == '\r' && tmp[1] == '\n'))) + if (last_line && (len == 0 || (len == 1 && tmp[0] == '\n'))) { HeapFree(GetProcessHeap(), 0, tmp); }

1 0

Aric Stewart : usp10: Make use of MS_MAKE_TAG instead of numeric constants.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 2587f702c5b7735e539e04590128e6c56f345b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2587f702c5b7735e539e04590… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 18 07:50:11 2011 -0500 usp10: Make use of MS_MAKE_TAG instead of numeric constants. --- dlls/usp10/shape.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index c0050c9..fb6084e 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -253,18 +253,18 @@ static const char* contextual_features[] = static OPENTYPE_FEATURE_RECORD standard_features[] = { - { 0x6167696c /*liga*/, 1}, - { 0x67696c63 /*clig*/, 1}, + { MS_MAKE_TAG('l','i','g','a'), 1}, + { MS_MAKE_TAG('c','l','i','g'), 1}, }; static OPENTYPE_FEATURE_RECORD arabic_features[] = { - { 0x67696c72 /*rlig*/, 1}, - { 0x746c6163 /*calt*/, 1}, - { 0x6167696c /*liga*/, 1}, - { 0x67696c64 /*dlig*/, 1}, - { 0x68777363 /*cswh*/, 1}, - { 0x7465736d /*mset*/, 1}, + { MS_MAKE_TAG('r','l','i','g'), 1}, + { MS_MAKE_TAG('c','a','l','t'), 1}, + { MS_MAKE_TAG('l','i','g','a'), 1}, + { MS_MAKE_TAG('d','l','i','g'), 1}, + { MS_MAKE_TAG('c','s','w','h'), 1}, + { MS_MAKE_TAG('m','s','e','t'), 1}, }; static const char* required_arabic_features[] = @@ -278,15 +278,15 @@ static const char* required_arabic_features[] = static OPENTYPE_FEATURE_RECORD hebrew_features[] = { - { 0x67696c64 /*dlig*/, 1}, + { MS_MAKE_TAG('d','l','i','g'), 1}, }; static OPENTYPE_FEATURE_RECORD syriac_features[] = { - { 0x67696c72 /*rlig*/, 1}, - { 0x746c6163 /*calt*/, 1}, - { 0x6167696c /*liga*/, 1}, - { 0x67696c64 /*dlig*/, 1}, + { MS_MAKE_TAG('r','l','i','g'), 1}, + { MS_MAKE_TAG('c','a','l','t'), 1}, + { MS_MAKE_TAG('l','i','g','a'), 1}, + { MS_MAKE_TAG('d','l','i','g'), 1}, }; static const char* required_syriac_features[] = @@ -304,25 +304,25 @@ static const char* required_syriac_features[] = static OPENTYPE_FEATURE_RECORD sinhala_features[] = { /* Base forms */ - { 0x6e686b61 /*akhn*/, 1}, - { 0x66687072 /*rphf*/, 1}, - { 0x75746176 /*vatu*/, 1}, - { 0x66747370 /*pstf*/, 1}, + { MS_MAKE_TAG('a','k','h','n'), 1}, + { MS_MAKE_TAG('r','p','h','f'), 1}, + { MS_MAKE_TAG('v','a','t','u'), 1}, + { MS_MAKE_TAG('p','s','t','f'), 1}, /* Presentation forms */ - { 0x73776c62 /*blws*/, 1}, - { 0x73766261 /*abvs*/, 1}, - { 0x73747370 /*psts*/, 1}, + { MS_MAKE_TAG('b','l','w','s'), 1}, + { MS_MAKE_TAG('a','b','v','s'), 1}, + { MS_MAKE_TAG('p','s','t','s'), 1}, }; static OPENTYPE_FEATURE_RECORD tibetan_features[] = { - { 0x73766261 /*abvs*/, 1}, - { 0x73776c62 /*blws*/, 1}, + { MS_MAKE_TAG('a','b','v','s'), 1}, + { MS_MAKE_TAG('b','l','w','s'), 1}, }; static OPENTYPE_FEATURE_RECORD thai_features[] = { - { 0x706d6363 /*ccmp*/, 1}, + { MS_MAKE_TAG('c','c','m','p'), 1}, }; static const char* required_lao_features[] =

1 0

Andrew Nguyen : windowscodecs: Trace the correct expected value in some seek test failure strings.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 9d5ef07178a661c39a758565584c45d454ca5ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5ef07178a661c39a7585655… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:17:53 2011 -0500 windowscodecs: Trace the correct expected value in some seek test failure strings. --- dlls/windowscodecs/tests/stream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index 5730995..0dbcddf 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -442,7 +442,7 @@ static void test_StreamOnStreamRange(void) /* Seek */ hr = IWICStream_Seek(pSubStream, LargeNull, STREAM_SEEK_END, &uNewPos); - ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 20, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, uBytesWritten); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 20, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 20); ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); hr = IWICStream_Seek(pSubStream, LargeNull, STREAM_SEEK_SET, &uNewPos); @@ -712,7 +712,7 @@ static void test_StreamOnStreamRange(void) hr = IWICStream_Seek(pSubStream, LargeNull, STREAM_SEEK_END, &uNewPos); ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); - ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 16, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, uBytesWritten); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 16, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 16); IWICStream_Seek(pSubStream, LargeNull, STREAM_SEEK_SET, NULL); hr = IWICStream_Read(pSubStream, Memory, 48, &uBytesRead);

1 0

Andrew Nguyen : winedbg: Eliminate a possible memory leak in input_fetch_entire_line.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 218d970bddc398a07da31631e31f7314c5ca1cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=218d970bddc398a07da31631e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:09:21 2011 -0500 winedbg: Eliminate a possible memory leak in input_fetch_entire_line. --- programs/winedbg/dbg.y | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 4f2da25..fa5e9a7 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -462,42 +462,39 @@ static HANDLE dbg_parser_output; int input_fetch_entire_line(const char* pfx, char** line) { + char* buffer; char ch; DWORD nread; size_t len, alloc; - + /* as of today, console handles can be file handles... so better use file APIs rather than * console's */ WriteFile(dbg_parser_output, pfx, strlen(pfx), &nread, NULL); - if (*line) - { - alloc = HeapSize(GetProcessHeap(), 0, *line); - assert(alloc); - } - else - { - *line = HeapAlloc(GetProcessHeap(), 0, alloc = 16); - assert(*line); - } + buffer = HeapAlloc(GetProcessHeap(), 0, alloc = 16); + assert(buffer != NULL); len = 0; do { if (!ReadFile(dbg_parser_input, &ch, 1, &nread, NULL) || nread == 0) + { + HeapFree(GetProcessHeap(), 0, buffer); return -1; + } if (len + 2 > alloc) { while (len + 2 > alloc) alloc *= 2; - *line = dbg_heap_realloc(*line, alloc); + buffer = dbg_heap_realloc(buffer, alloc); } - (*line)[len++] = ch; + buffer[len++] = ch; } while (ch != '\n'); - (*line)[len] = '\0'; + buffer[len] = '\0'; + *line = buffer; return len; }

1 0

Frédéric Delanoy : d3d10core: dxgi_format_from_wined3dformat should return DXGI_FORMAT enum values in all cases .
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 32f79acc1fc0451be8f0494171e6159c9165cb6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f79acc1fc0451be8f049417… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon May 16 09:47:24 2011 +0200 d3d10core: dxgi_format_from_wined3dformat should return DXGI_FORMAT enum values in all cases. --- dlls/d3d10core/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index 78e1348..97c0347 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -242,7 +242,7 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_B8G8R8X8_UNORM: return DXGI_FORMAT_B8G8R8X8_UNORM; default: FIXME("Unhandled wined3d format %#x.\n", format); - return WINED3DFMT_UNKNOWN; + return DXGI_FORMAT_UNKNOWN; } }

1 0

Ričardas Barkauskas : dxgi: Fix GetDisplayModeList parameter handling.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: b59b68b86da6905e7e124c755f5640d4f32044ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b59b68b86da6905e7e124c755… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon May 16 12:52:33 2011 +0300 dxgi: Fix GetDisplayModeList parameter handling. --- dlls/dxgi/output.c | 24 +++++++++++--- dlls/dxgi/tests/device.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++ include/dxgi.idl | 3 ++ 3 files changed, 103 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 46311fe..5ab7992 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -121,24 +121,38 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa enum wined3d_format_id wined3d_format; struct wined3d *wined3d; UINT i; + UINT max_count; - TRACE("iface %p, format %s, flags %#x, mode_count %p, desc %p.\n", + FIXME("iface %p, format %s, flags %#x, mode_count %p, desc %p partial stub!\n", iface, debug_dxgi_format(format), flags, mode_count, desc); + if (!mode_count) + { + return S_OK; + } + + if (format == DXGI_FORMAT_UNKNOWN) + { + *mode_count = 0; + return S_OK; + } + wined3d = IWineDXGIFactory_get_wined3d(This->adapter->parent); wined3d_format = wined3dformat_from_dxgi_format(format); + EnterCriticalSection(&dxgi_cs); + max_count = wined3d_get_adapter_mode_count(wined3d, This->adapter->ordinal, wined3d_format); + if (!desc) { - EnterCriticalSection(&dxgi_cs); - *mode_count = wined3d_get_adapter_mode_count(wined3d, This->adapter->ordinal, wined3d_format); wined3d_decref(wined3d); LeaveCriticalSection(&dxgi_cs); - + *mode_count = max_count; return S_OK; } - EnterCriticalSection(&dxgi_cs); + *mode_count = min(*mode_count,max_count); + for (i = 0; i < *mode_count; ++i) { WINED3DDISPLAYMODE mode; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index ef86b34..fa97fdd 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -212,6 +212,86 @@ static void test_parents(IDXGIDevice *device) IDXGIAdapter_Release(adapter); } +static void test_output(IDXGIDevice *device) +{ + IDXGIAdapter *adapter; + HRESULT hr; + IDXGIOutput *output; + UINT mode_count, mode_count_comp, i; + DXGI_MODE_DESC *modes; + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Adapter has not outputs, skipping output tests.\n"); + IDXGIAdapter_Release(adapter); + return; + } + + ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr); + + IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + + IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + mode_count_comp = mode_count; + + IDXGIOutput_GetDisplayModeList(output, 0, 0, &mode_count, NULL); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(!mode_count, "Expected 0 got %d\n", mode_count); + + IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, NULL); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(mode_count >= mode_count_comp, "Flag implies trying to enumerate more modes\n"); + mode_count_comp = mode_count; + + modes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DXGI_MODE_DESC) * mode_count+10); + + IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, NULL, modes); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(!modes[0].Height, "No output was expected\n"); + + mode_count = 0; + IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(!modes[0].Height, "No output was expected\n"); + + mode_count = mode_count_comp; + IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(mode_count == mode_count_comp, "Expected %d, got %d\n", mode_count_comp, mode_count); + + for (i = 0; i < mode_count; i++) + { + ok(modes[i].Height && modes[i].Width, "Proper mode was expected\n"); + } + + mode_count += 5; + IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(mode_count == mode_count_comp, "Expected %d, got %d\n", mode_count_comp, mode_count); + + if (mode_count_comp) + { + mode_count = mode_count_comp - 1; + IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(mode_count == mode_count_comp -1, "Expected %d, got %d\n", mode_count_comp, mode_count); + } + else + { + skip("Not enough modes for test, skipping\n"); + } + + HeapFree(GetProcessHeap(), 0, modes); + IDXGIOutput_Release(output); + IDXGIAdapter_Release(adapter); +} + START_TEST(device) { HMODULE d3d10core = LoadLibraryA("d3d10core.dll"); @@ -236,6 +316,7 @@ START_TEST(device) test_device_interfaces(device); test_create_surface(device); test_parents(device); + test_output(device); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left\n", refcount); diff --git a/include/dxgi.idl b/include/dxgi.idl index 8a7b092..8652a2c 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -59,6 +59,9 @@ const DXGI_USAGE DXGI_USAGE_BACK_BUFFER = 0x40L; const DXGI_USAGE DXGI_USAGE_SHARED = 0x80L; const DXGI_USAGE DXGI_USAGE_READ_ONLY = 0x100L; +const UINT DXGI_ENUM_MODES_INTERLACED = 1; +const UINT DXGI_ENUM_MODES_SCALING = 2; + typedef enum DXGI_SWAP_EFFECT { DXGI_SWAP_EFFECT_DISCARD = 0, DXGI_SWAP_EFFECT_SEQUENTIAL = 1,

1 0