July 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Recognize some more AMD cards.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 7bc003287806ad9509162c444493e2728432fb8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc003287806ad9509162c444… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:52 2011 +0200 wined3d: Recognize some more AMD cards. --- dlls/wined3d/directx.c | 8 ++++++-- dlls/wined3d/wined3d_private.h | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1430444..87f2606 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1175,7 +1175,9 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5700, "ATI Radeon HD 5700 Series", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5800, "ATI Radeon HD 5800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5900, "ATI Radeon HD 5900 Series", DRIVER_AMD_R600, 1024}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6310, "AMD Radeon HD 6310 Graphics", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6300, "AMD Radeon HD 6300 series Graphics", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6400, "AMD Radeon HD 6400 Series", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600, "AMD Radeon HD 6600 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_AMD_R600, 2048}, /* Intel cards */ @@ -1845,7 +1847,9 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info /* Northern Islands */ {"CAYMAN", CARD_AMD_RADEON_HD6900}, {"BARTS", CARD_AMD_RADEON_HD6800}, - {"PALM", CARD_AMD_RADEON_HD6310}, + {"TURKS", CARD_AMD_RADEON_HD6600}, + {"CAICOS", CARD_AMD_RADEON_HD6400}, + {"PALM", CARD_AMD_RADEON_HD6300}, /* Evergreen */ {"HEMLOCK", CARD_AMD_RADEON_HD5900}, {"CYPRESS", CARD_AMD_RADEON_HD5800}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0bbe9d1..f4e3f3e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1338,7 +1338,9 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD5850 = 0x6898, CARD_AMD_RADEON_HD5870 = 0x6899, CARD_AMD_RADEON_HD5900 = 0x689c, - CARD_AMD_RADEON_HD6310 = 0x9803, + CARD_AMD_RADEON_HD6300 = 0x9803, + CARD_AMD_RADEON_HD6400 = 0x6770, + CARD_AMD_RADEON_HD6600 = 0x6758, CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6900 = 0x6719,

1 0

Austin English : makefiles: sysconfdir is unused.
by Alexandre Julliard July 29, 2011

July 29, 2011

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

Frédéric Delanoy : tools: Assorted spelling fixes .
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 701aabb14148d703bd7345c5f8027e04626d0402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=701aabb14148d703bd7345c5f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 28 21:51:20 2011 +0200 tools: Assorted spelling fixes. --- tools/sfnt2fnt.c | 2 +- tools/winegcc/winegcc.c | 2 +- tools/wmc/utils.c | 2 +- tools/wmc/write.c | 2 +- tools/wrc/translation.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index f58c40b..d83d2be 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -579,7 +579,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, else left_byte = face->glyph->bitmap.buffer[(y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off - 1]; - /* On the last non-trival output byte (x == x_end) have we got one or two input bytes */ + /* On the last non-trivial output byte (x == x_end) have we got one or two input bytes */ if(x == x_end && (face->glyph->bitmap_left % 8 != 0) && ((face->glyph->bitmap.width % 8 == 0) || (x != (((face->glyph->bitmap.width) & ~0x7) + face->glyph->bitmap_left) / 8))) right_byte = 0; else diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9e75509..284223e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1252,7 +1252,7 @@ int main(int argc, char **argv) { if (argv[i][0] == '-') /* option */ { - /* determine if tihs switch is followed by a separate argument */ + /* determine if this switch is followed by a separate argument */ next_is_arg = 0; option_arg = 0; switch(argv[i][1]) diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index 6f26da3..276eeb4 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -219,7 +219,7 @@ int unistricmp(const WCHAR *s1, const WCHAR *s2) { int i; int once = 0; - static const char warn[] = "Don't know the uppercase equivalent of non acsii characters;" + static const char warn[] = "Don't know the uppercase equivalent of non ascii characters;" "comparison might yield wrong results"; while(*s1 && *s2) { diff --git a/tools/wmc/write.c b/tools/wmc/write.c index 0fc38ad..cf170d4 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -231,7 +231,7 @@ void write_h_file(const char *fname) if(!once) { /* - * Search for an english text. + * Search for an English text. * If not found, then use the first in the list */ once++; diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index 20e8346..6cfe07a 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -983,7 +983,7 @@ static resource_t *find_main(int type, name_id_t *id, resource_lang_node_t *lang if (neutral != NULL && (en != NULL || en_US != NULL)) { - fprintf(stderr, "INFO: Resource %04x/%s has both NEUTRAL and MASTER language translarion\n", + fprintf(stderr, "INFO: Resource %04x/%s has both NEUTRAL and MASTER language translation\n", type, get_nameid_str(id)); }

1 0

Alexandre Julliard : rpcrt4: Add a phase in proxies for clearing output parameters on error.
by Alexandre Julliard July 29, 2011

July 29, 2011

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: Pass the full argument format to the size/ marshall/unmarshall wrappers to greatly simplify the argument processing.
by Alexandre Julliard July 29, 2011

July 29, 2011

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

Henri Verbeet : wined3d: Only invalidate state for the current context in wined3d_buffer_unmap().
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: b06e32184bbe7c9a3f8500eb9a17199a933457ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06e32184bbe7c9a3f8500eb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:51 2011 +0200 wined3d: Only invalidate state for the current context in wined3d_buffer_unmap(). --- dlls/wined3d/buffer.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9b20d87..ae04138 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1136,12 +1136,13 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - device_invalidate_state(device, STATE_INDEXBUFFER); - context = context_acquire(device, NULL); gl_info = context->gl_info; + ENTER_GL(); + + if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) + context_invalidate_state(context, STATE_INDEXBUFFER); GL_EXTCALL(glBindBufferARB(buffer->buffer_type_hint, buffer->buffer_object)); if (gl_info->supported[ARB_MAP_BUFFER_RANGE])

1 0

Austin English : user32/tests: Remove win9x hacks.
by Alexandre Julliard July 28, 2011

July 28, 2011

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

July 28, 2011

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: Partial fix for echo' s special ':' handling.
by Alexandre Julliard July 28, 2011

July 28, 2011

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: -(a)todo_wine@ + @pwd@>echo :@space@ : @todo_wine@@pwd@>echo:word -(a)todo_wine@word +word @pwd@>echo :word(a)space@ :word @@ -57,9 +57,9 @@ at-echoed-word . word .word -(a)todo_wine@ + : -(a)todo_wine@word +word :word word(a)space@ word(a)space@@space@

1 0

Frédéric Delanoy : cmd/tests: Additional variable expansion FOR tests.
by Alexandre Julliard July 28, 2011

July 28, 2011

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 +(a)todo_wine@X Y @todo_wine(a)X Y @todo_wine(a)A C @todo_wine(a)A D @@ -199,6 +214,8 @@ C @todo_wine(a)A D @todo_wine(a)B C @todo_wine(a)B D +...basic wildcards +bazbaz -----------Testing del /a----------- not-r.test not found after delete, good r.test found before delete, good

1 0