February 2011 - Wine-Commits

Jacek Caban : dvdmedia.h: Added MPEG2VIDEOINFO declaration.
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: 11638e1e4d5d8374e385d99f010c3c8dc51b7d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=11638e1e4d5d8374e385d99f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 11 14:52:11 2011 +0100 dvdmedia.h: Added MPEG2VIDEOINFO declaration. --- include/dvdmedia.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/dvdmedia.h b/include/dvdmedia.h index 9a29994..32c22fc 100644 --- a/include/dvdmedia.h +++ b/include/dvdmedia.h @@ -41,4 +41,14 @@ typedef struct tagVIDEOINFOHEADER2 { BITMAPINFOHEADER bmiHeader; } VIDEOINFOHEADER2; +typedef struct tagMPEG2VIDEOINFO { + VIDEOINFOHEADER2 hdr; + DWORD dwStartTimeCode; + DWORD cbSequenceHeader; + DWORD dwProfile; + DWORD dwLevel; + DWORD dwFlags; + DWORD dwSequenceHeader[1]; +} MPEG2VIDEOINFO; + #endif /* __DVDMEDIA_H__ */

1 0

Peter Urbanec : d3d9/tests: Use primary monitor screen size to perform tests.
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: 766e732fb37cf0c6dabd895f56506e5e4feb10cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=766e732fb37cf0c6dabd895f5… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Fri Feb 11 15:39:20 2011 +1100 d3d9/tests: Use primary monitor screen size to perform tests. --- dlls/d3d9/tests/device.c | 40 ++++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 531d085..b377bee 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -24,6 +24,9 @@ #include <d3d9.h> #include "wine/test.h" +static INT screen_width; +static INT screen_height; + static IDirect3D9 *(WINAPI *pDirect3DCreate9)(UINT); static int get_refcount(IUnknown *object) @@ -56,8 +59,8 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND device_window, HWN present_parameters.Windowed = windowed; present_parameters.hDeviceWindow = device_window; present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = 640; - present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferWidth = screen_width; + present_parameters.BackBufferHeight = screen_height; present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; @@ -82,8 +85,8 @@ static HRESULT reset_device(IDirect3DDevice9 *device, HWND device_window, BOOL w present_parameters.Windowed = windowed; present_parameters.hDeviceWindow = device_window; present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = 640; - present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferWidth = screen_width; + present_parameters.BackBufferHeight = screen_height; present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; @@ -2207,7 +2210,7 @@ static void test_scissor_size(void) { IDirect3D9 *d3d9_ptr = 0; unsigned int i; - static const struct { + static struct { int winx; int winy; int backx; int backy; BOOL window; } scts[] = { /* scissor tests */ {800, 600, 640, 480, TRUE}, @@ -2233,6 +2236,12 @@ static void test_scissor_size(void) hwnd = CreateWindow("d3d9_test_wc", "d3d9_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, scts[i].winx, scts[i].winy, 0, 0, 0, 0); + if (!scts[i].window) + { + scts[i].backx = screen_width; + scts[i].backy = screen_height; + } + ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = scts[i].window; present_parameters.hDeviceWindow = hwnd; @@ -2266,8 +2275,8 @@ static void test_scissor_size(void) ok(scissorrect.right == scts[i].backx && scissorrect.bottom == scts[i].backy && scissorrect.top == 0 && scissorrect.left == 0, "Scissorrect missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, scts[i].backx, scts[i].backy); /* check the scissorrect values after a reset */ - present_parameters.BackBufferWidth = 800; - present_parameters.BackBufferHeight = 600; + present_parameters.BackBufferWidth = screen_width; + present_parameters.BackBufferHeight = screen_height; hr = IDirect3DDevice9_Reset(device_ptr, &present_parameters); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); hr = IDirect3DDevice9_TestCooperativeLevel(device_ptr); @@ -2275,7 +2284,7 @@ static void test_scissor_size(void) hr = IDirect3DDevice9_GetScissorRect(device_ptr, &scissorrect); ok(hr == D3D_OK, "IDirect3DDevice9_GetScissorRect failed with: %08x\n", hr); - ok(scissorrect.right == 800 && scissorrect.bottom == 600 && scissorrect.top == 0 && scissorrect.left == 0, "Scissorrect missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, 800, 600); + ok(scissorrect.right == screen_width && scissorrect.bottom == screen_height && scissorrect.top == 0 && scissorrect.left == 0, "Scissorrect missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, screen_width, screen_height); if(device_ptr) { ULONG ref; @@ -2423,7 +2432,7 @@ static DWORD WINAPI wndproc_thread(void *param) BOOL ret; p->dummy_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); p->running_in_foreground = SetForegroundWindow(p->dummy_window); ret = SetEvent(p->window_created); @@ -2484,9 +2493,9 @@ static void test_wndproc(void) ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError()); focus_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); device_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, &tid); ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); @@ -2628,9 +2637,9 @@ static void test_wndproc_windowed(void) ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError()); focus_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); device_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, &tid); ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); @@ -2830,7 +2839,7 @@ static void test_fpu_setup(void) ok(!!d3d9, "Failed to create a d3d9 object.\n"); if (!d3d9) return; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); ok(!!window, "Failed to create a window.\n"); if (!window) goto done; @@ -2906,6 +2915,9 @@ START_TEST(device) } IDirect3D9_Release(d3d9); + screen_width = GetSystemMetrics(SM_CXSCREEN); + screen_height = GetSystemMetrics(SM_CYSCREEN); + test_fpu_setup(); test_multi_device(); test_display_formats();

1 0

Peter Urbanec : d3d8/tests: Use primary monitor screen size to perform tests.
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: a02195a1482c5ccb77489d6c0b73697393cf4daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02195a1482c5ccb77489d6c0… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Fri Feb 11 15:39:01 2011 +1100 d3d8/tests: Use primary monitor screen size to perform tests. --- dlls/d3d8/tests/device.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index edcb72b..4ff9803 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -22,6 +22,9 @@ #include <d3d8.h> #include "wine/test.h" +static INT screen_width; +static INT screen_height; + static IDirect3D8 *(WINAPI *pDirect3DCreate8)(UINT); static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO); @@ -70,8 +73,8 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND device_window, HWN present_parameters.Windowed = windowed; present_parameters.hDeviceWindow = device_window; present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = 640; - present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferWidth = screen_width; + present_parameters.BackBufferHeight = screen_height; present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; @@ -96,8 +99,8 @@ static HRESULT reset_device(IDirect3DDevice8 *device, HWND device_window, BOOL w present_parameters.Windowed = windowed; present_parameters.hDeviceWindow = device_window; present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = 640; - present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferWidth = screen_width; + present_parameters.BackBufferHeight = screen_height; present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; @@ -785,8 +788,8 @@ static void test_states(void) ZeroMemory( &d3dpp, sizeof(d3dpp) ); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - d3dpp.BackBufferWidth = 640; - d3dpp.BackBufferHeight = 480; + d3dpp.BackBufferWidth = screen_width; + d3dpp.BackBufferHeight = screen_height; d3dpp.BackBufferFormat = d3ddm.Format; hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, @@ -1584,7 +1587,7 @@ static DWORD WINAPI wndproc_thread(void *param) BOOL ret; p->dummy_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); p->running_in_foreground = SetForegroundWindow(p->dummy_window); ret = SetEvent(p->window_created); @@ -1648,9 +1651,9 @@ static void test_wndproc(void) ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError()); focus_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, screen_width, screen_height, 0, 0, 0, 0); device_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, screen_width, screen_height, 0, 0, 0, 0); thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, &tid); ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); @@ -1792,9 +1795,9 @@ static void test_wndproc_windowed(void) ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError()); focus_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); device_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, &tid); ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); @@ -1995,7 +1998,7 @@ static void test_fpu_setup(void) ok(!!d3d8, "Failed to create a d3d8 object.\n"); if (!d3d8) return; - window = CreateWindowA("static", "d3d8_test", WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + window = CreateWindowA("static", "d3d8_test", WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); ok(!!window, "Failed to create a window.\n"); if (!window) goto done; @@ -2134,6 +2137,9 @@ START_TEST(device) } IDirect3D8_Release(d3d8); + screen_width = GetSystemMetrics(SM_CXSCREEN); + screen_height = GetSystemMetrics(SM_CYSCREEN); + test_fpu_setup(); test_display_modes(); test_shader_versions();

1 0

Jacek Caban : dsound.h: Added DSBNOTIFICATIONS_MAX definition.
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: 5d1a7511a2b831ee1ee54a87875f01b4f6e9d325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d1a7511a2b831ee1ee54a878… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 11 14:51:50 2011 +0100 dsound.h: Added DSBNOTIFICATIONS_MAX definition. --- include/dsound.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/dsound.h b/include/dsound.h index b594053..dc1ead3 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -232,6 +232,8 @@ typedef const DSCAPS *LPCDSCAPS; #define DSBFREQUENCY_MAX 200000 #define DSBFREQUENCY_ORIGINAL 0 +#define DSBNOTIFICATIONS_MAX 100000U + typedef struct _DSBCAPS { DWORD dwSize;

1 0

Juan Lang : rsaenh/tests: Test errors creating schannel keys and hashes before parameters are set.
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: b0ae8ca7c7170ac233ee938392a8c19ef3ee5a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ae8ca7c7170ac233ee93839… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 10 09:32:01 2011 -0800 rsaenh/tests: Test errors creating schannel keys and hashes before parameters are set. --- dlls/rsaenh/tests/rsaenh.c | 43 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index cef7d65..e3a31a2 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2339,7 +2339,30 @@ static void test_schannel_provider(void) result = CryptImportKey(hProv, abTLS1Master, dwLen, hRSAKey, 0, &hMasterSecret); ok (result, "%08x\n", GetLastError()); if (!result) return; - + + /* Deriving a hash from the master secret. This is due to the CryptoAPI architecture. + * (Keys can only be derived from hashes, not from other keys.) + * The hash can't be created yet because the key doesn't have the client + * random or server random set. + */ + result = CryptCreateHash(hProv, CALG_SCHANNEL_MASTER_HASH, hMasterSecret, 0, &hMasterHash); + todo_wine + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + if (result) + { + CryptDestroyHash(hMasterHash); + /* Reimporting the master secret is necessary under Wine until creating + * the hash fails as it should. + */ + CryptDestroyKey(hMasterSecret); + + dwLen = (DWORD)sizeof(abTLS1Master); + result = CryptImportKey(hProv, abTLS1Master, dwLen, hRSAKey, 0, &hMasterSecret); + ok (result, "%08x\n", GetLastError()); + if (!result) return; + } + /* Setting the TLS1 client and server random parameters, as well as the * MAC and encryption algorithm parameters. */ data_blob.cbData = 33; @@ -2353,7 +2376,21 @@ static void test_schannel_provider(void) result = CryptSetKeyParam(hMasterSecret, KP_SERVER_RANDOM, (BYTE*)&data_blob, 0); ok (result, "%08x\n", GetLastError()); if (!result) return; - + + result = CryptCreateHash(hProv, CALG_SCHANNEL_MASTER_HASH, hMasterSecret, 0, &hMasterHash); + ok (result, "%08x\n", GetLastError()); + if (!result) return; + + /* Deriving the server write encryption key from the master hash can't + * succeed before the encryption key algorithm is set. + */ + result = CryptDeriveKey(hProv, CALG_SCHANNEL_ENC_KEY, hMasterHash, CRYPT_SERVER, &hServerWriteKey); + todo_wine + ok (!result && GetLastError() == NTE_BAD_FLAGS, + "expected NTE_BAD_FLAGS, got %08x\n", GetLastError()); + + CryptDestroyHash(hMasterHash); + saSChannelAlg.dwUse = SCHANNEL_ENC_KEY; saSChannelAlg.Algid = CALG_DES; saSChannelAlg.cBits = 64; @@ -2372,8 +2409,6 @@ static void test_schannel_provider(void) ok (result, "%08x\n", GetLastError()); if (!result) return; - /* Deriving a hash from the master secret. This is due to the CryptoAPI architecture. - * (Keys can only be derived from hashes, not from other keys.) */ result = CryptCreateHash(hProv, CALG_SCHANNEL_MASTER_HASH, hMasterSecret, 0, &hMasterHash); ok (result, "%08x\n", GetLastError()); if (!result) return;

1 0

Juan Lang : rsaenh: Disallow creating schannel master hashes before setting the client random and server random .
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: ea43c5989cc6e44ad2681548f18efc389b330698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea43c5989cc6e44ad2681548f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 10 09:40:14 2011 -0800 rsaenh: Disallow creating schannel master hashes before setting the client random and server random. --- dlls/rsaenh/rsaenh.c | 7 +++++++ dlls/rsaenh/tests/rsaenh.c | 14 -------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index afd06e1..5f67589 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1857,6 +1857,13 @@ BOOL WINAPI RSAENH_CPCreateHash(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, SetLastError(NTE_BAD_KEY); return FALSE; } + if (Algid == CALG_SCHANNEL_MASTER_HASH && + ((!pCryptKey->siSChannelInfo.blobClientRandom.cbData) || + (!pCryptKey->siSChannelInfo.blobServerRandom.cbData))) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if ((Algid == CALG_TLS1PRF) && (pCryptKey->dwState != RSAENH_KEYSTATE_MASTERKEY)) { SetLastError(NTE_BAD_KEY_STATE); diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index e3a31a2..0476275 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2346,22 +2346,8 @@ static void test_schannel_provider(void) * random or server random set. */ result = CryptCreateHash(hProv, CALG_SCHANNEL_MASTER_HASH, hMasterSecret, 0, &hMasterHash); - todo_wine ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); - if (result) - { - CryptDestroyHash(hMasterHash); - /* Reimporting the master secret is necessary under Wine until creating - * the hash fails as it should. - */ - CryptDestroyKey(hMasterSecret); - - dwLen = (DWORD)sizeof(abTLS1Master); - result = CryptImportKey(hProv, abTLS1Master, dwLen, hRSAKey, 0, &hMasterSecret); - ok (result, "%08x\n", GetLastError()); - if (!result) return; - } /* Setting the TLS1 client and server random parameters, as well as the * MAC and encryption algorithm parameters. */

1 0

Juan Lang : crypt32: Don't attempt to find the length of a NULL string ( valgrind).
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: 9e6de30f8feb8eb0a5fbbfd88f34c7358f7d6e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e6de30f8feb8eb0a5fbbfd88… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 10 08:52:21 2011 -0800 crypt32: Don't attempt to find the length of a NULL string (valgrind). --- dlls/crypt32/encode.c | 48 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index e14ff19..825eb44 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1012,8 +1012,12 @@ static BOOL CRYPT_AsnEncodeUTF8String(const CERT_NAME_VALUE *value, LPCWSTR str = (LPCWSTR)value->Value.pbData; DWORD bytesNeeded, lenBytes, encodedLen, strLen; - strLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : - strlenW(str); + if (value->Value.cbData) + strLen = value->Value.cbData / sizeof(WCHAR); + else if (str) + strLen = strlenW(str); + else + strLen = 0; encodedLen = WideCharToMultiByte(CP_UTF8, 0, str, strLen, NULL, 0, NULL, NULL); CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); @@ -1992,8 +1996,12 @@ static BOOL CRYPT_AsnEncodeUnicodeStringCoerce(const CERT_NAME_VALUE *value, LPCWSTR str = (LPCWSTR)value->Value.pbData; DWORD bytesNeeded, lenBytes, encodedLen; - encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : - strlenW(str); + if (value->Value.cbData) + encodedLen = value->Value.cbData / sizeof(WCHAR); + else if (str) + encodedLen = strlenW(str); + else + encodedLen = 0; CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); bytesNeeded = 1 + lenBytes + encodedLen; if (!pbEncoded) @@ -2025,8 +2033,12 @@ static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, LPCWSTR str = (LPCWSTR)value->Value.pbData; DWORD bytesNeeded, lenBytes, encodedLen; - encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : - strlenW(str); + if (value->Value.cbData) + encodedLen = value->Value.cbData / sizeof(WCHAR); + else if (str) + encodedLen = strlenW(str); + else + encodedLen = 0; CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); bytesNeeded = 1 + lenBytes + encodedLen; if (!pbEncoded) @@ -2079,8 +2091,12 @@ static BOOL CRYPT_AsnEncodePrintableString(const CERT_NAME_VALUE *value, LPCWSTR str = (LPCWSTR)value->Value.pbData; DWORD bytesNeeded, lenBytes, encodedLen; - encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : - strlenW(str); + if (value->Value.cbData) + encodedLen = value->Value.cbData / sizeof(WCHAR); + else if (str) + encodedLen = strlenW(str); + else + encodedLen = 0; CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); bytesNeeded = 1 + lenBytes + encodedLen; if (!pbEncoded) @@ -2126,8 +2142,12 @@ static BOOL CRYPT_AsnEncodeIA5String(const CERT_NAME_VALUE *value, LPCWSTR str = (LPCWSTR)value->Value.pbData; DWORD bytesNeeded, lenBytes, encodedLen; - encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : - strlenW(str); + if (value->Value.cbData) + encodedLen = value->Value.cbData / sizeof(WCHAR); + else if (str) + encodedLen = strlenW(str); + else + encodedLen = 0; CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); bytesNeeded = 1 + lenBytes + encodedLen; if (!pbEncoded) @@ -2174,8 +2194,12 @@ static BOOL CRYPT_AsnEncodeUniversalString(const CERT_NAME_VALUE *value, DWORD bytesNeeded, lenBytes, strLen; /* FIXME: doesn't handle composite characters */ - strLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : - strlenW(str); + if (value->Value.cbData) + strLen = value->Value.cbData / sizeof(WCHAR); + else if (str) + strLen = strlenW(str); + else + strLen = 0; CRYPT_EncodeLen(strLen * 4, NULL, &lenBytes); bytesNeeded = 1 + lenBytes + strLen * 4; if (!pbEncoded)

1 0

André Hentschel : urlmon/tests: Mark unavailable InternetZoneManagerEx2 as broken.
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: a41ed6860f9a2eceec5f33c0cc5b595998ec4020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41ed6860f9a2eceec5f33c0c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Feb 10 20:23:17 2011 +0100 urlmon/tests: Mark unavailable InternetZoneManagerEx2 as broken. --- dlls/urlmon/tests/sec_mgr.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index f50ca17..72b6e8a 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -482,7 +482,8 @@ static void test_CoInternetCreateZoneManager(void) IUnknown_Release(punk); hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IInternetZoneManagerEx2, (void **) &punk); - ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + ok(hr == S_OK || broken(hr == ERROR_NOINTERFACE /* some W2K3 */), + "got 0x%x (expected S_OK)\n", hr); if (punk) IUnknown_Release(punk); else

1 0

Huw Davies : oleaut32: Implement proxy / stub for ITypeLib2_GetDocumentation2.
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: 9e0e3a73d256778cd1524abe9edeb56d30ff7218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0e3a73d256778cd1524abe9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 11 10:29:41 2011 +0000 oleaut32: Implement proxy / stub for ITypeLib2_GetDocumentation2. --- dlls/oleaut32/usrmarshal.c | 54 ++++++++++++++++++++++++++++--------------- 1 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 8f9e00c..cc4d2e7 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -2101,29 +2101,45 @@ HRESULT __RPC_STUB ITypeLib2_GetLibStatistics_Stub( return E_FAIL; } -HRESULT CALLBACK ITypeLib2_GetDocumentation2_Proxy( - ITypeLib2* This, - INT index, - LCID lcid, - BSTR* pbstrHelpString, - DWORD* pdwHelpStringContext, - BSTR* pbstrHelpStringDll) +HRESULT CALLBACK ITypeLib2_GetDocumentation2_Proxy(ITypeLib2 *This, INT index, + LCID lcid, BSTR *help_string, + DWORD *help_context, BSTR *help_dll) { - FIXME("not implemented\n"); - return E_FAIL; + DWORD dummy_help_context, flags = 0; + BSTR dummy_help_string, dummy_help_dll; + HRESULT hr; + TRACE("(%p, %d, %08x, %p, %p, %p)\n", This, index, lcid, help_string, help_context, help_dll); + + if(!help_string) help_string = &dummy_help_string; + else flags = 1; + + if(!help_context) help_context = &dummy_help_context; + else flags |= 2; + + if(!help_dll) help_dll = &dummy_help_dll; + else flags |= 4; + + hr = ITypeLib2_RemoteGetDocumentation2_Proxy(This, index, lcid, flags, help_string, help_context, help_dll); + + /* We don't need to free the dummy BSTRs since the stub ensures that these will be NULLs. */ + + return hr; } -HRESULT __RPC_STUB ITypeLib2_GetDocumentation2_Stub( - ITypeLib2* This, - INT index, - LCID lcid, - DWORD refPtrFlags, - BSTR* pbstrHelpString, - DWORD* pdwHelpStringContext, - BSTR* pbstrHelpStringDll) +HRESULT __RPC_STUB ITypeLib2_GetDocumentation2_Stub(ITypeLib2 *This, INT index, LCID lcid, + DWORD flags, BSTR *help_string, + DWORD *help_context, BSTR *help_dll) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %d, %08x, %08x, %p, %p, %p)\n", This, index, lcid, flags, help_string, help_context, help_dll); + + *help_string = *help_dll = NULL; + *help_context = 0; + + if(!(flags & 1)) help_string = NULL; + if(!(flags & 2)) help_context = NULL; + if(!(flags & 4)) help_dll = NULL; + + return ITypeLib2_GetDocumentation2(This, index, lcid, help_string, help_context, help_dll); } HRESULT CALLBACK IPropertyBag_Read_Proxy(

1 0

Huw Davies : oleaut32: Implement proxy / stub for ITypeInfo2_GetDocumentation2.
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: 1260bc8892db9f557d059078019cd72c4d4d0658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1260bc8892db9f557d0590780… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 11 10:19:32 2011 +0000 oleaut32: Implement proxy / stub for ITypeInfo2_GetDocumentation2. --- dlls/oleaut32/usrmarshal.c | 55 ++++++++++++++++++++++++++++--------------- 1 files changed, 36 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index d6e4bdd..2e64395 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1877,29 +1877,46 @@ HRESULT __RPC_STUB ITypeInfo_ReleaseVarDesc_Stub( /* ITypeInfo2 */ -HRESULT CALLBACK ITypeInfo2_GetDocumentation2_Proxy( - ITypeInfo2* This, - MEMBERID memid, - LCID lcid, - BSTR* pbstrHelpString, - DWORD* pdwHelpStringContext, - BSTR* pbstrHelpStringDll) +HRESULT CALLBACK ITypeInfo2_GetDocumentation2_Proxy(ITypeInfo2 *This, MEMBERID memid, + LCID lcid, BSTR *help_string, + DWORD *help_context, BSTR *help_dll) { - FIXME("not implemented\n"); - return E_FAIL; + DWORD dummy_help_context, flags = 0; + BSTR dummy_help_string, dummy_help_dll; + HRESULT hr; + TRACE("(%p, %08x, %08x, %p, %p, %p)\n", This, memid, lcid, help_string, help_context, help_dll); + + if(!help_string) help_string = &dummy_help_string; + else flags = 1; + + if(!help_context) help_context = &dummy_help_context; + else flags |= 2; + + if(!help_dll) help_dll = &dummy_help_dll; + else flags |= 4; + + hr = ITypeInfo2_RemoteGetDocumentation2_Proxy(This, memid, lcid, flags, help_string, help_context, help_dll); + + /* We don't need to free the dummy BSTRs since the stub ensures that these will be NULLs. */ + + return hr; } -HRESULT __RPC_STUB ITypeInfo2_GetDocumentation2_Stub( - ITypeInfo2* This, - MEMBERID memid, - LCID lcid, - DWORD refPtrFlags, - BSTR* pbstrHelpString, - DWORD* pdwHelpStringContext, - BSTR* pbstrHelpStringDll) +HRESULT __RPC_STUB ITypeInfo2_GetDocumentation2_Stub(ITypeInfo2 *This, MEMBERID memid, + LCID lcid, DWORD flags, + BSTR *help_string, DWORD *help_context, + BSTR *help_dll) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %08x, %08x, %08x, %p, %p, %p)\n", This, memid, lcid, flags, help_string, help_context, help_dll); + + *help_string = *help_dll = NULL; + *help_context = 0; + + if(!(flags & 1)) help_string = NULL; + if(!(flags & 2)) help_context = NULL; + if(!(flags & 4)) help_dll = NULL; + + return ITypeInfo2_GetDocumentation2(This, memid, lcid, help_string, help_context, help_dll); } /* ITypeLib */

1 0