September 2010 - Wine-Commits

Andrew Nguyen : ipconfig: Move socket address string generation to a helper function.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 7df2d4b231bf470291bfb2d1f728d6ec7f436fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df2d4b231bf470291bfb2d1f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Sep 27 04:30:49 2010 -0500 ipconfig: Move socket address string generation to a helper function. --- programs/ipconfig/ipconfig.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 84b0ace..bf186c1 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -130,6 +130,13 @@ static void print_field(int msg, const WCHAR *value) ipconfig_printfW(formatW, field, value); } +static BOOL socket_address_to_string(WCHAR *buf, DWORD len, SOCKET_ADDRESS *addr) +{ + return WSAAddressToStringW(addr->lpSockaddr, + addr->iSockaddrLength, NULL, + buf, &len) == 0; +} + static void print_basic_information(void) { IP_ADAPTER_ADDRESSES *adapters; @@ -150,6 +157,7 @@ static void print_basic_information(void) static const WCHAR newlineW[] = {'\n',0}; IP_ADAPTER_UNICAST_ADDRESS *addr; + WCHAR addr_buf[54]; ipconfig_message_printfW(STRING_ADAPTER_FRIENDLY, iftype_to_string(p->IfType), p->FriendlyName); ipconfig_printfW(newlineW); @@ -157,12 +165,7 @@ static void print_basic_information(void) for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) { - WCHAR addr_buf[54]; - DWORD len = sizeof(addr_buf)/sizeof(WCHAR); - - if (WSAAddressToStringW(addr->Address.lpSockaddr, - addr->Address.iSockaddrLength, NULL, - addr_buf, &len) == 0) + if (socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) print_field(STRING_IP_ADDRESS, addr_buf); /* FIXME: Output corresponding subnet mask. */ } @@ -287,6 +290,7 @@ static void print_full_information(void) { IP_ADAPTER_UNICAST_ADDRESS *addr; WCHAR physaddr_buf[3 * MAX_ADAPTER_ADDRESS_LENGTH]; + WCHAR addr_buf[54]; ipconfig_message_printfW(STRING_ADAPTER_FRIENDLY, iftype_to_string(p->IfType), p->FriendlyName); ipconfig_printfW(newlineW); @@ -299,12 +303,7 @@ static void print_full_information(void) for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) { - WCHAR addr_buf[54]; - DWORD len = sizeof(addr_buf)/sizeof(WCHAR); - - if (WSAAddressToStringW(addr->Address.lpSockaddr, - addr->Address.iSockaddrLength, NULL, - addr_buf, &len) == 0) + if (socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) print_field(STRING_IP_ADDRESS, addr_buf); /* FIXME: Output corresponding subnet mask. */ }

1 0

Luca Bennati : winmm: Update Italian translation.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 672b2ff59f863daab9297fa033acd134de7c3aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=672b2ff59f863daab9297fa03… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun Sep 26 21:15:45 2010 +0200 winmm: Update Italian translation. --- dlls/winmm/winmm_It.rc | 168 ++++++++++++++++++++++++----------------------- 1 files changed, 86 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=672b2ff59f863daab9297…

1 0

Anders Jonsson : winecfg: Update Swedish translation.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 29a4da8c15cd3cfe70a0eef6b053be84f7552232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a4da8c15cd3cfe70a0eef6b… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Mon Sep 27 09:33:58 2010 +0200 winecfg: Update Swedish translation. --- programs/winecfg/Sv.rc | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc index 78bccb2..3ef0e43 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc @@ -123,6 +123,16 @@ BEGIN PUSHBUTTON "Avbryt",IDCANCEL,57,74,45,14,WS_GROUP END +IDD_DRIVECHOOSE DIALOG 60, 70, 170, 60 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "V�lj enhetsbokstav" +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,105,10,45,14,WS_GROUP + PUSHBUTTON "Avbryt",IDCANCEL,105,30,45,14,WS_GROUP +END + IDD_DRIVECFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" @@ -287,8 +297,8 @@ END STRINGTABLE BEGIN - IDC_SYSPARAMS_BUTTON "Kontrollerar bakgrunden" - IDC_SYSPARAMS_BUTTON_TEXT "Kontrollerar text" + IDC_SYSPARAMS_BUTTON "Bakgrund i kontroller" + IDC_SYSPARAMS_BUTTON_TEXT "Text i kontroller" IDC_SYSPARAMS_DESKTOP "Skrivbord" IDC_SYSPARAMS_MENU "Menybakgrund" IDC_SYSPARAMS_MENU_TEXT "Menytext" @@ -300,7 +310,23 @@ BEGIN IDC_SYSPARAMS_WINDOW "F�nsterbakgrund" IDC_SYSPARAMS_WINDOW_TEXT "F�nstertext" IDC_SYSPARAMS_ACTIVE_TITLE "Aktiv titellist" - IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Aktiv titellist" + IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Aktiv titeltext" IDC_SYSPARAMS_INACTIVE_TITLE "Inaktiv titellist" - IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inaktiv titellist" + IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inaktiv titeltext" + IDC_SYSPARAMS_MSGBOX_TEXT "Text i meddelandef�nster" + IDC_SYSPARAMS_APPWORKSPACE "Arbetsyta i program" + IDC_SYSPARAMS_WINDOW_FRAME "F�nsterram" + IDC_SYSPARAMS_ACTIVE_BORDER "Aktiv kant" + IDC_SYSPARAMS_INACTIVE_BORDER "Inaktiv kant" + IDC_SYSPARAMS_BUTTON_SHADOW "Skugga i kontroller" + IDC_SYSPARAMS_GRAY_TEXT "Gr� text" + IDC_SYSPARAMS_BUTTON_HILIGHT "Markering i kontroller" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "M�rk skugga i kontroller" + IDC_SYSPARAMS_BUTTON_LIGHT "Ljus i kontroller" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Alternativ bakgrund i kontroller" + IDC_SYSPARAMS_HOT_TRACKING "Hovrat f�rem�l" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Gradient f�r aktiv titellist" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Gradient f�r inaktiv titellist" + IDC_SYSPARAMS_MENU_HILIGHT "Menymarkering" + IDC_SYSPARAMS_MENUBAR "Menyrad" END

1 0

Andrew Nguyen : ipconfig: Implement gateway address output.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 11d332c37c5630d5c144090e0a6fa9ce753171c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d332c37c5630d5c144090e0… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Sep 27 04:30:59 2010 -0500 ipconfig: Implement gateway address output. --- programs/ipconfig/En.rc | 1 + programs/ipconfig/ipconfig.c | 44 ++++++++++++++++++++++++++++++++++++++++- programs/ipconfig/ipconfig.h | 1 + 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/programs/ipconfig/En.rc b/programs/ipconfig/En.rc index 6606fe4..97fb223 100644 --- a/programs/ipconfig/En.rc +++ b/programs/ipconfig/En.rc @@ -44,4 +44,5 @@ STRINGTABLE STRING_DHCP_ENABLED, "DHCP enabled" STRING_YES, "Yes" STRING_NO, "No" + STRING_DEFAULT_GATEWAY, "Default gateway" } diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index bf186c1..e76b549 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -130,6 +130,17 @@ static void print_field(int msg, const WCHAR *value) ipconfig_printfW(formatW, field, value); } +static void print_value(const WCHAR *value) +{ + static const WCHAR formatW[] = {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', + ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', + ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', + ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', + '%','s','\n',0}; + + ipconfig_printfW(formatW, value); +} + static BOOL socket_address_to_string(WCHAR *buf, DWORD len, SOCKET_ADDRESS *addr) { return WSAAddressToStringW(addr->lpSockaddr, @@ -155,8 +166,10 @@ static void print_basic_information(void) for (p = adapters; p; p = p->Next) { static const WCHAR newlineW[] = {'\n',0}; + static const WCHAR emptyW[] = {0}; IP_ADAPTER_UNICAST_ADDRESS *addr; + IP_ADAPTER_GATEWAY_ADDRESS_LH *gateway; WCHAR addr_buf[54]; ipconfig_message_printfW(STRING_ADAPTER_FRIENDLY, iftype_to_string(p->IfType), p->FriendlyName); @@ -170,7 +183,20 @@ static void print_basic_information(void) /* FIXME: Output corresponding subnet mask. */ } - /* FIXME: Output default gateway address. */ + if (p->FirstGatewayAddress) + { + if (socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &p->FirstGatewayAddress->Address)) + print_field(STRING_DEFAULT_GATEWAY, addr_buf); + + for (gateway = p->FirstGatewayAddress->Next; gateway; gateway = gateway->Next) + { + if (socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &gateway->Address)) + print_value(addr_buf); + } + } + else + print_field(STRING_DEFAULT_GATEWAY, emptyW); + ipconfig_printfW(newlineW); } } @@ -245,6 +271,7 @@ static const WCHAR *boolean_to_string(int value) static void print_full_information(void) { static const WCHAR newlineW[] = {'\n',0}; + static const WCHAR emptyW[] = {0}; FIXED_INFO *info; IP_ADAPTER_ADDRESSES *adapters; @@ -290,6 +317,7 @@ static void print_full_information(void) { IP_ADAPTER_UNICAST_ADDRESS *addr; WCHAR physaddr_buf[3 * MAX_ADAPTER_ADDRESS_LENGTH]; + IP_ADAPTER_GATEWAY_ADDRESS_LH *gateway; WCHAR addr_buf[54]; ipconfig_message_printfW(STRING_ADAPTER_FRIENDLY, iftype_to_string(p->IfType), p->FriendlyName); @@ -308,7 +336,19 @@ static void print_full_information(void) /* FIXME: Output corresponding subnet mask. */ } - /* FIXME: Output default gateway address. */ + if (p->FirstGatewayAddress) + { + if (socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &p->FirstGatewayAddress->Address)) + print_field(STRING_DEFAULT_GATEWAY, addr_buf); + + for (gateway = p->FirstGatewayAddress->Next; gateway; gateway = gateway->Next) + { + if (socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &gateway->Address)) + print_value(addr_buf); + } + } + else + print_field(STRING_DEFAULT_GATEWAY, emptyW); ipconfig_printfW(newlineW); } diff --git a/programs/ipconfig/ipconfig.h b/programs/ipconfig/ipconfig.h index d209006..593a43c 100644 --- a/programs/ipconfig/ipconfig.h +++ b/programs/ipconfig/ipconfig.h @@ -40,3 +40,4 @@ #define STRING_DHCP_ENABLED 117 #define STRING_YES 118 #define STRING_NO 119 +#define STRING_DEFAULT_GATEWAY 120

1 0

Andrew Nguyen : iphlpapi: Remove useless loop and initialize gateway linked list next member to NULL .
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: fea9d8f171db15bfa80bd278e9e43eafab8e07e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea9d8f171db15bfa80bd278e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Sep 27 04:30:38 2010 -0500 iphlpapi: Remove useless loop and initialize gateway linked list next member to NULL. --- dlls/iphlpapi/iphlpapi_main.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d6e568f..079ebff 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -813,19 +813,9 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD PIP_ADAPTER_GATEWAY_ADDRESS gw; PSOCKADDR_IN sin; - for (gw = aa->FirstGatewayAddress; gw && gw->Next; - gw = gw->Next) - ; - if (!gw) - { - gw = (PIP_ADAPTER_GATEWAY_ADDRESS)ptr; - aa->FirstGatewayAddress = gw; - } - else - { - gw->Next = (PIP_ADAPTER_GATEWAY_ADDRESS)ptr; - gw = gw->Next; - } + gw = (PIP_ADAPTER_GATEWAY_ADDRESS)ptr; + aa->FirstGatewayAddress = gw; + gw->u.s.Length = sizeof(IP_ADAPTER_GATEWAY_ADDRESS); ptr += sizeof(IP_ADAPTER_GATEWAY_ADDRESS); sin = (PSOCKADDR_IN)ptr; @@ -835,6 +825,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD sizeof(DWORD)); gw->Address.lpSockaddr = (LPSOCKADDR)sin; gw->Address.iSockaddrLength = sizeof(SOCKADDR_IN); + gw->Next = NULL; ptr += sizeof(SOCKADDR_IN); } }

1 0

Igor Paliychuk : taskkill: Added Ukrainian translation.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 30b09071474d954636d9909208d64f5ff9889c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b09071474d954636d990920… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Mon Sep 27 00:49:42 2010 +0300 taskkill: Added Ukrainian translation. --- programs/taskkill/Makefile.in | 3 +- programs/taskkill/Uk.rc | 45 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletions(-) diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index 7af915e..dbb065c 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -14,6 +14,7 @@ RC_SRCS = \ Lt.rc \ Nl.rc \ Si.rc \ - Sv.rc + Sv.rc \ + Uk.rc @MAKE_PROG_RULES@ diff --git a/programs/taskkill/Uk.rc b/programs/taskkill/Uk.rc new file mode 100644 index 0000000..fe07a1e --- /dev/null +++ b/programs/taskkill/Uk.rc @@ -0,0 +1,45 @@ +/* + * Task termination utility + * Ukrainian language support + * + * Copyright 2010 Andrew Nguyen + * Copyright 2010 Igor Paliychuk + * + * 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 "taskkill.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Використання: taskkill [/?] [/f] [/im Ім'яПроцесу | /pid IDПроцесу]\n" + STRING_INVALID_OPTION, "Помилка: Вказана невідома чи невірна опція командного рядка.\n" + STRING_INVALID_PARAM, "Помилка: Вказано невірний параметр командного рядка.\n" + STRING_MISSING_OPTION, "Помилка: Повинна бути вказана одна з опцій /im чи /pid.\n" + STRING_MISSING_PARAM, "Помилка: Опція %s очікує параметр командного рядка.\n" + STRING_MUTUAL_EXCLUSIVE, "Помилка: Опції /im та /pid є взаємновиключними.\n" + STRING_CLOSE_PID_SEARCH, "Надіслано повідомлення закриття до вікон верхнього рівня процесу з PID %u.\n" + STRING_CLOSE_PROC_SRCH, "Надіслано повідомлення закриття до вікон верхнього рівня процесу \"%s\" з PID %u.\n" + STRING_TERM_PID_SEARCH, "Процес з PID %u був завершений примусово.\n" + STRING_TERM_PROC_SEARCH, "Процес \"%s\" з PID %u був завершений примусово.\n" + STRING_SEARCH_FAILED, "Помилка: Не вдалось знайти процес \"%s\".\n" + STRING_ENUM_FAILED, "Помилка: Неможливо перелічити список процесів.\n" + STRING_TERMINATE_FAILED, "Помилка: Не вдається завершити процес \"%s\".\n" +}

1 0

Rico Schüller : dxgi: Fix IWineD3DSwapChain_GetParent( ) call.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 4a3da6e1900d380890802b2101b203673e2a963e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3da6e1900d380890802b210… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Sep 26 09:47:59 2010 +0200 dxgi: Fix IWineD3DSwapChain_GetParent() call. --- dlls/dxgi/factory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index fb47364..6b0a681 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -235,7 +235,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory * return hr; } - swapchain = IWineD3DSwapChain_GetParent(wined3d_swapchain); + *swapchain = IWineD3DSwapChain_GetParent(wined3d_swapchain); IUnknown_Release(wined3d_swapchain); /* FIXME? The swapchain is created with refcount 1 by the wined3d device,

1 0

Lauri Kenttä : shell32: Update Finnish translation.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 1264ec931e999b45a02fc8d833e1f1b3f32b8c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1264ec931e999b45a02fc8d83… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Sep 25 23:40:55 2010 +0300 shell32: Update Finnish translation. --- dlls/shell32/shell32_Fi.rc | 93 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 88 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32_Fi.rc b/dlls/shell32/shell32_Fi.rc index fff38b4..98d9361 100644 --- a/dlls/shell32/shell32_Fi.rc +++ b/dlls/shell32/shell32_Fi.rc @@ -1,5 +1,6 @@ /* * Copyright 2005 Kimmo Myllyvirta + * Copyright 2010 Lauri Kentt� * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -129,6 +130,37 @@ FONT 8, "MS Shell Dlg" 4, 40, 180, 120 } +SHNEWBRSFORFOLDER_MSGBOX DIALOG 15, 40, 218, 196 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Valitse kansio" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDD_TITLE, 10, 8, 198, 24 + LTEXT "", IDD_STATUS, 10, 25, 198, 12 + LTEXT "Kansio:", IDD_FOLDER, 10, 156, 40, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 12, 38, 194, 105 + EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Luo uusi kansio", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Peruuta", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP +} + +SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Viesti" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "&Kyll�", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Kyll� k&aikkiin", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ei", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Peruuta", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + ICON "", IDD_ICON, 10, 10, 16, 16 + LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 +} + SHELL_ABOUT_MSGBOX DIALOG 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Tietoja ohjelmasta %s" @@ -174,10 +206,15 @@ STRINGTABLE IDS_SHV_COLUMN11 "Ryhm�" IDS_SHV_COLUMN_DELFROM "Alkuper�inen sijainti" IDS_SHV_COLUMN_DELDATE "Poistoaika" + IDS_SHV_COL_DOCS "Asiakirjat" + IDS_SHV_COL_STATUS "Tila" + IDS_SHV_COL_LOCATION "Sijainti" + IDS_SHV_COL_MODEL "Malli" /* special folders */ IDS_DESKTOP "Ty�p�yt�" IDS_MYCOMPUTER "Oma tietokone" + IDS_RECYCLEBIN_FOLDER_NAME "Roskakori" IDS_CONTROLPANEL "Ohjauspaneeli" /* context menus */ @@ -211,6 +248,12 @@ STRINGTABLE IDS_SHUTDOWN_TITLE "Sammuta" IDS_SHUTDOWN_PROMPT "Haluatko lopettaa Wine-istunnon?" + /* Run File dialog */ + IDS_RUNDLG_ERROR "Suorita tiedosto -valintaikkunaa ei voida n�ytt�� (sis�inen virhe)" + IDS_RUNDLG_BROWSE_ERROR "Selaa-valintaikkunaa ei voida n�ytt�� (sis�inen virhe)" + IDS_RUNDLG_BROWSE_CAPTION "Selaa" + IDS_RUNDLG_BROWSE_FILTER "Suoritettavat tiedostot\0*.exe\0Kaikki tiedostot\0*.*\0\0" + /* shell folder path default values */ IDS_PROGRAMS "K�ynnist�-valikko\\Ohjelmat" IDS_PERSONAL "Omat tiedostot" @@ -231,18 +274,58 @@ STRINGTABLE IDS_COOKIES "Ev�steet" IDS_HISTORY "Paikalliset asetukset\\Historia" IDS_PROGRAM_FILES "Ohjelmatiedostot" + IDS_PROGRAM_FILESX86 "Ohjelmatiedostot (x86)" IDS_MYPICTURES "Omat kuvatiedostot" IDS_PROGRAM_FILES_COMMON "Ohjelmatiedostot\\Yhteiset tiedostot" - IDS_COMMON_DOCUMENTS "Dokumentit" + IDS_PROGRAM_FILES_COMMONX86 "Ohjelmatiedostot (x86)\\Yhteiset tiedostot" + IDS_COMMON_DOCUMENTS "Tiedostot" IDS_ADMINTOOLS "K�ynnist�-valikko\\Ohjelmat\\Hallintaty�kalut" - IDS_COMMON_MUSIC "Dokumentit\\Omat musiikkitiedostot" - IDS_COMMON_PICTURES "Dokumentit\\Omat kuvatiedostot" - IDS_COMMON_VIDEO "Dokumentit\\Omat videotiedostot" + IDS_COMMON_MUSIC "Musiikki" + IDS_COMMON_PICTURES "Kuvat" + IDS_COMMON_VIDEO "Videot" IDS_CDBURN_AREA "Paikalliset asetukset\\Ohjelmien tiedot\\Microsoft\\CD Burning" + IDS_CONTACTS "Kontaktit" + IDS_LINKS "Linkit" + IDS_PHOTO_ALBUMS "Kuvat\\Diaesitykset" + IDS_PLAYLISTS "Musiikki\\Soittolistat" + IDS_PUBLIC_DOWNLOADS "Lataukset" + IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\GameExplorer" + IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Libraries" + IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Soitto��net" + IDS_SAMPLE_MUSIC "Musiikki\\Esimerkkimusiikki" + IDS_SAMPLE_PICTURES "Kuvat\\Esimerkkikuvat" + IDS_SAMPLE_PLAYLISTS "Musiikki\\Esimerkkisoittolistat" + IDS_SAMPLE_VIDEOS "Videot\\Esimerkkivideot" + IDS_SAVED_GAMES "Tallennetut pelit" + IDS_SAVED_SEARCHES "Haut" + IDS_USER_PROFILES "K�ytt�j�t" + IDS_COMMON_OEM_LINKS "OEM Links" + IDS_DOCUMENTS "Tiedostot" + IDS_DOWNLOADS "Lataukset" + IDS_LOCAL_APPDATA_LOW "AppData\\LocalLow" - IDS_NEWFOLDER "Uusi hakemisto" + IDS_NEWFOLDER "Uusi kansio" IDS_CPANEL_TITLE "Winen Ohjauspaneeli" IDS_CPANEL_NAME "Nimi" IDS_CPANEL_DESCRIPTION "Kuvaus" + + IDS_SHLEXEC_NOASSOC "T�m�n tiedostotyypin avaamiseen ei ole kytketty mit��n Windows-ohjelmaa." +} + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "Winen lisenssi" +IDS_LICENSE, +"Wine 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.\n\n\ +Wine 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.\n\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with Wine; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." }

1 0

Alexandre Julliard : configure: Support specifying a .rules. in file as dependency.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 9dd743fddc67d57ba4b087ebf093e3940548d2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd743fddc67d57ba4b087ebf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 25 12:19:31 2010 +0200 configure: Support specifying a .rules.in file as dependency. --- aclocal.m4 | 14 ++++++++++---- configure | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f9abe4c..021159d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -166,11 +166,17 @@ wine_fn_all_dir_rules () { ac_dir=$[1] ac_alldeps=$[2] + ac_makedep="\$(MAKEDEP)" + ac_input=Make.vars.in:$ac_dir/Makefile.in if test $ac_dir != tools then dnl makedep is in tools so tools makefile cannot depend on it - ac_alldeps="$[2] \$(MAKEDEP)" + ac_alldeps="$[2] $ac_makedep" fi + case $[2] in + *.in) ac_input=$ac_input:$[2] ;; + *) ac_makedep="$[2] $ac_makedep" ;; + esac wine_fn_append_file ALL_DIRS $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ @@ -180,11 +186,11 @@ $ac_dir/__clean__: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) clean \$(RM) $ac_dir/Makefile $ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend + @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend depend: $ac_dir/__depend__ .PHONY: $ac_dir/__depend__ -$ac_dir/__depend__: $[2] \$(MAKEDEP) dummy - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend" +$ac_dir/__depend__: $ac_makedep dummy + @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend" } wine_fn_config_makefile () diff --git a/configure b/configure index 36807fc..f1f9435 100755 --- a/configure +++ b/configure @@ -14127,10 +14127,16 @@ wine_fn_all_dir_rules () { ac_dir=$1 ac_alldeps=$2 + ac_makedep="\$(MAKEDEP)" + ac_input=Make.vars.in:$ac_dir/Makefile.in if test $ac_dir != tools then - ac_alldeps="$2 \$(MAKEDEP)" + ac_alldeps="$2 $ac_makedep" fi + case $2 in + *.in) ac_input=$ac_input:$2 ;; + *) ac_makedep="$2 $ac_makedep" ;; + esac wine_fn_append_file ALL_DIRS $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ @@ -14140,11 +14146,11 @@ $ac_dir/__clean__: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) clean \$(RM) $ac_dir/Makefile $ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend + @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend depend: $ac_dir/__depend__ .PHONY: $ac_dir/__depend__ -$ac_dir/__depend__: $2 \$(MAKEDEP) dummy - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend" +$ac_dir/__depend__: $ac_makedep dummy + @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend" } wine_fn_config_makefile ()

1 0

Alasdair Sinclair : shell32/test: Prevent crash on cleanup if tests fail.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: e3788512ad888c1da48e469aa6a424d998bfacbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3788512ad888c1da48e469aa… Author: Alasdair Sinclair <alasdairsinc(a)gmail.com> Date: Sat Sep 25 23:14:44 2010 +0100 shell32/test: Prevent crash on cleanup if tests fail. --- dlls/shell32/tests/shlfolder.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 639b092..5ddb973 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2549,7 +2549,7 @@ static void test_SHGetItemFromDataObject(void) static void test_ShellItemCompare(void) { IShellItem *psi[9]; /* a\a, a\b, a\c, b\a, .. */ - IShellItem *psi_a, *psi_b, *psi_c; + IShellItem *psi_a = NULL, *psi_b = NULL, *psi_c = NULL; IShellFolder *psf_desktop, *psf_current; LPITEMIDLIST pidl_cwd; WCHAR curdirW[MAX_PATH]; @@ -2620,7 +2620,6 @@ static void test_ShellItemCompare(void) } /* Generate ShellItems for the folders */ - psi_a = psi_b = psi_c = NULL; hr = IShellItem_GetParent(psi[0], &psi_a); ok(hr == S_OK, "Got 0x%08x\n", hr); if(FAILED(hr)) failed = TRUE;

1 0