December 2009 - Wine-Commits

Juan Lang : cryptnet: Correct AKI extension used in end certificate and CRL when checking revocation .
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: a2420c85f442f3259856a56b6174f91fbd823c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2420c85f442f3259856a56b6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 1 12:30:10 2009 -0800 cryptnet: Correct AKI extension used in end certificate and CRL when checking revocation. --- dlls/cryptnet/tests/cryptnet.c | 86 ++++++++++++++++++++------------------- 1 files changed, 44 insertions(+), 42 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 490e93a..e3d9465 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -431,55 +431,57 @@ static const BYTE rootWithKeySignAndCRLSign[] = { 0x45,0xd4,0xf5,0xe3,0xdf,0x2a,0xf1,0x18,0x28,0x20,0xb5,0xf8,0xf5,0x8d,0x7a, 0x2e,0x84,0xee }; static const BYTE eeCert[] = { -0x30,0x82,0x01,0x93,0x30,0x81,0xfd,0xa0,0x03,0x02,0x01,0x02,0x02,0x01,0x01, +0x30,0x82,0x01,0xbb,0x30,0x82,0x01,0x24,0xa0,0x03,0x02,0x01,0x02,0x02,0x01, +0x01,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05, +0x00,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43, +0x65,0x72,0x74,0x31,0x30,0x1e,0x17,0x0d,0x30,0x37,0x30,0x35,0x30,0x31,0x30, +0x30,0x30,0x30,0x30,0x30,0x5a,0x17,0x0d,0x30,0x37,0x31,0x30,0x30,0x31,0x30, +0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55, +0x04,0x03,0x13,0x05,0x43,0x65,0x72,0x74,0x32,0x30,0x81,0x9f,0x30,0x0d,0x06, +0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x81,0x8d, +0x00,0x30,0x81,0x89,0x02,0x81,0x81,0x00,0xb8,0x52,0xda,0xc5,0x4b,0x3f,0xe5, +0x33,0x0e,0x67,0x5f,0x48,0x21,0xdc,0x7e,0xef,0x37,0x33,0xba,0xff,0xb4,0xc6, +0xdc,0xb6,0x17,0x8e,0x20,0x55,0x07,0x12,0xd2,0x7b,0x3c,0xce,0x30,0xc5,0xa7, +0x48,0x9f,0x6e,0xfe,0xb8,0xbe,0xdb,0x9f,0x9b,0x17,0x60,0x16,0xde,0xc6,0x8b, +0x47,0xd1,0x57,0x71,0x3c,0x93,0xfc,0xbd,0xec,0x44,0x32,0x3b,0xb9,0xcf,0x6b, +0x05,0x72,0xa7,0x87,0x8e,0x7e,0xd4,0x9a,0x87,0x1c,0x2f,0xb7,0x82,0x40,0xfc, +0x6a,0x80,0x83,0x68,0x28,0xce,0x84,0xf4,0x0b,0x2e,0x44,0xcb,0x53,0xac,0x85, +0x85,0xb5,0x46,0x36,0x98,0x3c,0x10,0x02,0xaa,0x02,0xbc,0x8b,0xa2,0x23,0xb2, +0xd3,0x51,0x9a,0x22,0x4a,0xe3,0xaa,0x4e,0x7c,0xda,0x38,0xcf,0x49,0x98,0x72, +0xa3,0x02,0x03,0x01,0x00,0x01,0xa3,0x25,0x30,0x23,0x30,0x21,0x06,0x03,0x55, +0x1d,0x23,0x04,0x1a,0x30,0x18,0x80,0x16,0x04,0x14,0x14,0x8c,0x16,0xbb,0xbe, +0x70,0xa2,0x28,0x89,0xa0,0x58,0xff,0x98,0xbd,0xa8,0x24,0x2b,0x8a,0xe9,0x9a, 0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05,0x00, -0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43,0x65, -0x72,0x74,0x31,0x30,0x1e,0x17,0x0d,0x30,0x37,0x30,0x35,0x30,0x31,0x30,0x30, -0x30,0x30,0x30,0x30,0x5a,0x17,0x0d,0x30,0x37,0x31,0x30,0x30,0x31,0x30,0x30, -0x30,0x30,0x30,0x30,0x5a,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04, -0x03,0x13,0x05,0x43,0x65,0x72,0x74,0x32,0x30,0x81,0x9f,0x30,0x0d,0x06,0x09, -0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x81,0x8d,0x00, -0x30,0x81,0x89,0x02,0x81,0x81,0x00,0xb8,0x52,0xda,0xc5,0x4b,0x3f,0xe5,0x33, -0x0e,0x67,0x5f,0x48,0x21,0xdc,0x7e,0xef,0x37,0x33,0xba,0xff,0xb4,0xc6,0xdc, -0xb6,0x17,0x8e,0x20,0x55,0x07,0x12,0xd2,0x7b,0x3c,0xce,0x30,0xc5,0xa7,0x48, -0x9f,0x6e,0xfe,0xb8,0xbe,0xdb,0x9f,0x9b,0x17,0x60,0x16,0xde,0xc6,0x8b,0x47, -0xd1,0x57,0x71,0x3c,0x93,0xfc,0xbd,0xec,0x44,0x32,0x3b,0xb9,0xcf,0x6b,0x05, -0x72,0xa7,0x87,0x8e,0x7e,0xd4,0x9a,0x87,0x1c,0x2f,0xb7,0x82,0x40,0xfc,0x6a, -0x80,0x83,0x68,0x28,0xce,0x84,0xf4,0x0b,0x2e,0x44,0xcb,0x53,0xac,0x85,0x85, -0xb5,0x46,0x36,0x98,0x3c,0x10,0x02,0xaa,0x02,0xbc,0x8b,0xa2,0x23,0xb2,0xd3, -0x51,0x9a,0x22,0x4a,0xe3,0xaa,0x4e,0x7c,0xda,0x38,0xcf,0x49,0x98,0x72,0xa3, -0x02,0x03,0x01,0x00,0x01,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d, -0x01,0x01,0x05,0x05,0x00,0x03,0x81,0x81,0x00,0x22,0xf1,0x66,0x00,0x79,0xd2, -0xe6,0xb2,0xb2,0xf7,0x2f,0x98,0x92,0x7d,0x73,0xc3,0x6c,0x5c,0x77,0x20,0xe3, -0xbf,0x3e,0xe0,0xb3,0x5c,0x68,0xb4,0x9b,0x3a,0x41,0xae,0x94,0xa0,0x80,0x3a, -0xfe,0x5d,0x7a,0x56,0x87,0x85,0x44,0x45,0xcf,0xa6,0xd3,0x10,0xe7,0x73,0x41, -0xf2,0x7f,0x88,0x85,0x91,0x8e,0xe6,0xec,0xe2,0xce,0x08,0xbc,0xa5,0x76,0xe5, -0x4d,0x1d,0xb7,0x70,0x31,0xdd,0xc9,0x9a,0x15,0x32,0x11,0x5a,0x4e,0x62,0xc8, -0xd1,0xf8,0xec,0x46,0x39,0x5b,0xe7,0x67,0x1f,0x58,0xe8,0xa1,0xa0,0x5b,0xf7, -0x8a,0x6d,0x5f,0x91,0x18,0xd4,0x90,0x85,0xff,0x30,0xc7,0xca,0x9c,0xc6,0x92, -0xb0,0xca,0x16,0xc4,0xa4,0xc0,0xd6,0xe8,0xff,0x15,0x19,0xd1,0x30,0x61,0xf3, -0xef,0x9f }; +0x03,0x81,0x81,0x00,0x91,0xd2,0x78,0xe5,0xdc,0x10,0xa3,0x08,0x5e,0x20,0x85, +0xec,0x57,0x09,0x83,0x68,0x45,0xbe,0x4c,0xab,0x09,0x7b,0xe9,0x8f,0x71,0x43, +0x29,0x02,0x7e,0x26,0x55,0xc6,0xf1,0xfa,0xb2,0xbf,0x17,0x8f,0x37,0x30,0x57, +0x75,0x63,0xce,0xb8,0x5f,0x7e,0x3f,0xfd,0xc2,0x7a,0xa0,0x61,0x5f,0x41,0x6c, +0x94,0x6a,0xc3,0x04,0x0c,0xd7,0xcf,0x6f,0x4a,0x1e,0xdb,0x42,0xd2,0xa0,0x45, +0xeb,0xd4,0x4d,0x3a,0x3d,0x98,0x05,0x03,0x61,0x87,0x81,0xae,0xe7,0x8a,0xfd, +0x92,0x8c,0xb9,0xe1,0x48,0xf9,0xe2,0x0e,0x0f,0xef,0x72,0xe6,0x6e,0x7e,0x41, +0xc2,0x8c,0x99,0xa9,0xbe,0x3a,0x01,0xa0,0x55,0x1d,0x65,0x7e,0x2a,0xb7,0x93, +0xc5,0x09,0x7d,0x81,0x76,0xa8,0x50,0xff,0x48,0xe5,0xec,0x72 }; static const BYTE rootSignedCRL[] = { -0x30,0x82,0x01,0x1d,0x30,0x81,0x87,0x02,0x01,0x01,0x30,0x0d,0x06,0x09,0x2a, +0x30,0x82,0x01,0x21,0x30,0x81,0x8b,0x02,0x01,0x01,0x30,0x0d,0x06,0x09,0x2a, 0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05,0x00,0x30,0x10,0x31,0x0e,0x30, 0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43,0x65,0x72,0x74,0x31,0x17,0x0d, 0x30,0x37,0x30,0x39,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x17,0x0d, 0x30,0x37,0x31,0x32,0x33,0x31,0x32,0x33,0x35,0x39,0x35,0x39,0x5a,0x30,0x14, 0x30,0x12,0x02,0x01,0x01,0x17,0x0d,0x30,0x37,0x30,0x39,0x30,0x31,0x30,0x30, -0x30,0x30,0x30,0x30,0x5a,0xa0,0x2d,0x30,0x2b,0x30,0x0a,0x06,0x03,0x55,0x1d, -0x14,0x04,0x03,0x02,0x01,0x01,0x30,0x1d,0x06,0x03,0x55,0x1d,0x23,0x04,0x16, -0x04,0x14,0x14,0x8c,0x16,0xbb,0xbe,0x70,0xa2,0x28,0x89,0xa0,0x58,0xff,0x98, -0xbd,0xa8,0x24,0x2b,0x8a,0xe9,0x9a,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86, -0xf7,0x0d,0x01,0x01,0x05,0x05,0x00,0x03,0x81,0x81,0x00,0x9b,0x2b,0x99,0x0d, -0x16,0x83,0x93,0x54,0x29,0x3a,0xa6,0x53,0x5d,0xf8,0xa6,0x73,0x9f,0x2a,0x45, -0x39,0x91,0xff,0x91,0x1c,0x27,0x06,0xe8,0xdb,0x72,0x3f,0x66,0x89,0x15,0x68, -0x55,0xd5,0x49,0x63,0xa6,0x00,0xe9,0x66,0x9c,0x97,0xf9,0xb3,0xb3,0x2b,0x1b, -0xc7,0x79,0x46,0xa8,0xd8,0x2b,0x78,0x27,0xa0,0x70,0x02,0x81,0xc6,0x40,0xb3, -0x76,0x32,0x65,0x4c,0xf8,0xff,0x1d,0x41,0x6e,0x16,0x09,0xa2,0x8a,0x7b,0x0c, -0xd0,0xa6,0x9b,0x61,0xa3,0x7c,0x02,0x91,0x79,0xdf,0x6a,0x5e,0x88,0x95,0x66, -0x33,0x17,0xcb,0x5a,0xd2,0xdc,0x89,0x05,0x62,0x97,0x60,0x73,0x7b,0x2c,0x1a, -0x90,0x20,0x73,0x24,0x9f,0x45,0x22,0x4b,0xc1,0x33,0xd1,0xda,0xd8,0x7e,0x1b, -0x3d,0x74,0xd6,0x3b }; +0x30,0x30,0x30,0x30,0x5a,0xa0,0x31,0x30,0x2f,0x30,0x0a,0x06,0x03,0x55,0x1d, +0x14,0x04,0x03,0x02,0x01,0x01,0x30,0x21,0x06,0x03,0x55,0x1d,0x23,0x04,0x1a, +0x30,0x18,0x80,0x16,0x04,0x14,0x14,0x8c,0x16,0xbb,0xbe,0x70,0xa2,0x28,0x89, +0xa0,0x58,0xff,0x98,0xbd,0xa8,0x24,0x2b,0x8a,0xe9,0x9a,0x30,0x0d,0x06,0x09, +0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05,0x00,0x03,0x81,0x81,0x00, +0x66,0x62,0xcd,0xcf,0x5e,0x70,0xa5,0xf2,0x5b,0x39,0x86,0x5c,0x93,0x7b,0xd2, +0xde,0x51,0x29,0x1e,0x87,0x0c,0xe1,0xae,0xfe,0xf6,0x34,0x64,0x5a,0xd7,0xa9, +0x7c,0xa0,0x7b,0x98,0x2c,0x39,0x3a,0x43,0x2a,0xd8,0xe4,0x5c,0x4b,0x3d,0x99, +0xbb,0x04,0x10,0xe8,0xe4,0xfa,0x26,0xf5,0x83,0x6f,0xf5,0x81,0x6a,0xf4,0x23, +0xd0,0x68,0x52,0x2b,0x62,0x7c,0xe8,0xb1,0x69,0x21,0x99,0x80,0xd7,0x2d,0x16, +0xd8,0x4f,0xf2,0xd9,0xac,0x99,0xf1,0xb5,0xbb,0xd0,0x5e,0xeb,0xa5,0x31,0x99, +0x79,0xd2,0x81,0x24,0x8c,0x64,0xc6,0xa7,0x3d,0x2f,0x77,0xa2,0x08,0xad,0x00, +0x8b,0x65,0xde,0x00,0x8b,0xd5,0x8e,0x29,0xb9,0xdf,0x9c,0x5c,0x57,0x76,0xe1, +0x17,0x4c,0x47,0x4b,0xfa,0xf2,0xa4,0x38 }; BOOL (WINAPI *pCertVerifyRevocation)(DWORD, DWORD, DWORD, void **, DWORD, PCERT_REVOCATION_PARA, PCERT_REVOCATION_STATUS);

1 0

Luke Benstead : user32: Implement PrintWindow.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 7fc8aed47f09849df0f6524eb9fbdcded8abfb9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc8aed47f09849df0f6524eb… Author: Luke Benstead <kazade(a)gmail.com> Date: Tue Dec 1 17:06:56 2009 +0000 user32: Implement PrintWindow. --- dlls/user32/painting.c | 15 +++++++++++++++ dlls/user32/user32.spec | 2 +- include/winuser.h | 3 +++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 4af522d..883b0c1 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1549,3 +1549,18 @@ BOOL WINAPI ScrollDC( HDC hdc, INT dx, INT dy, const RECT *lprcScroll, { return USER_Driver->pScrollDC( hdc, dx, dy, lprcScroll, lprcClip, hrgnUpdate, lprcUpdate ); } + +/************************************************************************ + * PrintWindow (USER32.@) + * + */ +BOOL WINAPI PrintWindow(HWND hwnd, HDC hdcBlt, UINT nFlags) +{ + UINT flags = PRF_CHILDREN | PRF_ERASEBKGND | PRF_OWNED | PRF_CLIENT; + if(!(nFlags & PW_CLIENTONLY)) + { + flags |= PRF_NONCLIENT; + } + SendMessageW(hwnd, WM_PRINT, (WPARAM)hdcBlt, flags); + return TRUE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 326aedb..8cdc24c 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -533,7 +533,7 @@ @ stdcall PostQuitMessage(long) @ stdcall PostThreadMessageA(long long long long) @ stdcall PostThreadMessageW(long long long long) -# @ stub PrintWindow +@ stdcall PrintWindow(long long long) @ stdcall PrivateExtractIconExA(str long ptr ptr long) @ stdcall PrivateExtractIconExW(wstr long ptr ptr long) @ stdcall PrivateExtractIconsA (str long long long ptr ptr long long) diff --git a/include/winuser.h b/include/winuser.h index e6b4741..91fca34 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1493,6 +1493,9 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define ENUM_CURRENT_SETTINGS ((DWORD) -1) #define ENUM_REGISTRY_SETTINGS ((DWORD) -2) +/* Used for PrintWindow */ +#define PW_CLIENTONLY 0x00000001 + /****** Window classes ******/ typedef struct tagCREATESTRUCTA

1 0

Jeremy White : winspool: Remove unvarying unicode parameter from WINSPOOL_GetStringFromReg.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: c0238d96b413e97133f284a644981e1e31fa8133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0238d96b413e97133f284a64… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Dec 1 10:46:27 2009 -0600 winspool: Remove unvarying unicode parameter from WINSPOOL_GetStringFromReg. --- dlls/winspool.drv/info.c | 96 +++++++++++++++++---------------------------- 1 files changed, 36 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0238d96b413e97133f28…

1 0

Jeremy White : winspool: Remove unvarying unicode parameter from WINSPOOL_GetDefaultDevMode.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 9d549a9c1326637f2a91e5b91ba8a1b8fa7fdd30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d549a9c1326637f2a91e5b91… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Dec 1 10:46:33 2009 -0600 winspool: Remove unvarying unicode parameter from WINSPOOL_GetDefaultDevMode. --- dlls/winspool.drv/info.c | 33 ++++++++++----------------------- 1 files changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f6d7eb2..694699f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3257,18 +3257,17 @@ static BOOL WINSPOOL_GetStringFromReg(HKEY hkey, LPCWSTR ValueName, LPBYTE ptr, static void WINSPOOL_GetDefaultDevMode( LPBYTE ptr, - DWORD buflen, DWORD *needed, - BOOL unicode) + DWORD buflen, DWORD *needed) { - DEVMODEA dm; - static const char szwps[] = "wineps.drv"; + DEVMODEW dm; + static const WCHAR szWwps[] = {'w', 'i', 'n', 'e', 'p', 's', '.', 'd', 'r', 'v', 0 }; /* fill default DEVMODE - should be read from ppd... */ ZeroMemory( &dm, sizeof(dm) ); - memcpy(dm.dmDeviceName,szwps,sizeof szwps); + memcpy(dm.dmDeviceName,szWwps,sizeof szWwps); dm.dmSpecVersion = DM_SPECVERSION; dm.dmDriverVersion = 1; - dm.dmSize = sizeof(DEVMODEA); + dm.dmSize = sizeof(DEVMODEW); dm.dmDriverExtra = 0; dm.dmFields = DM_ORIENTATION | DM_PAPERSIZE | @@ -3308,21 +3307,9 @@ static void WINSPOOL_GetDefaultDevMode( /* dm.dmPanningWidth */ /* dm.dmPanningHeight */ - if(unicode) { - if(buflen >= sizeof(DEVMODEW)) { - DEVMODEW *pdmW = GdiConvertToDevmodeW(&dm); - memcpy(ptr, pdmW, sizeof(DEVMODEW)); - HeapFree(GetProcessHeap(),0,pdmW); - } - *needed = sizeof(DEVMODEW); - } - else - { - if(buflen >= sizeof(DEVMODEA)) { - memcpy(ptr, &dm, sizeof(DEVMODEA)); - } - *needed = sizeof(DEVMODEA); - } + if(buflen >= sizeof(DEVMODEW)) + memcpy(ptr, &dm, sizeof(DEVMODEW)); + *needed = sizeof(DEVMODEW); } /***************************************************************************** @@ -3494,7 +3481,7 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, } else { - WINSPOOL_GetDefaultDevMode(ptr, left, &size, TRUE); + WINSPOOL_GetDefaultDevMode(ptr, left, &size); if(space && size <= left) { pi2->pDevMode = (LPDEVMODEW)ptr; ptr += size; @@ -3692,7 +3679,7 @@ static BOOL WINSPOOL_GetPrinter_9(HKEY hkeyPrinter, PRINTER_INFO_9W *pi9, LPBYTE } else { - WINSPOOL_GetDefaultDevMode(buf, cbBuf, &size, TRUE); + WINSPOOL_GetDefaultDevMode(buf, cbBuf, &size); if(space && size <= cbBuf) { pi9->pDevMode = (LPDEVMODEW)buf; } else

1 0

Jeremy White : winspool: Remove unvarying unicode parameter from WINSPOOL_GetDevModeFromReg.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: fa63234b52d32948b4a0aefa9bfd2cb45b2c8d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa63234b52d32948b4a0aefa9… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Dec 1 10:46:41 2009 -0600 winspool: Remove unvarying unicode parameter from WINSPOOL_GetDevModeFromReg. --- dlls/winspool.drv/info.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 694699f..ad99988 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3320,8 +3320,7 @@ static void WINSPOOL_GetDefaultDevMode( */ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName, LPBYTE ptr, - DWORD buflen, DWORD *needed, - BOOL unicode) + DWORD buflen, DWORD *needed) { DWORD sz = buflen, type; LONG ret; @@ -3337,13 +3336,11 @@ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName, /* ensures that dmSize is not erratically bogus if registry is invalid */ if (ptr && ((DEVMODEA*)ptr)->dmSize < sizeof(DEVMODEA)) ((DEVMODEA*)ptr)->dmSize = sizeof(DEVMODEA); - if(unicode) { - sz += (CCHDEVICENAME + CCHFORMNAME); - if(buflen >= sz) { - DEVMODEW *dmW = GdiConvertToDevmodeW((DEVMODEA*)ptr); - memcpy(ptr, dmW, sz); - HeapFree(GetProcessHeap(),0,dmW); - } + sz += (CCHDEVICENAME + CCHFORMNAME); + if(buflen >= sz) { + DEVMODEW *dmW = GdiConvertToDevmodeW((DEVMODEA*)ptr); + memcpy(ptr, dmW, sz); + HeapFree(GetProcessHeap(),0,dmW); } *needed = sz; return TRUE; @@ -3469,8 +3466,7 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, space = FALSE; *pcbNeeded += size; } - if(WINSPOOL_GetDevModeFromReg(hkeyPrinter, Default_DevModeW, ptr, left, - &size, TRUE)) { + if(WINSPOOL_GetDevModeFromReg(hkeyPrinter, Default_DevModeW, ptr, left, &size)) { if(space && size <= left) { pi2->pDevMode = (LPDEVMODEW)ptr; ptr += size; @@ -3670,7 +3666,7 @@ static BOOL WINSPOOL_GetPrinter_9(HKEY hkeyPrinter, PRINTER_INFO_9W *pi9, LPBYTE *pcbNeeded = 0; - if(WINSPOOL_GetDevModeFromReg(hkeyPrinter, Default_DevModeW, buf, cbBuf, &size, TRUE)) { + if(WINSPOOL_GetDevModeFromReg(hkeyPrinter, Default_DevModeW, buf, cbBuf, &size)) { if(space && size <= cbBuf) { pi9->pDevMode = (LPDEVMODEW)buf; } else

1 0

Hans Leidekker : wininet: Implement InternetQueryOption( INTERNET_OPTION_DATAFILE_NAME) for ftp file objects.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: be86c2976bcb42edaf51de5943af6fa51313e75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be86c2976bcb42edaf51de594… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 1 17:01:35 2009 +0100 wininet: Implement InternetQueryOption(INTERNET_OPTION_DATAFILE_NAME) for ftp file objects. --- dlls/wininet/ftp.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index ea5b355..48a7a95 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1133,8 +1133,39 @@ static DWORD FTPFILE_QueryOption(object_header_t *hdr, DWORD option, void *buffe *size = sizeof(DWORD); *(DWORD*)buffer = INTERNET_HANDLE_TYPE_FTP_FILE; return ERROR_SUCCESS; - } + case INTERNET_OPTION_DATAFILE_NAME: + { + DWORD required; + ftp_file_t *file = (ftp_file_t *)hdr; + + TRACE("INTERNET_OPTION_DATAFILE_NAME\n"); + + if (!file->cache_file) + { + *size = 0; + return ERROR_INTERNET_ITEM_NOT_FOUND; + } + if (unicode) + { + required = (lstrlenW(file->cache_file) + 1) * sizeof(WCHAR); + if (*size < required) + return ERROR_INSUFFICIENT_BUFFER; + *size = required; + memcpy(buffer, file->cache_file, *size); + return ERROR_SUCCESS; + } + else + { + required = WideCharToMultiByte(CP_ACP, 0, file->cache_file, -1, NULL, 0, NULL, NULL); + if (required > *size) + return ERROR_INSUFFICIENT_BUFFER; + + *size = WideCharToMultiByte(CP_ACP, 0, file->cache_file, -1, buffer, *size, NULL, NULL); + return ERROR_SUCCESS; + } + } + } return INET_QueryOption(option, buffer, size, unicode); }

1 0

Juan Lang : crypt32: Further fix test failures.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 9c56314e3d49da01162b49e09557963786e29c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c56314e3d49da01162b49e09… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 1 08:09:30 2009 -0800 crypt32: Further fix test failures. --- dlls/crypt32/tests/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index e4b70eb..4192e11 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3407,7 +3407,7 @@ static ChainCheck chainCheckEmbeddedNullBroken = { { sizeof(chain27) / sizeof(chain27[0]), chain27 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, - CERT_TRUST_HAS_PREFERRED_ISSUER }, + CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS | CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, 1, simpleStatus27Broken },

1 0

Jeremy White : winspool: Revise EnumPrinterDriversW to fix the incorrect handling of 'all'. EnumPrinterDriversA is similarly fixed by using EnumPrinterDriversW.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 10e70fbd180f4c2ed6e52d6b1e9b46b51d9f918c URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e70fbd180f4c2ed6e52d6b1… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Dec 1 10:46:07 2009 -0600 winspool: Revise EnumPrinterDriversW to fix the incorrect handling of 'all'. EnumPrinterDriversA is similarly fixed by using EnumPrinterDriversW. --- dlls/winspool.drv/info.c | 169 +++++++++++++++++++++++----------------- dlls/winspool.drv/tests/info.c | 2 - 2 files changed, 96 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10e70fbd180f4c2ed6e52…

1 0

Jeremy White : winspool: Remove unvarying unicode parameter from WINSPOOL_GetDriverInfoFromReg.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 108230c19e400c6f43a5d040fbccd0e917214f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108230c19e400c6f43a5d040f… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Dec 1 10:46:13 2009 -0600 winspool: Remove unvarying unicode parameter from WINSPOOL_GetDriverInfoFromReg. --- dlls/winspool.drv/info.c | 128 ++++++++++++++++------------------------------ 1 files changed, 45 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=108230c19e400c6f43a5d…

1 0

Jeremy White : winspool: Remove unvarying unicode parameter from WINSPOOL_GetPrinter_[1-9].
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: b378e0a3d488b7da62c93b204b503ae7a703cb25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b378e0a3d488b7da62c93b204… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Dec 1 10:46:20 2009 -0600 winspool: Remove unvarying unicode parameter from WINSPOOL_GetPrinter_[1-9]. --- dlls/winspool.drv/info.c | 88 ++++++++++++++++++++------------------------- 1 files changed, 39 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b378e0a3d488b7da62c93…

1 0