wine-commits December 2007

wine-commits@winehq.org

3 participants
824 discussions

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

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 : 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

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

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

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 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

Rob Shearman : rpcrt4: Add a stub for I_RpcGetCurrentCallHandle.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: bdc5a341964e636fc492fc95479255ff186a6481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc5a341964e636fc492fc954… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 17 18:20:41 2007 +0000 rpcrt4: Add a stub for I_RpcGetCurrentCallHandle. --- dlls/rpcrt4/rpc_server.c | 9 +++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 098669c..a337df2 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1121,3 +1121,12 @@ RPC_STATUS WINAPI RpcMgmtSetServerStackSize(ULONG ThreadStackSize) FIXME("(0x%x): stub\n", ThreadStackSize); return RPC_S_OK; } + +/*********************************************************************** + * I_RpcGetCurrentCallHandle (RPCRT4.@) + */ +RPC_BINDING_HANDLE WINAPI I_RpcGetCurrentCallHandle(void) +{ + FIXME("\n"); + return NULL; +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 9005a4f..93f6d31 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -51,7 +51,7 @@ @ stub I_RpcGetAssociationContext @ stdcall I_RpcGetBuffer(ptr) @ stub I_RpcGetBufferWithObject -@ stub I_RpcGetCurrentCallHandle +@ stdcall I_RpcGetCurrentCallHandle() @ stub I_RpcGetExtendedError @ stub I_RpcGetServerContextList @ stub I_RpcGetThreadEvent # win9x

1 0

Rob Shearman : rpcrt4: Don' t copy memory from the buffer in NdrConformantStringUnmarshall if we just pointed the memory pointer into the buffer .
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: b9c92e95642325c99f83b4c2cbb610a5b01a47e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c92e95642325c99f83b4c2c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 17 18:20:34 2007 +0000 rpcrt4: Don't copy memory from the buffer in NdrConformantStringUnmarshall if we just pointed the memory pointer into the buffer. (Reported by Dan Kegel.) --- dlls/rpcrt4/ndr_marshall.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 2de650d..ca40bfa 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -890,7 +890,8 @@ unsigned char *WINAPI NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg *ppMemory = NdrAllocate(pStubMsg, memsize); } - safe_copy_from_buffer(pStubMsg, *ppMemory, bufsize); + if (*ppMemory != pStubMsg->Buffer) + safe_copy_from_buffer(pStubMsg, *ppMemory, bufsize); if (*pFormat == RPC_FC_C_CSTRING) { TRACE("string=%s\n", debugstr_a((char*)*ppMemory));

1 0

Kirill K. Smirnov : winhelp: Avoid any keywords comparision during lookup, store pointer to listbox ITEMDATA instead.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 8d6d9fd3adbb2f6afb9fbac81fb1b7dd573c75a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6d9fd3adbb2f6afb9fbac81… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Dec 17 20:49:09 2007 +0300 winhelp: Avoid any keywords comparision during lookup, store pointer to listbox ITEMDATA instead. --- programs/winhelp/winhelp.c | 36 +++++------------------------------- 1 files changed, 5 insertions(+), 31 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index f769153..ab4999b 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -1957,28 +1957,16 @@ WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW* win, WPARAM wParam, LPARAM static void cb_KWBTree(void *p, void **next, void *cookie) { HWND hListWnd = (HWND)cookie; + int count; WINE_TRACE("Adding '%s' to search list\n", (char *)p); SendMessage(hListWnd, LB_INSERTSTRING, -1, (LPARAM)p); + count = SendMessage(hListWnd, LB_GETCOUNT, 0, 0); + SendMessage(hListWnd, LB_SETITEMDATA, count-1, (LPARAM)p); *next = (char*)p + strlen((char*)p) + 7; } /************************************************************************** - * comp_KWBTREE - * - * HLPFILE_BPTreeCompare function for '|KWBTREE' internal file. - * - */ -static int comp_KWBTree(void *p, const void *key, - int leaf, void** next) -{ - WINE_TRACE("comparing key '%s' with '%s'\n", (char *)p, (char *)key); - *next = (char*)p+strlen(p)+1+(leaf?6:2); - /* unlike directory, index is case insensitive */ - return lstrcmpi(p, key); -} - -/************************************************************************** * WINHELP_IndexDlgProc * * Index dialog callback function. @@ -2004,25 +1992,11 @@ INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARA sel = SendDlgItemMessage(hWnd, IDC_INDEXLIST, LB_GETCURSEL, 0, 0); if (sel != LB_ERR) { - char buf[500]; /* enough */ BYTE *p; int count; - SendDlgItemMessage(hWnd, IDC_INDEXLIST, LB_GETTEXT, - sel, (LPARAM)buf); - p = HLPFILE_BPTreeSearch(file->kwbtree, buf, comp_KWBTree); - if (p == NULL) - { - /* - * TODO: - * This may happen if help file uses other locale than - * system. We should honour charset provided in help file - * and use UNICODE, but for now current implementation is - * acceptable (almost all help files use ANSI). - */ - WINE_FIXME("item '%s' not found, locale mismatch???\n", buf); - return TRUE; - } + p = (BYTE*)SendDlgItemMessage(hWnd, IDC_INDEXLIST, + LB_GETITEMDATA, sel, 0); count = *(short*)((char *)p + strlen((char *)p) + 1); if (count > 1) {

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2007