September 2010 - Wine-commits

Anders Jonsson : winecfg: Update Swedish translation.
by Alexandre Julliard 27 Sep '10

27 Sep '10

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 : iphlpapi: Remove useless loop and initialize gateway linked list next member to NULL .
by Alexandre Julliard 27 Sep '10

27 Sep '10

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

Andrew Nguyen : ipconfig: Move socket address string generation to a helper function.
by Alexandre Julliard 27 Sep '10

27 Sep '10

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

Andrew Nguyen : ipconfig: Implement gateway address output.
by Alexandre Julliard 27 Sep '10

27 Sep '10

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

Piotr Caban : oleaut32: Rename stubs.c file.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: b32c3102d2b45f8d0b18ac8692706304563aa12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32c3102d2b45f8d0b18ac869… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 27 12:00:19 2010 +0200 oleaut32: Rename stubs.c file. --- dlls/oleaut32/Makefile.in | 2 +- dlls/oleaut32/{stubs.c => olepropframe.c} | 25 ++++++++++--------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index ec23bd2..bf84c80 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -13,10 +13,10 @@ C_SRCS = \ oleaut.c \ olefont.c \ olepicture.c \ + olepropframe.c \ recinfo.c \ regsvr.c \ safearray.c \ - stubs.c \ tmarshal.c \ typelib.c \ typelib2.c \ diff --git a/dlls/oleaut32/stubs.c b/dlls/oleaut32/olepropframe.c similarity index 67% rename from dlls/oleaut32/stubs.c rename to dlls/oleaut32/olepropframe.c index d87e76e..b3e27d2 100644 --- a/dlls/oleaut32/stubs.c +++ b/dlls/oleaut32/olepropframe.c @@ -1,8 +1,5 @@ /* - * OlePro32 Stubs - * * Copyright 1999 Corel Corporation - * * Sean Langley * * This library is free software; you can redistribute it and/or @@ -24,8 +21,6 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" #include "wine/debug.h" #include "ole2.h" #include "olectl.h" @@ -35,22 +30,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /*********************************************************************** * OleCreatePropertyFrameIndirect (OLEAUT32.416) */ -HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams) +HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) { - FIXME("(%p), not implemented (olepro32.dll)\n",lpParams); - return S_OK; + FIXME("(%p), not implemented (olepro32.dll)\n", lpParams); + return S_OK; } /*********************************************************************** * OleCreatePropertyFrame (OLEAUT32.417) */ HRESULT WINAPI OleCreatePropertyFrame( - HWND hwndOwner, UINT x, UINT y, LPCOLESTR lpszCaption,ULONG cObjects, - LPUNKNOWN* ppUnk, ULONG cPages, LPCLSID pPageClsID, LCID lcid, - DWORD dwReserved, LPVOID pvReserved ) + HWND hwndOwner, UINT x, UINT y, LPCOLESTR lpszCaption,ULONG cObjects, + LPUNKNOWN* ppUnk, ULONG cPages, LPCLSID pPageClsID, LCID lcid, + DWORD dwReserved, LPVOID pvReserved) { - FIXME("(%p,%d,%d,%s,%d,%p,%d,%p,%x,%d,%p), not implemented (olepro32.dll)\n", - hwndOwner,x,y,debugstr_w(lpszCaption),cObjects,ppUnk,cPages, - pPageClsID, (int)lcid,dwReserved,pvReserved); - return S_OK; + FIXME("(%p,%d,%d,%s,%d,%p,%d,%p,%x,%d,%p), not implemented (olepro32.dll)\n", + hwndOwner, x, y, debugstr_w(lpszCaption), cObjects, ppUnk, cPages, + pPageClsID, (int)lcid, dwReserved, pvReserved); + return S_OK; }

1 0

Alexandre Julliard : configure: Support specifying a .rules. in file as dependency.
by Alexandre Julliard 27 Sep '10

27 Sep '10

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

Lauri Kenttä : comdlg32: Update Finnish translation.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 488e2bbcaf4bb503d49565dd83578a6842be2851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=488e2bbcaf4bb503d49565dd8… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Sep 24 21:57:04 2010 +0300 comdlg32: Update Finnish translation. --- dlls/comdlg32/cdlg_Fi.rc | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/comdlg32/cdlg_Fi.rc b/dlls/comdlg32/cdlg_Fi.rc index 19f61a9..e5ea674 100644 --- a/dlls/comdlg32/cdlg_Fi.rc +++ b/dlls/comdlg32/cdlg_Fi.rc @@ -136,7 +136,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "OK",IDOK,218,6,40,14,WS_GROUP PUSHBUTTON "Peruuta", IDCANCEL,218,23,40,14,WS_GROUP PUSHBUTTON "&Ota k�ytt��n", psh3,218,40,40,14,WS_GROUP - PUSHBUTTON "&Ohje" , pshHelp,218,57,40,14,WS_GROUP + PUSHBUTTON "O&hje" , pshHelp,218,57,40,14,WS_GROUP GROUPBOX "Efektit", grp1,6,72,84,34,WS_GROUP CHECKBOX "Yli&viivattu", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "A&lleviivattu", chx2, 10,94,50,10, BS_AUTOCHECKBOX @@ -145,7 +145,7 @@ FONT 8, "MS Shell Dlg" CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "N�yte",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 + LTEXT "Merk&ist�:",stc7 ,98,114,80,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -354,14 +354,14 @@ FONT 8, "MS Shell Dlg" STRINGTABLE { - IDS_ABOUTBOX "&Tietoja FolderPicker Test:st�" + IDS_ABOUTBOX "&Tietoja FolderPicker-testist�" IDS_DOCUMENTFOLDERS "Dokumenttikansiot" - IDS_PERSONAL "Omat Dokumentit" + IDS_PERSONAL "Omat tiedostot" IDS_FAVORITES "Suosikit" IDS_PATH "J�rjestelm�kansio" IDS_DESKTOP "Ty�p�yt�" IDS_FONTS "Fontit" - IDS_MYCOMPUTER "Oma Tietokone" + IDS_MYCOMPUTER "Oma tietokone" } STRINGTABLE @@ -370,7 +370,7 @@ STRINGTABLE IDS_LOCALHARDRIVES "Paikalliset kiintolevyt" IDS_FILENOTFOUND "Tiedostoa ei l�ydy" IDS_VERIFYFILE "Varmista, ett� tiedoston nimi on oikein" - IDS_CREATEFILE "Tiedostoa ei ole olemassa\nHaluatko luoda tiedoston" + IDS_CREATEFILE "Tiedostoa ei ole olemassa.\nHaluatko luoda sen?" IDS_OVERWRITEFILE "Tiedosto on jo olemassa.\nHaluatko ylikirjoitaa sen?" IDS_INVALID_FILENAME_TITLE "Kansio sis�lt�� ep�kelpoja merkkej�" IDS_INVALID_FILENAME "Tiedoston nimi ei voi sis�lt�� n�it� merkkej�:\n / : < > |" @@ -380,11 +380,11 @@ STRINGTABLE STRINGTABLE { - IDS_UPFOLDER "Kansio Yl�sp�in" - IDS_NEWFOLDER "Luo Uusi Kansio" + IDS_UPFOLDER "Ylempi kansio" + IDS_NEWFOLDER "Luo uusi kansio" IDS_LISTVIEW "Lista" IDS_REPORTVIEW "Tiedot" - IDS_TODESKTOP "Selaa Ty�p�yt��" + IDS_TODESKTOP "Ty�p�yt�" } STRINGTABLE @@ -403,14 +403,13 @@ STRINGTABLE PD32_OUT_OF_MEMORY "Muisti loppu." PD32_GENERIC_ERROR "Virhe." PD32_DRIVER_UNKNOWN "Tuntematon tulostinajuri." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "Jotta voisit k�ytt�� tulostimia tai muokata niiden asetuksia, \ +sinun t�ytyy ensin asentaa jokin tulostin." PD32_DEFAULT_PRINTER "Oletustulostin; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Jonossa on %d dokumenttia" - PD32_MARGINS_IN_INCHES "Marginaalit [inches]" - PD32_MARGINS_IN_MILLIMETERS "Marginaalit [mm]" + PD32_MARGINS_IN_INCHES "Marginaalit (tuumina)" + PD32_MARGINS_IN_MILLIMETERS "Marginaalit (mm)" PD32_MILLIMETERS "mm" PD32_PRINTER_STATUS_READY "Valmis" @@ -422,17 +421,17 @@ Please install one and retry." PD32_PRINTER_STATUS_MANUAL_FEED "Sy�t� paperi k�sin; " PD32_PRINTER_STATUS_PAPER_PROBLEM "Ongelma paperin kanssa; " PD32_PRINTER_STATUS_OFFLINE "Ei yhteytt� tulostimeen; " - PD32_PRINTER_STATUS_IO_ACTIVE "I/O Toiminnassa; " + PD32_PRINTER_STATUS_IO_ACTIVE "Tiedonsiirto meneill��n; " PD32_PRINTER_STATUS_BUSY "Varattu; " PD32_PRINTER_STATUS_PRINTING "Tulostaa; " - PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Output tray is full; " + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Paperin luovutustaso on t�ynn�; " PD32_PRINTER_STATUS_NOT_AVAILABLE "Ei saatavilla; " PD32_PRINTER_STATUS_WAITING "Odottaa; " PD32_PRINTER_STATUS_PROCESSING "K�sitell��n; " PD32_PRINTER_STATUS_INITIALIZING "Alustetaan; " PD32_PRINTER_STATUS_WARMING_UP "L�mmitet��n; " PD32_PRINTER_STATUS_TONER_LOW "V�riaine v�hiss�; " - PD32_PRINTER_STATUS_NO_TONER "Ei v�ri�ainetta; " + PD32_PRINTER_STATUS_NO_TONER "Ei v�riainetta; " PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " PD32_PRINTER_STATUS_USER_INTERVENTION "K�ytt�j�n keskeytt�m�; " PD32_PRINTER_STATUS_OUT_OF_MEMORY "Muisti loppu; " @@ -468,5 +467,5 @@ STRINGTABLE IDS_SAVE_IN "&Kansioon:" IDS_SAVE "Tallenna" IDS_SAVE_AS "Tallenna nimell�" - IDS_OPEN_FILE "Avaa Tiedosto" + IDS_OPEN_FILE "Avaa tiedosto" }

1 0

Lauri Kenttä : shell32: Update Finnish translation.
by Alexandre Julliard 27 Sep '10

27 Sep '10

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

Eric Pouech : kernel32: Only reset the console mode when it has been previously changed.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: eabe3b34b23fe62f6cfb1552d1e021ef32efcc6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eabe3b34b23fe62f6cfb1552d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Sep 24 21:25:06 2010 +0200 kernel32: Only reset the console mode when it has been previously changed. --- dlls/kernel32/console.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 45e6089..129c4a8 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -230,7 +230,8 @@ static BOOL restore_console_mode(HANDLE hin) int fd; BOOL ret; - if (RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != KERNEL32_CONSOLE_SHELL) + if (!S_termios_raw || + RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != KERNEL32_CONSOLE_SHELL) return TRUE; if ((fd = get_console_bare_fd(hin)) == -1) return FALSE; ret = tcsetattr(fd, TCSANOW, &S_termios) >= 0;

1 0

Juan Lang : ws2_32: Unpack ioctl codes in WSAIoctl trace.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 1e0999935011122cbac21b201038ffb58d27c904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0999935011122cbac21b201… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 24 14:20:14 2010 -0700 ws2_32: Unpack ioctl codes in WSAIoctl trace. --- dlls/ws2_32/socket.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 78 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6d25881..a4380aa 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2839,6 +2839,82 @@ char* WINAPI WS_inet_ntoa(struct WS_in_addr in) return NULL; } +static const char *debugstr_wsaioctl(DWORD ioctl) +{ + switch(ioctl & 0x18000000) + { + case WS_IOC_UNIX: + { + BYTE size = (ioctl >> 16) & WS_IOCPARM_MASK; + char x = (ioctl & 0xff00) >> 8; + BYTE y = ioctl & 0xff; + const char *buf_type; + char args[14]; + + switch (ioctl & (WS_IOC_VOID|WS_IOC_INOUT)) + { + case WS_IOC_VOID: + buf_type = "_IO"; + sprintf(args, "%d, %d", x, y); + break; + case WS_IOC_IN: + buf_type = "_IOW"; + sprintf(args, "'%c', %d, %d", x, y, size); + break; + case WS_IOC_OUT: + buf_type = "_IOR"; + sprintf(args, "'%c', %d, %d", x, y, size); + break; + default: + buf_type = "?"; + sprintf(args, "'%c', %d, %d", x, y, size); + break; + } + return wine_dbg_sprintf("%s(%s)", buf_type, args); + } + default: + { + USHORT code = ioctl & 0xffff; + const char *family, *buf_type; + + /* This switch looks redundant, but isn't: the case WS_IOC_UNIX + * is handled differently than all others. + */ + switch(ioctl & 0x18000000) + { + case WS_IOC_WS2: + family = "IOC_WS2"; + break; + case WS_IOC_PROTOCOL: + family = "IOC_PROTOCOL"; + break; + case WS_IOC_VENDOR: + family = "IOC_VENDOR"; + break; + } + switch (ioctl & (WS_IOC_VOID|WS_IOC_INOUT)) + { + case WS_IOC_VOID: + buf_type = "_WSAIO"; + break; + case WS_IOC_INOUT: + buf_type = "_WSAIORW"; + break; + case WS_IOC_IN: + buf_type = "_WSAIOW"; + break; + case WS_IOC_OUT: + buf_type = "_WSAIOR"; + break; + default: + buf_type = "?"; + break; + } + return wine_dbg_sprintf("%s(%s, %d)", buf_type, family, code); + } + } +} + /********************************************************************** * WSAIoctl (WS2_32.50) * @@ -3185,7 +3261,8 @@ INT WINAPI WSAIoctl(SOCKET s, FIXME("WS_SIO_UDP_CONNRESET stub\n"); break; default: - FIXME("unsupported WS_IOCTL cmd (%08x)\n", dwIoControlCode); + FIXME("unsupported WS_IOCTL cmd (%s)\n", + debugstr_wsaioctl(dwIoControlCode)); WSASetLastError(WSAEOPNOTSUPP); return SOCKET_ERROR; }

1 0