September 2010 - Wine-Commits

Nikolay Sivov : msxml3/httprequest: Implement IXMLHttpRequest:: setRequestHeader().
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 1ac256a5885fcb7a26e5d617f1599b2761f765e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac256a5885fcb7a26e5d617f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 29 02:50:37 2010 +0400 msxml3/httprequest: Implement IXMLHttpRequest::setRequestHeader(). --- dlls/msxml3/httprequest.c | 80 ++++++++++++++++++++++++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 36 ++++++++++++++++++++ 2 files changed, 110 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 21bd80c..e0f7701 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -31,6 +31,7 @@ #include "msxml_private.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -40,14 +41,34 @@ static const WCHAR MethodGetW[] = {'G','E','T',0}; static const WCHAR MethodPutW[] = {'P','U','T',0}; static const WCHAR MethodPostW[] = {'P','O','S','T',0}; +struct reqheader +{ + struct list entry; + BSTR header; + BSTR value; +}; + +enum READYSTATE +{ + STATE_UNINITIALIZED = 0, + STATE_LOADING = 1, + STATE_LOADED = 2, + STATE_INTERACTIVE = 3, + STATE_COMPLETED = 4 +}; + typedef struct _httprequest { const struct IXMLHTTPRequestVtbl *lpVtbl; LONG ref; + READYSTATE state; + + /* request */ BINDVERB verb; BSTR url; BOOL async; + struct list reqheaders; /* credentials */ BSTR user; @@ -59,6 +80,12 @@ static inline httprequest *impl_from_IXMLHTTPRequest( IXMLHTTPRequest *iface ) return (httprequest *)((char*)iface - FIELD_OFFSET(httprequest, lpVtbl)); } +/* TODO: process OnChange callback */ +static void httprequest_setreadystate(httprequest *This, READYSTATE state) +{ + This->state = state; +} + static HRESULT WINAPI httprequest_QueryInterface(IXMLHTTPRequest *iface, REFIID riid, void **ppvObject) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); @@ -95,9 +122,20 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { + struct reqheader *header, *header2; + SysFreeString(This->url); SysFreeString(This->user); SysFreeString(This->password); + + /* request headers */ + LIST_FOR_EACH_ENTRY_SAFE(header, header2, &This->reqheaders, struct reqheader, entry) + { + list_remove(&header->entry); + SysFreeString(header->header); + SysFreeString(header->value); + } + heap_free( This ); } @@ -223,16 +261,41 @@ static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR if (hr == S_OK) This->password = V_BSTR(&str); + httprequest_setreadystate(This, STATE_LOADING); + return S_OK; } -static HRESULT WINAPI httprequest_setRequestHeader(IXMLHTTPRequest *iface, BSTR bstrHeader, BSTR bstrValue) +static HRESULT WINAPI httprequest_setRequestHeader(IXMLHTTPRequest *iface, BSTR header, BSTR value) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); + struct reqheader *entry; - FIXME("stub (%p) %s %s\n", This, debugstr_w(bstrHeader), debugstr_w(bstrValue)); + TRACE("(%p)->(%s %s)\n", This, debugstr_w(header), debugstr_w(value)); - return E_NOTIMPL; + if (!header || !*header) return E_INVALIDARG; + if (This->state != STATE_LOADING) return E_FAIL; + if (!value) return E_INVALIDARG; + + /* replace existing header value if already added */ + LIST_FOR_EACH_ENTRY(entry, &This->reqheaders, struct reqheader, entry) + { + if (lstrcmpW(entry->header, header) == 0) + { + return SysReAllocString(&entry->value, value) ? S_OK : E_OUTOFMEMORY; + } + } + + entry = heap_alloc(sizeof(*entry)); + if (!entry) return E_OUTOFMEMORY; + + /* new header */ + entry->header = SysAllocString(header); + entry->value = SysAllocString(value); + + list_add_head(&This->reqheaders, &entry->entry); + + return S_OK; } static HRESULT WINAPI httprequest_getResponseHeader(IXMLHTTPRequest *iface, BSTR bstrHeader, BSTR *pbstrValue) @@ -325,13 +388,16 @@ static HRESULT WINAPI httprequest_get_responseStream(IXMLHTTPRequest *iface, VAR return E_NOTIMPL; } -static HRESULT WINAPI httprequest_get_readyState(IXMLHTTPRequest *iface, LONG *plState) +static HRESULT WINAPI httprequest_get_readyState(IXMLHTTPRequest *iface, LONG *state) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); - FIXME("stub %p %p\n", This, plState); + TRACE("(%p)->(%p)\n", This, state); - return E_NOTIMPL; + if (!state) return E_INVALIDARG; + + *state = This->state; + return S_OK; } static HRESULT WINAPI httprequest_put_onreadystatechange(IXMLHTTPRequest *iface, IDispatch *pReadyStateSink) @@ -385,6 +451,8 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, LPVOID *ppObj) req->async = FALSE; req->verb = -1; req->url = req->user = req->password = NULL; + req->state = STATE_UNINITIALIZED; + list_init(&req->reqheaders); *ppObj = &req->lpVtbl; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 008c6b7..d9587a0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2887,6 +2887,7 @@ static void test_XMLHTTP(void) VARIANT dummy; VARIANT async; VARIANT varbody; + LONG state; HRESULT hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLHttpRequest, (void **)&pXMLHttpRequest); @@ -2918,9 +2919,43 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_open(pXMLHttpRequest, NULL, url, async, dummy, dummy); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, _bstr_("header1"), NULL); + ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, NULL, _bstr_("value1")); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, _bstr_("header1"), _bstr_("value1")); + ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + state = -1; + hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == 0, "got %d, expected 0\n", state); + hr = IXMLHttpRequest_open(pXMLHttpRequest, method, url, async, dummy, dummy); ok(hr == S_OK, "got 0x%08x\n", hr); + state = -1; + hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == 1, "got %d, expected 1\n", state); + + hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, _bstr_("header1"), _bstr_("value1")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, NULL, _bstr_("value1")); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, _bstr_(""), _bstr_("value1")); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + SysFreeString(method); SysFreeString(url); @@ -2945,6 +2980,7 @@ static void test_XMLHTTP(void) } IXMLHttpRequest_Release(pXMLHttpRequest); + free_bstrs(); } static void test_IXMLDOMDocument2(void)

1 0

Nikolay Sivov : msxml3/httprequest: Store passed data for IXMLHttpRequest:: open().
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 2a85bc036753435640c4d7e85c5e088529e44fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a85bc036753435640c4d7e85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 29 00:27:12 2010 +0400 msxml3/httprequest: Store passed data for IXMLHttpRequest::open(). --- dlls/msxml3/httprequest.c | 70 +++++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 34 ++++++++++++++------- 2 files changed, 89 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 025dbc2..21bd80c 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -36,10 +36,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +static const WCHAR MethodGetW[] = {'G','E','T',0}; +static const WCHAR MethodPutW[] = {'P','U','T',0}; +static const WCHAR MethodPostW[] = {'P','O','S','T',0}; + typedef struct _httprequest { const struct IXMLHTTPRequestVtbl *lpVtbl; LONG ref; + + BINDVERB verb; + BSTR url; + BOOL async; + + /* credentials */ + BSTR user; + BSTR password; } httprequest; static inline httprequest *impl_from_IXMLHTTPRequest( IXMLHTTPRequest *iface ) @@ -83,6 +95,9 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { + SysFreeString(This->url); + SysFreeString(This->user); + SysFreeString(This->password); heap_free( This ); } @@ -158,14 +173,57 @@ static HRESULT WINAPI httprequest_Invoke(IXMLHTTPRequest *iface, DISPID dispIdMe return hr; } -static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR bstrMethod, BSTR bstrUrl, - VARIANT varAsync, VARIANT bstrUser, VARIANT bstrPassword) +static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR url, + VARIANT async, VARIANT user, VARIANT password) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); + HRESULT hr; + VARIANT str; - FIXME("stub (%p)\n", This); + TRACE("(%p)->(%s %s)\n", This, debugstr_w(method), debugstr_w(url)); - return E_NOTIMPL; + if (!method || !url) return E_INVALIDARG; + + /* free previously set data */ + SysFreeString(This->url); + SysFreeString(This->user); + SysFreeString(This->password); + This->url = This->user = This->password = NULL; + + if (lstrcmpiW(method, MethodGetW) == 0) + { + This->verb = BINDVERB_GET; + } + else if (lstrcmpiW(method, MethodPutW) == 0) + { + This->verb = BINDVERB_PUT; + } + else if (lstrcmpiW(method, MethodPostW) == 0) + { + This->verb = BINDVERB_POST; + } + else + { + FIXME("unsupported request type %s\n", debugstr_w(method)); + This->verb = -1; + return E_FAIL; + } + + This->url = SysAllocString(url); + + hr = VariantChangeType(&async, &async, 0, VT_BOOL); + This->async = hr == S_OK && V_BOOL(&async) == VARIANT_TRUE; + + VariantInit(&str); + hr = VariantChangeType(&str, &user, 0, VT_BSTR); + if (hr == S_OK) + This->user = V_BSTR(&str); + + hr = VariantChangeType(&str, &password, 0, VT_BSTR); + if (hr == S_OK) + This->password = V_BSTR(&str); + + return S_OK; } static HRESULT WINAPI httprequest_setRequestHeader(IXMLHTTPRequest *iface, BSTR bstrHeader, BSTR bstrValue) @@ -324,6 +382,10 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, LPVOID *ppObj) req->lpVtbl = &dimimpl_vtbl; req->ref = 1; + req->async = FALSE; + req->verb = -1; + req->url = req->user = req->password = NULL; + *ppObj = &req->lpVtbl; TRACE("returning iface %p\n", *ppObj); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a256c1c..008c6b7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2883,9 +2883,9 @@ static void test_XMLHTTP(void) 'p','o','s','t','t','e','s','t','.','p','h','p',0}; static const WCHAR wszExpectedResponse[] = {'F','A','I','L','E','D',0}; IXMLHttpRequest *pXMLHttpRequest; - BSTR bstrResponse, str1, str2; + BSTR bstrResponse, method, url; VARIANT dummy; - VARIANT varfalse; + VARIANT async; VARIANT varbody; HRESULT hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLHttpRequest, @@ -2899,18 +2899,30 @@ static void test_XMLHTTP(void) VariantInit(&dummy); V_VT(&dummy) = VT_ERROR; V_ERROR(&dummy) = DISP_E_MEMBERNOTFOUND; - VariantInit(&varfalse); - V_VT(&varfalse) = VT_BOOL; - V_BOOL(&varfalse) = VARIANT_FALSE; + VariantInit(&async); + V_VT(&async) = VT_BOOL; + V_BOOL(&async) = VARIANT_FALSE; V_VT(&varbody) = VT_BSTR; V_BSTR(&varbody) = SysAllocString(wszBody); - str1 = SysAllocString(wszPOST); - str2 = SysAllocString(wszUrl); - hr = IXMLHttpRequest_open(pXMLHttpRequest, str1, str2, varfalse, dummy, dummy); - todo_wine ok(hr == S_OK, "IXMLHttpRequest_open should have succeeded instead of failing with 0x%08x\n", hr); - SysFreeString(str1); - SysFreeString(str2); + method = SysAllocString(wszPOST); + url = SysAllocString(wszUrl); + + /* invalid parameters */ + hr = IXMLHttpRequest_open(pXMLHttpRequest, NULL, NULL, async, dummy, dummy); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_open(pXMLHttpRequest, method, NULL, async, dummy, dummy); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_open(pXMLHttpRequest, NULL, url, async, dummy, dummy); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_open(pXMLHttpRequest, method, url, async, dummy, dummy); + ok(hr == S_OK, "got 0x%08x\n", hr); + + SysFreeString(method); + SysFreeString(url); hr = IXMLHttpRequest_send(pXMLHttpRequest, varbody); if (hr == INET_E_RESOURCE_NOT_FOUND)

1 0

Adam Martinson : msxml3: Implement SelectionNamespaces property.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 05f011b73560297cbb0ed769b43d18c0e7400abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f011b73560297cbb0ed769b… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Tue Sep 28 14:35:48 2010 -0500 msxml3: Implement SelectionNamespaces property. --- dlls/msxml3/domdoc.c | 211 ++++++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/queryresult.c | 4 + dlls/msxml3/tests/domdoc.c | 38 +++++---- 3 files changed, 231 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05f011b73560297cbb0ed…

1 0

André Hentschel : ipconfig: Update German translation.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 404b817bfa2874a4dbf2bf75dd5a285e305cc4b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=404b817bfa2874a4dbf2bf75d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 28 17:49:02 2010 +0200 ipconfig: Update German translation. --- programs/ipconfig/De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/De.rc b/programs/ipconfig/De.rc index b21493a..44e770a 100644 --- a/programs/ipconfig/De.rc +++ b/programs/ipconfig/De.rc @@ -46,4 +46,5 @@ STRINGTABLE STRING_DHCP_ENABLED, "DHCP aktiviert" STRING_YES, "Ja" STRING_NO, "Nein" + STRING_DEFAULT_GATEWAY, "Standard Gateway" }

1 0

Adam Martinson : msxml3: Move domdoc properties into their own struct.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 1f93a47667b807dbaeae5d872aa5500823f3b2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f93a47667b807dbaeae5d872… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Sep 27 19:59:51 2010 -0500 msxml3: Move domdoc properties into their own struct. Unhooks domdoc properties from both the domdoc and xmlDoc. After the domdoc <-> xmlDoc connection is no longer an open question, the domdoc::properties pointer can be removed and rerouted through xmlDoc::_private::properties as long as it's impossible to have a domdoc with domdoc::node.node == NULL. With all of the checks for this, the current code suggests that it's perfectly possible. --- dlls/msxml3/domdoc.c | 193 +++++++++++++++++++++++++++++--------------- dlls/msxml3/tests/domdoc.c | 20 +++-- 2 files changed, 140 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f93a47667b807dbaeae5…

1 0

Louis Lenders : user32: UpdateWindow doesn't accept a NULL hwnd.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 6e4e8fb07ffb7f8bd69a8f2f487c4be525ea654c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4e8fb07ffb7f8bd69a8f2f4… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Sep 28 18:56:40 2010 +0200 user32: UpdateWindow doesn't accept a NULL hwnd. --- dlls/user32/painting.c | 6 ++++++ dlls/user32/tests/msg.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 9f02a03..e7ce2ec 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1202,6 +1202,12 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ) */ BOOL WINAPI UpdateWindow( HWND hwnd ) { + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + return RedrawWindow( hwnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN ); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6717e2e..76d46d0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6161,6 +6161,16 @@ static void test_paint_messages(void) flush_events(); ok_sequence( WmEmptySeq, "WmEmptySeq", FALSE ); + trace("testing UpdateWindow(NULL)\n"); + SetLastError(0xdeadbeef); + ok(!UpdateWindow(NULL), "UpdateWindow(NULL) should fail\n"); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || + broken( GetLastError() == 0xdeadbeef ) /* win9x */, + "wrong error code %d\n", GetLastError()); + check_update_rgn( hwnd, 0 ); + flush_events(); + ok_sequence( WmEmptySeq, "WmEmptySeq", FALSE ); + /* now with frame */ SetRectRgn( hrgn, -5, -5, 20, 20 );

1 0

Hans Leidekker : programs: Add a stub implementation of mofcomp.exe.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: f15aea2a86984cced58eefadedcec5636039461b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15aea2a86984cced58eefade… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 29 09:57:34 2010 +0200 programs: Add a stub implementation of mofcomp.exe. --- configure | 1 + configure.ac | 1 + programs/mofcomp/Makefile.in | 12 ++++++++++++ programs/mofcomp/mofcomp.c | 30 ++++++++++++++++++++++++++++++ tools/wine.inf.in | 2 +- 5 files changed, 45 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 436bbae..c9a1cc7 100755 --- a/configure +++ b/configure @@ -15011,6 +15011,7 @@ wine_fn_config_program icinfo enable_icinfo install wine_fn_config_program iexplore enable_iexplore install wine_fn_config_program ipconfig enable_ipconfig install wine_fn_config_program lodctr enable_lodctr install +wine_fn_config_program mofcomp enable_mofcomp install wine_fn_config_program mshta enable_mshta install wine_fn_config_program msiexec enable_msiexec installbin wine_fn_config_program net enable_net install diff --git a/configure.ac b/configure.ac index fb85cac..52fee51 100644 --- a/configure.ac +++ b/configure.ac @@ -2789,6 +2789,7 @@ WINE_CONFIG_PROGRAM(icinfo,install) WINE_CONFIG_PROGRAM(iexplore,install) WINE_CONFIG_PROGRAM(ipconfig,install) WINE_CONFIG_PROGRAM(lodctr,install) +WINE_CONFIG_PROGRAM(mofcomp,install) WINE_CONFIG_PROGRAM(mshta,install) WINE_CONFIG_PROGRAM(msiexec,installbin) WINE_CONFIG_PROGRAM(net,install) diff --git a/programs/mofcomp/Makefile.in b/programs/mofcomp/Makefile.in new file mode 100644 index 0000000..f1dd447 --- /dev/null +++ b/programs/mofcomp/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mofcomp.exe +APPMODE = -mconsole -municode +IMPORTS = kernel32 +EXTRADEFS = -DWINE_NO_UNICODE_MACROS + +C_SRCS = mofcomp.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/mofcomp/mofcomp.c b/programs/mofcomp/mofcomp.c new file mode 100644 index 0000000..f5c1e91 --- /dev/null +++ b/programs/mofcomp/mofcomp.c @@ -0,0 +1,30 @@ +/* + * Copyright 2010 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 WIN32_LEAN_AND_MEAN + +#include "wine/debug.h" +#include <windows.h> + +WINE_DEFAULT_DEBUG_CHANNEL(mofcomp); + +int wmain( int argc, const WCHAR *argv[] ) +{ + WINE_FIXME("stub\n"); + return 0; +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 44e36a7..1146ec6 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2588,7 +2588,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,mui, 11,spool\drivers\color, 11,spool\printers, -11,wbem, 10,,explorer.exe 10,,hh.exe 10,,notepad.exe @@ -2599,6 +2598,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,mountmgr.sys 10,Microsoft.NET\Framework\v1.1.4322,ngen.exe 10,Microsoft.NET\Framework\v2.0.50727,ngen.exe +11,wbem,mofcomp.exe 16422,Internet Explorer,iexplore.exe 11,,*

1 0

Hans Leidekker : msvcrt: Implement wcsnlen.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 23fdfbc39253736ae07c13631ab0dd089117a642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23fdfbc39253736ae07c13631… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 29 09:57:52 2010 +0200 msvcrt: Implement wcsnlen. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 12 ++++++++++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7b8be69..79517e5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1644,7 +1644,7 @@ @ cdecl wcsncmp(wstr wstr long) msvcrt.wcsncmp @ cdecl wcsncpy(ptr wstr long) msvcrt.wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) msvcrt.wcsncpy_s -@ stub wcsnlen +@ cdecl wcsnlen(wstr long) msvcrt.wcsnlen @ cdecl wcspbrk(wstr wstr) msvcrt.wcspbrk @ cdecl wcsrchr(wstr long) msvcrt.wcsrchr @ stub wcsrtombs diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 27c4088..3795264 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1498,7 +1498,7 @@ @ cdecl wcsncmp(wstr wstr long) msvcrt.wcsncmp @ cdecl wcsncpy(ptr wstr long) msvcrt.wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) msvcrt.wcsncpy_s -@ stub wcsnlen +@ cdecl wcsnlen(wstr long) msvcrt.wcsnlen @ cdecl wcspbrk(wstr wstr) msvcrt.wcspbrk @ cdecl wcsrchr(wstr long) msvcrt.wcsrchr @ stub wcsrtombs diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 00ccade..c0ed8b6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1482,7 +1482,7 @@ @ cdecl wcsncmp(wstr wstr long) msvcrt.wcsncmp @ cdecl wcsncpy(ptr wstr long) msvcrt.wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) msvcrt.wcsncpy_s -@ stub wcsnlen +@ cdecl wcsnlen(wstr long) msvcrt.wcsnlen @ cdecl wcspbrk(wstr wstr) msvcrt.wcspbrk @ cdecl wcsrchr(wstr long) msvcrt.wcsrchr @ stub wcsrtombs diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5325227..341093b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1444,7 +1444,7 @@ @ cdecl wcsncmp(wstr wstr long) ntdll.wcsncmp @ cdecl wcsncpy(ptr wstr long) ntdll.wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s -# stub wcsnlen +@ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk @ cdecl wcsrchr(wstr long) ntdll.wcsrchr # stub wcsrtombs diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d192c23..47a50b6 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1737,3 +1737,15 @@ unsigned __int64 CDECL MSVCRT__wcstoui64(const MSVCRT_wchar_t *nptr, { return MSVCRT__wcstoui64_l(nptr, endptr, base, NULL); } + +/****************************************************************** + * wcsnlen (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_wcsnlen(const MSVCRT_wchar_t *s, MSVCRT_size_t maxlen) +{ + MSVCRT_size_t i; + + for (i = 0; i < maxlen; i++) + if (!s[i]) break; + return i; +}

1 0

Hans Leidekker : msi: Treat empty string as NULL in MsiGetSummaryInformationW.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 259b5fdfa6036a1f4d782d215c507c9aaeb33eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=259b5fdfa6036a1f4d782d215… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 29 09:58:12 2010 +0200 msi: Treat empty string as NULL in MsiGetSummaryInformationW. --- dlls/msi/suminfo.c | 2 +- dlls/msi/tests/suminfo.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 902a61f..b174e5b 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -469,7 +469,7 @@ UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, if( !pHandle ) return ERROR_INVALID_PARAMETER; - if( szDatabase ) + if( szDatabase && szDatabase[0] ) { LPCWSTR persist = uiUpdateCount ? MSIDBOPEN_TRANSACT : MSIDBOPEN_READONLY; diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index a0b225b..07202a3 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -86,7 +86,18 @@ static void test_suminfo(void) ok(r == ERROR_INVALID_PARAMETER, "MsiGetSummaryInformation wrong error\n"); r = MsiGetSummaryInformation(hdb, NULL, 0, &hsuminfo); - ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed\n"); + ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed %u\n", r); + + r = MsiCloseHandle(hsuminfo); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + r = MsiGetSummaryInformation(0, "", 0, &hsuminfo); + todo_wine + ok(r == ERROR_INSTALL_PACKAGE_INVALID || r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, + "MsiGetSummaryInformation failed %u\n", r); + + r = MsiGetSummaryInformation(hdb, "", 0, &hsuminfo); + ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed %u\n", r); r = MsiSummaryInfoGetPropertyCount(0, NULL); ok(r == ERROR_INVALID_HANDLE, "getpropcount failed\n");

1 0

Hans Leidekker : include: Define IEnumWbemClassObject and IWbemServices.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 2e1eb80c2399c3f6e5d232b271666b7f1081d52f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1eb80c2399c3f6e5d232b27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 29 09:57:44 2010 +0200 include: Define IEnumWbemClassObject and IWbemServices. --- include/wbemcli.idl | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 184 insertions(+), 0 deletions(-) diff --git a/include/wbemcli.idl b/include/wbemcli.idl index b2ac6c1..db6a5ac 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -24,6 +24,10 @@ import "objidl.idl"; interface IWbemContext; interface IWbemServices; interface IWbemStatusCodeText; +interface IWbemCallResult; +interface IWbemObjectSink; +interface IWbemClassObject; +interface IEnumWbemClassObject; typedef [v1_enum] enum tag_WBEMSTATUS { @@ -209,3 +213,183 @@ interface IWbemStatusCodeText : IUnknown [in] LONG lFlags, [out] BSTR *MessageText); }; + +[ + object, + restricted, + uuid(9556dc99-828c-11cf-a37e-00aa003240c7), + pointer_default(unique) +] +interface IWbemServices : IUnknown +{ + HRESULT OpenNamespace( + [in] const BSTR strNamespace, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IWbemServices **ppWorkingNamespace, + [out] IWbemCallResult **ppResult); + + HRESULT CancelAsyncCall( + [in] IWbemObjectSink *pSink); + + HRESULT QueryObjectSink( + [in] long lFlags, + [out] IWbemObjectSink **ppResponseHandler); + + HRESULT GetObject( + [in] const BSTR strObjectPath, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IWbemClassObject **ppObject, + [out] IWbemCallResult **ppCallResult); + + HRESULT GetObjectAsync( + [in] const BSTR strObjectPath, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT PutClass( + [in] IWbemClassObject *pObject, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IWbemCallResult **ppCallResult); + + HRESULT PutClassAsync( + [in] IWbemClassObject *pObject, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT DeleteClass( + [in] const BSTR strClass, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IWbemCallResult **ppCallResult); + + HRESULT DeleteClassAsync( + [in] const BSTR strClass, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT CreateClassEnum( + [in] const BSTR strSuperclass, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IEnumWbemClassObject **ppEnum); + + HRESULT CreateClassEnumAsync( + [in] const BSTR strSuperclass, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT PutInstance( + [in] IWbemClassObject *pInst, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IWbemCallResult **ppCallResult); + + HRESULT PutInstanceAsync( + [in] IWbemClassObject *pInst, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT DeleteInstance( + [in] const BSTR strObjectPath, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IWbemCallResult **ppCallResult); + + HRESULT DeleteInstanceAsync( + [in] const BSTR strObjectPath, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT CreateInstanceEnum( + [in] const BSTR strFilter, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IEnumWbemClassObject **ppEnum); + + HRESULT CreateInstanceEnumAsync( + [in] const BSTR strFilter, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT ExecQuery( + [in] const BSTR strQueryLanguage, + [in] const BSTR strQuery, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IEnumWbemClassObject **ppEnum); + + HRESULT ExecQueryAsync( + [in] const BSTR strQueryLanguage, + [in] const BSTR strQuery, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT ExecNotificationQuery( + [in] const BSTR strQueryLanguage, + [in] const BSTR strQuery, + [in] long lFlags, + [in] IWbemContext *pCtx, + [out] IEnumWbemClassObject **ppEnum); + + HRESULT ExecNotificationQueryAsync( + [in] const BSTR strQueryLanguage, + [in] const BSTR strQuery, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemObjectSink *pResponseHandler); + + HRESULT ExecMethod( + [in] const BSTR strObjectPath, + [in] const BSTR strMethodName, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemClassObject *pInParams, + [out] IWbemClassObject **ppOutParams, + [out] IWbemCallResult **ppCallResult); + + HRESULT ExecMethodAsync( + [in] const BSTR strObjectPath, + [in] const BSTR strMethodName, + [in] long lFlags, + [in] IWbemContext *pCtx, + [in] IWbemClassObject *pInParams, + [in] IWbemObjectSink *pResponseHandler); +}; + +[ + object, + restricted, + uuid(027947e1-d731-11ce-a357-000000000001) +] +interface IEnumWbemClassObject : IUnknown +{ + HRESULT Reset(); + + HRESULT Next( + [in] long lTimeout, + [in] ULONG uCount, + [out, size_is(uCount), length_is(*puReturned)] IWbemClassObject **apObjects, + [out] ULONG *puReturned); + + HRESULT NextAsync( + [in] ULONG uCount, + [in] IWbemObjectSink *pSink); + + HRESULT Clone( + [out] IEnumWbemClassObject **ppEnum); + + HRESULT Skip( + [in] long lTimeout, + [in] ULONG nCount); +};

1 0