July 2007 - Wine-Commits - list.winehq.org

Juan Lang : crypt32: Add more tests for opening a data message for encoding .
by Alexandre Julliard July 10, 2007

July 10, 2007

Module: wine Branch: master Commit: fd05fe0d132a503b00aebd263aab46e63ddcfaa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd05fe0d132a503b00aebd263… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 9 10:55:00 2007 -0700 crypt32: Add more tests for opening a data message for encoding. --- dlls/crypt32/tests/msg.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 20b52ad..96489bc 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -304,6 +304,8 @@ static void test_data_msg_open(void) { HCRYPTMSG msg; CMSG_HASHED_ENCODE_INFO hashInfo = { 0 }; + CMSG_STREAM_INFO streamInfo = { 0 }; + char oid[] = "1.2.3"; /* The data message type takes no additional info */ SetLastError(0xdeadbeef); @@ -315,6 +317,30 @@ static void test_data_msg_open(void) NULL); ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); CryptMsgClose(msg); + + /* An empty stream info is allowed. */ + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, + &streamInfo); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + CryptMsgClose(msg); + + /* Passing a bogus inner OID succeeds for a non-streamed message.. */ + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, oid, + NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + CryptMsgClose(msg); + /* and still succeeds when CMSG_DETACHED_FLAG is passed.. */ + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, + CMSG_DATA, NULL, oid, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + CryptMsgClose(msg); + /* and when a stream info is given, even though you're not supposed to be + * able to use anything but szOID_RSA_data when streaming is being used. + */ + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, + CMSG_DATA, NULL, oid, &streamInfo); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + CryptMsgClose(msg); } static const BYTE msgData[] = { 1, 2, 3, 4 };

1 0

Vitaliy Margolen : dinput: Clear static variables after releasing hooks.
by Alexandre Julliard July 10, 2007

July 10, 2007

Module: wine Branch: master Commit: 6d5eee0851774a136a0fbce498ee470f3d45d5df URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d5eee0851774a136a0fbce49… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Jul 9 22:40:50 2007 -0600 dinput: Clear static variables after releasing hooks. --- dlls/dinput/dinput_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 20550c7..25380d3 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -766,6 +766,7 @@ static LRESULT CALLBACK dinput_hook_WndProc(HWND hWnd, UINT message, WPARAM wPar case WM_DESTROY: if (kbd_hook) UnhookWindowsHookEx(kbd_hook); if (mouse_hook) UnhookWindowsHookEx(mouse_hook); + kbd_hook = mouse_hook = NULL; PostQuitMessage(0); } return DefWindowProcW(hWnd, message, wParam, lParam);

1 0

Juan Lang : crypt32: Pass function pointers to CryptMsgBase_Init rather than rely on callers to initialize them .
by Alexandre Julliard July 10, 2007

July 10, 2007

Module: wine Branch: master Commit: dc63bf2de396cfa3db64a13f8bc54fda9075b2fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc63bf2de396cfa3db64a13f8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 9 10:50:48 2007 -0700 crypt32: Pass function pointers to CryptMsgBase_Init rather than rely on callers to initialize them. --- dlls/crypt32/msg.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 4ac5cf0..f5f1491 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -47,11 +47,15 @@ typedef struct _CryptMsgBase } CryptMsgBase; static inline void CryptMsgBase_Init(CryptMsgBase *msg, DWORD dwFlags, - PCMSG_STREAM_INFO pStreamInfo) + PCMSG_STREAM_INFO pStreamInfo, CryptMsgCloseFunc close, + CryptMsgGetParamFunc get_param, CryptMsgUpdateFunc update) { msg->ref = 1; msg->open_flags = dwFlags; msg->stream_info = pStreamInfo; + msg->close = close; + msg->get_param = get_param; + msg->update = update; msg->finalized = FALSE; } @@ -166,10 +170,8 @@ static HCRYPTMSG CDataEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, msg = CryptMemAlloc(sizeof(CDataEncodeMsg)); if (msg) { - CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo); - msg->base.close = CDataEncodeMsg_Close; - msg->base.update = CDataEncodeMsg_Update; - msg->base.get_param = CDataEncodeMsg_GetParam; + CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo, + CDataEncodeMsg_Close, CDataEncodeMsg_GetParam, CDataEncodeMsg_Update); msg->bare_content_len = sizeof(empty_data_content); msg->bare_content = (LPBYTE)empty_data_content; }

1 0

Misha Koshelev : urlmon/tests: Add tests for ObtainUserAgentString.
by Alexandre Julliard July 10, 2007

July 10, 2007

Module: wine Branch: master Commit: 82569d9d0a5ea6ea0bea4fae24bebeaaacb287f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82569d9d0a5ea6ea0bea4fae2… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jul 9 21:50:10 2007 -0500 urlmon/tests: Add tests for ObtainUserAgentString. --- dlls/urlmon/tests/misc.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 375875b..d93d94c 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1093,6 +1093,63 @@ static void test_UrlMkGetSessionOption(void) ok(encoding == 0xdeadbeef, "encoding = %08x, exepcted 0xdeadbeef\n", encoding); } +static void test_ObtainUserAgentString(void) +{ + static const CHAR expected[] = "Mozilla/4.0 (compatible; MSIE "; + static CHAR str[3]; + LPSTR str2 = NULL; + HRESULT hres; + DWORD size, saved; + + hres = ObtainUserAgentString(0, NULL, NULL); + ok(hres == E_INVALIDARG, "ObtainUserAgentString failed: %08x\n", hres); + + size = 100; + hres = ObtainUserAgentString(0, NULL, &size); + ok(hres == E_INVALIDARG, "ObtainUserAgentString failed: %08x\n", hres); + ok(size == 100, "size=%d, expected %d\n", size, 100); + + size = 0; + hres = ObtainUserAgentString(0, str, &size); + ok(hres == E_OUTOFMEMORY, "ObtainUserAgentString failed: %08x\n", hres); + ok(size > 0, "size=%d, expected non-zero\n", size); + + size = 2; + str[0] = 'a'; + hres = ObtainUserAgentString(0, str, &size); + ok(hres == E_OUTOFMEMORY, "ObtainUserAgentString failed: %08x\n", hres); + ok(size > 0, "size=%d, expected non-zero\n", size); + ok(str[0] == 'a', "str[0]=%c, expected 'a'\n", str[0]); + + size = 0; + hres = ObtainUserAgentString(1, str, &size); + ok(hres == E_OUTOFMEMORY, "ObtainUserAgentString failed: %08x\n", hres); + ok(size > 0, "size=%d, expected non-zero\n", size); + + str2 = HeapAlloc(GetProcessHeap(), 0, (size+20)*sizeof(CHAR)); + if (!str2) + { + skip("skipping rest of ObtainUserAgent tests, out of memory\n"); + } + else + { + saved = size; + hres = ObtainUserAgentString(0, str2, &size); + ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); + ok(size == saved, "size=%d, expected %d\n", size, saved); + ok(strlen(expected) <= strlen(str2) && + !memcmp(expected, str2, strlen(expected)*sizeof(CHAR)), + "user agent was \"%s\", expected to start with \"%s\"\n", + str2, expected); + + size = saved+10; + hres = ObtainUserAgentString(0, str2, &size); + ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); + ok(size == saved, "size=%d, expected %d\n", size, saved); + } + HeapFree(GetProcessHeap(), 0, str2); +} + START_TEST(misc) { OleInitialize(NULL); @@ -1109,6 +1166,7 @@ START_TEST(misc) test_NameSpace(); test_ReleaseBindInfo(); test_UrlMkGetSessionOption(); + test_ObtainUserAgentString(); OleUninitialize(); }

1 0

Misha Koshelev : urlmon: Improve ObtainUserAgentString conformance to native.
by Alexandre Julliard July 10, 2007

July 10, 2007

Module: wine Branch: master Commit: e4282a59dd8cdeba0004cc3adf81c68e2c82c01a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4282a59dd8cdeba0004cc3ad… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jul 9 21:49:58 2007 -0500 urlmon: Improve ObtainUserAgentString conformance to native. --- dlls/urlmon/urlmon_main.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 0f12011..bbd7cc5 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -304,13 +304,18 @@ HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPSTR pcszUAOut, DWORD *cbS { FIXME("(%d, %p, %p): stub\n", dwOption, pcszUAOut, cbSize); - if(dwOption) { - ERR("dwOption: %d, must be zero\n", dwOption); + if (pcszUAOut == NULL || cbSize == NULL) + return E_INVALIDARG; + + if (*cbSize < sizeof(Agent)) + { + *cbSize = sizeof(Agent); + return E_OUTOFMEMORY; } if (sizeof(Agent) < *cbSize) *cbSize = sizeof(Agent); - lstrcpynA(pcszUAOut, Agent, *cbSize); + lstrcpynA(pcszUAOut, Agent, *cbSize); return S_OK; }

1 0

James Hawkins : msi: Handle adding columns in transforms.
by Alexandre Julliard July 10, 2007

July 10, 2007

Module: wine Branch: master Commit: 17ba74195bec3d384539249a4bf7de659121041e URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ba74195bec3d384539249a4… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 9 19:34:41 2007 -0700 msi: Handle adding columns in transforms. --- dlls/msi/table.c | 153 ++++++++++++++++++++++++++++++++++++++------------ dlls/msi/tests/db.c | 69 +++++------------------ 2 files changed, 131 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17ba74195bec3d3845392…

1 0

James Hawkins : msi: Test adding columns with data in a transform.
by Alexandre Julliard July 10, 2007

July 10, 2007

Module: wine Branch: master Commit: 9285351ad3b088ff126fde7f62648348682c4d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9285351ad3b088ff126fde7f6… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 9 19:34:05 2007 -0700 msi: Test adding columns with data in a transform. --- dlls/msi/tests/db.c | 122 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 95 insertions(+), 27 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 2c47a1e..2ce58ae 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1821,6 +1821,18 @@ static void generate_transform(void) MsiCloseHandle(hrec); + query = "ALTER TABLE `MOO` ADD `COW` INTEGER"; + r = run_query(hdb1, 0, query); + ok(r == ERROR_SUCCESS, "failed to add column\n"); + + query = "ALTER TABLE `MOO` ADD `PIG` INTEGER"; + r = run_query(hdb1, 0, query); + ok(r == ERROR_SUCCESS, "failed to add column\n"); + + query = "UPDATE `MOO` SET `PIG` = 5 WHERE `NOO` = 1"; + r = run_query(hdb1, 0, query); + ok(r == ERROR_SUCCESS, "failed to modify row\n"); + /* database needs to be committed */ MsiDatabaseCommit(hdb1); @@ -1847,31 +1859,36 @@ static const WCHAR name8[] = { 0x3c8b, 0x3a97, 0x409b, 0x387e, 0 }; /* BINARY.1 /* data in each table */ static const WCHAR data1[] = { /* AAR */ - 0x0201, 0x0005, 0x8001, /* 0x0201 = add row (1), two shorts */ - 0x0201, 0x0006, 0x8002, + 0x0201, 0x0008, 0x8001, /* 0x0201 = add row (1), two shorts */ + 0x0201, 0x0009, 0x8002, }; static const WCHAR data2[] = { /* _Columns */ - 0x0401, 0x0002, 0x0000, 0x0003, 0xbdff, /* 0x0401 = add row (1), 4 shorts */ - 0x0401, 0x0002, 0x0000, 0x0004, 0x8502, + 0x0401, 0x0001, 0x8003, 0x0002, 0x9502, + 0x0401, 0x0001, 0x8004, 0x0003, 0x9502, + 0x0401, 0x0005, 0x0000, 0x0006, 0xbdff, /* 0x0401 = add row (1), 4 shorts */ + 0x0401, 0x0005, 0x0000, 0x0007, 0x8502, }; static const WCHAR data3[] = { /* _Tables */ - 0x0101, 0x0002, /* 0x0101 = add row (1), 1 short */ + 0x0101, 0x0005, /* 0x0101 = add row (1), 1 short */ }; static const char data4[] = /* _StringData */ - "cAARCARBARvwbmw"; /* all the strings squashed together */ + "MOOCOWPIGcAARCARBARvwbmw"; /* all the strings squashed together */ static const WCHAR data5[] = { /* _StringPool */ /* len, refs */ 0, 0, /* string 0 '' */ - 1, 1, /* string 1 'c' */ - 3, 3, /* string 2 'AAR' */ - 3, 1, /* string 3 'CAR' */ - 3, 1, /* string 4 'BAR' */ - 2, 1, /* string 5 'vw' */ - 3, 1, /* string 6 'bmw' */ + 3, 2, /* string 1 'MOO' */ + 3, 1, /* string 2 'COW' */ + 3, 1, /* string 3 'PIG' */ + 1, 1, /* string 4 'c' */ + 3, 3, /* string 5 'AAR' */ + 3, 1, /* string 6 'CAR' */ + 3, 1, /* string 7 'BAR' */ + 2, 1, /* string 8 'vw' */ + 3, 1, /* string 9 'bmw' */ }; /* update row, 0x0002 is a bitmask of present column data, keys are excluded */ static const WCHAR data6[] = { /* MOO */ - 0x0002, 0x8001, 0x0001, /* update row */ + 0x000a, 0x8001, 0x0004, 0x8005, /* update row */ 0x0000, 0x8003, /* delete row */ }; @@ -2032,21 +2049,30 @@ static void test_try_transform(void) hrec = 0; query = "select `NOO`,`OOO` from `MOO` where `NOO` = 1 AND `OOO` = 'c'"; r = do_query(hdb, query, &hrec); - ok(r == ERROR_SUCCESS, "select query failed\n"); + todo_wine + { + ok(r == ERROR_SUCCESS, "select query failed\n"); + } MsiCloseHandle(hrec); /* check unchanged value */ hrec = 0; query = "select `NOO`,`OOO` from `MOO` where `NOO` = 2 AND `OOO` = 'b'"; r = do_query(hdb, query, &hrec); - ok(r == ERROR_SUCCESS, "select query failed\n"); + todo_wine + { + ok(r == ERROR_SUCCESS, "select query failed\n"); + } MsiCloseHandle(hrec); /* check deleted value */ hrec = 0; query = "select * from `MOO` where `NOO` = 3"; r = do_query(hdb, query, &hrec); - ok(r == ERROR_NO_MORE_ITEMS, "select query failed\n"); + todo_wine + { + ok(r == ERROR_NO_MORE_ITEMS, "select query failed\n"); + } if (hrec) MsiCloseHandle(hrec); /* check added stream */ @@ -2067,39 +2093,81 @@ static void test_try_transform(void) hrec = 0; query = "select * from `MOO`"; r = MsiDatabaseOpenView(hdb, query, &hview); - ok(r == ERROR_SUCCESS, "open view failed\n"); + todo_wine + { + ok(r == ERROR_SUCCESS, "open view failed\n"); + } r = MsiViewExecute(hview, 0); - ok(r == ERROR_SUCCESS, "view execute failed\n"); + todo_wine + { + ok(r == ERROR_SUCCESS, "view execute failed\n"); + } r = MsiViewFetch(hview, &hrec); - ok(r == ERROR_SUCCESS, "view fetch failed\n"); + todo_wine + { + ok(r == ERROR_SUCCESS, "view fetch failed\n"); + } r = MsiRecordGetInteger(hrec, 1); - ok(r == 1, "Expected 1, got %d\n", r); + todo_wine + { + ok(r == 1, "Expected 1, got %d\n", r); + } sz = sizeof buffer; r = MsiRecordGetString(hrec, 2, buffer, &sz); - ok(r == ERROR_SUCCESS, "record get string failed\n"); - ok(!lstrcmpA(buffer, "c"), "Expected c, got %s\n", buffer); + todo_wine + { + ok(r == ERROR_SUCCESS, "record get string failed\n"); + ok(!lstrcmpA(buffer, "c"), "Expected c, got %s\n", buffer); + } + + r = MsiRecordGetInteger(hrec, 3); + ok(r == 0x80000000, "Expected 0x80000000, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 4); + todo_wine + { + ok(r == 5, "Expected 5, got %d\n", r); + } MsiCloseHandle(hrec); r = MsiViewFetch(hview, &hrec); - ok(r == ERROR_SUCCESS, "view fetch failed\n"); + todo_wine + { + ok(r == ERROR_SUCCESS, "view fetch failed\n"); + } r = MsiRecordGetInteger(hrec, 1); - ok(r == 2, "Expected 2, got %d\n", r); + todo_wine + { + ok(r == 2, "Expected 2, got %d\n", r); + } sz = sizeof buffer; r = MsiRecordGetString(hrec, 2, buffer, &sz); - ok(r == ERROR_SUCCESS, "record get string failed\n"); - ok(!lstrcmpA(buffer, "b"), "Expected b, got %s\n", buffer); + todo_wine + { + ok(r == ERROR_SUCCESS, "record get string failed\n"); + ok(!lstrcmpA(buffer, "b"), "Expected b, got %s\n", buffer); + } + + r = MsiRecordGetInteger(hrec, 3); + ok(r == 0x80000000, "Expected 0x80000000, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 4); + ok(r == 0x80000000, "Expected 0x80000000, got %d\n", r); MsiCloseHandle(hrec); r = MsiViewFetch(hview, &hrec); - ok(r == ERROR_NO_MORE_ITEMS, "view fetch succeeded\n"); + todo_wine + { + ok(r == ERROR_NO_MORE_ITEMS, "view fetch succeeded\n"); + } MsiCloseHandle(hrec); MsiCloseHandle(hview);

1 0

James Hawkins : msi: Delete msifile after the tests.
by Alexandre Julliard July 10, 2007

July 10, 2007

Module: wine Branch: master Commit: 5af06dec83870d73ba0234ec25e97a8a7fdb8385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af06dec83870d73ba0234ec2… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 9 19:33:20 2007 -0700 msi: Delete msifile after the tests. --- dlls/msi/tests/db.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 1599c80..2c47a1e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3172,6 +3172,8 @@ static void test_update(void) ok(r == ERROR_SUCCESS, "MsiDatabaseCommit failed\n"); r = MsiCloseHandle(hdb); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + DeleteFile(msifile); } static void test_special_tables(void) @@ -3321,6 +3323,8 @@ static void test_select_markers(void) ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); r = MsiCloseHandle(hdb); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + DeleteFile(msifile); } START_TEST(db)

1 0

James Hawkins : msi: Match the changes made by the hand-generated and API-generated transforms.
by Alexandre Julliard July 10, 2007

July 10, 2007

Module: wine Branch: master Commit: dfa1b1299cbdea6f22016d03788532abb65718e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa1b1299cbdea6f22016d037… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 9 19:32:44 2007 -0700 msi: Match the changes made by the hand-generated and API-generated transforms. --- dlls/msi/tests/db.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 2f4cc76..1599c80 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1872,7 +1872,7 @@ static const WCHAR data5[] = { /* _StringPool */ /* update row, 0x0002 is a bitmask of present column data, keys are excluded */ static const WCHAR data6[] = { /* MOO */ 0x0002, 0x8001, 0x0001, /* update row */ - 0x0000, 0x8002, /* delete row */ + 0x0000, 0x8003, /* delete row */ }; static const WCHAR data7[] = { /* BINARY */ @@ -2037,14 +2037,14 @@ static void test_try_transform(void) /* check unchanged value */ hrec = 0; - query = "select `NOO`,`OOO` from `MOO` where `NOO` = 3 AND `OOO` = 'c'"; + query = "select `NOO`,`OOO` from `MOO` where `NOO` = 2 AND `OOO` = 'b'"; r = do_query(hdb, query, &hrec); ok(r == ERROR_SUCCESS, "select query failed\n"); MsiCloseHandle(hrec); /* check deleted value */ hrec = 0; - query = "select * from `MOO` where `NOO` = 2"; + query = "select * from `MOO` where `NOO` = 3"; r = do_query(hdb, query, &hrec); ok(r == ERROR_NO_MORE_ITEMS, "select query failed\n"); if (hrec) MsiCloseHandle(hrec); @@ -2089,12 +2089,12 @@ static void test_try_transform(void) ok(r == ERROR_SUCCESS, "view fetch failed\n"); r = MsiRecordGetInteger(hrec, 1); - ok(r == 3, "Expected 3, got %d\n", r); + ok(r == 2, "Expected 2, got %d\n", r); sz = sizeof buffer; r = MsiRecordGetString(hrec, 2, buffer, &sz); ok(r == ERROR_SUCCESS, "record get string failed\n"); - ok(!lstrcmpA(buffer, "c"), "Expected b, got %s\n", buffer); + ok(!lstrcmpA(buffer, "b"), "Expected b, got %s\n", buffer); MsiCloseHandle(hrec);

1 0

Hans Leidekker : pdh: Implement and test PdhGetCounterInfo{A, W} and PdhGetCounterTimeBase.
by Alexandre Julliard July 10, 2007

July 10, 2007

Module: wine Branch: master Commit: 3ea31cb20be7cfbe53317699b27ed1904f33c74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea31cb20be7cfbe53317699b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jul 9 20:55:33 2007 +0200 pdh: Implement and test PdhGetCounterInfo{A, W} and PdhGetCounterTimeBase. --- dlls/pdh/pdh.spec | 6 ++-- dlls/pdh/pdh_main.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/pdh/tests/pdh.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 167 insertions(+), 3 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 7ed4207..2f575f8 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -40,9 +40,9 @@ @ stub PdhExpandWildCardPathHW @ stub PdhExpandWildCardPathW @ stub PdhFormatFromRawValue -@ stub PdhGetCounterInfoA -@ stub PdhGetCounterInfoW -@ stub PdhGetCounterTimeBase +@ stdcall PdhGetCounterInfoA(ptr long ptr ptr) +@ stdcall PdhGetCounterInfoW(ptr long ptr ptr) +@ stdcall PdhGetCounterTimeBase(ptr ptr) @ stub PdhGetDataSourceTimeRangeA @ stub PdhGetDataSourceTimeRangeH @ stub PdhGetDataSourceTimeRangeW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index a04d1eb..62c99f0 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -2,6 +2,7 @@ * Performance Data Helper (pdh.dll) * * Copyright 2007 Andrey Turkin + * Copyright 2007 Hans Leidekker * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -284,6 +285,84 @@ PDH_STATUS WINAPI PdhCollectQueryData( PDH_HQUERY handle ) } /*********************************************************************** + * PdhGetCounterInfoA (PDH.@) + */ +PDH_STATUS WINAPI PdhGetCounterInfoA( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD size, PPDH_COUNTER_INFO_A info ) +{ + struct counter *counter = handle; + + TRACE("%p %d %p %p\n", handle, text, size, info); + + if (!counter) return PDH_INVALID_HANDLE; + if (!size) return PDH_INVALID_ARGUMENT; + + if (*size < sizeof(PDH_COUNTER_INFO_A)) + { + *size = sizeof(PDH_COUNTER_INFO_A); + return PDH_MORE_DATA; + } + + memset( info, 0, sizeof(PDH_COUNTER_INFO_A) ); + + info->dwType = counter->type; + info->CStatus = counter->status; + info->lScale = counter->scale; + info->lDefaultScale = counter->defaultscale; + info->dwUserData = counter->user; + info->dwQueryUserData = counter->queryuser; + + *size = sizeof(PDH_COUNTER_INFO_A); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * PdhGetCounterInfoW (PDH.@) + */ +PDH_STATUS WINAPI PdhGetCounterInfoW( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD size, PPDH_COUNTER_INFO_W info ) +{ + struct counter *counter = handle; + + TRACE("%p %d %p %p\n", handle, text, size, info); + + if (!size) return PDH_INVALID_ARGUMENT; + if (!counter) return PDH_INVALID_HANDLE; + + if (*size < sizeof(PDH_COUNTER_INFO_W)) + { + *size = sizeof(PDH_COUNTER_INFO_W); + return PDH_MORE_DATA; + } + + memset( info, 0, sizeof(PDH_COUNTER_INFO_W) ); + + info->dwType = counter->type; + info->CStatus = counter->status; + info->lScale = counter->scale; + info->lDefaultScale = counter->defaultscale; + info->dwUserData = counter->user; + info->dwQueryUserData = counter->queryuser; + + *size = sizeof(PDH_COUNTER_INFO_A); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * PdhGetCounterTimeBase (PDH.@) + */ +PDH_STATUS WINAPI PdhGetCounterTimeBase( PDH_HCOUNTER handle, LONGLONG *base ) +{ + struct counter *counter = handle; + + TRACE("%p %p\n", handle, base); + + if (!base) return PDH_INVALID_ARGUMENT; + if (!counter) return PDH_INVALID_HANDLE; + + *base = counter->base; + return ERROR_SUCCESS; +} + +/*********************************************************************** * PdhGetFormattedCounterValue (PDH.@) */ PDH_STATUS WINAPI PdhGetFormattedCounterValue( PDH_HCOUNTER handle, DWORD format, diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 6ddb097..12770ed 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -213,6 +213,89 @@ static void test_PdhSetCounterScaleFactor( void ) ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); } +static void test_PdhGetCounterTimeBase( void ) +{ + PDH_STATUS ret; + PDH_HQUERY query; + PDH_HCOUNTER counter; + LONGLONG base; + + ret = PdhOpenQueryA( NULL, 0, &query ); + ok(ret == ERROR_SUCCESS, "PdhOpenQueryA failed 0x%08x\n", ret); + + ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, &counter ); + ok(ret == ERROR_SUCCESS, "PdhAddCounterA failed 0x%08x\n", ret); + + ret = PdhGetCounterTimeBase( NULL, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhGetCounterTimeBase failed 0x%08x\n", ret); + + ret = PdhGetCounterTimeBase( NULL, &base ); + ok(ret == PDH_INVALID_HANDLE, "PdhGetCounterTimeBase failed 0x%08x\n", ret); + + ret = PdhGetCounterTimeBase( counter, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhGetCounterTimeBase failed 0x%08x\n", ret); + + ret = PdhGetCounterTimeBase( counter, &base ); + ok(ret == ERROR_SUCCESS, "PdhGetCounterTimeBase failed 0x%08x\n", ret); + + ret = PdhCloseQuery( query ); + ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); +} + +static void test_PdhGetCounterInfo( void ) +{ + PDH_STATUS ret; + PDH_HQUERY query; + PDH_HCOUNTER counter; + PDH_COUNTER_INFO_A info; + DWORD size; + + ret = PdhOpenQueryA( NULL, 0, &query ); + ok(ret == ERROR_SUCCESS, "PdhOpenQueryA failed 0x%08x\n", ret); + + ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, &counter ); + ok(ret == ERROR_SUCCESS, "PdhAddCounterA failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoA( NULL, 0, NULL, NULL ); + ok(ret == PDH_INVALID_HANDLE, "PdhGetCounterInfoA failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoA( counter, 0, NULL, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoA failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoA( counter, 0, NULL, &info ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoA failed 0x%08x\n", ret); + + size = sizeof(info) - 1; + ret = PdhGetCounterInfoA( counter, 0, &size, NULL ); + ok(ret == PDH_MORE_DATA, "PdhGetCounterInfoA failed 0x%08x\n", ret); + + size = sizeof(info); + ret = PdhGetCounterInfoA( counter, 0, &size, &info ); + ok(ret == ERROR_SUCCESS, "PdhGetCounterInfoA failed 0x%08x\n", ret); + ok(size == sizeof(info), "PdhGetCounterInfoA failed %d\n", size); + + ret = PdhGetCounterInfoA( counter, 0, &size, &info ); + ok(ret == ERROR_SUCCESS, "PdhGetCounterInfoA failed 0x%08x\n", ret); + ok(info.lScale == 0, "lScale %d\n", info.lScale); + + ret = PdhSetCounterScaleFactor( counter, 0 ); + ok(ret == ERROR_SUCCESS, "PdhSetCounterScaleFactor failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoA( counter, 0, &size, &info ); + ok(ret == ERROR_SUCCESS, "PdhGetCounterInfoA failed 0x%08x\n", ret); + ok(info.lScale == 0, "lScale %d\n", info.lScale); + + ret = PdhSetCounterScaleFactor( counter, -5 ); + ok(ret == ERROR_SUCCESS, "PdhSetCounterScaleFactor failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoA( counter, 0, &size, &info ); + ok(ret == ERROR_SUCCESS, "PdhGetCounterInfoA failed 0x%08x\n", ret); + ok(info.lScale == -5, "lScale %d\n", info.lScale); + + ret = PdhCloseQuery( query ); + ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); +} + START_TEST(pdh) { test_open_close_query(); @@ -220,4 +303,6 @@ START_TEST(pdh) test_PdhGetFormattedCounterValue(); test_PdhGetRawCounterValue(); test_PdhSetCounterScaleFactor(); + test_PdhGetCounterTimeBase(); + test_PdhGetCounterInfo(); }

1 0