November 2011 - Wine-Commits

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 5243d44bb9517051e2a340003baa3eec92fa9b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5243d44bb9517051e2a340003… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Nov 7 19:12:51 2011 +0900 po: Update Japanese translation. --- po/ja.po | 131 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 63 insertions(+), 68 deletions(-) diff --git a/po/ja.po b/po/ja.po index 330cce9..1c0fd10 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-10-02 17:22+0900\n" +"PO-Revision-Date: 2011-11-05 21:36+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -2323,15 +2323,16 @@ msgid "&Settings..." msgstr "設定(&S)..." #: inetcpl.rc:65 -#, fuzzy msgid "Delete browsing history" -msgstr " 閲覧履歴 " +msgstr "閲覧履歴の削除" #: inetcpl.rc:68 msgid "" "Temporary internet files\n" "Cached copies of webpages, images and certificates." msgstr "" +"インターネット一時ファイル\n" +"キャッシュされたウェブページや画像、証明書です。" #: inetcpl.rc:70 msgid "" @@ -2339,24 +2340,33 @@ msgid "" "Files saved on your computer by websites, which store things like user " "preferences and login information." msgstr "" +"クッキー\n" +"ウェブサイトによってコンピュータ上に保存されたファイルで、ユーザー設定やログ" +"イン情報のようなものが保管されています。" #: inetcpl.rc:72 msgid "" "History\n" "List of websites you have accessed." msgstr "" +"履歴\n" +"アクセスしたウェブサイトの一覧です。" #: inetcpl.rc:74 msgid "" "Form data\n" "Usernames and other information you have entered into forms." msgstr "" +"フォームデータ\n" +"ユーザ名やフォームに入力した情報です。" #: inetcpl.rc:76 msgid "" "Passwords\n" "Saved passwords you have entered into forms." msgstr "" +"パスワード\n" +"フォームに入力した保存されたパスワードです。" #: inetcpl.rc:78 notepad.rc:123 oleview.rc:160 oleview.rc:173 wineboot.rc:31 #: wineconsole.rc:132 winefile.rc:132 winefile.rc:155 winefile.rc:185 @@ -2373,9 +2383,8 @@ msgid "Security" msgstr "セキュリティ" #: inetcpl.rc:90 -#, fuzzy msgid "Listview" -msgstr "一覧" +msgstr "" #: inetcpl.rc:95 msgid "trackbar" @@ -6882,6 +6891,19 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" +"Wine はフリーソフトウェアです。あなたはこれを、フリーソフトウェア財団によって" +"発行されたGNU 劣等一般公衆利用許諾契約書(バージョン2.1 か、希望によってはそれ" +"以降のバージョンのうちどれか)の定める条件の下で再頒布または改変することができ" +"ます。\n" +"\n" +"Wine は有用であることを願って頒布されますが、*全くの無保証* です。商業可能性" +"の保証や特定の目的への適合性は、言外に示されたものも含め全く存在しません。詳" +"しくはGNU 劣等一般公衆利用許諾契約書をご覧ください。\n" +"\n" +"あなたは Wine と共に、GNU 劣等一般公衆利用許諾契約書の複製物を一部受け取った" +"はずです。もし受け取っていなければ、フリーソフトウェア財団まで請求してくださ" +"い(宛先は the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, " +"Boston, MA 02110-1301, USA)。" #: shell32.rc:266 msgid "Wine License" @@ -6892,9 +6914,8 @@ msgid "Trash" msgstr "ごみ箱" #: shlwapi.rc:27 -#, fuzzy msgid "%d bytes" -msgstr "%ld バイト" +msgstr "%d バイト" #: shlwapi.rc:28 msgctxt "time unit: hours" @@ -7836,9 +7857,8 @@ msgstr "" "\n" #: attrib.rc:28 -#, fuzzy msgid "%1: File Not Found\n" -msgstr "%s: ファイルが見つかりません\n" +msgstr "%1: ファイルが見つかりません\n" #: attrib.rc:47 msgid "" @@ -8129,17 +8149,16 @@ msgstr "" "PATH %PATH%;c:\\temp\n" #: cmd.rc:128 -#, fuzzy msgid "" "PAUSE displays a message on the screen asking the user to press a key.\n" "\n" "It is mainly useful in batch files to allow the user to read the output\n" "of a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE は画面に「続けるにはリターンキーを押して下さい」と\n" -"表示し、ユーザがリターンキーを押すのを待機します。これは\n" -"主にバッチファイル中で実行されたコマンドの結果がスクロー\n" -"ルする前にユーザが読めるようにしたい場合に有用です。\n" +"PAUSE は画面にキーを押してくださいとメッセージを表示します。\n" +"\n" +"これは主にバッチファイル中で実行されたコマンドの結果がスクロールする前\n" +"にユーザが読めるようにしたい場合に有用です。\n" #: cmd.rc:149 msgid "" @@ -8405,7 +8424,6 @@ msgstr "" "ます。\n" #: cmd.rc:289 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8465,6 +8483,7 @@ msgstr "" "MORE\t\t出力をページ区切りで表示\n" "MOVE\t\tファイルまたはディレクトリツリーを移動\n" "PATH\t\tパスを表示または設定\n" +"PAUSE\t\tバッチファイルの実行を一時停止\n" "POPD\t\tPUSHDで最後に保存したディレクトリに変更\n" "PROMPT\t\tコマンドプロンプトを変更\n" "PUSHD\t\t現在のディレクトリを保存し、新ディレクトリに変更\n" @@ -8511,7 +8530,7 @@ msgstr "上書き %s" #: cmd.rc:297 msgid "More..." -msgstr "" +msgstr "続ける..." #: cmd.rc:298 msgid "Line in Batch processing possibly truncated. Using:\n" @@ -8609,9 +8628,8 @@ msgid "PATH not found\n" msgstr "PATH が見つかりません\n" #: cmd.rc:321 -#, fuzzy msgid "Press any key to continue... " -msgstr "続けるにはリターンキーを押して下さい: " +msgstr "続けるには何かキーを押して下さい... " #: cmd.rc:322 msgid "Wine Command Prompt" @@ -8769,14 +8787,12 @@ msgstr "" "'サービス'は停止するサービスの名前です。\n" #: net.rc:30 -#, fuzzy msgid "Stopping dependent service: %1\n" -msgstr "依存するサービスを停止中: %s\n" +msgstr "依存するサービスを停止中: %1\n" #: net.rc:31 -#, fuzzy msgid "Could not stop service %1\n" -msgstr "サービス %s を停止できませんでした。\n" +msgstr "サービス %1 を停止できませんでした。\n" #: net.rc:32 msgid "Could not get handle to service control manager.\n" @@ -8787,34 +8803,28 @@ msgid "Could not get handle to service.\n" msgstr "サービスのハンドルを取得できませんでした。\n" #: net.rc:34 -#, fuzzy msgid "The %1 service is starting.\n" -msgstr "%s サービスを開始しています。\n" +msgstr "%1 サービスを開始しています。\n" #: net.rc:35 -#, fuzzy msgid "The %1 service was started successfully.\n" -msgstr "%s サービスを起動しました。\n" +msgstr "%1 サービスを起動しました。\n" #: net.rc:36 -#, fuzzy msgid "The %1 service failed to start.\n" -msgstr "%s サービスの起動に失敗しました。\n" +msgstr "%1 サービスの起動に失敗しました。\n" #: net.rc:37 -#, fuzzy msgid "The %1 service is stopping.\n" -msgstr "%s サービスを停止中です。\n" +msgstr "%1 サービスを停止中です。\n" #: net.rc:38 -#, fuzzy msgid "The %1 service was stopped successfully.\n" -msgstr "%s サービスは停止しました。\n" +msgstr "%1 サービスは停止しました。\n" #: net.rc:39 -#, fuzzy msgid "The %1 service failed to stop.\n" -msgstr "%s サービスの停止に失敗しました。\n" +msgstr "%1 サービスの停止に失敗しました。\n" #: net.rc:41 msgid "There are no entries in the list.\n" @@ -8831,16 +8841,15 @@ msgstr "" "---------------------------------------------------------------\n" #: net.rc:43 -#, fuzzy msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%s %s %s リソース数: %lu\n" +msgstr "%1 %2 %3 リソース数: %4!u!\n" #: net.rc:44 notepad.rc:122 oleview.rc:159 oleview.rc:172 wineconsole.rc:131 #: winefile.rc:131 winefile.rc:154 winefile.rc:184 winemine.rc:68 #: winemine.rc:78 winemine.rc:92 wordpad.rc:204 wordpad.rc:215 wordpad.rc:233 #: wordpad.rc:246 msgid "OK" -msgstr "正常" +msgstr "OK" #: net.rc:45 msgid "Paused" @@ -9966,7 +9975,7 @@ msgstr "" "め全く存在しません。詳しくはGNU 劣等一般公衆利用許諾契約書をご覧くださ\n" "い。\n" "\n" -"あなたはこのライブラリと共に、GNU 劣等一般公衆利用許諾契約書の複製物を\n" +"あなたはこのプログラムと共に、GNU 劣等一般公衆利用許諾契約書の複製物を\n" "一部受け取ったはずです。もし受け取っていなければ、フリーソフトウェア財\n" "団まで請求してください(宛先は the Free Software Foundation, Inc.,\n" "51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA)。\n" @@ -10714,21 +10723,19 @@ msgstr "Wine設定 %s用" #: winecfg.rc:87 msgid "Selected driver: %s" -msgstr "" +msgstr "選択されたドライバ: %s" #: winecfg.rc:88 msgid "(None)" -msgstr "なし" +msgstr "(なし)" #: winecfg.rc:89 -#, fuzzy msgid "Audio test failed!" -msgstr "ハードディスクリセットが失敗しました。\n" +msgstr "オーディオテストに失敗!" #: winecfg.rc:91 -#, fuzzy msgid "(System default)" -msgstr "システムパス" +msgstr "(システムデフォルト)" #: winecfg.rc:51 msgid "" @@ -11137,9 +11144,8 @@ msgstr "" "スクリーンバッファサイズはウィンドウバッファサイズ以上にしてください。" #: wineconsole.rc:34 -#, fuzzy msgid "Each character is %1!u! pixels wide on %2!u! pixels high" -msgstr "それぞれの文字は %ld ピクセルの幅 %ld ピクセルの高さ" +msgstr "それぞれの文字は %1!u! ピクセルの幅、%2!u! ピクセルの高さ" #: wineconsole.rc:35 msgid "This is a test" @@ -11449,9 +11455,8 @@ msgid "Index/Inode" msgstr "Index/Inode" #: winefile.rc:120 -#, fuzzy msgid "%1 of %2 free" -msgstr "%s の空き (全容量 %s)" +msgstr "全 %2 中、%1 の空き" #: winemine.rc:34 msgid "&Game" @@ -11522,9 +11527,8 @@ msgid "Rows" msgstr "Rows" #: winemine.rc:87 -#, fuzzy msgid "Columns" -msgstr "列(&C)" +msgstr "Columns" #: winemine.rc:88 msgid "Mines" @@ -11982,59 +11986,50 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "パラメータの数が違います。xcopy /? で使い方を表示します\n" #: xcopy.rc:28 -#, fuzzy msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "無効なパラメータ '%s' です。xcopy /? で使い方を表示します\n" +msgstr "無効なパラメータ '%1' です。xcopy /? で使い方を表示します\n" #: xcopy.rc:29 msgid "Press <enter> to begin copying\n" msgstr "コピーを開始するには <enter> を押してください\n" #: xcopy.rc:30 -#, fuzzy msgid "%1!d! file(s) would be copied\n" -msgstr "%d ファイルがコピーされる見込みです。\n" +msgstr "%1!d! ファイルがコピーされる見込みです。\n" #: xcopy.rc:31 -#, fuzzy msgid "%1!d! file(s) copied\n" -msgstr "%d ファイルをコピーしました\n" +msgstr "%1!d! ファイルをコピーしました\n" #: xcopy.rc:34 -#, fuzzy msgid "" "Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"送り先の '%s' はファイル名ですか、\n" +"送り先の '%1' はファイル名ですか、\n" "ディレクトリですか?\n" "(F - ファイル、D - ディレクトリ)\n" #: xcopy.rc:35 -#, fuzzy msgid "%1? (Yes|No)\n" -msgstr "%s? (Yes|No)\n" +msgstr "%1? (Yes|No)\n" #: xcopy.rc:36 -#, fuzzy msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "%s を上書きしますか? (Yes|No|All)\n" +msgstr "%1 を上書きしますか? (Yes|No|All)\n" #: xcopy.rc:37 -#, fuzzy msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "'%s' から '%s' へのコピーは失敗しました。戻り値 %d\n" +msgstr "'%1' から '%2' へのコピーは失敗しました。戻り値 %d\n" #: xcopy.rc:38 -#, fuzzy msgid "Failed to open '%1'\n" -msgstr "'%s' を開けません\n" +msgstr "'%1' を開けません\n" #: xcopy.rc:39 -#, fuzzy msgid "Failed during reading of '%1'\n" -msgstr "'%s' の読み込み中に失敗しました\n" +msgstr "'%1' の読み込み中に失敗しました\n" #: xcopy.rc:43 msgctxt "File key"

1 0

Akihiro Sagawa : gdi32: Use the translated string as a charset name.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 35a928a0f84d3e31bdf91df299513abc306e2ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a928a0f84d3e31bdf91df29… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 3 22:11:35 2011 +0900 gdi32: Use the translated string as a charset name. --- dlls/gdi32/freetype.c | 84 ++++++++++++++++++--------------------------- dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/gdiobj.c | 3 ++ 3 files changed, 39 insertions(+), 50 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5d6cb58..1fedc74 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -89,6 +89,8 @@ #include "wine/debug.h" #include "wine/list.h" +#include "resource.h" + WINE_DEFAULT_DEBUG_CHANNEL(font); #ifdef HAVE_FREETYPE @@ -354,7 +356,7 @@ typedef struct { struct enum_charset_element { DWORD mask; DWORD charset; - LPCWSTR name; + WCHAR name[LF_FACESIZE]; }; struct enum_charset_list { @@ -437,6 +439,7 @@ static const WCHAR liberation_mono[] = {'L','i','b','e','r','a','t','i','o','n', static const WCHAR liberation_sans[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','a','n','s',0}; static const WCHAR liberation_serif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; static const WCHAR times_new_roman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; +static const WCHAR SymbolW[] = {'S','y','m','b','o','l','\0'}; static const WCHAR *default_serif_list[] = { @@ -462,48 +465,6 @@ static const WCHAR *default_sans_list[] = NULL }; - -static const WCHAR ArabicW[] = {'A','r','a','b','i','c','\0'}; -static const WCHAR BalticW[] = {'B','a','l','t','i','c','\0'}; -static const WCHAR CHINESE_BIG5W[] = {'C','H','I','N','E','S','E','_','B','I','G','5','\0'}; -static const WCHAR CHINESE_GB2312W[] = {'C','H','I','N','E','S','E','_','G','B','2','3','1','2','\0'}; -static const WCHAR Central_EuropeanW[] = {'C','e','n','t','r','a','l',' ', - 'E','u','r','o','p','e','a','n','\0'}; -static const WCHAR CyrillicW[] = {'C','y','r','i','l','l','i','c','\0'}; -static const WCHAR GreekW[] = {'G','r','e','e','k','\0'}; -static const WCHAR HangulW[] = {'H','a','n','g','u','l','\0'}; -static const WCHAR Hangul_Johab_W[] = {'H','a','n','g','u','l','(','J','o','h','a','b',')','\0'}; -static const WCHAR HebrewW[] = {'H','e','b','r','e','w','\0'}; -static const WCHAR JapaneseW[] = {'J','a','p','a','n','e','s','e','\0'}; -static const WCHAR SymbolW[] = {'S','y','m','b','o','l','\0'}; -static const WCHAR ThaiW[] = {'T','h','a','i','\0'}; -static const WCHAR TurkishW[] = {'T','u','r','k','i','s','h','\0'}; -static const WCHAR VietnameseW[] = {'V','i','e','t','n','a','m','e','s','e','\0'}; -static const WCHAR WesternW[] = {'W','e','s','t','e','r','n','\0'}; -static const WCHAR OEM_DOSW[] = {'O','E','M','/','D','O','S','\0'}; - -static const WCHAR * const ElfScriptsW[32] = { /* these are in the order of the fsCsb[0] bits */ - WesternW, /*00*/ - Central_EuropeanW, - CyrillicW, - GreekW, - TurkishW, - HebrewW, - ArabicW, - BalticW, - VietnameseW, /*08*/ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, /*15*/ - ThaiW, - JapaneseW, - CHINESE_GB2312W, - HangulW, - CHINESE_BIG5W, - Hangul_Johab_W, - NULL, NULL, /*23*/ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, - SymbolW /*31*/ -}; - typedef struct { WCHAR *name; INT charset; @@ -4384,6 +4345,30 @@ BOOL WineEngDestroyFontInstance(HFONT handle) return ret; } +static INT load_script_name( UINT id, WCHAR buffer[LF_FACESIZE] ) +{ + HRSRC rsrc; + HGLOBAL hMem; + WCHAR *p; + int i; + + id += IDS_FIRST_SCRIPT; + rsrc = FindResourceW( gdi32_module, (LPCWSTR)(ULONG_PTR)((id >> 4) + 1), (LPCWSTR)6 /*RT_STRING*/ ); + if (!rsrc) return 0; + hMem = LoadResource( gdi32_module, rsrc ); + if (!hMem) return 0; + + p = LockResource( hMem ); + id &= 0x000f; + while (id--) p += *p + 1; + + i = min(LF_FACESIZE - 1, *p); + memcpy(buffer, p + 1, i * sizeof(WCHAR)); + buffer[i] = 0; + return i; +} + + /*************************************************** * create_enum_charset_list * @@ -4400,7 +4385,7 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *l csi.fs.fsCsb[0] != 0) { list->element[n].mask = csi.fs.fsCsb[0]; list->element[n].charset = csi.ciCharset; - list->element[n].name = ElfScriptsW[ffs(csi.fs.fsCsb[0]) - 1]; + load_script_name( ffs(csi.fs.fsCsb[0]) - 1, list->element[n].name ); n++; } else { /* charset is DEFAULT_CHARSET or invalid. */ @@ -4412,7 +4397,7 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *l csi.fs.fsCsb[0] != 0) { list->element[n].mask = csi.fs.fsCsb[0]; list->element[n].charset = csi.ciCharset; - list->element[n].name = ElfScriptsW[ffs(csi.fs.fsCsb[0]) - 1]; + load_script_name( ffs(csi.fs.fsCsb[0]) - 1, list->element[n].name ); n++; } @@ -4428,7 +4413,7 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *l list->element[n].mask = fs.fsCsb[0]; list->element[n].charset = csi.ciCharset; - list->element[n].name = ElfScriptsW[i]; + load_script_name( i, list->element[n].name ); n++; } } @@ -4602,15 +4587,14 @@ static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list, for(i = 0; i < list->total; i++) { if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; - strcpyW(elf.elfScript, OEM_DOSW); + load_script_name( IDS_OEM_DOS, elf.elfScript ); i = 32; /* break out of loop */ } else if(!(face->fs.fsCsb[0] & list->element[i].mask)) continue; else { elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = list->element[i].charset; - if(list->element[i].name) - strcpyW(elf.elfScript, list->element[i].name); - else + strcpyW(elf.elfScript, list->element[i].name); + if (!elf.elfScript[0]) FIXME("Unknown elfscript for bit %d\n", ffs(list->element[i].mask) - 1); } TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 52fb318..3dfd9a5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -503,4 +503,6 @@ static inline const struct gdi_dc_funcs *get_bitmap_funcs( const BITMAPOBJ *bitm extern void free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; +extern HMODULE gdi32_module DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 4d84342..7d238a9 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -42,6 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); #define GDI_HEAP_SIZE 0xffe0 +HMODULE gdi32_module = 0; + /*********************************************************************** * GDI stock objects */ @@ -578,6 +580,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) if (reason != DLL_PROCESS_ATTACH) return TRUE; + gdi32_module = inst; DisableThreadLibraryCalls( inst ); WineEngInit();

1 0

Akihiro Sagawa : gdi32: Add a string table resource for the translation.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: b5db70f1ca2de13f0e552d89e274268953ddac63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5db70f1ca2de13f0e552d89e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 3 22:11:33 2011 +0900 gdi32: Add a string table resource for the translation. --- configure | 2 +- configure.ac | 2 +- dlls/gdi32/Makefile.in | 3 +- dlls/gdi32/gdi32.rc | 50 ++++++++++++++++++++++++++++++++++ dlls/gdi32/resource.h | 39 ++++++++++++++++++++++++++ dlls/gdi32/version.rc | 23 --------------- po/ar.po | 68 ++++++++++++++++++++++++++++++++++++++++++++++ po/bg.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++ po/ca.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/cs.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++ po/da.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++ po/de.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/el.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++ po/en.po | 68 ++++++++++++++++++++++++++++++++++++++++++++++ po/en_US.po | 68 ++++++++++++++++++++++++++++++++++++++++++++++ po/eo.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++ po/es.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++ po/fa.po | 68 ++++++++++++++++++++++++++++++++++++++++++++++ po/fi.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++ po/fr.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/he.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++ po/hi.po | 68 ++++++++++++++++++++++++++++++++++++++++++++++ po/hu.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/it.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/ja.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/ko.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/lt.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/ml.po | 68 ++++++++++++++++++++++++++++++++++++++++++++++ po/nb_NO.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/or.po | 68 ++++++++++++++++++++++++++++++++++++++++++++++ po/pa.po | 68 ++++++++++++++++++++++++++++++++++++++++++++++ po/pl.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/rm.po | 68 ++++++++++++++++++++++++++++++++++++++++++++++ po/ro.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/ru.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/sk.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++ po/sl.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/sv.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/te.po | 68 ++++++++++++++++++++++++++++++++++++++++++++++ po/th.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++ po/tr.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++ po/uk.po | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ po/wa.po | 68 ++++++++++++++++++++++++++++++++++++++++++++++ po/wine.pot | 68 ++++++++++++++++++++++++++++++++++++++++++++++ po/zh_CN.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 51 files changed, 3205 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5db70f1ca2de13f0e552…

1 0

Eric Pouech : expand: No longer use Unix stdio functions, but rather the kernel32 equivalent.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: c561b6795036cd294540323d6e05a51d4170c63b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c561b6795036cd294540323d6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Nov 4 21:14:05 2011 +0100 expand: No longer use Unix stdio functions, but rather the kernel32 equivalent. --- programs/expand/expand.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/programs/expand/expand.c b/programs/expand/expand.c index 3107ff6..2bede08 100644 --- a/programs/expand/expand.c +++ b/programs/expand/expand.c @@ -26,6 +26,21 @@ #include <lzexpand.h> #include <setupapi.h> +static int myprintf(const char* format, ...) +{ + va_list va; + char tmp[8192]; + DWORD w; + int len; + + va_start(va, format); + len = vsnprintf(tmp, sizeof(tmp), format, va); + if (len > 0) + WriteFile(GetStdHandle(STD_ERROR_HANDLE), tmp, len, &w, NULL); + va_end(va); + return w; +} + static UINT CALLBACK set_outfile( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 ) { FILE_IN_CABINET_INFO_A *info = (FILE_IN_CABINET_INFO_A *)param1; @@ -83,9 +98,9 @@ int main(int argc, char *argv[]) if (argc < 3) { - fprintf( stderr, "Usage:\n" ); - fprintf( stderr, "\t%s infile outfile\n", argv[0] ); - fprintf( stderr, "\t%s /r infile\n", argv[0] ); + myprintf( "Usage:\n" ); + myprintf( "\t%s infile outfile\n", argv[0] ); + myprintf( "\t%s /r infile\n", argv[0] ); return 1; } @@ -96,7 +111,7 @@ int main(int argc, char *argv[]) if (!SetupGetFileCompressionInfoExA( infile, actual_name, sizeof(actual_name), NULL, NULL, NULL, &comp )) { - fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile ); + myprintf( "%s: can't open input file %s\n", argv[0], infile ); return 1; } @@ -108,7 +123,7 @@ int main(int argc, char *argv[]) outfile_basename[0] = 0; if (!SetupIterateCabinetA( infile, 0, set_outfile, outfile_basename )) { - fprintf( stderr, "%s: can't determine original name\n", argv[0] ); + myprintf( "%s: can't determine original name\n", argv[0] ); return 1; } GetFullPathNameA( infile, sizeof(outfile), outfile, &basename_index ); @@ -119,7 +134,7 @@ int main(int argc, char *argv[]) GetExpandedNameA( infile, outfile_basename ); break; default: - fprintf( stderr, "%s: can't determine original\n", argv[0] ); + myprintf( "%s: can't determine original\n", argv[0] ); return 1; } } @@ -128,7 +143,7 @@ int main(int argc, char *argv[]) if (!lstrcmpiA( infile, outfile )) { - fprintf( stderr, "%s: can't expand file to itself\n", argv[0] ); + myprintf( "%s: can't expand file to itself\n", argv[0] ); return 1; } @@ -137,7 +152,7 @@ int main(int argc, char *argv[]) case FILE_COMPRESSION_MSZIP: if (!SetupIterateCabinetA( infile, 0, extract_callback, outfile )) { - fprintf( stderr, "%s: cabinet extraction failed\n", argv[0] ); + myprintf( "%s: cabinet extraction failed\n", argv[0] ); return 1; } break; @@ -149,13 +164,13 @@ int main(int argc, char *argv[]) if ((hin = LZOpenFileA( infile, &ofin, OF_READ )) < 0) { - fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile ); + myprintf( "%s: can't open input file %s\n", argv[0], infile ); return 1; } if ((hout = LZOpenFileA( outfile, &ofout, OF_CREATE | OF_WRITE )) < 0) { LZClose( hin ); - fprintf( stderr, "%s: can't open output file %s\n", argv[0], outfile ); + myprintf( "%s: can't open output file %s\n", argv[0], outfile ); return 1; } error = LZCopy( hin, hout ); @@ -165,7 +180,7 @@ int main(int argc, char *argv[]) if (error < 0) { - fprintf( stderr, "%s: LZCopy failed, error is %d\n", argv[0], error ); + myprintf( "%s: LZCopy failed, error is %d\n", argv[0], error ); return 1; } break; @@ -173,7 +188,7 @@ int main(int argc, char *argv[]) default: if (!CopyFileA( infile, outfile, FALSE )) { - fprintf( stderr, "%s: CopyFileA failed\n", argv[0] ); + myprintf( "%s: CopyFileA failed\n", argv[0] ); return 1; } break;

1 0

Francois Gouget : version: Add verrsrc. h and make it so it does not need other headers to be used in resource files .
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 17d6f08381f5c8b63371a25b976b427915b30d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d6f08381f5c8b63371a25b9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 7 12:21:30 2011 +0100 version: Add verrsrc.h and make it so it does not need other headers to be used in resource files. --- include/Makefile.in | 1 + include/verrsrc.h | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/winver.h | 128 +------------------------------------- 3 files changed, 177 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17d6f08381f5c8b63371a…

1 0

Alistair Leslie-Hughes : mscoree: Move clearing of processes to Terminate.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 7ea2e93107a2d48573b5d44402128680ef273962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea2e93107a2d48573b5d4440… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 3 09:35:06 2011 +1100 mscoree: Move clearing of processes to Terminate. --- dlls/mscoree/cordebug.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/mscoree/cordebug.c b/dlls/mscoree/cordebug.c index 8fe7501..498493e 100644 --- a/dlls/mscoree/cordebug.c +++ b/dlls/mscoree/cordebug.c @@ -180,20 +180,13 @@ static ULONG WINAPI CorDebug_Release(ICorDebug *iface) { CorDebug *This = impl_from_ICorDebug( iface ); ULONG ref = InterlockedDecrement(&This->ref); - struct CorProcess *cursor, *cursor2; TRACE("%p ref=%u\n", This, ref); if (ref == 0) { - LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->processes, struct CorProcess, entry) - { - if(cursor->pProcess) - ICorDebugProcess_Release(cursor->pProcess); - - list_remove(&cursor->entry); - HeapFree(GetProcessHeap(), 0, cursor); - } + if(!list_empty(&This->processes)) + ERR("Processes haven't been removed Correctly\n"); if(This->runtimehost) ICLRRuntimeHost_Release(This->runtimehost); @@ -220,8 +213,19 @@ static HRESULT WINAPI CorDebug_Initialize(ICorDebug *iface) static HRESULT WINAPI CorDebug_Terminate(ICorDebug *iface) { + struct CorProcess *cursor, *cursor2; CorDebug *This = impl_from_ICorDebug( iface ); FIXME("stub %p\n", This); + + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->processes, struct CorProcess, entry) + { + if(cursor->pProcess) + ICorDebugProcess_Release(cursor->pProcess); + + list_remove(&cursor->entry); + HeapFree(GetProcessHeap(), 0, cursor); + } + return E_NOTIMPL; }

1 0

André Hentschel : apphelp: Add stub for ApphelpCheckMsiPackage.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: ec56eee03d0e4019643e5fc2f1b1b7b92d07a401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec56eee03d0e4019643e5fc2f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 4 17:57:55 2011 +0100 apphelp: Add stub for ApphelpCheckMsiPackage. --- dlls/apphelp/apphelp.c | 6 ++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 20ff375..4a3cd96 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -55,6 +55,12 @@ BOOL WINAPI ApphelpCheckInstallShieldPackage( void* ptr, LPCWSTR path ) return TRUE; } +BOOL WINAPI ApphelpCheckMsiPackage( void* ptr, LPCWSTR path ) +{ + FIXME("stub: %p %s\n", ptr, debugstr_w(path)); + return TRUE; +} + PDB WINAPI SdbCreateDatabase( LPCWSTR path, PATH_TYPE type ) { FIXME("stub: %s %u\n", debugstr_w(path), type); diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index 005e39d..e8ebccb 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -1,7 +1,7 @@ @ stub AllowPermLayer @ stub ApphelpCheckExe @ stdcall ApphelpCheckInstallShieldPackage(ptr wstr) -@ stub ApphelpCheckMsiPackage +@ stdcall ApphelpCheckMsiPackage(ptr wstr) @ stub ApphelpCheckRunApp @ stub ApphelpCheckRunAppEx @ stub ApphelpCheckShellObject

1 0

Francois Gouget : version: Add some macros and prototypes to winver.h.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: c84b7d33dd18651057a80f609e11f809cc7f4bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84b7d33dd18651057a80f609… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 7 12:17:56 2011 +0100 version: Add some macros and prototypes to winver.h. --- include/winver.h | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/winver.h b/include/winver.h index 2de105b..48a2d5b 100644 --- a/include/winver.h +++ b/include/winver.h @@ -1,4 +1,4 @@ -/* Definitions for the VERsion infolibrary (VER.DLL) +/* Definitions for the VERsion info library (VER.DLL) * * Copyright 1996 Marcus Meissner * @@ -25,7 +25,7 @@ extern "C" { #endif /* defined(__cplusplus) */ /* resource ids for different version infos */ -#define VS_FILE_INFO 16 +#define VS_FILE_INFO RT_VERSION #define VS_VERSION_INFO 1 #define VS_USER_DEFINED 100 @@ -49,6 +49,7 @@ extern "C" { #define VOS_OS216 __MSABI_LONG(0x00020000) #define VOS_OS232 __MSABI_LONG(0x00030000) #define VOS_NT __MSABI_LONG(0x00040000) +#define VOS_WINCE __MSABI_LONG(0x00050000) /* minor os version */ #define VOS__BASE __MSABI_LONG(0x00000000) @@ -128,6 +129,8 @@ extern "C" { #define VIF_CANNOTREADSRC __MSABI_LONG(0x00010000) #define VIF_CANNOTREADDST __MSABI_LONG(0x00020000) #define VIF_BUFFTOOSMALL __MSABI_LONG(0x00040000) +#define VIF_CANNOTLOADLZ32 __MSABI_LONG(0x00080000) +#define VIF_CANNOTLOADCABINET __MSABI_LONG(0x00100000) typedef struct tagVS_FIXEDFILEINFO { DWORD dwSignature; @@ -168,8 +171,12 @@ DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD); BOOL WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,LPVOID); BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,LPVOID); #define GetFileVersionInfo WINELIB_NAME_AW(GetFileVersionInfo) - -/* 20 GETFILEVERSIONINFORAW */ +DWORD WINAPI GetFileVersionInfoSizeExA(DWORD,LPCSTR,LPDWORD); +DWORD WINAPI GetFileVersionInfoSizeExW(DWORD,LPCWSTR,LPDWORD); +#define GetFileVersionInfoSizeEx WINELIB_NAME_AW(GetFileVersionInfoSizeEx) +BOOL WINAPI GetFileVersionInfoExA(DWORD,LPCSTR,DWORD,DWORD,LPVOID); +BOOL WINAPI GetFileVersionInfoExW(DWORD,LPCWSTR,DWORD,DWORD,LPVOID); +#define GetFileVersionInfoEx WINELIB_NAME_AW(GetFileVersionInfoEx) #endif /* RC_INVOKED */

1 0

Stefan Dösinger : d3d9/tests: Test partial block locks .
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 7fd752047d918886ebe9cd91028bfd988238cbe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd752047d918886ebe9cd910… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 14 12:54:37 2011 +0200 d3d9/tests: Test partial block locks. --- dlls/d3d9/tests/surface.c | 173 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 2 +- 2 files changed, 174 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 361e8a3..1c2a2d2 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -633,6 +633,178 @@ static void test_surface_double_unlock(IDirect3DDevice9 *device) } } +static void test_surface_lockrect_blocks(IDirect3DDevice9 *device) +{ + IDirect3DTexture9 *texture; + IDirect3DSurface9 *surface; + IDirect3D9 *d3d; + D3DLOCKED_RECT locked_rect; + unsigned int i, j; + HRESULT hr; + RECT rect; + BOOL surface_only; + + const struct + { + D3DFORMAT fmt; + const char *name; + unsigned int block_width; + unsigned int block_height; + BOOL broken; + } + formats[] = + { + {D3DFMT_DXT1, "D3DFMT_DXT1", 4, 4, FALSE}, + {D3DFMT_DXT2, "D3DFMT_DXT2", 4, 4, FALSE}, + {D3DFMT_DXT3, "D3DFMT_DXT3", 4, 4, FALSE}, + {D3DFMT_DXT4, "D3DFMT_DXT4", 4, 4, FALSE}, + {D3DFMT_DXT5, "D3DFMT_DXT5", 4, 4, FALSE}, + /* ATI2N has 2x2 blocks on all AMD cards and Geforce 7 cards, + * which doesn't match the format spec. On newer Nvidia cards + * it has the correct 4x4 block size */ + {MAKEFOURCC('A','T','I','2'), "ATI2N", 4, 4, TRUE}, + }; + static const struct + { + D3DPOOL pool; + const char *name; + /* Don't check the return value, Nvidia returns D3DERR_INVALIDCALL for some formats + * and E_INVALIDARG/DDERR_INVALIDPARAMS for others. */ + BOOL success; + } + pools[] = + { + {D3DPOOL_DEFAULT, "D3DPOOL_DEFAULT", FALSE}, + {D3DPOOL_SCRATCH, "D3DPOOL_SCRATCH", TRUE}, + {D3DPOOL_SYSTEMMEM, "D3DPOOL_SYSTEMMEM",TRUE}, + {D3DPOOL_MANAGED, "D3DPOOL_MANAGED", TRUE}, + }; + + hr = IDirect3DDevice9_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "IDirect3DDevice9_GetDirect3D failed (%08x)\n", hr); + + for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i) { + surface_only = FALSE; + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_DYNAMIC, + D3DRTYPE_TEXTURE, formats[i].fmt); + if (FAILED(hr)) + { + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_SURFACE, formats[i].fmt); + if (FAILED(hr)) + { + skip("Format %s not supported, skipping lockrect offset test\n", formats[i].name); + continue; + } + surface_only = TRUE; + } + + for (j = 0; j < (sizeof(pools) / sizeof(*pools)); j++) + { + switch (pools[j].pool) + { + case D3DPOOL_SYSTEMMEM: + case D3DPOOL_MANAGED: + if (surface_only) continue; + /* Fall through */ + case D3DPOOL_DEFAULT: + if (surface_only) + { + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, formats[i].fmt, + pools[j].pool, &surface, 0); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateOffscreenPlainSurface failed (%08x)\n", hr); + } + else + { + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, + pools[j].pool == D3DPOOL_DEFAULT ? D3DUSAGE_DYNAMIC : 0, + formats[i].fmt, pools[j].pool, &texture, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateTexture failed (%08x)\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "IDirect3DTexture9_GetSurfaceLevel failed (%08x)\n", hr); + IDirect3DTexture9_Release(texture); + } + break; + + case D3DPOOL_SCRATCH: + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, formats[i].fmt, + pools[j].pool, &surface, 0); + ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed (%08x)\n", hr); + break; + + default: + break; + } + + if (formats[i].block_width > 1) + { + SetRect(&rect, formats[i].block_width >> 1, 0, formats[i].block_width, formats[i].block_height); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken), + "Partial block lock %s, expected %s, format %s, pool %s.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", + pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr); + } + + SetRect(&rect, 0, 0, formats[i].block_width >> 1, formats[i].block_height); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken), + "Partial block lock %s, expected %s, format %s, pool %s.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", + pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr); + } + } + + if (formats[i].block_height > 1) + { + SetRect(&rect, 0, formats[i].block_height >> 1, formats[i].block_width, formats[i].block_height); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken), + "Partial block lock %s, expected %s, format %s, pool %s.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", + pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr); + } + + SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height >> 1); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken), + "Partial block lock %s, expected %s, format %s, pool %s.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", + pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr); + } + } + + SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); + ok(SUCCEEDED(hr), "Full block lock returned %08x, expected %08x, format %s, pool %s\n", + hr, D3D_OK, formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed (%08x)\n", hr); + } + + IDirect3DSurface9_Release(surface); + } + } + IDirect3D9_Release(d3d); +} + START_TEST(surface) { HMODULE d3d9_handle; @@ -658,6 +830,7 @@ START_TEST(surface) test_surface_dimensions(device_ptr); test_surface_format_null(device_ptr); test_surface_double_unlock(device_ptr); + test_surface_lockrect_blocks(device_ptr); refcount = IDirect3DDevice9_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8def5b5..36e1dea 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3713,7 +3713,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, WARN("Surface is already mapped.\n"); return WINED3DERR_INVALIDCALL; } - if ((format->flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_COMPRESSED + if ((format->flags & WINED3DFMT_FLAG_COMPRESSED) && rect && (rect->left || rect->top || rect->right != surface->resource.width || rect->bottom != surface->resource.height))

1 0

Alexandre Julliard : configure: Remove some no longer used variables.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 7a3c56a941f2e236996cb849eb7cacc28ff8162e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a3c56a941f2e236996cb849e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 17:12:38 2011 +0100 configure: Remove some no longer used variables. --- configure | 6 ------ configure.ac | 6 ------ 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 9251e6f..9223d27 100755 --- a/configure +++ b/configure @@ -4043,8 +4043,6 @@ case $host in then CC="$CC -m64" CXX="$CXX -m64" - LD="${LD:-ld} -arch x86_64" - AS="${AS:-as} -arch x86_64" host_cpu="x86_64" notice_platform="64-bit " TARGETFLAGS="-m64" @@ -4052,8 +4050,6 @@ case $host in else CC="$CC -m32" CXX="$CXX -m32" - LD="${LD:-ld} -arch i386" - AS="${AS:-as} -arch i386" host_cpu="i386" notice_platform="32-bit " TARGETFLAGS="-m32" @@ -4090,8 +4086,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LD="${LD:-ld} -m elf_i386" - AS="${AS:-as} --32" host_cpu="i386" notice_platform="32-bit " TARGETFLAGS="-m32" diff --git a/configure.ac b/configure.ac index 1340757..362c2bf 100644 --- a/configure.ac +++ b/configure.ac @@ -132,16 +132,12 @@ case $host in then CC="$CC -m64" CXX="$CXX -m64" - LD="${LD:-ld} -arch x86_64" - AS="${AS:-as} -arch x86_64" host_cpu="x86_64" notice_platform="64-bit " AC_SUBST(TARGETFLAGS,"-m64") else CC="$CC -m32" CXX="$CXX -m32" - LD="${LD:-ld} -arch i386" - AS="${AS:-as} -arch i386" host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32") @@ -157,8 +153,6 @@ case $host in AC_LINK_IFELSE([AC_LANG_PROGRAM()],AC_MSG_RESULT([yes]), [AC_MSG_RESULT([no]) AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.])]) - LD="${LD:-ld} -m elf_i386" - AS="${AS:-as} --32" host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32")

1 0