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

Sebastian Lackner : wininet: Use list_head get first entry of list.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 1eb2c5520c4b1d0813f8c020c741c1cc2b5152c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb2c5520c4b1d0813f8c020c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 7 05:39:46 2016 +0200 wininet: Use list_head get first entry of list. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 5421fe1..5da9710 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -690,15 +690,15 @@ static void free_cookie_domain_list(struct list *list) cookie_domain_t *domain; while(!list_empty(list)) { - domain = LIST_ENTRY(list_next(list, list), cookie_domain_t, entry); + domain = LIST_ENTRY(list_head(list), cookie_domain_t, entry); free_cookie_domain_list(&domain->subdomain_list); while(!list_empty(&domain->path_list)) { - container = LIST_ENTRY(list_next(&domain->path_list, &domain->path_list), cookie_container_t, entry); + container = LIST_ENTRY(list_head(&domain->path_list), cookie_container_t, entry); while(!list_empty(&container->cookie_list)) - delete_cookie(LIST_ENTRY(list_next(&container->cookie_list, &container->cookie_list), cookie_t, entry)); + delete_cookie(LIST_ENTRY(list_head(&container->cookie_list), cookie_t, entry)); heap_free(container->cookie_url); list_remove(&container->entry);

1 0

Józef Kucia : wined3d: Recognize SM5 bfrev opcode.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 0dc4c3afb2dc5ff8c917f006a1ab7d631f5ea22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc4c3afb2dc5ff8c917f006a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:33 2016 +0200 wined3d: Recognize SM5 bfrev opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index deae1cc..24c1194 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5215,6 +5215,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_AND */ NULL, /* WINED3DSIH_BEM */ pshader_hw_bem, /* WINED3DSIH_BFI */ NULL, + /* WINED3DSIH_BFREV */ NULL, /* WINED3DSIH_BREAK */ shader_hw_break, /* WINED3DSIH_BREAKC */ shader_hw_breakc, /* WINED3DSIH_BREAKP */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8b5af9e..c9c0773 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8581,6 +8581,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_AND */ shader_glsl_binop, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BFI */ NULL, + /* WINED3DSIH_BFREV */ NULL, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, /* WINED3DSIH_BREAKP */ shader_glsl_breakp, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9bf7164..6a9f7fc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -45,6 +45,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_AND */ "and", /* WINED3DSIH_BEM */ "bem", /* WINED3DSIH_BFI */ "bfi", + /* WINED3DSIH_BFREV */ "bfrev", /* WINED3DSIH_BREAK */ "break", /* WINED3DSIH_BREAKC */ "breakc", /* WINED3DSIH_BREAKP */ "breakp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index abfcf4f..72cd5fc 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -216,6 +216,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_GATHER4_C = 0x7e, WINED3D_SM5_OP_BFI = 0x8c, + WINED3D_SM5_OP_BFREV = 0x8d, WINED3D_SM5_OP_SWAPC = 0x8e, WINED3D_SM5_OP_DCL_STREAM = 0x8f, WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, @@ -811,6 +812,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "uuuu"}, + {WINED3D_SM5_OP_BFREV, WINED3DSIH_BFREV, "u", "u"}, {WINED3D_SM5_OP_SWAPC, WINED3DSIH_SWAPC, "ff", "uff"}, {WINED3D_SM5_OP_DCL_STREAM, WINED3DSIH_DCL_STREAM, "", "f"}, {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ec52b15..8d97d2e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -560,6 +560,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_AND, WINED3DSIH_BEM, WINED3DSIH_BFI, + WINED3DSIH_BFREV, WINED3DSIH_BREAK, WINED3DSIH_BREAKC, WINED3DSIH_BREAKP,

1 0

Hadrien Boizard : winex11.drv: Use wine_dbgstr_point in TRACES.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 81538ebb6dd4bed43006084a1514c1c96095a712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81538ebb6dd4bed43006084a1… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Wed Jul 6 00:54:09 2016 +0200 winex11.drv: Use wine_dbgstr_point in TRACES. Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 677acfa..7287753 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1388,7 +1388,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) { POINT old = *pos; *pos = root_to_virtual_screen( winX, winY ); - TRACE( "pointer at (%d,%d) server pos %d,%d\n", pos->x, pos->y, old.x, old.y ); + TRACE( "pointer at %s server pos %s\n", wine_dbgstr_point(pos), wine_dbgstr_point(&old) ); } return ret; } @@ -1458,7 +1458,7 @@ void move_resize_window( HWND hwnd, int dir ) else if (GetKeyState( VK_MBUTTON ) & 0x8000) button = 2; else if (GetKeyState( VK_RBUTTON ) & 0x8000) button = 3; - TRACE( "hwnd %p/%lx, x %d, y %d, dir %d, button %d\n", hwnd, win, pos.x, pos.y, dir, button ); + TRACE( "hwnd %p/%lx, pos %s, dir %d, button %d\n", hwnd, win, wine_dbgstr_point(&pos), dir, button ); xev.xclient.type = ClientMessage; xev.xclient.window = win;

1 0

Sebastian Lackner : kernel32/tests: Add a test for sorting of InMemoryOrderModuleList.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 648cbf63c003e0230352f91ddb7602c44d570706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=648cbf63c003e0230352f91dd… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 7 06:44:15 2016 +0200 kernel32/tests: Add a test for sorting of InMemoryOrderModuleList. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index c35cf25..921abb1 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2750,6 +2750,24 @@ static void test_ResolveDelayLoadedAPI(void) DeleteFileA(dll_name); } +static void test_InMemoryOrderModuleList(void) +{ + LIST_ENTRY *entry1, *mark1 = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; + LIST_ENTRY *entry2, *mark2 = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; + LDR_MODULE *module1, *module2; + + for (entry1 = mark1->Flink, entry2 = mark2->Flink; + entry1 != mark1 && entry2 != mark2; + entry1 = entry1->Flink, entry2 = entry2->Flink) + { + module1 = CONTAINING_RECORD(entry1, LDR_MODULE, InLoadOrderModuleList); + module2 = CONTAINING_RECORD(entry2, LDR_MODULE, InMemoryOrderModuleList); + ok(module1 == module2, "expected module1 == module2, got %p and %p\n", module1, module2); + } + ok(entry1 == mark1, "expected entry1 == mark1, got %p and %p\n", entry1, mark1); + ok(entry2 == mark2, "expected entry2 == mark2, got %p and %p\n", entry2, mark2); +} + START_TEST(loader) { int argc; @@ -2804,4 +2822,5 @@ START_TEST(loader) test_section_access(); test_import_resolution(); test_ExitProcess(); + test_InMemoryOrderModuleList(); }

1 0

Michael Müller : ntdll: Do not sort InMemoryOrderModuleList by memory address.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 77be592845591c05a574b720b15c49e7cd1720c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77be592845591c05a574b720b… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jul 7 06:43:25 2016 +0200 ntdll: Do not sort InMemoryOrderModuleList by memory address. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a0049fe..d9176d7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -355,7 +355,6 @@ static WINE_MODREF *get_modref( HMODULE hmod ) mod = CONTAINING_RECORD(entry, LDR_MODULE, InMemoryOrderModuleList); if (mod->BaseAddress == hmod) return cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr); - if (mod->BaseAddress > (void*)hmod) break; } return NULL; } @@ -932,7 +931,6 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) WINE_MODREF *wm; const WCHAR *p; const IMAGE_NT_HEADERS *nt = RtlImageNtHeader(hModule); - PLIST_ENTRY entry, mark; if (!(wm = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*wm) ))) return NULL; @@ -965,18 +963,8 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) InsertTailList(&NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList); - - /* insert module in MemoryList, sorted in increasing base addresses */ - mark = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; - for (entry = mark->Flink; entry != mark; entry = entry->Flink) - { - if (CONTAINING_RECORD(entry, LDR_MODULE, InMemoryOrderModuleList)->BaseAddress > wm->ldr.BaseAddress) - break; - } - entry->Blink->Flink = &wm->ldr.InMemoryOrderModuleList; - wm->ldr.InMemoryOrderModuleList.Blink = entry->Blink; - wm->ldr.InMemoryOrderModuleList.Flink = entry; - entry->Blink = &wm->ldr.InMemoryOrderModuleList; + InsertTailList(&NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, + &wm->ldr.InMemoryOrderModuleList); /* wait until init is called for inserting into this list */ wm->ldr.InInitializationOrderModuleList.Flink = NULL; @@ -1386,7 +1374,6 @@ NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* pmod) *pmod = mod; return STATUS_SUCCESS; } - if (mod->BaseAddress > addr) break; } return STATUS_NO_MORE_ENTRIES; } @@ -3088,6 +3075,8 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, /* the main exe needs to be the first in the load order list */ RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); + RemoveEntryList( &wm->ldr.InMemoryOrderModuleList ); + InsertHeadList( &peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0 )) != STATUS_SUCCESS) goto error; if ((status = server_init_process_done()) != STATUS_SUCCESS) goto error;

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 7bfefeacbc0d4c0431a7b5a3490d26d2045d4320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bfefeacbc0d4c0431a7b5a34… Author: Kim Malmo <berencamlost(a)msn.com> Date: Wed Jul 6 17:57:11 2016 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 59 +++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index ff37757..9c167c3 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -11916,48 +11916,63 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgstr "" +"Bruk:\n" +" regedit [alternativer] [filnavn] [reg_key]\n" +"\n" +"Alternativer:\n" +" [Ingen alt.] Kjør den grafiske versjonen av dette programmet.\n" +" /L:system.dat Plasseringen til system.dat filen som skal modifiseres.\n" +" Kompatibel med hvilken som helst annen bryter. Ignorert.\n" +" /R:user.dat Plasseringen til user.dat filen som skal modifiseres.\n" +" Kompatibel med hvilken som helst annen bryter. Ignorert.\n" +" /C Importér innholdet av en registerfil.\n" +" /D Slett en spesifikk registernøkkel.\n" +" /E Eksportér innholdet av en spesifikk registernøkkel til en " +"fil.\n" +" Hvis ingen nøkkel er spesifisert, er hele registeret " +"eksportert.\n" +" /S Stille modus. Ingen beskjeder vil bli vist.\n" +" /V Kjør GUI'et i avansert modus. Ignorert.\n" +" /? Vis denne informasjonen og avslutt.\n" +" [filnavn] Plasseringen til filen som inneholder registerinformasjonen " +"som\n" +" skal importeres. Når brukt med [/E], spesifiserer dette \n" +" alternativet plasseringen hvor registerinformasjonen vil \n" +" bli eksportert.\n" +" [reg_key] Registernøkkelen som skal modifiseres.\n" +"\n" +"Brukseksempler:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" #: regedit.rc:360 -#, fuzzy -#| msgid "" -#| "regsvr32: Invalid or unrecognized switch [%1]\n" -#| "\n" msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "regsvr32: Ugyldig eller ukjent bryter [%1]\n" +msgstr "regedit: Ugyldig eller ukjent bryter [%1]\n" #: regedit.rc:361 -#, fuzzy -#| msgid "Type \"REG /?\" for help.\n" msgid "Type \"regedit /?\" for help.\n" -msgstr "Skriv \"REG /?\" for hjelp.\n" +msgstr "Skriv \"regedit /?\" for hjelp.\n" #: regedit.rc:362 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "Ingen kommando ble oppgitt." +msgstr "regedit: Intet filnavn ble oppgitt.\n" #: regedit.rc:363 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: Ingen registernøkkel ble oppgitt for fjerning.\n" #: regedit.rc:364 -#, fuzzy -#| msgid "uninstaller: The application with GUID '%1' was not found\n" msgid "regedit: The file '%1' was not found.\n" -msgstr "uninstaller: Programmet med GUID %1 ble ikke funnet\n" +msgstr "regedit: Filen \"%1\" ble ikke funnet.\n" #: regedit.rc:365 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "reg: Ingen tilgang til ekstern maskin\n" +msgstr "regedit: Kan ikke åpne filen \"%1\".\n" #: regedit.rc:366 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "Ugyldig operasjon på referanse.\n" +msgstr "regedit: Uhåndtert handling.\n" #: regedit.rc:163 msgid "Quits the registry editor" @@ -13005,7 +13020,7 @@ msgid "" "WARNING: Debugging this process may result in loss of data.\n" "Are you sure you wish to attach the debugger?" msgstr "" -"ADVERSEL: Å feilsøke denne prosessen kan føre til tap av data.\n" +"ADVARSEL: Å feilsøke denne prosessen kan føre til tap av data.\n" "Er du sikker på at du vil koble til feilsøkeren?" #: taskmgr.rc:314

1 0

Michael Stefaniuc : riched20/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: f18f44c505bb4b36eeb690f95410dda484844aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18f44c505bb4b36eeb690f95… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 08:51:06 2016 +0200 riched20/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 72 +++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 44 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index fd5bcc4..76e2c97 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7050,9 +7050,8 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); for (n = -3; n <= 3; n++) { @@ -7066,19 +7065,16 @@ static void test_format_rect(void) expected.bottom = min(clientRect.bottom, rc.bottom); expected.right = min(clientRect.right, rc.right); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), - "[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - n, rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "[n=%d] rect %s != %s\n", n, wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); } rc = clientRect; SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); /* Adding the selectionbar adds the selectionbar width to the left side. */ SendMessageA(hwnd, EM_SETOPTIONS, ECOOP_OR, ECO_SELECTIONBAR); @@ -7086,17 +7082,15 @@ static void test_format_rect(void) ok(options & ECO_SELECTIONBAR, "EM_SETOPTIONS failed to add selectionbar.\n"); expected.left += 8; /* selection bar width */ SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); rc = clientRect; SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); /* Removing the selectionbar subtracts the selectionbar width from the left side, * even if the left side is already 0. */ @@ -7105,19 +7099,16 @@ static void test_format_rect(void) ok(!(options & ECO_SELECTIONBAR), "EM_SETOPTIONS failed to remove selectionbar.\n"); expected.left -= 8; /* selection bar width */ SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); /* Set the absolute value of the formatting rectangle. */ rc = clientRect; SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), - "[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - n, rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "[n=%d] rect %s != %s\n", n, wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); /* MSDN documents the EM_SETRECT message as using the rectangle provided in * LPARAM as being a relative offset when the WPARAM value is 1, but these @@ -7129,9 +7120,8 @@ static void test_format_rect(void) expected = rc; SendMessageA(hwnd, EM_SETRECT, 1, (LPARAM)&rc); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); /* For some reason it does not limit the values to the client rect with * a WPARAM value of 1. */ @@ -7142,9 +7132,8 @@ static void test_format_rect(void) expected = rc; SendMessageA(hwnd, EM_SETRECT, 1, (LPARAM)&rc); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); /* Reset to default rect and check how the format rect adjusts to window * resize and how it copes with very small windows */ @@ -7157,9 +7146,8 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); MoveWindow(hwnd, 0, 0, 0, 30, FALSE); GetClientRect(hwnd, &clientRect); @@ -7168,9 +7156,8 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); MoveWindow(hwnd, 0, 0, 100, 0, FALSE); GetClientRect(hwnd, &clientRect); @@ -7179,9 +7166,8 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); DestroyWindow(hwnd); @@ -7198,9 +7184,8 @@ static void test_format_rect(void) expected.top += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); rc = clientRect; InflateRect(&rc, -5, -5); @@ -7210,9 +7195,8 @@ static void test_format_rect(void) expected.right += 1; SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); DestroyWindow(hwnd); }

1 0

Sebastian Lackner : gdi32: Fix copy & paste mistake in a comment.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 69d895ac864e49fc3b50f7dafd1f1fa0f8b492ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d895ac864e49fc3b50f7daf… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 7 05:35:04 2016 +0200 gdi32: Fix copy & paste mistake in a comment. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index d905490..1dd345c 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -1005,7 +1005,7 @@ BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) } /********************************************************************** - * EMFDRV_MoveTo + * EMFDRV_StrokePath */ BOOL EMFDRV_StrokePath( PHYSDEV dev ) {

1 0

Michael Stefaniuc : wineps.drv: Use wine_dbgstr_rect() to print a RECT.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: b06b96595ba51e1dbf152c9d663b02f6346fa002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06b96595ba51e1dbf152c9d6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 08:59:27 2016 +0200 wineps.drv: Use wine_dbgstr_rect() to print a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/escape.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 00a4a6c..435376c 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -129,14 +129,8 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, BANDINFOSTRUCT *ibi = (BANDINFOSTRUCT*)in_data; BANDINFOSTRUCT *obi = (BANDINFOSTRUCT*)out_data; - FIXME("BANDINFO(graphics %d, text %d, rect [%dx%d-%dx%d]), stub!\n", - ibi->GraphicsFlag, - ibi->TextFlag, - ibi->GraphicsRect.top, - ibi->GraphicsRect.bottom, - ibi->GraphicsRect.left, - ibi->GraphicsRect.right - ); + FIXME("BANDINFO(graphics %d, text %d, rect %s), stub!\n", ibi->GraphicsFlag, + ibi->TextFlag, wine_dbgstr_rect(&ibi->GraphicsRect)); *obi = *ibi; return 1; }

1 0

Francois Gouget : regedit: Make GetwideString() static.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: f099d0b19772c91829986a298d97f70ac3c1cd4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f099d0b19772c91829986a298… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 6 17:05:17 2016 +0200 regedit: Make GetwideString() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/regproc.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index fee4030..353d5f9 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -68,7 +68,7 @@ if (!(p)) \ * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller */ -WCHAR* GetWideString(const char* strA) +static WCHAR* GetWideString(const char* strA) { if(strA) { diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 81223e0..2104e5f 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -25,5 +25,4 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format); BOOL import_registry_file(FILE *in); void delete_registry_key(WCHAR *reg_key_name); -WCHAR* GetWideString(const char* strA); CHAR* GetMultiByteString(const WCHAR* strW);

1 0