wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Francois Gouget : po: A couple of line wrapping tweaks in the Czech translation.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 6ff1efb717b4e7a7e3a1ea5743b90d6458428153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ff1efb717b4e7a7e3a1ea574… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:16:39 2012 +0200 po: A couple of line wrapping tweaks in the Czech translation. --- po/cs.po | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/po/cs.po b/po/cs.po index f7fa51b..169618f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -178,8 +178,7 @@ msgid "" "entry for this program from the registry?" msgstr "" "Spuštění odinstalování %s selhalo, možná příčína je předchozí smazání " -"aplikace.\n" -"Přejete si odstranit záznam odinstalace tohoto programu z registru?" +"aplikace. Přejete si odstranit záznam odinstalace tohoto programu z registru?" #: appwiz.rc:33 #, fuzzy @@ -1205,7 +1204,7 @@ msgid "" msgstr "" "Zapnutý Caps Lock může způsobit nesprávné zadání hesla.\n" "\n" -"Stiskněte klávesu Caps Lock na své klávesnici pro vypnutí funkce Caps Lock " +"Stiskněte klávesu Caps Lock na své klávesnici pro vypnutí funkce Caps Lock\n" "před napsáním hesla." #: credui.rc:31

1 0

Francois Gouget : po: Fix some typography issues in the Czech translation.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 985ae2290c192ea2629c874ad21cd5ba041e9d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=985ae2290c192ea2629c874ad… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:15:47 2012 +0200 po: Fix some typography issues in the Czech translation. --- po/cs.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/cs.po b/po/cs.po index d6d3234..f7fa51b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1166,11 +1166,11 @@ msgstr "mm" #: credui.rc:42 msgid "&User name:" -msgstr "&Uživatelské jméno" +msgstr "&Uživatelské jméno:" #: credui.rc:45 cryptui.rc:394 msgid "&Password:" -msgstr "&Heslo" +msgstr "&Heslo:" #: credui.rc:47 msgid "&Remember my password" @@ -12644,7 +12644,7 @@ msgstr "Zobrazit rozšířené možnosti" #: winecfg.rc:240 msgid "De&vice:" -msgstr "&Zařízení" +msgstr "&Zařízení:" #: winecfg.rc:242 msgid "Bro&wse..."

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 1fbccef1accc0a369c3c1704129ac11a15bab7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbccef1accc0a369c3c17041… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 20 11:13:02 2012 +0400 po: Update Russian translation. --- po/ru.po | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/po/ru.po b/po/ru.po index 339fba0..80c1791 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3538,16 +3538,12 @@ msgid "URI to be decoded is incorrect" msgstr "Декодируемый URI неверен" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "Значение перечисления вне диапазона.\n" +msgstr "Количество знаков после запятой вне диапазона" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "Индекс вне диапазона" +msgstr "Точность представления вне диапазона" #: jscript.rc:59 msgid "Array length must be a finite positive integer"

1 0

Huw Davies : winspool: If CUPS is found but lists no printers assume that there really are no printers - don 't look in /etc/printcap.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: f27df046ad97129fc5be8a9c1d66f11938a6d277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27df046ad97129fc5be8a9c1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 20 11:19:29 2012 +0100 winspool: If CUPS is found but lists no printers assume that there really are no printers - don't look in /etc/printcap. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 30dcd86..a09ebbe 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -567,7 +567,7 @@ static BOOL CUPS_LoadPrinters(void) } pcupsFreeDests(nrofdests, dests); RegCloseKey(hkeyPrinters); - return hadprinter; + return TRUE; } #endif

1 0

Huw Davies : winspool: Update the default settings when deleting the default printer.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 1aa5696c933490d6a02661860466a0acc335cb8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa5696c933490d6a02661860… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 20 11:19:28 2012 +0100 winspool: Update the default settings when deleting the default printer. --- dlls/winspool.drv/info.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a2e3f8b..30dcd86 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2812,6 +2812,8 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) { LPCWSTR lpNameW = get_opened_printer_name(hPrinter); HKEY hkeyPrinters, hkey; + WCHAR def[MAX_PATH]; + DWORD size = sizeof( def ) / sizeof( def[0] ); if(!lpNameW) { SetLastError(ERROR_INVALID_HANDLE); @@ -2833,6 +2835,18 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) RegDeleteValueW(hkey, lpNameW); RegCloseKey(hkey); } + + if (GetDefaultPrinterW( def, &size ) && !strcmpW( def, lpNameW )) + { + WriteProfileStringW( windowsW, deviceW, NULL ); + if (!RegCreateKeyW( HKEY_CURRENT_USER, user_default_reg_key, &hkey )) + { + RegDeleteValueW( hkey, deviceW ); + RegCloseKey( hkey ); + } + SetDefaultPrinterW( NULL ); + } + return TRUE; }

1 0

Piotr Caban : msvcr90: Fix byteswap_ulong implementation.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: c0140118be99b6965b44b867eec2c21ac2ac667f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0140118be99b6965b44b867e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 20 12:16:38 2012 +0200 msvcr90: Fix byteswap_ulong implementation. --- dlls/msvcr90/msvcr90.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 2caf60d..99ae9ed 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -378,7 +378,7 @@ unsigned short CDECL _byteswap_ushort(unsigned short s) /********************************************************************* * _byteswap_ulong (MSVCR90.@) */ -unsigned long CDECL _byteswap_ulong(unsigned long l) +ULONG CDECL _byteswap_ulong(ULONG l) { return (l<<24) + ((l<<8)&0xFF0000) + ((l>>8)&0xFF00) + (l>>24); }

1 0

Alexandre Julliard : gdi32/tests: Take into account multi-monitor setups in the clip region tests.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: caf15dd7979b5eb0a446a89116fb4000ac614242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf15dd7979b5eb0a446a8911… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 20 12:12:06 2012 +0200 gdi32/tests: Take into account multi-monitor setups in the clip region tests. --- dlls/gdi32/tests/clipping.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index dcdc8d7..04b2785 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -333,7 +333,7 @@ static void test_GetClipRgn(void) /* Try unsetting and then query the clipping region. */ ret = SelectClipRgn(hdc, NULL); - ok(ret == SIMPLEREGION, + ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1), "Expected SelectClipRgn to return SIMPLEREGION, got %d\n", ret); ret = GetClipRgn(hdc, NULL); @@ -434,7 +434,8 @@ static void test_window_dc_clipping(void) ok(ret == 0, "expected 0, got %d\n", ret); ret = ExtSelectClipRgn(hdc, hrgn_empty, RGN_DIFF); - ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1), + "expected SIMPLEREGION, got %d\n", ret); ret = GetClipRgn(hdc, hrgn); ok(ret == 1, "expected 1, got %d\n", ret); @@ -446,7 +447,8 @@ static void test_window_dc_clipping(void) rc.left, rc.top, rc.right, rc.bottom); ret = ExtSelectClipRgn(hdc, 0, RGN_COPY); - ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1), + "expected SIMPLEREGION, got %d\n", ret); ret = GetClipRgn(hdc, hrgn); ok(ret == 0, "expected 0, got %d\n", ret);

1 0

Francois Gouget : msi: Make create_record() static.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: f5a5cc067a8d01ffd62419e830c9dd61dce97b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5a5cc067a8d01ffd62419e83… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 20 08:40:15 2012 +0200 msi: Make create_record() static. --- dlls/msi/automation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index f1a3532..375191e 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -926,7 +926,7 @@ static HRESULT RecordImpl_Invoke( return S_OK; } -HRESULT create_record(MSIHANDLE msiHandle, IDispatch **disp) +static HRESULT create_record(MSIHANDLE msiHandle, IDispatch **disp) { AutomationObject *record; HRESULT hr;

1 0

Francois Gouget : gdiplus/tests: Make test_pathgradientpresetblend() static .
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 84bc0f7888846dd731952b2a4144e520de35baee URL: http://source.winehq.org/git/wine.git/?a=commit;h=84bc0f7888846dd731952b2a4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 20 08:40:12 2012 +0200 gdiplus/tests: Make test_pathgradientpresetblend() static. --- dlls/gdiplus/tests/brush.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 6321011..bf74abd 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -993,7 +993,7 @@ static void test_pathgradientcenterpoint(void) expect(Ok, status); } -void test_pathgradientpresetblend(void) +static void test_pathgradientpresetblend(void) { static const GpPointF path_points[] = {{0,0}, {3,0}, {0,4}}; GpStatus status;

1 0

Francois Gouget : wineoss.drv: Make get_ossdevice_from_guid() static.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: d76d88a74b86b62ce9ced37bfd6323e29b0653e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76d88a74b86b62ce9ced37bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 20 08:40:04 2012 +0200 wineoss.drv: Make get_ossdevice_from_guid() static. --- dlls/wineoss.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 70ea416..9b0f5f8 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -588,7 +588,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, return S_OK; } -const OSSDevice *get_ossdevice_from_guid(const GUID *guid) +static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) { OSSDevice *dev_item; LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry)

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
72
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 April 2012