May 2007 - Wine-commits - list.winehq.org

Dan Hipschman : widl: Lay framework for unions with simple unions working.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: c5aaadc4c89a49696dc265cb1498e2e28837534a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5aaadc4c89a49696dc265cb1… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri May 18 16:53:27 2007 -0700 widl: Lay framework for unions with simple unions working. --- dlls/rpcrt4/tests/server.c | 34 +++++ dlls/rpcrt4/tests/server.idl | 14 ++ dlls/rpcrt4/tests/server_defines.h | 24 ++++ tools/widl/parser.y | 1 + tools/widl/typegen.c | 266 ++++++++++++++++++++++++++++++++++-- tools/widl/widltypes.h | 1 + 6 files changed, 331 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5aaadc4c89a49696dc26…

1 0

Andrew Talbot : user32: Exclude unused headers.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: 01e93cc2d1eab9b1ba887a0fe5903fdb9ad106f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e93cc2d1eab9b1ba887a0fe… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat May 19 23:24:05 2007 +0100 user32: Exclude unused headers. --- dlls/user32/combo.c | 1 - dlls/user32/comm16.c | 1 - dlls/user32/cursoricon.c | 2 -- dlls/user32/dde_client.c | 1 - dlls/user32/dde_misc.c | 1 - 5 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 4be67cc..3e8504d 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -46,7 +46,6 @@ #include "user_private.h" #include "win.h" #include "controls.h" -#include "winreg.h" #include "winternl.h" #include "wine/debug.h" diff --git a/dlls/user32/comm16.c b/dlls/user32/comm16.c index 4f6a076..57b00d1 100644 --- a/dlls/user32/comm16.c +++ b/dlls/user32/comm16.c @@ -62,7 +62,6 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" #include "wine/winuser16.h" #include "win.h" #include "user_private.h" diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 63465ca..d528bee 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -53,9 +53,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wownt32.h" #include "winerror.h" -#include "excpt.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "wine/exception.h" diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 1441e71..900128c 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -29,7 +29,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winerror.h" #include "winnls.h" #include "dde.h" #include "ddeml.h" diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index bcb4cea..b02db0a 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -33,7 +33,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winerror.h" #include "dde.h" #include "ddeml.h" #include "win.h"

1 0

Andrew Talbot : user32: Exclude unused headers.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: eafdcd11f138967ac455094cf2cfdcafd4c94ec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafdcd11f138967ac455094cf… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat May 19 23:05:09 2007 +0100 user32: Exclude unused headers. --- dlls/user32/dde_server.c | 1 - dlls/user32/defwnd.c | 1 - dlls/user32/exticon.c | 1 - dlls/user32/focus.c | 1 - dlls/user32/lstr.c | 1 - 5 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index 2789450..bb2d583 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -29,7 +29,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winerror.h" #include "dde.h" #include "ddeml.h" #include "win.h" diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index fda2dc9..489f720 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -29,7 +29,6 @@ #include "winbase.h" #include "wingdi.h" #include "winnls.h" -#include "imm.h" #include "win.h" #include "user_private.h" #include "controls.h" diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index b0c02f1..8b70309 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -36,7 +36,6 @@ #define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" -#include "winerror.h" #include "winuser.h" #include "wine/winbase16.h" #include "user_private.h" diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index efc8b8f..e2932d2 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -28,7 +28,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winerror.h" #include "win.h" #include "user_private.h" #include "wine/server.h" diff --git a/dlls/user32/lstr.c b/dlls/user32/lstr.c index dacca84..8fff22f 100644 --- a/dlls/user32/lstr.c +++ b/dlls/user32/lstr.c @@ -36,7 +36,6 @@ #include "wine/exception.h" #include "wine/unicode.h" -#include "excpt.h" /***********************************************************************

1 0

Andrew Talbot : user32: Exclude unused headers.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: 6030e4d549a8789e92599b6e5fcbd4e13291e277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6030e4d549a8789e92599b6e5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat May 19 23:24:59 2007 +0100 user32: Exclude unused headers. --- dlls/user32/mdi.c | 1 - dlls/user32/msgbox.c | 1 - dlls/user32/nonclient.c | 2 -- dlls/user32/property.c | 1 - dlls/user32/spy.c | 1 - 5 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 05448d2..630d58b 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -99,7 +99,6 @@ #include "controls.h" #include "user_private.h" #include "wine/debug.h" -#include "dlgs.h" WINE_DEFAULT_DEBUG_CHANNEL(mdi); diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 0143d5d..fc74314 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -27,7 +27,6 @@ #include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" -#include "winreg.h" #include "winternl.h" #include "dlgs.h" #include "user_private.h" diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index b4cb46c..575bb39 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -26,11 +26,9 @@ #include "winbase.h" #include "wingdi.h" #include "wine/winuser16.h" -#include "wownt32.h" #include "win.h" #include "user_private.h" #include "controls.h" -#include "shellapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(nonclient); diff --git a/dlls/user32/property.c b/dlls/user32/property.c index fac119b..c08128b 100644 --- a/dlls/user32/property.c +++ b/dlls/user32/property.c @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" #include "wownt32.h" #include "wine/unicode.h" #include "wine/winuser16.h" diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 65f86c8..52dced6 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -32,7 +32,6 @@ #include "win.h" #include "user_private.h" #include "wine/debug.h" -#include "winnls.h" #include "commctrl.h" #include "commdlg.h" #include "richedit.h"

1 0

Marcus Meissner : kernel32: Skip modem status tests if GetModemStatus failed.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: b45367347abbe11b33f16761b947f10595546875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45367347abbe11b33f16761b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 20 23:30:11 2007 +0200 kernel32: Skip modem status tests if GetModemStatus failed. --- dlls/kernel32/tests/comm.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 9866521..01ba2b9 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1413,6 +1413,7 @@ static void test_WaitRing(HANDLE hcom) HANDLE alarmThread; DWORD args[3], defaultStat; DWORD alarmThreadId, before, after, after1, diff, success, err, written, evtmask=0; + BOOL ret; ok(GetCommState(hcom, &dcb), "GetCommState failed\n"); if (dcb.fDtrControl == DTR_CONTROL_DISABLE) @@ -1421,7 +1422,11 @@ static void test_WaitRing(HANDLE hcom) return; } args[0]= TIMEOUT >>1; - ok(GetCommModemStatus(hcom, &defaultStat), "GetCommModemStatus failed\n"); + ok((ret = GetCommModemStatus(hcom, &defaultStat)), "GetCommModemStatus failed\n"); + if (!ret) { + skip("modem status failed -> skip.\n"); + return; + } if(defaultStat & MS_RING_ON) args[1] = CLRDTR; else

1 0

Mounir IDRASSI : crypt32: Fix CertAddCertificateContextToStore when called with CERT_STORE_ADD_USE_EXISTING .
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: e5256d98407d95af08758f39ce2a632f8c2e8d00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5256d98407d95af08758f39c… Author: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Mon May 21 02:25:48 2007 +0200 crypt32: Fix CertAddCertificateContextToStore when called with CERT_STORE_ADD_USE_EXISTING. --- dlls/crypt32/store.c | 5 +++++ dlls/crypt32/tests/cert.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index a38d06c..13ac320 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -2160,7 +2160,12 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, break; case CERT_STORE_ADD_USE_EXISTING: if (existing) + { CertContext_CopyProperties(existing, pCertContext); + *ppStoreContext = CertDuplicateCertificateContext(existing); + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); break; default: FIXME("Unimplemented add disposition %d\n", dwAddDisposition); diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index c9f7a0a..25008be 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -134,6 +134,7 @@ static void testAddCert(void) HCERTSTORE store; HCERTSTORE collection; PCCERT_CONTEXT context; + PCCERT_CONTEXT copyContext; BOOL ret; store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, @@ -274,6 +275,15 @@ static void testAddCert(void) CERT_STORE_ADD_REPLACE_EXISTING, NULL); ok(ret, "CertAddCertificateContextToStore failed: %08x\n", GetLastError()); + /* use the existing certificate and ask for a copy of the context*/ + copyContext = NULL; + ret = CertAddCertificateContextToStore(collection, context, + CERT_STORE_ADD_USE_EXISTING, &copyContext); + ok(ret, "CertAddCertificateContextToStore failed: %08x\n", + GetLastError()); + ok(copyContext != NULL, "Expected on output a non NULL copyContext\n"); + if (copyContext) + CertFreeCertificateContext(copyContext); /* but adding a new certificate isn't allowed. */ ret = CertAddCertificateContextToStore(collection, context, CERT_STORE_ADD_ALWAYS, NULL);

1 0

Misha Koshelev : msi/tests: automation: Installer::InstallProduct, remove a registry key set by Wine but not native.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: 74b2c18bae80699ce7ffa5a4bf9c4202ad5af412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b2c18bae80699ce7ffa5a4b… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun May 20 14:31:47 2007 -0500 msi/tests: automation: Installer::InstallProduct, remove a registry key set by Wine but not native. --- dlls/msi/tests/automation.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 9bd7d03..1be45b9 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1814,6 +1814,9 @@ static void test_Installer_InstallProduct(LPCWSTR szPath) RegCloseKey(hkey); + res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Products\\05FA3C1F65B896A40AC00077F34EF203"); + todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_SUCCESS, got %d\n", res); + /* Delete installation files we installed */ delete_test_files(); }

1 0

Misha Koshelev : msi/tests: automation: Test Installer:: Products before and after InstallProduct, check product is not/is installed .
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: ea899e1d6fb5206ec9415577e40c01eb9f32d6e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea899e1d6fb5206ec9415577e… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun May 20 14:31:52 2007 -0500 msi/tests: automation: Test Installer::Products before and after InstallProduct, check product is not/is installed. --- dlls/msi/tests/automation.c | 289 +++++++++++++++++++++++-------------------- 1 files changed, 156 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea899e1d6fb5206ec9415…

1 0

Misha Koshelev : msi: Make MsiEnumProducts enumerate products, not features .
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: 74de3e17540587f98f7ce5bd813ea4969d95f604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74de3e17540587f98f7ce5bd8… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun May 20 14:31:54 2007 -0500 msi: Make MsiEnumProducts enumerate products, not features. --- dlls/msi/registry.c | 21 +++++++++++++++++---- dlls/msi/tests/automation.c | 7 +++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 3781088..14a4754 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -107,6 +107,14 @@ static const WCHAR szUserProduct_fmt[] = { 'P','r','o','d','u','c','t','s','\\', '%','s',0}; +static const WCHAR szInstaller_Products[] = { +'S','o','f','t','w','a','r','e','\\', +'M','i','c','r','o','s','o','f','t','\\', +'W','i','n','d','o','w','s','\\', +'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', +'I','n','s','t','a','l','l','e','r','\\', +'P','r','o','d','u','c','t','s',0}; + static const WCHAR szInstaller_Products_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -493,6 +501,11 @@ UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) return rc; } +UINT MSIREG_OpenProducts(HKEY* key) +{ + return RegCreateKeyW(HKEY_LOCAL_MACHINE,szInstaller_Products,key); +} + UINT MSIREG_OpenProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create) { UINT rc; @@ -680,7 +693,7 @@ UINT WINAPI MsiEnumProductsA(DWORD index, LPSTR lpguid) UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) { - HKEY hkeyFeatures = 0; + HKEY hkeyProducts = 0; DWORD r; WCHAR szKeyName[SQUISH_GUID_SIZE]; @@ -689,14 +702,14 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) if (NULL == lpguid) return ERROR_INVALID_PARAMETER; - r = MSIREG_OpenFeatures(&hkeyFeatures); + r = MSIREG_OpenProducts(&hkeyProducts); if( r != ERROR_SUCCESS ) return ERROR_NO_MORE_ITEMS; - r = RegEnumKeyW(hkeyFeatures, index, szKeyName, SQUISH_GUID_SIZE); + r = RegEnumKeyW(hkeyProducts, index, szKeyName, SQUISH_GUID_SIZE); if( r == ERROR_SUCCESS ) unsquash_guid(szKeyName, lpguid); - RegCloseKey(hkeyFeatures); + RegCloseKey(hkeyProducts); return r; } diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 73145e1..8bf2913 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1679,10 +1679,9 @@ static void test_Installer_Products(BOOL bProductInstalled) } } - if (bProductInstalled) - todo_wine ok(bProductFound, "Product expected to be installed but product code was not found\n"); - else - ok(!bProductFound, "Product not expected to be installed but product code was found\n"); + ok(bProductInstalled == bProductFound, "Product expected to %s installed but product code was %s\n", + bProductInstalled ? "be" : "not be", + bProductFound ? "found" : "not found"); if (pEnum) {

1 0

Francois Gouget : ntdll: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: 820d9540959bef0c88c41568264d60b51ea9985b URL: http://source.winehq.org/git/wine.git/?a=commit;h=820d9540959bef0c88c415682… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 20 12:08:48 2007 +0200 ntdll: Fix compilation on systems that don't support nameless unions. --- dlls/ntdll/thread.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 30e441d..c97ecd3 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -332,8 +332,8 @@ HANDLE thread_init(void) /* initialize time values in user_shared_data */ NtQuerySystemTime( &now ); - user_shared_data->SystemTime.LowPart = now.LowPart; - user_shared_data->SystemTime.High1Time = user_shared_data->SystemTime.High2Time = now.HighPart; + user_shared_data->SystemTime.LowPart = now.u.LowPart; + user_shared_data->SystemTime.High1Time = user_shared_data->SystemTime.High2Time = now.u.HighPart; user_shared_data->u.TickCountQuad = (now.QuadPart - server_start_time) / 10000; user_shared_data->u.TickCount.High2Time = user_shared_data->u.TickCount.High1Time; user_shared_data->TickCountLowDeprecated = user_shared_data->u.TickCount.LowPart;

1 0