November 2012 - Wine-Commits

Jacek Caban : mshtml: Store embedder' s IOleComandTarget iface in HTMLDocumentObj and use it in handle_navigation_error .
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: f0b7db4df8622d6f4b36b32ce94f665d6cf8e503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b7db4df8622d6f4b36b32ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:58:27 2012 +0100 mshtml: Store embedder's IOleComandTarget iface in HTMLDocumentObj and use it in handle_navigation_error. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 11 +++-------- dlls/mshtml/oleobj.c | 9 +++++++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 74f1b39..3a02416 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -531,6 +531,7 @@ struct HTMLDocumentObj { IOleClientSite *client; IDocHostUIHandler *hostui; + IOleCommandTarget *client_cmdtrg; BOOL custom_hostui; IOleInPlaceSite *ipsite; IOleInPlaceFrame *frame; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9532a82..1c6b80c 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1450,7 +1450,6 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) { HTMLOuterWindow *outer_window; HTMLDocumentObj *doc; - IOleCommandTarget *olecmd; BOOL is_error_url; SAFEARRAY *sa; SAFEARRAYBOUND bound; @@ -1473,18 +1472,15 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) if(FAILED(hres) || is_error_url) return; - hres = IOleClientSite_QueryInterface(doc->client, - &IID_IOleCommandTarget, (void**)&olecmd); + if(!doc->client_cmdtrg) if(FAILED(hres)) return; bound.lLbound = 0; bound.cElements = 8; sa = SafeArrayCreate(VT_VARIANT, 1, &bound); - if(!sa) { - IOleCommandTarget_Release(olecmd); + if(!sa) return; - } ind = 0; V_VT(&var) = VT_I4; @@ -1532,11 +1528,10 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) V_ARRAY(&var) = sa; V_VT(&varOut) = VT_BOOL; V_BOOL(&varOut) = VARIANT_TRUE; - IOleCommandTarget_Exec(olecmd, &CGID_DocHostCmdPriv, 1, 0, &var, FAILED(hres)?NULL:&varOut); + IOleCommandTarget_Exec(doc->client_cmdtrg, &CGID_DocHostCmdPriv, 1, 0, &var, FAILED(hres)?NULL:&varOut); SysFreeString(unk); SafeArrayDestroy(sa); - IOleCommandTarget_Release(olecmd); } static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 0a1f97c..d62c306 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -231,6 +231,11 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->usermode = UNKNOWN_USERMODE; } + if(This->doc_obj->client_cmdtrg) { + IOleCommandTarget_Release(This->doc_obj->client_cmdtrg); + This->doc_obj->client_cmdtrg = NULL; + } + if(This->doc_obj->hostui && !This->doc_obj->custom_hostui) { IDocHostUIHandler_Release(This->doc_obj->hostui); This->doc_obj->hostui = NULL; @@ -319,6 +324,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite VARIANT var; OLECMD cmd = {OLECMDID_SETPROGRESSTEXT, 0}; + This->doc_obj->client_cmdtrg = cmdtrg; + if(!hostui_setup) { IDocObjectService *doc_object_service; IBrowserService *browser_service; @@ -361,8 +368,6 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSPOS, OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); - - IOleCommandTarget_Release(cmdtrg); } if(This->doc_obj->usermode == UNKNOWN_USERMODE)

1 0

Hans Leidekker : rpcrt4: Implement RpcMgmtIsServerListening.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: a5750a1fdf05960d03ad3fc30dd3e3a1c70408bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5750a1fdf05960d03ad3fc30… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 12 11:46:53 2012 +0100 rpcrt4: Implement RpcMgmtIsServerListening. --- dlls/rpcrt4/rpc_server.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 91b7707..4789d8a 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1663,8 +1663,14 @@ RPC_STATUS WINAPI RpcMgmtEpEltInqBegin(RPC_BINDING_HANDLE Binding, ULONG Inquiry */ RPC_STATUS WINAPI RpcMgmtIsServerListening(RPC_BINDING_HANDLE Binding) { - FIXME("(%p): stub\n", Binding); - return RPC_S_INVALID_BINDING; + RPC_STATUS status = RPC_S_NOT_LISTENING; + + TRACE("(%p)\n", Binding); + + EnterCriticalSection(&listen_cs); + if (manual_listen_count > 0) status = RPC_S_OK; + LeaveCriticalSection(&listen_cs); + return status; } /***********************************************************************

1 0

Hans Leidekker : msvcr100: Add a version resource.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: e6738c20859e8f07920fccb5512a0daa7374c434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6738c20859e8f07920fccb55… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 12 11:46:36 2012 +0100 msvcr100: Add a version resource. --- dlls/msvcr100/Makefile.in | 2 ++ dlls/msvcr100/rsrc.rc | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index 22a2a5b..7714289 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -6,4 +6,6 @@ EXTRAINCL = -I$(top_srcdir)/include/msvcrt C_SRCS = \ msvcr100.c +RC_SRCS = rsrc.rc + @MAKE_DLL_RULES@ diff --git a/dlls/msvcr100/rsrc.rc b/dlls/msvcr100/rsrc.rc new file mode 100644 index 0000000..26eda98 --- /dev/null +++ b/dlls/msvcr100/rsrc.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine CRT library" +#define WINE_FILENAME_STR "msvcr100.dll" +#define WINE_FILEVERSION 10,0,30319,0 +#define WINE_FILEVERSION_STR "10.0.30319.0" + +#include "wine/wine_common_ver.rc"

1 0

Michael Stefaniuc : msiexec: Use FIELD_OFFSET to calculate the size of a struct with variable length array .
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: b791c25274b83bc9083359f74a53d6cbd637d575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b791c25274b83bc9083359f74… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 12 10:43:44 2012 +0100 msiexec: Use FIELD_OFFSET to calculate the size of a struct with variable length array. --- programs/msiexec/msiexec.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 2227af0..9b378c6 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -109,10 +109,8 @@ static BOOL IsProductCode(LPWSTR str) static VOID StringListAppend(struct string_list **list, LPCWSTR str) { struct string_list *entry; - DWORD size; - size = sizeof *entry + lstrlenW(str) * sizeof (WCHAR); - entry = HeapAlloc(GetProcessHeap(), 0, size); + entry = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(struct string_list, str[lstrlenW(str) + 1])); if(!entry) { WINE_ERR("Out of memory!\n");

1 0

Frédéric Delanoy : ole32: Avoid erroneously freeing a variable in ReadFmtUserTypeStg.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 3cdd1abd09b0292955730dac2e03a831cffa0b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cdd1abd09b0292955730dac2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 10 10:33:49 2012 +0100 ole32: Avoid erroneously freeing a variable in ReadFmtUserTypeStg. --- dlls/ole32/storage32.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8498eaf..3bf3216 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8771,7 +8771,10 @@ HRESULT WINAPI ReadFmtUserTypeStg (LPSTORAGE pstg, CLIPFORMAT* pcf, LPOLESTR* lp *pcf = RegisterClipboardFormatW( szOleTypeName ); if( lplpszUserType ) + { *lplpszUserType = szCLSIDName; + szCLSIDName = NULL; + } end: CoTaskMemFree( szCLSIDName );

1 0

Nikolay Sivov : scrrun: Use heap helpers for dictionary.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 5908cda9a514f865fff62a351d6337934b0b52f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5908cda9a514f865fff62a351… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 10 09:47:17 2012 -0500 scrrun: Use heap helpers for dictionary. --- dlls/scrrun/dictionary.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index b75d23c..4fcaedd 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -95,9 +95,7 @@ static ULONG WINAPI dictionary_Release(IDictionary *iface) ref = InterlockedDecrement(&This->ref); if(ref == 0) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return ref; } @@ -333,7 +331,7 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, *obj = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IDictionary_iface.lpVtbl = &dictionary_vtbl;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DMATERIAL3.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 3a32ecd90fd8fb4e36fd8c4a5fa3c3d750ecde5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a32ecd90fd8fb4e36fd8c4a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:36 2012 +0100 ddraw: Avoid LPDIRECT3DMATERIAL3. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 4cdfe2d..f05f690b 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -308,7 +308,7 @@ DECLARE_INTERFACE_(IDirect3D3,IUnknown) /*** IDirect3D3 methods ***/ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; - STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL3 *lplpDirect3DMaterial3, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial3 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT3 *lplpD3DViewport3, IUnknown *pUnkOuter) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface4 *surface,

1 0

Nikolay Sivov : comcat: Cleanup from unused includes and imports.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: bb44713e6d4431492dea28b52fdaed6f27fdfc94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb44713e6d4431492dea28b52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 11 23:10:10 2012 -0500 comcat: Cleanup from unused includes and imports. --- dlls/comcat/Makefile.in | 2 +- dlls/comcat/comcat_main.c | 6 ------ 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/comcat/Makefile.in b/dlls/comcat/Makefile.in index 695c66b..d38f779 100644 --- a/dlls/comcat/Makefile.in +++ b/dlls/comcat/Makefile.in @@ -1,5 +1,5 @@ MODULE = comcat.dll -IMPORTS = uuid ole32 user32 advapi32 +IMPORTS = ole32 C_SRCS = \ comcat_main.c diff --git a/dlls/comcat/comcat_main.c b/dlls/comcat/comcat_main.c index 83fc0ee..345cf67 100644 --- a/dlls/comcat/comcat_main.c +++ b/dlls/comcat/comcat_main.c @@ -20,14 +20,8 @@ #include <stdarg.h> -#define COBJMACROS - #include "windef.h" #include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" -#include "ole2.h" /*********************************************************************** * DllCanUnloadNow (COMCAT.@)

1 0

Nikolay Sivov : msxml3: Add VT_INT to VARIANT tracing helper.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 9860e85ac855b32a0178f6c4ef15322eceb6cace URL: http://source.winehq.org/git/wine.git/?a=commit;h=9860e85ac855b32a0178f6c4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 7 21:43:44 2012 -0500 msxml3: Add VT_INT to VARIANT tracing helper. --- dlls/msxml3/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 3debd06..da3969e 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -273,6 +273,8 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); case VT_I4: return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); + case VT_INT: + return wine_dbg_sprintf("{VT_INT: %d}", V_INT(v)); case VT_R8: return wine_dbg_sprintf("{VT_R8: %lf}", V_R8(v)); case VT_BSTR:

1 0

Piotr Caban : msvcp90: Free memory allocated by _get_current_locale function.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 0609fccf449fd5ae87674feff5032e75cc69af27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0609fccf449fd5ae87674feff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 10 00:00:08 2012 +0100 msvcp90: Free memory allocated by _get_current_locale function. --- dlls/msvcp90/tests/misc.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 5faa03c..19dcdde 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -50,6 +50,7 @@ typedef struct static void* (__cdecl *p_set_invalid_parameter_handler)(void*); static _locale_t (__cdecl *p__get_current_locale)(void); +static void (__cdecl *p__free_locale)(_locale_t); static void (__cdecl *p_free)(void*); static void (__cdecl *p_char_assign)(void*, const void*); @@ -174,8 +175,9 @@ static BOOL init(void) p_set_invalid_parameter_handler = (void*)GetProcAddress(msvcr, "_set_invalid_parameter_handler"); p__get_current_locale = (void*)GetProcAddress(msvcr, "_get_current_locale"); + p__free_locale = (void*)GetProcAddress(msvcr, "_free_locale"); p_free = (void*)GetProcAddress(msvcr, "free"); - if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p_free) { + if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p__free_locale || !p_free) { win_skip("Error setting tests environment\n"); return FALSE; } @@ -389,6 +391,7 @@ static void test_wctype(void) static void test__Getctype(void) { MSVCP__Ctypevec ret; + _locale_t locale; ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); ok(ret.handle == 0, "ret.handle = %d\n", ret.handle); @@ -397,7 +400,9 @@ static void test__Getctype(void) ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); p_free(ret.table); - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 0x1234567; + locale = p__get_current_locale(); + locale->locinfo->lc_handle[LC_COLLATE] = 0x1234567; + p__free_locale(locale); ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); ok(ret.handle == 0x1234567, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); @@ -409,13 +414,16 @@ static void test__Getctype(void) static void test__Getcoll(void) { ULONGLONG (__cdecl *p__Getcoll_arg)(MSVCP__Collvec*); + _locale_t locale; union { MSVCP__Collvec collvec; ULONGLONG ull; }ret; - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 0x7654321; + locale = p__get_current_locale(); + locale->locinfo->lc_handle[LC_COLLATE] = 0x7654321; + p__free_locale(locale); ret.ull = 0; p__Getcoll_arg = (void*)p__Getcoll; p__Getcoll_arg(&ret.collvec); @@ -462,12 +470,15 @@ static void test_virtual_call(void) { BYTE this[256]; basic_string_char bstr; + _locale_t locale; const char *p; char str1[] = "test"; char str2[] = "TEST"; int ret; - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 1; + locale = p__get_current_locale(); + locale->locinfo->lc_handle[LC_COLLATE] = 1; + p__free_locale(locale); call_func2(p_collate_char_ctor_refs, this, 0); ret = (int)call_func5(p_collate_char_compare, this, str1, str1+4, str1, str1+4); ok(ret == 0, "collate<char>::compare returned %d\n", ret);

1 0