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

Hans Leidekker : msi/tests: Avoid test failures caused by broken MsiGetFileVersionA.
by Alexandre Julliard June 18, 2013

June 18, 2013

Module: wine Branch: master Commit: 407584fd3ebaadc8a7ca62a18d47023393e2d37e URL: http://source.winehq.org/git/wine.git/?a=commit;h=407584fd3ebaadc8a7ca62a18… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 18 16:55:57 2013 +0200 msi/tests: Avoid test failures caused by broken MsiGetFileVersionA. --- dlls/msi/tests/msi.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 1bffbf9..5df72e9 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -4010,8 +4010,15 @@ static void test_MsiGetFileVersion(void) lstrcpyA(lang, "lang"); r = MsiGetFileVersionA(path, version, &versz, lang, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + if (langchecksz && !langsz) + { + win_skip("broken MsiGetFileVersionA detected\n"); + HeapFree(GetProcessHeap(), 0, vercheck); + HeapFree(GetProcessHeap(), 0, langcheck); + return; + } ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); - ok(strstr(lang, langcheck) != NULL, "Expected %s in %s\n", langcheck, lang); + ok(strstr(lang, langcheck) != NULL, "Expected \"%s\" in \"%s\"\n", langcheck, lang); ok(!lstrcmpA(version, vercheck), "Expected %s, got %s\n", vercheck, version); @@ -4029,7 +4036,7 @@ static void test_MsiGetFileVersion(void) lstrcpyA(lang, "lang"); r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(strstr(lang, langcheck) != NULL, "Expected %s in %s\n", langcheck, lang); + ok(strstr(lang, langcheck) != NULL, "Expected \"%s\" in \"%s\"\n", langcheck, lang); /* check neither version nor language */ r = MsiGetFileVersionA(path, NULL, NULL, NULL, NULL); @@ -4053,7 +4060,7 @@ static void test_MsiGetFileVersion(void) r = MsiGetFileVersionA(path, version, &versz, NULL, NULL); ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); ok(!strncmp(version, vercheck, 4), - "Expected first 4 characters of %s, got %s\n", vercheck, version); + "Expected first 4 characters of \"%s\", got \"%s\"\n", vercheck, version); ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); /* pcchLangBuf not big enough */ @@ -4062,7 +4069,7 @@ static void test_MsiGetFileVersion(void) r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz); ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); ok(!strncmp(lang, langcheck, 2), - "Expected first character of %s, got %s\n", langcheck, lang); + "Expected first character of \"%s\", got \"%s\"\n", langcheck, lang); ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz); /* pcchVersionBuf big enough, pcchLangBuf not big enough */ @@ -4072,7 +4079,7 @@ static void test_MsiGetFileVersion(void) r = MsiGetFileVersionA(path, version, &versz, NULL, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); - ok(!lstrcmpA(version, vercheck), "Expected %s, got %s\n", vercheck, version); + ok(!lstrcmpA(version, vercheck), "Expected \"%s\", got \"%s\"\n", vercheck, version); ok(langsz >= langchecksz && langsz < MAX_PATH, "Expected %d >= %d\n", langsz, langchecksz); /* pcchVersionBuf not big enough, pcchLangBuf big enough */

1 0

Ken Thomases : winemac: Cope with apps which return multiple DROPEFFECTs from IDropTarget:: DragEnter() and DragOver().
by Alexandre Julliard June 18, 2013

June 18, 2013

Module: wine Branch: master Commit: 300b231107388c38c89fdfe74415706486394fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=300b231107388c38c89fdfe74… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 18 05:42:42 2013 -0500 winemac: Cope with apps which return multiple DROPEFFECTs from IDropTarget::DragEnter() and DragOver(). --- dlls/winemac.drv/dragdrop.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index f7e797b..612a868 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -307,12 +307,11 @@ static DWORD drag_operations_to_dropeffects(uint32_t ops) */ static uint32_t dropeffect_to_drag_operation(DWORD effect, uint32_t ops) { - switch (effect) - { - case DROPEFFECT_COPY: return (ops & DRAG_OP_COPY) ? DRAG_OP_COPY : DRAG_OP_GENERIC; - case DROPEFFECT_MOVE: return DRAG_OP_MOVE; - case DROPEFFECT_LINK: return (ops & DRAG_OP_LINK) ? DRAG_OP_LINK : DRAG_OP_GENERIC; - } + if (effect & DROPEFFECT_LINK && ops & DRAG_OP_LINK) return DRAG_OP_LINK; + if (effect & DROPEFFECT_COPY && ops & DRAG_OP_COPY) return DRAG_OP_COPY; + if (effect & DROPEFFECT_MOVE && ops & DRAG_OP_MOVE) return DRAG_OP_MOVE; + if (effect & DROPEFFECT_LINK && ops & DRAG_OP_GENERIC) return DRAG_OP_GENERIC; + if (effect & DROPEFFECT_COPY && ops & DRAG_OP_GENERIC) return DRAG_OP_GENERIC; return DRAG_OP_NONE; }

1 0

André Hentschel : dinput: Don' t use autoheader styled define.
by Alexandre Julliard June 18, 2013

June 18, 2013

Module: wine Branch: master Commit: c5e9479b85427510610acb11441e6467bf6fa5cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5e9479b85427510610acb114… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 17 21:56:55 2013 +0200 dinput: Don't use autoheader styled define. --- dlls/dinput/joystick_linuxinput.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 6b22f4a..5d1cacc 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -43,7 +43,7 @@ # include <linux/input.h> # undef SW_MAX # if defined(EVIOCGBIT) && defined(EV_ABS) && defined(BTN_PINKIE) -# define HAVE_CORRECT_LINUXINPUT_H +# define HAS_PROPER_HEADER # endif #endif #ifdef HAVE_SYS_POLL_H @@ -65,7 +65,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); -#ifdef HAVE_CORRECT_LINUXINPUT_H +#ifdef HAS_PROPER_HEADER #define EVDEVPREFIX "/dev/input/event" #define EVDEVDRIVER " (event)" @@ -1478,7 +1478,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice8WImpl_GetImageInfo }; -#else /* HAVE_CORRECT_LINUXINPUT_H */ +#else /* HAS_PROPER_HEADER */ const struct dinput_device joystick_linuxinput_device = { "Wine Linux-input joystick driver", @@ -1487,4 +1487,4 @@ const struct dinput_device joystick_linuxinput_device = { NULL }; -#endif /* HAVE_CORRECT_LINUXINPUT_H */ +#endif /* HAS_PROPER_HEADER */

1 0

Alexandre Julliard : user32: Use the current DC layout in DrawState when drawing to an intermediate bitmap .
by Alexandre Julliard June 18, 2013

June 18, 2013

Module: wine Branch: master Commit: 8dc7b0d9c293750398732a1d5626e330fc8777a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc7b0d9c293750398732a1d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 11:32:08 2013 +0200 user32: Use the current DC layout in DrawState when drawing to an intermediate bitmap. --- dlls/user32/uitools.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 4921299..386801c 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -1690,6 +1690,7 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp SetBkColor(memdc, RGB(255, 255, 255)); SetTextColor(memdc, RGB(0, 0, 0)); hfsave = SelectObject(memdc, GetCurrentObject(hdc, OBJ_FONT)); + SetLayout( memdc, GetLayout( hdc )); /* DST_COMPLEX may draw text as well, * so we must be sure that correct font is selected

1 0

Ken Thomases : winemac: Don' t bring disabled or no-activate windows forward when clicked.
by Alexandre Julliard June 18, 2013

June 18, 2013

Module: wine Branch: master Commit: 3faf1a92b04a930359a16aa3de731a0423c2f867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3faf1a92b04a930359a16aa3d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 17 23:35:56 2013 -0500 winemac: Don't bring disabled or no-activate windows forward when clicked. --- dlls/winemac.drv/cocoa_app.m | 1 + dlls/winemac.drv/cocoa_window.h | 2 ++ dlls/winemac.drv/cocoa_window.m | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index fd481e5..2441b5d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1428,6 +1428,7 @@ int macdrv_err_on; NSEventType type = [theEvent type]; if ([window isKindOfClass:[WineWindow class]] && + !window.disabled && !window.noActivate && type == NSLeftMouseDown && (([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) { diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 362d9aa..c5a630f 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -60,6 +60,8 @@ } @property (retain, readonly, nonatomic) WineEventQueue* queue; +(a)property (readonly, nonatomic) BOOL disabled; +(a)property (readonly, nonatomic) BOOL noActivate; @property (readonly, nonatomic) BOOL floating; @property (readonly, getter=isFullscreen, nonatomic) BOOL fullscreen; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 3750931..cf63b25 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -136,8 +136,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) @interface WineWindow () -(a)property (nonatomic) BOOL disabled; -(a)property (nonatomic) BOOL noActivate; +(a)property (readwrite, nonatomic) BOOL disabled; +(a)property (readwrite, nonatomic) BOOL noActivate; @property (readwrite, nonatomic) BOOL floating; @property (retain, nonatomic) NSWindow* latentParentWindow;

1 0

Hans Leidekker : wbemprox/tests: Mark a test result as broken.
by Alexandre Julliard June 18, 2013

June 18, 2013

Module: wine Branch: master Commit: cd51d513c4c171f8fe755878cde6fbdbad4dfcd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd51d513c4c171f8fe755878c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 18 16:55:33 2013 +0200 wbemprox/tests: Mark a test result as broken. --- dlls/wbemprox/tests/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f09da91..8134e3a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -583,7 +583,7 @@ static void test_notification_query_async( IWbemServices *services ) prev_sink_refs = sink_refs; hr = IWbemServices_ExecNotificationQueryAsync( services, wql, query, 0, NULL, &sink ); ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr ); - ok( sink_refs > prev_sink_refs, "got %u refs\n", sink_refs ); + ok( sink_refs > prev_sink_refs || broken(!sink_refs), "got %u refs\n", sink_refs ); hr = IWbemServices_CancelAsyncCall( services, &sink ); ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr );

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard June 18, 2013

June 18, 2013

Module: wine Branch: master Commit: 9974a3e8998d151545f59c090ba39c145824514f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9974a3e8998d151545f59c090… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jun 18 00:42:40 2013 -0300 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 108 ++++++++++++++++------------------------------------------- 1 files changed, 29 insertions(+), 79 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 496dc18..11726b2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8277,44 +8277,36 @@ msgid "Security Warning" msgstr "Aviso de Segurança" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Deseja continuar mesmo assim?" +msgstr "Deseja instalar esse software?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Localização:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Instalar/Desinstalar" +msgstr "Não instalar" #: urlmon.rc:40 msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" +"Quando instalado, um componente ActiveX tem acesso total ao computador. Não " +"clique em instalar a menos que tenha absoluta confiança na fonte acima." #: urlmon.rc:48 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "Falha ao aplicar transformação de instalação.\n" +msgstr "Instalação do componente falhou: %08x" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Instalar" +msgstr "Instalar (%d)" #: urlmon.rc:50 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Instalar" +msgstr "Instalar" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window" @@ -10116,10 +10108,8 @@ msgid "Wine Command Prompt" msgstr "Prompt de Comando Wine" #: cmd.rc:349 -#, fuzzy -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" -msgstr "Versão do CMD %1!S!\n" +msgstr "Versão do CMD Wine %1!S!\n" #: cmd.rc:350 msgid "More? " @@ -10159,10 +10149,8 @@ msgid "Expected an operand.\n" msgstr "" #: cmd.rc:359 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" -msgstr "Erro de rede inesperado.\n" +msgstr "Um operador é esperado.\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" @@ -10225,10 +10213,8 @@ msgid "Connection-specific DNS suffix" msgstr "Sufixo DNS específico da conexão" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "endereço IP" +msgstr "Endereço IPv4" #: ipconfig.rc:34 msgid "Hostname" @@ -10271,10 +10257,8 @@ msgid "Default gateway" msgstr "Porta de ligação padrão" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "endereço IP" +msgstr "Endereço IPv6" #: net.rc:27 msgid "" @@ -10407,38 +10391,28 @@ msgid "The following services are running:\n" msgstr "Os seguintes serviços estão rodando:\n" #: netstat.rc:27 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "Conexão LAN" +msgstr "Conexões Ativas" #: netstat.rc:28 msgid "Proto" msgstr "" #: netstat.rc:29 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "Endereço de E-mail" +msgstr "Endereço Local" #: netstat.rc:30 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "Endereço da Rua" +msgstr "Endereço Remoto" #: netstat.rc:31 -#, fuzzy -#| msgid "Status" msgid "State" msgstr "Estado" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "Interfaces" +msgstr "Estatísticas de Interface" #: netstat.rc:33 msgid "Sent" @@ -10449,10 +10423,8 @@ msgid "Received" msgstr "" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" -msgstr "bytes" +msgstr "Bytes" #: netstat.rc:36 msgid "Unicast packets" @@ -10463,80 +10435,60 @@ msgid "Non-unicast packets" msgstr "" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "Declaração" +msgstr "Descartados" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" -msgstr "Erro" +msgstr "Erros" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "Porta desconhecida.\n" +msgstr "Protocolos desconhecidos" #: netstat.rc:41 msgid "TCP Statistics for IPv4" msgstr "" #: netstat.rc:42 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Opens" -msgstr "Conexão LAN" +msgstr "Abertas Ativas" #: netstat.rc:43 msgid "Passive Opens" msgstr "" #: netstat.rc:44 -#, fuzzy -#| msgid "LAN Connection" msgid "Failed Connection Attempts" -msgstr "Conexão LAN" +msgstr "Tentativas de Conexão com Falha" #: netstat.rc:45 -#, fuzzy -#| msgid "LAN Connection" msgid "Reset Connections" -msgstr "Conexão LAN" +msgstr "Reiniciar Conexões" #: netstat.rc:46 -#, fuzzy -#| msgid "LAN Connection" msgid "Current Connections" -msgstr "Conexão LAN" +msgstr "Conexões Atuais" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "Segmento trancado.\n" +msgstr "Segmentos Recebido" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "Segmento trancado.\n" +msgstr "Segmentos Enviados" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "Segmentos Retransmitidos" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "Estatísticas UDP para IPv4" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "Segmento trancado.\n" +msgstr "Datagramas Recebidos" #: netstat.rc:52 #, fuzzy @@ -10545,10 +10497,8 @@ msgid "No Ports" msgstr "Porta Local" #: netstat.rc:53 -#, fuzzy -#| msgid "Decoding Error" msgid "Receive Errors" -msgstr "Erro de Decodificação" +msgstr "Erros de Recepção" #: netstat.rc:54 msgid "Datagrams Sent"

1 0

Dmitry Timoshkov : gdi32: ExtSelectClipRgn(hdc, 0, RGN_DIFF) is supposed to fail.
by Alexandre Julliard June 18, 2013

June 18, 2013

Module: wine Branch: master Commit: 924fad9d25c928422ac66b5e13b2312151dc208b URL: http://source.winehq.org/git/wine.git/?a=commit;h=924fad9d25c928422ac66b5e1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 18 13:12:54 2013 +0900 gdi32: ExtSelectClipRgn(hdc, 0, RGN_DIFF) is supposed to fail. --- dlls/gdi32/clipping.c | 15 +++++++++++---- dlls/gdi32/tests/clipping.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 572287e..ccd61d0 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -148,14 +148,21 @@ INT nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode ) if (!rgn) { - if (mode != RGN_COPY) + switch (mode) { + case RGN_COPY: + if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); + dc->hClipRgn = 0; + ret = SIMPLEREGION; + break; + + case RGN_DIFF: + return ERROR; + + default: FIXME("Unimplemented: hrgn NULL in mode: %d\n", mode); return ERROR; } - if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); - dc->hClipRgn = 0; - ret = SIMPLEREGION; } else { diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 0247bbb..6257c17 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -2,6 +2,7 @@ * Unit test suite for clipping * * Copyright 2005 Huw Davies + * Copyright 2008,2011,2013 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -388,6 +389,12 @@ static void test_memory_dc_clipping(void) ret = GetClipRgn(hdc, hrgn); ok(ret == 0, "expected 0, got %d\n", ret); + ret = ExtSelectClipRgn(hdc, 0, RGN_DIFF); + ok(ret == 0, "expected 0, got %d\n", ret); + + ret = GetClipRgn(hdc, hrgn); + ok(ret == 0, "expected 0, got %d\n", ret); + SelectObject(hdc, hbmp); ret = ExtSelectClipRgn(hdc, hrgn_empty, RGN_DIFF); @@ -409,6 +416,17 @@ static void test_memory_dc_clipping(void) ret = RectVisible( hdc, &rc ); ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom ); + ret = ExtSelectClipRgn(hdc, 0, RGN_DIFF); + ok(ret == 0, "expected 0, got %d\n", ret); + + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + + ret = GetRgnBox(hrgn, &rc); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + ok(rc.left == 0 && rc.top == 0 && rc.right == 100 && rc.bottom == 100, + "expected 0,0-100,100, got %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom); + DeleteDC(hdc); DeleteObject(hrgn); DeleteObject(hrgn_empty); @@ -441,6 +459,12 @@ static void test_window_dc_clipping(void) ret = GetClipRgn(hdc, hrgn); ok(ret == 0, "expected 0, got %d\n", ret); + ret = ExtSelectClipRgn(hdc, 0, RGN_DIFF); + ok(ret == 0, "expected 0, got %d\n", ret); + + ret = GetClipRgn(hdc, hrgn); + ok(ret == 0, "expected 0, got %d\n", ret); + ret = ExtSelectClipRgn(hdc, hrgn_empty, RGN_DIFF); ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1), "expected SIMPLEREGION, got %d\n", ret); @@ -462,6 +486,18 @@ static void test_window_dc_clipping(void) ret = RectVisible( hdc, &rc ); ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom ); + ret = ExtSelectClipRgn(hdc, 0, RGN_DIFF); + ok(ret == 0, "expected 0, got %d\n", ret); + + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + + ret = GetRgnBox(hrgn, &rc); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + ok(rc.left == 0 && rc.top == 0 && rc.right == screen_width && rc.bottom == screen_height, + "expected 0,0-%d,%d, got %d,%d-%d,%d\n", screen_width, screen_height, + rc.left, rc.top, rc.right, rc.bottom); + ret = ExtSelectClipRgn(hdc, 0, RGN_COPY); ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1), "expected SIMPLEREGION, got %d\n", ret);

1 0

Dmitry Timoshkov : gdi32/tests: Skip the bitmap font max width test on not 96 dpi resolutions.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: 288f3be439a75a47377791cf84fa7d649989a298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288f3be439a75a47377791cf8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 17 19:00:53 2013 +0900 gdi32/tests: Skip the bitmap font max width test on not 96 dpi resolutions. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 087d572..63fe909 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -976,7 +976,7 @@ static void test_bitmap_font_metrics(void) /* Don't run the max char width test on System/ANSI_CHARSET. We have extra characters in our font that make the max width bigger */ - if(strcmp(lf.lfFaceName, "System") || lf.lfCharSet != ANSI_CHARSET) + if ((strcmp(lf.lfFaceName, "System") || lf.lfCharSet != ANSI_CHARSET) && tm.tmDigitizedAspectX == 96) ok(tm.tmMaxCharWidth == fd[i].max_char_width, "%s(%d): tm.tmMaxCharWidth %d != %d\n", fd[i].face_name, height, tm.tmMaxCharWidth, fd[i].max_char_width); } else

1 0

Dmitry Timoshkov : gdi32/tests: Add a test for default font height scaling with screen resolution changes.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: 6834a44dc4c3c7e8c377a2fd56d11e93edd37b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6834a44dc4c3c7e8c377a2fd5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 17 19:01:39 2013 +0900 gdi32/tests: Add a test for default font height scaling with screen resolution changes. --- dlls/gdi32/tests/font.c | 67 ++++++++++++++++++++++++++--------------------- 1 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 63fe909..2802f0e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4900,7 +4900,7 @@ static void test_east_asian_font_selection(void) ReleaseDC(NULL, hdc); } -static int get_font_dpi(const LOGFONT *lf) +static int get_font_dpi(const LOGFONT *lf, int *height) { HDC hdc = CreateCompatibleDC(0); HFONT hfont; @@ -4914,6 +4914,7 @@ static int get_font_dpi(const LOGFONT *lf) ret = GetTextMetrics(hdc, &tm); ok(ret, "GetTextMetrics failed\n"); ret = tm.tmDigitizedAspectX; + if (height) *height = tm.tmHeight; DeleteDC(hdc); DeleteObject(hfont); @@ -4930,49 +4931,49 @@ static void test_stock_fonts(void) }; static const struct test_data { - int charset, weight, height, dpi; + int charset, weight, height, height_pixels, dpi; const char face_name[LF_FACESIZE]; } td[][11] = { { /* ANSI_FIXED_FONT */ - { DEFAULT_CHARSET, FW_NORMAL, 12, 96, "Courier" }, - { DEFAULT_CHARSET, FW_NORMAL, 12, 120, "Courier" }, + { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 96, "Courier" }, + { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 120, "Courier" }, { 0 } }, { /* ANSI_VAR_FONT */ - { DEFAULT_CHARSET, FW_NORMAL, 12, 96, "MS Sans Serif" }, - { DEFAULT_CHARSET, FW_NORMAL, 12, 120, "MS Sans Serif" }, + { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 96, "MS Sans Serif" }, + { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 120, "MS Sans Serif" }, { 0 } }, { /* SYSTEM_FONT */ - { SHIFTJIS_CHARSET, FW_NORMAL, 18, 96, "System" }, - { SHIFTJIS_CHARSET, FW_NORMAL, 22, 120, "System" }, - { HANGEUL_CHARSET, FW_NORMAL, 16, 96, "System" }, - { HANGEUL_CHARSET, FW_NORMAL, 20, 120, "System" }, - { DEFAULT_CHARSET, FW_BOLD, 16, 96, "System" }, - { DEFAULT_CHARSET, FW_BOLD, 20, 120, "System" }, + { SHIFTJIS_CHARSET, FW_NORMAL, 18, 18, 96, "System" }, + { SHIFTJIS_CHARSET, FW_NORMAL, 22, 22, 120, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 16, 16, 96, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 20, 20, 120, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 16, 16, 96, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 20, 20, 120, "System" }, { 0 } }, { /* DEVICE_DEFAULT_FONT */ - { SHIFTJIS_CHARSET, FW_NORMAL, 18, 96, "System" }, - { SHIFTJIS_CHARSET, FW_NORMAL, 22, 120, "System" }, - { HANGEUL_CHARSET, FW_NORMAL, 16, 96, "System" }, - { HANGEUL_CHARSET, FW_NORMAL, 20, 120, "System" }, - { DEFAULT_CHARSET, FW_BOLD, 16, 96, "System" }, - { DEFAULT_CHARSET, FW_BOLD, 20, 120, "System" }, + { SHIFTJIS_CHARSET, FW_NORMAL, 18, 18, 96, "System" }, + { SHIFTJIS_CHARSET, FW_NORMAL, 22, 22, 120, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 16, 16, 96, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 20, 20, 120, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 16, 16, 96, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 20, 20, 120, "System" }, { 0 } }, { /* DEFAULT_GUI_FONT */ - { SHIFTJIS_CHARSET, FW_NORMAL, -12, 96, "?MS UI Gothic" }, - { SHIFTJIS_CHARSET, FW_NORMAL, -15, 120, "?MS UI Gothic" }, - { HANGEUL_CHARSET, FW_NORMAL, -12, 96, "?Gulim" }, - { HANGEUL_CHARSET, FW_NORMAL, -15, 120, "?Gulim" }, - { GB2312_CHARSET, FW_NORMAL, -12, 96, "?SimHei" }, - { GB2312_CHARSET, FW_NORMAL, -15, 120, "?SimHei" }, - { CHINESEBIG5_CHARSET, FW_NORMAL, -12, 96, "?MingLiU" }, - { CHINESEBIG5_CHARSET, FW_NORMAL, -15, 120, "?MingLiU" }, - { DEFAULT_CHARSET, FW_NORMAL, -11, 96, "MS Shell Dlg" }, - { DEFAULT_CHARSET, FW_NORMAL, -13, 120, "MS Shell Dlg" }, + { SHIFTJIS_CHARSET, FW_NORMAL, -12, 15, 96, "?MS UI Gothic" }, + { SHIFTJIS_CHARSET, FW_NORMAL, -15, 18, 120, "?MS UI Gothic" }, + { HANGEUL_CHARSET, FW_NORMAL, -12, 15, 96, "?Gulim" }, + { HANGEUL_CHARSET, FW_NORMAL, -15, 18, 120, "?Gulim" }, + { GB2312_CHARSET, FW_NORMAL, -12, 15, 96, "?SimHei" }, + { GB2312_CHARSET, FW_NORMAL, -15, 18, 120, "?SimHei" }, + { CHINESEBIG5_CHARSET, FW_NORMAL, -12, 15, 96, "?MingLiU" }, + { CHINESEBIG5_CHARSET, FW_NORMAL, -15, 18, 120, "?MingLiU" }, + { DEFAULT_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" }, + { DEFAULT_CHARSET, FW_NORMAL, -13, 16, 120, "MS Shell Dlg" }, { 0 } } }; @@ -4982,7 +4983,7 @@ static void test_stock_fonts(void) { HFONT hfont; LOGFONT lf; - int ret; + int ret, height; hfont = GetStockObject(font[i]); ok(hfont != 0, "%d: GetStockObject(%d) failed\n", i, font[i]); @@ -5002,7 +5003,7 @@ static void test_stock_fonts(void) continue; } - ret = get_font_dpi(&lf); + ret = get_font_dpi(&lf, &height); if (ret != td[i][j].dpi) { trace("%d(%d): font %s %d dpi doesn't match test data %d\n", @@ -5010,6 +5011,12 @@ static void test_stock_fonts(void) continue; } + /* FIXME: Remove once Wine is fixed */ + if (td[i][j].dpi != 96) todo_wine + ok(height == td[i][j].height_pixels, "%d(%d): expected height %d, got %d\n", i, j, td[i][j].height_pixels, height); + else + ok(height == td[i][j].height_pixels, "%d(%d): expected height %d, got %d\n", i, j, td[i][j].height_pixels, height); + ok(td[i][j].weight == lf.lfWeight, "%d(%d): expected lfWeight %d, got %d\n", i, j, td[i][j].weight, lf.lfWeight); ok(td[i][j].height == lf.lfHeight, "%d(%d): expected lfHeight %d, got %d\n", i, j, td[i][j].height, lf.lfHeight); if (td[i][j].face_name[0] == '?')

1 0