November 2009 - Wine-commits

Owen Rudge : comctl32: Add support for scrolling during marquee selection.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: e1f3edef3e491095dd73548b711bddf14ee73ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f3edef3e491095dd73548b7… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 2 10:58:26 2009 -0600 comctl32: Add support for scrolling during marquee selection. --- dlls/comctl32/listview.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ba9bb3b..ae658bd 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -249,6 +249,7 @@ typedef struct tagLISTVIEW_INFO BOOL bRButtonDown; BOOL bDragging; BOOL bMarqueeSelect; /* marquee selection/highlight underway */ + BOOL bScrolling; RECT marqueeRect; /* absolute coordinates of marquee selection */ RECT marqueeDrawRect; /* relative coordinates for drawing marquee */ POINT marqueeOrigin; /* absolute coordinates of marquee click origin */ @@ -434,6 +435,7 @@ static HWND CreateEditLabelT(LISTVIEW_INFO *, LPCWSTR, DWORD, BOOL); static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *, INT, HIMAGELIST); static INT LISTVIEW_HitTest(const LISTVIEW_INFO *, LPLVHITTESTINFO, BOOL, BOOL); static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *, BOOL, BOOL); +static BOOL LISTVIEW_Scroll(LISTVIEW_INFO *, INT, INT); /******** Text handling functions *************************************/ @@ -3595,6 +3597,11 @@ static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, I return 0; } +#define SCROLL_LEFT 0x1 +#define SCROLL_RIGHT 0x2 +#define SCROLL_UP 0x4 +#define SCROLL_DOWN 0x8 + /*** * DESCRIPTION: * Utility routine to draw and highlight items within a marquee selection rectangle. @@ -3641,6 +3648,21 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, LPPOINT coords_ori /* Cancel out the old marquee rectangle and draw the new one */ LISTVIEW_InvalidateRect(infoPtr, &infoPtr->marqueeDrawRect); + /* Scroll by the appropriate distance if applicable - speed up scrolling as + the cursor is further away */ + + if ((scroll & SCROLL_LEFT) && (coords_orig->x <= 0)) + LISTVIEW_Scroll(infoPtr, coords_orig->x, 0); + + if ((scroll & SCROLL_RIGHT) && (coords_orig->x >= infoPtr->rcList.right)) + LISTVIEW_Scroll(infoPtr, (coords_orig->x - infoPtr->rcList.right), 0); + + if ((scroll & SCROLL_UP) && (coords_orig->y <= 0)) + LISTVIEW_Scroll(infoPtr, 0, coords_orig->y); + + if ((scroll & SCROLL_DOWN) && (coords_orig->y >= infoPtr->rcList.bottom)) + LISTVIEW_Scroll(infoPtr, 0, (coords_orig->y - infoPtr->rcList.bottom)); + /* Invert the items in the old marquee rectangle */ iterator_frameditems_absolute(&i, infoPtr, &infoPtr->marqueeRect); @@ -3694,6 +3716,80 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, LPPOINT coords_ori /*** * DESCRIPTION: + * Called when we are in a marquee selection that involves scrolling the listview (ie, + * the cursor is outside the bounds of the client area). This is a TIMERPROC. + * + * PARAMETER(S): + * [I] hwnd : Handle to the listview + * [I] uMsg : WM_TIMER (ignored) + * [I] idEvent : The timer ID interpreted as a pointer to a LISTVIEW_INFO struct + * [I] dwTimer : The elapsed time (ignored) + * + * RETURN: + * None. + */ +static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + LISTVIEW_INFO *infoPtr; + SCROLLINFO scrollInfo; + POINT coords_orig; + POINT coords_offs; + POINT offset; + INT scroll = 0; + + infoPtr = (LISTVIEW_INFO *) idEvent; + + if (!infoPtr) + return; + + /* Get the current cursor position and convert to client coordinates */ + GetCursorPos(&coords_orig); + ScreenToClient(hWnd, &coords_orig); + + /* Ensure coordinates are within client bounds */ + coords_offs.x = max(min(coords_orig.x, infoPtr->rcList.right), 0); + coords_offs.y = max(min(coords_orig.y, infoPtr->rcList.bottom), 0); + + /* Get offset */ + LISTVIEW_GetOrigin(infoPtr, &offset); + + /* Offset coordinates by the appropriate amount */ + coords_offs.x -= offset.x; + coords_offs.y -= offset.y; + + scrollInfo.cbSize = sizeof(SCROLLINFO); + scrollInfo.fMask = SIF_ALL; + + /* Work out in which directions we can scroll */ + if (GetScrollInfo(infoPtr->hwndSelf, SB_VERT, &scrollInfo)) + { + if (scrollInfo.nPos != scrollInfo.nMin) + scroll |= SCROLL_UP; + + if (((scrollInfo.nPage + scrollInfo.nPos) - 1) != scrollInfo.nMax) + scroll |= SCROLL_DOWN; + } + + if (GetScrollInfo(infoPtr->hwndSelf, SB_HORZ, &scrollInfo)) + { + if (scrollInfo.nPos != scrollInfo.nMin) + scroll |= SCROLL_LEFT; + + if (((scrollInfo.nPage + scrollInfo.nPos) - 1) != scrollInfo.nMax) + scroll |= SCROLL_RIGHT; + } + + if (((coords_orig.x <= 0) && (scroll & SCROLL_LEFT)) || + ((coords_orig.y <= 0) && (scroll & SCROLL_UP)) || + ((coords_orig.x >= infoPtr->rcList.right) && (scroll & SCROLL_RIGHT)) || + ((coords_orig.y >= infoPtr->rcList.bottom) && (scroll & SCROLL_DOWN))) + { + LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, scroll); + } +} + +/*** + * DESCRIPTION: * Called whenever WM_MOUSEMOVE is received. * * PARAMETER(S): @@ -3739,6 +3835,24 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN coords_offs.x -= offset.x; coords_offs.y -= offset.y; + /* Enable the timer if we're going outside our bounds, in case the user doesn't + move the mouse again */ + + if ((x <= 0) || (y <= 0) || (x >= infoPtr->rcList.right) || + (y >= infoPtr->rcList.bottom)) + { + if (!infoPtr->bScrolling) + { + infoPtr->bScrolling = TRUE; + SetTimer(infoPtr->hwndSelf, (UINT_PTR) infoPtr, 1, LISTVIEW_ScrollTimer); + } + } + else + { + infoPtr->bScrolling = FALSE; + KillTimer(infoPtr->hwndSelf, (UINT_PTR) infoPtr); + } + LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, 0); return 0; } @@ -9464,6 +9578,8 @@ static LRESULT LISTVIEW_KillFocus(LISTVIEW_INFO *infoPtr) SetRect(&infoPtr->marqueeRect, 0, 0, 0, 0); infoPtr->bMarqueeSelect = FALSE; + infoPtr->bScrolling = FALSE; + KillTimer(infoPtr->hwndSelf, (UINT_PTR) infoPtr); } /* set window focus flag */ @@ -9545,6 +9661,7 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN infoPtr->ptClickPos = pt; infoPtr->bDragging = FALSE; infoPtr->bMarqueeSelect = FALSE; + infoPtr->bScrolling = FALSE; lvHitTestInfo.pt.x = x; lvHitTestInfo.pt.y = y; @@ -9683,6 +9800,7 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT infoPtr->bDragging = FALSE; infoPtr->bMarqueeSelect = FALSE; + infoPtr->bScrolling = FALSE; KillTimer(infoPtr->hwndSelf, (UINT_PTR) infoPtr); return 0;

1 0

Jörg Höhle : mciwave: waveaudio does not support the shareable flag.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: d3dd250c2e4f6d98f572091f5bc886f184a1f617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3dd250c2e4f6d98f572091f5… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Nov 2 23:52:49 2009 +0100 mciwave: waveaudio does not support the shareable flag. --- dlls/mciwave/mciwave.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index be7d3b1..18fb5eb 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -38,7 +38,6 @@ typedef struct { UINT wDevID; HANDLE hWave; int nUseCount; /* Incremented for each shared open */ - BOOL fShareable; /* TRUE if first open was shareable */ HMMIO hFile; /* mmio file handle open as Element */ MCI_WAVE_OPEN_PARMSW openParms; WAVEFORMATEX wfxRef; @@ -476,7 +475,7 @@ static LRESULT WAVE_mciOpen(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_P if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; if (dwFlags & MCI_OPEN_SHAREABLE) - return MCIERR_HARDWARE; + return MCIERR_UNSUPPORTED_FUNCTION; if (wmw->nUseCount > 0) { /* The driver is already opened on this channel

1 0

Juan Lang : rsaenh: Test exporting an RSA private key with the most significant bit set.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 812fdca9d66273be6ec4df6802fa8d8e8e1e6a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=812fdca9d66273be6ec4df680… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 3 10:22:54 2009 -0800 rsaenh: Test exporting an RSA private key with the most significant bit set. --- dlls/rsaenh/tests/rsaenh.c | 179 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 177 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=812fdca9d66273be6ec4d…

1 0

Juan Lang : crypt32: Add tests for CertGetIntendedKeyUsage.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 6ac162231b5286f66142afb5eccdcbb01a0b4a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac162231b5286f66142afb5e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 3 10:44:41 2009 -0800 crypt32: Add tests for CertGetIntendedKeyUsage. --- dlls/crypt32/tests/cert.c | 53 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 685a564..ea904f6 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2065,6 +2065,58 @@ static void testCreateSelfSignCert(void) CRYPT_DELETEKEYSET); } +static void testIntendedKeyUsage(void) +{ + BOOL ret; + CERT_INFO info = { 0 }; + static char oid_key_usage[] = szOID_KEY_USAGE; + /* A couple "key usages". Really they're just encoded bits which aren't + * necessarily restricted to the defined key usage values. + */ + static BYTE usage1[] = { 0x03,0x03,0x00,0xff,0xff }; + static BYTE usage2[] = { 0x03,0x03,0x01,0xff,0xfe }; + static const BYTE expected_usage1[] = { 0xff,0xff,0x00,0x00 }; + static const BYTE expected_usage2[] = { 0xff,0xfe,0x00,0x00 }; + CERT_EXTENSION ext = { oid_key_usage, TRUE, { sizeof(usage1), usage1 } }; + BYTE usage_bytes[4]; + + if (0) + { + /* Crash */ + ret = CertGetIntendedKeyUsage(0, NULL, NULL, 0); + } + ret = CertGetIntendedKeyUsage(0, &info, NULL, 0); + ok(!ret, "expected failure\n"); + ret = CertGetIntendedKeyUsage(0, &info, usage_bytes, sizeof(usage_bytes)); + ok(!ret, "expected failure\n"); + ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, NULL, 0); + ok(!ret, "expected failure\n"); + ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, usage_bytes, + sizeof(usage_bytes)); + info.cExtension = 1; + info.rgExtension = &ext; + ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, NULL, 0); + ok(!ret, "expected failure\n"); + /* The unused bytes are filled with 0. */ + ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, usage_bytes, + sizeof(usage_bytes)); + todo_wine { + ok(ret, "CertGetIntendedKeyUsage failed: %08x\n", GetLastError()); + ok(!memcmp(usage_bytes, expected_usage1, sizeof(expected_usage1)), + "unexpected value\n"); + } + /* The usage bytes are copied in big-endian order. */ + ext.Value.cbData = sizeof(usage2); + ext.Value.pbData = usage2; + ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, usage_bytes, + sizeof(usage_bytes)); + todo_wine { + ok(ret, "CertGetIntendedKeyUsage failed: %08x\n", GetLastError()); + ok(!memcmp(usage_bytes, expected_usage2, sizeof(expected_usage2)), + "unexpected value\n"); + } +} + static const LPCSTR keyUsages[] = { szOID_PKIX_KP_CODE_SIGNING, szOID_PKIX_KP_CLIENT_AUTH, szOID_RSA_RSA }; @@ -3222,6 +3274,7 @@ START_TEST(cert) testCertSigs(); testSignAndEncodeCert(); testCreateSelfSignCert(); + testIntendedKeyUsage(); testKeyUsage(); testGetValidUsages(); testCompareCertName();

1 0

Juan Lang : crypt32: Implement CryptGetIntendedKeyUsage.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: f5546692861f7eac76669d4fbd25f4f62684c84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5546692861f7eac76669d4fb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 3 10:45:51 2009 -0800 crypt32: Implement CryptGetIntendedKeyUsage. --- dlls/crypt32/cert.c | 33 +++++++++++++++++++++++++++++++-- dlls/crypt32/tests/cert.c | 4 ---- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index cb1b973..c87b07c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2200,9 +2200,38 @@ BOOL WINAPI CryptVerifyCertificateSignatureEx(HCRYPTPROV_LEGACY hCryptProv, BOOL WINAPI CertGetIntendedKeyUsage(DWORD dwCertEncodingType, PCERT_INFO pCertInfo, BYTE *pbKeyUsage, DWORD cbKeyUsage) { - FIXME("(%08x, %p, %p, %d)\n", dwCertEncodingType, pCertInfo, pbKeyUsage, + PCERT_EXTENSION ext; + BOOL ret = FALSE; + + TRACE("(%08x, %p, %p, %d)\n", dwCertEncodingType, pCertInfo, pbKeyUsage, cbKeyUsage); - return FALSE; + + ext = CertFindExtension(szOID_KEY_USAGE, pCertInfo->cExtension, + pCertInfo->rgExtension); + if (ext) + { + CRYPT_BIT_BLOB usage; + DWORD size = sizeof(usage); + + ret = CryptDecodeObjectEx(dwCertEncodingType, X509_BITS, + ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_NOCOPY_FLAG, NULL, + &usage, &size); + if (ret) + { + if (cbKeyUsage < usage.cbData) + ret = FALSE; + else + { + memcpy(pbKeyUsage, usage.pbData, usage.cbData); + if (cbKeyUsage > usage.cbData) + memset(pbKeyUsage + usage.cbData, 0, + cbKeyUsage - usage.cbData); + } + } + } + else + SetLastError(0); + return ret; } BOOL WINAPI CertGetEnhancedKeyUsage(PCCERT_CONTEXT pCertContext, DWORD dwFlags, diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index ea904f6..4dc8846 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2100,21 +2100,17 @@ static void testIntendedKeyUsage(void) /* The unused bytes are filled with 0. */ ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, usage_bytes, sizeof(usage_bytes)); - todo_wine { ok(ret, "CertGetIntendedKeyUsage failed: %08x\n", GetLastError()); ok(!memcmp(usage_bytes, expected_usage1, sizeof(expected_usage1)), "unexpected value\n"); - } /* The usage bytes are copied in big-endian order. */ ext.Value.cbData = sizeof(usage2); ext.Value.pbData = usage2; ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, usage_bytes, sizeof(usage_bytes)); - todo_wine { ok(ret, "CertGetIntendedKeyUsage failed: %08x\n", GetLastError()); ok(!memcmp(usage_bytes, expected_usage2, sizeof(expected_usage2)), "unexpected value\n"); - } } static const LPCSTR keyUsages[] = { szOID_PKIX_KP_CODE_SIGNING,

1 0

Juan Lang : crypt32: Add stub for CertAddCertificateLinkToStore.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 9364d7a928bae2e2b2854a1c62383c4cb526792f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9364d7a928bae2e2b2854a1c6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 2 16:16:46 2009 -0800 crypt32: Add stub for CertAddCertificateLinkToStore. --- dlls/crypt32/cert.c | 9 +++++++++ dlls/crypt32/crypt32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c87b07c..208f3fc 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -71,6 +71,15 @@ BOOL WINAPI CertAddEncodedCertificateToStore(HCERTSTORE hCertStore, return ret; } +BOOL WINAPI CertAddCertificateLinkToStore(HCERTSTORE hCertStore, + PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, + PCCERT_CONTEXT *ppCertContext) +{ + FIXME("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, dwAddDisposition, + ppCertContext); + return FALSE; +} + PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType, const BYTE *pbCertEncoded, DWORD cbCertEncoded) { diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index c144ea9..ef5d6e6 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -1,6 +1,7 @@ @ stdcall CertAddCRLContextToStore(ptr ptr long ptr) @ stdcall CertAddCTLContextToStore(ptr ptr long ptr) @ stdcall CertAddCertificateContextToStore(ptr ptr long ptr) +@ stdcall CertAddCertificateLinkToStore(ptr ptr long ptr) @ stdcall CertAddEncodedCRLToStore(ptr long ptr long long ptr) @ stdcall CertAddEncodedCTLToStore(ptr long ptr long long ptr) @ stdcall CertAddEncodedCertificateToStore(ptr long ptr long long ptr)

1 0

Paul Vriens : advapi32/tests: Add some ClearEventLog tests.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: e13ead694973add3eb0362b1dc0df84c87c30ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13ead694973add3eb0362b1d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 4 07:58:41 2009 +0100 advapi32/tests: Add some ClearEventLog tests. --- dlls/advapi32/tests/eventlog.c | 67 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 8a96c69..99990a2 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -36,6 +36,16 @@ static void init_function_pointers(void) pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation"); } +static void create_backup(const char *filename) +{ + HANDLE handle; + + DeleteFileA(filename); + handle = OpenEventLogA(NULL, "Application"); + BackupEventLogA(handle, filename); + CloseEventLog(handle); +} + static void test_open_close(void) { HANDLE handle; @@ -434,10 +444,7 @@ static void test_openbackup(void) "Expected RPC_S_SERVER_UNAVAILABLE, got %d\n", GetLastError()); /* Make a backup eventlog to work with */ - DeleteFileA(backup); - handle = OpenEventLogA(NULL, "Application"); - BackupEventLogA(handle, backup); - CloseEventLog(handle); + create_backup(backup); /* FIXME: Wine stops here */ if (GetFileAttributesA(backup) == INVALID_FILE_ATTRIBUTES) @@ -493,6 +500,57 @@ static void test_openbackup(void) DeleteFileA(backup); } +static void test_clear(void) +{ + HANDLE handle; + BOOL ret; + const char backup[] = "backup.evt"; + + SetLastError(0xdeadbeef); + ret = ClearEventLogA(NULL, NULL); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + } + + /* Make a backup eventlog to work with */ + create_backup(backup); + + SetLastError(0xdeadbeef); + ret = ClearEventLogA(NULL, backup); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + } + + handle = OpenBackupEventLogA(NULL, backup); + todo_wine + ok(handle != NULL, "Expected a handle\n"); + + /* A real eventlog would fail with ERROR_ALREADY_EXISTS */ + SetLastError(0xdeadbeef); + ret = ClearEventLogA(handle, backup); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + } + + /* Show that ClearEventLog only works for real eventlogs. */ + SetLastError(0xdeadbeef); + ret = ClearEventLogA(handle, NULL); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + } + + CloseEventLog(handle); + DeleteFileA(backup); +} + START_TEST(eventlog) { SetLastError(0xdeadbeef); @@ -513,4 +571,5 @@ START_TEST(eventlog) test_backup(); test_openbackup(); test_read(); + test_clear(); }

1 0

Paul Vriens : advapi32: Add a input parameter check to ClearEventLog.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 5dafeacbd5b89d89c66bafbe3523278382158f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dafeacbd5b89d89c66bafbe3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 4 08:00:58 2009 +0100 advapi32: Add a input parameter check to ClearEventLog. --- dlls/advapi32/eventlog.c | 23 ++++++++++++++++++----- dlls/advapi32/tests/eventlog.c | 12 ------------ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 4990112..af377ee 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -107,7 +107,7 @@ BOOL WINAPI BackupEventLogW( HANDLE hEventLog, LPCWSTR lpBackupFileName ) /****************************************************************************** * ClearEventLogA [ADVAPI32.@] * - * Clears the event log and/or saves the log to a backup file. + * Clears the event log and optionally saves the log to a backup file. * * PARAMS * hEvenLog [I] Handle to event log to clear. @@ -121,8 +121,14 @@ BOOL WINAPI BackupEventLogW( HANDLE hEventLog, LPCWSTR lpBackupFileName ) */ BOOL WINAPI ClearEventLogA( HANDLE hEventLog, LPCSTR lpBackupFileName ) { - FIXME("(%p,%s) stub\n", hEventLog, debugstr_a(lpBackupFileName)); - return TRUE; + LPWSTR backupW; + BOOL ret; + + backupW = SERV_dup(lpBackupFileName); + ret = ClearEventLogW(hEventLog, backupW); + HeapFree(GetProcessHeap(), 0, backupW); + + return ret; } /****************************************************************************** @@ -132,8 +138,15 @@ BOOL WINAPI ClearEventLogA( HANDLE hEventLog, LPCSTR lpBackupFileName ) */ BOOL WINAPI ClearEventLogW( HANDLE hEventLog, LPCWSTR lpBackupFileName ) { - FIXME("(%p,%s) stub\n", hEventLog, debugstr_w(lpBackupFileName)); - return TRUE; + FIXME("(%p,%s) stub\n", hEventLog, debugstr_w(lpBackupFileName)); + + if (!hEventLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + return TRUE; } /****************************************************************************** diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 99990a2..6bc9a24 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -508,22 +508,16 @@ static void test_clear(void) SetLastError(0xdeadbeef); ret = ClearEventLogA(NULL, NULL); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } /* Make a backup eventlog to work with */ create_backup(backup); SetLastError(0xdeadbeef); ret = ClearEventLogA(NULL, backup); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } handle = OpenBackupEventLogA(NULL, backup); todo_wine @@ -532,20 +526,14 @@ static void test_clear(void) /* A real eventlog would fail with ERROR_ALREADY_EXISTS */ SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, backup); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } /* Show that ClearEventLog only works for real eventlogs. */ SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, NULL); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } CloseEventLog(handle); DeleteFileA(backup);

1 0

Paul Vriens : advapi32/tests: Add some tests for handling a backup file.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 9c3c49f472e8d174aa0cb779b1166f52ec2d78a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c3c49f472e8d174aa0cb779b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 4 08:02:09 2009 +0100 advapi32/tests: Add some tests for handling a backup file. --- dlls/advapi32/tests/eventlog.c | 58 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 6bc9a24..3c932ea 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -164,6 +164,7 @@ static void test_count(void) HANDLE handle; BOOL ret; DWORD count; + const char backup[] = "backup.evt"; SetLastError(0xdeadbeef); ret = GetNumberOfEventLogRecords(NULL, NULL); @@ -190,6 +191,25 @@ static void test_count(void) ok(count != 0xdeadbeef, "Expected the number of records\n"); CloseEventLog(handle); + + /* Make a backup eventlog to work with */ + create_backup(backup); + + handle = OpenBackupEventLogA(NULL, backup); + todo_wine + ok(handle != NULL, "Expected a handle\n"); + + /* Does GetNumberOfEventLogRecords work with backup eventlogs? */ + count = 0xdeadbeef; + ret = GetNumberOfEventLogRecords(handle, &count); + todo_wine + { + ok(ret, "Expected succes\n"); + ok(count != 0xdeadbeef, "Expected the number of records\n"); + } + + CloseEventLog(handle); + DeleteFileA(backup); } static void test_oldest(void) @@ -197,6 +217,7 @@ static void test_oldest(void) HANDLE handle; BOOL ret; DWORD oldest; + const char backup[] = "backup.evt"; SetLastError(0xdeadbeef); ret = GetOldestEventLogRecord(NULL, NULL); @@ -223,6 +244,25 @@ static void test_oldest(void) ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); CloseEventLog(handle); + + /* Make a backup eventlog to work with */ + create_backup(backup); + + handle = OpenBackupEventLogA(NULL, backup); + todo_wine + ok(handle != NULL, "Expected a handle\n"); + + /* Does GetOldestEventLogRecord work with backup eventlogs? */ + oldest = 0xdeadbeef; + ret = GetOldestEventLogRecord(handle, &oldest); + todo_wine + { + ok(ret, "Expected succes\n"); + ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); + } + + CloseEventLog(handle); + DeleteFileA(backup); } static void test_backup(void) @@ -230,6 +270,7 @@ static void test_backup(void) HANDLE handle; BOOL ret; const char backup[] = "backup.evt"; + const char backup2[] = "backup2.evt"; SetLastError(0xdeadbeef); ret = BackupEventLogA(NULL, NULL); @@ -251,7 +292,7 @@ static void test_backup(void) ret = BackupEventLogA(handle, backup); ok(ret, "Expected succes\n"); todo_wine - ok(GetFileAttributesA("backup.evt") != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); + ok(GetFileAttributesA(backup) != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); /* Try to overwrite */ SetLastError(0xdeadbeef); @@ -263,7 +304,22 @@ static void test_backup(void) } CloseEventLog(handle); + + /* Can we make a backup of a backup? */ + handle = OpenBackupEventLogA(NULL, backup); + todo_wine + ok(handle != NULL, "Expected a handle\n"); + + ret = BackupEventLogA(handle, backup2); + todo_wine + { + ok(ret, "Expected succes\n"); + ok(GetFileAttributesA(backup2) != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); + } + + CloseEventLog(handle); DeleteFileA(backup); + DeleteFileA(backup2); } static void test_read(void)

1 0

Hans Leidekker : rpcrt4: Correct spelling of RPC_C_QOS_IDENTITY_STATIC and RPC_C_QOS_IDENTITY_DYNAMIC .
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 4b33527f510e8a9f052c20b508ee30a47329f72d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b33527f510e8a9f052c20b50… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 4 09:10:30 2009 +0100 rpcrt4: Correct spelling of RPC_C_QOS_IDENTITY_STATIC and RPC_C_QOS_IDENTITY_DYNAMIC. --- dlls/rpcrt4/rpc_transport.c | 2 +- include/rpcdce.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index cc43278..5d38b6e 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -214,7 +214,7 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, dwFlags |= SECURITY_DELEGATION; break; } - if (Connection->QOS->qos->IdentityTracking == RPC_C_QOS_IDENTIFY_DYNAMIC) + if (Connection->QOS->qos->IdentityTracking == RPC_C_QOS_IDENTITY_DYNAMIC) dwFlags |= SECURITY_CONTEXT_TRACKING; } pipe = CreateFileA(pname, GENERIC_READ|GENERIC_WRITE, 0, NULL, diff --git a/include/rpcdce.h b/include/rpcdce.h index 465a835..5b714b5 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -158,8 +158,8 @@ typedef I_RPC_HANDLE *RPC_EP_INQ_HANDLE; #define RPC_C_IMP_LEVEL_DELEGATE 4 /* values for RPC_SECURITY_QOS*::IdentityTracking */ -#define RPC_C_QOS_IDENTIFY_STATIC 0 -#define RPC_C_QOS_IDENTIFY_DYNAMIC 1 +#define RPC_C_QOS_IDENTITY_STATIC 0 +#define RPC_C_QOS_IDENTITY_DYNAMIC 1 /* flags for RPC_SECURITY_QOS*::Capabilities */ #define RPC_C_QOS_CAPABILITIES_DEFAULT 0x0

1 0