wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Austin English : makefiles: sysconfdir is unused.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 5d5f267e090df465ff018a13888f89c42c4a62cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5f267e090df465ff018a138… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jul 28 11:48:02 2011 -0700 makefiles: sysconfdir is unused. --- Make.vars.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index bc0ca36..10d74e8 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -8,7 +8,6 @@ datarootdir = @datarootdir@ datadir = @datadir@ infodir = @infodir@ mandir = @mandir@ -sysconfdir = @sysconfdir@ fontdir = $(datadir)/wine/fonts includedir = @includedir@/wine dlldir = @libdir@/wine

1 0

Alexandre Julliard : rpcrt4: Support sizing of a few more argument types.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 976cd5c9fee029ab0eb8190f738a80ab6703fe4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=976cd5c9fee029ab0eb8190f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 29 12:08:47 2011 +0200 rpcrt4: Support sizing of a few more argument types. --- dlls/rpcrt4/ndr_stubless.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 243a0af..4e00269 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -150,6 +150,7 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) switch(*pFormat) { case RPC_FC_STRUCT: + case RPC_FC_PSTRUCT: size = *(const WORD*)(pFormat + 2); break; case RPC_FC_BOGUS_STRUCT: @@ -178,6 +179,15 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) size = ComplexStructSize(pStubMsg, pFormat); size *= pStubMsg->MaxCount; break; + case RPC_FC_USER_MARSHAL: + size = *(const WORD*)(pFormat + 4); + break; + case RPC_FC_CSTRING: + size = *(const WORD*)(pFormat + 2); + break; + case RPC_FC_WSTRING: + size = *(const WORD*)(pFormat + 2) * sizeof(WCHAR); + break; case RPC_FC_C_CSTRING: case RPC_FC_C_WSTRING: if (*pFormat == RPC_FC_C_CSTRING)

1 0

Alexandre Julliard : rpcrt4: Add a phase in proxies for zeroing output parameters on startup.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 2bdff697338cc559580a863e3c2e85d5a292f761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bdff697338cc559580a863e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 22:43:12 2011 +0200 rpcrt4: Add a phase in proxies for zeroing output parameters on startup. --- dlls/rpcrt4/ndr_stubless.c | 162 ++++++++++++++++++++++++-------------------- 1 files changed, 89 insertions(+), 73 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 017be5d..243a0af 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -144,6 +144,62 @@ static inline void call_freer(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemor if (m) m(pStubMsg, pMemory, pFormat); } +static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) +{ + DWORD size; + switch(*pFormat) + { + case RPC_FC_STRUCT: + size = *(const WORD*)(pFormat + 2); + break; + case RPC_FC_BOGUS_STRUCT: + size = *(const WORD*)(pFormat + 2); + if(*(const WORD*)(pFormat + 4)) + FIXME("Unhandled conformant description\n"); + break; + case RPC_FC_CARRAY: + case RPC_FC_CVARRAY: + size = *(const WORD*)(pFormat + 2); + ComputeConformance(pStubMsg, NULL, pFormat + 4, 0); + size *= pStubMsg->MaxCount; + break; + case RPC_FC_SMFARRAY: + case RPC_FC_SMVARRAY: + size = *(const WORD*)(pFormat + 2); + break; + case RPC_FC_LGFARRAY: + case RPC_FC_LGVARRAY: + size = *(const DWORD*)(pFormat + 2); + break; + case RPC_FC_BOGUS_ARRAY: + pFormat = ComputeConformance(pStubMsg, NULL, pFormat + 4, *(const WORD*)&pFormat[2]); + TRACE("conformance = %ld\n", pStubMsg->MaxCount); + pFormat = ComputeVariance(pStubMsg, NULL, pFormat, pStubMsg->MaxCount); + size = ComplexStructSize(pStubMsg, pFormat); + size *= pStubMsg->MaxCount; + break; + case RPC_FC_C_CSTRING: + case RPC_FC_C_WSTRING: + if (*pFormat == RPC_FC_C_CSTRING) + size = sizeof(CHAR); + else + size = sizeof(WCHAR); + if (pFormat[1] == RPC_FC_STRING_SIZED) + ComputeConformance(pStubMsg, NULL, pFormat + 2, 0); + else + pStubMsg->MaxCount = 0; + size *= pStubMsg->MaxCount; + break; + default: + FIXME("Unhandled type %02x\n", *pFormat); + /* fallthrough */ + case RPC_FC_RP: + size = sizeof(void *); + break; + } + return size; +} + void WINAPI NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE pMessage) { #if 0 /* these functions are not defined yet */ @@ -367,6 +423,13 @@ void client_do_args( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, enum s switch (phase) { + case STUBLESS_INITOUT: + if (!params[i].attr.IsBasetype && params[i].attr.IsOut && + !params[i].attr.IsIn && !params[i].attr.IsByValue) + { + memset( *(unsigned char **)pArg, 0, calc_arg_size( pStubMsg, pTypeFormat )); + } + break; case STUBLESS_CALCSIZE: if (params[i].attr.IsSimpleRef && !*(unsigned char **)pArg) RpcRaiseException(RPC_X_NULL_REF_POINTER); @@ -648,24 +711,33 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma } /* order of phases: - * 1. CALCSIZE - calculate the buffer size - * 2. GETBUFFER - allocate the buffer - * 3. MARSHAL - marshal [in] params into the buffer - * 4. SENDRECEIVE - send/receive buffer - * 5. UNMARSHAL - unmarshal [out] params from buffer - * 6. FREE - clear [out] parameters (for proxies, and only on error) + * 1. INITOUT - zero [out] parameters (proxies only) + * 2. CALCSIZE - calculate the buffer size + * 3. GETBUFFER - allocate the buffer + * 4. MARSHAL - marshal [in] params into the buffer + * 5. SENDRECEIVE - send/receive buffer + * 6. UNMARSHAL - unmarshal [out] params from buffer + * 7. FREE - clear [out] parameters (for proxies, and only on error) */ if ((pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) || (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_HAS_COMM_OR_FAULT)) { + /* 1. INITOUT */ + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) + { + TRACE( "INITOUT\n" ); + client_do_args(&stubMsg, pFormat, STUBLESS_INITOUT, fpu_stack, + number_of_params, (unsigned char *)&RetVal); + } + __TRY { - /* 1. CALCSIZE */ + /* 2. CALCSIZE */ TRACE( "CALCSIZE\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_CALCSIZE, fpu_stack, number_of_params, (unsigned char *)&RetVal); - /* 2. GETBUFFER */ + /* 3. GETBUFFER */ TRACE( "GETBUFFER\n" ); if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { @@ -691,12 +763,12 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma } } - /* 3. MARSHAL */ + /* 4. MARSHAL */ TRACE( "MARSHAL\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_MARSHAL, fpu_stack, number_of_params, (unsigned char *)&RetVal); - /* 4. SENDRECEIVE */ + /* 5. SENDRECEIVE */ TRACE( "SENDRECEIVE\n" ); if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { @@ -729,7 +801,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) NdrConvert(&stubMsg, pFormat); - /* 5. UNMARSHAL */ + /* 6. UNMARSHAL */ TRACE( "UNMARSHAL\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_UNMARSHAL, fpu_stack, number_of_params, (unsigned char *)&RetVal); @@ -738,7 +810,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma { if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { - /* 6. FREE */ + /* 7. FREE */ TRACE( "FREE\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_FREE, fpu_stack, number_of_params, (unsigned char *)&RetVal); @@ -774,12 +846,12 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma } else { - /* 1. CALCSIZE */ + /* 2. CALCSIZE */ TRACE( "CALCSIZE\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_CALCSIZE, fpu_stack, number_of_params, (unsigned char *)&RetVal); - /* 2. GETBUFFER */ + /* 3. GETBUFFER */ TRACE( "GETBUFFER\n" ); if (Oif_flags.HasPipes) /* NdrGetPipeBuffer(...) */ @@ -796,12 +868,12 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma NdrGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); } - /* 3. MARSHAL */ + /* 4. MARSHAL */ TRACE( "MARSHAL\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_MARSHAL, fpu_stack, number_of_params, (unsigned char *)&RetVal); - /* 4. SENDRECEIVE */ + /* 5. SENDRECEIVE */ TRACE( "SENDRECEIVE\n" ); if (Oif_flags.HasPipes) /* NdrPipesSendReceive(...) */ @@ -823,7 +895,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) NdrConvert(&stubMsg, pFormat); - /* 5. UNMARSHAL */ + /* 6. UNMARSHAL */ TRACE( "UNMARSHAL\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_UNMARSHAL, fpu_stack, number_of_params, (unsigned char *)&RetVal); @@ -1000,62 +1072,6 @@ LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, uns } #endif -static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) -{ - DWORD size; - switch(*pFormat) - { - case RPC_FC_STRUCT: - size = *(const WORD*)(pFormat + 2); - break; - case RPC_FC_BOGUS_STRUCT: - size = *(const WORD*)(pFormat + 2); - if(*(const WORD*)(pFormat + 4)) - FIXME("Unhandled conformant description\n"); - break; - case RPC_FC_CARRAY: - case RPC_FC_CVARRAY: - size = *(const WORD*)(pFormat + 2); - ComputeConformance(pStubMsg, NULL, pFormat + 4, 0); - size *= pStubMsg->MaxCount; - break; - case RPC_FC_SMFARRAY: - case RPC_FC_SMVARRAY: - size = *(const WORD*)(pFormat + 2); - break; - case RPC_FC_LGFARRAY: - case RPC_FC_LGVARRAY: - size = *(const DWORD*)(pFormat + 2); - break; - case RPC_FC_BOGUS_ARRAY: - pFormat = ComputeConformance(pStubMsg, NULL, pFormat + 4, *(const WORD*)&pFormat[2]); - TRACE("conformance = %ld\n", pStubMsg->MaxCount); - pFormat = ComputeVariance(pStubMsg, NULL, pFormat, pStubMsg->MaxCount); - size = ComplexStructSize(pStubMsg, pFormat); - size *= pStubMsg->MaxCount; - break; - case RPC_FC_C_CSTRING: - case RPC_FC_C_WSTRING: - if (*pFormat == RPC_FC_C_CSTRING) - size = sizeof(CHAR); - else - size = sizeof(WCHAR); - if (pFormat[1] == RPC_FC_STRING_SIZED) - ComputeConformance(pStubMsg, NULL, pFormat + 2, 0); - else - pStubMsg->MaxCount = 0; - size *= pStubMsg->MaxCount; - break; - default: - FIXME("Unhandled type %02x\n", *pFormat); - /* fallthrough */ - case RPC_FC_RP: - size = sizeof(void *); - break; - } - return size; -} - static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat, enum stubless_phase phase, unsigned short number_of_params)

1 0

Alexandre Julliard : rpcrt4: Add a phase in proxies for clearing output parameters on error.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: a37ec01bd1aa2196ec224203fb10a4b0a41667b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37ec01bd1aa2196ec224203f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 22:43:12 2011 +0200 rpcrt4: Add a phase in proxies for clearing output parameters on error. --- dlls/rpcrt4/ndr_stubless.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index fa175d1..017be5d 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -346,6 +346,7 @@ void client_do_args( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, enum s for (i = 0; i < number_of_params; i++) { unsigned char *pArg = pStubMsg->StackTop + params[i].stack_offset; + PFORMAT_STRING pTypeFormat = (PFORMAT_STRING)&pStubMsg->StubDesc->pFormatTypes[params[i].u.type_offset]; #ifdef __x86_64__ /* floats are passed as doubles through varargs functions */ float f; @@ -361,18 +362,14 @@ void client_do_args( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, enum s #endif TRACE("param[%d]: %p type %02x %s\n", i, pArg, - params[i].attr.IsBasetype ? params[i].u.type_format_char : - pStubMsg->StubDesc->pFormatTypes[params[i].u.type_offset], + params[i].attr.IsBasetype ? params[i].u.type_format_char : *pTypeFormat, debugstr_PROC_PF( params[i].attr )); - /* if a simple ref pointer then we have to do the - * check for the pointer being non-NULL. */ - if (params[i].attr.IsSimpleRef && !*(unsigned char **)pArg) - RpcRaiseException(RPC_X_NULL_REF_POINTER); - switch (phase) { case STUBLESS_CALCSIZE: + if (params[i].attr.IsSimpleRef && !*(unsigned char **)pArg) + RpcRaiseException(RPC_X_NULL_REF_POINTER); if (params[i].attr.IsIn) call_buffer_sizer(pStubMsg, pArg, &params[i]); break; case STUBLESS_MARSHAL: @@ -385,6 +382,10 @@ void client_do_args( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, enum s call_unmarshaller(pStubMsg, &pArg, &params[i], 0); } break; + case STUBLESS_FREE: + if (!params[i].attr.IsBasetype && params[i].attr.IsOut && !params[i].attr.IsByValue) + NdrClearOutParameters( pStubMsg, pTypeFormat, *(unsigned char **)pArg ); + break; default: RpcRaiseException(RPC_S_INTERNAL_ERROR); } @@ -652,6 +653,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma * 3. MARSHAL - marshal [in] params into the buffer * 4. SENDRECEIVE - send/receive buffer * 5. UNMARSHAL - unmarshal [out] params from buffer + * 6. FREE - clear [out] parameters (for proxies, and only on error) */ if ((pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) || (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_HAS_COMM_OR_FAULT)) @@ -735,7 +737,13 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma __EXCEPT_ALL { if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) + { + /* 6. FREE */ + TRACE( "FREE\n" ); + client_do_args(&stubMsg, pFormat, STUBLESS_FREE, fpu_stack, + number_of_params, (unsigned char *)&RetVal); RetVal = NdrProxyErrorHandler(GetExceptionCode()); + } else { const COMM_FAULT_OFFSETS *comm_fault_offsets = &pStubDesc->CommFaultOffsets[procedure_number];

1 0

Alexandre Julliard : rpcrt4: Use the same phase values for clients and stubs.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 78e8fccbd65c5536c449111826527e192eb1cf2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=78e8fccbd65c5536c44911182… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 22:34:57 2011 +0200 rpcrt4: Use the same phase values for clients and stubs. --- dlls/rpcrt4/ndr_es.c | 6 +- dlls/rpcrt4/ndr_stubless.c | 442 ++++++++++++++++++++------------------------ dlls/rpcrt4/ndr_stubless.h | 15 ++- 3 files changed, 217 insertions(+), 246 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78e8fccbd65c5536c4491…

1 0

Alexandre Julliard : rpcrt4: Pass the full argument format to the size/ marshall/unmarshall wrappers to greatly simplify the argument processing.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: f3734fd68712063714a4ea80173a62e127887066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3734fd68712063714a4ea801… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 22:13:45 2011 +0200 rpcrt4: Pass the full argument format to the size/marshall/unmarshall wrappers to greatly simplify the argument processing. --- dlls/rpcrt4/ndr_stubless.c | 376 ++++++++++++++++++-------------------------- 1 files changed, 151 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3734fd68712063714a4e…

1 0

Austin English : user32/tests: Remove win9x hacks.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 5e941f89c2dfcfb7e4e7f66638c7505dc2b78d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e941f89c2dfcfb7e4e7f6663… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 26 19:11:34 2011 -0700 user32/tests: Remove win9x hacks. --- dlls/user32/tests/edit.c | 8 ++------ dlls/user32/tests/resource.c | 12 +++++------- dlls/user32/tests/static.c | 4 +--- dlls/user32/tests/text.c | 8 +------- 4 files changed, 9 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index d279f0d..c6c815a 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1318,9 +1318,7 @@ static void test_edit_control_limittext(void) ok(r == 30000, "Incorrect default text limit, expected 30000 got %u\n", r); SendMessage(hwEdit, EM_SETLIMITTEXT, 0, 0); r = SendMessage(hwEdit, EM_GETLIMITTEXT, 0, 0); - /* Win9x+ME: 32766; WinNT: 2147483646UL */ - ok( (r == 32766) || (r == 2147483646UL), - "got limit %u (expected 32766 or 2147483646)\n", r); + ok( r == 2147483646, "got limit %u (expected 2147483646)\n", r); DestroyWindow(hwEdit); /* Test default limit for multi-line control */ @@ -1330,9 +1328,7 @@ static void test_edit_control_limittext(void) ok(r == 30000, "Incorrect default text limit, expected 30000 got %u\n", r); SendMessage(hwEdit, EM_SETLIMITTEXT, 0, 0); r = SendMessage(hwEdit, EM_GETLIMITTEXT, 0, 0); - /* Win9x+ME: 65535; WinNT: 4294967295UL */ - ok( (r == 65535) || (r == 4294967295UL), - "got limit %u (expected 65535 or 4294967295)\n", r); + ok( r == 4294967295U, "got limit %u (expected 4294967295)\n", r); DestroyWindow(hwEdit); } diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index c64aff0..5bc2d7a 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -180,12 +180,10 @@ static void test_accel1(void) ok( hAccel != NULL, "create accelerator table\n"); r = CopyAcceleratorTable( hAccel, NULL, 0 ); - ok( r == n || broken(r == 2), /* win9x */ - "two entries in table %u/%u\n", r, n); + ok( r == n, "two entries in table %u/%u\n", r, n); r = CopyAcceleratorTable( hAccel, &ac[0], n ); - ok( r == n || broken(r == 2), /* win9x */ - "still should be two entries in table %u/%u\n", r, n); + ok( r == n, "still should be two entries in table %u/%u\n", r, n); n=0; ok( ac[n].cmd == 1000, "cmd 0 not preserved got %x\n", ac[n].cmd); @@ -262,11 +260,11 @@ static void test_accel2(void) hac = CreateAcceleratorTable( &ac[0], 2); ok( hac != NULL , "fail\n"); res = CopyAcceleratorTable( hac, NULL, 100 ); - ok( res == 2 || broken(res == 0), /* win9x */ "copy null failed %d\n", res); + ok( res == 2, "copy null failed %d\n", res); res = CopyAcceleratorTable( hac, NULL, 0 ); ok( res == 2, "copy null failed %d\n", res); res = CopyAcceleratorTable( hac, NULL, 1 ); - ok( res == 2 || broken(res == 0), /* win9x */ "copy null failed %d\n", res); + ok( res == 2, "copy null failed %d\n", res); ok( 1 == CopyAcceleratorTable( hac, out, 1 ), "copy 1 failed\n"); ok( 2 == CopyAcceleratorTable( hac, out, 2 ), "copy 2 failed\n"); ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); @@ -318,7 +316,7 @@ static void test_accel2(void) hac = CreateAcceleratorTable( &ac[0], 2); ok( hac != NULL , "fail\n"); res = CopyAcceleratorTable( hac, out, 2 ); - ok( res == 2 || broken(res == 1), /* win9x */ "copy 2 failed %d\n", res); + ok( res == 2, "copy 2 failed %d\n", res); /* ok( memcmp( ac, out, sizeof ac ), "tables not different\n"); */ ok( out[0].cmd == ac[0].cmd, "cmd modified\n"); ok( out[0].fVirt == (ac[0].fVirt&0x7f), "fVirt not modified\n"); diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index d04f725..b761356 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -95,9 +95,7 @@ static void test_updates(int style, int flags) if (flags & TODO_COUNT) todo_wine { expect_eq(g_nReceivedColorStatic, exp, int, "%d"); } else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP) - ok( g_nReceivedColorStatic == exp || - broken(g_nReceivedColorStatic == 0), /* win9x */ - "expected %u got %u\n", exp, g_nReceivedColorStatic ); + ok( g_nReceivedColorStatic == exp, "expected %u got %u\n", exp, g_nReceivedColorStatic ); else expect_eq(g_nReceivedColorStatic, exp, int, "%d"); DestroyWindow(hStatic); diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index b45a312..1874b15 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -114,13 +114,7 @@ static void test_DrawTextCalcRect(void) heightcheck = textheight = DrawTextExA(hdc, text, 0, &rect, DT_CALCRECT, NULL ); ok( !EMPTY(rect) && !MODIFIED(rect), "rectangle should NOT be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); - if (textheight != 0) /* Windows 98 */ - { - win_skip("XP conformity failed, skipping XP tests. Probably win9x\n"); - conform_xp = FALSE; - } - else - ok(textheight==0,"Got textheight from DrawTextExA\n"); + ok(textheight==0,"Got textheight from DrawTextExA\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextA(hdc, text, 0, &rect, DT_CALCRECT);

1 0

André Hentschel : user32: Fix for finding nested default buttons.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: a3551214144c2b973a5a048e81e265a7aeec0363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3551214144c2b973a5a048e8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 26 20:39:28 2011 +0200 user32: Fix for finding nested default buttons. --- dlls/comctl32/tests/propsheet.c | 1 - dlls/user32/dialog.c | 34 +++++++++++++++++++++++++++++++++- dlls/user32/tests/dialog.c | 2 +- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index f6b4c7d..89c548f 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -502,7 +502,6 @@ static void test_custom_default_button(void) } } - todo_wine ok(add_button_has_been_pressed, "The Add button has not been pressed!\n"); DestroyWindow(hdlg); diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 2aa89d9..1e47374 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1120,6 +1120,38 @@ static void DIALOG_FixChildrenOnChangeFocus (HWND hwndDlg, HWND hwndNext) } /*********************************************************************** + * DIALOG_IdToHwnd + * + * A recursive version of GetDlgItem + * + * RETURNS + * The HWND for a Child ID. + */ +static HWND DIALOG_IdToHwnd( HWND hwndDlg, INT id ) +{ + int i; + HWND *list = WIN_ListChildren( hwndDlg ); + HWND ret = 0; + + if (!list) return 0; + + for (i = 0; list[i]; i++) + { + if (GetWindowLongPtrW( list[i], GWLP_ID ) == id) + { + ret = list[i]; + break; + } + + /* Recurse into every child */ + if ((ret = DIALOG_IdToHwnd( list[i], id ))) break; + } + + HeapFree( GetProcessHeap(), 0, list ); + return ret; +} + +/*********************************************************************** * IsDialogMessageW (USER32.@) */ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) @@ -1227,7 +1259,7 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) } else if (DC_HASDEFID == HIWORD(dw = SendMessageW (hwndDlg, DM_GETDEFID, 0, 0))) { - HWND hwndDef = GetDlgItem(hwndDlg, LOWORD(dw)); + HWND hwndDef = DIALOG_IdToHwnd(hwndDlg, LOWORD(dw)); if (hwndDef ? IsWindowEnabled(hwndDef) : LOWORD(dw)==IDOK) SendMessageW( hwndDlg, WM_COMMAND, MAKEWPARAM( LOWORD(dw), BN_CLICKED ), (LPARAM)hwndDef); } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 1a1cd75..8e4ffb5 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -709,7 +709,7 @@ static void test_WM_NEXTDLGCTL(void) g_bReceivedCommand = FALSE; FormEnterMsg (&msg, child3); ok(IsDialogMessage (g_hwndTestDlg, &msg), "Did not handle the ENTER\n"); - todo_wine ok(g_bReceivedCommand, "Did not trigger the default Button action\n"); + ok(g_bReceivedCommand, "Did not trigger the default Button action\n"); DestroyWindow(child3); DestroyWindow(child2);

1 0

Frédéric Delanoy : cmd/tests: Additional variable expansion FOR tests.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 327eb3132553e5a84bc5d1ecda22da505356e925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=327eb3132553e5a84bc5d1ecd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 28 01:06:48 2011 +0200 cmd/tests: Additional variable expansion FOR tests. --- programs/cmd/tests/test_builtins.cmd | 18 ++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 17 +++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index c9d1d53..4510074 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -262,16 +262,25 @@ if /I foo==FOO echo if /I seems to work if /I not foo==FOO echo if /I seems to be broken echo -----------Testing for ----------- +echo ...plain FOR for %%i in (A B C) do echo %%i +for %%i in (A B C) do echo %%I +for %%i in (A B C) do echo %%j for %%i in (A B C) do call :forTestFun1 %%i +for %%i in (1,4,1) do echo %%i +for %%i in (A, B,C) do echo %%i goto :endForTestFun1 :forTestFun1 echo %1 goto :eof :endForTestFun1 +echo ...imbricated FORs for %%i in (X) do ( for %%j in (Y) do ( echo %%i %%j)) +for %%i in (X) do ( + for %%I in (Y) do ( + echo %%i %%I)) for %%i in (A B) do ( for %%j in (C D) do ( echo %%i %%j)) @@ -283,6 +292,15 @@ goto :endForTestFun2 echo %1 %2 goto :eof :endForTestFun2 +mkdir foobar & cd foobar +mkdir foo +mkdir bar +mkdir baz +echo > bazbaz +echo ...basic wildcards +for %%i in (ba*) do echo %%i +cd .. +rd /s/Q foobar echo -----------Testing del /a----------- del /f/q *.test > nul diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index e0d3cf7..a050c14 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -184,12 +184,27 @@ if seems to default to case sensitivity if /i seems to work if /I seems to work -----------Testing for ----------- +...plain FOR A B C +%I +%I +%I +%j +%j +%j A B C +1 +4 +1 +A +B +C +...imbricated FORs +@todo_wine@X Y @todo_wine@X Y @todo_wine@A C @todo_wine@A D @@ -199,6 +214,8 @@ C @todo_wine@A D @todo_wine@B C @todo_wine@B D +...basic wildcards +bazbaz -----------Testing del /a----------- not-r.test not found after delete, good r.test found before delete, good

1 0

Frédéric Delanoy : cmd: Partial fix for echo' s special ':' handling.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 25fcad3768ab00ec0493c127efa4f3992706b2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25fcad3768ab00ec0493c127e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 28 01:06:47 2011 +0200 cmd: Partial fix for echo's special ':' handling. --- programs/cmd/builtins.c | 4 ++-- programs/cmd/tests/test_builtins.cmd.exp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 86fd54c..49869ba 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -861,10 +861,10 @@ void WCMD_echo (const WCHAR *command) { int count; const WCHAR *origcommand = command; - if (command[0]==' ' || command[0]=='.') + if (command[0]==' ' || command[0]=='.' || command[0]==':') command++; count = strlenW(command); - if (count == 0 && origcommand[0]!='.') { + if (count == 0 && origcommand[0]!='.' && origcommand[0]!=':') { if (echo_mode) WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), onW); else WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), offW); return; diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7db3b86..e0d3cf7 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -31,13 +31,13 @@ word .word @todo_wine@@pwd@>echo: -@todo_wine@ + @pwd@>echo :@space@ : @todo_wine@@pwd@>echo:word -@todo_wine@word +word @pwd@>echo :word@space@ :word @@ -57,9 +57,9 @@ at-echoed-word . word .word -@todo_wine@ + : -@todo_wine@word +word :word word@space@ word@space@@space@

1 0

← Newer
1
2
3
4
5
6
7
8
...
84
Older →

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 July 2011