wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Piotr Caban : mshtml: Fix DOCUMENT_NODE handling in nsnode_to_nsstring_rec.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 0bbc95e4f6f5776a6dfccc80878406cffc78de0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bbc95e4f6f5776a6dfccc808… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 4 14:05:23 2011 +0200 mshtml: Fix DOCUMENT_NODE handling in nsnode_to_nsstring_rec. --- dlls/mshtml/nsembed.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 33d34b9..2bebf8b 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -794,10 +794,12 @@ static HRESULT nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNo return E_FAIL; } - nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIContent, (void**)&nscontent); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDontent interface: %08x\n", nsres); - return E_FAIL; + if(type != DOCUMENT_NODE) { + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIContent, (void**)&nscontent); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIContent interface: %08x\n", nsres); + return E_FAIL; + } } switch(type) { @@ -849,7 +851,8 @@ static HRESULT nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNo if(type == ELEMENT_NODE) nsIContentSerializer_AppendElementEnd(serializer, nscontent, str); - nsIContent_Release(nscontent); + if(type != DOCUMENT_NODE) + nsIContent_Release(nscontent); return S_OK; }

1 0

Mariusz Pluciński : shell32: Check if known folder' s relative path was passed to function.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: f3bd5210b821826b4787f777c8d7636c9c61ad0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3bd5210b821826b4787f777c… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Aug 4 16:26:33 2011 +0200 shell32: Check if known folder's relative path was passed to function. All non-virtual known folders must have set relative path field. --- dlls/shell32/shellpath.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8336479..9898bc2 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3846,9 +3846,18 @@ static HRESULT WINAPI foldermanager_RegisterFolder( } if(SUCCEEDED(hr) && pKFD->category != KF_CATEGORY_VIRTUAL) - hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) )); + { + if(!pKFD->pszRelativePath) + hr = E_INVALIDARG; + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) )); + } RegCloseKey(hKey); + + if(FAILED(hr)) + SHDeleteKeyW(HKEY_LOCAL_MACHINE, registryPath); } HeapFree(GetProcessHeap(), 0, registryPath);

1 0

Mariusz Pluciński : shell32/tests: Add verification of FOLDERID_ProgramFilesX64 and FOLDERID_ProgramFilesCommonX64 .
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: faa9d41e7f2cd6e6d793badeb110373bd2a7daf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa9d41e7f2cd6e6d793badeb… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Aug 4 16:25:47 2011 +0200 shell32/tests: Add verification of FOLDERID_ProgramFilesX64 and FOLDERID_ProgramFilesCommonX64. These two known folders exists on 64-bit Windows versions. --- dlls/shell32/tests/shellpath.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 92a4b6d..0db72df 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1390,6 +1390,15 @@ static const struct knownFolderDef known_folders[] = { NULL, 0, 0), + KNOWN_FOLDER(FOLDERID_ProgramFilesCommonX64, + NO_CSIDL, + "ProgramFilesCommonX64", + KF_CATEGORY_FIXED, + GUID_NULL, + NULL, + NULL, + 0, + 0), KNOWN_FOLDER(FOLDERID_ProgramFilesCommonX86, NO_CSIDL, "ProgramFilesCommonX86", @@ -1399,6 +1408,15 @@ static const struct knownFolderDef known_folders[] = { NULL, 0, 0), + KNOWN_FOLDER(FOLDERID_ProgramFilesX64, + NO_CSIDL, + "ProgramFilesX64", + KF_CATEGORY_FIXED, + GUID_NULL, + NULL, + NULL, + 0, + 0), KNOWN_FOLDER(FOLDERID_ProgramFilesX86, CSIDL_PROGRAM_FILESX86, "ProgramFilesX86",

1 0

Mariusz Pluciński : shell32/tests: Add verification of known folders definition attributes.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 20cd9f631bdfff8e10b3098a09799daf016bb452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20cd9f631bdfff8e10b3098a0… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Aug 4 16:25:25 2011 +0200 shell32/tests: Add verification of known folders definition attributes. --- dlls/shell32/tests/shellpath.c | 220 ++++++++++++++++++++++++++++++---------- 1 files changed, 164 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20cd9f631bdfff8e10b30…

1 0

Mariusz Pluciński : shell32/tests: Add verification of known folders attributes.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 183bc5006da1ae7d15d31d0555d3f3cb8c9ffd0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=183bc5006da1ae7d15d31d055… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Aug 4 16:25:17 2011 +0200 shell32/tests: Add verification of known folders attributes. --- dlls/shell32/tests/shellpath.c | 319 +++++++++++++++++++++++++++------------- 1 files changed, 213 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=183bc5006da1ae7d15d31…

1 0

Frédéric Delanoy : cmd/tests: Add FOR /A tests.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 28fe027eee5d093aa3fd99839161a907cdd568d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28fe027eee5d093aa3fd99839… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 16:01:48 2011 +0200 cmd/tests: Add FOR /A tests. --- programs/cmd/tests/test_builtins.cmd | 79 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 70 ++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index a27c833..a83e568 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -385,6 +385,85 @@ rem for /L %%i in (1,1,1) do echo %%i rem for /L %%i in (1,-2,-1) do echo %%i rem for /L %%i in (-1,-1,-1) do echo %%i rem for /L %%i in (1,2, 3) do echo %%i +echo ...for /a +rem No output when using "set expr" syntax, unless in interactive mode +rem Need to use "set envvar=expr" to use in a batch script +echo ......individual operations +set var=0 +set /a var=1 +2 & echo %var% +set /a var=1 +-2 & echo %var% +set /a var=1 --2 & echo %var% +set /a var=2* 3 & echo %var% +set /a var=-2* -5 & echo %var% +set /a var=12/3 & echo %var% +set /a var=13/3 & echo %var% +set /a var=-13/3 & echo %var% +rem FIXME Divide by zero should return an error, but error messages cannot be tested with current infrastructure +set /a var=5 %% 5 & echo %var% +set /a var=5 %% 3 & echo %var% +set /a var=5 %% -3 & echo %var% +set /a var=-5 %% -3 & echo %var% +set /a var=1 ^<^< 0 & echo %var% +set /a var=1 ^<^< 2 & echo %var% +set /a var=1 ^<^< -2 & echo %var% +set /a var=-1 ^<^< -2 & echo %var% +set /a var=-1 ^<^< 2 & echo %var% +set /a var=9 ^>^> 0 & echo %var% +set /a var=9 ^>^> 2 & echo %var% +set /a var=9 ^>^> -2 & echo %var% +set /a var=-9 ^>^> -2 & echo %var% +set /a var=-9 ^>^> 2 & echo %var% +set /a var=5 ^& 0 & echo %var% +set /a var=5 ^& 1 & echo %var% +set /a var=5 ^& 3 & echo %var% +set /a var=5 ^& 4 & echo %var% +set /a var=5 ^& 1 & echo %var% +set /a var=5 ^| 0 & echo %var% +set /a var=5 ^| 1 & echo %var% +set /a var=5 ^| 3 & echo %var% +set /a var=5 ^| 4 & echo %var% +set /a var=5 ^| 1 & echo %var% +set /a var=5 ^^ 0 & echo %var% +set /a var=5 ^^ 1 & echo %var% +set /a var=5 ^^ 3 & echo %var% +set /a var=5 ^^ 4 & echo %var% +set /a var=5 ^^ 1 & echo %var% +echo ......precedence and grouping +set /a var=4 + 2*3 & echo %var% +set /a var=(4+2)*3 & echo %var% +set /a var=4 * 3/5 & echo %var% +set /a var=(4 * 3)/5 & echo %var% +set /a var=4 * 5 %% 4 & echo %var% +set /a var=4 * (5 %% 4) & echo %var% +set /a var=3 %% (5 + 8 %% 3 ^^ 2) & echo %var% +set /a var=3 %% (5 + 8 %% 3 ^^ -2) & echo %var% +echo ......octal and hexadecimal +set /a var=0xf + 3 & echo %var% +set /a var=0xF + 3 & echo %var% +set /a var=015 + 2 & echo %var% +set /a var=3, 8+3,0 & echo %var% +echo ......variables +set /a var=foo=3, foo+1 & echo %var% +if defined foo (echo %foo%) else ( + echo foo not defined +) +set /a var=foo=3, foo+=1 & echo %var% +set /a var=foo=3, bar=1, bar+=foo, bar & echo %var% +set /a var=foo*= foo & echo %var% +set /a var=whateverNonExistingVar & echo %var% +set /a var=whateverNonExistingVar + bar & echo %var% +set /a var=foo -= foo + 7 & echo %var% +set /a var=foo /= 3 + 2 & echo %var% +set /a var=foo=5, foo %%=2 & echo %var% +set /a var=foo ^<^<= 2 & echo %var% +set /a var=foo ^>^>= 2 & echo %var% +set /a var=foo ^&= 2 & echo %var% +set /a var=foo=5, foo ^|= 2 & echo %var% +set /a var=foo=5, foo ^^= 2 & echo %var% +set /a var=foo=19, foo %%= 4 + (bar %%= 7) & echo. +set foo= +set bar= +set var= 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 c4f0d76..ec0ece4 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -253,6 +253,76 @@ bar -1 @todo_wine@ErrorLevel 0 @todo_wine@ErrorLevel 0 +...for /a +......individual operations +0 +@todo_wine@3 +@todo_wine@-1 +@todo_wine@3 +@todo_wine@6 +@todo_wine@10 +@todo_wine@4 +@todo_wine@4 +@todo_wine@-4 +0 +@todo_wine@2 +@todo_wine@2 +@todo_wine@-2 +@todo_wine@1 +@todo_wine@4 +0@or_broken@1073741824 +0@or_broken@-1073741824 +@todo_wine@-4 +@todo_wine@9 +@todo_wine@2 +0 +@todo_wine@-1 +@todo_wine@-3 +0 +@todo_wine@1 +@todo_wine@1 +@todo_wine@4 +@todo_wine@1 +@todo_wine@5 +@todo_wine@5 +@todo_wine@7 +@todo_wine@5 +@todo_wine@5 +@todo_wine@5 +@todo_wine@4 +@todo_wine@6 +@todo_wine@1 +......precedence and grouping +@todo_wine@4 +@todo_wine@10 +@todo_wine@18@or_broken@10 +@todo_wine@2@or_broken@0 +@todo_wine@2@or_broken@0 +0@or_broken@4 +@todo_wine@4 +@todo_wine@3@or_broken@4 +......octal and hexadecimal +@todo_wine@3@or_broken@4 +@todo_wine@18 +@todo_wine@18 +@todo_wine@15 +......variables +@todo_wine@3 +@todo_wine@3@or_broken@foo not defined +@todo_wine@3@or_broken@0 +@todo_wine@3@or_broken@0 +@todo_wine@3@or_broken@0 +@todo_wine@9@or_broken@0 +0 +@todo_wine@4@or_broken@0 +@todo_wine@-7@or_broken@0 +@todo_wine@-1@or_broken@0 +@todo_wine@5@or_broken@0 +@todo_wine@4@or_broken@0 +@todo_wine@1@or_broken@0 +0 +@todo_wine@5@or_broken@0 + -----------Testing del /a----------- not-r.test not found after delete, good r.test found before delete, good

1 0

Frédéric Delanoy : tests: Assorted spelling fixes .
by Alexandre Julliard 04 Aug '11

04 Aug '11

1 0

Huw Davies : gdi32: If possible use the GetImage driver entry to fill the colour table for GetDIBits .
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: b94616864d7627d8e86210dd808bd8c220a5b33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b94616864d7627d8e86210dd8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 4 12:38:33 2011 +0100 gdi32: If possible use the GetImage driver entry to fill the colour table for GetDIBits. --- dlls/gdi32/dib.c | 181 ++++++++++++++++++--------------------------- dlls/gdi32/tests/bitmap.c | 4 - 2 files changed, 72 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b94616864d7627d8e8621…

1 0

Huw Davies : gdi32: Simplify the code a little by using a separate variable for the return value .
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: d947f6ef087b6d2ef39e33a9eddede27e081d52e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d947f6ef087b6d2ef39e33a9e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 4 12:38:32 2011 +0100 gdi32: Simplify the code a little by using a separate variable for the return value. --- dlls/gdi32/dib.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 5d08c6e..af9a9a2 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -881,7 +881,7 @@ INT WINAPI GetDIBits( { DC * dc; BITMAPOBJ * bmp; - int i; + int i, ret = 0; LONG width; LONG height; WORD bpp; @@ -916,7 +916,7 @@ INT WINAPI GetDIBits( bpp = dst_info->bmiHeader.biBitCount; if (bpp == 0) /* query bitmap info only */ { - lines = fill_query_info( info, bmp ); + ret = fill_query_info( info, bmp ); goto done; } @@ -1007,7 +1007,7 @@ INT WINAPI GetDIBits( if (startscan >= dst.visrect.bottom) { - lines = 1; /* yes, this is strange */ + ret = 1; /* yes, this is strange */ goto empty_image; } @@ -1053,26 +1053,18 @@ INT WINAPI GetDIBits( } } - if (empty_rect) - { - lines = 0; - goto empty_image; - } + if (empty_rect) goto empty_image; src.x = src.visrect.left; src.y = src.visrect.top; src.width = src.visrect.right - src.visrect.left; src.height = src.visrect.bottom - src.visrect.top; - lines = src.height; - err = funcs->pGetImage( NULL, hbitmap, src_info, &src_bits, &src ); - if(err) - { - lines = 0; - goto done; - } + if (err) goto done; + + ret = src.height; if (src_info->bmiHeader.biBitCount <= 8 && src_info->bmiHeader.biClrUsed == 0) { @@ -1090,7 +1082,7 @@ INT WINAPI GetDIBits( convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, bits ); if (src_bits.free) src_bits.free( &src_bits ); } - else lines = abs(height); + else ret = abs( height ); empty_image: if (coloruse == DIB_PAL_COLORS) @@ -1105,7 +1097,7 @@ empty_image: done: release_dc_ptr( dc ); GDI_ReleaseObj( hbitmap ); - return lines; + return ret; }

1 0

Huw Davies : gdi32/tests: Add some GetDIBits tests with zero lines and bits parameters.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: d88151704ea375040b38f9a3289146ddeb4bdfb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d88151704ea375040b38f9a32… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 4 12:38:31 2011 +0100 gdi32/tests: Add some GetDIBits tests with zero lines and bits parameters. --- dlls/gdi32/tests/bitmap.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 7358ccd..69f4d74 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1252,6 +1252,28 @@ static void test_GetDIBits_selected_DIB(UINT bpp) ok( !memcmp( bits, bits2, dib_size ), "bit mismatch (bpp %d)\n", bpp ); + /* Test various combinations of lines = 0 and bits2 = NULL */ + memset( info2->bmiColors, 0xcc, 256 * sizeof(RGBQUAD) ); + res = GetDIBits( dc, dib, 0, 0, bits2, info2, DIB_RGB_COLORS ); +todo_wine + ok( res == 1, "got %d (bpp %d)\n", res, bpp ); + ok( !memcmp( info->bmiColors, info2->bmiColors, (1 << bpp) * sizeof(RGBQUAD) ), + "color table mismatch (bpp %d)\n", bpp ); + + memset( info2->bmiColors, 0xcc, 256 * sizeof(RGBQUAD) ); + res = GetDIBits( dc, dib, 0, 0, NULL, info2, DIB_RGB_COLORS ); +todo_wine + ok( res == 1, "got %d (bpp %d)\n", res, bpp ); + ok( !memcmp( info->bmiColors, info2->bmiColors, (1 << bpp) * sizeof(RGBQUAD) ), + "color table mismatch (bpp %d)\n", bpp ); + + memset( info2->bmiColors, 0xcc, 256 * sizeof(RGBQUAD) ); + res = GetDIBits( dc, dib, 0, info->bmiHeader.biHeight, NULL, info2, DIB_RGB_COLORS ); +todo_wine + ok( res == 1, "got %d (bpp %d)\n", res, bpp ); + ok( !memcmp( info->bmiColors, info2->bmiColors, (1 << bpp) * sizeof(RGBQUAD) ), + "color table mismatch (bpp %d)\n", bpp ); + /* Map into a 32bit-DIB */ info2->bmiHeader.biBitCount = 32; res = GetDIBits(dc, dib, 0, info->bmiHeader.biHeight, bits2, info2, DIB_RGB_COLORS); @@ -1364,7 +1386,8 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) /* Get the palette indices */ res = GetDIBits(dc, ddb, 0, 0, NULL, info2, DIB_PAL_COLORS); - ok( res, "got %d (bpp %d)\n", res, bpp ); +todo_wine + ok( res == 1, "got %d (bpp %d)\n", res, bpp ); for (i = 0; i < (1 << info->bmiHeader.biBitCount); i++) ok( colors[i] == i, "%d: got %d (bpp %d)\n", i, colors[i], bpp );

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2011