February 2009 - Wine-commits

Francois Gouget : shell32: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 6aa216fb57b5059db4ebd07d4471c8910997d3c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa216fb57b5059db4ebd07d4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 25 15:49:02 2009 +0100 shell32: Remove WINAPI on static functions where not needed. --- dlls/shell32/shellitem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index d65513d..b995534 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -164,7 +164,7 @@ static const IShellItemVtbl ShellItem_Vtbl = { }; -static HRESULT WINAPI ShellItem_GetClassID(ShellItem* This, CLSID *pClassID) +static HRESULT ShellItem_GetClassID(ShellItem* This, CLSID *pClassID) { TRACE("(%p,%p)\n", This, pClassID);

1 0

Alexandre Julliard : programs: Get rid of the remaining binary wrappers, they break out-of-tree builds.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 65c6ca594757dedbd15fa78649d5b6e05780c689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c6ca594757dedbd15fa7864… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 25 16:05:55 2009 +0100 programs: Get rid of the remaining binary wrappers, they break out-of-tree builds. --- .gitignore | 11 ----------- configure | 12 ------------ configure.ac | 10 ---------- programs/Makefile.in | 9 +-------- tools/make_makefiles | 4 ---- 5 files changed, 1 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index cf63122..f853aba 100644 --- a/.gitignore +++ b/.gitignore @@ -226,10 +226,6 @@ loader/wine.de.man loader/wine.fr.man loader/wine.man programs/Makeprog.rules -programs/msiexec/msiexec -programs/notepad/notepad -programs/regedit/regedit -programs/regsvr32/regsvr32 programs/rpcss/epm.h programs/rpcss/epm_s.c programs/rpcss/irot.h @@ -237,17 +233,10 @@ programs/rpcss/irot_s.c programs/services/svcctl.h programs/services/svcctl_s.c programs/wineapploader -programs/wineboot/wineboot -programs/winecfg/winecfg -programs/wineconsole/wineconsole programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c -programs/winedbg/winedbg programs/winedbg/winedbg.man -programs/winefile/winefile -programs/winemine/winemine -programs/winepath/winepath programs/winetest/*_test.exe programs/winetest/tests.rc programs/winhlp32/macro.lex.yy.c diff --git a/configure b/configure index 2b9b4e4..e5a4fcc 100755 --- a/configure +++ b/configure @@ -639,7 +639,6 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS -ALL_PROGRAM_BIN_WRAPPERS ALL_WINETEST_DEPENDS ALL_PROGRAM_BIN_INSTALL_DIRS ALL_PROGRAM_INSTALL_DIRS @@ -28000,17 +27999,6 @@ done test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" -ALL_PROGRAM_BIN_WRAPPERS="" - -for dir in $ALL_PROGRAM_BIN_INSTALL_DIRS -do - if test "$dir" != "\\" - then - ALL_PROGRAM_BIN_WRAPPERS="$ALL_PROGRAM_BIN_WRAPPERS \\ - $dir/$dir" - fi -done - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure diff --git a/configure.ac b/configure.ac index 8db0c51..67241f2 100644 --- a/configure.ac +++ b/configure.ac @@ -2336,16 +2336,6 @@ done dnl Don't install in bin dir for Windows build test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" -AC_SUBST(ALL_PROGRAM_BIN_WRAPPERS,"") -for dir in $ALL_PROGRAM_BIN_INSTALL_DIRS -do - if test "$dir" != "\\" - then - ALL_PROGRAM_BIN_WRAPPERS="$ALL_PROGRAM_BIN_WRAPPERS \\ - $dir/$dir" - fi -done - AC_OUTPUT if test "$no_create" = "yes" diff --git a/programs/Makefile.in b/programs/Makefile.in index 3bc7abd..7bd60b2 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -6,7 +6,6 @@ VPATH = @srcdir@ SUBDIRS = @ALL_PROGRAM_DIRS@ INSTALLSUBDIRS = @ALL_PROGRAM_INSTALL_DIRS@ INSTALLPROGS = @ALL_PROGRAM_BIN_INSTALL_DIRS@ -BIN_WRAPPERS = @ALL_PROGRAM_BIN_WRAPPERS@ INSTALLDIRS = $(DESTDIR)$(bindir) @@ -14,14 +13,11 @@ PROGRAMS = wineapploader @MAKE_RULES@ -all: $(PROGRAMS) $(SUBDIRS) $(BIN_WRAPPERS) +all: $(PROGRAMS) $(SUBDIRS) wineapploader: wineapploader.in sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) -$(BIN_WRAPPERS): $(WINEWRAPPER) - $(RM) $@ && $(LN) $(WINEWRAPPER) $@ - # Rules for installation .PHONY: install-apploader install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__) @@ -43,9 +39,6 @@ uninstall:: -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS) -rmdir $(DESTDIR)$(dlldir) -clean:: - $(RM) $(BIN_WRAPPERS) - # Rules for testing check test:: $(SUBDIRS:%=%/__test__) diff --git a/tools/make_makefiles b/tools/make_makefiles index 7f04e22..ff6e85a 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -541,10 +541,6 @@ sub update_gitignore(@) { push @ignores, map { s/\$$EXEEXT$//; $dir . $_; } @{$makefile{"PROGRAMS"}}; } - if ($dir =~ /^programs\/(.*)\/$/) - { - push @ignores, "$dir$1" if $bin_install{$1}; - } } # prepend a slash to paths that don't have one

1 0

Paul Vriens : shlwapi/tests: Fix a few test failures on Win95 and some W2K.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 9fd4f8738bdc3269bbee1fa227d0b110398dd9a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd4f8738bdc3269bbee1fa22… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 25 14:04:57 2009 +0100 shlwapi/tests: Fix a few test failures on Win95 and some W2K. --- dlls/shlwapi/tests/path.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 3f9c9e6..2260d88 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -392,8 +392,12 @@ static void test_PathCombineW(void) /* Some NULL */ wszString2[0] = 'a'; wszString = pPathCombineW(wszString2, NULL, NULL); - ok (wszString == NULL, "Expected a NULL return\n"); - ok (wszString2[0] == 0, "Destination string not empty\n"); + ok (wszString == NULL || + broken(wszString[0] = 'a'), /* Win95 and some W2K */ + "Expected a NULL return\n"); + ok (wszString2[0] == 0 || + broken(wszString[0] = 'a'), /* Win95 and some W2K */ + "Destination string not empty\n"); HeapFree(GetProcessHeap(), 0, wszString2); @@ -489,7 +493,9 @@ static void test_PathCombineA(void) lstrcpyA(dest, "control"); str = PathCombineA(dest, NULL, NULL); ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0, "Expected 0 length, got %i\n", lstrlenA(dest)); + ok(lstrlenA(dest) == 0 || + broken(!lstrcmp(dest, "control")), /* Win95 and some W2K */ + "Expected 0 length, got %i\n", lstrlenA(dest)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try directory without backslash */ @@ -577,7 +583,9 @@ static void test_PathCombineA(void) lstrcpyA(dest, "control"); str = PathCombineA(dest, "C:\\", too_long); ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0, "Expected 0 length, got %i\n", lstrlenA(dest)); + ok(lstrlenA(dest) == 0 || + broken(!lstrcmp(dest, "control")), /* Win95 and some W2K */ + "Expected 0 length, got %i\n", lstrlenA(dest)); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try a directory longer than MAX_PATH */ @@ -585,7 +593,9 @@ static void test_PathCombineA(void) lstrcpyA(dest, "control"); str = PathCombineA(dest, too_long, "one\\two\\three"); ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0, "Expected 0 length, got %i\n", lstrlenA(dest)); + ok(lstrlenA(dest) == 0 || + broken(!lstrcmp(dest, "control")), /* Win95 and some W2K */ + "Expected 0 length, got %i\n", lstrlenA(dest)); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); memset(one, 'b', HALF_LEN); @@ -598,7 +608,9 @@ static void test_PathCombineA(void) lstrcpyA(dest, "control"); str = PathCombineA(dest, one, two); ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0, "Expected 0 length, got %i\n", lstrlenA(dest)); + ok(lstrlenA(dest) == 0 || + broken(!lstrcmp(dest, "control")), /* Win95 and some W2K */ + "Expected 0 length, got %i\n", lstrlenA(dest)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); }

1 0

Paul Vriens : fusion/tests: Directories with no dll or exe are not enumerated.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 0e4b0b9f217ea59942d72a9a378294364a33ab90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e4b0b9f217ea59942d72a9a3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 25 15:04:30 2009 +0100 fusion/tests: Directories with no dll or exe are not enumerated. --- dlls/fusion/tests/asmenum.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index 54c1340..8883d0b 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -240,11 +240,19 @@ static BOOL enum_gac_assemblies(struct list *assemblies, int depth, LPSTR path) if (depth == 0) { - sprintf(parent, "%s, ", ffd.cFileName); + lstrcpyA(parent, ffd.cFileName); } else if (depth == 1) { char culture[MAX_PATH]; + char dll[MAX_PATH], exe[MAX_PATH]; + + /* Directories with no dll or exe will not be enumerated */ + sprintf(dll, "%s\\%s\\%s.dll", path, ffd.cFileName, parent); + sprintf(exe, "%s\\%s\\%s.exe", path, ffd.cFileName, parent); + if (GetFileAttributesA(dll) == INVALID_FILE_ATTRIBUTES && + GetFileAttributesA(exe) == INVALID_FILE_ATTRIBUTES) + continue; ptr = strstr(ffd.cFileName, "_"); *ptr = '\0'; @@ -260,7 +268,7 @@ static BOOL enum_gac_assemblies(struct list *assemblies, int depth, LPSTR path) ptr = strchr(ptr, '_'); ptr++; - sprintf(buf, "Version=%s, Culture=%s, PublicKeyToken=%s", + sprintf(buf, ", Version=%s, Culture=%s, PublicKeyToken=%s", ffd.cFileName, culture, ptr); lstrcpyA(disp, parent); lstrcatA(disp, buf);

1 0

Alexandre Julliard : ntdll: Default to WinXP version if there' s nothing in the registry.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 57d9a868107cc3be864e2e778d5454005f36d482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d9a868107cc3be864e2e778… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 25 15:30:37 2009 +0100 ntdll: Default to WinXP version if there's nothing in the registry. --- dlls/ntdll/version.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 09b338f..bf9db4d 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -449,7 +449,7 @@ void version_init( const WCHAR *appname ) HANDLE root, hkey, config_key; BOOL got_win_ver = FALSE; - current_version = &VersionData[NT2K]; /* default if nothing else is specified */ + current_version = &VersionData[WINXP]; /* default if nothing else is specified */ RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr);

1 0

Alexandre Julliard : msi/tests: Add some tests for MsiEnumPatchesW, fix a few failures on XP.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: b5ac29a73d16085b79641ca294ee4cbdf897dd3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ac29a73d16085b79641ca29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 25 15:04:45 2009 +0100 msi/tests: Add some tests for MsiEnumPatchesW, fix a few failures on XP. --- dlls/msi/tests/msi.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index fec9d89..f3d2e4b 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -9090,6 +9090,7 @@ static void test_MsiEnumPatches(void) CHAR patchcode[MAX_PATH], patch_squashed[MAX_PATH]; CHAR prodcode[MAX_PATH], prod_squashed[MAX_PATH]; CHAR transforms[MAX_PATH]; + WCHAR patchW[MAX_PATH], prodcodeW[MAX_PATH], transformsW[MAX_PATH]; HKEY prodkey, patches, udprod; HKEY userkey, hpatch, udpatch; DWORD size, data; @@ -9298,7 +9299,7 @@ static void test_MsiEnumPatches(void) "Expected \"%s\", got \"%s\"\n", patchcode, patch); ok(!lstrcmpA(transforms, "whatever"), "Expected \"whatever\", got \"%s\"\n", transforms); - ok(size == 8, "Expected 8, got %d\n", size); + ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size); /* lpPatchBuf is NULL */ size = MAX_PATH; @@ -9341,7 +9342,7 @@ static void test_MsiEnumPatches(void) "Expected \"%s\", got \"%s\"\n", patchcode, patch); ok(!lstrcmpA(transforms, "whate"), "Expected \"whate\", got \"%s\"\n", transforms); - ok(size == 16, "Expected 16, got %d\n", size); + ok(size == 8 || size == 16, "Expected 8 or 16, got %d\n", size); /* increase the index */ size = MAX_PATH; @@ -9507,7 +9508,7 @@ static void test_MsiEnumPatches(void) "Expected \"%s\", got \"%s\"\n", patchcode, patch); ok(!lstrcmpA(transforms, "whatever"), "Expected \"whatever\", got \"%s\"\n", transforms); - ok(size == 8, "Expected 8, got %d\n", size); + ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size); RegDeleteKeyA(userkey, ""); RegCloseKey(userkey); @@ -9632,7 +9633,7 @@ static void test_MsiEnumPatches(void) "Expected \"%s\", got \"%s\"\n", patchcode, patch); ok(!lstrcmpA(transforms, "whatever"), "Expected \"whatever\", got \"%s\"\n", transforms); - ok(size == 8, "Expected 8, got %d\n", size); + ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size); lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\"); lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\"); @@ -9651,7 +9652,7 @@ static void test_MsiEnumPatches(void) "Expected \"%s\", got \"%s\"\n", patchcode, patch); ok(!lstrcmpA(transforms, "whatever"), "Expected \"whatever\", got \"%s\"\n", transforms); - ok(size == 8, "Expected 8, got %d\n", size); + ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size); res = RegCreateKeyA(udprod, "Patches", &udpatch); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -9666,7 +9667,7 @@ static void test_MsiEnumPatches(void) "Expected \"%s\", got \"%s\"\n", patchcode, patch); ok(!lstrcmpA(transforms, "whatever"), "Expected \"whatever\", got \"%s\"\n", transforms); - ok(size == 8, "Expected 8, got %d\n", size); + ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size); res = RegCreateKeyA(udpatch, patch_squashed, &hpatch); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -9698,8 +9699,39 @@ static void test_MsiEnumPatches(void) "Expected \"%s\", got \"%s\"\n", patchcode, patch); ok(!lstrcmpA(transforms, "whatever"), "Expected \"whatever\", got \"%s\"\n", transforms); + ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size); + + /* now duplicate some of the tests for the W version */ + + /* pcchTransformsBuf is too small */ + size = 6; + MultiByteToWideChar( CP_ACP, 0, prodcode, -1, prodcodeW, MAX_PATH ); + MultiByteToWideChar( CP_ACP, 0, "apple", -1, patchW, MAX_PATH ); + MultiByteToWideChar( CP_ACP, 0, "banana", -1, transformsW, MAX_PATH ); + r = MsiEnumPatchesW(prodcodeW, 0, patchW, transformsW, &size); + ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); + WideCharToMultiByte( CP_ACP, 0, patchW, -1, patch, MAX_PATH, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, transformsW, -1, transforms, MAX_PATH, NULL, NULL ); + ok(!lstrcmpA(patch, patchcode), + "Expected \"%s\", got \"%s\"\n", patchcode, patch); + ok(!lstrcmpA(transforms, "whate"), + "Expected \"whate\", got \"%s\"\n", transforms); ok(size == 8, "Expected 8, got %d\n", size); + /* patch code value exists */ + size = MAX_PATH; + MultiByteToWideChar( CP_ACP, 0, "apple", -1, patchW, MAX_PATH ); + MultiByteToWideChar( CP_ACP, 0, "banana", -1, transformsW, MAX_PATH ); + r = MsiEnumPatchesW(prodcodeW, 0, patchW, transformsW, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + WideCharToMultiByte( CP_ACP, 0, patchW, -1, patch, MAX_PATH, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, transformsW, -1, transforms, MAX_PATH, NULL, NULL ); + ok(!lstrcmpA(patch, patchcode), + "Expected \"%s\", got \"%s\"\n", patchcode, patch); + ok(!lstrcmpA(transforms, "whatever"), + "Expected \"whatever\", got \"%s\"\n", transforms); + ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size); + RegDeleteValueA(patches, patch_squashed); RegDeleteValueA(patches, "Patches"); RegDeleteKeyA(patches, "");

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_marginLeft .
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: e3009fec39f88b32a51db12f1135df063fb6f3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3009fec39f88b32a51db12f1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 23 20:53:32 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_marginLeft. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 6d08dfb..c7cdf16 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -456,8 +456,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_marginBottom(IHTMLCurrentStyle *iface static HRESULT WINAPI HTMLCurrentStyle_get_marginLeft(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_LEFT, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_clear(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b488999..d39fdec 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2492,6 +2492,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_marginLeft(current_style, &v); + ok(hres == S_OK, "get_marginLeft failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put backgroundRepeat.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 63c8939cdd2f6814cf8382e2f32e0c52ef551c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c8939cdd2f6814cf8382e2f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 25 15:50:33 2009 +1100 mshtml: Implement IHTMLStyle get/put backgroundRepeat. --- dlls/mshtml/htmlstyle.c | 26 ++++++++++++++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 769e14e..ce5dba2 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -41,6 +41,8 @@ static const WCHAR attrBackgroundColor[] = {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0}; static const WCHAR attrBackgroundImage[] = {'b','a','c','k','g','r','o','u','n','d','-','i','m','a','g','e',0}; +static const WCHAR attrBackgroundRepeat[] = + {'b','a','c','k','g','r','o','u','n','d','-','r','e','p','e','a','t',0}; static const WCHAR attrBorder[] = {'b','o','r','d','e','r',0}; static const WCHAR attrBorderBottomStyle[] = @@ -113,6 +115,7 @@ static const struct{ {attrBackground, DISPID_IHTMLSTYLE_BACKGROUND}, {attrBackgroundColor, DISPID_IHTMLSTYLE_BACKGROUNDCOLOR}, {attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE}, + {attrBackgroundRepeat, DISPID_IHTMLSTYLE_BACKGROUNDREPEAT}, {attrBorder, DISPID_IHTMLSTYLE_BORDER}, {attrBorderBottomStyle, DISPID_IHTMLSTYLE_BORDERBOTTOMSTYLE}, {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, @@ -803,15 +806,30 @@ static HRESULT WINAPI HTMLStyle_get_backgroundImage(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_backgroundRepeat(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + static const WCHAR styleRepeat[] = {'r','e','p','e','a','t',0}; + static const WCHAR styleNoRepeat[] = {'n','o','-','r','e','p','e','a','t',0}; + static const WCHAR styleRepeatX[] = {'r','e','p','e','a','t','-','x',0}; + static const WCHAR styleRepeatY[] = {'r','e','p','e','a','t','-','y',0}; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + /* fontWeight can only be one of the following */ + if(!v || strcmpiW(styleRepeat, v) == 0 || strcmpiW(styleNoRepeat, v) == 0 || + strcmpiW(styleRepeatX, v) == 0 || strcmpiW(styleRepeatY, v) == 0 ) + { + return set_style_attr(This, STYLEID_BACKGROUND_REPEAT , v, 0); + } + + return E_INVALIDARG; } static HRESULT WINAPI HTMLStyle_get_backgroundRepeat(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_BACKGROUND_REPEAT, p); } static HRESULT WINAPI HTMLStyle_put_backgroundAttachment(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 8db28df..73c7c7d 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -38,6 +38,7 @@ typedef enum { STYLEID_BACKGROUND, STYLEID_BACKGROUND_COLOR, STYLEID_BACKGROUND_IMAGE, + STYLEID_BACKGROUND_REPEAT, STYLEID_BORDER, STYLEID_BORDER_BOTTOM_STYLE, STYLEID_BORDER_LEFT, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d39fdec..607816a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3184,6 +3184,44 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_paddingLeft(style, vDefault); ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + /* BackgroundRepeat */ + hres = IHTMLStyle_get_backgroundRepeat(style, &sDefault); + ok(hres == S_OK, "get_backgroundRepeat failed: %08x\n", hres); + + str = a2bstr("invalid"); + hres = IHTMLStyle_put_backgroundRepeat(style, str); + ok(hres == E_INVALIDARG, "put_backgroundRepeat failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("repeat"); + hres = IHTMLStyle_put_backgroundRepeat(style, str); + ok(hres == S_OK, "put_backgroundRepeat failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("no-repeat"); + hres = IHTMLStyle_put_backgroundRepeat(style, str); + ok(hres == S_OK, "put_backgroundRepeat failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("repeat-x"); + hres = IHTMLStyle_put_backgroundRepeat(style, str); + ok(hres == S_OK, "put_backgroundRepeat failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("repeat-y"); + hres = IHTMLStyle_put_backgroundRepeat(style, str); + ok(hres == S_OK, "put_backgroundRepeat failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_backgroundRepeat(style, &str); + ok(hres == S_OK, "get_backgroundRepeat failed: %08x\n", hres); + ok(!strcmp_wa(str, "repeat-y"), "str=%s\n", dbgstr_w(str)); + SysFreeString(str); + + hres = IHTMLStyle_put_backgroundRepeat(style, sDefault); + ok(hres == S_OK, "put_backgroundRepeat failed: %08x\n", hres); + SysFreeString(str); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_backgroundRepeat.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 0e8e77cdbdafb17be9e02f436be3d347be385c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8e77cdbdafb17be9e02f436… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 25 15:57:40 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_backgroundRepeat. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index c7cdf16..9bb139d 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -216,8 +216,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_backgroundPositionY(IHTMLCurrentStyle static HRESULT WINAPI HTMLCurrentStyle_get_backgroundRepeat(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_BACKGROUND_REPEAT, p); } static HRESULT WINAPI HTMLCurrentStyle_get_borderLeftColor(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 607816a..01fb539 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2440,6 +2440,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(!strcmp_wa(str, "default"), "get_cursor returned %s\n", dbgstr_w(str)); SysFreeString(str); + hres = IHTMLCurrentStyle_get_backgroundRepeat(current_style, &str); + ok(hres == S_OK, "get_backgroundRepeat failed: %08x\n", hres); + ok(!strcmp_wa(str, "repeat"), "get_borderLeftStyle returned %s\n", dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLCurrentStyle_get_fontWeight(current_style, &v); ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v));

1 0

Alexandre Julliard : msi: Fix handling of buffer sizes in MsiEnumPatchesA and avoid a redundant call to MsiEnumPatchesW .
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: b4d81f851740cdb782e6a48ff2f74280a6a97fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d81f851740cdb782e6a48ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 25 15:04:31 2009 +0100 msi: Fix handling of buffer sizes in MsiEnumPatchesA and avoid a redundant call to MsiEnumPatchesW. --- dlls/msi/registry.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 7f9dcb2..73a36eb 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1983,7 +1983,7 @@ UINT WINAPI MsiEnumPatchesExW(LPCWSTR szProductCode, LPCWSTR szUserSid, UINT WINAPI MsiEnumPatchesA(LPCSTR szProduct, DWORD iPatchIndex, LPSTR lpPatchBuf, LPSTR lpTransformsBuf, LPDWORD pcchTransformsBuf) { - LPWSTR product, transforms = NULL; + LPWSTR product, transforms; WCHAR patch[GUID_SIZE]; DWORD len; UINT r; @@ -1998,12 +1998,8 @@ UINT WINAPI MsiEnumPatchesA(LPCSTR szProduct, DWORD iPatchIndex, if (!product) return ERROR_OUTOFMEMORY; - len = 0; - r = MsiEnumPatchesW(product, iPatchIndex, patch, patch, &len); - if (r != ERROR_MORE_DATA) - goto done; - - transforms = msi_alloc(len); + len = *pcchTransformsBuf; + transforms = msi_alloc( len * sizeof(WCHAR) ); if (!transforms) { r = ERROR_OUTOFMEMORY; @@ -2011,24 +2007,23 @@ UINT WINAPI MsiEnumPatchesA(LPCSTR szProduct, DWORD iPatchIndex, } r = MsiEnumPatchesW(product, iPatchIndex, patch, transforms, &len); - if (r != ERROR_SUCCESS) + if (r != ERROR_SUCCESS && r != ERROR_MORE_DATA) goto done; WideCharToMultiByte(CP_ACP, 0, patch, -1, lpPatchBuf, GUID_SIZE, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, transforms, -1, lpTransformsBuf, - *pcchTransformsBuf - 1, NULL, NULL); + if (!WideCharToMultiByte(CP_ACP, 0, transforms, -1, lpTransformsBuf, + *pcchTransformsBuf, NULL, NULL)) + r = ERROR_MORE_DATA; - len = lstrlenW(transforms); - if (*pcchTransformsBuf < len + 1) + if (r == ERROR_MORE_DATA) { - r = ERROR_MORE_DATA; lpTransformsBuf[*pcchTransformsBuf - 1] = '\0'; - *pcchTransformsBuf = len * sizeof(WCHAR); + *pcchTransformsBuf = len * 2; } else - *pcchTransformsBuf = len; + *pcchTransformsBuf = strlen( lpTransformsBuf ); done: msi_free(transforms); @@ -2078,7 +2073,7 @@ UINT WINAPI MsiEnumPatchesW(LPCWSTR szProduct, DWORD iPatchIndex, if (*pcchTransformsBuf <= lstrlenW(transforms)) { r = ERROR_MORE_DATA; - *pcchTransformsBuf = lstrlenW(transforms) * sizeof(WCHAR); + *pcchTransformsBuf = lstrlenW(transforms); } else *pcchTransformsBuf = lstrlenW(transforms);

1 0