October 2008 - Wine-commits

Juan Lang : wintrust: Add tests for WVTAsn1CatMemberInfoEncode.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 52751981ad8b3befa6b4b5d2f443583f43e8f803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52751981ad8b3befa6b4b5d2f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 17 14:06:26 2008 -0700 wintrust: Add tests for WVTAsn1CatMemberInfoEncode. --- dlls/wintrust/tests/asn.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index a3557e7..28cc6f6 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -464,6 +464,76 @@ static void test_decodeSPCPEImage(void) } } +static WCHAR foo[] = { 'f','o','o',0 }; +static WCHAR guidStr[] = { '{','8','b','c','9','6','b','0','0','-', + '8','d','a','1','-','1','1','c','f','-','8','7','3','6','-','0','0', + 'a','a','0','0','a','4','8','5','e','b','}',0 }; + +static const BYTE emptyCatMemberInfo[] = { 0x30,0x05,0x1e,0x00,0x02,0x01,0x00 }; +static const BYTE catMemberInfoWithSillyGuid[] = { +0x30,0x0b,0x1e,0x06,0x00,0x66,0x00,0x6f,0x00,0x6f,0x02,0x01,0x00 }; +static const BYTE catMemberInfoWithGuid[] = { +0x30,0x51,0x1e,0x4c,0x00,0x7b,0x00,0x38,0x00,0x62,0x00,0x63,0x00,0x39,0x00,0x36, +0x00,0x62,0x00,0x30,0x00,0x30,0x00,0x2d,0x00,0x38,0x00,0x64,0x00,0x61,0x00,0x31, +0x00,0x2d,0x00,0x31,0x00,0x31,0x00,0x63,0x00,0x66,0x00,0x2d,0x00,0x38,0x00,0x37, +0x00,0x33,0x00,0x36,0x00,0x2d,0x00,0x30,0x00,0x30,0x00,0x61,0x00,0x61,0x00,0x30, +0x00,0x30,0x00,0x61,0x00,0x34,0x00,0x38,0x00,0x35,0x00,0x65,0x00,0x62,0x00,0x7d, +0x02,0x01,0x00 }; + +static void test_encodeCatMemberInfo(void) +{ + CAT_MEMBERINFO info; + BOOL ret; + DWORD size = 0; + LPBYTE buf; + + memset(&info, 0, sizeof(info)); + + if (!pCryptEncodeObjectEx) + { + skip("CryptEncodeObjectEx() is not available. Skipping the encodeCatMemberInfo tests\n"); + return; + } + + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, + &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(emptyCatMemberInfo), "Unexpected size %d\n", size); + ok(!memcmp(buf, emptyCatMemberInfo, sizeof(emptyCatMemberInfo)), + "Unexpected value\n"); + LocalFree(buf); + } + info.pwszSubjGuid = foo; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, + (LPBYTE)&info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(catMemberInfoWithSillyGuid), "Unexpected size %d\n", + size); + ok(!memcmp(buf, catMemberInfoWithSillyGuid, + sizeof(catMemberInfoWithSillyGuid)), "Unexpected value\n"); + LocalFree(buf); + } + info.pwszSubjGuid = guidStr; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, + (LPBYTE)&info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(catMemberInfoWithGuid), "Unexpected size %d\n", + size); + ok(!memcmp(buf, catMemberInfoWithGuid, sizeof(catMemberInfoWithGuid)), + "Unexpected value\n"); + LocalFree(buf); + } +} + START_TEST(asn) { HMODULE hCrypt32 = LoadLibraryA("crypt32.dll"); @@ -474,6 +544,7 @@ START_TEST(asn) test_decodeSPCLink(); test_encodeSPCPEImage(); test_decodeSPCPEImage(); + test_encodeCatMemberInfo(); FreeLibrary(hCrypt32); }

1 0

Juan Lang : wintrust: Add stub for WVTAsn1CatMemberInfoEncode.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 4ffb8a2318a8cb35724e53f206f7e1fc5313f587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ffb8a2318a8cb35724e53f20… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 17 11:42:43 2008 -0700 wintrust: Add stub for WVTAsn1CatMemberInfoEncode. --- dlls/wintrust/asn.c | 9 +++++++++ dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 09285bc..76ac8a8 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -738,6 +738,15 @@ BOOL WINAPI WVTAsn1SpcIndirectDataContentEncode(DWORD dwCertEncodingType, return ret; } +BOOL WINAPI WVTAsn1CatMemberInfoEncode(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + FIXME("(0x%08x, %s, %p, %p, %p): stub\n", dwCertEncodingType, + debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); + return FALSE; +} + /* Gets the number of length bytes from the given (leading) length byte */ #define GET_LEN_BYTES(b) ((b) <= 0x7f ? 1 : 1 + ((b) & 0x7f)) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index a9d0857..35e1b2f 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -87,7 +87,7 @@ @ stub WTHelperOpenKnownStores @ stdcall WTHelperProvDataFromStateData(ptr) @ stub WVTAsn1CatMemberInfoDecode -@ stub WVTAsn1CatMemberInfoEncode +@ stdcall WVTAsn1CatMemberInfoEncode(long str ptr ptr ptr) @ stub WVTAsn1CatNameValueDecode @ stub WVTAsn1CatNameValueEncode @ stub WVTAsn1SpcFinancialCriteriaInfoDecode

1 0

Nicolas Le Cam : netapi32/tests: Fix a failing test on localized Windows.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 7526b88013d7879f4a7d2cfc9dc51e9bd7874b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7526b88013d7879f4a7d2cfc9… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Oct 16 23:53:36 2008 +0200 netapi32/tests: Fix a failing test on localized Windows. --- dlls/netapi32/tests/access.c | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 01c4896..1cc71b9 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -170,9 +170,7 @@ static void run_usergetinfo_tests(void) trace("Deleting the test user failed. You might have to manually delete it.\n"); } -/* checks Level 1 of NetQueryDisplayInformation - * FIXME: Needs to be rewritten to not depend on the spelling of the users, - * ideally based on the admin and guest user SIDs/RIDs.*/ +/* Checks Level 1 of NetQueryDisplayInformation */ static void run_querydisplayinformation1_tests(void) { PNET_DISPLAY_USER Buffer, rec; @@ -180,9 +178,6 @@ static void run_querydisplayinformation1_tests(void) DWORD i = 0; BOOL hasAdmin = FALSE; BOOL hasGuest = FALSE; - static const WCHAR sAdminUserName[] = {'A','d','m','i','n','i','s','t','r','a', - 't','o','r',0}; - static const WCHAR sGuestUserName[] = {'G','u','e','s','t',0}; do { @@ -195,24 +190,18 @@ static void run_querydisplayinformation1_tests(void) rec = Buffer; for(; EntryCount > 0; EntryCount--) { - if (!lstrcmpW(rec->usri1_name, sAdminUserName)) + if (rec->usri1_user_id == DOMAIN_USER_RID_ADMIN) { ok(!hasAdmin, "One admin user\n"); ok(rec->usri1_flags & UF_SCRIPT, "UF_SCRIPT flag is set\n"); ok(rec->usri1_flags & UF_NORMAL_ACCOUNT, "UF_NORMAL_ACCOUNT flag is set\n"); - ok(rec->usri1_user_id == DOMAIN_USER_RID_ADMIN, - "Expected DOMAIN_USER_RID_ADMIN, got %u\n", - rec->usri1_user_id); hasAdmin = TRUE; } - else if (!lstrcmpW(rec->usri1_name, sGuestUserName)) + else if (rec->usri1_user_id == DOMAIN_USER_RID_GUEST) { ok(!hasGuest, "One guest record\n"); ok(rec->usri1_flags & UF_SCRIPT, "UF_SCRIPT flag is set\n"); ok(rec->usri1_flags & UF_NORMAL_ACCOUNT, "UF_NORMAL_ACCOUNT flag is set\n"); - ok(rec->usri1_user_id == DOMAIN_USER_RID_GUEST, - "Expected DOMAIN_USER_RID_GUEST, got %u\n", - rec->usri1_user_id); hasGuest = TRUE; }

1 0

Jacek Caban : jscript: Added Number.valueOf implementation.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: f30de9b9fc454c8cb76c26854f6e1089837ab1cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30de9b9fc454c8cb76c26854… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 17 17:04:45 2008 -0500 jscript: Added Number.valueOf implementation. --- dlls/jscript/number.c | 29 +++++++++++++++++------------ dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 598de42..d909cdb 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -105,8 +105,18 @@ static HRESULT Number_toPrecision(DispatchEx *dispex, LCID lcid, WORD flags, DIS static HRESULT Number_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_NUMBER)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + NumberInstance *number = (NumberInstance*)dispex; + *retv = number->num; + } + return S_OK; } static HRESULT Number_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -198,19 +208,13 @@ static HRESULT NumberConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DIS case DISPATCH_CONSTRUCT: { DispatchEx *obj; - switch(arg_cnt(dp)) { - case 0: - V_VT(&num) = VT_I4; - V_I4(&num) = 0; - break; - case 1: + if(arg_cnt(dp)) { hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &num); if(FAILED(hres)) return hres; - break; - default: - FIXME("unimplemented args\n"); - return E_NOTIMPL; + }else { + V_VT(&num) = VT_I4; + V_I4(&num) = 0; } hres = create_number(dispex->ctx, &num, &obj); @@ -258,6 +262,7 @@ HRESULT create_number_constr(script_ctx_t *ctx, DispatchEx **ret) if(FAILED(hres)) return hres; + V_VT(&number->num) = VT_I4; hres = create_builtin_function(ctx, NumberConstr_value, PROPF_CONSTR, &number->dispex, ret); jsdisp_release(&number->dispex); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 3bb3ddf..602b7df 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -362,6 +362,15 @@ ok(Number() === 0, "Number() = " + Number()); ok(Number(false) === 0, "Number(false) = " + Number(false)); ok(Number("43") === 43, "Number('43') = " + Number("43")); +tmp = (new Number(1)).valueOf(); +ok(tmp === 1, "(new Number(1)).valueOf = " + tmp); +tmp = (new Number(1,2)).valueOf(); +ok(tmp === 1, "(new Number(1,2)).valueOf = " + tmp); +tmp = (new Number()).valueOf(); +ok(tmp === 0, "(new Number()).valueOf = " + tmp); +tmp = Number.prototype.valueOf(); +ok(tmp === 0, "Number.prototype.valueOf = " + tmp); + tmp = Math.min(1); ok(tmp === 1, "Math.min(1) = " + tmp);

1 0

Reece Dunn : include: data_size on GetPrivateData should be a pointer type since it is an in/ out parameter.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 5044f57ce6fdc005bd11a7faf1f89125ea20df3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5044f57ce6fdc005bd11a7faf… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Fri Oct 17 20:56:11 2008 +0100 include: data_size on GetPrivateData should be a pointer type since it is an in/out parameter. --- include/dxgi.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index 8cba615..c14ef2c 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -107,7 +107,7 @@ interface IDXGIObject : IUnknown ); HRESULT GetPrivateData( [in] REFGUID guid, - [in, out] UINT data_size, + [in, out] UINT *data_size, [out] void *data ); HRESULT GetParent(

1 0

Nicolas Le Cam : netapi32/tests: Add a test for well known account RIDs.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 72d764f60e3eb6815e68cc414282f950d57747a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d764f60e3eb6815e68cc414… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Oct 16 23:47:31 2008 +0200 netapi32/tests: Add a test for well known account RIDs. --- dlls/netapi32/tests/access.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 3999bdd..5b5e330 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -200,6 +200,9 @@ static void run_querydisplayinformation1_tests(void) ok(!hasAdmin, "One admin user\n"); ok(rec->usri1_flags & UF_SCRIPT, "UF_SCRIPT flag is set\n"); ok(rec->usri1_flags & UF_NORMAL_ACCOUNT, "UF_NORMAL_ACCOUNT flag is set\n"); + ok(rec->usri1_user_id == DOMAIN_USER_RID_ADMIN, + "Expected DOMAIN_USER_RID_ADMIN, got %u\n", + rec->usri1_user_id); hasAdmin = TRUE; } else if (!lstrcmpW(rec->usri1_name, sGuestUserName)) @@ -207,6 +210,10 @@ static void run_querydisplayinformation1_tests(void) ok(!hasGuest, "One guest record\n"); ok(rec->usri1_flags & UF_SCRIPT, "UF_SCRIPT flag is set\n"); ok(rec->usri1_flags & UF_NORMAL_ACCOUNT, "UF_NORMAL_ACCOUNT flag is set\n"); + todo_wine + ok(rec->usri1_user_id == DOMAIN_USER_RID_GUEST, + "Expected DOMAIN_USER_RID_GUEST, got %u\n", + rec->usri1_user_id); hasGuest = TRUE; }

1 0

Nicolas Le Cam : netapi32: Fix well known account RIDs in NetQueryDisplayInformation Level 1.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 6a7017e41fb610dc0e53cbc910ae03240358f001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7017e41fb610dc0e53cbc91… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Oct 16 23:51:02 2008 +0200 netapi32: Fix well known account RIDs in NetQueryDisplayInformation Level 1. --- dlls/netapi32/access.c | 4 ++-- dlls/netapi32/tests/access.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 4244827..84d280b 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -514,7 +514,7 @@ static void ACCESS_QueryAdminDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD p usr->usri1_comment[0] = 0; usr->usri1_flags = UF_SCRIPT | UF_NORMAL_ACCOUNT | UF_DONT_EXPIRE_PASSWD; usr->usri1_full_name[0] = 0; - usr->usri1_user_id = 500; + usr->usri1_user_id = DOMAIN_USER_RID_ADMIN; usr->usri1_next_index = 0; } @@ -554,7 +554,7 @@ static void ACCESS_QueryGuestDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD p usr->usri1_flags = UF_ACCOUNTDISABLE | UF_SCRIPT | UF_NORMAL_ACCOUNT | UF_DONT_EXPIRE_PASSWD; usr->usri1_full_name[0] = 0; - usr->usri1_user_id = 500; + usr->usri1_user_id = DOMAIN_USER_RID_GUEST; usr->usri1_next_index = 0; } diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 5b5e330..01c4896 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -210,7 +210,6 @@ static void run_querydisplayinformation1_tests(void) ok(!hasGuest, "One guest record\n"); ok(rec->usri1_flags & UF_SCRIPT, "UF_SCRIPT flag is set\n"); ok(rec->usri1_flags & UF_NORMAL_ACCOUNT, "UF_NORMAL_ACCOUNT flag is set\n"); - todo_wine ok(rec->usri1_user_id == DOMAIN_USER_RID_GUEST, "Expected DOMAIN_USER_RID_GUEST, got %u\n", rec->usri1_user_id);

1 0

Alexandre Julliard : Convert remaining source files to utf-8.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 7f327237bf45f00161802360f7fa1a139db9f473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f327237bf45f00161802360f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 18 19:23:08 2008 +0200 Convert remaining source files to utf-8. --- dlls/d3d8/tests/visual.c | 2 +- dlls/dbghelp/stack.c | 2 +- dlls/gdi32/dispdib.c | 2 +- dlls/msvfw32/msvideo_main.c | 2 +- dlls/mswsock/mswsock.c | 2 +- dlls/shlwapi/ordinal.c | 2 +- dlls/winmm/mmio.c | 2 +- dlls/winspool.drv/tests/info.c | 2 +- loader/kthread.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 33d6176..efead14 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2005 Henri Verbeet - * Copyright (C) 2007 Stefan D�singer(for CodeWeavers) + * Copyright (C) 2007 Stefan Dösinger(for CodeWeavers) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 04f36fb..3c66fcb 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -3,7 +3,7 @@ * * Copyright 1995 Alexandre Julliard * Copyright 1996 Eric Youngdale - * Copyright 1999 Ove K�ven + * Copyright 1999 Ove Kåven * Copyright 2004 Eric Pouech * * This library is free software; you can redistribute it and/or diff --git a/dlls/gdi32/dispdib.c b/dlls/gdi32/dispdib.c index 6e5219e..0d46f65 100644 --- a/dlls/gdi32/dispdib.c +++ b/dlls/gdi32/dispdib.c @@ -1,7 +1,7 @@ /* * DISPDIB.dll * - * Copyright 1998 Ove K�ven (with some help from Marcus Meissner) + * Copyright 1998 Ove Kåven (with some help from Marcus Meissner) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index a135db2..fa02716 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1,7 +1,7 @@ /* * Copyright 1998 Marcus Meissner * Copyright 2000 Bradley Baetz - * Copyright 2003 Michael G�nnewig + * Copyright 2003 Michael Günnewig * Copyright 2005 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or diff --git a/dlls/mswsock/mswsock.c b/dlls/mswsock/mswsock.c index e82f2e3..7998e5a 100644 --- a/dlls/mswsock/mswsock.c +++ b/dlls/mswsock/mswsock.c @@ -1,7 +1,7 @@ /* * MSWSOCK specific functions * - * Copyright (C) 2003 Andr� Johansen + * Copyright (C) 2003 André Johansen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 7b6ae22..be6b0da 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2,7 +2,7 @@ * SHLWAPI ordinal functions * * Copyright 1997 Marcus Meissner - * 1998 J�rgen Schmied + * 1998 Jürgen Schmied * 2001-2003 Jon Griffiths * * This library is free software; you can redistribute it and/or diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 4bad745..60b6d0f 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -2,7 +2,7 @@ * MMIO functions * * Copyright 1998 Andrew Taylor - * Copyright 1998 Ove K�ven + * Copyright 1998 Ove Kåven * Copyright 2000,2002 Eric Pouech * * This library is free software; you can redistribute it and/or diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index e2fd941..d1f4dea 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -342,7 +342,7 @@ static void test_AddMonitor(void) { /* The Test is deactivated, because when mi2a.pName is NULL, the subkey HKLM\System\CurrentControlSet\Control\Print\Monitors\C:\WINDOWS\SYSTEM - or HKLM\System\CurrentControlSet\Control\Print\Monitors\� + or HKLM\System\CurrentControlSet\Control\Print\Monitors\ì is created on win9x and we do not want to hit this bug here. */ mi2a.pEnvironment = entry->env; diff --git a/loader/kthread.c b/loader/kthread.c index cc51cc0..acfa10f 100644 --- a/loader/kthread.c +++ b/loader/kthread.c @@ -4,7 +4,7 @@ * We can't use pthreads directly, so why not let libcs * that want pthreads use Wine's own threading instead... * - * Copyright 1999 Ove K�ven + * Copyright 1999 Ove Kåven * Copyright 2003 Alexandre Julliard * * This library is free software; you can redistribute it and/or

1 0

Dylan Smith : richedit: Added test for auto scroll behaviour with redraw disabled.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 2271226bfd8b1ef01438291f307be677e6ad8e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2271226bfd8b1ef01438291f3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Oct 17 14:07:16 2008 -0400 richedit: Added test for auto scroll behaviour with redraw disabled. --- dlls/riched20/tests/editor.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 08b913b..63fb440 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5537,6 +5537,37 @@ static void test_word_wrap(void) DestroyWindow(hwnd); } +static void test_auto_yscroll(void) +{ + HWND hwnd = new_richedit(NULL); + int lines, ret, redraw; + POINT pt; + + for (redraw = 0; redraw <= 1; redraw++) { + trace("testing with WM_SETREDRAW=%d\n", redraw); + SendMessage(hwnd, WM_SETREDRAW, redraw, 0); + SendMessage(hwnd, EM_REPLACESEL, 0, (LPARAM)"1\n2\n3\n4\n5\n6\n7\n8"); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines == 8, "%d lines instead of 8\n", lines); + ret = SendMessage(hwnd, EM_GETSCROLLPOS, 0, (LPARAM)&pt); + ok(ret == 1, "EM_GETSCROLLPOS returned %d instead of 1\n", ret); + if (!redraw) + todo_wine ok(pt.y != 0, "Didn't scroll down after replacing text.\n"); + else + ok(pt.y != 0, "Didn't scroll down after replacing text.\n"); + + SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM)NULL); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines == 1, "%d lines instead of 1\n", lines); + ret = SendMessage(hwnd, EM_GETSCROLLPOS, 0, (LPARAM)&pt); + ok(ret == 1, "EM_GETSCROLLPOS returned %d instead of 1\n", ret); + ok(pt.y == 0, "y scroll position is %d after clearing text.\n", pt.y); + } + + SendMessage(hwnd, WM_SETREDRAW, TRUE, 0); + DestroyWindow(hwnd); +} + START_TEST( editor ) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -5585,6 +5616,7 @@ START_TEST( editor ) test_EM_CHARFROMPOS(); test_SETPARAFORMAT(); test_word_wrap(); + test_auto_yscroll(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Reece Dunn : include: Fixed the tom constant values.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: a9581adeac43fb4fce919a0b2399fabf8a519ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9581adeac43fb4fce919a0b2… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Fri Oct 17 20:41:38 2008 +0100 include: Fixed the tom constant values. --- include/tom.idl | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/tom.idl b/include/tom.idl index 28a71a7..669fbcf 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -32,8 +32,8 @@ typedef enum tagTomConstants tomApplyLater = 1, tomTrackParms = 2, tomCacheParms = 3, - tomBackward = 0xc00000001, - tomForward = 0x3ffffffff, + tomBackward = 0xc0000001, + tomForward = 0x3fffffff, tomMove = 0, tomExtend = 1, tomNoSelection = 0, @@ -161,21 +161,21 @@ typedef enum tagTomConstants tomText = 0x2, tomHTML = 0x3, tomWordDocument = 0x4, - tomBold = 0x800000001, - tomItalic = 0x800000002, - tomUnderline = 0x800000004, - tomStrikeout = 0x800000008, - tomProtected = 0x800000010, - tomLink = 0x800000020, - tomSmallCaps = 0x800000040, - tomAllCaps = 0x800000080, - tomHidden = 0x800000100, - tomOutline = 0x800000200, - tomShadow = 0x800000400, - tomEmboss = 0x800000800, - tomImprint = 0x800001000, - tomDisabled = 0x800002000, - tomRevised = 0x800004000, + tomBold = 0x80000001, + tomItalic = 0x80000002, + tomUnderline = 0x80000004, + tomStrikeout = 0x80000008, + tomProtected = 0x80000010, + tomLink = 0x80000020, + tomSmallCaps = 0x80000040, + tomAllCaps = 0x80000080, + tomHidden = 0x80000100, + tomOutline = 0x80000200, + tomShadow = 0x80000400, + tomEmboss = 0x80000800, + tomImprint = 0x80001000, + tomDisabled = 0x80002000, + tomRevised = 0x80004000, tomNormalCaret = 0, tomKoreanBlockCaret = 0x1, tomIncludeInset = 0x1,

1 0