August 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Add a magic number to validate timer queue pointers.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 2810c5647f70bfaca2f76f3f72553fb2bbaae879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2810c5647f70bfaca2f76f3f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 20 20:13:58 2013 +0200 ntdll: Add a magic number to validate timer queue pointers. --- dlls/ntdll/threadpool.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index e33a025..4edd069 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -553,6 +553,7 @@ struct queue_timer struct timer_queue { + DWORD magic; RTL_CRITICAL_SECTION cs; struct list timers; /* sorted by expiration time */ BOOL quit; /* queue should be deleted; once set, never unset */ @@ -561,6 +562,7 @@ struct timer_queue }; #define EXPIRE_NEVER (~(ULONGLONG) 0) +#define TIMER_QUEUE_MAGIC 0x516d6954 /* TimQ */ static void queue_remove_timer(struct queue_timer *t) { @@ -748,6 +750,7 @@ static void WINAPI timer_queue_thread_proc(LPVOID p) NtClose(q->event); RtlDeleteCriticalSection(&q->cs); + q->magic = 0; RtlFreeHeap(GetProcessHeap(), 0, q); } @@ -788,6 +791,7 @@ NTSTATUS WINAPI RtlCreateTimerQueue(PHANDLE NewTimerQueue) RtlInitializeCriticalSection(&q->cs); list_init(&q->timers); q->quit = FALSE; + q->magic = TIMER_QUEUE_MAGIC; status = NtCreateEvent(&q->event, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE); if (status != STATUS_SUCCESS) { @@ -830,7 +834,7 @@ NTSTATUS WINAPI RtlDeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) HANDLE thread; NTSTATUS status; - if (!q) + if (!q || q->magic != TIMER_QUEUE_MAGIC) return STATUS_INVALID_HANDLE; thread = q->thread; @@ -925,8 +929,9 @@ NTSTATUS WINAPI RtlCreateTimer(PHANDLE NewTimer, HANDLE TimerQueue, NTSTATUS status; struct queue_timer *t; struct timer_queue *q = get_timer_queue(TimerQueue); - if (!q) - return STATUS_NO_MEMORY; + + if (!q) return STATUS_NO_MEMORY; + if (q->magic != TIMER_QUEUE_MAGIC) return STATUS_INVALID_HANDLE; t = RtlAllocateHeap(GetProcessHeap(), 0, sizeof *t); if (!t)

1 0

Alexandre Julliard : ntdll: Silence some printf format warnings.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: c2d7347e2a0c1a59a25817660d233f858dd52b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d7347e2a0c1a59a25817660… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 20 20:51:19 2013 +0200 ntdll: Silence some printf format warnings. --- dlls/ntdll/signal_x86_64.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f5a8ec9..8bcf71b 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1826,7 +1826,7 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun if (is_inside_signal_stack( stack )) { ERR( "nested exception on signal stack in thread %04x eip %016lx esp %016lx stack %p-%p\n", - GetCurrentThreadId(), RIP_sig(sigcontext), RSP_sig(sigcontext), + GetCurrentThreadId(), (ULONG_PTR)RIP_sig(sigcontext), (ULONG_PTR)RSP_sig(sigcontext), NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); abort_thread(1); } @@ -1836,7 +1836,7 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun (char *)stack > (char *)NtCurrentTeb()->Tib.StackBase) { WARN( "exception outside of stack limits in thread %04x eip %016lx esp %016lx stack %p-%p\n", - GetCurrentThreadId(), RIP_sig(sigcontext), RSP_sig(sigcontext), + GetCurrentThreadId(), (ULONG_PTR)RIP_sig(sigcontext), (ULONG_PTR)RSP_sig(sigcontext), NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); } else if ((char *)(stack - 1) < (char *)NtCurrentTeb()->DeallocationStack + 4096) @@ -1844,8 +1844,8 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun /* stack overflow on last page, unrecoverable */ UINT diff = (char *)NtCurrentTeb()->DeallocationStack + 4096 - (char *)(stack - 1); ERR( "stack overflow %u bytes in thread %04x eip %016lx esp %016lx stack %p-%p-%p\n", - diff, GetCurrentThreadId(), RIP_sig(sigcontext), - RSP_sig(sigcontext), NtCurrentTeb()->DeallocationStack, + diff, GetCurrentThreadId(), (ULONG_PTR)RIP_sig(sigcontext), + (ULONG_PTR)RSP_sig(sigcontext), NtCurrentTeb()->DeallocationStack, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); abort_thread(1); } @@ -1857,8 +1857,8 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun { UINT diff = (char *)NtCurrentTeb()->Tib.StackLimit - (char *)(stack - 1); ERR( "stack overflow %u bytes in thread %04x eip %016lx esp %016lx stack %p-%p-%p\n", - diff, GetCurrentThreadId(), RIP_sig(sigcontext), - RSP_sig(sigcontext), NtCurrentTeb()->DeallocationStack, + diff, GetCurrentThreadId(), (ULONG_PTR)RIP_sig(sigcontext), + (ULONG_PTR)RSP_sig(sigcontext), NtCurrentTeb()->DeallocationStack, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); abort_thread(1); } @@ -2255,7 +2255,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec->ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; break; default: - ERR( "Got unexpected trap %ld\n", TRAP_sig(ucontext) ); + ERR( "Got unexpected trap %ld\n", (ULONG_PTR)TRAP_sig(ucontext) ); /* fall through */ case TRAP_x86_NMI: /* NMI interrupt */ case TRAP_x86_DNA: /* Device not available exception */

1 0

Dmitry Timoshkov : ntdll: Last parameter of NtSetIoCompletion is 64-bit on 64-bit platforms.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 7cab2e99c314b08fa4d81e82b32035d7293f4327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cab2e99c314b08fa4d81e82b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 20 20:20:39 2013 +0900 ntdll: Last parameter of NtSetIoCompletion is 64-bit on 64-bit platforms. --- dlls/ntdll/sync.c | 4 ++-- dlls/ntdll/tests/file.c | 14 +++++++++++--- include/winternl.h | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 58dde65..7e3b57f 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1297,11 +1297,11 @@ NTSTATUS WINAPI NtCreateIoCompletion( PHANDLE CompletionPort, ACCESS_MASK Desire */ NTSTATUS WINAPI NtSetIoCompletion( HANDLE CompletionPort, ULONG_PTR CompletionKey, ULONG_PTR CompletionValue, NTSTATUS Status, - ULONG NumberOfBytesTransferred ) + SIZE_T NumberOfBytesTransferred ) { NTSTATUS status; - TRACE("(%p, %lx, %lx, %x, %d)\n", CompletionPort, CompletionKey, + TRACE("(%p, %lx, %lx, %x, %lx)\n", CompletionPort, CompletionKey, CompletionValue, Status, NumberOfBytesTransferred); SERVER_START_REQ( add_completion ) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 3a1efdd..77a8431 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -72,7 +72,7 @@ static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_AT static NTSTATUS (WINAPI *pNtOpenIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI *pNtQueryIoCompletion)(HANDLE, IO_COMPLETION_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtRemoveIoCompletion)(HANDLE, PULONG_PTR, PULONG_PTR, PIO_STATUS_BLOCK, PLARGE_INTEGER); -static NTSTATUS (WINAPI *pNtSetIoCompletion)(HANDLE, ULONG_PTR, ULONG_PTR, NTSTATUS, ULONG); +static NTSTATUS (WINAPI *pNtSetIoCompletion)(HANDLE, ULONG_PTR, ULONG_PTR, NTSTATUS, SIZE_T); static NTSTATUS (WINAPI *pNtSetInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, FILE_INFORMATION_CLASS); static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, FILE_INFORMATION_CLASS); static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK, @@ -990,8 +990,11 @@ static void test_iocp_setcompletion(HANDLE h) { NTSTATUS res; ULONG count; + SIZE_T size = 3; - res = pNtSetIoCompletion( h, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, 3 ); + if (sizeof(size) > 4) size |= (ULONGLONG)0x12345678 << 32; + + res = pNtSetIoCompletion( h, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, size ); ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %x\n", res ); count = get_pending_msgs(h); @@ -1000,7 +1003,12 @@ static void test_iocp_setcompletion(HANDLE h) if (get_msg(h)) { ok( completionKey == CKEY_FIRST, "Invalid completion key: %lx\n", completionKey ); - ok( ioSb.Information == 3, "Invalid ioSb.Information: %ld\n", ioSb.Information ); + /* FIXME: Remove once Wine is fixed */ + if (sizeof(size) > 4) +todo_wine + ok( ioSb.Information == size, "Invalid ioSb.Information: %lu\n", ioSb.Information ); + else + ok( ioSb.Information == size, "Invalid ioSb.Information: %lu\n", ioSb.Information ); ok( U(ioSb).Status == STATUS_INVALID_DEVICE_REQUEST, "Invalid ioSb.Status: %x\n", U(ioSb).Status); ok( completionValue == CVALUE_FIRST, "Invalid completion value: %lx\n", completionValue ); } diff --git a/include/winternl.h b/include/winternl.h index 07ebbab..d3c1ce8 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2208,7 +2208,7 @@ NTSYSAPI NTSTATUS WINAPI NtSetInformationProcess(HANDLE,PROCESS_INFORMATION_CLA NTSYSAPI NTSTATUS WINAPI NtSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetInformationToken(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetIntervalProfile(ULONG,KPROFILE_SOURCE); -NTSYSAPI NTSTATUS WINAPI NtSetIoCompletion(HANDLE,ULONG_PTR,ULONG_PTR,NTSTATUS,ULONG); +NTSYSAPI NTSTATUS WINAPI NtSetIoCompletion(HANDLE,ULONG_PTR,ULONG_PTR,NTSTATUS,SIZE_T); NTSYSAPI NTSTATUS WINAPI NtSetLdtEntries(ULONG,LDT_ENTRY,ULONG,LDT_ENTRY); NTSYSAPI NTSTATUS WINAPI NtSetLowEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetLowWaitHighEventPair(HANDLE);

1 0

Dmitry Timoshkov : ntdll/tests: Check WriteFile return values.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 87db683aad87de07f0f3ef8ae5e46d9c624abeca URL: http://source.winehq.org/git/wine.git/?a=commit;h=87db683aad87de07f0f3ef8ae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 20 20:21:27 2013 +0900 ntdll/tests: Check WriteFile return values. --- dlls/ntdll/tests/file.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 77a8431..cc0b5c2 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -505,7 +505,8 @@ static void read_file_test(void) ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); ok( !apc_count, "apc was called\n" ); - WriteFile( write, buffer, 1, &written, NULL ); + ret = WriteFile( write, buffer, 1, &written, NULL ); + ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* iosb updated here by async i/o */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); @@ -530,7 +531,8 @@ static void read_file_test(void) ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); ok( !apc_count, "apc was called\n" ); - WriteFile( write, buffer, 1, &written, NULL ); + ret = WriteFile( write, buffer, 1, &written, NULL ); + ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* iosb updated here by async i/o */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); @@ -548,7 +550,8 @@ static void read_file_test(void) U(iosb).Status = 0xdeadbabe; iosb.Information = 0xdeadbeef; ResetEvent( event ); - WriteFile( write, buffer, 1, &written, NULL ); + ret = WriteFile( write, buffer, 1, &written, NULL ); + ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); status = pNtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); @@ -571,7 +574,8 @@ static void read_file_test(void) ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); ok( !apc_count, "apc was called\n" ); - WriteFile( write, buffer, 1, &written, NULL ); + ret = WriteFile( write, buffer, 1, &written, NULL ); + ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* partial read is good enough */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( is_signaled( event ), "event is signaled\n" );

1 0

Dmitry Timoshkov : ntdll/tests: Use official path for temporary files instead of current directory.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: fca3231914561cf7502af10e9688078d5b435121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca3231914561cf7502af10e9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 20 20:22:08 2013 +0900 ntdll/tests: Use official path for temporary files instead of current directory. --- dlls/ntdll/tests/file.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index cc0b5c2..7771795 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -863,9 +863,10 @@ static void append_file_test(void) NTSTATUS status; IO_STATUS_BLOCK iosb; DWORD written; - char buffer[128]; + char path[MAX_PATH], buffer[MAX_PATH]; - GetTempFileNameA( ".", "foo", 0, buffer ); + GetTempPathA( MAX_PATH, path ); + GetTempFileNameA( path, "foo", 0, buffer ); /* It is possible to open a file with only FILE_APPEND_DATA access flags. It matches the O_WRONLY|O_APPEND open() posix behavior */ handle = CreateFileA(buffer, FILE_APPEND_DATA, 0, NULL, CREATE_ALWAYS, @@ -1872,7 +1873,6 @@ static void test_NtCreateFile(void) /*18*/{ FILE_SUPERSEDE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, TRUE } }; static const WCHAR fooW[] = {'f','o','o',0}; - static const WCHAR dotW[] = {'.',0}; NTSTATUS status; HANDLE handle; WCHAR path[MAX_PATH]; @@ -1881,7 +1881,8 @@ static void test_NtCreateFile(void) UNICODE_STRING nameW; DWORD ret, i; - GetTempFileNameW(dotW, fooW, 0, path); + GetTempPathW(MAX_PATH, path); + GetTempFileNameW(path, fooW, 0, path); DeleteFileW(path); pRtlDosPathNameToNtPathName_U(path, &nameW, NULL, NULL);

1 0

Michael Stefaniuc : winedbg: Fix the return type of read_input(); it is never negative.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 4cf489f9ceb9f99ed33be527479944dae935570b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cf489f9ceb9f99ed33be5274… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 20 00:13:42 2013 +0200 winedbg: Fix the return type of read_input(); it is never negative. --- programs/winedbg/debug.l | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index a6ab10c..ef7a2eb 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -61,7 +61,7 @@ void lexeme_flush(void) next_lexeme = 0; } -static int read_input(const char* pfx, char* buf, int size) +static size_t read_input(const char* pfx, char* buf, int size) { int len; static char* last_line = NULL; @@ -107,8 +107,7 @@ static int read_input(const char* pfx, char* buf, int size) } #define YY_INPUT(buf,result,max_size) \ - if ((result = read_input("Wine-dbg>", buf, max_size)) < 0) \ - YY_FATAL_ERROR("read_input in flex scanner failed"); + (result = read_input("Wine-dbg>", buf, max_size)) static int syntax_error; %}

1 0

Vincent Povirk : riched20: Use \ulnone instead of \ul0 for no underline.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: d04d1c17369887c365174c062d2975d957509980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04d1c17369887c365174c062… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 19 17:31:38 2013 -0500 riched20: Use \ulnone instead of \ul0 for no underline. --- dlls/riched20/writer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 6a4538c..ea797fd 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -680,7 +680,7 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) break; case CFU_UNDERLINENONE: default: - strcat(props, "\\ul0"); + strcat(props, "\\ulnone"); break; } else if (fmt->dwEffects & CFE_UNDERLINE)

1 0

Henri Verbeet : wined3d: Store the original display mode in the swapchain.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 7e7bd87b2cf2786f858a5d14a4611c34102bbbfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7bd87b2cf2786f858a5d14a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 20 10:20:09 2013 +0200 wined3d: Store the original display mode in the swapchain. --- dlls/wined3d/device.c | 6 +----- dlls/wined3d/swapchain.c | 39 ++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 14 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1db04b4..1ab93a3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5012,11 +5012,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } else if (swapchain_desc->windowed) { - m.width = swapchain->orig_width; - m.height = swapchain->orig_height; - m.refresh_rate = 0; - m.format_id = swapchain->desc.backbuffer_format; - m.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + m = swapchain->original_mode; } else { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f6cfc2e..47ee901 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -30,7 +30,6 @@ WINE_DECLARE_DEBUG_CHANNEL(fps); /* Do not call while under the GL lock. */ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) { - struct wined3d_display_mode mode; HRESULT hr; UINT i; @@ -76,13 +75,8 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) * orig_height will be equal to the modes in the presentation params. */ if (!swapchain->desc.windowed && swapchain->desc.auto_restore_display_mode) { - mode.width = swapchain->orig_width; - mode.height = swapchain->orig_height; - mode.refresh_rate = 0; - mode.format_id = swapchain->orig_fmt; - mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; if (FAILED(hr = wined3d_set_adapter_display_mode(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, &mode))) + swapchain->device->adapter->ordinal, &swapchain->original_mode))) ERR("Failed to restore display mode, hr %#x.\n", hr); } @@ -818,8 +812,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 { const struct wined3d_adapter *adapter = device->adapter; struct wined3d_resource_desc surface_desc; - const struct wined3d_format *format; - struct wined3d_display_mode mode; BOOL displaymode_set = FALSE; RECT client_rect; HWND window; @@ -853,11 +845,12 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 swapchain->win_handle = window; swapchain->device_window = window; - wined3d_get_adapter_display_mode(device->wined3d, adapter->ordinal, &mode, NULL); - swapchain->orig_width = mode.width; - swapchain->orig_height = mode.height; - swapchain->orig_fmt = mode.format_id; - format = wined3d_get_format(&adapter->gl_info, mode.format_id); + if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, + adapter->ordinal, &swapchain->original_mode, NULL))) + { + ERR("Failed to get current display mode, hr %#x.\n", hr); + goto err; + } GetClientRect(window, &client_rect); if (desc->windowed @@ -879,8 +872,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 if (desc->backbuffer_format == WINED3DFMT_UNKNOWN) { - desc->backbuffer_format = swapchain->orig_fmt; - TRACE("Updating format to %s.\n", debug_d3dformat(swapchain->orig_fmt)); + desc->backbuffer_format = swapchain->original_mode.format_id; + TRACE("Updating format to %s.\n", debug_d3dformat(swapchain->original_mode.format_id)); } } swapchain->desc = *desc; @@ -1040,18 +1033,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 err: if (displaymode_set) { - DEVMODEW devmode; - + if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, + adapter->ordinal, &swapchain->original_mode))) + ERR("Failed to restore display mode.\n"); ClipCursor(NULL); - - /* Change the display settings */ - memset(&devmode, 0, sizeof(devmode)); - devmode.dmSize = sizeof(devmode); - devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - devmode.dmBitsPerPel = format->byte_count * CHAR_BIT; - devmode.dmPelsWidth = swapchain->orig_width; - devmode.dmPelsHeight = swapchain->orig_height; - ChangeDisplaySettingsExW(adapter->DeviceName, &devmode, NULL, CDS_FULLSCREEN, NULL); } if (swapchain->back_buffers) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cee9651..49aacc1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2543,8 +2543,7 @@ struct wined3d_swapchain struct wined3d_surface **back_buffers; struct wined3d_surface *front_buffer; struct wined3d_swapchain_desc desc; - DWORD orig_width, orig_height; - enum wined3d_format_id orig_fmt; + struct wined3d_display_mode original_mode; struct wined3d_gamma_ramp orig_gamma; BOOL render_to_fbo; const struct wined3d_format *ds_format;

1 0

Henri Verbeet : d3d9: Always create textures for surfaces.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: d0c9dbe7633c0618660dcf85bb8e6bc7f367a8e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0c9dbe7633c0618660dcf85b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 20 10:20:10 2013 +0200 d3d9: Always create textures for surfaces. --- dlls/d3d9/device.c | 72 +++++++++++++++++++++++++++++++++++---------------- 1 files changed, 49 insertions(+), 23 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 738a274..261591b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -25,6 +25,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); +static void STDMETHODCALLTYPE d3d9_null_wined3d_object_destroyed(void *parent) {} + +static const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops = +{ + d3d9_null_wined3d_object_destroyed, +}; + D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) { BYTE *c = (BYTE *)&format; @@ -909,7 +916,10 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width D3DFORMAT format, DWORD flags, IDirect3DSurface9 **surface, UINT usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) { - struct d3d9_surface *object; + struct wined3d_resource *sub_resource; + struct wined3d_resource_desc desc; + struct d3d9_surface *surface_impl; + struct wined3d_texture *texture; HRESULT hr; TRACE("device %p, width %u, height %u, format %#x, flags %#x, surface %p.\n" @@ -917,22 +927,36 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width device, width, height, format, flags, surface, usage, pool, multisample_type, multisample_quality); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - FIXME("Failed to allocate surface memory.\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } + desc.resource_type = WINED3D_RTYPE_TEXTURE; + desc.format = wined3dformat_from_d3dformat(format); + desc.multisample_type = multisample_type; + desc.multisample_quality = multisample_quality; + desc.usage = usage & WINED3DUSAGE_MASK; + desc.pool = pool; + desc.width = width; + desc.height = height; + desc.depth = 1; + desc.size = 0; - if (FAILED(hr = surface_init(object, device, width, height, format, - flags, usage, pool, multisample_type, multisample_quality))) + wined3d_mutex_lock(); + + if (FAILED(hr = wined3d_texture_create_2d(device->wined3d_device, &desc, + 1, flags, NULL, &d3d9_null_wined3d_parent_ops, &texture))) { - WARN("Failed to initialize surface, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); + WARN("Failed to create texture, hr %#x.\n", hr); return hr; } - TRACE("Created surface %p.\n", object); - *surface = &object->IDirect3DSurface9_iface; + sub_resource = wined3d_texture_get_sub_resource(texture, 0); + surface_impl = wined3d_resource_get_parent(sub_resource); + surface_impl->forwardReference = NULL; + surface_impl->parent_device = &device->IDirect3DDevice9Ex_iface; + *surface = &surface_impl->IDirect3DSurface9_iface; + IDirect3DSurface9_AddRef(*surface); + wined3d_texture_decref(texture); + + wined3d_mutex_unlock(); return D3D_OK; } @@ -1989,13 +2013,6 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface return hr; } -static void STDMETHODCALLTYPE d3d9_null_wined3d_object_destroyed(void *parent) {} - -static const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops = -{ - d3d9_null_wined3d_object_destroyed, -}; - /* The caller is responsible for wined3d locking */ static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UINT min_size) { @@ -3292,14 +3309,23 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ TRACE("device_parent %p, container_parent %p, desc %p, sub_resource_idx %u, flags %#x, surface %p.\n", device_parent, container_parent, desc, sub_resource_idx, flags, surface); - if (FAILED(hr = d3d9_device_create_surface(device, desc->width, desc->height, - d3dformat_from_wined3dformat(desc->format), flags, (IDirect3DSurface9 **)&d3d_surface, - desc->usage, desc->pool, desc->multisample_type, desc->multisample_quality))) + if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) { - WARN("Failed to create surface, hr %#x.\n", hr); + FIXME("Failed to allocate surface memory.\n"); + return D3DERR_OUTOFVIDEOMEMORY; + } + + if (FAILED(hr = surface_init(d3d_surface, device, desc->width, desc->height, + d3dformat_from_wined3dformat(desc->format), flags, desc->usage, desc->pool, + desc->multisample_type, desc->multisample_quality))) + { + WARN("Failed to initialize surface, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, d3d_surface); return hr; } + TRACE("Created surface %p.\n", d3d_surface); + *surface = d3d_surface->wined3d_surface; wined3d_surface_incref(*surface);

1 0

Henri Verbeet : d3d8: Always create textures for surfaces.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 133bfe29e4b5d70e5e962dbce2f5e56f8264a83c URL: http://source.winehq.org/git/wine.git/?a=commit;h=133bfe29e4b5d70e5e962dbce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 20 10:20:11 2013 +0200 d3d8: Always create textures for surfaces. --- dlls/d3d8/device.c | 72 +++++++++++++++++++++++++++++++++++---------------- 1 files changed, 49 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2f09a4f..e2a6af9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -36,6 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); +static void STDMETHODCALLTYPE d3d8_null_wined3d_object_destroyed(void *parent) {} + +static const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops = +{ + d3d8_null_wined3d_object_destroyed, +}; + D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) { BYTE *c = (BYTE *)&format; @@ -871,7 +878,10 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width D3DFORMAT format, DWORD flags, IDirect3DSurface8 **surface, UINT usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) { - struct d3d8_surface *object; + struct wined3d_resource *sub_resource; + struct wined3d_resource_desc desc; + struct d3d8_surface *surface_impl; + struct wined3d_texture *texture; HRESULT hr; TRACE("device %p, width %u, height %u, format %#x, flags %#x, surface %p,\n" @@ -879,22 +889,36 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width device, width, height, format, flags, surface, usage, pool, multisample_type, multisample_quality); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - FIXME("Failed to allocate surface memory.\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } + desc.resource_type = WINED3D_RTYPE_TEXTURE; + desc.format = wined3dformat_from_d3dformat(format); + desc.multisample_type = multisample_type; + desc.multisample_quality = multisample_quality; + desc.usage = usage & WINED3DUSAGE_MASK; + desc.pool = pool; + desc.width = width; + desc.height = height; + desc.depth = 1; + desc.size = 0; - if (FAILED(hr = surface_init(object, device, width, height, format, - flags, usage, pool, multisample_type, multisample_quality))) + wined3d_mutex_lock(); + + if (FAILED(hr = wined3d_texture_create_2d(device->wined3d_device, &desc, + 1, flags, NULL, &d3d8_null_wined3d_parent_ops, &texture))) { - WARN("Failed to initialize surface, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); + WARN("Failed to create texture, hr %#x.\n", hr); return hr; } - TRACE("Created surface %p.\n", object); - *surface = &object->IDirect3DSurface8_iface; + sub_resource = wined3d_texture_get_sub_resource(texture, 0); + surface_impl = wined3d_resource_get_parent(sub_resource); + surface_impl->forwardReference = NULL; + surface_impl->parent_device = &device->IDirect3DDevice8_iface; + *surface = &surface_impl->IDirect3DSurface8_iface; + IDirect3DSurface8_AddRef(*surface); + wined3d_texture_decref(texture); + + wined3d_mutex_unlock(); return D3D_OK; } @@ -1910,13 +1934,6 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, return hr; } -static void STDMETHODCALLTYPE d3d8_null_wined3d_object_destroyed(void *parent) {} - -static const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops = -{ - d3d8_null_wined3d_object_destroyed, -}; - /* The caller is responsible for wined3d locking */ static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UINT min_size) { @@ -2907,14 +2924,23 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ TRACE("device_parent %p, container_parent %p, desc %p, sub_resource_idx %u, flags %#x, surface %p.\n", device_parent, container_parent, desc, sub_resource_idx, flags, surface); - if (FAILED(hr = d3d8_device_create_surface(device, desc->width, desc->height, - d3dformat_from_wined3dformat(desc->format), flags, (IDirect3DSurface8 **)&d3d_surface, - desc->usage, desc->pool, desc->multisample_type, desc->multisample_quality))) + if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) { - WARN("Failed to create surface, hr %#x.\n", hr); + FIXME("Failed to allocate surface memory.\n"); + return D3DERR_OUTOFVIDEOMEMORY; + } + + if (FAILED(hr = surface_init(d3d_surface, device, desc->width, desc->height, + d3dformat_from_wined3dformat(desc->format), flags, desc->usage, desc->pool, + desc->multisample_type, desc->multisample_quality))) + { + WARN("Failed to initialize surface, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, d3d_surface); return hr; } + TRACE("Created surface %p.\n", d3d_surface); + *surface = d3d_surface->wined3d_surface; wined3d_surface_incref(*surface);

1 0