October 2011 - Wine-Commits

Henri Verbeet : secur32: Properly handle GNUTLS_E_AGAIN in (GnuTLS) schan_imp_recv().
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

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

Jacek Caban : mshtml: Set frame interface to NULL after releasing it in IOleInPlaceObjectWindowless ::InPlaceDeactivate.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

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

Nikolay Sivov : comctl32/tests: Fix a test that depends on control size.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

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

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

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

André Hentschel : po: Update German translation.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

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 : ddraw: Use the same device name as Windows for the Direct3D HAL device.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

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

Frédéric Delanoy : cmd: Output error messages to stderr instead of stdout where appropriate.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: aee397a31780dcc98e555b27b4cac8f827c573d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee397a31780dcc98e555b27b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 1 04:15:05 2011 +0200 cmd: Output error messages to stderr instead of stdout where appropriate. --- programs/cmd/builtins.c | 4 ++-- programs/cmd/wcmdmain.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ca0d4fe..0df123a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1124,7 +1124,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Process the input file */ if (input == INVALID_HANDLE_VALUE) { WCMD_print_error (); - WCMD_output (WCMD_LoadMessage(WCMD_READFAIL), item); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), item); errorlevel = 1; return; /* FOR loop aborts at first failure here */ @@ -1539,7 +1539,7 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { WCMD_parameter(s, 1, &command, NULL); } else { - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 3f2cfcf..eb57928 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1055,7 +1055,7 @@ void WCMD_run_program (WCHAR *command, int called) { if (strchrW(param1, '.') != NULL) extensionsupplied = TRUE; if (strlenW(param1) >= MAX_PATH) { - WCMD_output_asis(WCMD_LoadMessage(WCMD_LINETOOLONG)); + WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_LINETOOLONG)); return; } @@ -1836,9 +1836,9 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, /* Handle truncated input - issue warning */ if (strlenW(extraSpace) == MAXSTRING -1) { - WCMD_output_asis(WCMD_LoadMessage(WCMD_TRUNCATEDLINE)); - WCMD_output_asis(extraSpace); - WCMD_output_asis(newline); + WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_TRUNCATEDLINE)); + WCMD_output_asis_stderr(extraSpace); + WCMD_output_asis_stderr(newline); } /* Replace env vars if in a batch context */

1 0

Vincent Povirk : gdiplus: Include an alpha channel in HBITMAPs created from Bitmaps.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 5f946531593a0f934cccc22eb1f67f27d268501e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f946531593a0f934cccc22eb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 29 11:58:17 2011 -0500 gdiplus: Include an alpha channel in HBITMAPs created from Bitmaps. --- dlls/gdiplus/image.c | 26 +++++++++-------------- dlls/gdiplus/tests/image.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index fe1656f..4ae1d64 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1370,12 +1370,12 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, HBITMAP* hbmReturn, ARGB background) { GpStatus stat; - HBITMAP result, oldbitmap; + HBITMAP result; UINT width, height; HDC hdc; - GpGraphics *graphics; BITMAPINFOHEADER bih; - void *bits; + LPBYTE bits; + BitmapData lockeddata; TRACE("(%p,%p,%x)\n", bitmap, hbmReturn, background); if (!bitmap || !hbmReturn) return InvalidParameter; @@ -1398,25 +1398,19 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, hdc = CreateCompatibleDC(NULL); if (!hdc) return GenericError; - result = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, &bits, + result = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&bits, NULL, 0); if (result) { - oldbitmap = SelectObject(hdc, result); - - stat = GdipCreateFromHDC(hdc, &graphics); - if (stat == Ok) - { - stat = GdipGraphicsClear(graphics, background); + lockeddata.Stride = -width * 4; + lockeddata.Scan0 = bits - (lockeddata.Stride * (height - 1)); - if (stat == Ok) - stat = GdipDrawImage(graphics, (GpImage*)bitmap, 0, 0); + stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead|ImageLockModeUserInputBuf, + PixelFormat32bppPARGB, &lockeddata); - GdipDeleteGraphics(graphics); - } - - SelectObject(hdc, oldbitmap); + if (stat == Ok) + stat = GdipBitmapUnlockBits(bitmap, &lockeddata); } else stat = GenericError; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 77aec93..44554a5 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1514,6 +1514,12 @@ static void test_createhbitmap(void) expect(32, bm.bmBitsPixel); ok(bm.bmBits != NULL, "got DDB, expected DIB\n"); + if (bm.bmBits) + { + DWORD val = *(DWORD*)bm.bmBits; + ok(val == 0xff686868, "got %x, expected 0xff686868\n", val); + } + hdc = CreateCompatibleDC(NULL); oldhbitmap = SelectObject(hdc, hbitmap); @@ -1529,6 +1535,49 @@ static void test_createhbitmap(void) stat = GdipDisposeImage((GpImage*)bitmap); expect(Ok, stat); + + /* create alpha Bitmap */ + stat = GdipCreateBitmapFromScan0(8, 20, 32, PixelFormat32bppARGB, bits, &bitmap); + expect(Ok, stat); + + /* create HBITMAP */ + stat = GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0); + expect(Ok, stat); + + if (stat == Ok) + { + ret = GetObjectA(hbitmap, sizeof(BITMAP), &bm); + expect(sizeof(BITMAP), ret); + + expect(0, bm.bmType); + expect(8, bm.bmWidth); + expect(20, bm.bmHeight); + expect(32, bm.bmWidthBytes); + expect(1, bm.bmPlanes); + expect(32, bm.bmBitsPixel); + ok(bm.bmBits != NULL, "got DDB, expected DIB\n"); + + if (bm.bmBits) + { + DWORD val = *(DWORD*)bm.bmBits; + ok(val == 0x682a2a2a, "got %x, expected 0x682a2a2a\n", val); + } + + hdc = CreateCompatibleDC(NULL); + + oldhbitmap = SelectObject(hdc, hbitmap); + pixel = GetPixel(hdc, 5, 5); + SelectObject(hdc, oldhbitmap); + + DeleteDC(hdc); + + expect(0x2a2a2a, pixel); + + DeleteObject(hbitmap); + } + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); } static void test_getthumbnail(void)

1 0

Michael Stefaniuc : msxml3: Use SUCCEEDED instead of !FAILED.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 718a924f5b8c8f19bc6538a6caf69ab409db07e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718a924f5b8c8f19bc6538a6c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 1 20:31:34 2011 +0200 msxml3: Use SUCCEEDED instead of !FAILED. --- dlls/msxml3/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d4fcc1c..2eedc78 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2760,7 +2760,7 @@ static HRESULT WINAPI domdoc_validateNode( { hr = SchemaCache_validate_tree(This->properties->schemaCache, get_node_obj(node)->node); - if (!FAILED(hr)) + if (SUCCEEDED(hr)) { ++validated; /* TODO: get a real error code here */

1 0

Michael Stefaniuc : sane.ds: Don't compare with TRUE.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 43b7a0db48465a5af15f60558435f2e3db531be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b7a0db48465a5af15f60558… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 1 21:42:21 2011 +0200 sane.ds: Don't compare with TRUE. --- dlls/sane.ds/ui.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 5d4cd83..d57376e 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -994,7 +994,7 @@ static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM switch (((NMHDR*)lParam)->code) { case PSN_APPLY: - if (psn->lParam == TRUE) + if (psn->lParam) { activeDS.currentState = 6; if (activeDS.windowMessage)

1 0