December 2007 - Wine-commits

Francois Gouget : msi: Add a trailing '\n' to Wine traces.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: a39ea2e8ba0659084d83efba133b74821bf2937a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39ea2e8ba0659084d83efba1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 18 09:47:22 2007 +0100 msi: Add a trailing '\n' to Wine traces. --- dlls/msi/package.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index a678470..79c8764 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -660,7 +660,7 @@ static UINT msi_load_summary_properties( MSIPACKAGE *package ) &count, NULL, NULL, NULL ); if (rc != ERROR_SUCCESS) { - WARN("Unable to query page count: %d", rc); + WARN("Unable to query page count: %d\n", rc); goto done; } @@ -960,7 +960,7 @@ UINT WINAPI MsiOpenPackageExW(LPCWSTR szPackage, DWORD dwOptions, MSIHANDLE *phP if ( !*szPackage ) { - FIXME("Should create an empty database and package."); + FIXME("Should create an empty database and package\n"); return ERROR_FUNCTION_FAILED; }

1 0

Francois Gouget : secur32/tests: Dynamically load various APIs and don' t link with crypt32.dll to make the test run on Windows 95.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 31bcb3f6f4b6974062cf271bec24ecc0fc6a80b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31bcb3f6f4b6974062cf271be… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 18 10:00:10 2007 +0100 secur32/tests: Dynamically load various APIs and don't link with crypt32.dll to make the test run on Windows 95. --- dlls/secur32/tests/Makefile.in | 2 +- dlls/secur32/tests/schannel.c | 90 ++++++++++++++++++++++++++++------------ 2 files changed, 64 insertions(+), 28 deletions(-) diff --git a/dlls/secur32/tests/Makefile.in b/dlls/secur32/tests/Makefile.in index 45cfeab..0053d73 100644 --- a/dlls/secur32/tests/Makefile.in +++ b/dlls/secur32/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = secur32.dll -IMPORTS = crypt32 advapi32 kernel32 +IMPORTS = advapi32 kernel32 CTESTS = \ main.c \ diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 785ad26..3d3eb7f 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -27,12 +27,18 @@ #include "wine/test.h" -static HMODULE secdll; +static HMODULE secdll, crypt32dll; static SECURITY_STATUS (SEC_ENTRY * pAcquireCredentialsHandleA)(SEC_CHAR*, SEC_CHAR*, ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp); +static PCCERT_CONTEXT (WINAPI *pCertCreateCertificateContext)(DWORD,const BYTE*,DWORD); +static BOOL (WINAPI *pCertFreeCertificateContext)(PCCERT_CONTEXT); +static BOOL (WINAPI *pCertSetCertificateContextProperty)(PCCERT_CONTEXT,DWORD,DWORD,const void*); static SECURITY_STATUS (SEC_ENTRY * pFreeCredentialsHandle)(PCredHandle); static BOOL (WINAPI * pCryptAcquireContextW)(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD); +static BOOL (WINAPI *pCryptDestroyKey)(HCRYPTKEY); +static BOOL (WINAPI *pCryptImportKey)(HCRYPTPROV,CONST BYTE*,DWORD,HCRYPTKEY,DWORD,HCRYPTKEY*); +static BOOL (WINAPI *pCryptReleaseContext)(HCRYPTPROV,ULONG_PTR); static const BYTE bigCert[] = { 0x30, 0x7a, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06, 0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, @@ -100,17 +106,29 @@ static const BYTE selfSignedCert[] = { static void InitFunctionPtrs(void) { HMODULE advapi32dll = GetModuleHandleA("advapi32.dll"); + HMODULE crypt32dll = LoadLibraryA("crypt32.dll"); secdll = LoadLibraryA("secur32.dll"); if(!secdll) secdll = LoadLibraryA("security.dll"); + +#define GET_PROC(h, func) p ## func = (void*)GetProcAddress(h, #func) + if(secdll) { - pAcquireCredentialsHandleA = (PVOID)GetProcAddress(secdll, "AcquireCredentialsHandleA"); - pFreeCredentialsHandle = (PVOID)GetProcAddress(secdll, "FreeCredentialsHandle"); + GET_PROC(secdll, AcquireCredentialsHandleA); + GET_PROC(secdll, FreeCredentialsHandle); } - pCryptAcquireContextW = (void *)GetProcAddress(advapi32dll, "CryptAcquireContextW"); + GET_PROC(advapi32dll, CryptAcquireContextW); + GET_PROC(advapi32dll, CryptDestroyKey); + GET_PROC(advapi32dll, CryptImportKey); + GET_PROC(advapi32dll, CryptReleaseContext); + + GET_PROC(crypt32dll, CertFreeCertificateContext); + GET_PROC(crypt32dll, CertSetCertificateContextProperty); + +#undef GET_PROC } static void testAcquireSecurityContext(void) @@ -127,6 +145,13 @@ static void testAcquireSecurityContext(void) HCRYPTKEY key; CRYPT_KEY_PROV_INFO keyProvInfo; + if (!pAcquireCredentialsHandleA || !pCertCreateCertificateContext || + !pFreeCredentialsHandle || !pCryptAcquireContextW) + { + skip("Needed functions are not available\n"); + return; + } + lstrcpyW(ms_def_prov_w, MS_DEF_PROV_W); keyProvInfo.pwszContainerName = cspNameW; @@ -137,9 +162,9 @@ static void testAcquireSecurityContext(void) keyProvInfo.rgProvParam = NULL; keyProvInfo.dwKeySpec = AT_SIGNATURE; - certs[0] = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, + certs[0] = pCertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); - certs[1] = CertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, + certs[1] = pCertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert)); pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, @@ -247,23 +272,30 @@ static void testAcquireSecurityContext(void) st); /* Good cert, with CRYPT_KEY_PROV_INFO set before it's had a key loaded. */ - ret = CertSetCertificateContextProperty(certs[1], - CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); - schanCred.dwVersion = SCH_CRED_V3; - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, - NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS, - "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, - NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS, - "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); + if (pCertSetCertificateContextProperty) + { + ret = pCertSetCertificateContextProperty(certs[1], + CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); + schanCred.dwVersion = SCH_CRED_V3; + st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + NULL, &schanCred, NULL, NULL, &cred, NULL); + ok(st == SEC_E_UNKNOWN_CREDENTIALS, + "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); + st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, + NULL, &schanCred, NULL, NULL, &cred, NULL); + ok(st == SEC_E_UNKNOWN_CREDENTIALS, + "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); + } ret = pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_NEWKEYSET); ok(ret, "CryptAcquireContextW failed: %08x\n", GetLastError()); - ret = CryptImportKey(csp, privKey, sizeof(privKey), 0, 0, &key); - ok(ret, "CryptImportKey failed: %08x\n", GetLastError()); + ret = 0; + if (pCryptImportKey) + { + ret = pCryptImportKey(csp, privKey, sizeof(privKey), 0, 0, &key); + ok(ret, "CryptImportKey failed: %08x\n", GetLastError()); + } if (ret) { PCCERT_CONTEXT tmp; @@ -338,26 +370,30 @@ static void testAcquireSecurityContext(void) "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); /* FIXME: what about two valid certs? */ - CryptDestroyKey(key); + if (pCryptDestroyKey) + pCryptDestroyKey(key); } - CryptReleaseContext(csp, 0); + if (pCryptReleaseContext) + pCryptReleaseContext(csp, 0); pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - CertFreeCertificateContext(certs[0]); - CertFreeCertificateContext(certs[1]); + if (pCertFreeCertificateContext) + { + pCertFreeCertificateContext(certs[0]); + pCertFreeCertificateContext(certs[1]); + } } START_TEST(schannel) { InitFunctionPtrs(); - if (pAcquireCredentialsHandleA && pFreeCredentialsHandle && pCryptAcquireContextW) - testAcquireSecurityContext(); - else - skip("Needed functions are not available\n"); + testAcquireSecurityContext(); if(secdll) FreeLibrary(secdll); + if(crypt32dll) + FreeLibrary(crypt32dll); }

1 0

James Hawkins : msi: Test sorting a table using a column that is not selected.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: f93ee6f420c5b70001364ce3a03803ccc5e518f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93ee6f420c5b70001364ce3a… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 17 19:34:08 2007 -0600 msi: Test sorting a table using a column that is not selected. --- dlls/msi/tests/db.c | 242 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 242 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index c269572..125b08c 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4558,6 +4558,247 @@ static void test_defaultdatabase(void) DeleteFileA(msifile); } +static void test_order(void) +{ + MSIHANDLE hdb, hview, hrec; + LPCSTR query; + UINT r; + int val; + + hdb = create_db(); + ok(hdb, "failed to create db\n"); + + query = "CREATE TABLE `Mesa` ( `A` SHORT NOT NULL, `B` SHORT, `C` SHORT PRIMARY KEY `A`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Mesa` ( `A`, `B`, `C` ) VALUES ( 1, 2, 9 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Mesa` ( `A`, `B`, `C` ) VALUES ( 3, 4, 7 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Mesa` ( `A`, `B`, `C` ) VALUES ( 5, 6, 8 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `Sideboard` ( `D` SHORT NOT NULL, `E` SHORT, `F` SHORT PRIMARY KEY `D`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Sideboard` ( `D`, `E`, `F` ) VALUES ( 10, 11, 18 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Sideboard` ( `D`, `E`, `F` ) VALUES ( 12, 13, 16 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Sideboard` ( `D`, `E`, `F` ) VALUES ( 14, 15, 17 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT `A`, `B` FROM `Mesa` ORDER BY `C`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(hrec, 1); + todo_wine + { + ok(val == 3, "Expected 3, got %d\n", val); + } + + val = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(val == 4, "Expected 3, got %d\n", val); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(hrec, 1); + todo_wine + { + ok(val == 5, "Expected 5, got %d\n", val); + } + + val = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(val == 6, "Expected 6, got %d\n", val); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(hrec, 1); + todo_wine + { + ok(val == 1, "Expected 1, got %d\n", val); + } + + val = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(val == 2, "Expected 2, got %d\n", val); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + query = "SELECT `A`, `D` FROM `Mesa`, `Sideboard` ORDER BY `F`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(hrec, 1); + ok(val == 1, "Expected 1, got %d\n", val); + + val = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(val == 12, "Expected 12, got %d\n", val); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(hrec, 1); + ok(val == 3, "Expected 3, got %d\n", val); + + val = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(val == 12, "Expected 12, got %d\n", val); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(hrec, 1); + ok(val == 5, "Expected 5, got %d\n", val); + + val = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(val == 12, "Expected 12, got %d\n", val); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(hrec, 1); + ok(val == 1, "Expected 1, got %d\n", val); + + val = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(val == 14, "Expected 14, got %d\n", val); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(hrec, 1); + ok(val == 3, "Expected 3, got %d\n", val); + + val = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(val == 14, "Expected 14, got %d\n", val); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(hrec, 1); + ok(val == 5, "Expected 5, got %d\n", val); + + val = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(val == 14, "Expected 14, got %d\n", val); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(hrec, 1); + ok(val == 1, "Expected 1, got %d\n", val); + + val = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(val == 10, "Expected 10, got %d\n", val); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(hrec, 1); + ok(val == 3, "Expected 3, got %d\n", val); + + val = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(val == 10, "Expected 10, got %d\n", val); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(hrec, 1); + ok(val == 5, "Expected 5, got %d\n", val); + + val = MsiRecordGetInteger(hrec, 2); + todo_wine + { + ok(val == 10, "Expected 10, got %d\n", val); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiCloseHandle(hview); + MsiCloseHandle(hdb); +} + START_TEST(db) { test_msidatabase(); @@ -4586,4 +4827,5 @@ START_TEST(db) test_stringtable(); test_viewmodify_delete(); test_defaultdatabase(); + test_order(); }

1 0

James Hawkins : msi: Sort each table of the join separately.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 91c205e8c0332a1260f58a94fc1a216be2da8c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c205e8c0332a1260f58a94f… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 17 19:35:31 2007 -0600 msi: Sort each table of the join separately. --- dlls/msi/Makefile.in | 1 - dlls/msi/alter.c | 1 + dlls/msi/create.c | 1 + dlls/msi/distinct.c | 9 ++ dlls/msi/insert.c | 1 + dlls/msi/join.c | 19 +++ dlls/msi/msipriv.h | 15 ++ dlls/msi/order.c | 376 -------------------------------------------------- dlls/msi/query.h | 10 -- dlls/msi/select.c | 9 ++ dlls/msi/sql.y | 15 +- dlls/msi/streams.c | 1 + dlls/msi/table.c | 170 +++++++++++++++++++++++ dlls/msi/tests/db.c | 75 ++-------- dlls/msi/where.c | 9 ++ 15 files changed, 258 insertions(+), 454 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91c205e8c0332a1260f58…

1 0

Francois Gouget : user32/tests: Use GetProcAddress() on ChangeDisplaySettingsExA() because it is missing on Windows 95.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 69f83a6f9f33038ee60b1eb4f989df0612861f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f83a6f9f33038ee60b1eb4f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 18 09:47:17 2007 +0100 user32/tests: Use GetProcAddress() on ChangeDisplaySettingsExA() because it is missing on Windows 95. --- dlls/user32/tests/sysparams.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index b554430..8ce4b93 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -37,6 +37,8 @@ # define SPI_GETDESKWALLPAPER 0x0073 #endif +static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); + static int strict; static int dpi; static int iswin9x; @@ -2188,6 +2190,12 @@ static void test_WM_DISPLAYCHANGE(void) LONG change_ret; DWORD wait_ret; + if (!pChangeDisplaySettingsExA) + { + skip("ChangeDisplaySettingsExA is not available\n"); + return; + } + displaychange_test_active = TRUE; memset(&startmode, 0, sizeof(startmode)); @@ -2209,7 +2217,7 @@ static void test_WM_DISPLAYCHANGE(void) change_counter = 0; /* This sends a SETTINGSCHANGE message as well in which we aren't interested */ displaychange_ok = TRUE; - change_ret = ChangeDisplaySettingsEx(NULL, &mode, NULL, 0, NULL); + change_ret = pChangeDisplaySettingsExA(NULL, &mode, NULL, 0, NULL); /* Wait quite long for the message, screen setting changes can take some time */ if(change_ret == DISP_CHANGE_SUCCESSFUL) { wait_ret = WaitForSingleObject(displaychange_sem, 10000); @@ -2240,7 +2248,7 @@ static void test_WM_DISPLAYCHANGE(void) mode.dmPelsHeight = GetSystemMetrics(SM_CYSCREEN); displaychange_ok = TRUE; - change_ret = ChangeDisplaySettingsEx(NULL, &mode, NULL, 0, NULL); + change_ret = pChangeDisplaySettingsExA(NULL, &mode, NULL, 0, NULL); WaitForSingleObject(displaychange_sem, 10000); displaychange_ok = FALSE; CloseHandle(displaychange_sem); @@ -2552,8 +2560,12 @@ START_TEST(sysparams) MSG msg; HANDLE hThread; DWORD dwThreadId; - HANDLE hInstance = GetModuleHandleA( NULL ); + HANDLE hInstance, hdll; + + hdll = GetModuleHandleA("user32.dll"); + pChangeDisplaySettingsExA=(void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA"); + hInstance = GetModuleHandleA( NULL ); hdc = GetDC(0); dpi = GetDeviceCaps( hdc, LOGPIXELSY); iswin9x = GetVersion() & 0x80000000;

1 0

Rob Shearman : include: Add some context handle defines to rpcdcep.h.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: be0e3a479a651837933e24d9be036b265fbf2559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0e3a479a651837933e24d9b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 17 18:20:58 2007 +0000 include: Add some context handle defines to rpcdcep.h. --- include/rpcdcep.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/rpcdcep.h b/include/rpcdcep.h index d3c2e09..f2a2196 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -48,12 +48,21 @@ typedef struct _RPC_MESSAGE unsigned long RpcFlags; } RPC_MESSAGE, *PRPC_MESSAGE; +#define RPC_CONTEXT_HANDLE_DEFAULT_GUARD ((void *)0xfffff00d) + +#define RPC_CONTEXT_HANDLE_DEFAULT_FLAGS 0x00000000 +#define RPC_CONTEXT_HANDLE_FLAGS 0x30000000 +#define RPC_CONTEXT_HANDLE_SERIALIZE 0x10000000 +#define RPC_CONTEXT_HANDLE_DONT_SERIALIZE 0x20000000 +#define RPC_TYPE_STRICT_CONTEXT_HANDLE 0x40000000 + #define RPC_NCA_FLAGS_DEFAULT 0x00000000 #define RPC_NCA_FLAGS_IDEMPOTENT 0x00000001 #define RPC_NCA_FLAGS_BROADCAST 0x00000002 #define RPC_NCA_FLAGS_MAYBE 0x00000004 typedef void (__RPC_STUB *RPC_DISPATCH_FUNCTION)(PRPC_MESSAGE Message); +typedef RPC_STATUS (RPC_ENTRY *RPC_FORWARD_FUNCTION)(UUID *InterfaceId, RPC_VERSION *InterfaceVersion, UUID *ObjectId, unsigned char *Rpcpro, void **ppDestEndpoint); typedef struct {

1 0

Michael Stefaniuc : rpcrt4: Add missing LeaveCriticalSection. Found by Smatch.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 6210c097a46f829715bd634b4a1c6959a882a1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6210c097a46f829715bd634b4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 17 22:28:00 2007 +0100 rpcrt4: Add missing LeaveCriticalSection. Found by Smatch. --- dlls/rpcrt4/rpc_assoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 173ba71..7793c48 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -137,6 +137,7 @@ RPC_STATUS RpcServerAssoc_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, } } *assoc_out = NULL; + LeaveCriticalSection(&assoc_list_cs); return RPC_S_NO_CONTEXT_AVAILABLE; }

1 0

Rob Shearman : include: Add more types and function declarations to the rpcasync.h header file.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 486326ed4842e5dc989fed71157dd1473a573bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=486326ed4842e5dc989fed711… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 17 15:24:08 2007 +0000 include: Add more types and function declarations to the rpcasync.h header file. Fix up a couple of conflicts with the Status field in the RPC_EXTENDED_ERROR_INFO and the X Status define. --- dlls/winex11.drv/desktop.c | 5 +- dlls/winex11.drv/event.c | 6 ++- include/rpcasync.h | 150 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 1e189c8..19643d1 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -23,8 +23,11 @@ #include <X11/Xlib.h> #include "win.h" -#include "ddrawi.h" #include "x11drv.h" + +/* avoid conflict with field names in included win32 headers */ +#undef Status +#include "ddrawi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index d06ade8..5eaebe9 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -37,11 +37,15 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" -#include "shlobj.h" /* DROPFILES */ #include "win.h" #include "x11drv.h" + +/* avoid conflict with field names in included win32 headers */ +#undef Status +#include "shlobj.h" /* DROPFILES */ #include "shellapi.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(event); diff --git a/include/rpcasync.h b/include/rpcasync.h index d90bbe0..d4bf4f8 100644 --- a/include/rpcasync.h +++ b/include/rpcasync.h @@ -26,12 +26,162 @@ typedef struct tagRPC_ERROR_ENUM_HANDLE void* Head; } RPC_ERROR_ENUM_HANDLE; +typedef enum tagExtendedErrorParamTypes +{ + eeptAnsiString = 1, + eeptUnicodeString, + eeptLongVal, + eeptShortVal, + eeptPointerVal, + eeptNone, + eeptBinary +} ExtendedErrorParamTypes; + +#define MaxNumberOfEEInfoParams 4 +#define RPC_EEINFO_VERSION 1 + +typedef struct tagBinaryParam +{ + void *Buffer; + short Size; +} BinaryParam; + +typedef struct tagRPC_EE_INFO_PARAM +{ + ExtendedErrorParamTypes ParameterType; + union + { + LPSTR AnsiString; + LPWSTR UnicodeString; + LONG LVal; + short SVal; + ULONGLONG PVal; + BinaryParam BVal; + } u; +} RPC_EE_INFO_PARAM; + +#define EEInfoPreviousRecordsMissing 0x1 +#define EEInfoNextRecordsMissing 0x2 +#define EEInfoUseFileTime 0x4 + +#define EEInfoGCCOM 11 +#define EEInfoGCFRS 12 + +typedef struct tagRPC_EXTENDED_ERROR_INFO +{ + ULONG Version; + LPWSTR ComputerName; + ULONG ProcessID; + union + { + SYSTEMTIME SystemTime; + FILETIME FileTime; + } u; + ULONG GeneratingComponent; + ULONG Status; + USHORT DetectionLocation; + USHORT Flags; + int NumberOfParameters; + RPC_EE_INFO_PARAM Parameters[MaxNumberOfEEInfoParams]; +} RPC_EXTENDED_ERROR_INFO; + +#define RPC_ASYNC_VERSION_1_0 sizeof(RPC_ASYNC_STATE) + +typedef enum _RPC_NOTIFICATION_TYPES +{ + RpcNotificationTypeNone, + RpcNotificationTypeEvent, + RpcNotificationTypeApc, + RpcNotificationTypeIoc, + RpcNotificationTypeHwnd, + RpcNotificationTypeCallback, +} RPC_NOTIFICATION_TYPES; + +typedef enum _RPC_ASYNC_EVENT +{ + RpcCallComplete, + RpcSendComplete, + RpcReceiveComplete, + RpcClientDisconnect, + RpcClientCancel, +} RPC_ASYNC_EVENT; + +struct _RPC_ASYNC_STATE; + +typedef void RPC_ENTRY RPCNOTIFICATION_ROUTINE(struct _RPC_ASYNC_STATE *,void *,RPC_ASYNC_EVENT); +typedef RPCNOTIFICATION_ROUTINE *PFN_RPCNOTIFICATION_ROUTINE; + +typedef union _RPC_ASYNC_NOTIFICATION_INFO +{ + struct + { + PFN_RPCNOTIFICATION_ROUTINE NotificationRoutine; + HANDLE hThread; + } APC; + struct + { + HANDLE hIOPort; + DWORD dwNumberOfBytesTransferred; + DWORD_PTR dwCompletionKey; + LPOVERLAPPED lpOverlapped; + } IOC; + struct + { + HWND hWnd; + UINT Msg; + } HWND; + HANDLE hEvent; + PFN_RPCNOTIFICATION_ROUTINE NotificationRoutine; +} RPC_ASYNC_NOTIFICATION_INFO, *PRPC_ASYNC_NOTIFICATION_INFO; + +#define RPC_C_NOTIFY_ON_SEND_COMPLETE 0x1 +#define RPC_C_INFINITE_TIMEOUT INFINITE + +typedef struct _RPC_ASYNC_STATE +{ + unsigned int Size; + ULONG Signature; + LONG Lock; + ULONG Flags; + void *StubInfo; + void *UserInfo; + void *RuntimeInfo; + RPC_ASYNC_EVENT Event; + RPC_NOTIFICATION_TYPES NotificationType; + RPC_ASYNC_NOTIFICATION_INFO u; + LONG_PTR Reserved[4]; +} RPC_ASYNC_STATE, *PRPC_ASYNC_STATE; + +#define RpcAsyncGetCallHandle(async) (((PRPC_ASYNC_STATE)async)->RuntimeInfo) #ifdef __cplusplus extern "C" { #endif +RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncInitializeHandle(PRPC_ASYNC_STATE,unsigned int); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncRegisterInfo(PRPC_ASYNC_STATE); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncGetCallStatus(PRPC_ASYNC_STATE); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncCompleteCall(PRPC_ASYNC_STATE,void *); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncAbortCall(PRPC_ASYNC_STATE,ULONG); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncCancelCall(PRPC_ASYNC_STATE,BOOL); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncCleanupThread(DWORD); RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorStartEnumeration(RPC_ERROR_ENUM_HANDLE*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorGetNextRecord(RPC_ERROR_ENUM_HANDLE*,BOOL,RPC_EXTENDED_ERROR_INFO*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorEndEnumeration(RPC_ERROR_ENUM_HANDLE*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorResetEnumeration(RPC_ERROR_ENUM_HANDLE*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorGetNumberOfRecords(RPC_ERROR_ENUM_HANDLE*,int*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorSaveErrorInfo(RPC_ERROR_ENUM_HANDLE*,PVOID*,SIZE_T*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorLoadErrorInfo(PVOID,SIZE_T,RPC_ERROR_ENUM_HANDLE*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorAddRecord(RPC_EXTENDED_ERROR_INFO*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorClearInformation(void); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcGetAuthorizationContextForClient(RPC_BINDING_HANDLE,BOOL,LPVOID,PLARGE_INTEGER,LUID,DWORD,PVOID,PVOID*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcFreeAuthorizationContext(PVOID*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcSsContextLockExclusive(RPC_BINDING_HANDLE,PVOID); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcSsContextLockShared(RPC_BINDING_HANDLE,PVOID); + +RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcAsyncSetHandle(PRPC_MESSAGE,PRPC_ASYNC_STATE); +RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcAsyncAbortCall(PRPC_ASYNC_STATE,ULONG); +RPCRTAPI int RPC_ENTRY I_RpcExceptionFilter(ULONG); #ifdef __cplusplus }

1 0

Maarten Lankhorst : riched20: Fix bugs in EM_SETOPTIONS.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 8e639ec392b1652edd4a0f121e534f036b4ceac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e639ec392b1652edd4a0f121… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Mon Dec 17 17:56:32 2007 +0100 riched20: Fix bugs in EM_SETOPTIONS. Add SELECTIONBAR to mask, and use settings rather then lParam. 2 subtle bugs that prevent selectionbar from working. --- dlls/riched20/editor.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 343da8b..01d60c5 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1569,7 +1569,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, * setting the bit to work */ DWORD mask = ECO_VERTICAL | ECO_AUTOHSCROLL | ECO_AUTOVSCROLL | - ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN; + ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN | ECO_SELECTIONBAR; DWORD raw = GetWindowLongW(hWnd, GWL_STYLE); DWORD settings = mask & raw; @@ -1589,22 +1589,23 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, } SetWindowLongW(hWnd, GWL_STYLE, (raw & ~mask) | (settings & mask)); - if (lParam & ECO_AUTOWORDSELECTION) + if (settings & ECO_AUTOWORDSELECTION) FIXME("ECO_AUTOWORDSELECTION not implemented yet!\n"); - if (lParam & ECO_SELECTIONBAR) + if (settings & ECO_SELECTIONBAR) editor->selofs = 16; else editor->selofs = 0; + ME_WrapMarkedParagraphs(editor); - if (lParam & ECO_VERTICAL) + if (settings & ECO_VERTICAL) FIXME("ECO_VERTICAL not implemented yet!\n"); - if (lParam & ECO_AUTOHSCROLL) + if (settings & ECO_AUTOHSCROLL) FIXME("ECO_AUTOHSCROLL not implemented yet!\n"); - if (lParam & ECO_AUTOVSCROLL) + if (settings & ECO_AUTOVSCROLL) FIXME("ECO_AUTOVSCROLL not implemented yet!\n"); - if (lParam & ECO_NOHIDESEL) + if (settings & ECO_NOHIDESEL) FIXME("ECO_NOHIDESEL not implemented yet!\n"); - if (lParam & ECO_WANTRETURN) + if (settings & ECO_WANTRETURN) FIXME("ECO_WANTRETURN not implemented yet!\n"); return settings;

1 0

Kirill K. Smirnov : winhelp: Remember last added page.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 6af0e45d794df870b803afd902e438be838d4bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af0e45d794df870b803afd90… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Dec 17 20:46:50 2007 +0300 winhelp: Remember last added page. --- programs/winhelp/hlpfile.c | 14 ++++++-------- programs/winhelp/hlpfile.h | 1 + 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 3a9717a..49e652c 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -443,15 +443,14 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigned off if (hlpfile->first_page) { - HLPFILE_PAGE *p; - - for (p = hlpfile->first_page; p->next; p = p->next); - page->prev = p; - p->next = page; + hlpfile->last_page->next = page; + page->prev = hlpfile->last_page; + hlpfile->last_page = page; } else { hlpfile->first_page = page; + hlpfile->last_page = page; page->prev = NULL; } @@ -889,9 +888,8 @@ static BOOL HLPFILE_AddParagraph(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigne unsigned short bits; unsigned nc, ncol = 1; - if (!hlpfile->first_page) {WINE_WARN("no page\n"); return FALSE;}; - - for (page = hlpfile->first_page; page->next; page = page->next) /* Nothing */; + if (!hlpfile->last_page) {WINE_WARN("no page\n"); return FALSE;}; + page = hlpfile->last_page; for (paragraphptr = &page->first_paragraph; *paragraphptr; paragraphptr = &(*paragraphptr)->next) /* Nothing */; diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index 7e6e6e5..3632902 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -122,6 +122,7 @@ typedef struct tagHlpFileFile LPSTR lpszTitle; LPSTR lpszCopyright; HLPFILE_PAGE* first_page; + HLPFILE_PAGE* last_page; HLPFILE_MACRO* first_macro; BYTE* Context; BYTE* kwbtree;

1 0