May 2011 - Wine-Commits - list.winehq.org

Jacek Caban : include: Added iextag.idl file.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: e6ee2c163ea445bca1d73d8e64a0ee3258c7f67c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ee2c163ea445bca1d73d8e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 30 17:51:37 2011 +0200 include: Added iextag.idl file. --- .gitignore | 1 + include/Makefile.in | 1 + include/iextag.idl | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index cbe3b9f..711a35d 100644 --- a/.gitignore +++ b/.gitignore @@ -180,6 +180,7 @@ include/hlink.h include/htiframe.h include/iads.h include/icftypes.h +include/iextag.h include/imnact.h include/imnxport.h include/indexsrv.h diff --git a/include/Makefile.in b/include/Makefile.in index 1db5e81..673c32f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -41,6 +41,7 @@ PUBLIC_IDL_H_SRCS = \ htiframe.idl \ iads.idl \ icftypes.idl \ + iextag.idl \ imnact.idl \ imnxport.idl \ indexsrv.idl \ diff --git a/include/iextag.idl b/include/iextag.idl new file mode 100644 index 0000000..7ec0518 --- /dev/null +++ b/include/iextag.idl @@ -0,0 +1,105 @@ +/* + * Copyright 2011 Jacek Caban 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 + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +[ + object, + uuid(7e8bc44d-aeff-11d1-89c2-00c04fb6bfc4), + dual, + pointer_default(unique) + ] +interface IClientCaps : IDispatch +{ + [propget, id(1)] + HRESULT javaEnabled([out, retval] VARIANT_BOOL *pVal); + + [propget, id(2)] + HRESULT cookieEnabled([out, retval] VARIANT_BOOL *pVal); + + [propget, id(3)] + HRESULT cpuClass([out, retval] BSTR *p); + + [propget, id(4)] + HRESULT systemLanguage([out, retval] BSTR *p); + + [propget, id(6)] + HRESULT userLanguage([out, retval] BSTR *p); + + [propget, id(7)] + HRESULT platform([out, retval] BSTR *p); + + [propget, id(9)] + HRESULT connectionSpeed([out, retval] long *p); + + [propget, id(10)] + HRESULT onLine([out, retval] VARIANT_BOOL *p); + + [propget, id(11)] + HRESULT colorDepth([out, retval] long *p); + + [propget, id(12)] + HRESULT bufferDepth([out, retval] long *p); + + [propget, id(13)] + HRESULT width([out, retval] long *p); + + [propget, id(14)] + HRESULT height([out, retval] long *p); + + [propget, id(15)] + HRESULT availHeight([out, retval] long *p); + + [propget, id(16)] + HRESULT availWidth([out, retval] long *p); + + [propget, id(17)] + HRESULT connectionType([out, retval] BSTR *p); + + [id(18)] + HRESULT isComponentInstalled( + [in] BSTR bstrName, + [in] BSTR bstrType, + [in, defaultvalue("")] BSTR bStrVer, + [out, retval] VARIANT_BOOL *p); + + [id(19)] + HRESULT getComponentVersion( + [in] BSTR bstrName, + [in] BSTR bstrType, + [out, retval] BSTR *pbstrVer); + + [id(20)] + HRESULT compareVersions( + [in] BSTR bstrVer1, + [in] BSTR bstrVer2, + [out, retval] long *p); + + [id(21)] + HRESULT addComponentRequest( + [in] BSTR bstrName, + [in] BSTR bstrType, + [in, defaultvalue("")] BSTR bstrVer); + + [id(22)] + HRESULT doComponentRequest([out, retval] VARIANT_BOOL *p); + + [id(23)] + HRESULT clearComponentRequest(); +}

1 0

David Hedberg : ole32: Add ManualResetEvent implementation.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: a0980b47c8840ae1952c3561923e02ca1ff3b376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0980b47c8840ae1952c35619… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon May 30 12:45:31 2011 +0200 ole32: Add ManualResetEvent implementation. --- dlls/ole32/compobj.c | 113 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/tests/marshal.c | 64 +++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 0aa3aee..28e5da1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -458,6 +458,116 @@ static void COM_RevokeAllClasses(const struct apartment *apt) LeaveCriticalSection( &csRegisteredClassList ); } +/****************************************************************************** + * Implementation of the manual reset event object. (CLSID_ManualResetEvent) + */ + +typedef struct ManualResetEvent { + ISynchronize ISynchronize_iface; + LONG ref; + HANDLE event; +} MREImpl; + +static inline MREImpl *impl_from_ISynchronize(ISynchronize *iface) +{ + return CONTAINING_RECORD(iface, MREImpl, ISynchronize_iface); +} + +static HRESULT WINAPI ISynchronize_fnQueryInterface(ISynchronize *iface, REFIID riid, void **ppv) +{ + MREImpl *This = impl_from_ISynchronize(iface); + TRACE("%p (%s, %p)\n", This, debugstr_guid(riid), ppv); + + *ppv = NULL; + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ISynchronize)) + *ppv = This; + else + ERR("Unknown interface %s requested.\n", debugstr_guid(riid)); + + if(*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI ISynchronize_fnAddRef(ISynchronize *iface) +{ + MREImpl *This = impl_from_ISynchronize(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("%p - ref %d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ISynchronize_fnRelease(ISynchronize *iface) +{ + MREImpl *This = impl_from_ISynchronize(iface); + LONG ref = InterlockedDecrement(&This->ref); + TRACE("%p - ref %d\n", This, ref); + + if(!ref) + { + CloseHandle(This->event); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI ISynchronize_fnWait(ISynchronize *iface, DWORD dwFlags, DWORD dwMilliseconds) +{ + MREImpl *This = impl_from_ISynchronize(iface); + UINT index; + TRACE("%p (%08x, %08x)\n", This, dwFlags, dwMilliseconds); + return CoWaitForMultipleHandles(dwFlags, dwMilliseconds, 1, &This->event, &index); +} + +static HRESULT WINAPI ISynchronize_fnSignal(ISynchronize *iface) +{ + MREImpl *This = impl_from_ISynchronize(iface); + TRACE("%p\n", This); + SetEvent(This->event); + return S_OK; +} + +static HRESULT WINAPI ISynchronize_fnReset(ISynchronize *iface) +{ + MREImpl *This = impl_from_ISynchronize(iface); + TRACE("%p\n", This); + ResetEvent(This->event); + return S_OK; +} + +static ISynchronizeVtbl vt_ISynchronize = { + ISynchronize_fnQueryInterface, + ISynchronize_fnAddRef, + ISynchronize_fnRelease, + ISynchronize_fnWait, + ISynchronize_fnSignal, + ISynchronize_fnReset +}; + +static HRESULT ManualResetEvent_Construct(IUnknown *punkouter, REFIID iid, void **ppv) +{ + MREImpl *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MREImpl)); + HRESULT hr; + + if(punkouter) + FIXME("Aggregation not implemented.\n"); + + This->ref = 1; + This->ISynchronize_iface.lpVtbl = &vt_ISynchronize; + This->event = CreateEventW(NULL, TRUE, FALSE, NULL); + + hr = ISynchronize_QueryInterface(&This->ISynchronize_iface, iid, ppv); + ISynchronize_Release(&This->ISynchronize_iface); + return hr; +} + /*********************************************************************** * CoRevokeClassObject [OLE32.@] * @@ -2510,6 +2620,9 @@ HRESULT WINAPI CoCreateInstance( return S_OK; } + if (IsEqualCLSID(rclsid, &CLSID_ManualResetEvent)) + return ManualResetEvent_Construct(pUnkOuter, iid, ppv); + /* * Get a class factory to construct the object we want. */ diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 86a8f0f..87b2006 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -36,6 +36,7 @@ #include "wine/test.h" DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); /* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); @@ -2836,6 +2837,68 @@ static void test_globalinterfacetable(void) IGlobalInterfaceTable_Release(git); } +static void test_manualresetevent(void) +{ + ISynchronize *psync1, *psync2; + IUnknown *punk; + LONG ref; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ManualResetEvent, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&punk); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!!punk, "Got NULL.\n"); + IUnknown_Release(punk); + + hr = CoCreateInstance(&CLSID_ManualResetEvent, NULL, CLSCTX_INPROC_SERVER, &IID_ISynchronize, (void**)&psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!!psync1, "Got NULL.\n"); + + hr = ISynchronize_Wait(psync1, 0, 5); + ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr); + + hr = ISynchronize_Reset(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Signal(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Wait(psync1, 0, 5); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Wait(psync1, 0, 5); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Reset(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Wait(psync1, 0, 5); + ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr); + + hr = CoCreateInstance(&CLSID_ManualResetEvent, NULL, CLSCTX_INPROC_SERVER, &IID_ISynchronize, (void**)&psync2); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!!psync2, "Got NULL.\n"); + ok(psync1 != psync2, "psync1 == psync2.\n"); + hr = ISynchronize_Wait(psync2, 0, 5); + ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr); + + hr = ISynchronize_Reset(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Reset(psync2); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Signal(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Wait(psync2, 0, 5); + ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr); + + ref = ISynchronize_AddRef(psync1); + ok(ref == 2, "Got ref: %d\n", ref); + ref = ISynchronize_AddRef(psync1); + ok(ref == 3, "Got ref: %d\n", ref); + ref = ISynchronize_Release(psync1); + ok(ref == 2, "Got nonzero ref: %d\n", ref); + ref = ISynchronize_Release(psync2); + ok(!ref, "Got nonzero ref: %d\n", ref); + ref = ISynchronize_Release(psync1); + ok(ref == 1, "Got nonzero ref: %d\n", ref); + ref = ISynchronize_Release(psync1); + ok(!ref, "Got nonzero ref: %d\n", ref); +} + static const char *debugstr_iid(REFIID riid) { static char name[256]; @@ -3120,6 +3183,7 @@ START_TEST(marshal) test_local_server(); test_globalinterfacetable(); + test_manualresetevent(); /* must be last test as channel hooks can't be unregistered */ test_channel_hook();

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 8f3361b51dc3de6e96ce70920be83d0ec87094b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f3361b51dc3de6e96ce70920… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat May 21 10:12:43 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/po/lt.po b/po/lt.po index ec0c5ab..79c18bd 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-05-19 22:50+0300\n" +"PO-Revision-Date: 2011-05-23 19:33+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Virtaal 0.7.0-beta4\n" +"X-Generator: Virtaal 0.7.0-rc1\n" "X-Project-Style: default\n" #: appwiz.rc:28 @@ -280,23 +280,23 @@ msgstr "Kaštoninė" #: comdlg32.rc:133 wordpad.rc:116 msgid "Green" -msgstr "Žalia" +msgstr "Tamsiai žalia" #: comdlg32.rc:134 wordpad.rc:117 msgid "Olive" -msgstr "Alyvinė" +msgstr "Tamsiai geltona" #: comdlg32.rc:135 wordpad.rc:118 msgid "Navy" -msgstr "Ultramarinas" +msgstr "Tamsiai mėlyna" #: comdlg32.rc:136 wordpad.rc:119 msgid "Purple" -msgstr "Purpurinė" +msgstr "Violetinė" #: comdlg32.rc:137 wordpad.rc:120 msgid "Teal" -msgstr "Neutrali ciano" +msgstr "Tamsiai žydra" #: comdlg32.rc:138 wordpad.rc:121 msgid "Gray" @@ -312,7 +312,7 @@ msgstr "Raudona" #: comdlg32.rc:141 wordpad.rc:124 msgid "Lime" -msgstr "Gelsvai žalsva" +msgstr "Žalia" #: comdlg32.rc:142 wordpad.rc:125 msgid "Yellow" @@ -324,7 +324,7 @@ msgstr "Mėlyna" #: comdlg32.rc:144 wordpad.rc:127 msgid "Fuchsia" -msgstr "Fuksija" +msgstr "Purpurinė" #: comdlg32.rc:145 wordpad.rc:128 msgid "Aqua" @@ -8418,18 +8418,18 @@ msgstr "Įvedimo eilutė per ilga.\n" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "" +msgstr "Naudojimas: hostname\n" #: hostname.rc:28 -#, fuzzy msgid "Error: Invalid option '%c'.\n" -msgstr "Klaida: Netinkamas rakto vardas\n" +msgstr "Klaida: netinkamas parametras „%c“.\n" #: hostname.rc:29 msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" msgstr "" +"Klaida: su programa „hostname“ neįmanoma nustatyti kompiuterio vardo.\n" #: ipconfig.rc:27 msgid "Usage: ipconfig [ /? | /all ]\n"

1 0

Alexandre Julliard : iphlpapi: Close the socket in IcmpCloseHandle.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 7165e22d7282df9ac53d727ed1c3fdd658ccd5f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7165e22d7282df9ac53d727ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 17:22:27 2011 +0200 iphlpapi: Close the socket in IcmpCloseHandle. --- dlls/iphlpapi/icmp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 2b76041..50f5bf0 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -187,7 +187,7 @@ BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle) return FALSE; } - shutdown(icp->sid,2); + close( icp->sid ); HeapFree(GetProcessHeap (), 0, icp); return TRUE; }

1 0

Hans Leidekker : msi: Set the SystemComponent installation property if necessary.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 4c49cf853d25463b9eae42c61a18fe37c9d8e31f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c49cf853d25463b9eae42c61… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 09:28:14 2011 +0200 msi: Set the SystemComponent installation property if necessary. --- dlls/msi/action.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 86a8c99..5f42d7c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4815,6 +4815,10 @@ static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey) {'A','R','P','U','R','L','U','P','D','A','T','E','I','N','F','O',0}; static const WCHAR szURLUpdateInfo[] = {'U','R','L','U','p','d','a','t','e','I','n','f','o',0}; + static const WCHAR szARPSYSTEMCOMPONENT[] = + {'A','R','P','S','Y','S','T','E','M','C','O','M','P','O','N','E','N','T',0}; + static const WCHAR szSystemComponent[] = + {'S','y','s','t','e','m','C','o','m','p','o','n','e','n','t',0}; static const WCHAR *propval[] = { szARPAUTHORIZEDCDFPREFIX, szAuthorizedCDFPrefix, @@ -4844,7 +4848,10 @@ static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey) } msi_reg_set_val_dword(hkey, szWindowsInstaller, 1); - + if (msi_get_property_int( package->db, szARPSYSTEMCOMPONENT, 0 )) + { + msi_reg_set_val_dword( hkey, szSystemComponent, 1 ); + } size = deformat_string(package, modpath_fmt, &buffer); RegSetValueExW(hkey, szModifyPath, 0, REG_EXPAND_SZ, (LPBYTE)buffer, size); RegSetValueExW(hkey, szUninstallString, 0, REG_EXPAND_SZ, (LPBYTE)buffer, size);

1 0

Marcus Meissner : gdiplus: Convert and pass in 3 points, not 1 (Coverity).
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 9af15023a2cbda823942d526f50a7958484e3997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af15023a2cbda823942d526f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 29 23:53:45 2011 +0200 gdiplus: Convert and pass in 3 points, not 1 (Coverity). --- dlls/gdiplus/matrix.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 1035cc2..acfe989 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -105,7 +105,8 @@ GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect *rect, GDIPCONST GpPoint GpMatrix **matrix) { GpRectF rectF; - GpPointF ptF; + GpPointF ptF[3]; + int i; TRACE("(%p, %p, %p)\n", rect, pt, matrix); @@ -114,10 +115,11 @@ GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect *rect, GDIPCONST GpPoint rectF.Width = (REAL)rect->Width; rectF.Height = (REAL)rect->Height; - ptF.X = (REAL)pt->X; - ptF.Y = (REAL)pt->Y; - - return GdipCreateMatrix3(&rectF, &ptF, matrix); + for (i = 0; i < 3; i++) { + ptF[i].X = (REAL)pt[i].X; + ptF[i].Y = (REAL)pt[i].Y; + } + return GdipCreateMatrix3(&rectF, ptF, matrix); } GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix *matrix, GpMatrix **clone)

1 0

Hans Leidekker : appwiz.cpl: Don't list system components.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 9432d65b7a6cb731bf513390f8e1677ad926f1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9432d65b7a6cb731bf513390f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 09:28:31 2011 +0200 appwiz.cpl: Don't list system components. --- dlls/appwiz.cpl/appwiz.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 957b8bf..48aee45 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -100,6 +100,7 @@ static const WCHAR CommentsW[] = {'C','o','m','m','e','n','t','s',0}; static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l', 'S','t','r','i','n','g',0}; static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; +static const WCHAR SystemComponentW[] = {'S','y','s','t','e','m','C','o','m','p','o','n','e','n','t',0}; static const WCHAR PathUninstallW[] = { 'S','o','f','t','w','a','r','e','\\', @@ -153,7 +154,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) HKEY hkeyApp; int i, id = 0; DWORD sizeOfSubKeyName, displen, uninstlen; - DWORD dwNoModify, dwType, value; + DWORD dwNoModify, dwType, value, size; WCHAR subKeyName[256]; WCHAR *command; APPINFO *info = NULL; @@ -165,12 +166,19 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) NULL, NULL, NULL) != ERROR_NO_MORE_ITEMS; ++i) { RegOpenKeyExW(root, subKeyName, 0, KEY_READ, &hkeyApp); - + size = sizeof(value); + if (!RegQueryValueExW(hkeyApp, SystemComponentW, NULL, &dwType, (LPBYTE)&value, &size) + && dwType == REG_DWORD && value == 1) + { + RegCloseKey(hkeyApp); + sizeOfSubKeyName = sizeof(subKeyName) / sizeof(subKeyName[0]); + continue; + } displen = 0; uninstlen = 0; if (!RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, NULL, &displen)) { - DWORD size = sizeof(value); + size = sizeof(value); if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &dwType, (LPBYTE)&value, &size) && dwType == REG_DWORD && value == 1) {

1 0

Michael Stefaniuc : d3dxof/tests: Fix an ok() comment to match the tested value.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 2317815da588de72910490ac80e2fa4e50a42a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2317815da588de72910490ac8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 30 13:52:24 2011 +0200 d3dxof/tests: Fix an ok() comment to match the tested value. --- dlls/d3dxof/tests/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 39fa880..e8bda82 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -123,7 +123,7 @@ static void test_refcount(void) ref = getRefcount( (IUnknown *) lpDirectXFile); ok(ref == 1, "Got refcount %d, expected 1\n", ref); ref = IDirectXFile_AddRef(lpDirectXFile); - ok(ref == 2, "Got refcount %d, expected 1\n", ref); + ok(ref == 2, "Got refcount %d, expected 2\n", ref); ref = IDirectXFile_Release(lpDirectXFile); ok(ref == 1, "Got refcount %d, expected 1\n", ref);

1 0

Marko Nikolic : comctl32/tests: Fixed variable type, removed sign comparison warning.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: e3ba666485482c217e51f8c3a2f1e248b9770559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ba666485482c217e51f8c3a… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Fri May 27 14:49:05 2011 +0200 comctl32/tests: Fixed variable type, removed sign comparison warning. --- dlls/comctl32/tests/trackbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 8eaedf4..b72099d 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -954,7 +954,7 @@ static void test_ignore_selection(HWND hWndTrackbar){ static void test_initial_state(void) { HWND hWnd; - DWORD ret; + int ret; hWnd = create_trackbar(0, hWndParent);

1 0

Alexandre Julliard : winevdm: Print an error when trying to start a DOS app from the z: drive.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: cf5d9a0e34e01715ddfe842a22d71c3bbcdcbf5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5d9a0e34e01715ddfe842a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 17:25:39 2011 +0200 winevdm: Print an error when trying to start a DOS app from the z: drive. --- programs/winevdm/winevdm.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 0aaf041..04f2953 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -161,6 +161,12 @@ static void start_dosbox( const char *appname, const char *args ) char *dosbox = find_dosbox(); if (!dosbox) return; + if (tolower(appname[0]) == 'z') + { + WINE_MESSAGE( "winevdm: Cannot start DOS application %s\n", appname ); + WINE_MESSAGE( " because DOSBox doesn't support running from the Z: drive.\n" ); + ExitProcess(1); + } if (!GetTempPathW( MAX_PATH, path )) return; if (!GetTempFileNameW( path, cfgW, 0, config )) return; if (!GetCurrentDirectoryW( MAX_PATH, path )) return;

1 0