October 2011 - Wine-commits

Akihiro Sagawa : ddraw: Use the same device name as Windows for the Direct3D HAL device.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: f2044702fa442ca513a720536b88ba77d9d4a970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2044702fa442ca513a720536… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Oct 2 22:29:20 2011 +0900 ddraw: Use the same device name as Windows for the Direct3D HAL device. --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 18fe07f..3fe3204 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -56,7 +56,7 @@ static struct enum_device_entry /* HAL device */ { "WINE Direct3D7 Hardware acceleration using WineD3D", - "Wine D3D7 HAL", + "Direct3D HAL", &IID_IDirect3DHALDevice, },

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 5cabd4c2bc88fc8be8c48eade13580f654a39a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cabd4c2bc88fc8be8c48eade… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 1 17:29:32 2011 +0200 po: Update German translation. --- po/de.po | 112 +++++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 75 insertions(+), 37 deletions(-) diff --git a/po/de.po b/po/de.po index 9718199..f4d25fd 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-09-07 23:43+0200\n" +"PO-Revision-Date: 2011-10-01 18:05+0200\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -7748,6 +7748,25 @@ msgid "" " /S Processes matching files in the current folder and all subfolders.\n" " /D Processes folders as well.\n" msgstr "" +"ATTRIB - Zeigt oder ändert Dateiattribute.\n" +"\n" +"Syntax:\n" +"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [Laufwerk:][Pfad][Dateiname]\n" +" [/S [/D]]\n" +"\n" +"Dabei:\n" +"\n" +" + Setzt ein Attribut.\n" +" - Löscht ein Attribut.\n" +" R Schreibschut Dateiattribut.\n" +" A Archiv Dateiattribut.\n" +" S System Dateiattribut.\n" +" H Verbergen Dateiattribut.\n" +" [Laufwerk:][Pfad][Dateiname]\n" +" Gibt eine Datei oder mehrere Dateien für attrib an.\n" +" /S Zutreffende Dateien im aktuellen Verzeichnis und Unterverzeichnissen " +"verarbeiten.\n" +" /D Auch Verzeichnisse verarbeiten.\n" #: clock.rc:29 msgid "Ana&log" @@ -7915,7 +7934,6 @@ msgid "" msgstr "HELP zeigt die Hilfe an\n" #: cmd.rc:94 -#, fuzzy msgid "" "IF is used to conditionally execute a command.\n" "\n" @@ -7929,13 +7947,12 @@ msgstr "" "IF wird benutzt, um einen Befehl bedingt auszuführen.\n" "\n" "Syntax:\tIF [NOT] EXIST Dateiname Befehl\n" -"IF [NOT] Zeichenkette1==Zeichenkette2 Befehl\n" -"IF [NOT] ERRORLEVEL Nummer Befehl\n" +" IF [NOT] Zeichenkette1==Zeichenkette2 Befehl\n" +" IF [NOT] ERRORLEVEL Nummer Befehl\n" "\n" "In der zweiten Form des Befehls, müssen die beiden Zeichenketten in " -"doppelten\n" -"Anführungszeichen stehen. Der Vergleich achtet nicht auf die Groß- und\n" -"Kleinschreibung.\n" +"doppelten Anführungszeichen stehen. Der Vergleich achtet nicht auf " +"die Groß- und Kleinschreibung.\n" #: cmd.rc:100 msgid "" @@ -8245,6 +8262,14 @@ msgid "" "Specifying no file type after the equal sign removes the current " "association, if any.\n" msgstr "" +"ASSOC zeigt oder ändert Dateierweiterungs Zuordungen\n" +"\n" +"Syntax: ASSOC [.erw[=[Dateityp]]]\n" +"\n" +"ASSOC zeigt ohne Parameter die aktuellen Dateierweiterungs Zuordungen an.\n" +"Mit nur einer Dateierweiterung, wird die aktuelle Zurordung angezeigt.\n" +"Ohne Zuordung nach dem Gleichheitszeichen wird die aktuelle Zuordnung " +"gelöscht, falls es eine gab.\n" #: cmd.rc:242 msgid "" @@ -8259,6 +8284,15 @@ msgid "" "Specifying no open command after the equal sign removes the command string " "associated to the specified file type.\n" msgstr "" +"FTYPE zeigt oder ändert die Öffnen-Befehle zu Dateierweiterungs Zuordungen\n" +"\n" +"Syntax: FTYPE [Dateityp[=[Öffnen-Befehl]]]\n" +"\n" +"Zeigt ohne Parameter die Dateitypen für die aktuell Öffnen-Befehle definiert " +"sind.\n" +"Mit nur einem Dateityp, wird der aktuelle Öffnen-Befehl angezeigt.\n" +"Ohne Öffnen-Befehl nach dem Gleichheitszeichen wird der aktuell zugeordnete " +"Öffnen-Befehl gelöscht.\n" #: cmd.rc:244 msgid "MORE displays output of files or piped input in pages.\n" @@ -8593,7 +8627,6 @@ msgid "Default gateway" msgstr "Standard Gateway" #: net.rc:27 -#, fuzzy msgid "" "The syntax of this command is:\n" "\n" @@ -8605,12 +8638,11 @@ msgid "" msgstr "" "Die Syntax von diesem Befehl ist:\n" "\n" -"NET HELP Befehl\n" -" -or-\n" +"NET Befehl [Parameter]\n" +" -oder-\n" "NET Befehl /HELP\n" "\n" -" Mögliche Befehle:\n" -" NET HELP NET START NET STOP NET USE\n" +"Befehl kann hier HELP, START, STOP oder USE sein.\n" #: net.rc:28 msgid "" @@ -8621,6 +8653,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" +"Die Syntax dieses Befehls ist:\n" +"\n" +"NET START [Dienst]\n" +"\n" +"Zeigt eine Liste laufender Dienste wenn kein Dienst angegeben wurde. " +"Ansonsten wird der angegebene Dienst gestartet.\n" #: net.rc:29 msgid "" @@ -8630,6 +8668,11 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" +"Die Syntax dieses Befehls ist:\n" +"\n" +"NET STOP Dienst\n" +"\n" +"Der angegebene Dienst wird gestoppt.\n" #: net.rc:30 msgid "Stopping dependent service: %s\n" @@ -9024,9 +9067,8 @@ msgid "version 1.0" msgstr "Version 1.0" #: oleview.rc:100 -#, fuzzy msgid "TypeLib files (*.tlb; *.olb; *.dll; *.ocx; *.exe)" -msgstr "TypeLib Dateien (*.tlb;*.olb;*.dll;*.ocx;*.exe)" +msgstr "TypeLib Dateien (*.tlb; *.olb; *.dll; *.ocx; *.exe)" #: oleview.rc:103 msgid "Bind to file via a File Moniker" @@ -9696,7 +9738,6 @@ msgstr "" "Bedingungen weiter zu verbreiten; führe 'start /L' für mehr Details aus.\n" #: start.rc:64 -#, fuzzy msgid "" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "This program is free software; you can redistribute it and/or\n" @@ -9716,19 +9757,21 @@ msgid "" "See the COPYING.LIB file for license information.\n" msgstr "" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" -"This program is free software; you can redistribute it and/or\n" -"modify it under the terms of the GNU Lesser Public License\n" -"as published by the Free Software Foundation; either version 2.1\n" -"of the License, or (at your option) any later version.\n" +"Dieses Programm ist freie Software; Sie dürfen es unter den Bedingungen\n" +"der GNU Lesser General Public License, wie von der Free Software Foundation\n" +"veröffentlicht, weiterverteilen und/oder modifizieren; entweder gemäß\n" +"Version 2.1 der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n" "\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU Lesser Public License for more details.\n" +"Diese Bibliothek wird in der Hoffnung weiterverbreitet, daß es nützlich sein\n" +"wird, jedoch OHNE IRGENDEINE GARANTIE, auch ohne die implizierte\n" +"Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN\n" +"BESTIMMTEN ZWECK. Mehr Details finden Sie in der\n" +"GNU Lesser General Public License.\n" +"\n" +"Sie sollten eine Kopie der GNU Lesser General Public License zusammen\n" +"mit diesem Programm erhalten haben; falls nicht, schreiben Sie an die Free\n" +"Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA." "\n" -"You should have received a copy of the GNU Lesser Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n" "\n" "Schau in die Datei COPYING.LIB für Lizenzinformationen.\n" @@ -10448,12 +10491,11 @@ msgstr "Wine-Konfiguration für %s" #: winecfg.rc:87 msgid "Selected driver: %s" -msgstr "" +msgstr "Ausgewählter Treiber: %s" #: winecfg.rc:88 -#, fuzzy msgid "(None)" -msgstr "Kein" +msgstr "(Kein)" #: winecfg.rc:51 msgid "" @@ -10492,9 +10534,8 @@ msgid "Default Settings" msgstr "Standardeinstellungen" #: winecfg.rc:59 -#, fuzzy msgid "Wine Programs (*.exe; *.exe.so)" -msgstr "Wine-Programme (*.exe,*.exe.so)" +msgstr "Wine-Programme (*.exe; *.exe.so)" #: winecfg.rc:60 msgid "Use global settings" @@ -10915,9 +10956,8 @@ msgid "Tile &Vertically\tCtrl+F4" msgstr "&Nebeneinander\tUmschalt+F4" #: winefile.rc:87 -#, fuzzy msgid "&About Wine File Manager" -msgstr "&Info über Wine File Manager" +msgstr "&Info über Wine Dateimanager" #: winefile.rc:93 msgid "Applying font settings" @@ -10928,9 +10968,8 @@ msgid "Error while selecting new font." msgstr "Fehler während der Schriftart-Auswahl." #: winefile.rc:99 -#, fuzzy msgid "Wine File Manager" -msgstr "Winefile" +msgstr "Wine Dateimanager" #: winefile.rc:101 msgid "root fs" @@ -11247,9 +11286,8 @@ msgid "Unicode text document" msgstr "Unicode-Textdokument" #: wordpad.rc:143 -#, fuzzy msgid "Printer files (*.prn)" -msgstr "Druckerdateien (*.PRN)" +msgstr "Druckerdateien (*.prn)" #: wordpad.rc:148 msgid "Left"

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: c5881eabfa96e08d98ddbe9a894a38a4bf5b9253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5881eabfa96e08d98ddbe9a8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Oct 2 22:29:23 2011 +0900 po: Update Japanese translation. --- po/ja.po | 78 ++++++++++++++++++++++++++----------------------------------- 1 files changed, 33 insertions(+), 45 deletions(-) diff --git a/po/ja.po b/po/ja.po index e73d572..a2ca408 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-09-11 22:43+0900\n" +"PO-Revision-Date: 2011-10-02 17:22+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -145,7 +145,7 @@ msgstr "今日へ移動" #: comdlg32.rc:29 msgid "&About FolderPicker Test" -msgstr "" +msgstr "バージョン情報(&A)" #: comdlg32.rc:30 msgid "Document Folders" @@ -2916,11 +2916,8 @@ msgid "Invalid starting code segment for %1\n" msgstr "%1 における開始コードセグメントが正しくありません。\n" #: winerror.mc:736 -#, fuzzy msgid "Invalid starting stack segment for %1\n" -msgstr "" -"Invalid starting stack segment for %1\n" -"%1 における開始スタックセグメントが正しくありません。\n" +msgstr "%1 における開始スタックセグメントが正しくありません。\n" #: winerror.mc:741 msgid "Invalid module type for %1\n" @@ -3735,11 +3732,8 @@ msgid "Connection refused\n" msgstr "接続は拒否されました。\n" #: winerror.mc:1761 -#, fuzzy msgid "Connection gracefully closed\n" -msgstr "" -"接続は終了しました。\n" -"Connection gracefully closed\n" +msgstr "接続は終了しました。\n" #: winerror.mc:1766 msgid "Address already associated with transport endpoint\n" @@ -7657,7 +7651,6 @@ msgid "%s: File Not Found\n" msgstr "%s: ファイルが見つかりません\n" #: attrib.rc:47 -#, fuzzy msgid "" "ATTRIB - Displays or changes file attributes.\n" "\n" @@ -7683,21 +7676,21 @@ msgstr "" "構文:\n" "ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] [ドライブ:][パス][ファイル" "名]\n" -"\t [/S [/D]]\n" +" [/S [/D]]\n" "\n" "オプション:\n" "\n" -"+ 属性を設定します。\n" -"- 属性を消去します。\n" -"R 読み取り専用ファイル属性\n" -"A アーカイブファイル属性。\n" -"S システムファイル属性。\n" -"H 隠しファイル属性。\n" -"[ドライブ:][パス][ファイル名]\n" -"attribが処理するファイルやファイル群を指定します。\n" -"/S カレントフォルダとすべてのサブフォルダで\n" -"マッチするファイルを処理します。\n" -"/D フォルダも同様に処理します。\n" +" + 属性を設定します。\n" +" - 属性を消去します。\n" +" R 読み取り専用ファイル属性。\n" +" A アーカイブファイル属性。\n" +" S システムファイル属性。\n" +" H 隠しファイル属性。\n" +" [ドライブ:][パス][ファイル名]\n" +" attribが処理するファイルやファイル群を指定します。\n" +" /S カレントフォルダとすべてのサブフォルダでマッチするファイルを処理しま" +"す。\n" +" /D フォルダも同様に処理します。\n" #: clock.rc:29 msgid "Ana&log" @@ -8965,9 +8958,8 @@ msgid "version 1.0" msgstr "バージョン 1.0" #: oleview.rc:100 -#, fuzzy msgid "TypeLib files (*.tlb; *.olb; *.dll; *.ocx; *.exe)" -msgstr "TypeLib ファイル (*.tlb;*.olb;*.dll;*.ocx;*.exe)" +msgstr "TypeLib ファイル (*.tlb; *.olb; *.dll; *.ocx; *.exe)" #: oleview.rc:103 msgid "Bind to file via a File Moniker" @@ -9631,7 +9623,6 @@ msgstr "" "条件の詳細は 'start /L' を起動してください。\n" #: start.rc:64 -#, fuzzy msgid "" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "This program is free software; you can redistribute it and/or\n" @@ -9650,20 +9641,21 @@ msgid "" "\n" "See the COPYING.LIB file for license information.\n" msgstr "" -"start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" -"This program is free software; you can redistribute it and/or\n" -"modify it under the terms of the GNU Lesser Public License\n" -"as published by the Free Software Foundation; either version 2.1\n" -"of the License, or (at your option) any later version.\n" +"start.exe バージョン 0.2 Copyright (C) 2003, Dan Kegel\n" +"このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフトウェ\n" +"ア財団によって発行されたGNU 劣等一般公衆利用許諾契約書(バージョン2.1 \n" +"か、希望によってはそれ以降のバージョンのうちどれか)の定める条件の下で\n" +"再頒布または改変することができます。\n" "\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU Lesser Public License for more details.\n" +"このプログラムは有用であることを願って頒布されますが、*全くの無保証* \n" +"です。商業可能性の保証や特定の目的への適合性は、言外に示されたものも含\n" +"め全く存在しません。詳しくはGNU 劣等一般公衆利用許諾契約書をご覧くださ\n" +"い。\n" "\n" -"You should have received a copy of the GNU Lesser Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n" +"あなたはこのライブラリと共に、GNU 劣等一般公衆利用許諾契約書の複製物を\n" +"一部受け取ったはずです。もし受け取っていなければ、フリーソフトウェア財\n" +"団まで請求してください(宛先は the Free Software Foundation, Inc.,\n" +"51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA)。\n" "\n" "ライセンスの内容については COPYING.LIB ファイルを参照してください。\n" @@ -10381,7 +10373,6 @@ msgid "Selected driver: %s" msgstr "" #: winecfg.rc:88 -#, fuzzy msgid "(None)" msgstr "なし" @@ -10422,9 +10413,8 @@ msgid "Default Settings" msgstr "既定の設定" #: winecfg.rc:59 -#, fuzzy msgid "Wine Programs (*.exe; *.exe.so)" -msgstr "Wine プログラム (*.exe,*.exe.so)" +msgstr "Wine プログラム (*.exe; *.exe.so)" #: winecfg.rc:60 msgid "Use global settings" @@ -10844,9 +10834,8 @@ msgid "Tile &Vertically\tCtrl+F4" msgstr "左右に並べて表示(&V)\tCtrl+F4" #: winefile.rc:87 -#, fuzzy msgid "&About Wine File Manager" -msgstr "Wine ファイルマネージャ" +msgstr "バージョン情報(&A)" #: winefile.rc:93 msgid "Applying font settings" @@ -11173,9 +11162,8 @@ msgid "Unicode text document" msgstr "Unicodeテキスト文書" #: wordpad.rc:143 -#, fuzzy msgid "Printer files (*.prn)" -msgstr "プリンタファイル (*.PRN)" +msgstr "プリンタファイル (*.prn)" #: wordpad.rc:148 msgid "Left"

1 0

Nikolay Sivov : comctl32/tests: Fix a test that depends on control size.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: ce6819d93da8681f5696c3038b67adc434fa6a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6819d93da8681f5696c3038… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 3 09:31:18 2011 -0500 comctl32/tests: Fix a test that depends on control size. --- dlls/comctl32/tests/monthcal.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 9775095..fd6b910 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1865,10 +1865,17 @@ static void test_daystate(void) MONTHDAYSTATE state[4]; DWORD ret, style; HWND hwnd; + RECT r; /* without MCS_DAYSTATE */ hwnd = create_monthcal_control(0); + ret = SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r); + expect(TRUE, ret); + + /* resize control to display two Calendars */ + MoveWindow(hwnd, 0, 0, r.right, (5/2)*r.bottom, FALSE); + ret = SendMessageA(hwnd, MCM_GETMONTHRANGE, GMR_DAYSTATE, 0); expect(4, ret);

1 0

Jacek Caban : mshtml: Set frame interface to NULL after releasing it in IOleInPlaceObjectWindowless ::InPlaceDeactivate.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 6cfa962922df52a46f2227447743015635ed60e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cfa962922df52a46f2227447… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 3 10:58:17 2011 -0500 mshtml: Set frame interface to NULL after releasing it in IOleInPlaceObjectWindowless::InPlaceDeactivate. --- dlls/mshtml/olewnd.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/olewnd.c b/dlls/mshtml/olewnd.c index 18b98f6..f272949 100644 --- a/dlls/mshtml/olewnd.c +++ b/dlls/mshtml/olewnd.c @@ -197,8 +197,10 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_InPlaceDeactivate(IOleInPlaceOb if(!This->doc_obj->in_place_active) return S_OK; - if(This->doc_obj->frame) + if(This->doc_obj->frame) { IOleInPlaceFrame_Release(This->doc_obj->frame); + This->doc_obj->frame = NULL; + } if(This->doc_obj->hwnd) { ShowWindow(This->doc_obj->hwnd, SW_HIDE);

1 0

Henri Verbeet : secur32: Use gnutls_record_get_max_size() to get the maximum message size.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 0903855456ccc2e12188a29a178810f398d33cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0903855456ccc2e12188a29a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 3 20:22:48 2011 +0200 secur32: Use gnutls_record_get_max_size() to get the maximum message size. --- dlls/secur32/schannel.c | 6 ++++-- dlls/secur32/schannel_gnutls.c | 7 +++++++ dlls/secur32/schannel_macosx.c | 6 ++++++ dlls/secur32/secur32_priv.h | 1 + 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index f12baaa..13353a7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -821,13 +821,15 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( SecPkgContext_StreamSizes *stream_sizes = buffer; SIZE_T mac_size = info.dwHashStrength; unsigned int block_size = schan_imp_get_session_cipher_block_size(ctx->session); + unsigned int message_size = schan_imp_get_max_message_size(ctx->session); - TRACE("Using %lu mac bytes, block size %u\n", mac_size, block_size); + TRACE("Using %lu mac bytes, message size %u, block size %u\n", + mac_size, message_size, block_size); /* These are defined by the TLS RFC */ stream_sizes->cbHeader = 5; stream_sizes->cbTrailer = mac_size + 256; /* Max 255 bytes padding + 1 for padding size */ - stream_sizes->cbMaximumMessage = 1 << 14; + stream_sizes->cbMaximumMessage = message_size; stream_sizes->cbBuffers = 4; stream_sizes->cbBlockSize = block_size; } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 782cc64..870c553 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -62,6 +62,7 @@ MAKE_FUNCPTR(gnutls_mac_get_key_size); MAKE_FUNCPTR(gnutls_perror); MAKE_FUNCPTR(gnutls_protocol_get_version); MAKE_FUNCPTR(gnutls_set_default_priority); +MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); MAKE_FUNCPTR(gnutls_record_send); MAKE_FUNCPTR(gnutls_transport_set_errno); @@ -289,6 +290,11 @@ unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) return schannel_get_cipher_block_size(cipher); } +unsigned int schan_imp_get_max_message_size(schan_imp_session session) +{ + return pgnutls_record_get_max_size((gnutls_session_t)session); +} + SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, SecPkgContext_ConnectionInfo *info) { @@ -423,6 +429,7 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_perror) LOAD_FUNCPTR(gnutls_protocol_get_version) LOAD_FUNCPTR(gnutls_set_default_priority) + LOAD_FUNCPTR(gnutls_record_get_max_size); LOAD_FUNCPTR(gnutls_record_recv); LOAD_FUNCPTR(gnutls_record_send); LOAD_FUNCPTR(gnutls_transport_set_errno) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index fbaa432..1158b14 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -628,6 +628,12 @@ unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) } } +unsigned int schan_imp_get_max_message_size(schan_imp_session session) +{ + FIXME("Returning 1 << 14.\n"); + return 1 << 14; +} + SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, SecPkgContext_ConnectionInfo *info) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 2d2fc1e..3aa5af6 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -196,6 +196,7 @@ extern void schan_imp_set_session_transport(schan_imp_session session, struct schan_transport *t) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_handshake(schan_imp_session session) DECLSPEC_HIDDEN; extern unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) DECLSPEC_HIDDEN; +extern unsigned int schan_imp_get_max_message_size(schan_imp_session session) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, SecPkgContext_ConnectionInfo *info) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session,

1 0

Henri Verbeet : secur32: Return failure if chan_EncryptMessage() can' t encrypt the entire buffer.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 5004c38dd574de99445584ff0b3e14dbcea63963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5004c38dd574de99445584ff0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 3 20:22:49 2011 +0200 secur32: Return failure if chan_EncryptMessage() can't encrypt the entire buffer. --- dlls/secur32/schannel.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 13353a7..69ee0e6 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -925,10 +925,11 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle struct schan_transport transport; struct schan_context *ctx; struct schan_buffers *b; + SECURITY_STATUS status; SecBuffer *buffer; SIZE_T data_size; + SIZE_T length; char *data; - SSIZE_T sent = 0; int idx; TRACE("context_handle %p, quality %d, message %p, message_seq_no %d\n", @@ -959,29 +960,21 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle init_schan_buffers(&transport.out, message, schan_encrypt_message_get_next_buffer_token); schan_imp_set_session_transport(ctx->session, &transport); - while (sent < data_size) - { - SIZE_T length = data_size - sent; - SECURITY_STATUS status = schan_imp_send(ctx->session, data + sent, &length); - if (status == SEC_I_CONTINUE_NEEDED) - break; - else if (status != SEC_E_OK) - { - HeapFree(GetProcessHeap(), 0, data); - ERR("Returning %d\n", status); - return status; - } + length = data_size; + status = schan_imp_send(ctx->session, data, &length); - sent += length; - } + TRACE("Sent %ld bytes.\n", length); - TRACE("Sent %ld bytes\n", sent); + if (length != data_size) + status = SEC_E_INTERNAL_ERROR; b = &transport.out; b->desc->pBuffers[b->current_buffer_idx].cbBuffer = b->offset; HeapFree(GetProcessHeap(), 0, data); - return SEC_E_OK; + TRACE("Returning %#x.\n", status); + + return status; } static int schan_decrypt_message_get_next_buffer(const struct schan_transport *t, struct schan_buffers *s)

1 0

Henri Verbeet : secur32: Properly handle GNUTLS_E_AGAIN in (GnuTLS) schan_imp_send().
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 65aed972c0dac659800faf0097df190278c37883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65aed972c0dac659800faf009… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 3 20:22:50 2011 +0200 secur32: Properly handle GNUTLS_E_AGAIN in (GnuTLS) schan_imp_send(). --- dlls/secur32/schannel.c | 19 +------------------ dlls/secur32/schannel_gnutls.c | 16 +++++++++++++++- dlls/secur32/secur32_priv.h | 18 ++++++++++++++++++ 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 69ee0e6..0355982 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -62,23 +62,6 @@ struct schan_context ULONG req_ctx_attr; }; -struct schan_buffers -{ - SIZE_T offset; - SIZE_T limit; - const SecBufferDesc *desc; - int current_buffer_idx; - BOOL allow_buffer_resize; - int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *); -}; - -struct schan_transport -{ - struct schan_context *ctx; - struct schan_buffers in; - struct schan_buffers out; -}; - static struct schan_handle *schan_handle_table; static struct schan_handle *schan_free_handles; static SIZE_T schan_handle_table_size; @@ -496,7 +479,7 @@ static void schan_resize_current_buffer(const struct schan_buffers *s, SIZE_T mi b->pvBuffer = new_data; } -static char *schan_get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count) +char *schan_get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count) { SIZE_T max_count; PSecBuffer buffer; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 870c553..e47c022 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -65,6 +65,7 @@ MAKE_FUNCPTR(gnutls_set_default_priority); MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); MAKE_FUNCPTR(gnutls_record_send); +MAKE_FUNCPTR(gnutls_transport_get_ptr); MAKE_FUNCPTR(gnutls_transport_set_errno); MAKE_FUNCPTR(gnutls_transport_set_ptr); MAKE_FUNCPTR(gnutls_transport_set_pull_function); @@ -340,11 +341,23 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, SIZE_T *length) { gnutls_session_t s = (gnutls_session_t)session; - ssize_t ret = pgnutls_record_send(s, buffer, *length); + ssize_t ret; + +again: + ret = pgnutls_record_send(s, buffer, *length); + if (ret >= 0) *length = ret; else if (ret == GNUTLS_E_AGAIN) + { + struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); + SIZE_T count = 0; + + if (schan_get_buffer(t, &t->out, &count)) + goto again; + return SEC_I_CONTINUE_NEEDED; + } else { pgnutls_perror(ret); @@ -432,6 +445,7 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_record_get_max_size); LOAD_FUNCPTR(gnutls_record_recv); LOAD_FUNCPTR(gnutls_record_send); + LOAD_FUNCPTR(gnutls_transport_get_ptr) LOAD_FUNCPTR(gnutls_transport_set_errno) LOAD_FUNCPTR(gnutls_transport_set_ptr) LOAD_FUNCPTR(gnutls_transport_set_pull_function) diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 3aa5af6..c6b362b 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -183,6 +183,24 @@ typedef struct schan_imp_certificate_credentials_opaque *schan_imp_certificate_c struct schan_transport; +struct schan_buffers +{ + SIZE_T offset; + SIZE_T limit; + const SecBufferDesc *desc; + int current_buffer_idx; + BOOL allow_buffer_resize; + int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *); +}; + +struct schan_transport +{ + struct schan_context *ctx; + struct schan_buffers in; + struct schan_buffers out; +}; + +char *schan_get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count) DECLSPEC_HIDDEN; extern int schan_pull(struct schan_transport *t, void *buff, size_t *buff_len) DECLSPEC_HIDDEN; extern int schan_push(struct schan_transport *t, const void *buff, size_t *buff_len) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : secur32: Properly handle GNUTLS_E_AGAIN in (GnuTLS) schan_imp_recv().
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 929598fd00778a6d5e90acd80f68452cd93be0f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=929598fd00778a6d5e90acd80… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 3 20:22:51 2011 +0200 secur32: Properly handle GNUTLS_E_AGAIN in (GnuTLS) schan_imp_recv(). --- dlls/secur32/schannel_gnutls.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index e47c022..96fb471 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -371,11 +371,23 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, SIZE_T *length) { gnutls_session_t s = (gnutls_session_t)session; - ssize_t ret = pgnutls_record_recv(s, buffer, *length); + ssize_t ret; + +again: + ret = pgnutls_record_recv(s, buffer, *length); + if (ret >= 0) *length = ret; else if (ret == GNUTLS_E_AGAIN) + { + struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); + SIZE_T count = 0; + + if (schan_get_buffer(t, &t->in, &count)) + goto again; + return SEC_I_CONTINUE_NEEDED; + } else { pgnutls_perror(ret);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_present() const.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: adf9e6120d493f134489b3d8f257961e2716728d URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf9e6120d493f134489b3d8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 3 20:22:52 2011 +0200 wined3d: Make the device parameter to wined3d_device_present() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d1bec23..8e4d827 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4045,7 +4045,7 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device) return WINED3D_OK; } -HRESULT CDECL wined3d_device_present(struct wined3d_device *device, const RECT *src_rect, +HRESULT CDECL wined3d_device_present(const struct wined3d_device *device, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region) { UINT i; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 208c5c0..8a38668 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2278,7 +2278,7 @@ HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, WINED3DPRE HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, WINED3DPRESENT_PARAMETERS *present_parameters); HRESULT __cdecl wined3d_device_multiply_transform(struct wined3d_device *device, WINED3DTRANSFORMSTATETYPE state, const WINED3DMATRIX *matrix); -HRESULT __cdecl wined3d_device_present(struct wined3d_device *device, const RECT *src_rect, +HRESULT __cdecl wined3d_device_present(const struct wined3d_device *device, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region); HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer,

1 0