October 2010 - Wine-Commits

Henri Verbeet : wined3d: Recognize the SM4 loop opcode.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 98a2973e9575d41c46680944f782abd2bd643eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a2973e9575d41c46680944f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 7 12:17:56 2010 +0200 wined3d: Recognize the SM4 loop opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b463790..3ba10bf 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -62,6 +62,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IF = 0x1f, WINED3D_SM4_OP_IGE = 0x21, WINED3D_SM4_OP_LOG = 0x2f, + WINED3D_SM4_OP_LOOP = 0x30, WINED3D_SM4_OP_LT = 0x31, WINED3D_SM4_OP_MIN = 0x33, WINED3D_SM4_OP_MAX = 0x34, @@ -125,6 +126,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IF, WINED3DSIH_IF, 0, 1}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, 1, 2}, {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, 1, 1}, + {WINED3D_SM4_OP_LOOP, WINED3DSIH_LOOP, 0, 0}, {WINED3D_SM4_OP_LT, WINED3DSIH_LT, 1, 2}, {WINED3D_SM4_OP_MIN, WINED3DSIH_MIN, 1, 2}, {WINED3D_SM4_OP_MAX, WINED3DSIH_MAX, 1, 2},

1 0

Yaron Shahrabani : winhlp32: Add Hebrew translation.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 5c8ed1493641627712ad62e5372cf4626b2e992d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8ed1493641627712ad62e53… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Wed Oct 6 18:08:17 2010 +0200 winhlp32: Add Hebrew translation. --- programs/winhlp32/He.rc | 134 +++++++++++++++++++++++++++++++++++++++++ programs/winhlp32/Makefile.in | 1 + 2 files changed, 135 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/He.rc b/programs/winhlp32/He.rc new file mode 100644 index 0000000..f3d82ae --- /dev/null +++ b/programs/winhlp32/He.rc @@ -0,0 +1,134 @@ +/* + * Help Viewer (Hebrew resources) + * + * Copyright 1996 Ulrich Schmid + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winhelp_res.h" + +#pragma code_page(65001) + +/* Menu */ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "&קובץ" { + MENUITEM "&פתיחה", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "ה&דפסה", MNID_FILE_PRINT + MENUITEM "ה&גדרת המדפסת...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "י&ציאה", MNID_FILE_EXIT + } + POPUP "ע&ריכה" { + MENUITEM "ה&עתקה...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "הוספת הע&רות...", MNID_EDIT_ANNOTATE + } + POPUP "&סימניה" { + MENUITEM "ה&גדרה...", MNID_BKMK_DEFINE + } + POPUP "&אפשרויות" { + POPUP "העזרה גלויה תמיד" + BEGIN + MENUITEM "בררת מחדל", MNID_OPTS_HELP_DEFAULT + MENUITEM "גלויה", MNID_OPTS_HELP_VISIBLE + MENUITEM "מוסתרת", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "היסטוריה", MNID_OPTS_HISTORY + POPUP "גופנים" + BEGIN + MENUITEM "קטנים", MNID_OPTS_FONTS_SMALL + MENUITEM "רגילים", MNID_OPTS_FONTS_NORMAL + MENUITEM "גדולים", MNID_OPTS_FONTS_LARGE + END + MENUITEM "שימוש בצבעי המערכת", MNID_OPTS_SYSTEM_COLORS + } + POPUP "ע&זרה" { + MENUITEM "עזרה ע&ל העזרה", MNID_HELP_HELPON + MENUITEM "תמיד &עליון", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&מידע...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "על &אודות Wine", MNID_HELP_WINE +#endif + } +} + +IDD_INDEX DIALOG 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +FONT 8, "MS Shell Dlg" +CAPTION "מפתח" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +FONT 8, "MS Shell Dlg" +CAPTION "חיפוש" +{ + LTEXT "לא מוטמע עדיין", -1, 10, 10, 180, 150 +} + +/* Strings */ +STRINGTABLE +{ +STID_WINE_HELP, "העזרה של Wine" +STID_WHERROR, "שגיאה" +STID_WARNING, "אזהרה" +STID_INFO, "מידע" +STID_NOT_IMPLEMENTED, "לא מוטמע" +STID_HLPFILE_ERROR_s, "אירעה שגיאה בעת קריאת קובץ העזרה `%s'" +STID_INDEX, "מ&פתח" +STID_CONTENTS, "תקציר" +STID_BACK, "&חזרה" +STID_ALL_FILES, "כל הקבצים (*.*)" +STID_HELP_FILES_HLP, "קובצי העזרה (*.hlp)" +STID_FILE_NOT_FOUND_s "לא ניתן למצוא את '%s'. האם ברצונך למצוא קובץ זה בעצמך?" +STID_NO_RICHEDIT "לא ניתן למצוא יישום של richedit... התכנית תצא" +STID_PSH_INDEX, "נושאי העזרה: " +} + +CONTEXT_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "הערות...", MNID_CTXT_ANNOTATE + MENUITEM "העתקה", MNID_CTXT_COPY + MENUITEM "הדפסה...", MNID_CTXT_PRINT + POPUP "גופנים" + BEGIN + MENUITEM "קטנים", MNID_CTXT_FONTS_SMALL + MENUITEM "רגילים", MNID_CTXT_FONTS_NORMAL + MENUITEM "גדולים", MNID_CTXT_FONTS_LARGE + END + POPUP "העזרה תמיד זמינה" + BEGIN + MENUITEM "בררת מחדל", MNID_CTXT_HELP_DEFAULT + MENUITEM "גלויה", MNID_CTXT_HELP_VISIBLE + MENUITEM "מוסתרת", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "שימוש בצבעי המערכת", MNID_CTXT_SYSTEM_COLORS + END +END diff --git a/programs/winhlp32/Makefile.in b/programs/winhlp32/Makefile.in index 01e2017..c185417 100644 --- a/programs/winhlp32/Makefile.in +++ b/programs/winhlp32/Makefile.in @@ -24,6 +24,7 @@ RC_SRCS = \ Es.rc \ Fi.rc \ Fr.rc \ + He.rc \ Hu.rc \ It.rc \ Ja.rc \

1 0

André Hentschel : winedbg: Implement adjust_pc_for_break on ARM.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 0d0d30505d8a82e820351b5ec81b9053b029161d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0d30505d8a82e820351b5ec… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 6 22:20:29 2010 +0200 winedbg: Implement adjust_pc_for_break on ARM. --- programs/winedbg/be_arm.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 102e4ad..709ce26 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -142,8 +142,13 @@ static void be_arm_clear_watchpoint(CONTEXT* ctx, unsigned idx) static int be_arm_adjust_pc_for_break(CONTEXT* ctx, BOOL way) { - dbg_printf("not done\n"); - return 0; + if (way) + { + ctx->Pc--; + return -1; + } + ctx->Pc++; + return 1; } static int be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size,

1 0

Joel Holdsworth : windowscodecs/tests: Added test for GifFrameDecode_GetResolution.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: e66a2f6d8135852d65bea487389fe63aa31f8926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e66a2f6d8135852d65bea4873… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Oct 7 00:21:09 2010 +0100 windowscodecs/tests: Added test for GifFrameDecode_GetResolution. --- dlls/windowscodecs/tests/bmpformat.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index f817df5..0fcdc06 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -1042,7 +1042,7 @@ static void test_createfromstream(void) /* 1x1 pixel gif, missing trailer */ static unsigned char gifimage_notrailer[] = { -0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x00,0xff,0xff,0xff, +0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x71,0xff,0xff,0xff, 0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, 0x01,0x00 }; @@ -1054,6 +1054,7 @@ static void test_gif_notrailer(void) HRESULT hr; IWICStream *gifstream; IWICBitmapFrameDecode *framedecode; + double dpiX = 0.0, dpiY = 0.0; UINT framecount; hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, @@ -1086,7 +1087,15 @@ static void test_gif_notrailer(void) { hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); ok(hr == S_OK, "GetFrame failed, hr=%x\n", hr); - if (SUCCEEDED(hr)) IWICBitmapFrameDecode_Release(framedecode); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameDecode_GetResolution(framedecode, &dpiX, &dpiY); + ok(SUCCEEDED(hr), "GetResolution failed, hr=%x\n", hr); + ok(dpiX == 48.0, "expected dpiX=48.0, got %f\n", dpiX); + ok(dpiY == 96.0, "expected dpiY=96.0, got %f\n", dpiY); + + IWICBitmapFrameDecode_Release(framedecode); + } } if (SUCCEEDED(hr))

1 0

Louis Lenders : fusion: Add version resource.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: e068971075d4780a23e21fb018cf4e54ed43a32b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e068971075d4780a23e21fb01… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Oct 6 23:46:05 2010 +0200 fusion: Add version resource. --- dlls/fusion/Makefile.in | 2 ++ dlls/fusion/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in index 5998813..63b1b73 100644 --- a/dlls/fusion/Makefile.in +++ b/dlls/fusion/Makefile.in @@ -9,4 +9,6 @@ C_SRCS = \ fusion.c \ fusion_main.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ diff --git a/dlls/fusion/version.rc b/dlls/fusion/version.rc new file mode 100644 index 0000000..06b7e1c --- /dev/null +++ b/dlls/fusion/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2010 Louis Lenders + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine assembly manager" +#define WINE_FILENAME_STR "fusion.dll" +#define WINE_FILEVERSION 2,0,50727,4016 +#define WINE_FILEVERSION_STR "2.0.50727.4016" +#define WINE_PRODUCTVERSION 2,0,50727,4016 +#define WINE_PRODUCTVERSION_STR "2.0.50727.4016" + +#include "wine/wine_common_ver.rc"

1 0

André Hentschel : winedbg: Fix get_addr on ARM.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 1760483dfba5ba4d05c738aba670337411d02c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1760483dfba5ba4d05c738aba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 6 22:20:25 2010 +0200 winedbg: Fix get_addr on ARM. --- programs/winedbg/be_arm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index f81f14d..102e4ad 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -33,9 +33,8 @@ static unsigned be_arm_get_addr(HANDLE hThread, const CONTEXT* ctx, return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->Pc); case be_cpu_addr_stack: return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->Sp); - default: case be_cpu_addr_frame: - dbg_printf("not done\n"); + return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->Fp); } return FALSE; }

1 0

Joel Holdsworth : windowscodecs: Implemented GifFrameDecode_GetResolution.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 57e00c851e572dd97909d7f9fd3d198f9671dbbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e00c851e572dd97909d7f9f… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Oct 7 00:21:10 2010 +0100 windowscodecs: Implemented GifFrameDecode_GetResolution. --- dlls/windowscodecs/gifformat.c | 11 +++++++++-- dlls/windowscodecs/ungif.c | 1 + dlls/windowscodecs/ungif.h | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 3443b2c..239d25d 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -123,8 +123,15 @@ static HRESULT WINAPI GifFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface static HRESULT WINAPI GifFrameDecode_GetResolution(IWICBitmapFrameDecode *iface, double *pDpiX, double *pDpiY) { - FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); - return E_NOTIMPL; + GifFrameDecode *This = (GifFrameDecode*)iface; + const GifWord aspect_word = This->parent->gif->SAspectRatio; + const double aspect = (aspect_word > 0) ? ((aspect_word + 15.0) / 64.0) : 1.0; + TRACE("(%p,%p,%p)\n", iface, pDpiX, pDpiY); + + *pDpiX = 96.0 / aspect; + *pDpiY = 96.0; + + return S_OK; } static HRESULT WINAPI GifFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index cfc7613..87a9331 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -285,6 +285,7 @@ DGifGetScreenDesc(GifFileType * GifFile) { GifFile->SColorResolution = (((Buf[0] & 0x70) + 1) >> 4) + 1; BitsPerPixel = (Buf[0] & 0x07) + 1; GifFile->SBackGroundColor = Buf[1]; + GifFile->SAspectRatio = Buf[2]; if (Buf[0] & 0x80) { /* Do we have global color map? */ GifFile->SColorMap = MakeMapObject(1 << BitsPerPixel, NULL); diff --git a/dlls/windowscodecs/ungif.h b/dlls/windowscodecs/ungif.h index e71dad8..5e39c56 100644 --- a/dlls/windowscodecs/ungif.h +++ b/dlls/windowscodecs/ungif.h @@ -100,7 +100,8 @@ typedef struct GifImageDesc { typedef struct GifFileType { GifWord SWidth, SHeight, /* Screen dimensions. */ SColorResolution, /* How many colors can we generate? */ - SBackGroundColor; /* I hope you understand this one... */ + SBackGroundColor, /* I hope you understand this one... */ + SAspectRatio; /* Pixel aspect ratio, in 1/64 units, starting at 1:4. */ ColorMapObject *SColorMap; /* NULL if not exists. */ int ImageCount; /* Number of current image */ GifImageDesc Image; /* Block describing current image */

1 0

Austin Lund : advapi32/tests: Fix RegEnumValue overflow tests for broken behaviour on XP Pro Chinese.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: fd30e6953807741a439061307435a90ca13141ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd30e6953807741a439061307… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Oct 6 12:04:42 2010 +1000 advapi32/tests: Fix RegEnumValue overflow tests for broken behaviour on XP Pro Chinese. --- dlls/advapi32/tests/registry.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 8b0dbee..505d5ad 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -462,7 +462,7 @@ static void test_enum_value(void) res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 2, "val_count set to %d\n", val_count ); - ok( data_count == 7, "data_count set to %d instead of 7\n", data_count ); + ok( data_count == 7 || broken( data_count == 8 ), "data_count set to %d instead of 7\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); ok( !strcmp( data, "xxxxxxxxxx" ), "data set to '%s'\n", data ); @@ -477,12 +477,12 @@ static void test_enum_value(void) ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); /* Win9x returns 2 as specified by MSDN but NT returns 3... */ ok( val_count == 2 || val_count == 3, "val_count set to %d\n", val_count ); - ok( data_count == 7, "data_count set to %d instead of 7\n", data_count ); + ok( data_count == 7 || broken( data_count == 8 ), "data_count set to %d instead of 7\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); /* v5.1.2600.0 (XP Home and Professional) does not touch value or data in this case */ ok( !strcmp( value, "Te" ) || !strcmp( value, "xxxxxxxxxx" ), "value set to '%s' instead of 'Te' or 'xxxxxxxxxx'\n", value ); - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ), + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count == 8 ), "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); /* overflow empty name */ @@ -494,11 +494,11 @@ static void test_enum_value(void) res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 0, "val_count set to %d\n", val_count ); - ok( data_count == 7, "data_count set to %d instead of 7\n", data_count ); + ok( data_count == 7 || broken( data_count == 8 ), "data_count set to %d instead of 7\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); /* v5.1.2600.0 (XP Home and Professional) does not touch data in this case */ - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ), + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count == 8 ), "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); /* overflow data */

1 0

Louis Lenders : wine.inf: Add a fake fusion.dll.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 9c1ab84ee0b8e336d54fc2b6ef88b002041fa7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1ab84ee0b8e336d54fc2b6e… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Oct 6 23:43:21 2010 +0200 wine.inf: Add a fake fusion.dll. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 04fa375..51ae512 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2598,6 +2598,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,mountmgr.sys 10,Microsoft.NET\Framework\v1.1.4322,ngen.exe 10,Microsoft.NET\Framework\v2.0.50727,ngen.exe +10,Microsoft.NET\Framework\v2.0.50727,fusion.dll 11,wbem,mofcomp.exe 16422,Internet Explorer,iexplore.exe 11,,*

1 0

Nikolay Sivov : msxml3: Implement ::get_responseText() for UTF-8 and UTF-16 (little endian) response encoding.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: eebf331e892353921947c039cfbffa18e7824c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebf331e892353921947c039c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 7 03:20:35 2010 +0400 msxml3: Implement ::get_responseText() for UTF-8 and UTF-16 (little endian) response encoding. --- dlls/msxml3/httprequest.c | 48 +++++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 14 ++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 9cccd3a..3a3e0d6 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -40,6 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +#include <libxml/encoding.h> + static const WCHAR MethodGetW[] = {'G','E','T',0}; static const WCHAR MethodPutW[] = {'P','U','T',0}; static const WCHAR MethodPostW[] = {'P','O','S','T',0}; @@ -770,13 +772,53 @@ static HRESULT WINAPI httprequest_get_responseXML(IXMLHTTPRequest *iface, IDispa return E_NOTIMPL; } -static HRESULT WINAPI httprequest_get_responseText(IXMLHTTPRequest *iface, BSTR *pbstrBody) +static HRESULT WINAPI httprequest_get_responseText(IXMLHTTPRequest *iface, BSTR *body) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); + HGLOBAL hglobal; + HRESULT hr; - FIXME("stub %p %p\n", This, pbstrBody); + TRACE("(%p)->(%p)\n", This, body); - return E_NOTIMPL; + if (!body) return E_INVALIDARG; + if (This->state != READYSTATE_COMPLETE) return E_FAIL; + + hr = GetHGlobalFromStream(This->bsc->stream, &hglobal); + if (hr == S_OK) + { + xmlChar *ptr = GlobalLock(hglobal); + DWORD size = GlobalSize(hglobal); + xmlCharEncoding encoding = XML_CHAR_ENCODING_UTF8; + + /* try to determine data encoding */ + if (size >= 4) + { + encoding = xmlDetectCharEncoding(ptr, 4); + TRACE("detected encoding: %s\n", xmlGetCharEncodingName(encoding)); + if ( encoding != XML_CHAR_ENCODING_UTF8 && + encoding != XML_CHAR_ENCODING_UTF16LE && + encoding != XML_CHAR_ENCODING_NONE ) + { + FIXME("unsupported encoding: %s\n", xmlGetCharEncodingName(encoding)); + GlobalUnlock(hglobal); + return E_FAIL; + } + } + + /* without BOM assume UTF-8 */ + if (encoding == XML_CHAR_ENCODING_UTF8 || + encoding == XML_CHAR_ENCODING_NONE ) + { + *body = bstr_from_xmlChar(ptr); + } + else + *body = SysAllocStringByteLen((LPCSTR)ptr, size); + + if (!*body) hr = E_OUTOFMEMORY; + GlobalUnlock(hglobal); + } + + return hr; } static HRESULT WINAPI httprequest_get_responseBody(IXMLHTTPRequest *iface, VARIANT *pvarBody) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bcc9842..6035d2b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3188,6 +3188,8 @@ static void test_XMLHTTP(void) 'c','r','o','s','s','o','v','e','r','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', 'x','m','l','t','e','s','t','.','x','m','l',0}; static const WCHAR wszExpectedResponse[] = {'F','A','I','L','E','D',0}; + static const CHAR xmltestbodyA[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; + IXMLHttpRequest *pXMLHttpRequest; BSTR bstrResponse, method, url; VARIANT dummy; @@ -3359,6 +3361,18 @@ todo_wine { } ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLHttpRequest_get_responseText(pXMLHttpRequest, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_get_responseText(pXMLHttpRequest, &bstrResponse); + ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) + { + ok(!memcmp(bstrResponse, _bstr_(xmltestbodyA), sizeof(xmltestbodyA)*sizeof(WCHAR)), + "expected %s, got %s\n", xmltestbodyA, wine_dbgstr_w(bstrResponse)); + SysFreeString(bstrResponse); + } + SysFreeString(url); IDispatch_Release(event);

1 0