July 2011 - Wine-commits - list.winehq.org

Frédéric Delanoy : include: Assorted spelling fixes.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 81bf92540188cb31fab57f76c5f647c624c1f5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81bf92540188cb31fab57f76c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 28 01:09:36 2011 +0200 include: Assorted spelling fixes. --- include/commctrl.h | 2 +- include/d3d9.h | 4 ++-- include/d3d9types.h | 2 +- include/dplobby.h | 4 ++-- include/mmsystem.h | 2 +- include/werapi.h | 2 +- include/wine/test.h | 2 +- include/winuser.h | 2 +- include/wnaspi32.h | 4 ++-- include/xinput.h | 6 +++--- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 92f7274..21f481e 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -579,7 +579,7 @@ typedef struct _IMAGELISTDRAWPARAMS INT y; INT cx; INT cy; - INT xBitmap; /* x offest from the upperleft of bitmap */ + INT xBitmap; /* x offset from the upperleft of bitmap */ INT yBitmap; /* y offset from the upperleft of bitmap */ COLORREF rgbBk; COLORREF rgbFg; diff --git a/include/d3d9.h b/include/d3d9.h index 0310240..1311ac0 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -258,8 +258,8 @@ DECLARE_INTERFACE_(IDirect3D9Ex,IDirect3D9) /* Note: Microsoft's d3d9.h does not declare IDirect3D9Ex::RegisterSoftwareDevice . This would mean that * the offsets of the other methods in the Vtable change too. This is wrong. In Microsoft's * d3d9.dll, the offsets for the other functions are still compatible with IDirect3D9. - * This is probably because even in MS's header IDirect3D9Ex inherits from IDirect3D9, which makes the - * C++ inferface compatible, and nobody uses the C interface in Windows world. + * This is probably because even in MS header IDirect3D9Ex inherits from IDirect3D9, which makes the + * C++ interface compatible, and nobody uses the C interface in Windows world. */ STDMETHOD(RegisterSoftwareDevice)(THIS_ void* pInitializeFunction) PURE; diff --git a/include/d3d9types.h b/include/d3d9types.h index db5fe39..bbb8fbd 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -1305,7 +1305,7 @@ typedef struct D3DDEVINFO_VCACHE { DWORD OptMethod; /* Cache size to use (only valid if OptMethod==1) */ DWORD CacheSize; - /* internal for deciding when to restart strips, non user modifyable (only valid if OptMethod==1) */ + /* internal for deciding when to restart strips, non user modifiable (only valid if OptMethod==1) */ DWORD MagicNumber; } D3DDEVINFO_VCACHE; diff --git a/include/dplobby.h b/include/dplobby.h index 5a53c1d..eb49513 100644 --- a/include/dplobby.h +++ b/include/dplobby.h @@ -103,7 +103,7 @@ typedef struct tagDPLDATA_PLAYERSCORE * System messages can be identified by dwMessageFlags having a value of DPLMSG_SYSTEM * after a call to ReceiveLobbyMessage. * - * Standard messages can be indentified by dwMessageFlags having a value of DPLMSG_STANDARD + * Standard messages can be identified by dwMessageFlags having a value of DPLMSG_STANDARD * after a call to ReceiveLobbyMessage. */ @@ -127,7 +127,7 @@ typedef struct tagDPLDATA_PLAYERSCORE -/* Used to indentify the message type */ +/* Used to identify the message type */ typedef struct tagDPLMSG_GENERIC { DWORD dwType; /* Message type */ diff --git a/include/mmsystem.h b/include/mmsystem.h index ef74c75..1286a35 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -659,7 +659,7 @@ DECL_WINELIB_TYPE_AW(LPMIDIOUTCAPS2) #define MOD_SQSYNTH 3 /* square wave internal synth */ #define MOD_FMSYNTH 4 /* FM internal synth */ #define MOD_MAPPER 5 /* MIDI mapper */ -#define MOD_WAVETABLE 6 /* hardware watetable internal synth */ +#define MOD_WAVETABLE 6 /* hardware wavetable internal synth */ #define MOD_SWSYNTH 7 /* software synth */ #define MIDICAPS_VOLUME 0x0001 /* supports volume control */ diff --git a/include/werapi.h b/include/werapi.h index 4b79c04..2486d3d 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -1,5 +1,5 @@ /* - * Windows Error Reporing definitions + * Windows Error Reporting definitions * * Copyright (C) 2010 Louis Lenders * diff --git a/include/wine/test.h b/include/wine/test.h index 1a98025..bee9c23 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -65,7 +65,7 @@ extern void winetest_wait_child_process( HANDLE process ); extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } -/* strcmpW is avaiable for tests compiled under Wine, but not in standalone +/* strcmpW is available for tests compiled under Wine, but not in standalone * builds under Windows, so we reimplement it under a different name. */ static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) { diff --git a/include/winuser.h b/include/winuser.h index a6ff3db..ef6530f 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -982,7 +982,7 @@ typedef struct tagWINDOWPLACEMENT #define COLOR_3DHILIGHT COLOR_BTNHIGHLIGHT #define COLOR_BTNHILIGHT COLOR_BTNHIGHLIGHT /* win98 colors */ -#define COLOR_ALTERNATEBTNFACE 25 /* undocumented, constant's name unknown */ +#define COLOR_ALTERNATEBTNFACE 25 /* undocumented, constant name unknown */ #define COLOR_HOTLIGHT 26 #define COLOR_GRADIENTACTIVECAPTION 27 #define COLOR_GRADIENTINACTIVECAPTION 28 diff --git a/include/wnaspi32.h b/include/wnaspi32.h index 6a20fb0..9051f00 100644 --- a/include/wnaspi32.h +++ b/include/wnaspi32.h @@ -19,8 +19,8 @@ #ifndef __WNASPI32_H__ #define __WNASPI32_H__ -/* This file should be 100% source compatible according to MSes docs and - * Adaptecs docs */ +/* This file should be 100% source compatible according to MS docs and + * Adaptec docs */ #ifdef __cplusplus extern "C" { diff --git a/include/xinput.h b/include/xinput.h index 426dfac..98d23a3 100644 --- a/include/xinput.h +++ b/include/xinput.h @@ -106,7 +106,7 @@ /* * Defines what type of abilities the type of joystick has * DEVTYPE_GAMEPAD is available for all joysticks, however - * there may be more specfic identifiers for other joysticks + * there may be more specific identifiers for other joysticks * which are being used. */ @@ -188,8 +188,8 @@ typedef struct _XINPUT_VIBRATION { /* * Defines the structure for what kind of abilities the joystick has - * such abilites are things such as if the joystick has the ability - * to send and receive audio, if the joystick is infact a driving + * such abilities are things such as if the joystick has the ability + * to send and receive audio, if the joystick is in fact a driving * wheel or perhaps if the joystick is some kind of dance pad or * guitar. */

1 0

Frédéric Delanoy : cmd/tests: Fix test runner so it catches cases where an output line contains the associated expected line as prefix .
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 5fe0f1e1dc372d75ca5d9443c54e3fda80d9183e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe0f1e1dc372d75ca5d9443c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 28 01:06:45 2011 +0200 cmd/tests: Fix test runner so it catches cases where an output line contains the associated expected line as prefix. --- programs/cmd/tests/batch.c | 10 +++++++++- programs/cmd/tests/test_builtins.cmd | 8 ++++---- programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++------ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 2715b11..84d7f39 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -200,7 +200,12 @@ static const char *compare_line(const char *out_line, const char *out_end, const out_ptr++; } - return exp_ptr == exp_end ? NULL : out_ptr; + if(exp_ptr != exp_end) + return out_ptr; + else if(out_ptr != out_end) + return exp_end; + + return NULL; } static void test_output(const char *out_data, DWORD out_size, const char *exp_data, DWORD exp_size) @@ -227,6 +232,9 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da if(err == out_nl) ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else if(err == exp_nl) + ok(0, "excess characters on line %d (got '%.*s', wanted '%.*s')\n", + line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); else ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 572fb38..1b3bbcb 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -263,10 +263,10 @@ goto :eof :endForTestFun1 for %%i in (X) do ( for %%j in (Y) do ( - echo %%i %%j )) + echo %%i %%j)) for %%i in (A B) do ( for %%j in (C D) do ( - echo %%i %%j )) + echo %%i %%j)) for %%i in (A B) do ( for %%j in (C D) do ( call :forTestFun2 %%i %%j )) @@ -478,7 +478,7 @@ rd /s/q foobaz echo ------------ Testing CALL -------------- mkdir foobar & cd foobar rem External script -echo echo foo %%1 > foo.cmd +echo echo foo %%1> foo.cmd call foo call foo.cmd 8 del foo.cmd @@ -510,7 +510,7 @@ call :setError 0 call for %%i in (foo bar baz) do echo %%i 2> nul echo %ErrorLevel% rem First look for programs in the path before trying a builtin -echo echo non-builtin dir > dir.cmd +echo echo non-builtin dir> dir.cmd call dir /b cd .. rd /s/q foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d10aa4c..d06c4cf 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -18,13 +18,13 @@ at-echoed-word @pwd@>echo "/?"@space@ "/?" -(a)pwd@>echo. +(a)todo_wine@@pwd@>echo. @pwd@>echo .(a)space@ . -(a)pwd@>echo.word +(a)todo_wine@@pwd@>echo.word word @pwd@>echo .word(a)space@ @@ -100,7 +100,7 @@ FOOBAR = baz bar @todo_wine(a)FOOBAR= bar @todo_wine(a)FOOBAR = baz2 -FOOBAR = baz +FOOBAR = baz2 FOOBAR not defined 1 bar @@ -114,7 +114,7 @@ bar ~dp0 should be directory containing batch file @pwd@\ @pwd@\ -CD value @pwd@@or_broken(a)CD value +CD value @pwd@@or_broken(a)CD value(a)space@ % P P @@ -236,8 +236,8 @@ bar removed foobar removed bar\baz removed ------------ Testing CALL -------------- -foo -foo 8 +foo(a)space@ +(a)todo_wine@foo 8 bar :testRoutine @todo_wine(a)0 @todo_wine(a)foo created

1 0

Frédéric Delanoy : cmd/tests: Test special handling of ':' in echo.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: dcd544f744733cf446ef8fc602ebdff6de572e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcd544f744733cf446ef8fc60… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 28 01:06:46 2011 +0200 cmd/tests: Test special handling of ':' in echo. --- programs/cmd/tests/test_builtins.cmd | 8 ++++++++ programs/cmd/tests/test_builtins.cmd.exp | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1b3bbcb..c9d1d53 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -11,6 +11,10 @@ echo. echo . echo.word echo .word +echo: +echo : +echo:word +echo :word echo word(a)space@ echo word(a)space@@space@ @@ -25,6 +29,10 @@ echo. echo . echo.word echo .word +echo: +echo : +echo:word +echo :word echo word(a)space@ echo word(a)space@@space@ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d06c4cf..7db3b86 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -30,6 +30,18 @@ word @pwd@>echo .word(a)space@ .word +(a)todo_wine@@pwd@>echo: +(a)todo_wine@ + +(a)pwd@>echo :@space@ +: + +(a)todo_wine@@pwd@>echo:word +(a)todo_wine@word + +(a)pwd@>echo :word(a)space@ +:word + @pwd@>echo word(a)space@@space@ word(a)space@ @@ -45,6 +57,10 @@ at-echoed-word . word .word +(a)todo_wine@ +: +(a)todo_wine@word +:word word(a)space@ word(a)space@@space@ ------------ Testing redirection operators --------------

1 0

Frédéric Delanoy : cmd: Partial fix for echo' s special ':' handling.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 25fcad3768ab00ec0493c127efa4f3992706b2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25fcad3768ab00ec0493c127e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 28 01:06:47 2011 +0200 cmd: Partial fix for echo's special ':' handling. --- programs/cmd/builtins.c | 4 ++-- programs/cmd/tests/test_builtins.cmd.exp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 86fd54c..49869ba 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -861,10 +861,10 @@ void WCMD_echo (const WCHAR *command) { int count; const WCHAR *origcommand = command; - if (command[0]==' ' || command[0]=='.') + if (command[0]==' ' || command[0]=='.' || command[0]==':') command++; count = strlenW(command); - if (count == 0 && origcommand[0]!='.') { + if (count == 0 && origcommand[0]!='.' && origcommand[0]!=':') { if (echo_mode) WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), onW); else WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), offW); return; diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7db3b86..e0d3cf7 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -31,13 +31,13 @@ word .word @todo_wine@@pwd@>echo: -(a)todo_wine@ + @pwd@>echo :@space@ : @todo_wine@@pwd@>echo:word -(a)todo_wine@word +word @pwd@>echo :word(a)space@ :word @@ -57,9 +57,9 @@ at-echoed-word . word .word -(a)todo_wine@ + : -(a)todo_wine@word +word :word word(a)space@ word(a)space@@space@

1 0

Frédéric Delanoy : cmd/tests: Additional variable expansion FOR tests.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 327eb3132553e5a84bc5d1ecda22da505356e925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=327eb3132553e5a84bc5d1ecd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 28 01:06:48 2011 +0200 cmd/tests: Additional variable expansion FOR tests. --- programs/cmd/tests/test_builtins.cmd | 18 ++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 17 +++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index c9d1d53..4510074 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -262,16 +262,25 @@ if /I foo==FOO echo if /I seems to work if /I not foo==FOO echo if /I seems to be broken echo -----------Testing for ----------- +echo ...plain FOR for %%i in (A B C) do echo %%i +for %%i in (A B C) do echo %%I +for %%i in (A B C) do echo %%j for %%i in (A B C) do call :forTestFun1 %%i +for %%i in (1,4,1) do echo %%i +for %%i in (A, B,C) do echo %%i goto :endForTestFun1 :forTestFun1 echo %1 goto :eof :endForTestFun1 +echo ...imbricated FORs for %%i in (X) do ( for %%j in (Y) do ( echo %%i %%j)) +for %%i in (X) do ( + for %%I in (Y) do ( + echo %%i %%I)) for %%i in (A B) do ( for %%j in (C D) do ( echo %%i %%j)) @@ -283,6 +292,15 @@ goto :endForTestFun2 echo %1 %2 goto :eof :endForTestFun2 +mkdir foobar & cd foobar +mkdir foo +mkdir bar +mkdir baz +echo > bazbaz +echo ...basic wildcards +for %%i in (ba*) do echo %%i +cd .. +rd /s/Q foobar echo -----------Testing del /a----------- del /f/q *.test > nul diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index e0d3cf7..a050c14 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -184,12 +184,27 @@ if seems to default to case sensitivity if /i seems to work if /I seems to work -----------Testing for ----------- +...plain FOR A B C +%I +%I +%I +%j +%j +%j A B C +1 +4 +1 +A +B +C +...imbricated FORs +(a)todo_wine@X Y @todo_wine(a)X Y @todo_wine(a)A C @todo_wine(a)A D @@ -199,6 +214,8 @@ C @todo_wine(a)A D @todo_wine(a)B C @todo_wine(a)B D +...basic wildcards +bazbaz -----------Testing del /a----------- not-r.test not found after delete, good r.test found before delete, good

1 0

Huw Davies : gdi32: Use the helper to retrieve the number of colours.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: d61e1ffaabf117aa15daee8ced1c19c49a4cf9aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d61e1ffaabf117aa15daee8ce… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 28 15:34:15 2011 +0100 gdi32: Use the helper to retrieve the number of colours. --- dlls/gdi32/dib.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 99baf67..5adafcb 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -147,14 +147,12 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * if (bitmap_type == -1) return FALSE; - colors = (bpp > 8) ? 0 : 1 << bpp; - if (bitmap_type == 1) { dst->bmiHeader = info->bmiHeader; dst->bmiHeader.biSize = sizeof(dst->bmiHeader); - if (info->bmiHeader.biClrUsed) colors = info->bmiHeader.biClrUsed; + colors = get_dib_num_of_colors( dst ); if (info->bmiHeader.biCompression == BI_BITFIELDS) /* bitfields are always at bmiColors even in larger structures */ @@ -184,6 +182,8 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * dst->bmiHeader.biClrUsed = 0; dst->bmiHeader.biClrImportant = 0; + colors = get_dib_num_of_colors( dst ); + if (colors) { if (coloruse == DIB_PAL_COLORS)

1 0

Piotr Caban : msvcrt: Fix uninitialized memory access in wcsrtombs_l implementation (valgrind).
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: a8c6fda50170b4557a9dd66331b0e0ead344c56b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c6fda50170b4557a9dd6633… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 28 12:28:38 2011 +0200 msvcrt: Fix uninitialized memory access in wcsrtombs_l implementation (valgrind). --- dlls/msvcrt/wcs.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index bb720e7..04d3ee2 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -313,7 +313,6 @@ static MSVCRT_size_t CDECL MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t MSVCRT_size_t count, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; - char default_char = '\0'; MSVCRT_size_t tmp = 0; BOOL used_default; @@ -322,16 +321,20 @@ static MSVCRT_size_t CDECL MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t else locinfo = locale->locinfo; - if(!mbstr) - return WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, - *wcstr, -1, NULL, 0, &default_char, &used_default)-1; + if(!mbstr) { + tmp = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, + *wcstr, -1, NULL, 0, NULL, &used_default)-1; + if(used_default) + return -1; + return tmp; + } while(**wcstr) { char buf[3]; MSVCRT_size_t i, size; size = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, - *wcstr, 1, buf, 3, &default_char, &used_default); + *wcstr, 1, buf, 3, NULL, &used_default); if(used_default) return -1; if(tmp+size > count)

1 0

Jacek Caban : ieframe: Moved ie.c tests to ieframe.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: f42d9e2ef262d7acf84bc6d2a4592332c8dc524b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42d9e2ef262d7acf84bc6d2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 13:32:01 2011 +0200 ieframe: Moved ie.c tests to ieframe. --- configure | 1 + configure.ac | 1 + dlls/ieframe/tests/Makefile.in | 7 +++++++ dlls/{shdocvw => ieframe}/tests/ie.c | 6 ++---- dlls/shdocvw/tests/Makefile.in | 1 - 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 5758297..264acaa 100755 --- a/configure +++ b/configure @@ -14888,6 +14888,7 @@ wine_fn_config_dll httpapi enable_httpapi wine_fn_config_dll iccvid enable_iccvid po wine_fn_config_dll icmp enable_icmp wine_fn_config_dll ieframe enable_ieframe implib,po +wine_fn_config_test dlls/ieframe/tests ieframe_test wine_fn_config_dll ifsmgr.vxd enable_win16 wine_fn_config_dll imaadp32.acm enable_imaadp32_acm wine_fn_config_dll imagehlp enable_imagehlp implib diff --git a/configure.ac b/configure.ac index 8126c7b..2521c71 100644 --- a/configure.ac +++ b/configure.ac @@ -2528,6 +2528,7 @@ WINE_CONFIG_DLL(httpapi) WINE_CONFIG_DLL(iccvid,,[po]) WINE_CONFIG_DLL(icmp) WINE_CONFIG_DLL(ieframe,,[implib,po]) +WINE_CONFIG_TEST(dlls/ieframe/tests) WINE_CONFIG_DLL(ifsmgr.vxd,enable_win16) WINE_CONFIG_DLL(imaadp32.acm) WINE_CONFIG_DLL(imagehlp,,[implib]) diff --git a/dlls/ieframe/tests/Makefile.in b/dlls/ieframe/tests/Makefile.in new file mode 100644 index 0000000..c1d1031 --- /dev/null +++ b/dlls/ieframe/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = ieframe.dll +IMPORTS = ole32 + +C_SRCS = \ + ie.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/shdocvw/tests/ie.c b/dlls/ieframe/tests/ie.c similarity index 95% rename from dlls/shdocvw/tests/ie.c rename to dlls/ieframe/tests/ie.c index 336a62e..7a87469 100644 --- a/dlls/shdocvw/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "ole2.h" #include "exdisp.h" @@ -58,10 +59,7 @@ static void test_InternetExplorer(void) hres = CoCreateInstance(&CLSID_InternetExplorer, NULL, CLSCTX_SERVER, &IID_IUnknown, (void**)&unk); - if(FAILED(hres)) { - win_skip("Could not create InternetExplorer object\n"); - return; - } + ok(hres == S_OK, "Could not create InternetExplorer instance: %08x\n", hres); hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in index 53f2130..10474a1 100644 --- a/dlls/shdocvw/tests/Makefile.in +++ b/dlls/shdocvw/tests/Makefile.in @@ -2,7 +2,6 @@ TESTDLL = shdocvw.dll IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 C_SRCS = \ - ie.c \ intshcut.c \ shdocvw.c \ shortcut.c \

1 0

Jacek Caban : mshtml.idl: Added IHTMLStyle5 and IHTMLStyle6 declarations.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: b9202639e3dd1a81d95614498c997903a610a300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9202639e3dd1a81d95614498… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 16:28:44 2011 +0200 mshtml.idl: Added IHTMLStyle5 and IHTMLStyle6 declarations. --- include/mshtmdid.h | 60 +++++++++++++++++++++ include/mshtml.idl | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 206 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9202639e3dd1a81d9561…

1 0

Jacek Caban : mshtml: Added IHTMLStyle5 implementation.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 8925638f9f2016328ef1bba044268e540f9c1d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8925638f9f2016328ef1bba04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 16:28:59 2011 +0200 mshtml: Added IHTMLStyle5 implementation. --- dlls/mshtml/htmlstyle.c | 3 + dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle3.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 027a2fb..fc8edcc 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -656,6 +656,9 @@ static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, v }else if(IsEqualGUID(&IID_IHTMLStyle4, riid)) { TRACE("(%p)->(IID_IHTMLStyle4 %p)\n", This, ppv); *ppv = &This->IHTMLStyle4_iface; + }else if(IsEqualGUID(&IID_IHTMLStyle5, riid)) { + TRACE("(%p)->(IID_IHTMLStyle5 %p)\n", This, ppv); + *ppv = &This->IHTMLStyle5_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index f23d911..cf103fc 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -22,6 +22,7 @@ struct HTMLStyle { IHTMLStyle2 IHTMLStyle2_iface; IHTMLStyle3 IHTMLStyle3_iface; IHTMLStyle4 IHTMLStyle4_iface; + IHTMLStyle5 IHTMLStyle5_iface; LONG ref; diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index f95cbd7..8c1888c 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -458,8 +458,139 @@ static const IHTMLStyle4Vtbl HTMLStyle4Vtbl = { HTMLStyle4_get_minHeight }; +static inline HTMLStyle *impl_from_IHTMLStyle5(IHTMLStyle5 *iface) +{ + return CONTAINING_RECORD(iface, HTMLStyle, IHTMLStyle5_iface); +} + +static HRESULT WINAPI HTMLStyle5_QueryInterface(IHTMLStyle5 *iface, REFIID riid, void **ppv) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + + return IHTMLStyle_QueryInterface(&This->IHTMLStyle_iface, riid, ppv); +} + +static ULONG WINAPI HTMLStyle5_AddRef(IHTMLStyle5 *iface) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + + return IHTMLStyle_AddRef(&This->IHTMLStyle_iface); +} + +static ULONG WINAPI HTMLStyle5_Release(IHTMLStyle5 *iface) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + + return IHTMLStyle_Release(&This->IHTMLStyle_iface); +} + +static HRESULT WINAPI HTMLStyle5_GetTypeInfoCount(IHTMLStyle5 *iface, UINT *pctinfo) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLStyle5_GetTypeInfo(IHTMLStyle5 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLStyle5_GetIDsOfNames(IHTMLStyle5 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLStyle5_Invoke(IHTMLStyle5 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLStyle5_put_msInterpolationMode(IHTMLStyle5 *iface, BSTR v) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyle5_get_msInterpolationMode(IHTMLStyle5 *iface, BSTR *p) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyle5_put_maxHeight(IHTMLStyle5 *iface, VARIANT v) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyle5_get_maxHeight(IHTMLStyle5 *iface, VARIANT *p) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyle5_put_minWidth(IHTMLStyle5 *iface, VARIANT v) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyle5_get_minWidth(IHTMLStyle5 *iface, VARIANT *p) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyle5_put_maxWidth(IHTMLStyle5 *iface, VARIANT v) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyle5_get_maxWidth(IHTMLStyle5 *iface, VARIANT *p) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLStyle5Vtbl HTMLStyle5Vtbl = { + HTMLStyle5_QueryInterface, + HTMLStyle5_AddRef, + HTMLStyle5_Release, + HTMLStyle5_GetTypeInfoCount, + HTMLStyle5_GetTypeInfo, + HTMLStyle5_GetIDsOfNames, + HTMLStyle5_Invoke, + HTMLStyle5_put_msInterpolationMode, + HTMLStyle5_get_msInterpolationMode, + HTMLStyle5_put_maxHeight, + HTMLStyle5_get_maxHeight, + HTMLStyle5_put_minWidth, + HTMLStyle5_get_minWidth, + HTMLStyle5_put_maxWidth, + HTMLStyle5_get_maxWidth +}; + void HTMLStyle3_Init(HTMLStyle *This) { This->IHTMLStyle3_iface.lpVtbl = &HTMLStyle3Vtbl; This->IHTMLStyle4_iface.lpVtbl = &HTMLStyle4Vtbl; + This->IHTMLStyle5_iface.lpVtbl = &HTMLStyle5Vtbl; }

1 0