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

Aric Stewart : msctf: Hook up ITfLanguageProfileNotifySink:: OnLanguageChange.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: a60f32739baffc7c3ce8d7b70ff82d4b1bb316cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60f32739baffc7c3ce8d7b70… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 31 09:31:27 2009 -0500 msctf: Hook up ITfLanguageProfileNotifySink::OnLanguageChange. --- dlls/msctf/inputprocessor.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 2cd20cd..0935c44 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -491,8 +491,22 @@ static HRESULT WINAPI InputProcessorProfiles_GetCurrentLanguage( static HRESULT WINAPI InputProcessorProfiles_ChangeCurrentLanguage( ITfInputProcessorProfiles *iface, LANGID langid) { + struct list *cursor; InputProcessorProfiles *This = (InputProcessorProfiles*)iface; + BOOL accept; + FIXME("STUB:(%p)\n",This); + + LIST_FOR_EACH(cursor, &This->LanguageProfileNotifySink) + { + InputProcessorProfilesSink* sink = LIST_ENTRY(cursor,InputProcessorProfilesSink,entry); + accept = TRUE; + ITfLanguageProfileNotifySink_OnLanguageChange(sink->interfaces.pITfLanguageProfileNotifySink, langid, &accept); + if (!accept) + return E_FAIL; + } + + /* TODO: On successful language change call OnLanguageChanged sink */ return E_NOTIMPL; }

1 0

Francois Gouget : iphlpapi/tests: Fix compilation on systems that don' t support nameless unions or structs.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 30a92641095cfdd1893f4822c5003119433a7972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a92641095cfdd1893f4822c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 31 11:52:21 2009 +0200 iphlpapi/tests: Fix compilation on systems that don't support nameless unions or structs. --- dlls/iphlpapi/tests/iphlpapi.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index eaada07..7a35f7c 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -840,16 +840,16 @@ static void test_GetAdaptersAddresses(void) while (!ret && winetest_debug > 1 && aa) { - trace("Length: %u\n", aa->Length); - trace("IfIndex: %u\n", aa->IfIndex); + trace("Length: %u\n", S(U(*aa)).Length); + trace("IfIndex: %u\n", S(U(*aa)).IfIndex); trace("Next: %p\n", aa->Next); trace("AdapterName: %s\n", aa->AdapterName); trace("FirstUnicastAddress: %p\n", aa->FirstUnicastAddress); ua = aa->FirstUnicastAddress; while (ua) { - trace("\tLength: %u\n", ua->Length); - trace("\tFlags: 0x%08x\n", ua->Flags); + trace("\tLength: %u\n", S(U(*ua)).Length); + trace("\tFlags: 0x%08x\n", S(U(*ua)).Flags); trace("\tNext: %p\n", ua->Next); trace("\tAddress.lpSockaddr: %p\n", ua->Address.lpSockaddr); trace("\tAddress.iSockaddrLength: %d\n", ua->Address.iSockaddrLength);

1 0

Alexandre Julliard : user32: Bring SwitchToThisWindow a bit more in line with the now documented behavior .
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: b464f9cacb89eea507d90829a3bd6fba54c70ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b464f9cacb89eea507d90829a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 31 16:37:19 2009 +0200 user32: Bring SwitchToThisWindow a bit more in line with the now documented behavior. --- dlls/user32/winpos.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 8aeecc2..ba33967 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -85,9 +85,10 @@ typedef struct /*********************************************************************** * SwitchToThisWindow (USER32.@) */ -void WINAPI SwitchToThisWindow( HWND hwnd, BOOL restore ) +void WINAPI SwitchToThisWindow( HWND hwnd, BOOL alt_tab ) { - ShowWindow( hwnd, restore ? SW_RESTORE : SW_SHOWMINIMIZED ); + if (IsIconic( hwnd )) ShowWindow( hwnd, SW_RESTORE ); + else BringWindowToTop( hwnd ); }

1 0

Alexandre Julliard : user32: Don' t send focus change messages if foreground window didn't change.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 6eabce171e8fa0ff67664319de4e755fd84b2fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eabce171e8fa0ff67664319d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 31 16:36:17 2009 +0200 user32: Don't send focus change messages if foreground window didn't change. --- dlls/user32/focus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 210af36..f086584 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -193,7 +193,7 @@ static BOOL set_foreground_window( HWND hwnd, BOOL mouse ) } SERVER_END_REQ; - if (ret) + if (ret && previous != hwnd) { if (send_msg_old) /* old window belongs to other thread */ SendNotifyMessageW( previous, WM_WINE_SETACTIVEWINDOW, 0, 0 );

1 0

Rico Schüller : d3d10: Add argument check in ID3D10EffectPass::GetDesc.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 45c27e12d45a071def2449a54f53b7f04aeb8fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c27e12d45a071def2449a54… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 29 20:36:38 2009 +0200 d3d10: Add argument check in ID3D10EffectPass::GetDesc. --- dlls/d3d10/effect.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e601c1a..61fbfee 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1139,6 +1139,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *ifa FIXME("iface %p, desc %p partial stub!\n", iface, desc); + if(This == &null_pass) + { + WARN("Null pass specified\n"); + return E_FAIL; + } + + if(!desc) + { + WARN("Invalid argument specified\n"); + return E_INVALIDARG; + } + memset(desc, 0, sizeof(*desc)); desc->Name = This->name; for (i = 0; i < This->object_count; ++i)

1 0

Rico Schüller : d3d10: Add argument check in ID3D10EffectTechnique::GetDesc.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 247b8679528bb44b4984c66d344ab31a96c14f84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=247b8679528bb44b4984c66d3… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 29 20:36:26 2009 +0200 d3d10: Add argument check in ID3D10EffectTechnique::GetDesc. --- dlls/d3d10/effect.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 7f9704a..e601c1a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1023,6 +1023,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_GetDesc(ID3D10EffectTech TRACE("iface %p, desc %p\n", iface, desc); + if(This == &null_technique) + { + WARN("Null technique specified\n"); + return E_FAIL; + } + + if(!desc) + { + WARN("Invalid argument specified\n"); + return E_INVALIDARG; + } + desc->Name = This->name; desc->Passes = This->pass_count; WARN("Annotations not implemented\n");

1 0

Rico Schüller : d3d10: Add null objects for technique, pass, local_buffer and variable.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 78741d2717a10d4b6ab1dd7e617c4483d45f48f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78741d2717a10d4b6ab1dd7e6… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 29 20:35:37 2009 +0200 d3d10: Add null objects for technique, pass, local_buffer and variable. --- dlls/d3d10/effect.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 71ec998..7f9704a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -36,6 +36,12 @@ static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl; static const struct ID3D10EffectVariableVtbl d3d10_effect_variable_vtbl; static const struct ID3D10EffectConstantBufferVtbl d3d10_effect_constant_buffer_vtbl; +/* null objects - needed for invalid calls */ +static struct d3d10_effect_technique null_technique = {&d3d10_effect_technique_vtbl, NULL, NULL, 0, 0, NULL}; +static struct d3d10_effect_pass null_pass = {&d3d10_effect_pass_vtbl, NULL, NULL, 0, 0, 0, NULL}; +static struct d3d10_effect_local_buffer null_local_buffer = {&d3d10_effect_constant_buffer_vtbl, NULL, 0, 0, 0, NULL}; +static struct d3d10_effect_variable null_variable = {&d3d10_effect_variable_vtbl, NULL, 0, 0}; + static inline void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); @@ -843,7 +849,7 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon if (index >= This->local_buffer_count) { WARN("Invalid index specified\n"); - return NULL; + return (ID3D10EffectConstantBuffer *)&null_local_buffer; } l = &This->local_buffers[index]; @@ -872,7 +878,9 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon } } - return NULL; + WARN("Invalid name specified\n"); + + return (ID3D10EffectConstantBuffer *)&null_local_buffer; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByIndex(ID3D10Effect *iface, UINT index) @@ -906,7 +914,9 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB } } - return NULL; + WARN("Invalid name specified\n"); + + return (ID3D10EffectVariable *)&null_variable; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableBySemantic(ID3D10Effect *iface, @@ -928,7 +938,7 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu if (index >= This->technique_count) { WARN("Invalid index specified\n"); - return NULL; + return (ID3D10EffectTechnique *)&null_technique; } t = &This->techniques[index]; @@ -956,7 +966,9 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu } } - return NULL; + WARN("Invalid name specified\n"); + + return (ID3D10EffectTechnique *)&null_technique; } static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) @@ -1046,7 +1058,7 @@ static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPas if (index >= This->pass_count) { WARN("Invalid index specified\n"); - return NULL; + return (ID3D10EffectPass *)&null_pass; } p = &This->passes[index]; @@ -1074,7 +1086,9 @@ static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPas } } - return NULL; + WARN("Invalid name specified\n"); + + return (ID3D10EffectPass *)&null_pass; } static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_ComputeStateBlockMask(ID3D10EffectTechnique *iface,

1 0

André Hentschel : winetest: Mute an annoying message box.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: d0c68ef0349803641023975c4734a94c87ad34d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0c68ef0349803641023975c4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Aug 29 22:08:13 2009 +0200 winetest: Mute an annoying message box. --- programs/winetest/main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 887fbfa..7564748 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -393,7 +393,6 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms) report (R_ERROR, "Wait for '%s' failed: %d", cmd, GetLastError ()); break; case WAIT_TIMEOUT: - report (R_ERROR, "Process '%s' timed out.", cmd); break; default: report (R_ERROR, "Wait returned %d", status);

1 0

Michael Stefaniuc : jscript: Check the correct variable for the error condition (Smatch).
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: e64df62ef20789782a77ebdafa70ef0da0195080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e64df62ef20789782a77ebdaf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Aug 30 23:08:40 2009 +0200 jscript: Check the correct variable for the error condition (Smatch). --- dlls/jscript/function.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 1651aeb..a1d0987 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -363,7 +363,7 @@ static HRESULT array_to_args(DispatchEx *arg_array, LCID lcid, jsexcept_t *ei, I return hres; argv = heap_alloc(length * sizeof(VARIANT)); - if(FAILED(hres)) + if(!argv) return E_OUTOFMEMORY; for(i=0; i<length; i++) {

1 0

Francois Gouget : dplayx/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: ea71c9e5fd0654e1aa8725746bfd1f9b82d0d169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea71c9e5fd0654e1aa8725746… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 31 11:52:28 2009 +0200 dplayx/tests: Fix compilation on systems that don't support nameless unions. --- dlls/dplayx/tests/dplayx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 3eba147..6636999 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6241,7 +6241,7 @@ static void test_host_migration(void) check( 0, lpData->dwLocalDataSize ); checkLP( NULL, lpData->lpRemoteData ); check( 0, lpData->dwRemoteDataSize ); - checkLP( NULL, lpData->dpnName.lpszShortNameA ); + checkLP( NULL, U1(lpData->dpnName).lpszShortNameA ); check( 0, lpData->dpIdParent ); checkFlags( 0, lpData->dwFlags, FLAGS_DPPLAYER | FLAGS_DPGROUP );

1 0