March 2008 - Wine-Commits - list.winehq.org

Tony Wasserka : d3dx9: Add the _D3DXERR enumeration.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: bcb7311516791a2276a3054ac3d0d43129d5e18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb7311516791a2276a3054ac… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Mar 8 14:25:15 2008 +0100 d3dx9: Add the _D3DXERR enumeration. --- include/d3dx9.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/d3dx9.h b/include/d3dx9.h index 5d9fd5f..dce0aeb 100644 --- a/include/d3dx9.h +++ b/include/d3dx9.h @@ -25,4 +25,19 @@ #include "d3dx9math.h" #include "d3dx9core.h" +#define _FACDD 0x876 +#define MAKE_DDHRESULT(code) MAKE_HRESULT(1, _FACDD, code) + +enum _D3DXERR { + D3DXERR_CANNOTMODIFYINDEXBUFFER = MAKE_DDHRESULT(2900), + D3DXERR_INVALIDMESH = MAKE_DDHRESULT(2901), + D3DXERR_CANNOTATTRSORT = MAKE_DDHRESULT(2902), + D3DXERR_SKINNINGNOTSUPPORTED = MAKE_DDHRESULT(2903), + D3DXERR_TOOMANYINFLUENCES = MAKE_DDHRESULT(2904), + D3DXERR_INVALIDDATA = MAKE_DDHRESULT(2905), + D3DXERR_LOADEDMESHASNODATA = MAKE_DDHRESULT(2906), + D3DXERR_DUPLICATENAMEDFRAGMENT = MAKE_DDHRESULT(2907), + D3DXERR_CANNOTREMOVELASTITEM = MAKE_DDHRESULT(2908), +}; + #endif

1 0

Jeremy White : gdi32: Revise CreateScalableFontResourceA to pass through CreateScalableFontResourceW .
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 5e1dd9577d41cd6a397c3da1c8c4a537dc37403a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1dd9577d41cd6a397c3da1c… Author: Jeremy White <jwhite(a)winehq.org> Date: Fri Mar 7 10:11:09 2008 -0600 gdi32: Revise CreateScalableFontResourceA to pass through CreateScalableFontResourceW. --- dlls/gdi32/font.c | 64 +++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 48 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7f29936..de82e70 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2367,23 +2367,41 @@ BOOL WINAPI CreateScalableFontResourceA( DWORD fHidden, LPCSTR lpszFontFile, LPCSTR lpszCurrentPath ) { - HANDLE f; + LPWSTR lpszResourceFileW = NULL; + LPWSTR lpszFontFileW = NULL; + LPWSTR lpszCurrentPathW = NULL; + int len; + BOOL ret; - /* fHidden=1 - only visible for the calling app, read-only, not - * enumbered with EnumFonts/EnumFontFamilies - * lpszCurrentPath can be NULL - */ - FIXME("(%d,%s,%s,%s): stub\n", - fHidden, debugstr_a(lpszResourceFile), debugstr_a(lpszFontFile), - debugstr_a(lpszCurrentPath) ); + if (lpszResourceFile) + { + len = MultiByteToWideChar(CP_ACP, 0, lpszResourceFile, -1, NULL, 0); + lpszResourceFileW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpszResourceFile, -1, lpszResourceFileW, len); + } - /* If the output file already exists, return the ERROR_FILE_EXISTS error as specified in MSDN */ - if ((f = CreateFileA(lpszResourceFile, 0, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)) != INVALID_HANDLE_VALUE) { - CloseHandle(f); - SetLastError(ERROR_FILE_EXISTS); - return FALSE; + if (lpszFontFile) + { + len = MultiByteToWideChar(CP_ACP, 0, lpszFontFile, -1, NULL, 0); + lpszFontFileW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpszFontFile, -1, lpszFontFileW, len); } - return FALSE; /* create failed */ + + if (lpszCurrentPath) + { + len = MultiByteToWideChar(CP_ACP, 0, lpszCurrentPath, -1, NULL, 0); + lpszCurrentPathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpszCurrentPath, -1, lpszCurrentPathW, len); + } + + ret = CreateScalableFontResourceW(fHidden, lpszResourceFileW, + lpszFontFileW, lpszCurrentPathW); + + HeapFree(GetProcessHeap(), 0, lpszResourceFileW); + HeapFree(GetProcessHeap(), 0, lpszFontFileW); + HeapFree(GetProcessHeap(), 0, lpszCurrentPathW); + + return ret; } /*********************************************************************** @@ -2394,8 +2412,22 @@ BOOL WINAPI CreateScalableFontResourceW( DWORD fHidden, LPCWSTR lpszFontFile, LPCWSTR lpszCurrentPath ) { - FIXME("(%d,%p,%p,%p): stub\n", - fHidden, lpszResourceFile, lpszFontFile, lpszCurrentPath ); + HANDLE f; + FIXME("(%d,%s,%s,%s): stub\n", + fHidden, debugstr_w(lpszResourceFile), debugstr_w(lpszFontFile), + debugstr_w(lpszCurrentPath) ); + + /* fHidden=1 - only visible for the calling app, read-only, not + * enumbered with EnumFonts/EnumFontFamilies + * lpszCurrentPath can be NULL + */ + + /* If the output file already exists, return the ERROR_FILE_EXISTS error as specified in MSDN */ + if ((f = CreateFileW(lpszResourceFile, 0, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)) != INVALID_HANDLE_VALUE) { + CloseHandle(f); + SetLastError(ERROR_FILE_EXISTS); + return FALSE; + } return FALSE; /* create failed */ }

1 0

Nathan Beckmann : gdiplus: Tests for GdipLockBitmapBits/ GdipUnlockBitmapBits.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 738e74a14bbda4bb55f366e2290a26b5dd0c8267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=738e74a14bbda4bb55f366e22… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Fri Mar 7 01:19:02 2008 -0800 gdiplus: Tests for GdipLockBitmapBits/GdipUnlockBitmapBits. --- dlls/gdiplus/tests/image.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 895ff35..4047fee 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -171,6 +171,111 @@ static void test_encoders(void) GdipFree(codecs); } +static void test_LockBits(void) +{ + GpStatus stat; + GpBitmap *bm; + GpRect rect; + BitmapData bd; + const REAL WIDTH = 10.0, HEIGHT = 20.0; + + bm = NULL; + stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm); + expect(Ok, stat); + + rect.X = 2; + rect.Y = 3; + rect.Width = 4; + rect.Height = 5; + + /* read-only */ + stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead, PixelFormat24bppRGB, &bd); + expect(Ok, stat); + + if (stat == Ok) { + stat = GdipBitmapUnlockBits(bm, &bd); + expect(Ok, stat); + } + + /* read-only, consecutive */ + stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead, PixelFormat24bppRGB, &bd); + expect(Ok, stat); + + if (stat == Ok) { + stat = GdipBitmapUnlockBits(bm, &bd); + expect(Ok, stat); + } + + stat = GdipDisposeImage((GpImage*)bm); + expect(Ok, stat); + stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm); + expect(Ok, stat); + + /* read x2 */ + stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead, PixelFormat24bppRGB, &bd); + expect(Ok, stat); + todo_wine { + stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead, PixelFormat24bppRGB, &bd); + expect(WrongState, stat); + } + + stat = GdipBitmapUnlockBits(bm, &bd); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bm); + expect(Ok, stat); + stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm); + expect(Ok, stat); + + /* write, no modification */ + stat = GdipBitmapLockBits(bm, &rect, ImageLockModeWrite, PixelFormat24bppRGB, &bd); + expect(Ok, stat); + + if (stat == Ok) { + stat = GdipBitmapUnlockBits(bm, &bd); + expect(Ok, stat); + } + + /* write, consecutive */ + todo_wine { + stat = GdipBitmapLockBits(bm, &rect, ImageLockModeWrite, PixelFormat24bppRGB, &bd); + expect(Ok, stat); + } + + if (stat == Ok) { + stat = GdipBitmapUnlockBits(bm, &bd); + expect(Ok, stat); + } + + stat = GdipDisposeImage((GpImage*)bm); + expect(Ok, stat); + stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm); + expect(Ok, stat); + + /* write, modify */ + stat = GdipBitmapLockBits(bm, &rect, ImageLockModeWrite, PixelFormat24bppRGB, &bd); + expect(Ok, stat); + + if (stat == Ok) { + if (bd.Scan0) + ((char*)bd.Scan0)[2] = 0xff; + + stat = GdipBitmapUnlockBits(bm, &bd); + expect(Ok, stat); + } + + stat = GdipDisposeImage((GpImage*)bm); + expect(Ok, stat); + + /* dispose locked */ + stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm); + expect(Ok, stat); + stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead, PixelFormat24bppRGB, &bd); + expect(Ok, stat); + stat = GdipDisposeImage((GpImage*)bm); + expect(Ok, stat); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -187,6 +292,7 @@ START_TEST(image) test_GetImageDimension(); test_LoadingImages(); test_encoders(); + test_LockBits(); GdiplusShutdown(gdiplusToken); }

1 0

Jacek Caban : jscript: Added stub DLL.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: fa23a2c4b68ce2dd5d506075099949d3e476d78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa23a2c4b68ce2dd5d5060750… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 9 00:07:57 2008 +0100 jscript: Added stub DLL. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/jscript/Makefile.in | 14 +++++++ dlls/jscript/jscript.spec | 4 ++ dlls/jscript/jscript_main.c | 85 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 110 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6b22eb0..34b4e56 100644 --- a/Makefile.in +++ b/Makefile.in @@ -288,6 +288,7 @@ ALL_MAKEFILES = \ dlls/itircl/Makefile \ dlls/itss/Makefile \ dlls/itss/tests/Makefile \ + dlls/jscript/Makefile \ dlls/kernel32/Makefile \ dlls/kernel32/tests/Makefile \ dlls/localspl/Makefile \ @@ -705,6 +706,7 @@ dlls/iphlpapi/tests/Makefile: dlls/iphlpapi/tests/Makefile.in dlls/Maketest.rule dlls/itircl/Makefile: dlls/itircl/Makefile.in dlls/Makedll.rules dlls/itss/Makefile: dlls/itss/Makefile.in dlls/Makedll.rules dlls/itss/tests/Makefile: dlls/itss/tests/Makefile.in dlls/Maketest.rules +dlls/jscript/Makefile: dlls/jscript/Makefile.in dlls/Makedll.rules dlls/kernel32/Makefile: dlls/kernel32/Makefile.in dlls/Makedll.rules dlls/kernel32/tests/Makefile: dlls/kernel32/tests/Makefile.in dlls/Maketest.rules dlls/localspl/Makefile: dlls/localspl/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 22ab9f4..32a85c3 100755 --- a/configure +++ b/configure @@ -21438,6 +21438,8 @@ ac_config_files="$ac_config_files dlls/itss/Makefile" ac_config_files="$ac_config_files dlls/itss/tests/Makefile" +ac_config_files="$ac_config_files dlls/jscript/Makefile" + ac_config_files="$ac_config_files dlls/kernel32/Makefile" ac_config_files="$ac_config_files dlls/kernel32/tests/Makefile" @@ -22678,6 +22680,7 @@ do "dlls/itircl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/itircl/Makefile" ;; "dlls/itss/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/itss/Makefile" ;; "dlls/itss/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/itss/tests/Makefile" ;; + "dlls/jscript/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/jscript/Makefile" ;; "dlls/kernel32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/kernel32/Makefile" ;; "dlls/kernel32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/kernel32/tests/Makefile" ;; "dlls/localspl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localspl/Makefile" ;; diff --git a/configure.ac b/configure.ac index c2d628b..f239a68 100644 --- a/configure.ac +++ b/configure.ac @@ -1792,6 +1792,7 @@ AC_CONFIG_FILES([dlls/iphlpapi/tests/Makefile]) AC_CONFIG_FILES([dlls/itircl/Makefile]) AC_CONFIG_FILES([dlls/itss/Makefile]) AC_CONFIG_FILES([dlls/itss/tests/Makefile]) +AC_CONFIG_FILES([dlls/jscript/Makefile]) AC_CONFIG_FILES([dlls/kernel32/Makefile]) AC_CONFIG_FILES([dlls/kernel32/tests/Makefile]) AC_CONFIG_FILES([dlls/localspl/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 9ed67df..1fe9309 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -117,6 +117,7 @@ BASEDIRS = \ iphlpapi \ itircl \ itss \ + jscript \ kernel32 \ localspl \ localui \ diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in new file mode 100644 index 0000000..c1ce428 --- /dev/null +++ b/dlls/jscript/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = jscript.dll +IMPORTS = kernel32 +EXTRALIBS = -luuid + +C_SRCS = \ + jscript_main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/jscript/jscript.spec b/dlls/jscript/jscript.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/jscript/jscript.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c new file mode 100644 index 0000000..807a821 --- /dev/null +++ b/dlls/jscript/jscript_main.c @@ -0,0 +1,85 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * 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 "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +/****************************************************************** + * DllMain (jscript.@) + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject (jscript.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow (jscript.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME("()\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (jscript.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("()\n"); + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (jscript.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("()\n"); + return S_OK; +}

1 0

Nathan Beckmann : gdiplus: Fix memory leak in GdipLockBitmapBits.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 08d49d3e335acb5f9188af827265b955ca430d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d49d3e335acb5f9188af827… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Fri Mar 7 01:19:03 2008 -0800 gdiplus: Fix memory leak in GdipLockBitmapBits. --- dlls/gdiplus/image.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 7009197..6b827ba 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -170,8 +170,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, bitmap->lockmode = flags; bitmap->numlocks++; - if(flags & ImageLockModeWrite) - bitmap->bitmapbits = buff; + bitmap->bitmapbits = buff; return Ok; } @@ -198,7 +197,8 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, if(!(--bitmap->numlocks)) bitmap->lockmode = 0; - GdipFree(lockeddata->Scan0); + GdipFree(bitmap->bitmapbits); + bitmap->bitmapbits = NULL; return Ok; } @@ -225,6 +225,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, } GdipFree(bitmap->bitmapbits); + bitmap->bitmapbits = NULL; return Ok; } @@ -426,6 +427,8 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) IPicture_get_CurDC(image->picture, &hdc); DeleteDC(hdc); IPicture_Release(image->picture); + if (image->type == ImageTypeBitmap) + GdipFree(((GpBitmap*)image)->bitmapbits); GdipFree(image); return Ok;

1 0

Alexandre Julliard : msvcrt/tests: The new string functions don' t have to exist.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: fea9fb4f476463e0fa7bc44944e1f37bdfd8dd77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea9fb4f476463e0fa7bc4494… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 10 11:30:45 2008 +0100 msvcrt/tests: The new string functions don't have to exist. --- dlls/msvcrt/tests/string.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4201c5e..926a9cf 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -616,10 +616,10 @@ START_TEST(string) ok(hMsvcrt != 0, "GetModuleHandleA failed\n"); SET(pmemcpy,"memcpy"); SET(pmemcmp,"memcmp"); - SET(pstrcpy_s,"strcpy_s"); - SET(pstrcat_s,"strcat_s"); - SET(p_mbsnbcpy_s,"_mbsnbcpy_s"); - SET(p_wcscpy_s,"wcscpy_s"); + pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); + pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); + p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); + p_wcscpy_s = (void *)GetProcAddress( hMsvcrt,"wcscpy_s" ); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */

1 0

Jacek Caban : urlmon: Fixed MapUrlToZone test on IE7.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: bbfae3deffcb395bc068ff5111f682c3cc09b584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfae3deffcb395bc068ff511… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 8 20:15:45 2008 +0100 urlmon: Fixed MapUrlToZone test on IE7. --- dlls/urlmon/sec_mgr.c | 2 +- dlls/urlmon/tests/misc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 0b56ba4..6ed72dc 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -66,7 +66,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone) if(FAILED(hres)) return hres; if(!*schema) - return 0x80041001; + return E_INVALIDARG; /* file protocol is a special case */ if(!strcmpW(schema, wszFile)) { diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 50a40b1..01c5eaf 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -754,7 +754,8 @@ static void test_SecurityManager(void) zone = 100; hres = IInternetSecurityManager_MapUrlToZone(secmgr, secmgr_tests[i].url, &zone, 0); - ok(hres == secmgr_tests[i].zone_hres, + ok(hres == secmgr_tests[i].zone_hres /* IE <=6 */ + || (FAILED(secmgr_tests[i].zone_hres) && hres == E_INVALIDARG), /* IE7 */ "[%d] MapUrlToZone failed: %08x, expected %08x\n", i, hres, secmgr_tests[i].zone_hres); if(SUCCEEDED(hres))

1 0

Jacek Caban : mshtml: Added IHTMLScriptElement:get_type implementation.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 134dad7ecdc2113c0e7d4f43ec7f52e6ef89f9b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134dad7ecdc2113c0e7d4f43e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 8 20:14:38 2008 +0100 mshtml: Added IHTMLScriptElement:get_type implementation. --- dlls/mshtml/htmlscript.c | 25 +++++++++++++++++++++++-- dlls/mshtml/nsiface.idl | 24 ++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 19 ++++++++++++++++++- 3 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index fa7867d..5bf4a18 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -39,6 +39,8 @@ typedef struct { HTMLElement element; const IHTMLScriptElementVtbl *lpHTMLScriptElementVtbl; + + nsIDOMHTMLScriptElement *nsscript; } HTMLScriptElement; #define HTMLSCRIPT(x) ((IHTMLScriptElement*) &(x)->lpHTMLScriptElementVtbl) @@ -203,8 +205,22 @@ static HRESULT WINAPI HTMLScriptElement_put_type(IHTMLScriptElement *iface, BSTR static HRESULT WINAPI HTMLScriptElement_get_type(IHTMLScriptElement *iface, BSTR *p) { HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + const PRUnichar *nstype; + nsAString nstype_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nstype_str, NULL); + nsres = nsIDOMHTMLScriptElement_GetType(This->nsscript, &nstype_str); + if(NS_FAILED(nsres)) + ERR("GetType failed: %08x\n", nsres); + + nsAString_GetData(&nstype_str, &nstype); + *p = *nstype ? SysAllocString(nstype) : NULL; + nsAString_Finish(&nstype_str); + + return S_OK; } static const IHTMLScriptElementVtbl HTMLScriptElementVtbl = { @@ -277,11 +293,16 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLElement *HTMLScriptElement_Create(nsIDOMHTMLElement *nselem) { HTMLScriptElement *ret = heap_alloc(sizeof(HTMLScriptElement)); + nsresult nsres; HTMLElement_Init(&ret->element); ret->lpHTMLScriptElementVtbl = &HTMLScriptElementVtbl; ret->element.node.vtbl = &HTMLScriptElementImplVtbl; + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLScriptElement, (void**)&ret->nsscript); + if(NS_FAILED(nsres)) + ERR("Could not get nsIDOMHTMLScriptElement: %08x\n", nsres); + return &ret->element; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 2f60cda..03115d9 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1273,6 +1273,30 @@ interface nsIDOMHTMLTextAreaElement : nsIDOMHTMLElement [ object, + uuid(a6cf90b1-15b3-11d2-932e-00805f8add32), + local + /* FROZEN */ +] +interface nsIDOMHTMLScriptElement : nsIDOMHTMLElement +{ + nsresult GetText(nsAString *aText); + nsresult SetText(const nsAString *aText); + nsresult GetHtmlFor(nsAString *aHtmlFor); + nsresult SetHtmlFor(const nsAString *aHtmlFor); + nsresult GetEvent(nsAString *aEvent); + nsresult SetEvent(const nsAString *aEvent); + nsresult GetCharset(nsAString *aCharset); + nsresult SetCharset(const nsAString *aCharset); + nsresult GetDefer(PRBool *aDefer); + nsresult SetDefer(PRBool aDefer); + nsresult GetSrc(nsAString *aSrc); + nsresult SetSrc(const nsAString *aSrc); + nsresult GetType(nsAString *aType); + nsresult SetType(const nsAString *aType); +} + +[ + object, uuid(94928ab3-8b63-11d3-989d-001083010e9b), local /* FROZEN */ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 60ddb6f..68a2130 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -43,7 +43,7 @@ static const char elem_test_str[] = "<select id=\"s\"><option id=\"x\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" "<table><tbody></tbody></table>" - "<script type=\"text/javascript\"></script>" + "<script id=\"sc\" type=\"text/javascript\"></script>" "</body></html>"; static const char indent_test_str[] = "<html><head><title>test</title></head><body>abc<br /><a href=\"about:blank\">123</a></body></html>"; @@ -54,6 +54,8 @@ static WCHAR characterW[] = {'c','h','a','r','a','c','t','e','r',0}; static WCHAR texteditW[] = {'t','e','x','t','e','d','i','t',0}; static WCHAR wordW[] = {'w','o','r','d',0}; +static const WCHAR text_javascriptW[] = {'t','e','x','t','/','j','a','v','a','s','c','r','i','p','t',0}; + typedef enum { ET_NONE, ET_HTML, @@ -1193,6 +1195,7 @@ static void test_elems(IHTMLDocument2 *doc) static const WCHAR xW[] = {'x',0}; static const WCHAR sW[] = {'s',0}; + static const WCHAR scW[] = {'s','c',0}; static const WCHAR xxxW[] = {'x','x','x',0}; static const elem_type_t all_types[] = { @@ -1250,6 +1253,20 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_elem_by_id(doc, scW, TRUE); + if(elem) { + IHTMLScriptElement *script; + BSTR type; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLScriptElement, (void**)&script); + ok(hres == S_OK, "Could not get IHTMLScriptElement interface: %08x\n", hres); + + hres = IHTMLScriptElement_get_type(script, &type); + ok(hres == S_OK, "get_type failed: %08x\n", hres); + ok(!lstrcmpW(type, text_javascriptW), "Unexpected type %s\n", dbgstr_w(type)); + SysFreeString(type); + } + test_stylesheets(doc); test_create_option_elem(doc); }

1 0

Jacek Caban : mshtml: Use load group to find NSContainer in AsyncOpen if URI has no associated container .
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 75fe97dc0b1447f4e731a6a1a2c15f129c339a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fe97dc0b1447f4e731a6a1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 8 20:15:30 2008 +0100 mshtml: Use load group to find NSContainer in AsyncOpen if URI has no associated container. --- dlls/mshtml/nsio.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index f684f2a..d55546d 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -634,6 +634,48 @@ static HRESULT create_mon_for_nschannel(nsChannel *channel, IMoniker **mon) return hres; } +static NSContainer *get_nscontainer_from_load_group(nsChannel *This) +{ + NSContainer *container; + nsIChannel *channel; + nsIRequest *req; + nsIWineURI *wine_uri; + nsIURI *uri; + nsresult nsres; + + nsres = nsILoadGroup_GetDefaultLoadRequest(This->load_group, &req); + if(NS_FAILED(nsres)) { + ERR("GetDefaultLoadRequest failed: %08x\n", nsres); + return NULL; + } + + nsres = nsIRequest_QueryInterface(req, &IID_nsIChannel, (void**)&channel); + nsIRequest_Release(req); + if(NS_FAILED(nsres)) { + WARN("Could not get nsIChannel interface: %08x\n", nsres); + return NULL; + } + + nsres = nsIChannel_GetURI(channel, &uri); + nsIChannel_Release(channel); + if(NS_FAILED(nsres)) { + ERR("GetURI failed: %08x\n", nsres); + return NULL; + } + + nsres = nsIURI_QueryInterface(uri, &IID_nsIWineURI, (void**)&wine_uri); + nsIURI_Release(uri); + if(NS_FAILED(nsres)) { + TRACE("Could not get nsIWineURI: %08x\n", nsres); + return NULL; + } + + nsIWineURI_GetNSContainer(wine_uri, &container); + nsIWineURI_Release(wine_uri); + + return container; +} + static nsresult async_open_doc_uri(nsChannel *This, NSContainer *container, nsIStreamListener *listener, nsISupports *context, BOOL *open) { @@ -774,6 +816,13 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen TRACE("(%p)->(%p %p)\n", This, aListener, aContext); nsIWineURI_GetNSContainer(This->uri, &container); + + if(!container && This->load_group) { + container = get_nscontainer_from_load_group(This); + if(container) + nsIWineURI_SetNSContainer(This->uri, container); + } + if(!container) { TRACE("container = NULL\n"); return This->channel @@ -2043,7 +2092,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * } nsACString_Init(&spec_str, spec); - nsres = nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, &uri); + nsres = nsIIOService_NewURI(nsio, &spec_str, aOriginCharset, aBaseURI, &uri); nsACString_Finish(&spec_str); if(NS_FAILED(nsres)) TRACE("NewURI failed: %08x\n", nsres); @@ -2058,6 +2107,8 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * } } + TRACE("nscontainer = %p\n", nscontainer); + nsres = create_uri(uri, nscontainer, &wine_uri); *_retval = (nsIURI*)wine_uri;

1 0

Andrew Talbot : ntdll: Assign to structs instead of using memcpy.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 5ecd33e2f9910090a3ecebcb354e62f246e60de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ecd33e2f9910090a3ecebcb3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 8 15:37:05 2008 +0000 ntdll: Assign to structs instead of using memcpy. --- dlls/ntdll/reg.c | 2 +- dlls/ntdll/sec.c | 4 ++-- dlls/ntdll/time.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 9c9509d..9d9de0e 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -96,7 +96,7 @@ NTSTATUS WINAPI RtlpNtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJEC if (attr) { - memcpy( &oa, attr, sizeof oa ); + oa = *attr; oa.Attributes &= ~(OBJ_PERMANENT|OBJ_EXCLUSIVE); attr = &oa; } diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index ea24414..79a356b 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -158,7 +158,7 @@ NTSTATUS WINAPI RtlAllocateAndInitializeSid ( tmp_sid->Revision = SID_REVISION; if (pIdentifierAuthority) - memcpy(&tmp_sid->IdentifierAuthority, pIdentifierAuthority, sizeof(SID_IDENTIFIER_AUTHORITY)); + tmp_sid->IdentifierAuthority = *pIdentifierAuthority; tmp_sid->SubAuthorityCount = nSubAuthorityCount; switch( nSubAuthorityCount ) @@ -302,7 +302,7 @@ BOOL WINAPI RtlInitializeSid( pisid->Revision = SID_REVISION; pisid->SubAuthorityCount = nSubAuthorityCount; if (pIdentifierAuthority) - memcpy(&pisid->IdentifierAuthority, pIdentifierAuthority, sizeof (SID_IDENTIFIER_AUTHORITY)); + pisid->IdentifierAuthority = *pIdentifierAuthority; for (i = 0; i < nSubAuthorityCount; i++) *RtlSubAuthoritySid(pSid, i) = 0; diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index cd23958..e6e4ed2 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -684,7 +684,7 @@ static void find_reg_tz_info(RTL_TIME_ZONE_INFORMATION *tzi) if (match_tz_info(tzi, &reg_tzi)) { - memcpy(tzi, &reg_tzi, sizeof(*tzi)); + *tzi = reg_tzi; NtClose(hkey); return; }

1 0