wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

André Hentschel : ws2_32/tests: Turn a randomly behaving test into a trace.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 64732ccab43aca40f27cfbda34befddc8594ab7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64732ccab43aca40f27cfbda3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 25 15:18:37 2016 +0200 ws2_32/tests: Turn a randomly behaving test into a trace. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ed31f25..d47c175 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -638,14 +638,14 @@ static VOID WINAPI oob_server ( server_params *par ) ok ( n_sent == n_expected, "oob_server (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); - /* Receive a part of the out-of-band data and check atmark state */ + /* Receive a part of the out-of-band data and print atmark state */ n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, 8, 0, par->buflen ); ok ( n_recvd == 8, "oob_server (%x): received less data than expected: %d of %d\n", id, n_recvd, 8 ); n_expected -= 8; ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); - todo_wine ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark ); + trace( "oob_server (%x): %s the OOB mark: %i\n", id, atmark == 1 ? "not at" : "at", atmark ); /* Receive the rest of the out-of-band data and check atmark state */ do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, 0, par->buflen );

1 0

Piotr Caban : msvcrt: Improve x86_64 nested exceptions handling.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: d9bacd98d8d23aefdd22755dc1ac4e3c67002921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9bacd98d8d23aefdd22755dc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 5 14:28:45 2016 +0200 msvcrt: Improve x86_64 nested exceptions handling. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 48 ++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 0379d30..d6d4b04 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -339,6 +339,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, ULONG64 exc_base = (rec->NumberParameters == 4 ? rec->ExceptionInformation[3] : 0); int trylevel = ip_to_state(rva_to_ptr(descr->ipmap, dispatch->ImageBase), descr->ipmap_count, dispatch->ControlPc-dispatch->ImageBase); + const tryblock_info *in_catch; EXCEPTION_RECORD catch_record; CONTEXT context; UINT i, j; @@ -374,24 +375,38 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, } } + for (i=descr->tryblock_count; i>0; i--) + { + in_catch = rva_to_ptr(descr->tryblock, dispatch->ImageBase); + in_catch = &in_catch[i-1]; + + if (trylevel>in_catch->end_level && trylevel<=in_catch->catch_level) + break; + } + if (!i) + in_catch = NULL; + unwind_help = rva_to_ptr(descr->unwind_help, orig_frame); - unwind_help[0] = trylevel; - TRACE("current trylevel: %d, last catch block: %d\n", trylevel, unwind_help[1]); + if (trylevel > unwind_help[1]) + unwind_help[0] = unwind_help[1] = trylevel; + else + trylevel = unwind_help[1]; + TRACE("current trylevel: %d\n", trylevel); for (i=0; i<descr->tryblock_count; i++) { const tryblock_info *tryblock = rva_to_ptr(descr->tryblock, dispatch->ImageBase); tryblock = &tryblock[i]; - if (unwind_help[1] != -1) - { - if (unwind_help[1] < tryblock->start_level) continue; - if (unwind_help[1] > tryblock->end_level) continue; - } - if (trylevel < tryblock->start_level) continue; if (trylevel > tryblock->end_level) continue; + if (in_catch) + { + if(tryblock->start_level <= in_catch->end_level) continue; + if(tryblock->end_level > in_catch->catch_level) continue; + } + /* got a try block */ for (j=0; j<tryblock->catchblock_count; j++) { @@ -419,8 +434,6 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, TRACE("found catch(...) block\n"); } - unwind_help[1] = tryblock->end_level+1; - /* unwind stack and call catch */ memset(&catch_record, 0, sizeof(catch_record)); catch_record.ExceptionCode = STATUS_UNWIND_CONSOLIDATE; @@ -433,7 +446,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, catch_record.ExceptionInformation[4] = (ULONG_PTR)rec; catch_record.ExceptionInformation[5] = (ULONG_PTR)rva_to_ptr(catchblock->handler, dispatch->ImageBase); - RtlUnwindEx((void*)orig_frame, 0, &catch_record, NULL, &context, NULL); + RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &context, NULL); } } @@ -460,15 +473,22 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, ULONG64 orig_frame = rec->ExceptionInformation[1]; const cxx_function_descr *descr = (void*)rec->ExceptionInformation[2]; int end_level = rec->ExceptionInformation[3]; + EXCEPTION_RECORD *new_rec = (void*)rec->ExceptionInformation[4]; + thread_data_t *data = msvcrt_get_thread_data(); frame_info *cur; cxx_local_unwind(orig_frame, dispatch, descr, end_level); /* FIXME: we should only unregister frames registered by call_catch_block here */ - for (cur = msvcrt_get_thread_data()->frame_info_head; cur; cur = cur->next) + for (cur = data->frame_info_head; cur; cur = cur->next) { - if ((ULONG64)cur > frame) - __CxxUnregisterExceptionObject((cxx_frame_info*)cur, FALSE); + if ((ULONG64)cur <= frame) + { + __CxxUnregisterExceptionObject((cxx_frame_info*)cur, + new_rec->ExceptionCode == CXX_EXCEPTION && + data->exc_record->ExceptionCode == CXX_EXCEPTION && + new_rec->ExceptionInformation[1] == data->exc_record->ExceptionInformation[1]); + } } return ExceptionContinueSearch; }

1 0

Piotr Caban : ntdll: Add RtlRestoreContext implementation.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 4c50ef699564f7d7ab5ab78e082af6da4ab62b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c50ef699564f7d7ab5ab78e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 5 16:24:33 2016 +0200 ntdll: Add RtlRestoreContext implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_x86_64.c | 72 ++++++++++++++++++++++++--------------------- 3 files changed, 41 insertions(+), 34 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0fc4dcb..3874b3e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1293,7 +1293,7 @@ @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -arch=arm -register RtlRaiseException(ptr) ntdll.RtlRaiseException -# @ stub -arch=x86_64 RtlRestoreContext +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind @ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4737b06..34b4b4a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -838,6 +838,7 @@ @ stdcall RtlRemoveVectoredContinueHandler(ptr) @ stdcall RtlRemoveVectoredExceptionHandler(ptr) @ stub RtlResetRtlTranslations +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) @ stdcall RtlRestoreLastWin32Error(long) RtlSetLastWin32Error @ stub RtlRevertMemoryStream @ stub RtlRunDecodeUnicodeString diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ca3e6ca..1db3a23 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3437,6 +3437,44 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") +/******************************************************************* + * RtlRestoreContext (NTDLL.@) + */ +void WINAPI RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) +{ + if (rec && rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) + { + struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; + context->Rbx = jmp->Rbx; + context->Rsp = jmp->Rsp; + context->Rbp = jmp->Rbp; + context->Rsi = jmp->Rsi; + context->Rdi = jmp->Rdi; + context->R12 = jmp->R12; + context->R13 = jmp->R13; + context->R14 = jmp->R14; + context->R15 = jmp->R15; + context->u.s.Xmm6 = jmp->Xmm6; + context->u.s.Xmm7 = jmp->Xmm7; + context->u.s.Xmm8 = jmp->Xmm8; + context->u.s.Xmm9 = jmp->Xmm9; + context->u.s.Xmm10 = jmp->Xmm10; + context->u.s.Xmm11 = jmp->Xmm11; + context->u.s.Xmm12 = jmp->Xmm12; + context->u.s.Xmm13 = jmp->Xmm13; + context->u.s.Xmm14 = jmp->Xmm14; + context->u.s.Xmm15 = jmp->Xmm15; + } + else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) + { + PVOID (CALLBACK *consolidate)(EXCEPTION_RECORD *) = (void *)rec->ExceptionInformation[0]; + TRACE( "calling consolidate callback %p (rec=%p)\n", consolidate, rec ); + context->Rip = (ULONG64)call_consolidate_callback( context, consolidate, rec ); + } + TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp ); + set_cpu_context( context ); +} + /******************************************************************* * RtlUnwindEx (NTDLL.@) @@ -3597,41 +3635,9 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec *context = new_context; } - if (rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) - { - struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; - context->Rbx = jmp->Rbx; - context->Rsp = jmp->Rsp; - context->Rbp = jmp->Rbp; - context->Rsi = jmp->Rsi; - context->Rdi = jmp->Rdi; - context->R12 = jmp->R12; - context->R13 = jmp->R13; - context->R14 = jmp->R14; - context->R15 = jmp->R15; - context->Rip = jmp->Rip; - context->u.s.Xmm6 = jmp->Xmm6; - context->u.s.Xmm7 = jmp->Xmm7; - context->u.s.Xmm8 = jmp->Xmm8; - context->u.s.Xmm9 = jmp->Xmm9; - context->u.s.Xmm10 = jmp->Xmm10; - context->u.s.Xmm11 = jmp->Xmm11; - context->u.s.Xmm12 = jmp->Xmm12; - context->u.s.Xmm13 = jmp->Xmm13; - context->u.s.Xmm14 = jmp->Xmm14; - context->u.s.Xmm15 = jmp->Xmm15; - } - else if (rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) - { - PVOID (CALLBACK *consolidate)(EXCEPTION_RECORD *) = (void *)rec->ExceptionInformation[0]; - TRACE( "calling consolidate callback %p (rec=%p)\n", consolidate, rec ); - target_ip = call_consolidate_callback( context, consolidate, rec ); - TRACE( "-> target=%p\n", target_ip ); - } context->Rax = (ULONG64)retval; context->Rip = (ULONG64)target_ip; - TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp ); - set_cpu_context( context ); + RtlRestoreContext(context, rec); }

1 0

Aaryaman Vasishta : d3drm: Fix device not assigning width and height after creation.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 9729d15a1a8de61030b68436a1c2239290af90f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9729d15a1a8de61030b68436a… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Jun 30 17:41:54 2016 +0530 d3drm: Fix device not assigning width and height after creation. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/device.c | 31 ++++++++++++++++++++++++++- dlls/d3drm/tests/d3drm.c | 54 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 75 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9729d15a1a8de61030b68…

1 0

Francois Gouget : mmdevapi/tests: Fix typos in a few ok() messages.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 847868fc873387e0f873836086426d5d2fdc6ac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=847868fc873387e0f87383608… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:58:20 2016 +0200 mmdevapi/tests: Fix typos in a few ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 4 ++-- dlls/mmdevapi/tests/render.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 2bb1e5a..e68c38d 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -414,7 +414,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) sum += frames; } else if(hr == AUDCLNT_S_BUFFER_EMPTY){ - ok(!pad, "resetted GCP %u\n", pad); + ok(!pad, "reset GCP %u\n", pad); Sleep(180); } @@ -590,7 +590,7 @@ static void test_audioclient(void) ok(hr == S_OK, "SetEventHandle returns %08x\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClient_Stop(ac); ok(hr == S_FALSE, "Stop on a stopped stream returns %08x\n", hr); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 5497681..9393f7b 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -361,7 +361,7 @@ static void test_audioclient(void) ok(hr == S_OK, "Reset on an initialized stream returns %08x\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClient_Stop(ac); ok(hr == S_FALSE, "Stop on a stopped stream returns %08x\n", hr); @@ -1090,7 +1090,7 @@ static void test_clock(int share) slept = sum = 0; hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClock_GetPosition(acl, &pos, &pcpos); ok(hr == S_OK, "GetPosition failed: %08x\n", hr); @@ -1164,7 +1164,7 @@ static void test_clock(int share) ok(QueryPerformanceCounter(&hpctime0), "PerfCounter unavailable\n"); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClient_Start(ac); ok(hr == S_OK, "Start failed: %08x\n", hr);

1 0

Detlef Riekenberg : dsound: Mark a multiplication factor as float.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 443130c4cf198a4b63d5f9a15b83059cb3ec5bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=443130c4cf198a4b63d5f9a15… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jul 3 22:33:21 2016 +0200 dsound: Mark a multiplication factor as float. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index d9ed637..0c9a34b 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -224,7 +224,7 @@ void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c break; case 0: /* front left */ - value *= 0.503; /* 1 / (sum of left volumes) */ + value *= 0.503f; /* 1 / (sum of left volumes) */ dsb->put_aux(dsb, pos, 0, value); break;

1 0

Francois Gouget : mshtml: Fix a typo in a TRACE() message.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: c242e00b8cd31758ce1e550de0baaf346f9e8e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c242e00b8cd31758ce1e550de… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 12:00:09 2016 +0200 mshtml: Fix a typo in a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 352b757..c341820 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -827,7 +827,7 @@ static HRESULT WINAPI HTMLDocument_get_domain(IHTMLDocument2 *iface, BSTR *p) nsAString_GetData(&nsstr, &str); if(!*str) { - TRACE("Gecko returned emptry string, fallback to loaded URL.\n"); + TRACE("Gecko returned empty string, fallback to loaded URL.\n"); nsAString_Finish(&nsstr); hres = IUri_GetHost(This->window->uri, p); return FAILED(hres) ? hres : S_OK;

1 0

Francois Gouget : mshtml: Nswindow_to_window() is not used anymore, remove it.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 3998a7aa54e028bbab8b0961597370b793f0ad8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3998a7aa54e028bbab8b09615… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:59:50 2016 +0200 mshtml: Nswindow_to_window() is not used anymore, remove it. It has been superseded by mozwindow_to_window(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 12 ------------ dlls/mshtml/mshtml_private.h | 1 - 2 files changed, 13 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d9f1346..bd15cb3 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3171,18 +3171,6 @@ HRESULT update_window_doc(HTMLInnerWindow *window) return hres; } -HTMLOuterWindow *nswindow_to_window(const nsIDOMWindow *nswindow) -{ - HTMLOuterWindow *iter; - - LIST_FOR_EACH_ENTRY(iter, &window_list, HTMLOuterWindow, entry) { - if(iter->nswindow == nswindow) - return iter; - } - - return NULL; -} - HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy *mozwindow) { HTMLOuterWindow *iter; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a25315c..7401634 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -807,7 +807,6 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLInnerWind HRESULT HTMLOuterWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT update_window_doc(HTMLInnerWindow*) DECLSPEC_HIDDEN; -HTMLOuterWindow *nswindow_to_window(const nsIDOMWindow*) DECLSPEC_HIDDEN; HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy*) DECLSPEC_HIDDEN; void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactory**) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Allow to create WINED3DFMT_R{16, 32}_TYPELESS depth textures.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: c7fdde8e83640c43746fd363c1ff63d862db43b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7fdde8e83640c43746fd363c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 5 11:46:55 2016 +0200 wined3d: Allow to create WINED3DFMT_R{16, 32}_TYPELESS depth textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 3 ++- dlls/d3d11/tests/d3d11.c | 3 ++- dlls/wined3d/utils.c | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5f4981f..7067ee6 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1055,6 +1055,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, FALSE, TRUE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_CONSTANT_BUFFER, 0, FALSE, TRUE}, @@ -1065,7 +1066,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8_UNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, - {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 174031c..b3b67c4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1476,6 +1476,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32_TYPELESS, 9, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_CONSTANT_BUFFER, 0, FALSE, TRUE}, @@ -1486,7 +1487,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8_UNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8_SNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, - {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 01e56eb..394f8ea 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -234,6 +234,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R32_UINT, WINED3DFMT_R32_TYPELESS, "U"}, {WINED3DFMT_R32_SINT, WINED3DFMT_R32_TYPELESS, "I"}, {WINED3DFMT_R32_FLOAT, WINED3DFMT_R32_TYPELESS, "F"}, + {WINED3DFMT_D32_FLOAT, WINED3DFMT_R32_TYPELESS, "D"}, {WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_R24G8_TYPELESS, "DX"}, {WINED3DFMT_X24_TYPELESS_G8_UINT, WINED3DFMT_R24G8_TYPELESS, "XS"}, {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24G8_TYPELESS, "DS"}, @@ -243,6 +244,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R16_UINT, WINED3DFMT_R16_TYPELESS, "U"}, {WINED3DFMT_R16_SINT, WINED3DFMT_R16_TYPELESS, "I"}, {WINED3DFMT_R16_FLOAT, WINED3DFMT_R16_TYPELESS, "F"}, + {WINED3DFMT_D16_UNORM, WINED3DFMT_R16_TYPELESS, "D"}, {WINED3DFMT_R8_UNORM, WINED3DFMT_R8_TYPELESS, "u"}, {WINED3DFMT_BC1_UNORM_SRGB, WINED3DFMT_BC1_TYPELESS, ""}, {WINED3DFMT_BC1_UNORM, WINED3DFMT_BC1_TYPELESS, ""}, @@ -1676,6 +1678,12 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) flags |= WINED3DFMT_FLAG_INTEGER; if (channel_type == WINED3D_CHANNEL_TYPE_FLOAT) flags |= WINED3DFMT_FLAG_FLOAT; + + if (channel_type == WINED3D_CHANNEL_TYPE_DEPTH && !format->depth_size) + { + format->depth_size = format->red_size; + format->red_size = format->red_offset = 0; + } } format_set_flag(format, flags);

1 0

Józef Kucia : wined3d: Do not limit temporary register count to 32 in SM4+.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: eb5c8d71fb31f5464457782182eb7772d06b8453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5c8d71fb31f546445778218… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 5 11:46:54 2016 +0200 wined3d: Do not limit temporary register count to 32 in SM4+. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 13 +++++++++++-- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e06f47b..8b5af9e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2168,9 +2168,18 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "vec4 %s_out[%u];\n", prefix, shader->limits->packed_output); /* Declare temporary variables */ - for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + if (reg_maps->temporary_count) { - if (map & 1) shader_addline(buffer, "vec4 R%u;\n", i); + for (i = 0; i < reg_maps->temporary_count; ++i) + shader_addline(buffer, "vec4 R%u;\n", i); + } + else + { + for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + { + if (map & 1) + shader_addline(buffer, "vec4 R%u;\n", i); + } } /* Declare indexable temporary variables */ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ce301cc..9bf7164 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -982,6 +982,10 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st if (ins.flags & WINED3DSI_SAMPLER_COMPARISON_MODE) reg_maps->sampler_comparison_mode |= (1u << ins.declaration.dst.reg.idx[0].offset); } + else if (ins.handler_idx == WINED3DSIH_DCL_TEMPS) + { + reg_maps->temporary_count = ins.declaration.count; + } else if (ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT) { if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e8dc3fd..ec52b15 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -530,7 +530,6 @@ enum wined3d_shader_conditional_op /* TODO: Make this dynamic, based on shader limits ? */ #define MAX_ATTRIBS 16 #define MAX_REG_ADDR 1 -#define MAX_REG_TEMP 32 #define MAX_REG_TEXCRD 8 #define MAX_REG_INPUT 32 #define MAX_REG_OUTPUT 32 @@ -810,7 +809,8 @@ struct wined3d_shader_reg_maps BYTE texcoord; /* MAX_REG_TEXCRD, 8 */ BYTE address; /* MAX_REG_ADDR, 1 */ WORD labels; /* MAX_LABELS, 16 */ - DWORD temporary; /* MAX_REG_TEMP, 32 */ + DWORD temporary; /* 32 */ + unsigned int temporary_count; DWORD *constf; /* pixel, vertex */ struct list indexable_temps; const struct wined3d_shader_immediate_constant_buffer *icb;

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2016