wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

André Hentschel : dinput: Don' t use autoheader styled define.
by Alexandre Julliard 18 Jun '13

18 Jun '13

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 : winefile: Avoid abbreviations in column names.
by Alexandre Julliard 18 Jun '13

18 Jun '13

1 0

Alexandre Julliard : user32: Use the current DC layout in DrawState when drawing to an intermediate bitmap .
by Alexandre Julliard 18 Jun '13

18 Jun '13

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 give windows focus on click if the click was sent to Wine.
by Alexandre Julliard 18 Jun '13

18 Jun '13

Module: wine Branch: master Commit: f035cc73d0ae3f192f19109c1ef16cc536fcc5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f035cc73d0ae3f192f19109c1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 17 23:36:01 2013 -0500 winemac: Don't give windows focus on click if the click was sent to Wine. Only clicks on the title bar (outside the close or minimize buttons) or the grow box give windows focus. --- dlls/winemac.drv/cocoa_app.m | 6 +++++- dlls/winemac.drv/cocoa_window.m | 16 ---------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 2441b5d..20050bf 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1426,6 +1426,7 @@ int macdrv_err_on; { WineWindow* window = (WineWindow*)[theEvent window]; NSEventType type = [theEvent type]; + BOOL broughtWindowForward = FALSE; if ([window isKindOfClass:[WineWindow class]] && !window.disabled && !window.noActivate && @@ -1433,7 +1434,8 @@ int macdrv_err_on; (([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) { NSWindowButton windowButton; - BOOL broughtWindowForward = TRUE; + + broughtWindowForward = TRUE; /* Any left-click on our window anyplace other than the close or minimize buttons will bring it forward. */ @@ -1538,6 +1540,8 @@ int macdrv_err_on; macdrv_release_event(event); } + else if (broughtWindowForward && ![window isKeyWindow]) + [self windowGotFocus:window]; } // Since mouse button events deliver absolute cursor position, the diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index cf63b25..d926635 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1181,8 +1181,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) sendEvent:(NSEvent*)event { - WineApplicationController* controller = [WineApplicationController sharedController]; - /* NSWindow consumes certain key-down events as part of Cocoa's keyboard interface control. For example, Control-Tab switches focus among views. We want to bypass that feature, so directly route key-down @@ -1190,21 +1188,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if ([event type] == NSKeyDown) [[self firstResponder] keyDown:event]; else - { - if ([event type] == NSLeftMouseDown && - (([event modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) - { - /* Since our windows generally claim they can't be made key, clicks - in their title bars are swallowed by the theme frame stuff. So, - we hook directly into the event stream and assume that any click - in the window will activate it, if Wine and the Win32 program - accept. */ - if (![self isKeyWindow] && !self.disabled && !self.noActivate) - [controller windowGotFocus:self]; - } - [super sendEvent:event]; - } }

1 0

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

18 Jun '13

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; +@property (readonly, nonatomic) BOOL disabled; +@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 () -@property (nonatomic) BOOL disabled; -@property (nonatomic) BOOL noActivate; +@property (readwrite, nonatomic) BOOL disabled; +@property (readwrite, nonatomic) BOOL noActivate; @property (readwrite, nonatomic) BOOL floating; @property (retain, nonatomic) NSWindow* latentParentWindow;

1 0

Dmitry Timoshkov : comctl32: Fix broken logic for retrieving default font properties.
by Alexandre Julliard 18 Jun '13

18 Jun '13

Module: wine Branch: master Commit: c14ff4bef0bd87000fea08eb69d29ddc6d874f5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14ff4bef0bd87000fea08eb6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 18 16:34:27 2013 +0900 comctl32: Fix broken logic for retrieving default font properties. --- dlls/comctl32/tab.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index bd75c88..85467ba 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1899,7 +1899,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect if(infoPtr->dwStyle & TCS_VERTICAL) /* if we are vertical rotate the text and each character */ { LOGFONTW logfont; - HFONT hFont = 0; + HFONT hFont; INT nEscapement = 900; INT nOrientation = 900; @@ -1911,10 +1911,8 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect /* to get a font with the escapement and orientation we are looking for, we need to */ /* call CreateFontIndirect, which requires us to set the values of the logfont we pass in */ - if (!GetObjectW((infoPtr->hFont) ? - infoPtr->hFont : GetStockObject(DEFAULT_GUI_FONT), - sizeof(LOGFONTW),&logfont)) - GetStockObject(DEFAULT_GUI_FONT); + if (!GetObjectW(infoPtr->hFont, sizeof(logfont), &logfont)) + GetObjectW(GetStockObject(DEFAULT_GUI_FONT), sizeof(logfont), &logfont); logfont.lfEscapement = nEscapement; logfont.lfOrientation = nOrientation;

1 0

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

18 Jun '13

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

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 18 Jun '13

18 Jun '13

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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: d6109e3710297eac425a172d8cecd48ad3d6542d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6109e3710297eac425a172d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 17 21:55:56 2013 +0400 po: Update Russian translation. --- po/ru.po | 221 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 110 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6109e3710297eac425a1…

1 0

Aric Stewart : ole32: Do not fail if partial blocks are read.
by Alexandre Julliard 17 Jun '13

17 Jun '13

Module: wine Branch: master Commit: df6115aea65c0931c2d579ece8ac15c1dcb113c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6115aea65c0931c2d579ece… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 17 11:28:42 2013 -0500 ole32: Do not fail if partial blocks are read. --- dlls/ole32/storage32.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 5009127..bd076ce 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -6226,7 +6226,8 @@ HRESULT BlockChainStream_ReadAt(BlockChainStream* This, { if (!cachedBlock->read) { - if (FAILED(StorageImpl_ReadBigBlock(This->parentStorage, cachedBlock->sector, cachedBlock->data, NULL))) + ULONG read; + if (FAILED(StorageImpl_ReadBigBlock(This->parentStorage, cachedBlock->sector, cachedBlock->data, &read)) && !read) return STG_E_READFAULT; cachedBlock->read = 1; @@ -6310,7 +6311,8 @@ HRESULT BlockChainStream_WriteAt(BlockChainStream* This, { if (!cachedBlock->read && bytesToWrite != This->parentStorage->bigBlockSize) { - if (FAILED(StorageImpl_ReadBigBlock(This->parentStorage, cachedBlock->sector, cachedBlock->data, NULL))) + ULONG read; + if (FAILED(StorageImpl_ReadBigBlock(This->parentStorage, cachedBlock->sector, cachedBlock->data, &read)) && !read) return STG_E_READFAULT; }

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
42
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 June 2013