September 2009 - Wine-commits

Francois Gouget : msctf: Make ThreadFocusHookProc() static.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 4e53bbda2e6ccc5bf5389a2b7c42264d06c1553d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e53bbda2e6ccc5bf5389a2b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 10 17:58:54 2009 +0200 msctf: Make ThreadFocusHookProc() static. --- dlls/msctf/threadmgr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 683a6f3..85b11a1 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -434,7 +434,7 @@ static HRESULT WINAPI ThreadMgr_SetFocus( ITfThreadMgr* iface, ITfDocumentMgr *p return S_OK; } -LRESULT CALLBACK ThreadFocusHookProc(int nCode, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK ThreadFocusHookProc(int nCode, WPARAM wParam, LPARAM lParam) { ThreadMgr *This;

1 0

Francois Gouget : msctf: Reorder a couple of functions to avoid forward declarations.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 80f862dedff6ec9893bbf01d0e431c64141548d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f862dedff6ec9893bbf01d0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 10 17:58:44 2009 +0200 msctf: Reorder a couple of functions to avoid forward declarations. --- dlls/msctf/threadmgr.c | 105 ++++++++++++++++++++++++------------------------ 1 files changed, 52 insertions(+), 53 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index a001792..683a6f3 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -126,7 +126,6 @@ typedef struct tagEnumTfDocumentMgr { } EnumTfDocumentMgr; static HRESULT EnumTfDocumentMgr_Constructor(struct list* head, IEnumTfDocumentMgrs **ppOut); -LRESULT CALLBACK ThreadFocusHookProc(int nCode, WPARAM wParam, LPARAM lParam); static inline ThreadMgr *impl_from_ITfSourceVtbl(ITfSource *iface) { @@ -159,22 +158,6 @@ static inline ThreadMgr *impl_from_ITfSourceSingleVtbl(ITfSourceSingle* iface) return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,SourceSingleVtbl)); } -static HRESULT SetupWindowsHook(ThreadMgr *This) -{ - if (!This->focusHook) - { - This->focusHook = SetWindowsHookExW(WH_CBT, ThreadFocusHookProc, 0, - GetCurrentThreadId()); - if (!This->focusHook) - { - ERR("Unable to set focus hook\n"); - return E_FAIL; - } - return S_OK; - } - return S_FALSE; -} - static void free_sink(ThreadMgrSink *sink) { IUnknown_Release(sink->interfaces.pIUnknown); @@ -451,6 +434,58 @@ static HRESULT WINAPI ThreadMgr_SetFocus( ITfThreadMgr* iface, ITfDocumentMgr *p return S_OK; } +LRESULT CALLBACK ThreadFocusHookProc(int nCode, WPARAM wParam, LPARAM lParam) +{ + ThreadMgr *This; + + This = TlsGetValue(tlsIndex); + if (!This) + { + ERR("Hook proc but no ThreadMgr for this thread. Serious Error\n"); + return 0; + } + if (!This->focusHook) + { + ERR("Hook proc but no ThreadMgr focus Hook. Serious Error\n"); + return 0; + } + + if (nCode == HCBT_SETFOCUS) /* focus change within our thread */ + { + struct list *cursor; + + LIST_FOR_EACH(cursor, &This->AssociatedFocusWindows) + { + AssociatedWindow *wnd = LIST_ENTRY(cursor,AssociatedWindow,entry); + if (wnd->hwnd == (HWND)wParam) + { + TRACE("Triggering Associated window focus\n"); + if (This->focus != wnd->docmgr) + ThreadMgr_SetFocus((ITfThreadMgr*)This, wnd->docmgr); + break; + } + } + } + + return CallNextHookEx(This->focusHook, nCode, wParam, lParam); +} + +static HRESULT SetupWindowsHook(ThreadMgr *This) +{ + if (!This->focusHook) + { + This->focusHook = SetWindowsHookExW(WH_CBT, ThreadFocusHookProc, 0, + GetCurrentThreadId()); + if (!This->focusHook) + { + ERR("Unable to set focus hook\n"); + return E_FAIL; + } + return S_OK; + } + return S_FALSE; +} + static HRESULT WINAPI ThreadMgr_AssociateFocus( ITfThreadMgr* iface, HWND hwnd, ITfDocumentMgr *pdimNew, ITfDocumentMgr **ppdimPrev) { @@ -1436,39 +1471,3 @@ void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *tm, ITfDocumentMgr *mgr) } FIXME("ITfDocumenMgr %p not found in this thread\n",mgr); } - -LRESULT CALLBACK ThreadFocusHookProc(int nCode, WPARAM wParam, LPARAM lParam) -{ - ThreadMgr *This; - - This = TlsGetValue(tlsIndex); - if (!This) - { - ERR("Hook proc but no ThreadMgr for this thread. Serious Error\n"); - return 0; - } - if (!This->focusHook) - { - ERR("Hook proc but no ThreadMgr focus Hook. Serious Error\n"); - return 0; - } - - if (nCode == HCBT_SETFOCUS) /* focus change within our thread */ - { - struct list *cursor; - - LIST_FOR_EACH(cursor, &This->AssociatedFocusWindows) - { - AssociatedWindow *wnd = LIST_ENTRY(cursor,AssociatedWindow,entry); - if (wnd->hwnd == (HWND)wParam) - { - TRACE("Triggering Associated window focus\n"); - if (This->focus != wnd->docmgr) - ThreadMgr_SetFocus((ITfThreadMgr*)This, wnd->docmgr); - break; - } - } - } - - return CallNextHookEx(This->focusHook, nCode, wParam, lParam); -}

1 0

Francois Gouget : msctf/tests: Make _sink_check_ok() static.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 08c6eca9b5b3f402dd0f101576d94b1927fcc90a URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c6eca9b5b3f402dd0f10157… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 10 17:59:03 2009 +0200 msctf/tests: Make _sink_check_ok() static. --- dlls/msctf/tests/inputprocessor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 732ab0f..6267f4a 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -118,7 +118,7 @@ static inline void _sink_fire_ok(INT *sink, const CHAR* name) #define sink_fire_ok(a,b) (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _sink_fire_ok(a,b) -inline void _sink_check_ok(INT *sink, const CHAR* name) +static inline void _sink_check_ok(INT *sink, const CHAR* name) { int action = *sink & SINK_ACTION_MASK;

1 0

Francois Gouget : jscript: Add a trailing '\n' to a FIXME().
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 78210e17fab6ff602ee67b35f72465c0ed61001b URL: http://source.winehq.org/git/wine.git/?a=commit;h=78210e17fab6ff602ee67b35f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 10 17:58:59 2009 +0200 jscript: Add a trailing '\n' to a FIXME(). --- dlls/jscript/engine.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1ff5eb3..efd5e46 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2036,7 +2036,7 @@ static HRESULT in_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *obj, jsexcept_t HRESULT hres; if(V_VT(obj) != VT_DISPATCH) { - FIXME("throw TypeError"); + FIXME("throw TypeError\n"); return E_FAIL; }

1 0

Francois Gouget : uninstaller: Perform a case-insensitive search for the application to uninstall.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: a4d391d65a74ff042f3af66d3afc90218b01019c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d391d65a74ff042f3af66d3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 10 17:58:18 2009 +0200 uninstaller: Perform a case-insensitive search for the application to uninstall. Registry keys are case-insensitive so the match should be too. --- programs/uninstaller/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 302d834..912d23d 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -98,7 +98,7 @@ static void RemoveSpecificProgram(WCHAR *nameW) for (i=0; i < numentries; i++) { - if (lstrcmpW(entries[i].key, nameW) == 0) + if (CompareStringW(GetThreadLocale(), NORM_IGNORECASE, entries[i].key, -1, nameW, -1) == CSTR_EQUAL) { entries[i].active++; break;

1 0

Henri Verbeet : dxgi: Add a separate function for dxgi_adapter initialization.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 7170a20239fc74fdb9ac6c69734070cb405abc7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7170a20239fc74fdb9ac6c697… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 10 16:57:19 2009 +0200 dxgi: Add a separate function for dxgi_adapter initialization. --- dlls/dxgi/adapter.c | 10 +++++++++- dlls/dxgi/dxgi_main.c | 5 +---- dlls/dxgi/dxgi_private.h | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index d2c64ad..2bc5fcc 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -142,7 +142,7 @@ static UINT STDMETHODCALLTYPE dxgi_adapter_get_ordinal(IWineDXGIAdapter *iface) return This->ordinal; } -const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = +static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = { /* IUnknown methods */ dxgi_adapter_QueryInterface, @@ -160,3 +160,11 @@ const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = /* IWineDXGIAdapter methods */ dxgi_adapter_get_ordinal, }; + +void dxgi_adapter_init(struct dxgi_adapter *adapter, IDXGIFactory *parent, UINT ordinal) +{ + adapter->vtbl = &dxgi_adapter_vtbl; + adapter->parent = parent; + adapter->refcount = 1; + adapter->ordinal = ordinal; +} diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index f4acef3..876a85c 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -129,10 +129,7 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) goto fail; } - adapter->vtbl = &dxgi_adapter_vtbl; - adapter->refcount = 1; - adapter->ordinal = i; - adapter->parent = (IDXGIFactory *)object; + dxgi_adapter_init(adapter, (IDXGIFactory *)object, i); object->adapters[i] = (IDXGIAdapter *)adapter; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 54446ef..a5b62b8 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -64,7 +64,6 @@ struct dxgi_device }; /* IDXGIAdapter */ -extern const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl; struct dxgi_adapter { const struct IWineDXGIAdapterVtbl *vtbl; @@ -73,6 +72,8 @@ struct dxgi_adapter UINT ordinal; }; +void dxgi_adapter_init(struct dxgi_adapter *adapter, IDXGIFactory *parent, UINT ordinal); + /* IDXGISwapChain */ extern const struct IDXGISwapChainVtbl dxgi_swapchain_vtbl; struct dxgi_swapchain

1 0

Henri Verbeet : d3d10core: Implement ID3D10Device::DrawIndexed().
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: fa07d93730a59d21752daae08502cb454601af8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa07d93730a59d21752daae08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 10 16:57:18 2009 +0200 d3d10core: Implement ID3D10Device::DrawIndexed(). --- dlls/d3d10core/device.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ed9b149..3808dfb 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -153,8 +153,13 @@ static void STDMETHODCALLTYPE d3d10_device_VSSetShader(ID3D10Device *iface, ID3D static void STDMETHODCALLTYPE d3d10_device_DrawIndexed(ID3D10Device *iface, UINT index_count, UINT start_index_location, INT base_vertex_location) { - FIXME("iface %p, index_count %u, start_index_location %u, base_vertex_location %d stub!\n", + struct d3d10_device *This = (struct d3d10_device *)iface; + + TRACE("iface %p, index_count %u, start_index_location %u, base_vertex_location %d.\n", iface, index_count, start_index_location, base_vertex_location); + + IWineD3DDevice_SetBaseVertexIndex(This->wined3d_device, base_vertex_location); + IWineD3DDevice_DrawIndexedPrimitive(This->wined3d_device, start_index_location, index_count); } static void STDMETHODCALLTYPE d3d10_device_Draw(ID3D10Device *iface,

1 0

Henri Verbeet : d3d10core: Add an initial implementation of ID3D10Device:: IASetIndexBuffer().
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 956e800c81155fe7be84b562ebce0bec044a2e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956e800c81155fe7be84b562e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 10 16:57:17 2009 +0200 d3d10core: Add an initial implementation of ID3D10Device::IASetIndexBuffer(). --- dlls/d3d10core/device.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index d51e302..ed9b149 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -205,8 +205,14 @@ static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *ifac static void STDMETHODCALLTYPE d3d10_device_IASetIndexBuffer(ID3D10Device *iface, ID3D10Buffer *buffer, DXGI_FORMAT format, UINT offset) { - FIXME("iface %p, buffer %p, format %s, offset %u stub!\n", + struct d3d10_device *This = (struct d3d10_device *)iface; + + TRACE("iface %p, buffer %p, format %s, offset %u.\n", iface, buffer, debug_dxgi_format(format), offset); + + IWineD3DDevice_SetIndices(This->wined3d_device, buffer ? ((struct d3d10_buffer *)buffer)->wined3d_buffer : NULL, + wined3dformat_from_dxgi_format(format)); + if (offset) FIXME("offset %u not supported.\n", offset); } static void STDMETHODCALLTYPE d3d10_device_DrawIndexedInstanced(ID3D10Device *iface,

1 0

Henri Verbeet : wined3d: Remove unused parameters to drawPrimitive().
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 2b2fc827ce1f340554cc8d01f6b183d4a5c02114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2fc827ce1f340554cc8d01f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 10 16:57:16 2009 +0200 wined3d: Remove unused parameters to drawPrimitive(). --- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 6 +++--- dlls/ddraw/device.c | 8 +++----- dlls/wined3d/device.c | 33 ++++++++++++++------------------- dlls/wined3d/drawprim.c | 35 ++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 3 +-- include/wine/wined3d.idl | 4 ---- 7 files changed, 36 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b2fc827ce1f340554cc8…

1 0

Henri Verbeet : d3d10: Move effect variable vtable initialization to parse_fx10_variable_head().
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: ff5991ce42d65fbb0aa3b49e03d22d092fc5dc7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff5991ce42d65fbb0aa3b49e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 10 16:57:15 2009 +0200 d3d10: Move effect variable vtable initialization to parse_fx10_variable_head(). --- dlls/d3d10/effect.c | 46 +++++++++++++++++++++------------------------- 1 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index c80cf56..fa9c509 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -449,6 +449,27 @@ static HRESULT parse_fx10_variable_head(struct d3d10_effect_variable *v, const c return E_FAIL; } + switch (v->type->type_class) + { + case D3D10_SVC_SCALAR: + v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_scalar_variable_vtbl; + break; + + case D3D10_SVC_VECTOR: + v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_vector_variable_vtbl; + break; + + case D3D10_SVC_MATRIX_ROWS: + case D3D10_SVC_MATRIX_COLUMNS: + v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl; + break; + + default: + FIXME("Unhandled type class %s.\n", debug_d3d10_shader_variable_class(v->type->type_class)); + v->vtbl = &d3d10_effect_variable_vtbl; + break; + } + return S_OK; } @@ -554,7 +575,6 @@ static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char **ptr, co { struct d3d10_effect_variable *a = &p->annotations[i]; - a->vtbl = &d3d10_effect_variable_vtbl; a->effect = p->technique->effect; hr = parse_fx10_annotation(a, ptr, data); @@ -615,7 +635,6 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char { struct d3d10_effect_variable *a = &t->annotations[i]; - a->vtbl = &d3d10_effect_variable_vtbl; a->effect = t->effect; hr = parse_fx10_annotation(a, ptr, data); @@ -651,27 +670,6 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * hr = parse_fx10_variable_head(v, ptr, data); if (FAILED(hr)) return hr; - switch (v->type->type_class) - { - case D3D10_SVC_SCALAR: - v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_scalar_variable_vtbl; - break; - - case D3D10_SVC_VECTOR: - v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_vector_variable_vtbl; - break; - - case D3D10_SVC_MATRIX_ROWS: - case D3D10_SVC_MATRIX_COLUMNS: - v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl; - break; - - default: - FIXME("Unhandled type class %s.\n", debug_d3d10_shader_variable_class(v->type->type_class)); - v->vtbl = &d3d10_effect_variable_vtbl; - break; - } - skip_dword_unknown(ptr, 1); read_dword(ptr, &v->buffer_offset); @@ -697,7 +695,6 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * struct d3d10_effect_variable *a = &v->annotations[i]; HRESULT hr; - a->vtbl = &d3d10_effect_variable_vtbl; a->effect = v->effect; hr = parse_fx10_annotation(a, ptr, data); @@ -748,7 +745,6 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons { struct d3d10_effect_variable *a = &l->annotations[i]; - a->vtbl = &d3d10_effect_variable_vtbl; a->effect = l->effect; hr = parse_fx10_annotation(a, ptr, data);

1 0