February 2011 - Wine-commits

Akihiro Sagawa : hhctrl.ocx: Use DEFAULT_GUI_FONT to show non-ansi characters properly.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: e7efd148a8f0af12bbe21e5ebf8b01efd2f925b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7efd148a8f0af12bbe21e5eb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 26 20:31:26 2011 +0900 hhctrl.ocx: Use DEFAULT_GUI_FONT to show non-ansi characters properly. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 31060fe..4c6196e 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1509,7 +1509,7 @@ static void HH_CreateFont(HHInfo *pHHInfo) { LOGFONTW lf; - GetObjectW(GetStockObject(ANSI_VAR_FONT), sizeof(LOGFONTW), &lf); + GetObjectW(GetStockObject(DEFAULT_GUI_FONT), sizeof(LOGFONTW), &lf); lf.lfWeight = FW_NORMAL; lf.lfItalic = FALSE; lf.lfUnderline = FALSE;

1 0

Akihiro Sagawa : shdocvw: Add Japanese translation.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 35ddb4c26d0977d12b8713c7ae608bb531b2f472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ddb4c26d0977d12b8713c7a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 26 20:31:15 2011 +0900 shdocvw: Add Japanese translation. --- dlls/shdocvw/Ja.rc | 36 ++++++++++++++++++++++++++++++++++++ dlls/shdocvw/Makefile.in | 1 + 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Ja.rc b/dlls/shdocvw/Ja.rc new file mode 100644 index 0000000..2c59614 --- /dev/null +++ b/dlls/shdocvw/Ja.rc @@ -0,0 +1,36 @@ +/* + * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2011 Akihiro Sagawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "URLを開く" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Internet Explorerで開きたいURLを入力してください。",-1,25, 5, 150,15 + LTEXT "URL:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "&OK", IDOK, 25, 50, 50, 15 + PUSHBUTTON "キャンセル(&C)", IDCANCEL, 85, 50, 50, 15 +} diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 61e6391..c4ffa16 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -31,6 +31,7 @@ RC_SRCS = \ Fr.rc \ He.rc \ It.rc \ + Ja.rc \ Ko.rc \ Lt.rc \ Nl.rc \

1 0

Akihiro Sagawa : wineconsole: Add Japanese translation.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 1aef4dc03056864ea65e58ef086a6f70ea53a543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aef4dc03056864ea65e58ef0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 26 20:31:18 2011 +0900 wineconsole: Add Japanese translation. --- programs/wineconsole/Makefile.in | 1 + programs/wineconsole/wineconsole_Ja.rc | 106 ++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index bda538e..b2f4f31 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -23,6 +23,7 @@ RC_SRCS = \ wineconsole_He.rc \ wineconsole_Hu.rc \ wineconsole_It.rc \ + wineconsole_Ja.rc \ wineconsole_Ko.rc \ wineconsole_Lt.rc \ wineconsole_Nl.rc \ diff --git a/programs/wineconsole/wineconsole_Ja.rc b/programs/wineconsole/wineconsole_Ja.rc new file mode 100644 index 0000000..8c5c04e --- /dev/null +++ b/programs/wineconsole/wineconsole_Ja.rc @@ -0,0 +1,106 @@ +/* + * Copyright 2001 Eric Pouech + * Copyright 2011 Akihiro Sagawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wineconsole_res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_OPTION DIALOG 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " オプション " +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "カーソルの大きさ", -1, 10, 11, 60, 44, BS_GROUPBOX + AUTORADIOBUTTON "小(&S)", IDC_OPT_CURSOR_SMALL, 14, 23, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "中(&M)", IDC_OPT_CURSOR_MEDIUM, 14, 33, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "大(&L)", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP + + GROUPBOX "コントロール", -1, 75, 11, 125, 44, BS_GROUPBOX + LTEXT "ポップアップ", -1, 79, 23, 40, 10 + AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP + AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP + LTEXT "簡易編集", -1, 79, 43, 50, 10 + AUTOCHECKBOX "有効(&E)", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP + + GROUPBOX "コマンド履歴", -1, 10, 57, 190, 35, BS_GROUPBOX + LTEXT "記憶するコマンド数(&N) :", -1, 14, 67, 78, 18 + EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + AUTOCHECKBOX "重複を削除(&R)", IDC_OPT_HIST_NODOUBLE, 130, 67, 50, 18, WS_TABSTOP|BS_MULTILINE +} + +IDD_FONT DIALOG 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " フォント " +FONT 8, "MS Shell Dlg" +{ + LTEXT "フォント(&F)", -1, 5, 5, 24, 8 + LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL + LTEXT "色(&C)", -1, 100, 5, 50, 8 + CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 + CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 + LTEXT "サイズ(&S)", -1, 158, 5, 40, 8 + LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL + CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 + LTEXT "", IDC_FNT_FONT_INFO, 128, 76, 80, 18 +} + +IDD_CONFIG DIALOG 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " 設定 " +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "バッファサイズ", -1, 10, 11, 100, 42, BS_GROUPBOX + LTEXT "幅(&W) :", -1, 14, 25, 54, 9 + EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + LTEXT "高さ(&H) :", -1, 14, 39, 54, 9 + EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + + GROUPBOX "ウィンドウサイズ", -1, 10, 55, 100, 42 + LTEXT "幅(&I) :", -1, 14, 69, 54, 9 + EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + LTEXT "高さ(&E) :", -1, 14, 83, 54, 9 + EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + + GROUPBOX "プログラムの終了時", -1, 115, 11, 80, 42, BS_GROUPBOX + AUTOCHECKBOX "コンソールを閉じる(&C)", IDC_CNF_CLOSE_EXIT, 119, 25, 72, 20, WS_TABSTOP + + GROUPBOX "編集方式", -1, 115, 55, 80, 42 + COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 72, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP +} + +IDD_SAVE_SETTINGS DIALOG 20, 20, 170, 60 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "コンソールパラメータ" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 10, 10, 150, 31, BS_GROUPBOX + AUTORADIOBUTTON "この設定を以後のセッションでも利用する", IDC_SAV_SAVE, 14, 15, 140, 10, WS_TABSTOP + AUTORADIOBUTTON "現在のセッションのみ変更する", IDC_SAV_SESSION, 14, 27, 140, 10, WS_TABSTOP + + PUSHBUTTON "OK", IDOK, 35, 45, 35, 12 + PUSHBUTTON "キャンセル", IDCANCEL, 80, 45, 35, 12 +}

1 0

Akihiro Sagawa : credui: Add Japanese translation.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 0ba05ee3f03ab16a29a0434bc85333b2e5430899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba05ee3f03ab16a29a0434bc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 26 20:31:20 2011 +0900 credui: Add Japanese translation. --- dlls/credui/Makefile.in | 1 + dlls/credui/credui_Ja.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index d300b3b..9d0ffb9 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -15,6 +15,7 @@ RC_SRCS = \ credui_He.rc \ credui_Hu.rc \ credui_It.rc \ + credui_Ja.rc \ credui_Ko.rc \ credui_Lt.rc \ credui_Nl.rc \ diff --git a/dlls/credui/credui_Ja.rc b/dlls/credui/credui_Ja.rc new file mode 100644 index 0000000..8f47ef5 --- /dev/null +++ b/dlls/credui/credui_Ja.rc @@ -0,0 +1,46 @@ +/* + * Japanese language resource file for Credentials UI + * + * Copyright 2007 Robert Shearman (for CodeWeavers) + * Copyright 2011 Akihiro Sagawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "credui_resources.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_CREDDIALOG DIALOG 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "ユーザ名(&U):",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "パスワード(&P):",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "パスワードを保存する(&R)",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "キャンセル",IDCANCEL,156,128,50,14 +END

1 0

Austin English : lz32/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: ca10161c5c6c0b00b00de6b16a42005524639eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca10161c5c6c0b00b00de6b16… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:35:19 2011 -0800 lz32/tests: Remove win9x hacks. --- dlls/lz32/tests/lzexpand_main.c | 144 ++++++++++++--------------------------- 1 files changed, 44 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca10161c5c6c0b00b00de…

1 0

Austin English : riched20/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: c17df92e5dc475de5ad70478288fcc848d358a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c17df92e5dc475de5ad704782… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:36:27 2011 -0800 riched20/tests: Remove win9x hacks. --- dlls/riched20/tests/editor.c | 131 +++++++++++------------------------------ 1 files changed, 35 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c17df92e5dc475de5ad70…

1 0

Austin English : crypt32/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 3ac1db562acce7b8b361d9f5b9f3f561c5d08ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac1db562acce7b8b361d9f5b… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 15:23:52 2011 -0800 crypt32/tests: Remove win9x hacks. --- dlls/crypt32/tests/store.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 67ebe11..6d3c54f 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -960,7 +960,7 @@ static void testRegStore(void) certCount++; } while (context != NULL); ok(certCount == 1 || - broken(certCount == 2), /* win9x */ + broken(certCount == 2) /* NT4 */ , "Expected 1 certificates, got %d\n", certCount); /* Try again with the correct hash... */ @@ -1161,10 +1161,7 @@ static void testSystemStore(void) /* Check opening a bogus store */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, BogusW); - ok((!store || - broken(store != 0)) && /* win9x */ - GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + ok(!store, "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, BogusW); ok(store != 0, "CertOpenStore failed: %08x\n", GetLastError()); @@ -1764,7 +1761,7 @@ static void testMessageStore(void) store = CertOpenStore(CERT_STORE_PROV_PKCS7, 0, 0, 0, &blob); ok(!store && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_DATA_ERROR), /* win9x */ + broken(GetLastError() == OSS_DATA_ERROR)), /* NT4 */ "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); }

1 0

Austin English : rpcrt4/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 01ca32ac91a3b00de11eb86a0c68036aae28e563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ca32ac91a3b00de11eb86a0… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 17:50:35 2011 -0800 rpcrt4/tests: Remove win9x hacks. --- dlls/rpcrt4/tests/rpc.c | 22 ++++------------------ 1 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 684b47e..4d62f30 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -119,13 +119,9 @@ static void UuidConversionAndComparison(void) { for (i1 = 0; i1 < 10; i1++) { Uuid1 = Uuid_Table[i1]; rslt=UuidToStringW(&Uuid1, &wstr); - if (rslt==RPC_S_CANNOT_SUPPORT) { - /* Must be Win9x (no Unicode support), skip the tests */ - break; - } - ok( (rslt == RPC_S_OK), "Simple UUID->WString copy\n" ); - ok( (UuidFromStringW(wstr, &Uuid2) == RPC_S_OK), "Simple WString->UUID copy from generated UUID String\n" ); - ok( UuidEqual(&Uuid1, &Uuid2, &rslt), "Uuid -> WString -> Uuid transform\n" ); + ok( (rslt == RPC_S_OK), "Simple UUID->WString copy\n" ); + ok( (UuidFromStringW(wstr, &Uuid2) == RPC_S_OK), "Simple WString->UUID copy from generated UUID String\n" ); + ok( UuidEqual(&Uuid1, &Uuid2, &rslt), "Uuid -> WString -> Uuid transform\n" ); /* invalid uuid tests -- size of valid UUID string=36 */ for (i2 = 0; i2 < 36; i2++) { wx = wstr[i2]; @@ -265,8 +261,7 @@ todo_wine { status = RpcBindingSetAuthInfo(IFoo_IfHandle, NULL, RPC_C_AUTHN_LEVEL_NONE, RPC_C_AUTHN_WINNT, NULL, RPC_C_AUTHZ_NAME); - ok(status == RPC_S_OK || broken(status == RPC_S_UNKNOWN_AUTHN_SERVICE), /* win9x */ - "RpcBindingSetAuthInfo failed (%u)\n", status); + ok(status == RPC_S_OK, "RpcBindingSetAuthInfo failed (%u)\n", status); status = RpcBindingInqAuthInfo(IFoo_IfHandle, NULL, NULL, NULL, NULL, NULL); ok(status == RPC_S_BINDING_HAS_NO_AUTH, "RpcBindingInqAuthInfo failed (%u)\n", @@ -436,14 +431,8 @@ static void test_I_RpcMapWin32Status(void) { LONG win32status; RPC_STATUS rpc_status; - BOOL on_win9x = FALSE; BOOL w2k3_up = FALSE; - /* Win9x always returns the given status */ - win32status = I_RpcMapWin32Status(ERROR_ACCESS_DENIED); - if (win32status == ERROR_ACCESS_DENIED) - on_win9x = TRUE; - /* Windows 2003 and Vista return STATUS_UNSUCCESSFUL if given an unknown status */ win32status = I_RpcMapWin32Status(9999); if (win32status == STATUS_UNSUCCESSFUL) @@ -577,9 +566,6 @@ static void test_I_RpcMapWin32Status(void) expected_win32status = rpc_status; } - if (on_win9x) - missing = TRUE; - ok(win32status == expected_win32status || broken(missing && win32status == rpc_status), "I_RpcMapWin32Status(%d) should have returned 0x%x instead of 0x%x%s\n",

1 0

Wolfram Sang : user32/tests: Modify proper fields instead of magic offsets.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 25923d2f16c56bb6840f92b2c4b0cc2b2ef927aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=25923d2f16c56bb6840f92b2c… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Thu Feb 24 22:12:07 2011 +0100 user32/tests: Modify proper fields instead of magic offsets. --- dlls/user32/tests/cursoricon.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index cba5704..454606a 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -854,7 +854,7 @@ static void test_LoadImage(void) DWORD error, bytes_written; CURSORICONFILEDIR *icon_data; CURSORICONFILEDIRENTRY *icon_entry; - BITMAPINFOHEADER *icon_header; + BITMAPINFOHEADER *icon_header, *bitmap_header; ICONINFO icon_info; #define ICON_WIDTH 32 @@ -981,13 +981,17 @@ static void test_LoadImage(void) test_LoadImageFile("GIF (2x2 pixel)", gif4pixel, sizeof(gif4pixel), "gif", 0); test_LoadImageFile("JPG", jpgimage, sizeof(jpgimage), "jpg", 0); test_LoadImageFile("PNG", pngimage, sizeof(pngimage), "png", 0); + /* Check failure for broken BMP images */ - bmpimage[0x14]++; /* biHeight > 65535 */ + bitmap_header = (BITMAPINFOHEADER *)(bmpimage + sizeof(BITMAPFILEHEADER)); + + bitmap_header->biHeight = 65536; test_LoadImageFile("BMP (too high)", bmpimage, sizeof(bmpimage), "bmp", 0); - bmpimage[0x14]--; - bmpimage[0x18]++; /* biWidth > 65535 */ + bitmap_header->biHeight = 1; + + bitmap_header->biWidth = 65536; test_LoadImageFile("BMP (too wide)", bmpimage, sizeof(bmpimage), "bmp", 0); - bmpimage[0x18]--; + bitmap_header->biWidth = 1; } static void test_CreateIconFromResource(void)

1 0

Austin English : fusion/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: cbc81c97d03b08ef2e32073e0bf9efad52ec3a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc81c97d03b08ef2e32073e0… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:32:51 2011 -0800 fusion/tests: Remove win9x hacks. --- dlls/fusion/tests/asmcache.c | 40 ++++++++++------------------------------ 1 files changed, 10 insertions(+), 30 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 8af1553..900d23a 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -1187,9 +1187,7 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - /* win9x: 32 */ - ok((info.uliAssemblySizeInKB.u.LowPart == 4) || - broken(info.uliAssemblySizeInKB.u.LowPart == 32), + ok((info.uliAssemblySizeInKB.u.LowPart == 4), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); } ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), @@ -1210,9 +1208,7 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - /* win9x: 32 */ - ok((info.uliAssemblySizeInKB.u.LowPart == 4) || - broken(info.uliAssemblySizeInKB.u.LowPart == 32), + ok((info.uliAssemblySizeInKB.u.LowPart == 4), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); } ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), @@ -1235,9 +1231,7 @@ static void test_QueryAssemblyInfo(void) "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); todo_wine { - /* win9x: 32 */ - ok((info.uliAssemblySizeInKB.u.LowPart == 4) || - broken(info.uliAssemblySizeInKB.u.LowPart == 32), + ok((info.uliAssemblySizeInKB.u.LowPart == 4), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); } ok(info.cchBuf == lstrlenW(asmpath) + 1, @@ -1260,9 +1254,7 @@ static void test_QueryAssemblyInfo(void) "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); todo_wine { - /* win9x: 32 */ - ok((info.uliAssemblySizeInKB.u.LowPart == 4) || - broken(info.uliAssemblySizeInKB.u.LowPart == 32), + ok((info.uliAssemblySizeInKB.u.LowPart == 4), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); } ok(info.cchBuf == lstrlenW(asmpath) + 1, @@ -1284,9 +1276,7 @@ static void test_QueryAssemblyInfo(void) "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); todo_wine { - /* win9x: 32 */ - ok((info.uliAssemblySizeInKB.u.LowPart == 4) || - broken(info.uliAssemblySizeInKB.u.LowPart == 32), + ok((info.uliAssemblySizeInKB.u.LowPart == 4), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); } ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), @@ -1308,9 +1298,7 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - /* win9x: 32 */ - ok((info.uliAssemblySizeInKB.u.LowPart == 4) || - broken(info.uliAssemblySizeInKB.u.LowPart == 32), + ok((info.uliAssemblySizeInKB.u.LowPart == 4), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); } ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), @@ -1341,9 +1329,7 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - /* win9x: 32 */ - ok((info.uliAssemblySizeInKB.u.LowPart == 4) || - broken(info.uliAssemblySizeInKB.u.LowPart == 32), + ok((info.uliAssemblySizeInKB.u.LowPart == 4), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); } ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), @@ -1387,9 +1373,7 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - /* win9x: 32 */ - ok((info.uliAssemblySizeInKB.u.LowPart == 4) || - broken(info.uliAssemblySizeInKB.u.LowPart == 32), + ok((info.uliAssemblySizeInKB.u.LowPart == 4), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); } ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), @@ -1439,9 +1423,7 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - /* win9x: 32 */ - ok((info.uliAssemblySizeInKB.u.LowPart == 4) || - broken(info.uliAssemblySizeInKB.u.LowPart == 32), + ok((info.uliAssemblySizeInKB.u.LowPart == 4), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); } ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), @@ -1485,9 +1467,7 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - /* win9x: 32 */ - ok((info.uliAssemblySizeInKB.u.LowPart == 4) || - broken(info.uliAssemblySizeInKB.u.LowPart == 32), + ok((info.uliAssemblySizeInKB.u.LowPart == 4), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); } ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath),

1 0