September 2012 - Wine-Commits

Ken Thomases : winex11: Avoid a redundant TRACE.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 58441052231184f7278adcbffa129f4d9c8ef97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=58441052231184f7278adcbff… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Sep 22 15:44:42 2012 -0500 winex11: Avoid a redundant TRACE. --- dlls/winex11.drv/event.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 4e4b816..514f0d4 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1209,14 +1209,17 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat } TRACE( "not restoring to max win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } - else if (style & (WS_MINIMIZE | WS_MAXIMIZE)) + else { - TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); - release_win_data( data ); - SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); - return; + if (style & (WS_MINIMIZE | WS_MAXIMIZE)) + { + TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); + release_win_data( data ); + SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + return; + } + TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } - TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } else if (!data->iconic && data->wm_state == IconicState) {

1 0

Thomas Faber : rpcrt4: Match MSVC version of call_server_func with GCC.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 25b76525f3f6edfcf630f235ccf15e395d009e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b76525f3f6edfcf630f235c… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat Sep 22 12:38:11 2012 +0200 rpcrt4: Match MSVC version of call_server_func with GCC. --- dlls/rpcrt4/ndr_stubless.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index db41a1a..d7a81bd 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -990,11 +990,12 @@ __declspec(naked) LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigne __asm { push ebp + mov ebp, esp push edi ; Save registers push esi - mov ebp, esp mov eax, [ebp+16] ; Get stack size sub esp, eax ; Make room in stack for arguments + and esp, 0xFFFFFFF0 mov edi, esp mov ecx, eax mov esi, [ebp+12]

1 0

Alexandre Julliard : winex11: Add window data structure locking to the SysCommand entry point.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 803fc6e27c2507a2cefe57d53bdbaab1770f3854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=803fc6e27c2507a2cefe57d53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 13:41:20 2012 +0200 winex11: Add window data structure locking to the SysCommand entry point. --- dlls/winex11.drv/window.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4ff3678..66588d1 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2397,8 +2397,8 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) int dir; struct x11drv_win_data *data; - if (!(data = X11DRV_get_win_data( hwnd ))) return -1; - if (!data->whole_window || !data->managed || !data->mapped) return -1; + if (!(data = get_win_data( hwnd ))) return -1; + if (!data->whole_window || !data->managed || !data->mapped) goto failed; switch (wparam & 0xfff0) { @@ -2408,7 +2408,7 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) break; case SC_SIZE: /* windows without WS_THICKFRAME are not resizable through the window manager */ - if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_THICKFRAME)) return -1; + if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_THICKFRAME)) goto failed; switch (hittest) { @@ -2427,24 +2427,30 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) case SC_KEYMENU: /* prevent a simple ALT press+release from activating the system menu, * as that can get confusing on managed windows */ - if ((WCHAR)lparam) return -1; /* got an explicit char */ - if (GetMenu( hwnd )) return -1; /* window has a real menu */ - if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_SYSMENU)) return -1; /* no system menu */ + if ((WCHAR)lparam) goto failed; /* got an explicit char */ + if (GetMenu( hwnd )) goto failed; /* window has a real menu */ + if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_SYSMENU)) goto failed; /* no system menu */ TRACE( "ignoring SC_KEYMENU wp %lx lp %lx\n", wparam, lparam ); + release_win_data( data ); return 0; default: - return -1; + goto failed; } - if (IsZoomed(hwnd)) return -1; + if (IsZoomed(hwnd)) goto failed; if (!is_netwm_supported( data->display, x11drv_atom(_NET_WM_MOVERESIZE) )) { TRACE( "_NET_WM_MOVERESIZE not supported\n" ); - return -1; + goto failed; } + release_win_data( data ); move_resize_window( hwnd, dir ); return 0; + +failed: + release_win_data( data ); + return -1; }

1 0

Alexandre Julliard : winex11: Add window data structure locking to the WindowPosChanging/ Changed entry points.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 4c58210390d9f8a6b6662b61f0e87a736cc0e1fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c58210390d9f8a6b6662b61f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 14:06:42 2012 +0200 winex11: Add window data structure locking to the WindowPosChanging/Changed entry points. --- dlls/winex11.drv/window.c | 109 ++++++++++++++++++++++++++++----------------- 1 files changed, 68 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c58210390d9f8a6b6662…

1 0

Jacek Caban : mshtml: Added support for overriding builtin functions.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 6d3bfe8ee5a0bcfd8170b214e0fa422a5350195c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3bfe8ee5a0bcfd8170b214e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 24 14:10:05 2012 +0200 mshtml: Added support for overriding builtin functions. --- dlls/mshtml/dispex.c | 135 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 107 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index eca45a6..cc22ce4 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -74,15 +74,21 @@ typedef struct { typedef struct { DispatchEx dispex; IUnknown IUnknown_iface; + LONG ref; DispatchEx *obj; func_info_t *info; } func_disp_t; +typedef struct { + func_disp_t *func_obj; + IDispatch *val; +} func_obj_entry_t; + struct dispex_dynamic_data_t { DWORD buf_size; DWORD prop_cnt; dynamic_prop_t *props; - func_disp_t **func_disps; + func_obj_entry_t *func_disps; }; #define DISPID_DYNPROP_0 0x50000000 @@ -575,19 +581,27 @@ static HRESULT WINAPI Function_QueryInterface(IUnknown *iface, REFIID riid, void static ULONG WINAPI Function_AddRef(IUnknown *iface) { func_disp_t *This = impl_from_IUnknown(iface); + LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p) ref=%d\n", This, ref); - return IDispatchEx_AddRef(&This->obj->IDispatchEx_iface); + return ref; } static ULONG WINAPI Function_Release(IUnknown *iface) { func_disp_t *This = impl_from_IUnknown(iface); + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p) ref=%d\n", This, ref); - return IDispatchEx_Release(&This->obj->IDispatchEx_iface); + if(!ref) { + assert(!This->obj); + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; } static const IUnknownVtbl FunctionUnkVtbl = { @@ -613,6 +627,8 @@ static HRESULT function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return E_INVALIDARG; /* fall through */ case DISPATCH_METHOD: + if(!This->obj) + return E_UNEXPECTED; hres = typeinfo_invoke(This->obj, This->info, flags, params, res, ei); break; default: @@ -649,6 +665,7 @@ static func_disp_t *create_func_disp(DispatchEx *obj, func_info_t *info) ret->IUnknown_iface.lpVtbl = &FunctionUnkVtbl; init_dispex(&ret->dispex, &ret->IUnknown_iface, &function_dispex); + ret->ref = 1; ret->obj = obj; ret->info = info; @@ -696,6 +713,37 @@ static HRESULT invoke_disp_value(DispatchEx *This, IDispatch *func_disp, LCID lc return hres; } +static HRESULT get_func_obj_entry(DispatchEx *This, func_info_t *func, func_obj_entry_t **ret) +{ + dispex_dynamic_data_t *dynamic_data; + + dynamic_data = get_dynamic_data(This); + if(!dynamic_data) + return E_OUTOFMEMORY; + + if(!dynamic_data->func_disps) { + dynamic_data->func_disps = heap_alloc_zero(This->data->data->func_disp_cnt * sizeof(*dynamic_data->func_disps)); + if(!dynamic_data->func_disps) + return E_OUTOFMEMORY; + } + + if(!dynamic_data->func_disps[func->func_disp_idx].func_obj) { + func_disp_t *func_obj; + + func_obj = create_func_disp(This, func); + if(!func_obj) + return E_OUTOFMEMORY; + + dynamic_data->func_disps[func->func_disp_idx].func_obj = func_obj; + + IDispatchEx_AddRef(&func_obj->dispex.IDispatchEx_iface); + dynamic_data->func_disps[func->func_disp_idx].val = (IDispatch*)&func_obj->dispex.IDispatchEx_iface; + } + + *ret = dynamic_data->func_disps+func->func_disp_idx; + return S_OK; +} + static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei) { @@ -707,10 +755,25 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, return E_INVALIDARG; /* fall through */ case DISPATCH_METHOD: + if(This->dynamic_data && This->dynamic_data && This->dynamic_data->func_disps + && This->dynamic_data->func_disps[func->func_disp_idx].func_obj) { + func_obj_entry_t *entry = This->dynamic_data->func_disps + func->func_disp_idx; + + if((IDispatch*)&entry->func_obj->dispex.IDispatchEx_iface != entry->val) { + if(!entry->val) { + FIXME("Calling null\n"); + return E_FAIL; + } + + hres = invoke_disp_value(This, entry->val, 0, flags, dp, res, ei, NULL); + break; + } + } + hres = typeinfo_invoke(This, func, flags, dp, res, ei); break; case DISPATCH_PROPERTYGET: { - dispex_dynamic_data_t *dynamic_data; + func_obj_entry_t *entry; if(func->id == DISPID_VALUE) { BSTR ret; @@ -724,32 +787,46 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, return S_OK; } - dynamic_data = get_dynamic_data(This); - if(!dynamic_data) - return E_OUTOFMEMORY; + hres = get_func_obj_entry(This, func, &entry); + if(FAILED(hres)) + return hres; - if(!dynamic_data->func_disps) { - dynamic_data->func_disps = heap_alloc_zero(This->data->data->func_disp_cnt * sizeof(func_disp_t*)); - if(!dynamic_data->func_disps) - return E_OUTOFMEMORY; - } + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = entry->val; + if(V_DISPATCH(res)) + IDispatch_AddRef(V_DISPATCH(res)); + hres = S_OK; + break; + } + case DISPATCH_PROPERTYPUT: { + func_obj_entry_t *entry; + VARIANT *v; - if(!dynamic_data->func_disps[func->func_disp_idx]) { - dynamic_data->func_disps[func->func_disp_idx] = create_func_disp(This, func); - if(!dynamic_data->func_disps[func->func_disp_idx]) - return E_OUTOFMEMORY; + if(dp->cArgs != 1 || (dp->cNamedArgs == 1 && *dp->rgdispidNamedArgs != DISPID_PROPERTYPUT) + || dp->cNamedArgs > 1) { + FIXME("invalid args\n"); + return E_INVALIDARG; } - V_VT(res) = VT_DISPATCH; - V_DISPATCH(res) = (IDispatch*)&dynamic_data->func_disps[func->func_disp_idx]->dispex.IDispatchEx_iface; - IDispatch_AddRef(V_DISPATCH(res)); + v = dp->rgvarg; + /* FIXME: not exactly right */ + if(V_VT(v) != VT_DISPATCH) + return E_NOTIMPL; + + hres = get_func_obj_entry(This, func, &entry); + if(FAILED(hres)) + return hres; + + if(entry->val) + IDispatch_Release(entry->val); + entry->val = V_DISPATCH(v); + if(entry->val) + IDispatch_AddRef(entry->val); hres = S_OK; break; } default: FIXME("Unimplemented flags %x\n", flags); - /* fall through */ - case DISPATCH_PROPERTYPUT: hres = E_NOTIMPL; } @@ -1445,13 +1522,15 @@ void release_dispex(DispatchEx *This) heap_free(This->dynamic_data->props); if(This->dynamic_data->func_disps) { - unsigned i; + func_obj_entry_t *iter; - for(i=0; i < This->data->data->func_disp_cnt; i++) { - if(This->dynamic_data->func_disps[i]) { - release_dispex(&This->dynamic_data->func_disps[i]->dispex); - heap_free(This->dynamic_data->func_disps[i]); + for(iter = This->dynamic_data->func_disps; iter < This->dynamic_data->func_disps+This->data->data->func_disp_cnt; iter++) { + if(iter->func_obj) { + iter->func_obj->obj = NULL; + IDispatchEx_Release(&iter->func_obj->dispex.IDispatchEx_iface); } + if(iter->val) + IDispatch_Release(iter->val); } heap_free(This->dynamic_data->func_disps);

1 0

Nikolay Sivov : mlang: Store source and destination codepage ids in IMLangConvertCharset_Initialize .
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: ed42bf08dbd5077adf0db2ea6468f7f27cd9c418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed42bf08dbd5077adf0db2ea6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 24 01:15:11 2012 +0400 mlang: Store source and destination codepage ids in IMLangConvertCharset_Initialize. --- dlls/mlang/mlang.c | 15 +++++++++++++-- include/mlang.idl | 11 +++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index b5fd0eb..388b99c 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3563,6 +3563,9 @@ static const IMLangLineBreakConsoleVtbl IMLangLineBreakConsole_vtbl = struct convert_charset { IMLangConvertCharset IMLangConvertCharset_iface; LONG ref; + + UINT src_cp; + UINT dst_cp; }; static inline struct convert_charset *impl_from_IMLangConvertCharset(IMLangConvertCharset *iface) @@ -3614,8 +3617,16 @@ static HRESULT WINAPI MLangConvertCharset_Initialize(IMLangConvertCharset *iface UINT src_cp, UINT dst_cp, DWORD prop) { struct convert_charset *This = impl_from_IMLangConvertCharset(iface); - FIXME("(%p)->(%u %u 0x%08x): stub\n", This, src_cp, dst_cp, prop); - return E_NOTIMPL; + + TRACE("(%p)->(%u %u 0x%08x)\n", This, src_cp, dst_cp, prop); + + if (prop) + FIXME("property 0x%08x not supported\n", prop); + + This->src_cp = src_cp; + This->dst_cp = dst_cp; + + return S_OK; } static HRESULT WINAPI MLangConvertCharset_GetSourceCodePage(IMLangConvertCharset *iface, UINT *src_cp) diff --git a/include/mlang.idl b/include/mlang.idl index 7cdc970..e153565 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -375,6 +375,17 @@ interface IEnumCodePage : IUnknown ] interface IMLangConvertCharset : IUnknown { + typedef enum tagMLCONVCHARF + { + MLCONVCHARF_AUTODETECT = 1, + MLCONVCHARF_ENTITIZE = 2, + MLCONVCHARF_NCR_ENTITIZE = 2, + MLCONVCHARF_NAME_ENTITIZE = 4, + MLCONVCHARF_USEDEFCHAR = 8, + MLCONVCHARF_NOBESTFITCHARS = 16, + MLCONVCHARF_DETECTJPN = 32 + } MLCONVCHAR; + HRESULT Initialize( [in] UINT uiSrcCodePage, [in] UINT uiDstCodePage,

1 0

Christian Costa : d3dx9_36: Add stub for D3DXCleanMesh.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: fcb9c5fadbf0b070bee1b300623c2c9e8f88780e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb9c5fadbf0b070bee1b3006… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 23 20:45:44 2012 +0200 d3dx9_36: Add stub for D3DXCleanMesh. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 5c880a4..4278ae1 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -8,7 +8,7 @@ @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr ptr) @ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr ptr) -@ stub D3DXCleanMesh(ptr ptr ptr ptr ptr) +@ stdcall D3DXCleanMesh(long ptr ptr ptr ptr ptr) @ stdcall D3DXColorAdjustContrast(ptr ptr float) @ stdcall D3DXColorAdjustSaturation(ptr ptr float) @ stdcall D3DXCompileShader(ptr long ptr ptr str str long ptr ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 35365eb..de4049a 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3818,6 +3818,14 @@ cleanup: return hr; } +HRESULT WINAPI D3DXCleanMesh(D3DXCLEANTYPE clean_type, LPD3DXMESH mesh_in, const DWORD *adjacency_in, + LPD3DXMESH *mesh_out, DWORD *adjacency_out, LPD3DXBUFFER *errors_and_warnings) +{ + FIXME("(%u, %p, %p, %p, %p, %p)\n", clean_type, mesh_in, adjacency_in, mesh_out, adjacency_out, errors_and_warnings); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME frame, LPD3DXALLOCATEHIERARCHY alloc_hier) { HRESULT hr;

1 0

Francois Gouget : wininet: Make URLCacheContainers_{Create, Delete}All() static.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 51c90eba233540c6c0018f30d6790bab0e092755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c90eba233540c6c0018f30d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 08:42:21 2012 +0200 wininet: Make URLCacheContainers_{Create,Delete}All() static. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 87789fe..89be901 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -542,7 +542,7 @@ static void URLCacheContainer_DeleteContainer(URLCACHECONTAINER * pContainer) heap_free(pContainer); } -void URLCacheContainers_CreateDefaults(void) +static void URLCacheContainers_CreateDefaults(void) { static const WCHAR UrlSuffix[] = {'C','o','n','t','e','n','t','.','I','E','5',0}; static const WCHAR UrlPrefix[] = {0}; @@ -601,7 +601,7 @@ void URLCacheContainers_CreateDefaults(void) } } -void URLCacheContainers_DeleteAll(void) +static void URLCacheContainers_DeleteAll(void) { while(!list_empty(&UrlContainers)) URLCacheContainer_DeleteContainer(

1 0

Alistair Leslie-Hughes : oledb32: Add IDataInitialize interface support.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 0fd6649988b72837d17de7fe28d10ec967cde801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fd6649988b72837d17de7fe2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 24 14:20:13 2012 +1000 oledb32: Add IDataInitialize interface support. --- dlls/oledb32/Makefile.in | 1 + dlls/oledb32/datainit.c | 193 ++++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/main.c | 7 ++ dlls/oledb32/oledb_private.h | 1 + 4 files changed, 202 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index 5c66a2c..71e352b 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = uuid oleaut32 ole32 user32 advapi32 C_SRCS = \ convert.c \ + datainit.c \ main.c IDL_I_SRCS = convert.idl diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c new file mode 100644 index 0000000..af596fe --- /dev/null +++ b/dlls/oledb32/datainit.c @@ -0,0 +1,193 @@ +/* + * Copyright (C) 2012 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "ole2.h" +#include "msdasc.h" +#include "oledberr.h" + +#include "oledb_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oledb); + + +typedef struct datainit +{ + IDataInitialize IDataInitialize_iface; + + LONG ref; +} datainit; + +static inline datainit *impl_from_IDataInitialize(IDataInitialize *iface) +{ + return CONTAINING_RECORD(iface, datainit, IDataInitialize_iface); +} + +static HRESULT WINAPI datainit_QueryInterface(IDataInitialize *iface, REFIID riid, void **obj) +{ + datainit *This = impl_from_IDataInitialize(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); + + *obj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDataInitialize)) + { + *obj = &This->IDataInitialize_iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IDataInitialize_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI datainit_AddRef(IDataInitialize *iface) +{ + datainit *This = impl_from_IDataInitialize(iface); + TRACE("(%p)\n", This); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI datainit_Release(IDataInitialize *iface) +{ + datainit *This = impl_from_IDataInitialize(iface); + LONG ref; + + TRACE("(%p)\n", This); + + ref = InterlockedDecrement(&This->ref); + if(ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +/*** IDataInitialize methods ***/ +static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *pUnkOuter, DWORD dwClsCtx, + LPWSTR pwszInitializationString, REFIID riid, IUnknown **ppDataSource) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->(%p %d %s %s %p)\n", This, pUnkOuter, dwClsCtx, debugstr_w(pwszInitializationString), + debugstr_guid(riid), ppDataSource); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, IUnknown *pDataSource, + boolean fIncludePassword, LPWSTR *ppwszInitString) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->(%p %d %p)\n", This, pDataSource, fIncludePassword, ppwszInitString); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_CreateDBInstance(IDataInitialize *iface, REFCLSID clsidProvider, + IUnknown *pUnkOuter, DWORD dwClsCtx, LPWSTR pwszReserved, REFIID riid, + IUnknown **ppDataSource) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->()\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_RemoteCreateDBInstanceEx(IDataInitialize *iface, REFCLSID clsidProvider, + IUnknown *pUnkOuter, DWORD dwClsCtx, LPWSTR pwszReserved, COSERVERINFO *pServerInfo, + DWORD cmq, GUID **rgpIID, IUnknown **rgpItf, HRESULT *rghr) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->()\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_LoadStringFromStorage(IDataInitialize *iface, LPWSTR pwszFileName, + LPWSTR *ppwszInitializationString) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->(%s %p)\n", This, debugstr_w(pwszFileName), ppwszInitializationString); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_WriteStringToStorage(IDataInitialize *iface, LPWSTR pwszFileName, + LPWSTR pwszInitializationString, DWORD dwCreationDisposition) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->(%s %s %d)\n", This, debugstr_w(pwszFileName), debugstr_w(pwszInitializationString), dwCreationDisposition); + + return E_NOTIMPL; +} + + +static const struct IDataInitializeVtbl datainit_vtbl = +{ + datainit_QueryInterface, + datainit_AddRef, + datainit_Release, + datainit_GetDataSource, + datainit_GetInitializationString, + datainit_CreateDBInstance, + datainit_RemoteCreateDBInstanceEx, + datainit_LoadStringFromStorage, + datainit_WriteStringToStorage +}; + +HRESULT create_data_init(IUnknown *outer, void **obj) +{ + datainit *This; + + TRACE("(%p)\n", obj); + + if(outer) return CLASS_E_NOAGGREGATION; + + *obj = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if(!This) return E_OUTOFMEMORY; + + This->IDataInitialize_iface.lpVtbl = &datainit_vtbl; + This->ref = 1; + + *obj = &This->IDataInitialize_iface; + + return S_OK; +} diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c index af81d77..e8a1d46 100644 --- a/dlls/oledb32/main.c +++ b/dlls/oledb32/main.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "ole2.h" #include "rpcproxy.h" +#include "msdasc.h" #include "initguid.h" #include "msdaguid.h" @@ -127,6 +128,7 @@ static const IClassFactoryVtbl CF_Vtbl = }; static cf oledb_convert_cf = { { &CF_Vtbl }, create_oledb_convert }; +static cf oledb_datainit_cf = { { &CF_Vtbl }, create_data_init }; /****************************************************************** * DllGetClassObject @@ -140,6 +142,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) *obj = &oledb_convert_cf; return S_OK; } + else if ( IsEqualCLSID (rclsid, &CLSID_MSDAINITIALIZE) ) + { + *obj = &oledb_datainit_cf; + return S_OK; + } return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index a79d251..ad5d67f 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -18,3 +18,4 @@ */ HRESULT create_oledb_convert(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; +HRESULT create_data_init(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : uuid: Add msdasc.h.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: eda7615d699eb01a73e7bf7e30b12b7e804459e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda7615d699eb01a73e7bf7e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 24 13:44:00 2012 +1000 uuid: Add msdasc.h. --- dlls/uuid/uuid.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index cae55c7..fd96fe3 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -84,6 +84,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "ocmm.h" #include "commoncontrols.h" #include "tlogstg.h" +#include "msdasc.h" /* FIXME: cguids declares GUIDs but does not define their values */

1 0