February 2015 - Wine-commits

Sebastian Lackner : ntdll: Try to handle write-watches while we' re on the signal stack.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 6bec132c7ac6d21bb7da45b93d67bfad47ef8b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bec132c7ac6d21bb7da45b93… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 10 14:54:25 2015 +0100 ntdll: Try to handle write-watches while we're on the signal stack. --- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_i386.c | 11 ++++++++++- dlls/ntdll/signal_powerpc.c | 4 ++-- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/virtual.c | 4 ++-- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 92e5baf..674fcbc 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -169,7 +169,7 @@ extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_ extern void virtual_clear_thread_stack(void) DECLSPEC_HIDDEN; extern BOOL virtual_handle_stack_fault( void *addr ) DECLSPEC_HIDDEN; extern BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T size ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e3ae7bd..53a2663 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -443,7 +443,7 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context if (rec->NumberParameters == 2) { if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0] ))) + rec->ExceptionInformation[0], FALSE ))) goto done; } break; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 8c8f7af..ccbdf4c 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -326,7 +326,7 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context if (rec->NumberParameters == 2) { if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0] ))) + rec->ExceptionInformation[0], FALSE ))) goto done; } break; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 1a69bc0..5c3aa819 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1907,7 +1907,7 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context if (rec->ExceptionInformation[1] == 0xffffffff && check_invalid_gs( context )) goto done; if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0] ))) + rec->ExceptionInformation[0], FALSE ))) goto done; if (rec->ExceptionCode == EXCEPTION_ACCESS_VIOLATION && rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT) @@ -2046,6 +2046,15 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) ucontext_t *context = sigcontext; void *stack = init_handler( sigcontext, &fs, &gs ); + /* check for exceptions on the signal stack caused by write watches */ + if (get_trap_code(context) == TRAP_x86_PAGEFLT && + (char *)stack >= (char *)get_signal_stack() && + (char *)stack < (char *)get_signal_stack() + signal_stack_size && + !virtual_handle_fault( siginfo->si_addr, (get_error_code(context) >> 1) & 0x09, TRUE )) + { + return; + } + /* check for page fault inside the thread stack */ if (get_trap_code(context) == TRAP_x86_PAGEFLT && (char *)siginfo->si_addr >= (char *)NtCurrentTeb()->DeallocationStack && diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 0fca342..886da86 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -678,7 +678,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 2; rec.ExceptionInformation[0] = 0; /* FIXME ? */ rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; - if (!(rec.ExceptionCode = virtual_handle_fault(siginfo->si_addr, rec.ExceptionInformation[0]))) + if (!(rec.ExceptionCode = virtual_handle_fault(siginfo->si_addr, rec.ExceptionInformation[0], FALSE))) goto done; break; default: @@ -701,7 +701,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 2; rec.ExceptionInformation[0] = 0; /* FIXME ? */ rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; - if (!(rec.ExceptionCode = virtual_handle_fault(siginfo->si_addr, rec.ExceptionInformation[0]))) + if (!(rec.ExceptionCode = virtual_handle_fault(siginfo->si_addr, rec.ExceptionInformation[0], FALSE))) goto done; break; #endif diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c71069d..551687f 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2286,7 +2286,7 @@ static void raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) if (rec->NumberParameters == 2) { if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0] ))) + rec->ExceptionInformation[0], FALSE ))) set_cpu_context( context ); } break; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9f82204..dc5db00 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1521,7 +1521,7 @@ void virtual_clear_thread_stack(void) /*********************************************************************** * virtual_handle_fault */ -NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) +NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) { struct file_view *view; NTSTATUS ret = STATUS_ACCESS_VIOLATION; @@ -1542,7 +1542,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) /* ignore fault if page is writable now */ if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS; } - if (*vprot & VPROT_GUARD) + if (!on_signal_stack && (*vprot & VPROT_GUARD)) { VIRTUAL_SetProt( view, page, page_size, *vprot & ~VPROT_GUARD ); ret = STATUS_GUARD_PAGE_VIOLATION;

1 0

Sebastian Lackner : winebuild: Do not access memory below ESP when restoring thread contexts.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 44fbc018eda12bdee5c2c1e2e40dbdc6a81b27fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fbc018eda12bdee5c2c1e2e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 12 11:09:34 2015 +0100 winebuild: Do not access memory below ESP when restoring thread contexts. Based on a patch by John Reiser. --- tools/winebuild/relay.c | 49 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index cc7dd37..63c2ca4 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -852,31 +852,48 @@ static void build_call_from_regs_x86(void) /* Restore the context structure */ - output( "2:\tpushl 0x94(%%ecx)\n"); /* SegEs */ + output( "2:\n" ); + + /* As soon as we have switched stacks the context structure could + * be invalid (when signal handlers are executed for example). Copy + * values on the target stack before changing ESP. */ + + output( "\tpushl 0xc8(%%ecx)\n" ); /* SegSs */ + output( "\tpopl %%es\n" ); + output( "\tmovl 0xc4(%%ecx),%%eax\n" ); /* Esp */ + output( "\tleal -4*4(%%eax),%%eax\n" ); + + output( "\tmovl 0xc0(%%ecx),%%edx\n" ); /* EFlags */ + output( "\t.byte 0x26\n\tmovl %%edx,3*4(%%eax)\n" ); + output( "\tmovl 0xbc(%%ecx),%%edx\n" ); /* SegCs */ + output( "\t.byte 0x26\n\tmovl %%edx,2*4(%%eax)\n" ); + output( "\tmovl 0xb8(%%ecx),%%edx\n" ); /* Eip */ + output( "\t.byte 0x26\n\tmovl %%edx,1*4(%%eax)\n" ); + output( "\tmovl 0xb0(%%ecx),%%edx\n" ); /* Eax */ + output( "\t.byte 0x26\n\tmovl %%edx,0*4(%%eax)\n" ); + + output( "\tpushl %%es\n" ); + output( "\tpushl 0x98(%%ecx)\n" ); /* SegDs */ + + output(" \tpushl 0x94(%%ecx)\n" ); /* SegEs */ output( "\tpopl %%es\n" ); output( "\tpushl 0x90(%%ecx)\n"); /* SegFs */ output( "\tpopl %%fs\n" ); output( "\tpushl 0x8c(%%ecx)\n"); /* SegGs */ output( "\tpopl %%gs\n" ); - output( "\tmovl 0x9c(%%ecx),%%edi\n"); /* Edi */ - output( "\tmovl 0xa0(%%ecx),%%esi\n"); /* Esi */ - output( "\tmovl 0xa8(%%ecx),%%edx\n"); /* Edx */ - output( "\tmovl 0xa4(%%ecx),%%ebx\n"); /* Ebx */ - output( "\tmovl 0xb0(%%ecx),%%eax\n"); /* Eax */ - output( "\tmovl 0xb4(%%ecx),%%ebp\n"); /* Ebp */ + output( "\tmovl 0x9c(%%ecx),%%edi\n" ); /* Edi */ + output( "\tmovl 0xa0(%%ecx),%%esi\n" ); /* Esi */ + output( "\tmovl 0xa4(%%ecx),%%ebx\n" ); /* Ebx */ + output( "\tmovl 0xa8(%%ecx),%%edx\n" ); /* Edx */ + output( "\tmovl 0xb4(%%ecx),%%ebp\n" ); /* Ebp */ + output( "\tmovl 0xac(%%ecx),%%ecx\n" ); /* Ecx */ - output( "\tpushl 0xc8(%%ecx)\n"); /* SegSs */ + output( "\tpopl %%ds\n" ); output( "\tpopl %%ss\n" ); - output( "\tmovl 0xc4(%%ecx),%%esp\n"); /* Esp */ + output( "\tmovl %%eax,%%esp\n" ); - output( "\tpushl 0xc0(%%ecx)\n"); /* EFlags */ - output( "\tpushl 0xbc(%%ecx)\n"); /* SegCs */ - output( "\tpushl 0xb8(%%ecx)\n"); /* Eip */ - output( "\tpushl 0x98(%%ecx)\n"); /* SegDs */ - output( "\tmovl 0xac(%%ecx),%%ecx\n"); /* Ecx */ - - output( "\tpopl %%ds\n" ); + output( "\tpopl %%eax\n" ); output( "\tiret\n" ); output_cfi( ".cfi_endproc" ); output_function_size( "__wine_call_from_regs" );

1 0

Henri Verbeet : d3d10core: Implement d3d10_pixel_shader_SetPrivateDataInterface().
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: ed0c1c2ad5ea1bcef84bb2065ce1d15fd6db8617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0c1c2ad5ea1bcef84bb2065… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 12:29:44 2015 +0100 d3d10core: Implement d3d10_pixel_shader_SetPrivateDataInterface(). --- dlls/d3d10core/shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index cdd0608..9245445 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -571,9 +571,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateData(ID3D10PixelSh static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateDataInterface(ID3D10PixelShader *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&shader->private_store, guid, data); } static const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl =

1 0

Nikolay Sivov : scrrun/tests: More dictionary tests.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 94e5353f0d3b19c4bfc102d6d214fc48891eced9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94e5353f0d3b19c4bfc102d6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 26 17:23:12 2015 +0300 scrrun/tests: More dictionary tests. --- dlls/scrrun/scrrun.idl | 5 +- dlls/scrrun/tests/dictionary.c | 169 +++++++++++++++++++++++++++++++++++++++++ dlls/scrrun/tests/scrrun.idl | 5 +- 3 files changed, 177 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/scrrun.idl b/dlls/scrrun/scrrun.idl index 53125ee..061d924d 100644 --- a/dlls/scrrun/scrrun.idl +++ b/dlls/scrrun/scrrun.idl @@ -27,7 +27,10 @@ cpp_quote("#undef CopyFile") cpp_quote("#undef DeleteFile") cpp_quote("#undef MoveFile") cpp_quote("#endif") -cpp_quote("#define CTL_E_ENDOFFILE STD_CTL_SCODE(62)") /* this is not defined in public headers */ +/* this is not defined in public headers */ +cpp_quote("#define CTL_E_ENDOFFILE STD_CTL_SCODE(62)") +cpp_quote("#define CTL_E_KEY_ALREADY_EXISTS STD_CTL_SCODE(457)") +cpp_quote("#define CTL_E_ELEMENT_NOT_FOUND STD_CTL_SCODE(32811)") [ uuid(420B2830-E718-11CF-893D-00A0C9054228), diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 0c3a92c..25cb0a6 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -93,6 +93,7 @@ static void test_comparemode(void) { CompareMethod method; IDictionary *dict; + VARIANT key, item; HRESULT hr; hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -122,6 +123,18 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(method == DatabaseCompare, "got %d\n", method); + /* try to change mode of a non-empty dict */ + V_VT(&key) = VT_I2; + V_I2(&key) = 0; + VariantInit(&item); + hr = IDictionary_Add(dict, &key, &item); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDictionary_put_CompareMode(dict, BinaryCompare); +todo_wine + ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); + IDictionary_Release(dict); } @@ -414,6 +427,159 @@ static void test_hash_value(void) IDictionary_Release(dict); } +static void test_Exists(void) +{ + VARIANT_BOOL exists; + IDictionary *dict; + VARIANT key, item; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) /* crashes on native */ + hr = IDictionary_Exists(dict, NULL, NULL); + + V_VT(&key) = VT_I2; + V_I2(&key) = 0; + hr = IDictionary_Exists(dict, &key, NULL); +todo_wine + ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); + + V_VT(&key) = VT_I2; + V_I2(&key) = 0; + exists = VARIANT_TRUE; + hr = IDictionary_Exists(dict, &key, &exists); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists == VARIANT_FALSE, "got %x\n", exists); +} + VariantInit(&item); + hr = IDictionary_Add(dict, &key, &item); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&key) = VT_R4; + V_R4(&key) = 0.0; + hr = IDictionary_Add(dict, &key, &item); +todo_wine + ok(hr == CTL_E_KEY_ALREADY_EXISTS, "got 0x%08x\n", hr); + + V_VT(&key) = VT_I2; + V_I2(&key) = 0; + hr = IDictionary_Exists(dict, &key, NULL); +todo_wine + ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); + + V_VT(&key) = VT_I2; + V_I2(&key) = 0; + exists = VARIANT_FALSE; + hr = IDictionary_Exists(dict, &key, &exists); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists == VARIANT_TRUE, "got %x\n", exists); +} + /* key of different type, but resolves to same hash value */ + V_VT(&key) = VT_R4; + V_R4(&key) = 0.0; + exists = VARIANT_FALSE; + hr = IDictionary_Exists(dict, &key, &exists); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists == VARIANT_TRUE, "got %x\n", exists); +} + IDictionary_Release(dict); +} + +static void test_Keys(void) +{ + VARIANT key, keys, item; + IDictionary *dict; + LONG index; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDictionary_Keys(dict, NULL); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + VariantInit(&keys); + hr = IDictionary_Keys(dict, &keys); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&keys) == (VT_ARRAY|VT_VARIANT), "got %d\n", V_VT(&keys)); +} + VariantClear(&keys); + + V_VT(&key) = VT_R4; + V_R4(&key) = 0.0; + VariantInit(&item); + hr = IDictionary_Add(dict, &key, &item); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + VariantInit(&keys); + hr = IDictionary_Keys(dict, &keys); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&keys) == (VT_ARRAY|VT_VARIANT), "got %d\n", V_VT(&keys)); +} +if (hr == S_OK) +{ + VariantInit(&key); + index = 0; + hr = SafeArrayGetElement(V_ARRAY(&keys), &index, &key); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&key) == VT_R4, "got %d\n", V_VT(&key)); + + index = SafeArrayGetDim(V_ARRAY(&keys)); + ok(index == 1, "got %d\n", index); + + hr = SafeArrayGetUBound(V_ARRAY(&keys), 1, &index); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(index == 0, "got %d\n", index); +} + VariantClear(&keys); + + IDictionary_Release(dict); +} + +static void test_Remove(void) +{ + VARIANT key, item; + IDictionary *dict; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) + hr = IDictionary_Remove(dict, NULL); + + /* nothing added yet */ + V_VT(&key) = VT_R4; + V_R4(&key) = 0.0; + hr = IDictionary_Remove(dict, &key); +todo_wine + ok(hr == CTL_E_ELEMENT_NOT_FOUND, "got 0x%08x\n", hr); + + VariantInit(&item); + hr = IDictionary_Add(dict, &key, &item); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDictionary_Remove(dict, &key); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDictionary_Release(dict); +} + START_TEST(dictionary) { IDispatch *disp; @@ -433,6 +599,9 @@ START_TEST(dictionary) test_interfaces(); test_comparemode(); test_hash_value(); + test_Exists(); + test_Keys(); + test_Remove(); CoUninitialize(); } diff --git a/dlls/scrrun/tests/scrrun.idl b/dlls/scrrun/tests/scrrun.idl index 96835c7..91e0151 100644 --- a/dlls/scrrun/tests/scrrun.idl +++ b/dlls/scrrun/tests/scrrun.idl @@ -24,7 +24,10 @@ cpp_quote("#undef CopyFile") cpp_quote("#undef DeleteFile") cpp_quote("#undef MoveFile") cpp_quote("#endif") -cpp_quote("#define CTL_E_ENDOFFILE STD_CTL_SCODE(62)") /* this is not defined in public headers */ +/* this is not defined in public headers */ +cpp_quote("#define CTL_E_ENDOFFILE STD_CTL_SCODE(62)") +cpp_quote("#define CTL_E_KEY_ALREADY_EXISTS STD_CTL_SCODE(457)") +cpp_quote("#define CTL_E_ELEMENT_NOT_FOUND STD_CTL_SCODE(32811)") [ uuid(420B2830-E718-11CF-893D-00A0C9054228),

1 0

Jacek Caban : winegecko.php: Make use of autoselect mirror SourceForge feature.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: tools Branch: master Commit: c97e300fa50540af4c9b9cea5d17293524320cbd URL: http://source.winehq.org/git/tools.git/?a=commit;h=c97e300fa50540af4c9b9cea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 27 11:45:49 2015 +0100 winegecko.php: Make use of autoselect mirror SourceForge feature. This leaves the job of redirecting to mirror to SourceForge, which may do much better job at this than we do. Our current solution is to redirect to random mirror known to have Gecko. In our current code, connection time is bad (it may even feel like it hangs), because we need an additional request from server script to a mirror to ensure that the resource is present there. Also, choosing random mirror often causes pretty bad transfers. --- winegecko.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/winegecko.php b/winegecko.php index fdc1b96..e44b9e3 100644 --- a/winegecko.php +++ b/winegecko.php @@ -48,6 +48,16 @@ default: // Name of the file $sFileName = sprintf('%s/%s/wine_gecko-%s.%s', $sFolder, $sVersion, $sFileSuffix, $sExt); +// SourceForge can do better job at redirecting to the mirror than us. However, +// it redirects to HTML page by default for web browser user agents. New enough +// Wine set user agent to 'Wine Addon Downloader', so redirect them directly +// to SourceForge. For older Wine and other user agents, fallback to random +// known mirror. +if(strcmp($_SERVER['HTTP_USER_AGENT'], 'Wine Addon Downloader') === 0) { + header("Location: http://sourceforge.net/projects/wine/files/".$sFileName); + exit; +} + // Size array $aFileSizes = array( '0.0.1'=>5219822,

1 0

Andrew Eikum : advapi32: Stub EventActivityIdControl.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: 8140bdc752125249c1a5adae618f964941c177f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8140bdc752125249c1a5adae6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 25 14:27:15 2015 -0600 advapi32: Stub EventActivityIdControl. Used by the Office 2013 live installer. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 10 ++++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-eventing-provider-l1-1-0.spec | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 40ae014..322360d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -269,7 +269,7 @@ # @ stub EventAccessControl # @ stub EventAccessQuery # @ stub EventAccessRemove -# @ stub EventActivityIdControl +@ stdcall EventActivityIdControl(long ptr) @ stdcall EventEnabled(int64 ptr) @ stdcall EventProviderEnabled(int64 long int64) @ stdcall EventRegister(ptr ptr ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 988060f..bebb08b 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -908,6 +908,16 @@ BOOLEAN WINAPI EventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG ke } /****************************************************************************** + * EventActivityIdControl [ADVAPI32.@] + * + */ +ULONG WINAPI EventActivityIdControl(ULONG code, GUID *guid) +{ + FIXME("0x%x, %p: stub\n", code, guid); + return ERROR_SUCCESS; +} + +/****************************************************************************** * EventWrite [ADVAPI32.@] */ ULONG WINAPI EventWrite( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, ULONG count, diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 5b0b069..130f285 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -38,7 +38,7 @@ @ stub EqualDomainSid @ stdcall EqualPrefixSid(ptr ptr) advapi32.EqualPrefixSid @ stdcall EqualSid(ptr ptr) advapi32.EqualSid -@ stub EventActivityIdControl +@ stdcall EventActivityIdControl(long ptr) advapi32.EventActivityIdControl @ stdcall EventEnabled(int64 ptr) advapi32.EventEnabled @ stdcall EventProviderEnabled(int64 long int64) advapi32.EventProviderEnabled @ stdcall EventRegister(ptr ptr ptr ptr) advapi32.EventRegister diff --git a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec index 901f74c..a498097 100644 --- a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec +++ b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub EventActivityIdControl +@ stdcall EventActivityIdControl(long ptr) advapi32.EventActivityIdControl @ stdcall EventEnabled(int64 ptr) advapi32.EventEnabled @ stdcall EventProviderEnabled(int64 long int64) advapi32.EventProviderEnabled @ stdcall EventRegister(ptr ptr ptr ptr) advapi32.EventRegister

1 0

Matteo Bruni : wined3d: Remove ARB_/EXT_TEXTURE_ENV_ADD.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: 67d2b52c27841228897c738a7417f7ad22a44830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d2b52c27841228897c738a7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 24 13:38:18 2015 +0100 wined3d: Remove ARB_/EXT_TEXTURE_ENV_ADD. --- dlls/wined3d/directx.c | 2 -- dlls/wined3d/wined3d_gl.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5fa9355..4ca13f4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -145,7 +145,6 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION }, {"GL_ARB_texture_compression_rgtc", ARB_TEXTURE_COMPRESSION_RGTC }, {"GL_ARB_texture_cube_map", ARB_TEXTURE_CUBE_MAP }, - {"GL_ARB_texture_env_add", ARB_TEXTURE_ENV_ADD }, {"GL_ARB_texture_env_combine", ARB_TEXTURE_ENV_COMBINE }, {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3 }, {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT }, @@ -192,7 +191,6 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture3D", EXT_TEXTURE3D }, {"GL_EXT_texture_compression_rgtc", EXT_TEXTURE_COMPRESSION_RGTC }, {"GL_EXT_texture_compression_s3tc", EXT_TEXTURE_COMPRESSION_S3TC }, - {"GL_EXT_texture_env_add", EXT_TEXTURE_ENV_ADD }, {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE }, {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3 }, {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3f06601..48d25b0 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -81,7 +81,6 @@ enum wined3d_gl_extension ARB_TEXTURE_COMPRESSION, ARB_TEXTURE_COMPRESSION_RGTC, ARB_TEXTURE_CUBE_MAP, - ARB_TEXTURE_ENV_ADD, ARB_TEXTURE_ENV_COMBINE, ARB_TEXTURE_ENV_DOT3, ARB_TEXTURE_FLOAT, @@ -126,7 +125,6 @@ enum wined3d_gl_extension EXT_TEXTURE3D, EXT_TEXTURE_COMPRESSION_RGTC, EXT_TEXTURE_COMPRESSION_S3TC, - EXT_TEXTURE_ENV_ADD, EXT_TEXTURE_ENV_COMBINE, EXT_TEXTURE_ENV_DOT3, EXT_TEXTURE_FILTER_ANISOTROPIC,

1 0

Jacek Caban : urlmon: Added IInternetBindInfo implementation to BindStatusCallback object.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: 168e915c918a38f29c4323fb24e84de56c81d5b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=168e915c918a38f29c4323fb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 26 11:00:27 2015 +0100 urlmon: Added IInternetBindInfo implementation to BindStatusCallback object. --- dlls/urlmon/bindctx.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/tests/url.c | 11 +++++++++ 2 files changed, 73 insertions(+) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index b2d2776..d8bba1b 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -29,6 +29,7 @@ extern IID IID_IBindStatusCallbackHolder; typedef struct { IBindStatusCallbackEx IBindStatusCallbackEx_iface; + IInternetBindInfo IInternetBindInfo_iface; IServiceProvider IServiceProvider_iface; IHttpNegotiate2 IHttpNegotiate2_iface; IAuthenticate IAuthenticate_iface; @@ -126,6 +127,9 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallbackEx *i }else if(IsEqualGUID(&IID_IAuthenticate, riid)) { TRACE("(%p)->(IID_IAuthenticate, %p)\n", This, ppv); *ppv = &This->IAuthenticate_iface; + }else if(IsEqualGUID(&IID_IInternetBindInfo, riid)) { + TRACE("(%p)->(IID_IInternetBindInfo, %p)\n", This, ppv); + *ppv = &This->IInternetBindInfo_iface; } if(*ppv) { @@ -497,6 +501,63 @@ static const IAuthenticateVtbl BSCAuthenticateVtbl = { BSCAuthenticate_Authenticate }; +static inline BindStatusCallback *impl_from_IInternetBindInfo(IInternetBindInfo *iface) +{ + return CONTAINING_RECORD(iface, BindStatusCallback, IInternetBindInfo_iface); +} + +static HRESULT WINAPI BSCInternetBindInfo_QueryInterface(IInternetBindInfo *iface, REFIID riid, void **ppv) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + return IBindStatusCallbackEx_QueryInterface(&This->IBindStatusCallbackEx_iface, riid, ppv); +} + +static ULONG WINAPI BSCInternetBindInfo_AddRef(IInternetBindInfo *iface) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + return IBindStatusCallbackEx_AddRef(&This->IBindStatusCallbackEx_iface); +} + +static ULONG WINAPI BSCInternetBindInfo_Release(IInternetBindInfo *iface) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + return IBindStatusCallbackEx_Release(&This->IBindStatusCallbackEx_iface); +} + +static HRESULT WINAPI BSCInternetBindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *bindf, BINDINFO *bindinfo) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + FIXME("(%p)->(%p %p)\n", This, bindf, bindinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI BSCInternetBindInfo_GetBindString(IInternetBindInfo *iface, ULONG string_type, + WCHAR **strs, ULONG cnt, ULONG *fetched) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + IInternetBindInfo *bind_info; + HRESULT hres; + + TRACE("(%p)->(%d %p %d %p)\n", This, string_type, strs, cnt, fetched); + + hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IInternetBindInfo, (void**)&bind_info); + if(FAILED(hres)) + return hres; + + hres = IInternetBindInfo_GetBindString(bind_info, string_type, strs, cnt, fetched); + + IInternetBindInfo_Release(bind_info); + return hres; +} + +static IInternetBindInfoVtbl BSCInternetBindInfoVtbl = { + BSCInternetBindInfo_QueryInterface, + BSCInternetBindInfo_AddRef, + BSCInternetBindInfo_Release, + BSCInternetBindInfo_GetBindInfo, + BSCInternetBindInfo_GetBindString +}; + static void set_callback(BindStatusCallback *This, IBindStatusCallback *bsc) { IServiceProvider *serv_prov; @@ -523,6 +584,7 @@ HRESULT wrap_callback(IBindStatusCallback *bsc, IBindStatusCallback **ret_iface) return E_OUTOFMEMORY; ret->IBindStatusCallbackEx_iface.lpVtbl = &BindStatusCallbackExVtbl; + ret->IInternetBindInfo_iface.lpVtbl = &BSCInternetBindInfoVtbl; ret->IServiceProvider_iface.lpVtbl = &BSCServiceProviderVtbl; ret->IHttpNegotiate2_iface.lpVtbl = &BSCHttpNegotiateVtbl; ret->IAuthenticate_iface.lpVtbl = &BSCAuthenticateVtbl; diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index ab564f7..dd3a52d 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2564,6 +2564,7 @@ static BOOL test_bscholder(IBindStatusCallback *holder) IHttpNegotiate *http_negotiate, *http_negotiate_serv; IHttpNegotiate2 *http_negotiate2, *http_negotiate2_serv; IAuthenticate *authenticate, *authenticate_serv; + IInternetBindInfo *bind_info; IInternetProtocol *protocol; BINDINFO bindinfo = {sizeof(bindinfo)}; BOOL ret = TRUE; @@ -2678,6 +2679,16 @@ static BOOL test_bscholder(IBindStatusCallback *holder) IAuthenticate_Release(authenticate); IAuthenticate_Release(authenticate_serv); + hres = IBindStatusCallback_QueryInterface(holder, &IID_IInternetBindInfo, (void**)&bind_info); + ok(hres == S_OK || broken(hres == E_NOINTERFACE /* win2k */), "Could not get IInternetBindInfo interface: %08x\n", hres); + + if(SUCCEEDED(hres)) { + hres = IInternetBindInfo_GetBindString(bind_info, BINDSTRING_USER_AGENT, &wstr, 1, &dw); + ok(hres == E_NOINTERFACE, "GetBindString(BINDSTRING_USER_AGENT) failed: %08x\n", hres); + + IInternetBindInfo_Release(bind_info); + } + SET_EXPECT(OnStopBinding); hres = IBindStatusCallback_OnStopBinding(holder, S_OK, NULL); ok(hres == S_OK, "OnStopBinding failed: %08x\n", hres);

1 0

Henri Verbeet : d3d10core: Implement d3d10_vertex_shader_SetPrivateData().
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: fe06bb149261ab4e4693c72e024dba447ec6c5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe06bb149261ab4e4693c72e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 10:11:31 2015 +0100 d3d10core: Implement d3d10_vertex_shader_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/shader.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index e03a5cb..dfd6149 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -200,6 +200,7 @@ struct d3d10_vertex_shader ID3D10VertexShader ID3D10VertexShader_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; ID3D10Device1 *device; }; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 1000054..31896e3 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -209,10 +209,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10Vertex static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10VertexShader *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateDataInterface(ID3D10VertexShader *iface, @@ -238,6 +240,9 @@ static const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl = static void STDMETHODCALLTYPE d3d10_vertex_shader_wined3d_object_destroyed(void *parent) { + struct d3d10_vertex_shader *shader = parent; + + wined3d_private_store_cleanup(&shader->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -257,12 +262,14 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 shader->ID3D10VertexShader_iface.lpVtbl = &d3d10_vertex_shader_vtbl; shader->refcount = 1; + wined3d_private_store_init(&shader->private_store); shader_info.input_signature = &input_signature; shader_info.output_signature = &output_signature; if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info))) { ERR("Failed to extract shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return hr; } @@ -278,6 +285,7 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 if (FAILED(hr)) { WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return E_INVALIDARG; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_vertex_shader_SetPrivateDataInterface().
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: e8dc68a8e4674713139030592f9849dde9d34a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8dc68a8e4674713139030592… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 10:11:32 2015 +0100 d3d10core: Implement d3d10_vertex_shader_SetPrivateDataInterface(). --- dlls/d3d10core/shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 31896e3..bb0e596 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -220,9 +220,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10Vertex static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateDataInterface(ID3D10VertexShader *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&shader->private_store, guid, data); } static const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl =

1 0