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

Juan Lang : crypt32: Test an encoded signed message with a cert with a public key.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: 8c4330e732e7fec10b4b5310879a21b8f4b5666e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c4330e732e7fec10b4b53108… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 20 17:26:10 2007 -0700 crypt32: Test an encoded signed message with a cert with a public key. --- dlls/crypt32/tests/msg.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 15f6baa..471cc17 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1311,6 +1311,18 @@ static BYTE cert[] = { 0x00,0x30,0x07,0x30,0x02,0x06,0x00,0x03,0x01,0x00,0xa3,0x16,0x30,0x14,0x30, 0x12,0x06,0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01, 0xff,0x02,0x01,0x01 }; +static BYTE v1CertWithPubKey[] = { +0x30,0x81,0x95,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, +0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, +0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31, +0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31, +0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x01,0x01,0x05,0x00,0x03,0x11,0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, +0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xa3,0x16,0x30,0x14,0x30,0x12,0x06, +0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02, +0x01,0x01 }; static const BYTE signedWithCertEmptyBareContent[] = { 0x30,0x81,0xce,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48, 0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x02,0x06,0x00,0xa0,0x7c,0x30,0x7a, @@ -1420,6 +1432,23 @@ static const BYTE signedWithCertAndCrlBareContent[] = { 0xa0,0x1e,0xee,0xc2,0x60,0xbc,0x59,0xbe,0x3f,0x63,0x06,0x8d,0xc9,0x11,0x1d, 0x23,0x64,0x92,0xef,0x2e,0xfc,0x57,0x29,0xa4,0xaf,0xe0,0xee,0x93,0x19,0x39, 0x51,0xe4,0x44,0xb8,0x0b,0x28,0xf4,0xa8,0x0d }; +static const BYTE signedWithCertWithPubKeyBareContent[] = { +0x30,0x81,0xeb,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48, +0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x02,0x06,0x00,0xa0,0x81,0x98,0x30, +0x81,0x95,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30, +0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30, +0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11,0x06, +0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67, +0x00,0x30,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01, +0x01,0x05,0x00,0x03,0x11,0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08, +0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xa3,0x16,0x30,0x14,0x30,0x12,0x06,0x03, +0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02,0x01, +0x01,0x31,0x37,0x30,0x35,0x02,0x01,0x01,0x30,0x1a,0x30,0x15,0x31,0x13,0x30, +0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, +0x6e,0x67,0x00,0x02,0x01,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7, +0x0d,0x02,0x05,0x05,0x00,0x30,0x04,0x06,0x00,0x05,0x00,0x04,0x00 }; static void test_signed_msg_encoding(void) { @@ -1561,6 +1590,18 @@ static void test_signed_msg_encoding(void) CryptMsgClose(msg); + /* Test with a cert with a (bogus) public key */ + signInfo.cCrlEncoded = 0; + encodedCert.cbData = sizeof(v1CertWithPubKey); + encodedCert.pbData = v1CertWithPubKey; + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, + NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + check_param("signedWithCertWithPubKeyBareContent", msg, + CMSG_BARE_CONTENT_PARAM, signedWithCertWithPubKeyBareContent, + sizeof(signedWithCertWithPubKeyBareContent)); + CryptMsgClose(msg); + CryptDestroyKey(key); CryptReleaseContext(signer.hCryptProv, 0); pCryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, PROV_RSA_FULL,

1 0

Juan Lang : crypt32: Add tests for CryptMsgControl.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: cc8948fefab090237fb83eabbe324d9f74b2a734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8948fefab090237fb83eabb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 20 17:26:39 2007 -0700 crypt32: Add tests for CryptMsgControl. --- dlls/crypt32/tests/msg.c | 248 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 248 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc8948fefab090237fb83…

1 0

Paul Vriens : wined3d/vertexdeclaration: Return when out of memory ( Coverity).
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: ffb1e74eacfebd93a9b4b050358448576566c23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb1e74eacfebd93a9b4b0503… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 21 17:13:55 2007 +0200 wined3d/vertexdeclaration: Return when out of memory (Coverity). --- dlls/wined3d/vertexdeclaration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 292f1f0..bc22d89 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -136,7 +136,7 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte This->pDeclarationWine = HeapAlloc(GetProcessHeap(), 0, sizeof(WINED3DVERTEXELEMENT) * element_count); if (!This->pDeclarationWine) { ERR("Memory allocation failed\n"); - hr = WINED3DERR_OUTOFVIDEOMEMORY; + return WINED3DERR_OUTOFVIDEOMEMORY; } else { CopyMemory(This->pDeclarationWine, elements, sizeof(WINED3DVERTEXELEMENT) * element_count); }

1 0

Paul Vriens : kernel32/tests: Skip some not implemented functions and add a few skip's.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: 7626e5ec77a19ab657dc7e239354ff57c420cc9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7626e5ec77a19ab657dc7e239… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 21 14:22:03 2007 +0200 kernel32/tests: Skip some not implemented functions and add a few skip's. --- dlls/kernel32/tests/change.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 9b6c52b..3c5ace3 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -256,7 +256,13 @@ static void test_ffcn(void) static const WCHAR szBoo[] = { '\\','b','o','o',0 }; static const WCHAR szHoo[] = { '\\','h','o','o',0 }; + SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); + if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + skip("GetTempPathW is not implemented\n"); + return; + } ok( r != 0, "temp path failed\n"); if (!r) return; @@ -376,7 +382,10 @@ static void test_readdirectorychanges(void) PFILE_NOTIFY_INFORMATION pfni; if (!pReadDirectoryChangesW) + { + skip("ReadDirectoryChangesW is not available\n"); return; + } r = GetTempPathW( MAX_PATH, path ); ok( r != 0, "temp path failed\n"); @@ -587,7 +596,10 @@ static void test_readdirectorychanges_null(void) PFILE_NOTIFY_INFORMATION pfni; if (!pReadDirectoryChangesW) + { + skip("ReadDirectoryChangesW is not available\n"); return; + } r = GetTempPathW( MAX_PATH, path ); ok( r != 0, "temp path failed\n"); @@ -678,7 +690,13 @@ static void test_readdirectorychanges_filedir(void) static const WCHAR szFoo[] = { '\\','f','o','o',0 }; PFILE_NOTIFY_INFORMATION pfni; + SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); + if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + skip("GetTempPathW is not implemented\n"); + return; + } ok( r != 0, "temp path failed\n"); if (!r) return;

1 0

Roderick Colenbrander : wined3d: Fix a null pointer dereference.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: 3c08b2302470f2cfed82116b6567688729a88b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c08b2302470f2cfed82116b6… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Aug 21 16:52:01 2007 +0200 wined3d: Fix a null pointer dereference. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 58b4ed6..20ade5c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1155,7 +1155,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { } IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain); - if(swapchain || iface == myDevice->render_targets[0]) { + if(swapchain || (myDevice->render_targets && iface == myDevice->render_targets[0])) { if(wined3d_settings.rendertargetlock_mode == RTL_DISABLE) { static BOOL warned = FALSE; if(!warned) {

1 0

Dmitry Timoshkov : kernel32: Restore check for StandardDate.wMonth being 0.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: 18060ed7d4497512ba473a387155b5a42f8d73bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=18060ed7d4497512ba473a387… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Aug 21 21:44:50 2007 +0900 kernel32: Restore check for StandardDate.wMonth being 0. --- dlls/kernel32/time.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 9aa9c69..eab7635 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -166,11 +166,12 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, /* if year is 0 then date is in day-of-week format, otherwise * it's absolute date. */ - if (pTZinfo->StandardDate.wYear == 0 && + if (pTZinfo->StandardDate.wMonth == 0 || + (pTZinfo->StandardDate.wYear == 0 && (pTZinfo->StandardDate.wDay<1 || pTZinfo->StandardDate.wDay>5 || pTZinfo->DaylightDate.wDay<1 || - pTZinfo->DaylightDate.wDay>5)) + pTZinfo->DaylightDate.wDay>5))) { SetLastError(ERROR_INVALID_PARAMETER); return TIME_ZONE_ID_INVALID;

1 0

Dmitry Timoshkov : msvcrt: Restore error handling code in localtime.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: e98d1da7d4ad94e7d07a33a4d8bfb5ec7ec7408f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98d1da7d4ad94e7d07a33a4d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Aug 21 21:44:24 2007 +0900 msvcrt: Restore error handling code in localtime. --- dlls/msvcrt/time.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4d75fb9..69762e0 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -105,10 +105,14 @@ MSVCRT_time_t CDECL MSVCRT_mktime(struct MSVCRT_tm *mstm) struct MSVCRT_tm* CDECL MSVCRT_localtime(const MSVCRT_time_t* secs) { struct tm tm; - thread_data_t *data = msvcrt_get_thread_data(); + thread_data_t *data; time_t seconds = *secs; - localtime_r( &seconds, &tm ); + if (seconds < 0) return NULL; + + if (!localtime_r( &seconds, &tm )) return NULL; + + data = msvcrt_get_thread_data(); unix_tm_to_msvcrt( &data->time_buffer, &tm ); return &data->time_buffer;

1 0

Paul Vriens : dnsapi/tests: No need to dynamically load dnsapi anymore.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: 1691ca5ee332dfbc52dae53d57181da7bb32cd9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1691ca5ee332dfbc52dae53d5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 21 17:38:19 2007 +0200 dnsapi/tests: No need to dynamically load dnsapi anymore. --- dlls/dnsapi/tests/Makefile.in | 2 +- dlls/dnsapi/tests/name.c | 94 +++++++++++++--------------------------- dlls/dnsapi/tests/record.c | 76 +++++++++------------------------ 3 files changed, 53 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1691ca5ee332dfbc52dae…

1 0

Damjan Jovanovic : setupapi: Use NtDeleteKey instead of an invalid RegDeleteKeyW.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: 28025d64ef4e2b367f4e7417d6bed93c5f425892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28025d64ef4e2b367f4e7417d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Aug 21 13:23:58 2007 +0200 setupapi: Use NtDeleteKey instead of an invalid RegDeleteKeyW. --- dlls/setupapi/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index ca17b64..f11ace4 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -276,7 +276,7 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context } else RegDeleteValueW( hkey, value ); } - else RegDeleteKeyW( hkey, NULL ); + else NtDeleteKey( hkey ); return TRUE; }

1 0

Alexandre Julliard : winex11: Update the wm hints also when mapping a previously zero-size window.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: a37a2fa4c5dc83c87288fbe8123c6dbf91a53895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37a2fa4c5dc83c87288fbe81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 21 21:38:20 2007 +0200 winex11: Update the wm hints also when mapping a previously zero-size window. --- dlls/winex11.drv/winpos.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index eb615c6..5499ef0 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -397,23 +397,22 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, { /* window got shown, map it */ TRACE( "mapping win %p\n", hwnd ); - X11DRV_sync_window_style( display, data ); - X11DRV_set_wm_hints( display, data ); - wine_tsx11_lock(); - XMapWindow( display, data->whole_window ); - XFlush( display ); - wine_tsx11_unlock(); mapped = TRUE; } else if ((swp_flags & (SWP_NOSIZE | SWP_NOMOVE)) != (SWP_NOSIZE | SWP_NOMOVE)) { /* resizing from zero size to non-zero -> map */ TRACE( "mapping non zero size or off-screen win %p\n", hwnd ); + mapped = TRUE; + } + if (mapped) + { + X11DRV_sync_window_style( display, data ); + X11DRV_set_wm_hints( display, data ); wine_tsx11_lock(); XMapWindow( display, data->whole_window ); XFlush( display ); wine_tsx11_unlock(); - mapped = TRUE; } SetRect( &old_screen_rect, 0, 0, screen_width, screen_height ); if (fullscreen_state_changed( data, &old_client_rect, &old_screen_rect, &new_fs_state ) || mapped)

1 0