September 2010 - Wine-commits

Cheer Xiao : oleview: Update simplified Chinese translation.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 064b4ef0a54281e58c10c1d029cfbce1abe2b3e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=064b4ef0a54281e58c10c1d02… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Wed Sep 29 14:19:59 2010 +0800 oleview: Update simplified Chinese translation. --- programs/oleview/Zh.rc | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/programs/oleview/Zh.rc b/programs/oleview/Zh.rc index 36bf3f1..5b6e108 100644 --- a/programs/oleview/Zh.rc +++ b/programs/oleview/Zh.rc @@ -2,6 +2,7 @@ * OleView (Simplified and Traditional Chinese Resources) * * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -60,7 +61,7 @@ IDM_MENU MENU } POPUP "视图(&V)" { - MENUITEM "专家状态(&E)", IDM_EXPERT,CHECKED + MENUITEM "专家模式(&E)", IDM_EXPERT,CHECKED MENUITEM SEPARATOR MENUITEM "隐藏部件分类(&H)", IDM_HIDDEN, GRAYED MENUITEM SEPARATOR @@ -97,7 +98,7 @@ STRINGTABLE IDS_APPTITLE "OleView" IDS_READY "待命" IDS_ABOUT "OleView - OLE/COM 对象查看器" - IDS_ABOUTVER "版本 1.0 " + IDS_ABOUTVER "版本 1.0" IDS_TYPELIBTITLE "ITypeLib 查看器" IDS_OPEN "打开" IDS_OPEN_TYPELIB_FILTER "TypeLib 文件 (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0All Files (*.*)\0*.*\0\0" @@ -106,7 +107,7 @@ STRINGTABLE IDM_TYPELIB, "打开 TypeLib 文件并查看内容" IDM_SYSCONF, "修改本机分布式 COM 设置" IDM_REGEDIT, "运行 Wine 注册表编辑器" - IDM_EXIT, "退出程序. 提示保存" + IDM_EXIT, "退出程序。提示保存" IDM_CREATEINST, "创建当前选定对象实例" IDM_CREATEINSTON, "创建当前选定对象在指定计算机的实例" IDM_RELEASEINST, "释放当前选定对象实例" @@ -148,7 +149,7 @@ STRINGTABLE IDS_BYTES, "字节" IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) 失败 ($%x)" - IDS_INHERITINTERFACES, "遗传界面" + IDS_INHERITINTERFACES, "继承的界面" } DLG_CREATEINSTON DIALOG 0, 0, 250, 41 @@ -156,7 +157,7 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "连接到另外一台计算机" FONT 9, "MS Shell Dlg" { - LTEXT "计算机名称(&M):", -1, 5, 6, 190, 8 + LTEXT "计算机名称(&M)：", -1, 5, 6, 190, 8 EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL DEFPUSHBUTTON "确定(&O)", IDOK, 200, 5, 45, 14 PUSHBUTTON "取消(&C)", IDCANCEL, 200, 22, 45, 14 @@ -170,7 +171,7 @@ FONT 9, "MS Shell Dlg" LTEXT "系统设置", -1, 5, 6, 160, 8 CHECKBOX "启用分布式CO&M", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX CHECKBOX "启用远程连接(限&Win95)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX - LTEXT "这些设置只改变注册表值.\n它对Wine的性能没有影响.", -1, 5, 50, 160, 40 + LTEXT "这些设置只改变寄存器值(register values)。\n它对Wine的性能没有影响。", -1, 5, 50, 160, 40 DEFPUSHBUTTON "确定(&O)", IDOK, 70, 80, 45, 14 PUSHBUTTON "取消(&C)", IDCANCEL, 120, 80, 45, 14 } @@ -182,7 +183,7 @@ FONT 9, "MS Shell Dlg" { LTEXT "界面", -1, 5, 6, 50, 8 LTEXT "", IDC_LABEL, 60, 6, 145, 8 - LTEXT "IID:", -1, 5, 16, 50, 8 + LTEXT "IID：", -1, 5, 16, 50, 8 LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 DEFPUSHBUTTON "关闭(&C)", IDCANCEL, 230, 6, 45, 14 PUSHBUTTON "查看类型信息(&V)", IDC_VIEWTYPEINFO, 6, 31, 70, 14, WS_DISABLED @@ -193,9 +194,9 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "IPersist 界面查看器" FONT 9, "MS Shell Dlg" { - LTEXT "类别名称:", -1, 5, 6, 50, 8 + LTEXT "类别名称：", -1, 5, 6, 50, 8 LTEXT "", IDC_LABEL, 60, 6, 145, 8 - LTEXT "CLSID:", -1, 5, 16, 50, 8 + LTEXT "CLSID：", -1, 5, 16, 50, 8 LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 DEFPUSHBUTTON "关闭(&C)", IDCANCEL, 230, 6, 45, 14 } @@ -205,9 +206,9 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "IPersistStream 界面查看器" FONT 9, "MS Shell Dlg" { - LTEXT "类别名称:", -1, 5, 6, 50, 8 + LTEXT "类别名称：", -1, 5, 6, 50, 8 LTEXT "", IDC_LABEL, 60, 6, 145, 8 - LTEXT "CLSID:", -1, 5, 16, 50, 8 + LTEXT "CLSID：", -1, 5, 16, 50, 8 LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 DEFPUSHBUTTON "关闭(&C)", IDCANCEL, 230, 6, 45, 14 PUSHBUTTON "已修改(&I)", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14

1 0

André Hentschel : ipconfig: Update German translation.
by Alexandre Julliard 29 Sep '10

29 Sep '10

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: Implement SelectionNamespaces property.
by Alexandre Julliard 29 Sep '10

29 Sep '10

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

Adam Martinson : msxml3: Move domdoc properties into their own struct.
by Alexandre Julliard 29 Sep '10

29 Sep '10

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 29 Sep '10

29 Sep '10

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

Nikolay Sivov : msxml3/httprequest: Store passed data for IXMLHttpRequest:: open().
by Alexandre Julliard 29 Sep '10

29 Sep '10

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

Hans Leidekker : programs: Add a stub implementation of mofcomp.exe.
by Alexandre Julliard 29 Sep '10

29 Sep '10

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

Michael Stefaniuc : ole32: Allocate a small temp variable on the stack instead of the heap.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 620ca68d01b3952480172efb94b1612403967ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620ca68d01b3952480172efb9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 28 22:43:50 2010 +0200 ole32: Allocate a small temp variable on the stack instead of the heap. --- dlls/ole32/ole2.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 2b301e4..0829ca1 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2530,19 +2530,17 @@ HRESULT WINAPI OleCreate( if (SUCCEEDED(hres2)) { DWORD dwConnection; - FORMATETC *pfe; if (renderopt == OLERENDER_DRAW && !pFormatEtc) { - pfe = HeapAlloc(GetProcessHeap(), 0, sizeof(FORMATETC)); - pfe->cfFormat = 0; - pfe->ptd = NULL; - pfe->dwAspect = DVASPECT_CONTENT; - pfe->lindex = -1; - pfe->tymed = TYMED_NULL; - }else - pfe = pFormatEtc; - hres = IOleCache_Cache(pOleCache, pfe, ADVF_PRIMEFIRST, &dwConnection); - if (!pFormatEtc && pfe) - HeapFree(GetProcessHeap(), 0, pfe); + FORMATETC pfe; + pfe.cfFormat = 0; + pfe.ptd = NULL; + pfe.dwAspect = DVASPECT_CONTENT; + pfe.lindex = -1; + pfe.tymed = TYMED_NULL; + hres = IOleCache_Cache(pOleCache, &pfe, ADVF_PRIMEFIRST, &dwConnection); + } + else + hres = IOleCache_Cache(pOleCache, pFormatEtc, ADVF_PRIMEFIRST, &dwConnection); IOleCache_Release(pOleCache); } }

1 0

Hans Leidekker : include: Define IEnumWbemClassObject and IWbemServices.
by Alexandre Julliard 29 Sep '10

29 Sep '10

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

Hans Leidekker : msi: Always check the return value of msi_string2idW.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 2b2fa04ca4b89c221419ecd1c7a310f77ca93cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2fa04ca4b89c221419ecd1c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 29 09:58:02 2010 +0200 msi: Always check the return value of msi_string2idW. --- dlls/msi/join.c | 6 ++++-- dlls/msi/storages.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msi/join.c b/dlls/msi/join.c index f787c30..5e11577 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -225,10 +225,12 @@ static UINT JOIN_get_column_info( struct tagMSIVIEW *view, static UINT join_find_row( MSIJOINVIEW *jv, MSIRECORD *rec, UINT *row ) { LPCWSTR str; - UINT i, id, data; + UINT r, i, id, data; str = MSI_RecordGetString( rec, 1 ); - msi_string2idW( jv->db->strings, str, &id ); + r = msi_string2idW( jv->db->strings, str, &id ); + if (r != ERROR_SUCCESS) + return r; for (i = 0; i < jv->rows; i++) { diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 3e88874..56f252f 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -334,10 +334,12 @@ static UINT STORAGES_get_column_info(struct tagMSIVIEW *view, UINT n, static UINT storages_find_row(MSISTORAGESVIEW *sv, MSIRECORD *rec, UINT *row) { LPCWSTR str; - UINT i, id, data; + UINT r, i, id, data; str = MSI_RecordGetString(rec, 1); - msi_string2idW(sv->db->strings, str, &id); + r = msi_string2idW(sv->db->strings, str, &id); + if (r != ERROR_SUCCESS) + return r; for (i = 0; i < sv->num_rows; i++) {

1 0