wine-commits October 2007

wine-commits@winehq.org

4 participants
996 discussions

Juan Lang : crypt32: Add another test to show that time validity nesting isn't checked.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: a5de2742e70cdb8374fe549e4c3950fddb68541f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5de2742e70cdb8374fe549e4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 10 14:46:01 2007 -0700 crypt32: Add another test to show that time validity nesting isn't checked. --- dlls/crypt32/tests/chain.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 14b5993..695147c 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1033,6 +1033,38 @@ static const BYTE chain12_0[] = { 0x59,0xe6,0xed,0x7b,0x8b,0xec,0xcc,0x27,0x56,0xa1,0x0e,0x73,0xe7,0x37,0x20, 0x97,0x27,0x12,0xed,0x9f,0xe9,0xec,0x44,0xde,0x3f,0x07,0xa4,0x07,0x42,0x5b, 0x7e,0xe5,0xe1,0x42,0x10,0x4c,0x38,0xd7,0x2b,0xff }; +/* chain0_0 -> chain13_1: + * A chain whose time validity nesting is invalid. + */ +static const BYTE chain13_1[] = { +0x30,0x82,0x01,0x93,0x30,0x81,0xfd,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,0x36,0x30,0x31,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,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,0x85,0xc9,0xc5,0x08,0x0b,0xb1, +0xff,0x58,0x8f,0xee,0x66,0x5f,0xa3,0x77,0x63,0x9f,0xd1,0x53,0x03,0xdc,0xf6, +0x59,0x08,0x02,0x1f,0xdc,0x52,0x5a,0x52,0x38,0xa4,0x0b,0x83,0x12,0x19,0xd6, +0xb5,0xb8,0x81,0x17,0xcd,0x10,0x5d,0x96,0x16,0x9d,0x51,0x5b,0xf9,0x31,0x3e, +0x36,0xac,0x30,0xd5,0xd6,0xa0,0x30,0x5c,0x9c,0xcb,0xe1,0x02,0xfd,0x73,0xc3, +0xa1,0x58,0xfe,0x12,0xb0,0xa6,0xbd,0x11,0x86,0xdb,0x20,0x17,0x29,0x1e,0x09, +0x63,0x4d,0x28,0xe4,0x55,0x2d,0xa1,0x78,0xde,0x28,0x0b,0x1b,0x35,0x40,0x4c, +0xf1,0xb0,0x6e,0x82,0x34,0x2b,0x7f,0x3b,0x2e,0x27,0x6b,0xf7,0xde,0x73,0x9a, +0x98,0xac,0x79,0x33,0x1a,0xdd,0x03,0x95,0x60,0x8a,0x08,0xba,0xcb,0x8a,0xbf, +0xea,0xe3 }; typedef struct _CONST_DATA_BLOB { @@ -1385,6 +1417,18 @@ static const CERT_TRUST_STATUS elementStatus12[] = { static const SimpleChainStatusCheck simpleStatus12[] = { { sizeof(elementStatus12) / sizeof(elementStatus12[0]), elementStatus12 }, }; +static CONST_DATA_BLOB chain13[] = { + { sizeof(chain0_0), chain0_0 }, + { sizeof(chain13_1), chain13_1 }, +}; +static const CERT_TRUST_STATUS elementStatus13[] = { + { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, +}; +static const SimpleChainStatusCheck simpleStatus13[] = { + { sizeof(elementStatus13) / sizeof(elementStatus13[0]), elementStatus13 }, +}; static CONST_DATA_BLOB selfSignedChain[] = { { sizeof(selfSignedCert), selfSignedCert } }; @@ -1473,6 +1517,10 @@ static ChainCheck chainCheck[] = { { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus12 }, 0 }, + { { sizeof(chain13) / sizeof(chain13[0]), chain13 }, + { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus13 }, + 0 }, { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 },

1 0

Juan Lang : crypt32: Remove superficially different certificates.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 0d544f9510e49c39f8181ad5703f79941fcb66bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d544f9510e49c39f8181ad57… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 10 14:44:04 2007 -0700 crypt32: Remove superficially different certificates. --- dlls/crypt32/tests/chain.c | 133 +++----------------------------------------- 1 files changed, 8 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d544f9510e49c39f8181…

1 0

Juan Lang : crypt32: Allow imprecision of one millisecond in time decoding to fix test failures on Windows .
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: e6dbb9d2037956de2af6ab0d8f3b420ee953f78f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6dbb9d2037956de2af6ab0d8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 10 14:40:20 2007 -0700 crypt32: Allow imprecision of one millisecond in time decoding to fix test failures on Windows. --- dlls/crypt32/tests/encode.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 65b6a0f..421b236 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -482,17 +482,31 @@ static const char *printFileTime(const FILETIME *ft) return buf; } +static void compareTime(const SYSTEMTIME *expected, const FILETIME *got) +{ + SYSTEMTIME st; + + FileTimeToSystemTime(got, &st); + ok(expected->wYear == st.wYear && + expected->wMonth == st.wMonth && + expected->wDay == st.wDay && + expected->wHour == st.wHour && + expected->wMinute == st.wMinute && + expected->wSecond == st.wSecond && + abs(expected->wMilliseconds - st.wMilliseconds) <= 1, + "Got unexpected value for time decoding:\nexpected %s, got %s\n", + printSystemTime(expected), printFileTime(got)); +} + static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType, const struct encodedFiletime *time) { - FILETIME ft1 = { 0 }, ft2 = { 0 }; - DWORD size = sizeof(ft2); + FILETIME ft = { 0 }; + DWORD size = sizeof(ft); BOOL ret; - ret = SystemTimeToFileTime(&time->sysTime, &ft1); - ok(ret, "SystemTimeToFileTime failed: %d\n", GetLastError()); ret = CryptDecodeObjectEx(dwEncoding, structType, time->encodedTime, - time->encodedTime[1] + 2, 0, NULL, &ft2, &size); + time->encodedTime[1] + 2, 0, NULL, &ft, &size); /* years other than 1950-2050 are not allowed for encodings other than * X509_CHOICE_OF_TIME. */ @@ -501,9 +515,7 @@ static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType, { ok(ret, "CryptDecodeObjectEx failed: %d (0x%08x)\n", GetLastError(), GetLastError()); - ok(!memcmp(&ft1, &ft2, sizeof(ft1)), - "Got unexpected value for time decoding:\nexpected %s, got %s\n", - printSystemTime(&time->sysTime), printFileTime(&ft2)); + compareTime(&time->sysTime, &ft); } else ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG,

1 0

David Adam : d3dx8: Fix the definition of D3DXVECTOR.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 076340402d78e7761514a4b0111380e165a4c6af URL: http://source.winehq.org/git/wine.git/?a=commit;h=076340402d78e7761514a4b01… Author: David Adam <jeremielapuree(a)yahoo.fr> Date: Thu Oct 11 17:48:49 2007 +0200 d3dx8: Fix the definition of D3DXVECTOR. --- include/d3dx8math.h | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 452eb05..71de014 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -34,10 +34,7 @@ typedef struct D3DXVECTOR2 FLOAT x, y; } D3DXVECTOR2, *LPD3DXVECTOR2; -typedef struct D3DXVECTOR3 -{ - FLOAT x, y, z; -} D3DXVECTOR3, *LPD3DXVECTOR3; +typedef struct _D3DVECTOR D3DXVECTOR3, *LPD3DXVECTOR3; typedef struct D3DXVECTOR4 {

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: fda899a7786a6d940cb1c0e2bdbdfa590d12eea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda899a7786a6d940cb1c0e2b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 11 18:31:26 2007 +0200 Assorted spelling fixes. --- dlls/advapi32/tests/security.c | 2 +- dlls/wined3d/pixelshader.c | 2 +- dlls/winex11.drv/dib.c | 4 ++-- programs/wineboot/wineboot.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3583a4d..15fdf49 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1981,7 +1981,7 @@ static void test_ConvertSecurityDescriptorToString() return; } -/* It seems Windows XP add an extra character to the length of the string for each ACE in an ACL. We +/* It seems Windows XP adds an extra character to the length of the string for each ACE in an ACL. We * don't replicate this feature so we only test len >= strlen+1. */ #define CHECK_RESULT_AND_FREE(exp_str) \ ok(strcmp(string, (exp_str)) == 0, "String mismatch (expected \"%s\", got \"%s\")\n", (exp_str), string); \ diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 8b2977b..a7de7e9 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -632,7 +632,7 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_CompileShader(IWineD3DPixelShader /* FIXME: validate reg_maps against OpenGL */ } - /* Reset fields tracking stateblock values beeing hardcoded in the shader */ + /* Reset fields tracking stateblock values being hardcoded in the shader */ This->baseShader.num_sampled_samplers = 0; /* Generate the HW shader */ diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 153c967..da0edb9 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3621,7 +3621,7 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) #ifdef HAVE_LIBXXSHM - /* We must not call XShmGetImage() with a bitmap which is bigger than the avilable area. + /* We must not call XShmGetImage() with a bitmap which is bigger than the available area. If we do, XShmGetImage() will fail (X exception), as it checks for this internally. */ if((descr->image && descr->useShm) && (bmpImage->width <= (descr->width - descr->xSrc)) && (bmpImage->height <= (descr->height - descr->ySrc))) @@ -3988,7 +3988,7 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, height = descr.lines; if (height < 0) height = -height; if( lines > height ) lines = height; - /* Top-down images have a negative biHeight, the scanlines of theses images + /* Top-down images have a negative biHeight, the scanlines of these images * were inverted in X11DRV_DIB_GetImageBits_xx * To prevent this we simply change the sign of lines * (the number of scan lines to copy). diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 27babc7..7172c89 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -19,7 +19,7 @@ /* Wine "bootup" handler application * * This app handles the various "hooks" windows allows for applications to perform - * as part of the bootstrap process. Theses are roughly devided into three types. + * as part of the bootstrap process. These are roughly divided into three types. * Knowledge base articles that explain this are 137367, 179365, 232487 and 232509. * Also, 119941 has some info on grpconv.exe * The operations performed are (by order of execution):

1 0

Francois Gouget : pdh/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 63a87554575bfffdbaa1e5ce50fa6b14bb9f28f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63a87554575bfffdbaa1e5ce5… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 11 18:33:40 2007 +0200 pdh/tests: Fix compilation on systems that don't support nameless unions. --- dlls/pdh/tests/pdh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 7a9770d..f0a33fa 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -845,7 +845,7 @@ static void test_PdhCollectQueryDataEx(void) status = PdhGetFormattedCounterValue( counter, PDH_FMT_LARGE, NULL, &value ); ok(status == ERROR_SUCCESS, "PdhGetFormattedCounterValue failed 0x%08x\n", status); - trace( "uptime %x%08x\n", (DWORD)(value.largeValue >> 32), (DWORD)value.largeValue ); + trace( "uptime %x%08x\n", (DWORD)(U(value).largeValue >> 32), (DWORD)U(value).largeValue ); } }

1 0

Francois Gouget : comctl32/tests: Fix the control' s size reporting in an error message.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: c76362afdd2ea6c42b8fbb7a8da063e00b8f80e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c76362afdd2ea6c42b8fbb7a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 11 18:33:25 2007 +0200 comctl32/tests: Fix the control's size reporting in an error message. --- dlls/comctl32/tests/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 2069df0..92a5714 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1309,7 +1309,7 @@ static void test_customdraw(void) GetClientRect(hWndHeader, &rect); ok(rect.right - rect.left == 670 && rect.bottom - rect.top == 18, "Tests will fail as header size is %dx%d instead of 670x18\n", - rect.right - rect.left == 670, rect.bottom - rect.top == 18); + rect.right - rect.left, rect.bottom - rect.top); for (i = 0; i < 3; i++) {

1 0

Francois Gouget : user32/tests: Don' t use nameless unions where they are not needed.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 6fc6b23287eb131b2a2b4febebe3671a25952def URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc6b23287eb131b2a2b4febe… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 11 18:33:16 2007 +0200 user32/tests: Don't use nameless unions where they are not needed. --- dlls/user32/tests/msg.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 82dd503..a73e6b9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -65,7 +65,7 @@ typedef struct UINT state : 16; /* ODS_* flags */ } item; LPARAM lp; - }; + } u; } DRAW_ITEM_STRUCT; static BOOL test_DestroyWindow_flag; @@ -6303,13 +6303,13 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam trace("WM_DRAWITEM: type %x, ctl_id %x, item_id %x, action %x, state %x\n", dis->CtlType, dis->CtlID, dis->itemID, dis->itemAction, dis->itemState); - di.item.type = dis->CtlType; - di.item.ctl_id = dis->CtlID; - di.item.item_id = dis->itemID; - di.item.action = dis->itemAction; - di.item.state = dis->itemState; + di.u.item.type = dis->CtlType; + di.u.item.ctl_id = dis->CtlID; + di.u.item.item_id = dis->itemID; + di.u.item.action = dis->itemAction; + di.u.item.state = dis->itemState; - lParam = di.lp; + lParam = di.u.lp; break; } }

1 0

Francois Gouget : winex11.drv: Add the trailing '\n' to a Wine trace.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 0b67c0a6e16c87fb8f6d89362f203526889be614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b67c0a6e16c87fb8f6d89362… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 11 18:33:32 2007 +0200 winex11.drv: Add the trailing '\n' to a Wine trace. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c45fa68..c510a3b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1484,7 +1484,7 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev, } } else { - FIXME("called on a non-window, non-bitmap object?"); + FIXME("called on a non-window, non-bitmap object?\n"); } physDev->current_pf = iPixelFormat;

1 0

Francois Gouget : winex11.drv: Remove an obsolete FIXME comment.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: e396288ec5e35b68b703470e95618ba6772f55e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e396288ec5e35b68b703470e9… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 11 18:32:55 2007 +0200 winex11.drv: Remove an obsolete FIXME comment. --- dlls/winex11.drv/dib.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 9f402ef..153c967 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -510,7 +510,6 @@ static void X11DRV_DIB_SetImageBits_1( int lines, const BYTE *srcbits, /* ==== pal 1 dib -> any bmp format ==== */ for (h = lines-1; h >=0; h--) { srcbyte=srcbits; - /* FIXME: should avoid putting x<left pixels (minor speed issue) */ for (i = width/8, x = left; i > 0; i--) { srcval=*srcbyte++; XPutPixel( bmpImage, x++, h, colors[ srcval >> 7] );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2007