September 2010 - Wine-commits

André Hentschel : winedump: Add more subsystem descriptions.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 7b1e33152353149bfd2b2d9bc1c81aa45bd50e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1e33152353149bfd2b2d9bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 19 23:22:39 2010 +0200 winedump: Add more subsystem descriptions. --- include/winnt.h | 1 + tools/winedump/pe.c | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index fce9952..8c17159 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2773,6 +2773,7 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12 #define IMAGE_SUBSYSTEM_EFI_ROM 13 #define IMAGE_SUBSYSTEM_XBOX 14 +#define IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION 16 /* DLL Characteristics */ #define IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE 0x0040 diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 48578d6..a2b1fe5 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -193,6 +193,14 @@ static inline void print_subsys(const char *title, WORD value) case IMAGE_SUBSYSTEM_WINDOWS_CUI: str = "Windows CUI"; break; case IMAGE_SUBSYSTEM_OS2_CUI: str = "OS/2 CUI"; break; case IMAGE_SUBSYSTEM_POSIX_CUI: str = "Posix CUI"; break; + case IMAGE_SUBSYSTEM_NATIVE_WINDOWS: str = "native Win9x driver"; break; + case IMAGE_SUBSYSTEM_WINDOWS_CE_GUI: str = "Windows CE GUI"; break; + case IMAGE_SUBSYSTEM_EFI_APPLICATION: str = "EFI application"; break; + case IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER: str = "EFI driver (boot)"; break; + case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER: str = "EFI driver (runtime)"; break; + case IMAGE_SUBSYSTEM_EFI_ROM: str = "EFI ROM"; break; + case IMAGE_SUBSYSTEM_XBOX: str = "Xbox application"; break; + case IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION: str = "Boot application"; break; } printf(" %-34s 0x%X (%s)\n", title, value, str); }

1 0

André Hentschel : shell32: Update German translation.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 84dccd920be67b6b25b2cf6a6547c8b14bb9c2b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84dccd920be67b6b25b2cf6a6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 19 23:36:13 2010 +0200 shell32: Update German translation. --- dlls/shell32/shell32_De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index ed33c1c..f29a566 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -305,6 +305,7 @@ STRINGTABLE IDS_COMMON_OEM_LINKS "OEM Links" IDS_DOCUMENTS "Dokumente" IDS_DOWNLOADS "Downloads" + IDS_LOCAL_APPDATA_LOW "Anwendungsdaten\\LocalLow" IDS_NEWFOLDER "Neuer Ordner"

1 0

Lauri Kenttä : wined3d: Use the same card selection for both Intel Mesa and binary drivers.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 602486bdb4b1aeabc9ab36d90922cd80e6be6239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=602486bdb4b1aeabc9ab36d90… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Sep 16 18:16:54 2010 +0300 wined3d: Use the same card selection for both Intel Mesa and binary drivers. --- dlls/wined3d/directx.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9f1b3be..ff41438 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1826,7 +1826,7 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in return CARD_ATI_RAGE_128PRO; } -static enum wined3d_pci_device select_card_intel_binary(const struct wined3d_gl_info *gl_info, +static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { if (strstr(gl_renderer, "X3100")) @@ -2046,13 +2046,6 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i return CARD_NVIDIA_RIVA_128; } -static enum wined3d_pci_device select_card_intel_mesa(const struct wined3d_gl_info *gl_info, - const char *gl_renderer) -{ - FIXME_(d3d_caps)("Card selection not handled for Mesa Intel driver\n"); - return CARD_INTEL_I915G; -} - struct vendor_card_selection { @@ -2067,12 +2060,12 @@ static const struct vendor_card_selection vendor_card_select_table[] = {GL_VENDOR_NVIDIA, HW_VENDOR_NVIDIA, "Nvidia binary driver", select_card_nvidia_binary}, {GL_VENDOR_APPLE, HW_VENDOR_NVIDIA, "Apple OSX NVidia binary driver", select_card_nvidia_binary}, {GL_VENDOR_APPLE, HW_VENDOR_ATI, "Apple OSX AMD/ATI binary driver", select_card_ati_binary}, - {GL_VENDOR_APPLE, HW_VENDOR_INTEL, "Apple OSX Intel binary driver", select_card_intel_binary}, + {GL_VENDOR_APPLE, HW_VENDOR_INTEL, "Apple OSX Intel binary driver", select_card_intel}, {GL_VENDOR_FGLRX, HW_VENDOR_ATI, "AMD/ATI binary driver", select_card_ati_binary}, {GL_VENDOR_MESA, HW_VENDOR_ATI, "Mesa AMD/ATI driver", select_card_ati_mesa}, {GL_VENDOR_MESA, HW_VENDOR_NVIDIA, "Mesa Nouveau driver", select_card_nvidia_mesa}, - {GL_VENDOR_MESA, HW_VENDOR_INTEL, "Mesa Intel driver", select_card_intel_mesa}, - {GL_VENDOR_INTEL, HW_VENDOR_INTEL, "Mesa Intel driver", select_card_intel_mesa} + {GL_VENDOR_MESA, HW_VENDOR_INTEL, "Mesa Intel driver", select_card_intel}, + {GL_VENDOR_INTEL, HW_VENDOR_INTEL, "Mesa Intel driver", select_card_intel} };

1 0

Jacek Caban : include: Fixed D3DMULTISAMPLE_FORCE_DWORD value and added MAKEFOURCC definition guard .
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 12f40e93871cc2b2848de4abde1a0a092144fd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f40e93871cc2b2848de4abd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 15:29:43 2010 +0200 include: Fixed D3DMULTISAMPLE_FORCE_DWORD value and added MAKEFOURCC definition guard. --- include/d3d8types.h | 6 +++--- include/d3d9types.h | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/d3d8types.h b/include/d3d8types.h index 21e30b5..3d0d7cb 100644 --- a/include/d3d8types.h +++ b/include/d3d8types.h @@ -148,11 +148,11 @@ #define D3DCOLORWRITEENABLE_ALPHA (1L<<3) - +#ifndef MAKEFOURCC #define MAKEFOURCC(ch0, ch1, ch2, ch3) \ ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) - +#endif /**************************** * Vertex Shaders Declaration @@ -683,7 +683,7 @@ typedef enum _D3DMULTISAMPLE_TYPE { D3DMULTISAMPLE_15_SAMPLES = 15, D3DMULTISAMPLE_16_SAMPLES = 16, - D3DMULTISAMPLE_FORCE_DWORD = 0xffffffff + D3DMULTISAMPLE_FORCE_DWORD = 0x7fffffff } D3DMULTISAMPLE_TYPE; typedef enum _D3DORDERTYPE { diff --git a/include/d3d9types.h b/include/d3d9types.h index ab9d4ce..db5fe39 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -191,9 +191,11 @@ #define D3DVERTEXTEXTURESAMPLER2 (D3DDMAPSAMPLER+3) #define D3DVERTEXTEXTURESAMPLER3 (D3DDMAPSAMPLER+4) +#ifndef MAKEFOURCC #define MAKEFOURCC(ch0, ch1, ch2, ch3) \ ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) +#endif /* Constants used by D3DPRESENT_PARAMETERS. when creating a device or swapchain */ @@ -867,7 +869,7 @@ typedef enum _D3DMULTISAMPLE_TYPE { D3DMULTISAMPLE_15_SAMPLES = 15, D3DMULTISAMPLE_16_SAMPLES = 16, - D3DMULTISAMPLE_FORCE_DWORD = 0xffffffff + D3DMULTISAMPLE_FORCE_DWORD = 0x7fffffff } D3DMULTISAMPLE_TYPE; #if 0

1 0

Paul Vriens : msi/tests: Prevent a popup on Windows NT.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 3d6a57a4941ad8e7205490b48ae384b1847ffdb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6a57a4941ad8e7205490b48… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Sep 20 11:26:09 2010 +0200 msi/tests: Prevent a popup on Windows NT. --- dlls/msi/tests/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 7be5094..345c63f 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4864,7 +4864,7 @@ static void delete_pfmsitest_files(void) shfl.wFunc = FO_DELETE; shfl.pFrom = path; shfl.pTo = NULL; - shfl.fFlags = FOF_FILESONLY | FOF_NOCONFIRMATION | FOF_NORECURSION | FOF_SILENT; + shfl.fFlags = FOF_FILESONLY | FOF_NOCONFIRMATION | FOF_NORECURSION | FOF_SILENT | FOF_NOERRORUI; SHFileOperation(&shfl);

1 0

Alexandre Julliard : ws2_32: Fail when select is called with an invalid fd.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 4cbfe4e1efb8c372cc95d91b3572f56e20e2e64c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cbfe4e1efb8c372cc95d91b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 20 14:56:55 2010 +0200 ws2_32: Fail when select is called with an invalid fd. Based on a patch by Vincent Povirk. --- dlls/ws2_32/socket.c | 27 +++++++++++++++++++++++---- dlls/ws2_32/tests/sock.c | 6 +++--- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0335d41..1894772 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3087,11 +3087,16 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set if (exceptfds) count += exceptfds->fd_count; *count_ptr = count; if (!count) return NULL; - if (!(fds = HeapAlloc( GetProcessHeap(), 0, count * sizeof(fds[0])))) return NULL; + if (!(fds = HeapAlloc( GetProcessHeap(), 0, count * sizeof(fds[0])))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return NULL; + } if (readfds) for (i = 0; i < readfds->fd_count; i++, j++) { fds[j].fd = get_sock_fd( readfds->fd_array[i], FILE_READ_DATA, NULL ); + if (fds[j].fd == -1) goto failed; fds[j].events = POLLIN; fds[j].revents = 0; } @@ -3099,6 +3104,7 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set for (i = 0; i < writefds->fd_count; i++, j++) { fds[j].fd = get_sock_fd( writefds->fd_array[i], FILE_WRITE_DATA, NULL ); + if (fds[j].fd == -1) goto failed; fds[j].events = POLLOUT; fds[j].revents = 0; } @@ -3106,10 +3112,26 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set for (i = 0; i < exceptfds->fd_count; i++, j++) { fds[j].fd = get_sock_fd( exceptfds->fd_array[i], 0, NULL ); + if (fds[j].fd == -1) goto failed; fds[j].events = POLLHUP; fds[j].revents = 0; } return fds; + +failed: + count = j; + j = 0; + if (readfds) + for (i = 0; i < readfds->fd_count && j < count; i++, j++) + release_sock_fd( readfds->fd_array[i], fds[j].fd ); + if (writefds) + for (i = 0; i < writefds->fd_count && j < count; i++, j++) + release_sock_fd( writefds->fd_array[i], fds[j].fd ); + if (exceptfds) + for (i = 0; i < exceptfds->fd_count && j < count; i++, j++) + release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); + HeapFree( GetProcessHeap(), 0, fds ); + return NULL; } /* release the file descriptor obtained in fd_sets_to_poll */ @@ -3188,10 +3210,7 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, ws_readfds, ws_writefds, ws_exceptfds, ws_timeout); if (!(pollfds = fd_sets_to_poll( ws_readfds, ws_writefds, ws_exceptfds, &count )) && count) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return SOCKET_ERROR; - } if (ws_timeout) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 16c6fcb..b2a22af 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1946,7 +1946,7 @@ static void test_select(void) FD_SET(INVALID_SOCKET, &readfds); SetLastError(0); ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); ok ( !FD_ISSET(fdRead, &readfds), "FD should not be set\n"); @@ -1954,7 +1954,7 @@ static void test_select(void) FD_SET(INVALID_SOCKET, &writefds); SetLastError(0); ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); ok ( !FD_ISSET(fdRead, &writefds), "FD should not be set\n"); @@ -1962,7 +1962,7 @@ static void test_select(void) FD_SET(INVALID_SOCKET, &exceptfds); SetLastError(0); ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); }

1 0

Detlef Riekenberg : inetcpl: Implement LaunchSiteCertDialog on top of cryptui.CryptUIDlgCertMgr.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 5c18b9fe3ecf3d49abf2a2db964ba22bb5db8692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c18b9fe3ecf3d49abf2a2db9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 17 19:19:35 2010 +0200 inetcpl: Implement LaunchSiteCertDialog on top of cryptui.CryptUIDlgCertMgr. --- dlls/inetcpl.cpl/Makefile.in | 2 + dlls/inetcpl.cpl/content.c | 73 +++++++++++++++++++++++++++++++++++++ dlls/inetcpl.cpl/inetcpl.cpl.spec | 2 +- 3 files changed, 76 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 972f103..f2259c3 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -1,6 +1,8 @@ MODULE = inetcpl.cpl +DELAYIMPORTS = cryptui C_SRCS = \ + content.c \ inetcpl.c RC_SRCS = \ diff --git a/dlls/inetcpl.cpl/content.c b/dlls/inetcpl.cpl/content.c new file mode 100644 index 0000000..4cc0d75 --- /dev/null +++ b/dlls/inetcpl.cpl/content.c @@ -0,0 +1,73 @@ +/* + * Internet control panel applet: content propsheet + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define NONAMELESSUNION + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <cryptuiapi.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); + +/********************************************************************* + * display_cert_manager (internal) + * + * call cryptui to display a specific certificate manager dialog + * + */ +static BOOL display_cert_manager(HWND parent, DWORD flags) +{ + CRYPTUI_CERT_MGR_STRUCT dlg; + + TRACE("(%p, 0x%x)\n", parent, flags); + + ZeroMemory(&dlg, sizeof(CRYPTUI_CERT_MGR_STRUCT)); + dlg.dwSize = sizeof(CRYPTUI_CERT_MGR_STRUCT); + dlg.hwndParent = parent; + dlg.dwFlags = flags; + + return CryptUIDlgCertMgr(&dlg); +} + +/********************************************************************* + * LaunchSiteCertDialog (inetcpl.@) + * + * Launch a dialog to manage personal certificates + * + * PARAMS + * hWnd [I] Handle for the parrent window + * + * RETURNS + * Failure: FALSE + * Success: TRUE + * + * NOTES + * rundll32 callable function: rundll32 inetcpl.cpl,LaunchSiteCertDialog + * + */ +BOOL WINAPI LaunchSiteCertDialog(HWND parent) +{ + return display_cert_manager(parent, 0); +} diff --git a/dlls/inetcpl.cpl/inetcpl.cpl.spec b/dlls/inetcpl.cpl/inetcpl.cpl.spec index 4394145..21cb34b 100644 --- a/dlls/inetcpl.cpl/inetcpl.cpl.spec +++ b/dlls/inetcpl.cpl/inetcpl.cpl.spec @@ -14,7 +14,7 @@ @ stub LaunchPrivacyDialog @ stub LaunchSecurityDialog @ stub LaunchSecurityDialogEx -@ stub LaunchSiteCertDialog +@ stdcall LaunchSiteCertDialog(long) @ stub OpenFontsDialog @ stub OpenFontsDialogEx @ stub OpenLanguageDialog

1 0

Łukasz Wojniłowicz : oleacc: Update the Polish translation.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 6801cc6be86874b0010b56b8c4c3402bb1a9ca49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6801cc6be86874b0010b56b8c… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Sep 19 11:11:41 2010 +0200 oleacc: Update the Polish translation. --- dlls/oleacc/oleacc_Pl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleacc/oleacc_Pl.rc b/dlls/oleacc/oleacc_Pl.rc index 87e3917..33761d8 100644 --- a/dlls/oleacc/oleacc_Pl.rc +++ b/dlls/oleacc/oleacc_Pl.rc @@ -24,7 +24,7 @@ LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL STRINGTABLE { - 0 "unknown object" /* undocumented */ + 0 "nieznany obiekt" /* undocumented */ ROLE_SYSTEM_TITLEBAR "pasek tytu�u" ROLE_SYSTEM_MENUBAR "pasek menu" ROLE_SYSTEM_SCROLLBAR "pasek przewijania"

1 0

Łukasz Wojniłowicz : appwiz.cpl: Update the Polish translation.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 0623b696d019de3ad670913c9bf7a91e55f29aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0623b696d019de3ad670913c9… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Sep 19 11:11:43 2010 +0200 appwiz.cpl: Update the Polish translation. --- dlls/appwiz.cpl/Pl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/Pl.rc b/dlls/appwiz.cpl/Pl.rc index 33b2e89..427024c 100644 --- a/dlls/appwiz.cpl/Pl.rc +++ b/dlls/appwiz.cpl/Pl.rc @@ -35,7 +35,7 @@ STRINGTABLE IDS_COLUMN_NAME, "Nazwa" IDS_COLUMN_PUBLISHER, "Wydawca" IDS_COLUMN_VERSION, "Wersja" - IDS_INSTALL_FILTER, "Installation Programs\0*instal*.exe;*setup*.exe;*.msi\0Programs (*.exe)\0*.exe\0All Files (*.*)\0*.*\0\0" + IDS_INSTALL_FILTER, "Programy instalacyjne\0*instal*.exe;*setup*.exe;*.msi\0Programy (*.exe)\0*.exe\0Wszystkie pliki (*.*)\0*.*\0\0" IDS_REMOVE, "&Usu�..." IDS_MODIFY_REMOVE, "&Zmie�/Usu�..."

1 0

Łukasz Wojniłowicz : inetcpl: Add the Polish translation.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 8e184f57e6f2e6592ac2bc80ee69a4df9ad1c1ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e184f57e6f2e6592ac2bc80e… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Sep 19 11:11:42 2010 +0200 inetcpl: Add the Polish translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Pl.rc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index f2259c3..4c32225 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -13,6 +13,7 @@ RC_SRCS = \ cpl_Ko.rc \ cpl_Lt.rc \ cpl_Nl.rc \ + cpl_Pl.rc \ cpl_Si.rc \ cpl_Sv.rc \ inetcpl.rc diff --git a/dlls/inetcpl.cpl/cpl_Pl.rc b/dlls/inetcpl.cpl/cpl_Pl.rc new file mode 100644 index 0000000..11b940a --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Pl.rc @@ -0,0 +1,30 @@ +/* + * Internet control panel applet + * + * Copyright 2010 �ukasz Wojni�owicz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Ustawienia Internetu" + IDS_CPL_INFO "Pozwala skonfigurowa� przegl�dark� internetow� Wine i odpowiadaj�ce jej ustawienia" +END

1 0