June 2006 - Wine-Commits - list.winehq.org

Juan Lang : crypt32: Correct CRL tests, and fix CRL encoding/ decoding accordingly.
by Alexandre Julliard June 16, 2006

June 16, 2006

Module: wine Branch: refs/heads/master Commit: bc2d4a71b4672d05af0be0af0ad4f632d702ae1b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc2d4a71b4672d05af0be0a… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Jun 15 09:48:12 2006 -0700 crypt32: Correct CRL tests, and fix CRL encoding/decoding accordingly. --- dlls/crypt32/decode.c | 7 ++-- dlls/crypt32/encode.c | 11 ++++-- dlls/crypt32/tests/encode.c | 79 ++++++++++++++++++++----------------------- 3 files changed, 48 insertions(+), 49 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index cd0e644..c40583d 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -957,10 +957,9 @@ static BOOL WINAPI CRYPT_AsnDecodeCRLInf { ASN_SEQUENCEOF, offsetof(CRL_INFO, cCRLEntry), CRYPT_AsnDecodeCRLEntries, sizeof(struct GenericArray), TRUE, TRUE, offsetof(CRL_INFO, rgCRLEntry), 0 }, - /* Note that the extensions are ignored by MS, so I'll ignore them too - */ - { 0, offsetof(CRL_INFO, cExtension), NULL, - sizeof(CERT_EXTENSIONS), TRUE, FALSE, 0 }, + { ASN_CONTEXT | ASN_CONSTRUCTOR | 0, offsetof(CRL_INFO, cExtension), + CRYPT_AsnDecodeCertExtensions, sizeof(CERT_EXTENSIONS), TRUE, TRUE, + offsetof(CRL_INFO, rgExtension), 0 }, }; ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index cd8b997..bc00ecf 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -675,7 +675,8 @@ static BOOL WINAPI CRYPT_AsnEncodeCRLInf { &info->ThisUpdate, CRYPT_AsnEncodeChoiceOfTime, 0 }, { 0 } }; - DWORD cItem = 4; + struct AsnConstructedItem constructed[1] = { { 0 } }; + DWORD cItem = 4, cConstructed = 0; if (info->NextUpdate.dwLowDateTime || info->NextUpdate.dwHighDateTime) { @@ -691,8 +692,12 @@ static BOOL WINAPI CRYPT_AsnEncodeCRLInf } if (info->cExtension) { - items[cItem].pvStructInfo = &info->cExtension; - items[cItem].encodeFunc = CRYPT_AsnEncodeExtensions; + constructed[cConstructed].tag = 0; + constructed[cConstructed].pvStructInfo = &info->cExtension; + constructed[cConstructed].encodeFunc = CRYPT_AsnEncodeExtensions; + items[cItem].pvStructInfo = &constructed[cConstructed]; + items[cItem].encodeFunc = CRYPT_AsnEncodeConstructed; + cConstructed++; cItem++; } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index f587bbd..42d8c0e 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2590,23 +2590,27 @@ static const BYTE v1CRLWithIssuerAndEntr 0x31, 0x36, 0x30, 0x31, 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x30, 0x16, 0x30, 0x14, 0x02, 0x01, 0x01, 0x18, 0x0f, 0x31, 0x36, 0x30, 0x31, 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a }; -static const BYTE v1CRLWithExt[] = { 0x30, 0x5a, 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, 0x18, 0x0f, 0x31, 0x36, - 0x30, 0x31, 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, - 0x30, 0x2c, 0x30, 0x2a, 0x02, 0x01, 0x01, 0x18, 0x0f, 0x31, 0x36, 0x30, 0x31, - 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 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 v2CRLWithExt[] = { 0x30, 0x5a, 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, 0x18, - 0x0f, 0x31, 0x36, 0x30, 0x31, 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, - 0x30, 0x30, 0x5a, 0x30, 0x29, 0x30, 0x27, 0x02, 0x01, 0x01, 0x18, 0x0f, 0x31, - 0x36, 0x30, 0x31, 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, - 0x5a, 0x30, 0x11, 0x30, 0x0f, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x04, 0x08, 0x30, - 0x06, 0x01, 0x01, 0xff, 0x02, 0x01, 0x01 }; - +static const BYTE v1CRLWithEntryExt[] = { 0x30,0x5a,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,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31, + 0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x2c,0x30,0x2a,0x02,0x01, + 0x01,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30, + 0x30,0x30,0x5a,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 v1CRLWithExt[] = { 0x30,0x5c,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,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30, + 0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x16,0x30,0x14,0x02,0x01,0x01, + 0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30, + 0x30,0x5a,0xa0,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 v2CRLWithExt[] = { 0x30,0x5c,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,0x18,0x0f,0x31,0x36,0x30,0x31, + 0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x16,0x30,0x14, + 0x02,0x01,0x01,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30, + 0x30,0x30,0x30,0x30,0x5a,0xa0,0x13,0x30,0x11,0x30,0x0f,0x06,0x03,0x55,0x1d, + 0x13,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01 }; static void test_encodeCRLToBeSigned(DWORD dwEncoding) { @@ -2690,13 +2694,26 @@ static void test_encodeCRLToBeSigned(DWO ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (buf) { + ok(size == sizeof(v1CRLWithEntryExt), "Wrong size %ld\n", size); + ok(!memcmp(buf, v1CRLWithEntryExt, size), "Got unexpected value\n"); + LocalFree(buf); + } + /* a CRL with an extension */ + entry.cExtension = 0; + info.cExtension = 1; + info.rgExtension = &criticalExt; + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + if (buf) + { ok(size == sizeof(v1CRLWithExt), "Wrong size %ld\n", size); ok(!memcmp(buf, v1CRLWithExt, size), "Got unexpected value\n"); LocalFree(buf); } /* a v2 CRL with an extension, this time non-critical */ info.dwVersion = CRL_V2; - entry.rgExtension = &nonCriticalExt; + info.rgExtension = &nonCriticalExt; ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); @@ -2852,10 +2869,7 @@ static void test_decodeCRLToBeSigned(DWO "Wrong issuer size %ld\n", info->Issuer.cbData); ok(!memcmp(info->Issuer.pbData, encodedCommonName, info->Issuer.cbData), "Unexpected issuer\n"); - /* Oddly, the extensions don't seem to be decoded. Is this just an MS - * bug, or am I missing something? - */ - ok(info->cExtension == 0, "Expected 0 extensions, got %ld\n", + ok(info->cExtension == 1, "Expected 1 extensions, got %ld\n", info->cExtension); } ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, @@ -2864,27 +2878,8 @@ static void test_decodeCRLToBeSigned(DWO if (buf) { CRL_INFO *info = (CRL_INFO *)buf; - CRL_ENTRY *entry; - ok(size >= sizeof(CRL_INFO), "Wrong size %ld\n", size); - ok(info->cCRLEntry == 1, "Expected 1 CRL entries, got %ld\n", - info->cCRLEntry); - ok(info->rgCRLEntry != NULL, "Expected a valid CRL entry array\n"); - entry = info->rgCRLEntry; - ok(entry->SerialNumber.cbData == 1, - "Expected serial number size 1, got %ld\n", - entry->SerialNumber.cbData); - ok(*entry->SerialNumber.pbData == *serialNum, - "Expected serial number %d, got %d\n", *serialNum, - *entry->SerialNumber.pbData); - ok(info->Issuer.cbData == sizeof(encodedCommonName), - "Wrong issuer size %ld\n", info->Issuer.cbData); - ok(!memcmp(info->Issuer.pbData, encodedCommonName, info->Issuer.cbData), - "Unexpected issuer\n"); - /* Oddly, the extensions don't seem to be decoded. Is this just an MS - * bug, or am I missing something? - */ - ok(info->cExtension == 0, "Expected 0 extensions, got %ld\n", + ok(info->cExtension == 1, "Expected 1 extensions, got %ld\n", info->cExtension); LocalFree(buf); }

1 0

Ulrich Czekalla : hlink: Fix typo. We should set hl not ppvObj.
by Alexandre Julliard June 16, 2006

June 16, 2006

Module: wine Branch: refs/heads/master Commit: 62e41ad1fda1f684b8d7aaf2227d001389ca405c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=62e41ad1fda1f684b8d7aaf… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Thu Jun 15 12:16:39 2006 -0400 hlink: Fix typo. We should set hl not ppvObj. --- dlls/hlink/hlink_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 9a535d7..aeec28c 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -83,7 +83,7 @@ HRESULT WINAPI HlinkCreateFromMoniker( I debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter, debugstr_guid(riid), ppvObj); - r = CoCreateInstance(&CLSID_StdHlink, piunkOuter, CLSCTX_INPROC_SERVER, riid, ppvObj); + r = CoCreateInstance(&CLSID_StdHlink, piunkOuter, CLSCTX_INPROC_SERVER, riid, (LPVOID*)&hl); if (FAILED(r)) return r;

1 0

H. Verbeet : wined3d: Add and use GL_EXT_fog_coord defines.
by Alexandre Julliard June 16, 2006

June 16, 2006

Module: wine Branch: refs/heads/master Commit: 701ce97d6557e47dc7023645e772bacdac3afb0e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=701ce97d6557e47dc702364… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Jun 16 00:24:46 2006 +0200 wined3d: Add and use GL_EXT_fog_coord defines. --- dlls/wined3d/device.c | 28 ++++++++++++++-------------- dlls/wined3d/drawprim.c | 12 ++++++------ include/wine/wined3d_gl.h | 11 +++++++++++ 3 files changed, 31 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=701ce97d6557e47dc70…

1 0

Alexandre Julliard : x11drv: Renamed the x11drv directory to winex11.drv.
by Alexandre Julliard June 16, 2006

June 16, 2006

Module: wine Branch: refs/heads/master Commit: bdb4fab7a71a790bf63d2a287350c7dfbf540e2b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bdb4fab7a71a790bf63d2a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 09:57:50 2006 +0200 x11drv: Renamed the x11drv directory to winex11.drv. --- configure | 4 configure.ac | 2 dlls/Makefile.in | 12 dlls/make_dlls | 6 dlls/winex11.drv/.gitignore | 1 dlls/winex11.drv/Makefile.in | 51 dlls/winex11.drv/bitblt.c | 1640 ++++++++++++ dlls/winex11.drv/bitmap.c | 488 ++++ dlls/winex11.drv/brush.c | 330 ++ dlls/winex11.drv/clipboard.c | 3054 +++++++++++++++++++++++ dlls/winex11.drv/clipping.c | 125 + dlls/winex11.drv/codepage.c | 763 ++++++ dlls/winex11.drv/dce.c | 651 +++++ dlls/winex11.drv/desktop.c | 189 + dlls/winex11.drv/dga2.c | 331 ++ dlls/winex11.drv/dga2.h | 42 dlls/winex11.drv/dib.c | 4974 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/dib_convert.c | 1428 +++++++++++ dlls/winex11.drv/dib_dst_swap.c | 1573 ++++++++++++ dlls/winex11.drv/dib_src_swap.c | 1518 +++++++++++ dlls/winex11.drv/event.c | 976 +++++++ dlls/winex11.drv/graphics.c | 1374 ++++++++++ dlls/winex11.drv/init.c | 441 +++ dlls/winex11.drv/keyboard.c | 2523 +++++++++++++++++++ dlls/winex11.drv/mouse.c | 882 +++++++ dlls/winex11.drv/mwm.h | 79 + dlls/winex11.drv/opengl.c | 692 +++++ dlls/winex11.drv/palette.c | 1287 ++++++++++ dlls/winex11.drv/pen.c | 116 + dlls/winex11.drv/scroll.c | 192 + dlls/winex11.drv/settings.c | 323 ++ dlls/winex11.drv/text.c | 243 ++ dlls/winex11.drv/window.c | 1285 ++++++++++ dlls/winex11.drv/winex11.drv.spec | 129 + dlls/winex11.drv/winpos.c | 1808 +++++++++++++ dlls/winex11.drv/wintab.c | 1203 +++++++++ dlls/winex11.drv/x11ddraw.c | 447 +++ dlls/winex11.drv/x11ddraw.h | 55 dlls/winex11.drv/x11drv.h | 704 +++++ dlls/winex11.drv/x11drv_main.c | 603 ++++ dlls/winex11.drv/x11font.h | 249 ++ dlls/winex11.drv/xdnd.c | 570 ++++ dlls/winex11.drv/xfont.c | 3432 ++++++++++++++++++++++++++ dlls/winex11.drv/xim.c | 593 ++++ dlls/winex11.drv/xrandr.c | 329 ++ dlls/winex11.drv/xrandr.h | 33 dlls/winex11.drv/xrender.c | 1692 +++++++++++++ dlls/winex11.drv/xvidmode.c | 406 +++ dlls/winex11.drv/xvidmode.h | 42 dlls/x11drv/.gitignore | 1 dlls/x11drv/Makefile.in | 51 dlls/x11drv/bitblt.c | 1640 ------------ dlls/x11drv/bitmap.c | 488 ---- dlls/x11drv/brush.c | 330 -- dlls/x11drv/clipboard.c | 3054 ----------------------- dlls/x11drv/clipping.c | 125 - dlls/x11drv/codepage.c | 763 ------ dlls/x11drv/dce.c | 651 ----- dlls/x11drv/desktop.c | 189 - dlls/x11drv/dga2.c | 331 -- dlls/x11drv/dga2.h | 42 dlls/x11drv/dib.c | 4974 ------------------------------------- dlls/x11drv/dib_convert.c | 1428 ----------- dlls/x11drv/dib_dst_swap.c | 1573 ------------ dlls/x11drv/dib_src_swap.c | 1518 ----------- dlls/x11drv/event.c | 976 ------- dlls/x11drv/graphics.c | 1374 ---------- dlls/x11drv/init.c | 441 --- dlls/x11drv/keyboard.c | 2523 ------------------- dlls/x11drv/mouse.c | 882 ------- dlls/x11drv/mwm.h | 79 - dlls/x11drv/opengl.c | 692 ----- dlls/x11drv/palette.c | 1287 ---------- dlls/x11drv/pen.c | 116 - dlls/x11drv/scroll.c | 192 - dlls/x11drv/settings.c | 323 -- dlls/x11drv/text.c | 243 -- dlls/x11drv/window.c | 1285 ---------- dlls/x11drv/winex11.drv.spec | 129 - dlls/x11drv/winpos.c | 1808 ------------- dlls/x11drv/wintab.c | 1203 --------- dlls/x11drv/x11ddraw.c | 447 --- dlls/x11drv/x11ddraw.h | 55 dlls/x11drv/x11drv.h | 704 ----- dlls/x11drv/x11drv_main.c | 603 ---- dlls/x11drv/x11font.h | 249 -- dlls/x11drv/xdnd.c | 570 ---- dlls/x11drv/xfont.c | 3432 -------------------------- dlls/x11drv/xim.c | 593 ---- dlls/x11drv/xrandr.c | 329 -- dlls/x11drv/xrandr.h | 33 dlls/x11drv/xrender.c | 1692 ------------- dlls/x11drv/xvidmode.c | 406 --- dlls/x11drv/xvidmode.h | 42 94 files changed, 39872 insertions(+), 39884 deletions(-) create mode 100644 dlls/winex11.drv/.gitignore create mode 100644 dlls/winex11.drv/Makefile.in create mode 100644 dlls/winex11.drv/bitblt.c create mode 100644 dlls/winex11.drv/bitmap.c create mode 100644 dlls/winex11.drv/brush.c create mode 100644 dlls/winex11.drv/clipboard.c create mode 100644 dlls/winex11.drv/clipping.c create mode 100644 dlls/winex11.drv/codepage.c create mode 100644 dlls/winex11.drv/dce.c create mode 100644 dlls/winex11.drv/desktop.c create mode 100644 dlls/winex11.drv/dga2.c create mode 100644 dlls/winex11.drv/dga2.h create mode 100644 dlls/winex11.drv/dib.c create mode 100644 dlls/winex11.drv/dib_convert.c create mode 100644 dlls/winex11.drv/dib_dst_swap.c create mode 100644 dlls/winex11.drv/dib_src_swap.c create mode 100644 dlls/winex11.drv/event.c create mode 100644 dlls/winex11.drv/graphics.c create mode 100644 dlls/winex11.drv/init.c create mode 100644 dlls/winex11.drv/keyboard.c create mode 100644 dlls/winex11.drv/mouse.c create mode 100644 dlls/winex11.drv/mwm.h create mode 100644 dlls/winex11.drv/opengl.c create mode 100644 dlls/winex11.drv/palette.c create mode 100644 dlls/winex11.drv/pen.c create mode 100644 dlls/winex11.drv/scroll.c create mode 100644 dlls/winex11.drv/settings.c create mode 100644 dlls/winex11.drv/text.c create mode 100644 dlls/winex11.drv/window.c create mode 100644 dlls/winex11.drv/winex11.drv.spec create mode 100644 dlls/winex11.drv/winpos.c create mode 100644 dlls/winex11.drv/wintab.c create mode 100644 dlls/winex11.drv/x11ddraw.c create mode 100644 dlls/winex11.drv/x11ddraw.h create mode 100644 dlls/winex11.drv/x11drv.h create mode 100644 dlls/winex11.drv/x11drv_main.c create mode 100644 dlls/winex11.drv/x11font.h create mode 100644 dlls/winex11.drv/xdnd.c create mode 100644 dlls/winex11.drv/xfont.c create mode 100644 dlls/winex11.drv/xim.c create mode 100644 dlls/winex11.drv/xrandr.c create mode 100644 dlls/winex11.drv/xrandr.h create mode 100644 dlls/winex11.drv/xrender.c create mode 100644 dlls/winex11.drv/xvidmode.c create mode 100644 dlls/winex11.drv/xvidmode.h delete mode 100644 dlls/x11drv/.gitignore delete mode 100644 dlls/x11drv/Makefile.in delete mode 100644 dlls/x11drv/bitblt.c delete mode 100644 dlls/x11drv/bitmap.c delete mode 100644 dlls/x11drv/brush.c delete mode 100644 dlls/x11drv/clipboard.c delete mode 100644 dlls/x11drv/clipping.c delete mode 100644 dlls/x11drv/codepage.c delete mode 100644 dlls/x11drv/dce.c delete mode 100644 dlls/x11drv/desktop.c delete mode 100644 dlls/x11drv/dga2.c delete mode 100644 dlls/x11drv/dga2.h delete mode 100644 dlls/x11drv/dib.c delete mode 100644 dlls/x11drv/dib_convert.c delete mode 100644 dlls/x11drv/dib_dst_swap.c delete mode 100644 dlls/x11drv/dib_src_swap.c delete mode 100644 dlls/x11drv/event.c delete mode 100644 dlls/x11drv/graphics.c delete mode 100644 dlls/x11drv/init.c delete mode 100644 dlls/x11drv/keyboard.c delete mode 100644 dlls/x11drv/mouse.c delete mode 100644 dlls/x11drv/mwm.h delete mode 100644 dlls/x11drv/opengl.c delete mode 100644 dlls/x11drv/palette.c delete mode 100644 dlls/x11drv/pen.c delete mode 100644 dlls/x11drv/scroll.c delete mode 100644 dlls/x11drv/settings.c delete mode 100644 dlls/x11drv/text.c delete mode 100644 dlls/x11drv/window.c delete mode 100644 dlls/x11drv/winex11.drv.spec delete mode 100644 dlls/x11drv/winpos.c delete mode 100644 dlls/x11drv/wintab.c delete mode 100644 dlls/x11drv/x11ddraw.c delete mode 100644 dlls/x11drv/x11ddraw.h delete mode 100644 dlls/x11drv/x11drv.h delete mode 100644 dlls/x11drv/x11drv_main.c delete mode 100644 dlls/x11drv/x11font.h delete mode 100644 dlls/x11drv/xdnd.c delete mode 100644 dlls/x11drv/xfont.c delete mode 100644 dlls/x11drv/xim.c delete mode 100644 dlls/x11drv/xrandr.c delete mode 100644 dlls/x11drv/xrandr.h delete mode 100644 dlls/x11drv/xrender.c delete mode 100644 dlls/x11drv/xvidmode.c delete mode 100644 dlls/x11drv/xvidmode.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bdb4fab7a71a790bf63…

1 0

appdb/. distributionView.php
by WineHQ June 16, 2006

June 16, 2006

ChangeSet ID: 25773 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/15 22:31:00 Modified files: . : distributionView.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Don't expose email addresses to robots on the distribution page Patch: http://cvs.winehq.org/patch.py?id=25773 Old revision New revision Changes Path 1.7 1.8 +8 -3 appdb/distributionView.php Index: appdb/distributionView.php diff -u -p appdb/distributionView.php:1.7 appdb/distributionView.php:1.8 --- appdb/distributionView.php:1.7 16 Jun 2006 3:31: 0 -0000 +++ appdb/distributionView.php 16 Jun 2006 3:31: 0 -0000 @@ -131,9 +131,14 @@ else echo '<td><a href="'.BASE.'appview.php?versionId='.$oTest->iVersionId.'&iTestingId='.$oTest->iTestingId.'">',"\n"; echo $oApp->sName.' '.$oVersion->sName.'</a></td>',"\n"; echo '<td>',"\n"; - echo $oSubmitter->sEmail ? "<a href=\"mailto:".$oSubmitter->sEmail."\">":""; - echo $oSubmitter->sRealname; - echo $oSubmitter->sEmail ? "</a>":""; + if($_SESSION['current']->isLoggedIn()) + { + echo $oSubmitter->sEmail ? "<a href=\"mailto:".$oSubmitter->sEmail."\">":""; + echo $oSubmitter->sRealname; + echo $oSubmitter->sEmail ? "</a>":""; + } + else + echo $oSubmitter->sRealname; echo '</td>',"\n"; echo '<td>'.date("M d Y", mysqltimestamp_to_unixtimestamp($oTest->sSubmitTime)).'</td>',"\n"; echo '<td>'.$oTest->sTestedRelease.'&nbsp</td>',"\n";

1 0

appdb/include comment.php
by WineHQ June 16, 2006

June 16, 2006

ChangeSet ID: 25772 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/15 22:18:46 Modified files: include : comment.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Don't expose users email addresses to robots Patch: http://cvs.winehq.org/patch.py?id=25772 Old revision New revision Changes Path 1.15 1.16 +4 -1 appdb/include/comment.php Index: appdb/include/comment.php diff -u -p appdb/include/comment.php:1.15 appdb/include/comment.php:1.16 --- appdb/include/comment.php:1.15 16 Jun 2006 3:18:46 -0000 +++ appdb/include/comment.php 16 Jun 2006 3:18:46 -0000 @@ -194,7 +194,10 @@ function forum_lookup_user($iUserId) if ($iUserId > 0) { $oUser = new User($iUserId); - $sMailto = '<a href="mailto:' . $oUser->sEmail . '">' . $oUser->sRealname . '</a>'; + if($_SESSION['current']->isLoggedIn()) + $sMailto = '<a href="mailto:' . $oUser->sEmail . '">' . $oUser->sRealname . '</a>'; + else + $sMailto = $oUser->sRealname; } if (!$iUserId || !$oUser->isLoggedIn()) {

1 0

appdb/. account.php
by WineHQ June 16, 2006

June 16, 2006

ChangeSet ID: 25771 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/15 21:04:33 Modified files: . : account.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Prevent users from creating accounts with a blank username Patch: http://cvs.winehq.org/patch.py?id=25771 Old revision New revision Changes Path 1.16 1.17 +2 -1 appdb/account.php Index: appdb/account.php diff -u -p appdb/account.php:1.16 appdb/account.php:1.17 --- appdb/account.php:1.16 16 Jun 2006 2: 4:33 -0000 +++ appdb/account.php 16 Jun 2006 2: 4:33 -0000 @@ -93,7 +93,8 @@ function cmd_do_new() retry("new", "Passwords don't match"); return; } - if(!isset($_POST['ext_realname'])) + $_POST['ext_realname']=trim($_POST['ext_realname']); + if(empty($_POST['ext_realname'])) { retry("new", "You don't have a Real name?"); return;

1 0

appdb/. account.php
by WineHQ June 16, 2006

June 16, 2006

ChangeSet ID: 25770 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/15 21:03:12 Modified files: . : account.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix session current cookie being corrupted when creating a user and the user exists. Patch: http://cvs.winehq.org/patch.py?id=25770 Old revision New revision Changes Path 1.15 1.16 +0 -1 appdb/account.php Index: appdb/account.php diff -u -p appdb/account.php:1.15 appdb/account.php:1.16 --- appdb/account.php:1.15 16 Jun 2006 2: 3:12 -0000 +++ appdb/account.php 16 Jun 2006 2: 3:12 -0000 @@ -114,7 +114,6 @@ function cmd_do_new() } else { - $_SESSION['current'] = ""; retry("new", "Failed to create account"); } }

1 0

Mikołaj Zalewski : notepad: Pl.rc: Fix the ellipsis in menu.
by Alexandre Julliard June 15, 2006

June 15, 2006

Module: wine Branch: refs/heads/master Commit: 35b7a813f694d02325518d1df9d836e58896b584 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35b7a813f694d02325518d1… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jun 15 15:30:13 2006 +0200 notepad: Pl.rc: Fix the ellipsis in menu. --- programs/notepad/Pl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/Pl.rc b/programs/notepad/Pl.rc index e2e5105..e91ebd8 100644 --- a/programs/notepad/Pl.rc +++ b/programs/notepad/Pl.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT MAIN_MENU MENU { POPUP "&Plik" { - MENUITEM "&Nowy...", CMD_NEW - MENUITEM "&Otw�rz\tCtrl+O", CMD_OPEN + MENUITEM "&Nowy", CMD_NEW + MENUITEM "&Otw�rz...\tCtrl+O", CMD_OPEN MENUITEM "&Zapisz\tCtrl+S", CMD_SAVE MENUITEM "Z&apisz jako...", CMD_SAVE_AS MENUITEM SEPARATOR

1 0

Huw Davies : printing: Don' t limit the printer name length to CCHDEVICENAME characters.
by Alexandre Julliard June 15, 2006

June 15, 2006

Module: wine Branch: refs/heads/master Commit: 7afe18ec27d4f9ba31b2130c0529b5d7678f0549 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7afe18ec27d4f9ba31b2130… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 15 11:36:00 2006 +0100 printing: Don't limit the printer name length to CCHDEVICENAME characters. --- dlls/wineps.drv/init.c | 12 ++++++++++-- dlls/winspool.drv/info.c | 21 +++++++-------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index ca749af..f50d4f5 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -302,7 +302,7 @@ BOOL PSDRV_CreateDC( HDC hdc, PSDRV_PDEV { PSDRV_PDEVICE *physDev; PRINTERINFO *pi; - char deviceA[CCHDEVICENAME]; + char *deviceA; /* If no device name was specified, retrieve the device name * from the DEVMODE structure from the DC's physDev. @@ -310,12 +310,20 @@ BOOL PSDRV_CreateDC( HDC hdc, PSDRV_PDEV if ( !device && *pdev ) { physDev = *pdev; + deviceA = HeapAlloc(GetProcessHeap(), 0, CCHDEVICENAME); lstrcpynA(deviceA, (LPCSTR)physDev->Devmode->dmPublic.dmDeviceName, CCHDEVICENAME); } else - WideCharToMultiByte(CP_ACP, 0, device, -1, deviceA, sizeof(deviceA), NULL, NULL); + { + DWORD len = WideCharToMultiByte(CP_ACP, 0, device, -1, NULL, 0, NULL, NULL); + deviceA = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(CP_ACP, 0, device, -1, deviceA, len, NULL, NULL); + } pi = PSDRV_FindPrinterInfo(deviceA); + HeapFree(GetProcessHeap(), 0, deviceA); + deviceA = NULL; + TRACE("(%s %s %s %p)\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), initData); diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index dc8bd79..9d6e1c0 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2032,13 +2032,6 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, SetLastError(ERROR_INVALID_LEVEL); return 0; } - if (strlenW(pi->pPrinterName) >= CCHDEVICENAME) { - ERR("Printername %s must not exceed length of DEVMODE.dmDeviceName !\n", - debugstr_w(pi->pPrinterName) - ); - SetLastError(ERROR_INVALID_LEVEL); - return 0; - } if(!pPrinter) { SetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -2109,19 +2102,19 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, dmW = pi->pDevMode; else { - dmW = HeapAlloc(GetProcessHeap(), 0, size); + dmW = HeapAlloc(GetProcessHeap(), 0, size); ZeroMemory(dmW,size); - dmW->dmSize = size; - if (0>DocumentPropertiesW(0,0,pi->pPrinterName,dmW,NULL,DM_OUT_BUFFER)) + dmW->dmSize = size; + if (0>DocumentPropertiesW(0,0,pi->pPrinterName,dmW,NULL,DM_OUT_BUFFER)) { - WARN("DocumentPropertiesW on printer '%s' failed!\n", debugstr_w(pi->pPrinterName)); + WARN("DocumentPropertiesW on printer '%s' failed!\n", debugstr_w(pi->pPrinterName)); HeapFree(GetProcessHeap(),0,dmW); dmW=NULL; - } + } else { - /* set devmode to printer name */ - strcpyW(dmW->dmDeviceName,pi->pPrinterName); + /* set devmode to printer name */ + lstrcpynW(dmW->dmDeviceName, pi->pPrinterName, CCHDEVICENAME); } }

1 0