September 2010 - Wine-Commits

Detlef Riekenberg : inetcpl: Add German translation.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: c9d2fb352b177b86cb542f524fc70116cec2e38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d2fb352b177b86cb542f524… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 10 13:32:43 2010 +0200 inetcpl: Add German translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_De.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 294cdbf..93bf2ac 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ inetcpl.c RC_SRCS = \ + cpl_De.rc \ cpl_En.rc \ inetcpl.rc diff --git a/dlls/inetcpl.cpl/cpl_De.rc b/dlls/inetcpl.cpl/cpl_De.rc new file mode 100644 index 0000000..397f0cd --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_De.rc @@ -0,0 +1,32 @@ +/* + * German resources for the Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +#pragma code_page(65001) + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Internet Einstellungen" + IDS_CPL_INFO "Wine Internet Browser und zugehörige Einstellungen anpassen." +END

1 0

Luca Bennati : inetcpl.cpl: Add Italian translation.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 5fd0bfe364df6726e394dfadf6b65719662419fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd0bfe364df6726e394dfadf… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Sep 10 13:59:09 2010 +0200 inetcpl.cpl: Add Italian translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_It.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 93bf2ac..66151e7 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ RC_SRCS = \ cpl_De.rc \ cpl_En.rc \ + cpl_It.rc \ inetcpl.rc SVG_SRCS = \ diff --git a/dlls/inetcpl.cpl/cpl_It.rc b/dlls/inetcpl.cpl/cpl_It.rc new file mode 100644 index 0000000..81e3044 --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_It.rc @@ -0,0 +1,33 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Luca Bennati <lucak3(a)gmail.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +/* UTF-8 */ +#pragma codepage(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Impostazioni di Internet" + IDS_CPL_INFO "Configura il browser Internet di Wine e le relative impostazioni" +END

1 0

Mikko Rasa : secur32: Fill a SECBUFFER_MISSING buffer if the message is not complete.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 506af9205d62af2bd58e40c8b5f956e041a0ba8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=506af9205d62af2bd58e40c8b… Author: Mikko Rasa <tdb(a)tdb.fi> Date: Wed Sep 15 20:30:10 2010 +0300 secur32: Fill a SECBUFFER_MISSING buffer if the message is not complete. --- dlls/secur32/schannel.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 78757ac..199c7ce 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1244,6 +1244,15 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle if(buffer->cbBuffer < expected_size) { TRACE("Expected %u bytes, but buffer only contains %u bytes\n", expected_size, buffer->cbBuffer); + buffer->BufferType = SECBUFFER_MISSING; + buffer->cbBuffer = expected_size - buffer->cbBuffer; + + /* This is a bit weird, but windows does it too */ + idx = schan_find_sec_buffer_idx(message, 0, SECBUFFER_EMPTY); + buffer = &message->pBuffers[idx]; + buffer->BufferType = SECBUFFER_MISSING; + buffer->cbBuffer = expected_size - buffer->cbBuffer; + TRACE("Returning SEC_E_INCOMPLETE_MESSAGE\n"); return SEC_E_INCOMPLETE_MESSAGE; }

1 0

Frédéric Delanoy : shdocvw: Update French translation.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 3d9794628a90162c25b055956fc00fe7961efe23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9794628a90162c25b055956… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 15 19:11:09 2010 +0200 shdocvw: Update French translation. --- dlls/shdocvw/Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Fr.rc b/dlls/shdocvw/Fr.rc index c3a409c..1e17409 100644 --- a/dlls/shdocvw/Fr.rc +++ b/dlls/shdocvw/Fr.rc @@ -54,6 +54,7 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "&Aperçu avant impression...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR MENUITEM "&Propriétés...", ID_BROWSE_PROPERTIES + MENUITEM "&Quitter", ID_BROWSE_QUIT } POPUP "&Afficher" {

1 0

Mikko Rasa : secur32: Fill header and trailer buffers in schan_DecryptMessage.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 149ffe130f682be1a5f1cbd91a3202f1c5ec4b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=149ffe130f682be1a5f1cbd91… Author: Mikko Rasa <tdb(a)tdb.fi> Date: Wed Sep 15 20:30:08 2010 +0300 secur32: Fill header and trailer buffers in schan_DecryptMessage. --- dlls/secur32/schannel.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 70458fa..0e8b9e2 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1187,6 +1187,19 @@ static int schan_validate_decrypt_buffer_desc(PSecBufferDesc message) return data_idx; } +static void schan_decrypt_fill_buffer(PSecBufferDesc message, ULONG buffer_type, void *data, ULONG size) +{ + int idx; + SecBuffer *buffer; + + idx = schan_find_sec_buffer_idx(message, 0, SECBUFFER_EMPTY); + buffer = &message->pBuffers[idx]; + + buffer->BufferType = buffer_type; + buffer->pvBuffer = data; + buffer->cbBuffer = size; +} + static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, PSecBufferDesc message, ULONG message_seq_no, PULONG quality) { @@ -1198,6 +1211,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle ssize_t received = 0; ssize_t ret; int idx; + char *buf_ptr; TRACE("context_handle %p, message %p, message_seq_no %d, quality %p\n", context_handle, message, message_seq_no, quality); @@ -1252,10 +1266,19 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle TRACE("Received %zd bytes\n", received); - memcpy(buffer->pvBuffer, data, received); - buffer->cbBuffer = received; + buf_ptr = buffer->pvBuffer; + memcpy(buf_ptr + 5, data, received); HeapFree(GetProcessHeap(), 0, data); + schan_decrypt_fill_buffer(message, SECBUFFER_DATA, + buf_ptr + 5, received); + + schan_decrypt_fill_buffer(message, SECBUFFER_STREAM_TRAILER, + buf_ptr + 5 + received, buffer->cbBuffer - 5 - received); + + buffer->BufferType = SECBUFFER_STREAM_HEADER; + buffer->cbBuffer = 5; + return SEC_E_OK; }

1 0

Mikko Rasa : secur32: Only process full TLS frames in schan_DecryptMessage.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: b335e94788647afa013b5e58791f176b2a459e38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b335e94788647afa013b5e587… Author: Mikko Rasa <tdb(a)tdb.fi> Date: Wed Sep 15 20:30:09 2010 +0300 secur32: Only process full TLS frames in schan_DecryptMessage. --- dlls/secur32/schannel.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 0e8b9e2..78757ac 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -105,6 +105,7 @@ struct schan_transport; struct schan_buffers { SIZE_T offset; + SIZE_T limit; const SecBufferDesc *desc; int current_buffer_idx; BOOL allow_buffer_resize; @@ -492,6 +493,7 @@ static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc des int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *)) { s->offset = 0; + s->limit = 0; s->desc = desc; s->current_buffer_idx = -1; s->allow_buffer_resize = FALSE; @@ -599,6 +601,16 @@ static ssize_t schan_pull(gnutls_transport_ptr_t transport, void *buff, size_t b return -1; } + if (t->in.limit != 0 && t->in.offset + buff_len >= t->in.limit) + { + buff_len = t->in.limit - t->in.offset; + if (buff_len == 0) + { + pgnutls_transport_set_errno(t->ctx->session, EAGAIN); + return -1; + } + } + memcpy(buff, b, buff_len); t->in.offset += buff_len; @@ -1208,10 +1220,11 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle SecBuffer *buffer; SIZE_T data_size; char *data; + unsigned expected_size; ssize_t received = 0; ssize_t ret; int idx; - char *buf_ptr; + unsigned char *buf_ptr; TRACE("context_handle %p, message %p, message_seq_no %d, quality %p\n", context_handle, message, message_seq_no, quality); @@ -1225,12 +1238,22 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle if (idx == -1) return SEC_E_INVALID_TOKEN; buffer = &message->pBuffers[idx]; + buf_ptr = buffer->pvBuffer; + + expected_size = 5 + ((buf_ptr[3] << 8) | buf_ptr[4]); + if(buffer->cbBuffer < expected_size) + { + TRACE("Expected %u bytes, but buffer only contains %u bytes\n", expected_size, buffer->cbBuffer); + TRACE("Returning SEC_E_INCOMPLETE_MESSAGE\n"); + return SEC_E_INCOMPLETE_MESSAGE; + } data_size = buffer->cbBuffer; data = HeapAlloc(GetProcessHeap(), 0, data_size); transport.ctx = ctx; init_schan_buffers(&transport.in, message, schan_decrypt_message_get_next_buffer); + transport.in.limit = expected_size; init_schan_buffers(&transport.out, NULL, NULL); pgnutls_transport_set_ptr(ctx->session, (gnutls_transport_ptr_t)&transport); @@ -1266,7 +1289,6 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle TRACE("Received %zd bytes\n", received); - buf_ptr = buffer->pvBuffer; memcpy(buf_ptr + 5, data, received); HeapFree(GetProcessHeap(), 0, data); @@ -1276,6 +1298,10 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle schan_decrypt_fill_buffer(message, SECBUFFER_STREAM_TRAILER, buf_ptr + 5 + received, buffer->cbBuffer - 5 - received); + if(buffer->cbBuffer > expected_size) + schan_decrypt_fill_buffer(message, SECBUFFER_EXTRA, + buf_ptr + expected_size, buffer->cbBuffer - expected_size); + buffer->BufferType = SECBUFFER_STREAM_HEADER; buffer->cbBuffer = 5;

1 0

Mikko Rasa : secur32: Validate buffers passed to schan_DecryptMessage.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: b424b3431ee4c07bfcdc54f58175f49b1f78780d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b424b3431ee4c07bfcdc54f58… Author: Mikko Rasa <tdb(a)tdb.fi> Date: Wed Sep 15 20:30:07 2010 +0300 secur32: Validate buffers passed to schan_DecryptMessage. --- dlls/secur32/schannel.c | 50 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 7a3bb3c..70458fa 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1144,6 +1144,49 @@ static int schan_decrypt_message_get_next_buffer(const struct schan_transport *t return -1; } +static int schan_validate_decrypt_buffer_desc(PSecBufferDesc message) +{ + int data_idx = -1; + unsigned int empty_count = 0; + unsigned int i; + + if (message->cBuffers < 4) + { + WARN("Less than four buffers passed\n"); + return -1; + } + + for (i = 0; i < message->cBuffers; ++i) + { + SecBuffer *b = &message->pBuffers[i]; + if (b->BufferType == SECBUFFER_DATA) + { + if (data_idx != -1) + { + WARN("More than one data buffer passed\n"); + return -1; + } + data_idx = i; + } + else if (b->BufferType == SECBUFFER_EMPTY) + ++empty_count; + } + + if (data_idx == -1) + { + WARN("No data buffer passed\n"); + return -1; + } + + if (empty_count < 3) + { + WARN("Less than three empty buffers passed\n"); + return -1; + } + + return data_idx; +} + static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, PSecBufferDesc message, ULONG message_seq_no, PULONG quality) { @@ -1164,12 +1207,9 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle dump_buffer_desc(message); - idx = schan_find_sec_buffer_idx(message, 0, SECBUFFER_DATA); + idx = schan_validate_decrypt_buffer_desc(message); if (idx == -1) - { - WARN("No data buffer passed\n"); - return SEC_E_INTERNAL_ERROR; - } + return SEC_E_INVALID_TOKEN; buffer = &message->pBuffers[idx]; data_size = buffer->cbBuffer;

1 0

Frédéric Delanoy : shell32: Update French translation.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 0df8892d596206475c3b03e67094e49113d745b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df8892d596206475c3b03e67… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 15 19:11:10 2010 +0200 shell32: Update French translation. --- dlls/shell32/shell32_Fr.rc | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index 3769947..a88fa2f 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -281,14 +281,34 @@ STRINGTABLE IDS_COOKIES "Cookies" IDS_HISTORY "Local Settings\\Historique" IDS_PROGRAM_FILES "Program Files" + IDS_PROGRAM_FILESX86 "Program Files (x86)" IDS_MYPICTURES "Mes images" IDS_PROGRAM_FILES_COMMON "Program Files\\Fichiers communs" + IDS_PROGRAM_FILES_COMMONX86 "Program Files (x86)\\Fichiers communs" IDS_COMMON_DOCUMENTS "Documents" IDS_ADMINTOOLS "Menu Démarrer\\Programmes\\Outils d'administration" - IDS_COMMON_MUSIC "Documents\\Ma musique" - IDS_COMMON_PICTURES "Documents\\Mes images" - IDS_COMMON_VIDEO "Documents\\Mes vidéos" + IDS_COMMON_MUSIC "Musique" + IDS_COMMON_PICTURES "Images" + IDS_COMMON_VIDEO "Vidéos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_CONTACTS "Contacts" + IDS_LINKS "Liens" + IDS_PHOTO_ALBUMS "Images\\Diaporamas" + IDS_PLAYLISTS "Musique\\Listes de lecture" + IDS_PUBLIC_DOWNLOADS "Téléchargements" + IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\GameExplorer" + IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Bibliothèques" + IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Sonneries" + IDS_SAMPLE_MUSIC "Musique\\Échantillons" + IDS_SAMPLE_PICTURES "Images\\Échantillons" + IDS_SAMPLE_PLAYLISTS "Musique\\Exemples de listes de lecture" + IDS_SAMPLE_VIDEOS "Vidéos\\Échantillons" + IDS_SAVED_GAMES "Jeux sauvegardés" + IDS_SAVED_SEARCHES "Recherches" + IDS_USER_PROFILES "Utilisateurs" + IDS_COMMON_OEM_LINKS "Liens OEM" + IDS_DOCUMENTS "Documents" + IDS_DOWNLOADS "Téléchargements" IDS_NEWFOLDER "Nouveau dossier"

1 0

Alexandre Julliard : winebuild: Don' t add extra CPU flags to stubs if they have some already.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: efc88fe317ca34b01b48955252be1f10ae2c08bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc88fe317ca34b01b4895525… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 15 12:45:04 2010 -0500 winebuild: Don't add extra CPU flags to stubs if they have some already. --- tools/winebuild/parser.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index bc483c9..755084e 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -385,7 +385,11 @@ static int parse_spec_stub( ORDDEF *odp, DLLSPEC *spec ) { odp->u.func.nb_args = 0; odp->link_name = xstrdup(""); - odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64); /* don't bother generating stubs for Winelib */ + /* don't bother generating stubs for Winelib */ + if (odp->flags & FLAG_CPU_MASK) + odp->flags &= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64); + else + odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64); return 1; }

1 0

Rudolf Mayerhofer : kernel32: Implement GetUserDefaultLocaleName using users default LCID.
by Alexandre Julliard Sept. 15, 2010

Sept. 15, 2010

Module: wine Branch: master Commit: 2637bb9de7feacf2df5a8c1528bd22dab2920174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2637bb9de7feacf2df5a8c152… Author: Rudolf Mayerhofer <rm(a)eightyfive.net> Date: Wed Sep 15 11:08:20 2010 +0200 kernel32: Implement GetUserDefaultLocaleName using users default LCID. --- dlls/kernel32/locale.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 8d8042b..168bb19 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3801,6 +3801,10 @@ INT WINAPI GetGeoInfoA(GEOID GeoId, GEOTYPE GeoType, LPSTR lpGeoData, INT WINAPI GetUserDefaultLocaleName(LPWSTR localename, int buffersize) { - FIXME("(%p, %d) stub!\n", localename, buffersize); - return 0; + LCID userlcid; + + TRACE("%p, %d\n", localename, buffersize); + + userlcid = GetUserDefaultLCID(); + return LCIDToLocaleName(userlcid, localename, buffersize, 0); }

1 0