September 2010 - Wine-Commits

Luca Bennati : winecfg: Fix Italian translation.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: 703a79dce049cf8f98a6dd092fd1eade67098d80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=703a79dce049cf8f98a6dd092… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 23 13:24:05 2010 +0200 winecfg: Fix Italian translation. --- programs/winecfg/It.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index f4d8b87..d27433f 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -77,9 +77,9 @@ BEGIN CONTROL "Le applicazioni Direct&X impediscono al mouse di lasciare la finestra",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Permetti al gestore delle finestre di &decorare le finestre",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Permetti al &gestore delle finestre di controllare le finestre",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 - CONTROL "&Emula una scrivania virtuale",IDC_ENABLE_DESKTOP,"Button", + CONTROL "&Emula un desktop virtuale",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 - LTEXT "Dimensione della Scrivania:",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED + LTEXT "Dimensione del desktop:",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,109,70,8,8,WS_DISABLED EDITTEXT IDC_DESKTOP_WIDTH,64,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED EDITTEXT IDC_DESKTOP_HEIGHT,117,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED @@ -101,7 +101,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Sostituzioni di DLL ",IDC_STATIC,8,4,244,210 - LTEXT "Le Dynamic Link Libraries possono essere specificate individualmente per essere builtin (fornite da Wine) o native (prese da Windows o fornite dall'applicazione)." + LTEXT "Le Dynamic Link Libraries possono essere specificate individualmente per essere integrate (fornite da Wine) o native (prese da Windows o fornite dall'applicazione)." ,IDC_STATIC,16,16,220,32 LTEXT "&Nuova sostituzione per la libreria:",IDC_STATIC,16,48,100,8 COMBOBOX IDC_DLLCOMBO,16,58,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE @@ -118,10 +118,10 @@ CAPTION "Modifica sostituzione" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Carica l'ordine ",IDC_STATIC,8,4,94,66 - CONTROL "&Builtin (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,16,14,75,10 + CONTROL "&Integrata (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,16,14,75,10 CONTROL "&Nativa (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,16,24,75,10 - CONTROL "B&uiltin poi Nativa",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,75,10 - CONTROL "N&ativa poi Builtin",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,75,10 + CONTROL "In&tegrata poi nativa",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,75,10 + CONTROL "N&ativa poi integrata",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,75,10 CONTROL "&Disabilita",IDC_RAD_DISABLE,"Button", BS_AUTORADIOBUTTON,16,54,75,10 DEFPUSHBUTTON "OK",IDOK,8,74,45,14,WS_GROUP PUSHBUTTON "Annulla",IDCANCEL,57,74,45,14,WS_GROUP @@ -228,7 +228,7 @@ BEGIN IDS_TAB_GRAPHICS "Grafica" IDS_TAB_DESKTOP_INTEGRATION "Integrazione del desktop" IDS_TAB_AUDIO "Audio" - IDS_TAB_ABOUT "Riguardo A" + IDS_TAB_ABOUT "Riguardo a" IDS_WINECFG_TITLE "Configurazione di Wine" IDS_WINECFG_TITLE_APP "Configurazione di Wine per %s" IDS_THEMEFILE "File del tema (*.msstyles; *.theme)" @@ -242,10 +242,10 @@ STRINGTABLE BEGIN IDS_DLL_WARNING "Cambiare l'ordine di caricamento di questa libreria non è raccomandato.\nSei sicuro di volerlo fare?" IDS_DLL_WARNING_CAPTION "Attenzione: libreria di sistema" - IDS_DLL_NATIVE "native" - IDS_DLL_BUILTIN "builtin" - IDS_DLL_NATIVE_BUILTIN "native, builtin" - IDS_DLL_BUILTIN_NATIVE "builtin, native" + IDS_DLL_NATIVE "nativa" + IDS_DLL_BUILTIN "integrata" + IDS_DLL_NATIVE_BUILTIN "nativa, integrata" + IDS_DLL_BUILTIN_NATIVE "integrata, nativa" IDS_DLL_DISABLED "disabilitato" IDS_DEFAULT_SETTINGS "Impostazioni predefinite" IDS_EXECUTABLE_FILTER "Programmi di Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0"

1 0

Luca Bennati : regeedit: Update Italian translation.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: 3f8f816f1d4fa2f5fbd106dde370635ee97a4402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f8f816f1d4fa2f5fbd106dde… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 23 12:42:49 2010 +0200 regeedit: Update Italian translation. --- programs/regedit/It.rc | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/regedit/It.rc b/programs/regedit/It.rc index 0154916..fc6bed4 100644 --- a/programs/regedit/It.rc +++ b/programs/regedit/It.rc @@ -154,18 +154,18 @@ END IDD_ADDFAVORITE DIALOG 22, 17, 210, 55 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Aggiungi Favorito" +CAPTION "Aggiungi preferito" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nome:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,140,40,30,11,WS_GROUP -PUSHBUTTON "Cancella",IDCANCEL,175,40,30,11, WS_GROUP +PUSHBUTTON "Annulla",IDCANCEL,175,40,30,11, WS_GROUP END IDD_DELFAVORITE DIALOG 22, 17, 210, 90 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Rimuovi Favorito" +CAPTION "Rimuovi preferito" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nome:",IDC_STATIC,5,5,119,8 @@ -176,7 +176,7 @@ END IDD_EDIT_STRING DIALOG 22, 17, 210, 75 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Edita Stringa" +CAPTION "Modifica stringa" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nome del valore:",IDC_STATIC,5,5,119,8 @@ -189,7 +189,7 @@ END IDD_EDIT_DWORD DIALOG 22, 17, 210, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU -CAPTION "Edita DWORD" +CAPTION "Modifica DWORD" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nome del valore:",IDC_STATIC,5,5,119,8 @@ -205,7 +205,7 @@ END IDD_EDIT_BINARY DIALOG 22, 17, 210, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU -CAPTION "Modifica Binario" +CAPTION "Modifica binario" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nome del valore:",IDC_STATIC,5,5,119,8 @@ -218,7 +218,7 @@ END IDD_EDIT_MULTI_STRING DIALOG 22, 17, 210, 175 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Modifica Multistringa" +CAPTION "Modifica multistringa" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nome del valore:",IDC_STATIC,5,5,119,8 @@ -271,7 +271,7 @@ BEGIN ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Si disconnette dal Registro di un computer remoto" ID_REGISTRY_PRINT "Stampa tutto o parte del Registro" -/* ID_HELP_HELPTOPICS "Apre l'aiuto dell'Editor del Registro" */ +/* ID_HELP_HELPTOPICS "Apre l'aiuto dell'editor del Registro" */ ID_HELP_ABOUT "Visualizza informazioni sul programma, numero di versione e copyright" END @@ -298,11 +298,11 @@ BEGIN IDS_BAD_VALUE "Impossibile trovare il valore '%s'" IDS_UNSUPPORTED_TYPE "Impossibile modificare valori di questo tipo (%u)" IDS_TOO_BIG_VALUE "Valore troppo grande (%u)" - IDS_DELETE_BOX_TITLE "Confermare Eliminazione del Valore" + IDS_DELETE_BOX_TITLE "Confermare l'eliminazione del valore" IDS_DELETE_BOX_TEXT "Sei sicuro di volere eliminare il valore '%s'?" IDS_DELETE_BOX_TEXT_MULTIPLE "Sei sicuro di volere eliminare questi valori?" - IDS_NEWKEY "Nuova Chiave #%d" - IDS_NEWVALUE "Nuovo Valore #%d" + IDS_NEWKEY "Nuova chiave #%d" + IDS_NEWVALUE "Nuovo valore #%d" IDS_NOTFOUND "Stringa di ricerca '%s' non trovata" END @@ -316,7 +316,7 @@ END STRINGTABLE BEGIN IDS_REGISTRY_ROOT_NAME "Il mio computer" - IDS_REGISTRY_DEFAULT_VALUE "(Default)" + IDS_REGISTRY_DEFAULT_VALUE "(Predefinito)" IDS_REGISTRY_VALUE_NOT_SET "(valore non immesso)" IDS_REGISTRY_VALUE_CANT_DISPLAY "(impossibile visualizzare valore)" IDS_REGISTRY_UNKNOWN_TYPE "(%d sconosciuto)"

1 0

Alexandre Julliard : server: Mirror the rectangles for RTL windows in set_window_pos.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: bc20ff50b62f40227c6b380cb44c74f0e183042d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc20ff50b62f40227c6b380cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 15:47:46 2010 +0200 server: Mirror the rectangles for RTL windows in set_window_pos. --- server/protocol.def | 8 ++++---- server/window.c | 29 ++++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/server/protocol.def b/server/protocol.def index 1faff19..687fe6c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2334,9 +2334,9 @@ enum message_type unsigned int flags; /* SWP_* flags */ user_handle_t handle; /* handle to the window */ user_handle_t previous; /* previous window in Z order */ - rectangle_t window; /* window rectangle */ - rectangle_t client; /* client rectangle */ - VARARG(valid,rectangles); /* valid rectangles from WM_NCCALCSIZE */ + rectangle_t window; /* window rectangle (in parent coords) */ + rectangle_t client; /* client rectangle (in parent coords) */ + VARARG(valid,rectangles); /* valid rectangles from WM_NCCALCSIZE (in client coords) */ @REPLY unsigned int new_style; /* new window style */ unsigned int new_ex_style; /* new window extended style */ @@ -2426,7 +2426,7 @@ enum coords_relative user_handle_t child; /* child to repaint (or window itself) */ unsigned int flags; /* resulting update flags (see below) */ data_size_t total_size; /* total size of the resulting region */ - VARARG(region,rectangles); /* list of rectangles for the region */ + VARARG(region,rectangles); /* list of rectangles for the region (in screen coords) */ @END #define UPDATE_NONCLIENT 0x01 /* get region for repainting non-client area */ #define UPDATE_ERASE 0x02 /* get region for erasing client area */ diff --git a/server/window.c b/server/window.c index ebcb5bf..bb66a39 100644 --- a/server/window.c +++ b/server/window.c @@ -2073,7 +2073,7 @@ DECL_HANDLER(get_window_tree) /* set the position and Z order of a window */ DECL_HANDLER(set_window_pos) { - const rectangle_t *visible_rect = NULL, *valid_rects = NULL; + rectangle_t window_rect, client_rect, visible_rect; struct window *previous = NULL; struct window *win = get_window( req->handle ); unsigned int flags = req->flags; @@ -2117,11 +2117,30 @@ DECL_HANDLER(set_window_pos) return; } - if (get_req_data_size() >= sizeof(rectangle_t)) visible_rect = get_req_data(); - if (get_req_data_size() >= 3 * sizeof(rectangle_t)) valid_rects = visible_rect + 1; + window_rect = visible_rect = req->window; + client_rect = req->client; + if (get_req_data_size() >= sizeof(rectangle_t)) + memcpy( &visible_rect, get_req_data(), sizeof(rectangle_t) ); + if (win->parent && win->parent->ex_style & WS_EX_LAYOUTRTL) + { + mirror_rect( &win->parent->client_rect, &window_rect ); + mirror_rect( &win->parent->client_rect, &visible_rect ); + mirror_rect( &win->parent->client_rect, &client_rect ); + } + + if (get_req_data_size() >= 3 * sizeof(rectangle_t)) + { + rectangle_t valid_rects[2]; + memcpy( valid_rects, (const rectangle_t *)get_req_data() + 1, 2 * sizeof(rectangle_t) ); + if (win->ex_style & WS_EX_LAYOUTRTL) + { + mirror_rect( &win->client_rect, &valid_rects[0] ); + mirror_rect( &win->client_rect, &valid_rects[1] ); + } + set_window_pos( win, previous, flags, &window_rect, &client_rect, &visible_rect, valid_rects ); + } + else set_window_pos( win, previous, flags, &window_rect, &client_rect, &visible_rect, NULL ); - if (!visible_rect) visible_rect = &req->window; - set_window_pos( win, previous, flags, &req->window, &req->client, visible_rect, valid_rects ); reply->new_style = win->style; reply->new_ex_style = win->ex_style; }

1 0

Damjan Jovanovic : winemenubuilder: Generate ICNS icons on MacOS.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: aa7cc131546e8842fb967bea07843ce55214f9c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7cc131546e8842fb967bea0… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Sep 22 22:14:47 2010 +0200 winemenubuilder: Generate ICNS icons on MacOS. --- programs/winemenubuilder/winemenubuilder.c | 67 ++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 37ebd06..a9cb033 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -164,6 +164,8 @@ struct xdg_mime_type struct list entry; }; +DEFINE_GUID(CLSID_WICIcnsEncoder, 0x312fb6f1,0xb767,0x409d,0x8a,0x6d,0x0f,0xc1,0x54,0xd4,0xf0,0x5c); + static char *xdg_config_dir; static char *xdg_data_dir; static char *xdg_desktop_dir; @@ -770,6 +772,70 @@ static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppSt return hr; } +#ifdef __APPLE__ +static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, + int bestIndex, LPCWSTR icoPathW, + const char *destFilename, char **nativeIdentifier) +{ + GUID guid; + WCHAR *guidStrW = NULL; + char *guidStrA = NULL; + char *icnsPath = NULL; + LARGE_INTEGER zero; + HRESULT hr; + + hr = CoCreateGuid(&guid); + if (FAILED(hr)) + { + WINE_WARN("CoCreateGuid failed, error 0x%08X\n", hr); + goto end; + } + hr = StringFromCLSID(&guid, &guidStrW); + if (FAILED(hr)) + { + WINE_WARN("StringFromCLSID failed, error 0x%08X\n", hr); + goto end; + } + guidStrA = wchars_to_utf8_chars(guidStrW); + if (guidStrA == NULL) + { + hr = E_OUTOFMEMORY; + WINE_WARN("out of memory converting GUID string\n"); + goto end; + } + icnsPath = heap_printf("/tmp/%s.icns", guidStrA); + if (icnsPath == NULL) + { + hr = E_OUTOFMEMORY; + WINE_WARN("out of memory creating ICNS path\n"); + goto end; + } + zero.QuadPart = 0; + hr = IStream_Seek(icoStream, zero, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) + { + WINE_WARN("seeking icon stream failed, error 0x%08X\n", hr); + goto end; + } + hr = convert_to_native_icon(icoStream, &bestIndex, 1, &CLSID_WICIcnsEncoder, + icnsPath, icoPathW); + if (FAILED(hr)) + { + WINE_WARN("converting %s to %s failed, error 0x%08X\n", + wine_dbgstr_w(icoPathW), wine_dbgstr_a(icnsPath), hr); + goto end; + } + +end: + CoTaskMemFree(guidStrW); + HeapFree(GetProcessHeap(), 0, guidStrA); + if (SUCCEEDED(hr)) + *nativeIdentifier = icnsPath; + else + HeapFree(GetProcessHeap(), 0, icnsPath); + return hr; +} +#else static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, int bestIndex, LPCWSTR icoPathW, const char *destFilename, char **nativeIdentifier) @@ -835,6 +901,7 @@ end: HeapFree(GetProcessHeap(), 0, pngPath); return hr; } +#endif /* defined(__APPLE__) */ /* extract an icon from an exe or icon file; helper for IPersistFile_fnSave */ static char *extract_icon(LPCWSTR icoPathW, int index, const char *destFilename, BOOL bWait)

1 0

Alexandre Julliard : user32: Always store the window rectangles unmirrored after SetWindowPos.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: 024521190a530b2c952e459b241168d51ab152c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024521190a530b2c952e459b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 15:48:02 2010 +0200 user32: Always store the window rectangles unmirrored after SetWindowPos. --- dlls/user32/win.c | 8 -------- dlls/user32/win.h | 8 ++++++++ dlls/user32/winpos.c | 7 +++++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 17925e9..b847a44 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -44,14 +44,6 @@ static DWORD process_layout; /**********************************************************************/ -static inline void mirror_rect( const RECT *window_rect, RECT *rect ) -{ - int width = window_rect->right - window_rect->left; - int tmp = rect->left; - rect->left = width - rect->right; - rect->right = width - tmp; -} - /* helper for Get/SetWindowLong */ static inline LONG_PTR get_win_data( const void *ptr, UINT size ) { diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 631cc96..2d5ff87 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -120,4 +120,12 @@ extern BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; +static inline void mirror_rect( const RECT *window_rect, RECT *rect ) +{ + int width = window_rect->right - window_rect->left; + int tmp = rect->left; + rect->left = width - rect->right; + rect->right = width - tmp; +} + #endif /* __WINE_WIN_H */ diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index d746e19..fbcd432 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1931,6 +1931,13 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, win->dwExStyle = reply->new_ex_style; win->rectWindow = *window_rect; win->rectClient = *client_rect; + if (GetWindowLongW( win->parent, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) + { + RECT client; + GetClientRect( win->parent, &client ); + mirror_rect( &client, &win->rectWindow ); + mirror_rect( &client, &win->rectClient ); + } } } SERVER_END_REQ;

1 0

Henri Verbeet : wininet: Cut of the query string before searching for the filename in CreateUrlCacheEntryW ().
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: 6e46e9048f03613c3c5e139a6f8641635e89b6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e46e9048f03613c3c5e139a6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 23 11:48:05 2010 +0200 wininet: Cut of the query string before searching for the filename in CreateUrlCacheEntryW(). Apparently it's possible to receive URLs with e.g. slashes in the query string. I was under the impression those were reserved in the query string, but e.g. Firefox will happily accept them as well. --- dlls/wininet/urlcache.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index a220e33..2129f42 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2271,6 +2271,12 @@ BOOL WINAPI CreateUrlCacheEntryW( if (((lpszUrlEnd - lpszUrlName) > 1) && (*(lpszUrlEnd - 1) == '/' || *(lpszUrlEnd - 1) == '\\')) lpszUrlEnd--; + lpszUrlPart = memchrW(lpszUrlName, '?', lpszUrlEnd - lpszUrlName); + if (!lpszUrlPart) + lpszUrlPart = memchrW(lpszUrlName, '#', lpszUrlEnd - lpszUrlName); + if (lpszUrlPart) + lpszUrlEnd = lpszUrlPart; + for (lpszUrlPart = lpszUrlEnd; (lpszUrlPart >= lpszUrlName); lpszUrlPart--) @@ -2281,10 +2287,6 @@ BOOL WINAPI CreateUrlCacheEntryW( lpszUrlPart++; break; } - else if(*lpszUrlPart == '?' || *lpszUrlPart == '#') - { - lpszUrlEnd = lpszUrlPart; - } } if (!lstrcmpW(lpszUrlPart, szWWW)) {

1 0

Hwang YunSong : taskkill: New Korean resource.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: c5cf9c8171dc7a8f0bba6fce62b1760854a57113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5cf9c8171dc7a8f0bba6fce6… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Sep 23 15:17:05 2010 +0900 taskkill: New Korean resource. --- programs/taskkill/Ko.rc | 44 +++++++++++++++++++++++++++++++++++++++++ programs/taskkill/Makefile.in | 1 + 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/Ko.rc b/programs/taskkill/Ko.rc new file mode 100644 index 0000000..5e22785 --- /dev/null +++ b/programs/taskkill/Ko.rc @@ -0,0 +1,44 @@ +/* + * Task termination utility + * Korean language support + * + * Copyright 2010 Andrew Nguyen + * Copyright 2010 YunSong Hwang + * + * 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" + +#pragma code_page(65001) + +LANGUAGE LANG_KOREAN, 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, "PID %u 의 프로세스 \"%s\"의 최상위 창에 닫는 메세지 보냈습니다.\n" + STRING_TERM_PID_SEARCH, "PID %u 의 프로세스는 강제로 종료되었습니다.\n" + STRING_TERM_PROC_SEARCH, "PID %u 의 프로세스 \"%s\" 는 강제로 종료되엇습니다.\n" + STRING_SEARCH_FAILED, "에러: 프로세스 \"%s\"를 찾을 수 없습니다.\n" + STRING_ENUM_FAILED, "에러: 프로세스 목록을 열거 할 수 업습니다.\n" + STRING_TERMINATE_FAILED, "에러: \"%s\" 프로세스를 중단시킬 수 없습니다.\n" +} diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index 8493b0f..e24df64 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -10,6 +10,7 @@ RC_SRCS = \ En.rc \ Fr.rc \ It.rc \ + Ko.rc \ Lt.rc \ Nl.rc \ Sv.rc

1 0

Luca Bennati : cmdlgtst: Update Italian translation.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: f1247424a6c62db486278311ca97a89387ce8c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1247424a6c62db486278311c… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 23 12:02:22 2010 +0200 cmdlgtst: Update Italian translation. --- programs/cmdlgtst/It.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/cmdlgtst/It.rc b/programs/cmdlgtst/It.rc index a61124b..821dff0 100644 --- a/programs/cmdlgtst/It.rc +++ b/programs/cmdlgtst/It.rc @@ -39,7 +39,7 @@ CmdlgtstMenu MENU MENUITEM "&Esci", CM_U_EXIT } - POPUP "&Commdlg" + POPUP "&Dialogo comune" { MENUITEM "&Apri", CM_U_OPEN MENUITEM "&Salva", CM_U_SAVE @@ -51,10 +51,10 @@ CmdlgtstMenu MENU MENUITEM "S&ostituisci", CM_U_REPLACE MENUITEM SEPARATOR MENUITEM "Sta&mpa", CM_U_PRINT - MENUITEM "&Impostazione Pagina", CM_U_PAGESETUP + MENUITEM "&Impostazione della pagina", CM_U_PAGESETUP } - POPUP "&Bandiere" + POPUP "F&lag" { MENUITEM "&File", CM_F_FILE MENUITEM SEPARATOR @@ -64,7 +64,7 @@ CmdlgtstMenu MENU MENUITEM "&Trova/Sostituisci", CM_F_FINDREPLACE MENUITEM SEPARATOR MENUITEM "&Stampa", CM_F_PRINT - MENUITEM "&Impostazione Pagina", CM_F_PAGESETUP + MENUITEM "&Impostazione della pagina", CM_F_PAGESETUP } POPUP "&Aiuto" @@ -77,7 +77,7 @@ CmdlgtstMenu MENU Color_Flags_Dialog DIALOG 11, 20, 207, 107 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Bandiere Dialogo Carattere" +CAPTION "Flag per i colori" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP @@ -94,7 +94,7 @@ FONT 8, "MS Shell Dlg" Font_Flags_Dialog DIALOG 9, 20, 207, 313 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Font Dialog Flags" +CAPTION "Flag per i caratteri" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14 @@ -128,7 +128,7 @@ CAPTION "Font Dialog Flags" Find_Flags_Dialog DIALOG 8, 24, 207, 306 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Trova/Sostituisci Dialog Flags" +CAPTION "Flag di Trova/Sostituisci" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14 @@ -156,12 +156,12 @@ FONT 8, "MS Shell Dlg" CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 168, 11, 13 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 180, 11, 13 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 24, 228, 11, 13 - CONTROL "Marca flags che sono settati dal sistema e devono essere confermati dall'utente.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 + CONTROL "Marca flag che sono impostati dal sistema e devono essere confermati dall'utente.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 } Print_Flags_Dialog DIALOG 4, 17, 239, 287 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Stampa / Configurazione di stampa dei Flags" +CAPTION "Flag di Stampa/Configurazione di stampa" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 180, 6, 50, 14 @@ -221,7 +221,7 @@ FONT 8, "MS Shell Dlg" File_Flags_Dialog DIALOG 6, 15, 207, 227 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Apri File/Salva File Flags" +CAPTION "Flag di Apri file/Salva file" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14 @@ -265,7 +265,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "OK", IDOK, 70, 276, 50, 14 LTEXT "Common Dialog Test Jig Exerciser, versione 1.20", -1, 13, 48, 168, 12 LTEXT "Questo programma testa COMMDLG per Wine.", -1, 12, 72, 168, 12 - LTEXT "Le Bandiere sono specificate nel menù bandiere.", -1, 12, 96, 168, 12 + LTEXT "Le flag sono specificate nel menù Flag.", -1, 12, 96, 168, 12 LTEXT "La finestra di dialogo dei colori modifica il colore dello sfondo.", -1, 12, 120, 168, 12 LTEXT "La finestra di dialogo dei caratteri modifica tutti i caratteri e il loro colore se CF_EFFECTS è selezionato.", -1, 12, 144, 168, 24 LTEXT "L'angolo in alto a sinistra indica il percorso completo e il titolo dell'ultima operazione di apertura o salvataggio conclusa con successo.", -1, 12, 180, 168, 24

1 0

Damjan Jovanovic : winemenubuilder: Isolate the platform-specific icon generation code.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: e502fafd69a2a4c507ad2c5ef9fe5d79b82808f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e502fafd69a2a4c507ad2c5ef… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Sep 22 22:14:04 2010 +0200 winemenubuilder: Isolate the platform-specific icon generation code. --- programs/winemenubuilder/winemenubuilder.c | 160 +++++++++++++++++----------- 1 files changed, 99 insertions(+), 61 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index dcf13ac..37ebd06 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -770,85 +770,123 @@ static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppSt return hr; } -/* extract an icon from an exe or icon file; helper for IPersistFile_fnSave */ -static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BOOL bWait ) +static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, + int bestIndex, LPCWSTR icoPathW, + const char *destFilename, char **nativeIdentifier) { + char *icoPathA = NULL; + char *iconsDir = NULL; + char *pngPath = NULL; unsigned short crc; - char *iconsdir = NULL, *ico_path = NULL, *ico_name, *png_path = NULL; - char* s; - int n; - IStream *stream = NULL; - HRESULT hr; + char *p, *q; + HRESULT hr = S_OK; + LARGE_INTEGER zero; - /* Where should we save the icon? */ - WINE_TRACE("path=[%s] index=%d\n", wine_dbgstr_w(path), index); - iconsdir = heap_printf("%s/icons", xdg_data_dir); - if (iconsdir) + icoPathA = wchars_to_utf8_chars(icoPathW); + if (icoPathA == NULL) { - if (mkdir(iconsdir, 0777) && errno != EEXIST) - { - WINE_WARN("couldn't make icons directory %s\n", wine_dbgstr_a(iconsdir)); - goto end; - } + hr = E_OUTOFMEMORY; + goto end; } + crc = crc16(icoPathA); + p = strrchr(icoPathA, '\\'); + if (p == NULL) + p = icoPathA; else { - WINE_TRACE("no icon created\n"); - return NULL; - } - - /* Determine the icon base name */ - n = WideCharToMultiByte(CP_UNIXCP, 0, path, -1, NULL, 0, NULL, NULL); - ico_path = HeapAlloc(GetProcessHeap(), 0, n); - WideCharToMultiByte(CP_UNIXCP, 0, path, -1, ico_path, n, NULL, NULL); - s=ico_name=ico_path; - while (*s!='\0') { - if (*s=='/' || *s=='\\') { - *s='\\'; - ico_name=s; - } else { - *s=tolower(*s); - } - s++; + *p = 0; + p++; } - if (*ico_name=='\\') *ico_name++='\0'; - s=strrchr(ico_name,'.'); - if (s) *s='\0'; - - /* Compute the source-path hash */ - crc=crc16(ico_path); - + q = strrchr(p, '.'); + if (q) + *q = 0; if (destFilename) - png_path=heap_printf("%s/%s.png",iconsdir,destFilename); + *nativeIdentifier = heap_printf("%s", destFilename); else - png_path=heap_printf("%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); - if (png_path == NULL) + *nativeIdentifier = heap_printf("%04X_%s.%d", crc, p, exeIndex); + if (*nativeIdentifier == NULL) { - WINE_ERR("could not extract icon %s, out of memory\n", wine_dbgstr_a(ico_name)); - return NULL; + hr = E_OUTOFMEMORY; + goto end; } - - hr = open_icon( path, index, bWait, &stream ); - if (SUCCEEDED(hr)) + iconsDir = heap_printf("%s/icons", xdg_data_dir); + if (iconsDir == NULL) { - hr = write_native_icon( stream, png_path, path ); - if (SUCCEEDED(hr)) - goto end; - else - WINE_ERR("writing native icon for %s index %d failed, hr=0x%08X\n", wine_dbgstr_w(path), index, hr); + hr = E_OUTOFMEMORY; + goto end; } - else - WINE_WARN("extracting icon %s index %d failed, hr=0x%08X\n", wine_dbgstr_w(path), index, hr); + create_directories(iconsDir); + pngPath = heap_printf("%s/%s.png", iconsDir, *nativeIdentifier); + if (pngPath == NULL) + { + hr = E_OUTOFMEMORY; + goto end; + } + zero.QuadPart = 0; + hr = IStream_Seek(icoStream, zero, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) + goto end; + hr = convert_to_native_icon(icoStream, &bestIndex, 1, &CLSID_WICPngEncoder, + pngPath, icoPathW); - HeapFree( GetProcessHeap(), 0, png_path ); - png_path=NULL; +end: + HeapFree(GetProcessHeap(), 0, icoPathA); + HeapFree(GetProcessHeap(), 0, iconsDir); + HeapFree(GetProcessHeap(), 0, pngPath); + return hr; +} + +/* extract an icon from an exe or icon file; helper for IPersistFile_fnSave */ +static char *extract_icon(LPCWSTR icoPathW, int index, const char *destFilename, BOOL bWait) +{ + IStream *stream = NULL; + HRESULT hr; + char *nativeIdentifier = NULL; + ICONDIRENTRY *iconDirEntries = NULL; + int numEntries; + int bestIndex = -1; + int maxPixels = 0; + int maxBits = 0; + int i; + + WINE_TRACE("path=[%s] index=%d destFilename=[%s]\n", wine_dbgstr_w(icoPathW), index, wine_dbgstr_a(destFilename)); + + hr = open_icon(icoPathW, index, bWait, &stream); + if (FAILED(hr)) + { + WINE_WARN("opening icon %s index %d failed, hr=0x%08X\n", wine_dbgstr_w(icoPathW), index, hr); + goto end; + } + hr = read_ico_direntries(stream, &iconDirEntries, &numEntries); + if (FAILED(hr)) + goto end; + for (i = 0; i < numEntries; i++) + { + WINE_TRACE("[%d]: %d x %d @ %d\n", i, iconDirEntries[i].bWidth, + iconDirEntries[i].bHeight, iconDirEntries[i].wBitCount); + if (iconDirEntries[i].wBitCount >= maxBits && + (iconDirEntries[i].bHeight * iconDirEntries[i].bWidth) >= maxPixels) + { + bestIndex = i; + maxPixels = iconDirEntries[i].bHeight * iconDirEntries[i].bWidth; + maxBits = iconDirEntries[i].wBitCount; + } + } + WINE_TRACE("Selected: %d\n", bestIndex); + hr = platform_write_icon(stream, index, bestIndex, icoPathW, destFilename, &nativeIdentifier); + if (FAILED(hr)) + WINE_WARN("writing icon failed, error 0x%08X\n", hr); - end: - HeapFree(GetProcessHeap(), 0, iconsdir); - HeapFree(GetProcessHeap(), 0, ico_path); +end: if (stream) IStream_Release(stream); - return png_path; + HeapFree(GetProcessHeap(), 0, iconDirEntries); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, nativeIdentifier); + nativeIdentifier = NULL; + } + return nativeIdentifier; } static HKEY open_menus_reg_key(void)

1 0

Alexandre Julliard : user32: Add support for RTL window layouts in GetUpdateRgn and GetUpdateRect.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: 9bbfcb5b07fa5f68c3f2fc56637c8258a1970a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bbfcb5b07fa5f68c3f2fc566… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 15:51:10 2010 +0200 user32: Add support for RTL window layouts in GetUpdateRgn and GetUpdateRect. --- dlls/user32/painting.c | 8 +++----- dlls/user32/win.h | 1 + dlls/user32/winpos.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 94bb630..9f02a03 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1289,8 +1289,6 @@ INT WINAPI GetUpdateRgn( HWND hwnd, HRGN hrgn, BOOL erase ) if ((update_rgn = send_ncpaint( hwnd, NULL, &flags ))) { - POINT offset; - retval = CombineRgn( hrgn, update_rgn, 0, RGN_COPY ); if (send_erase( hwnd, flags, update_rgn, NULL, NULL )) { @@ -1298,9 +1296,7 @@ INT WINAPI GetUpdateRgn( HWND hwnd, HRGN hrgn, BOOL erase ) get_update_flags( hwnd, NULL, &flags ); } /* map region to client coordinates */ - offset.x = offset.y = 0; - ScreenToClient( hwnd, &offset ); - OffsetRgn( hrgn, offset.x, offset.y ); + map_window_region( 0, hwnd, hrgn ); } return retval; } @@ -1324,8 +1320,10 @@ BOOL WINAPI GetUpdateRect( HWND hwnd, LPRECT rect, BOOL erase ) if (GetRgnBox( update_rgn, rect ) != NULLREGION) { HDC hdc = GetDCEx( hwnd, 0, DCX_USESTYLE ); + DWORD layout = SetLayout( hdc, 0 ); /* MapWindowPoints mirrors already */ MapWindowPoints( 0, hwnd, (LPPOINT)rect, 2 ); DPtoLP( hdc, (LPPOINT)rect, 2 ); + SetLayout( hdc, layout ); ReleaseDC( hwnd, hdc ); } } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 2d5ff87..6907889 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -83,6 +83,7 @@ extern HWND WIN_IsCurrentThread( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_SetOwner( HWND hwnd, HWND owner ) DECLSPEC_HIDDEN; extern ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPEC_HIDDEN; extern BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWindow, RECT *rectClient ) DECLSPEC_HIDDEN; +extern void map_window_region( HWND from, HWND to, HRGN hrgn ) DECLSPEC_HIDDEN; extern LRESULT WIN_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern void WIN_DestroyThreadWindows( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index fbcd432..1721b34 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -501,6 +501,41 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) return offset; } +/* map coordinates of a window region */ +void map_window_region( HWND from, HWND to, HRGN hrgn ) +{ + BOOL mirrored; + POINT offset = WINPOS_GetWinOffset( from, to, &mirrored ); + UINT i, size; + RGNDATA *data; + HRGN new_rgn; + RECT *rect; + + if (!mirrored) + { + OffsetRgn( hrgn, offset.x, offset.y ); + return; + } + if (!(size = GetRegionData( hrgn, 0, NULL ))) return; + if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return; + GetRegionData( hrgn, size, data ); + rect = (RECT *)data->Buffer; + for (i = 0; i < data->rdh.nCount; i++) + { + int tmp = -(rect[i].left + offset.x); + rect[i].left = -(rect[i].right + offset.x); + rect[i].right = tmp; + rect[i].top += offset.y; + rect[i].bottom += offset.y; + } + if ((new_rgn = ExtCreateRegion( NULL, data->rdh.nCount, data ))) + { + CombineRgn( hrgn, new_rgn, 0, RGN_COPY ); + DeleteObject( new_rgn ); + } + HeapFree( GetProcessHeap(), 0, data ); +} + /******************************************************************* * MapWindowPoints (USER32.@)

1 0