November 2012 - Wine-Commits

Piotr Caban : msvcp: Fixed uninitialized variable access in num_get:: _Getffld and _Getifld functions.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 605ea649853743396cfecaee7067b7baf94482f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=605ea649853743396cfecaee7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 15:15:29 2012 +0100 msvcp: Fixed uninitialized variable access in num_get::_Getffld and _Getifld functions. --- dlls/msvcp100/locale.c | 34 ++++++++++++++-------------------- dlls/msvcp60/locale.c | 34 ++++++++++++++-------------------- dlls/msvcp71/locale.c | 34 ++++++++++++++-------------------- dlls/msvcp90/locale.c | 34 ++++++++++++++-------------------- 4 files changed, 56 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=605ea649853743396cfec…

1 0

Jacek Caban : mshtml: Added IHTMLObjectElement:: name property implementation.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 1017c2b3ee44b0e520527fc40ea6b1d91fa56041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1017c2b3ee44b0e520527fc40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 7 12:55:28 2012 +0100 mshtml: Added IHTMLObjectElement::name property implementation. --- dlls/mshtml/htmlobject.c | 21 +++++++++++++++++---- dlls/mshtml/tests/dom.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index fc22419..9e9bbdd 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -162,15 +162,28 @@ static HRESULT WINAPI HTMLObjectElement_get_align(IHTMLObjectElement *iface, BST static HRESULT WINAPI HTMLObjectElement_put_name(IHTMLObjectElement *iface, BSTR v) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLObjectElement_SetName(This->nsobject, &nsstr); + nsAString_Finish(&nsstr); + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLObjectElement_get_name(IHTMLObjectElement *iface, BSTR *p) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLObjectElement_GetName(This->nsobject, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLObjectElement_put_codeBase(IHTMLObjectElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 26567d2..3f9bd5f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -56,7 +56,7 @@ static const char elem_test_str[] = "<textarea id=\"X\">text text</textarea>" "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td>td1 text</td><td>td2 text</td></tr></tbody></table>" "<script id=\"sc\" type=\"text/javascript\">\n</script>" - "<test /><object id=\"objid\" vspace=100></object><embed />" + "<test /><object id=\"objid\" name=\"objname\" vspace=100></object><embed />" "<img id=\"imgid\" name=\"WineImg\"/>" "<iframe src=\"about:blank\" id=\"ifr\"></iframe>" "<form id=\"frm\"></form>" @@ -1573,6 +1573,40 @@ static void _test_object_vspace(unsigned line, IUnknown *unk, LONG exl) IHTMLObjectElement_Release(object); } +#define test_object_name(a,b) _test_object_name(__LINE__,a,b) +static void _test_object_name(unsigned line, IHTMLElement *elem, const char *exname) +{ + IHTMLObjectElement *object = _get_object_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLObjectElement_get_name(object, &str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + if(exname) + ok_(__FILE__,line)(!strcmp_wa(str, exname), "name=%s, expected %s\n", wine_dbgstr_w(str), exname); + else + ok_(__FILE__,line)(!str, "name=%s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); + IHTMLObjectElement_Release(object); +} + +#define set_object_name(a,b) _set_object_name(__LINE__,a,b) +static void _set_object_name(unsigned line, IHTMLElement *elem, const char *name) +{ + IHTMLObjectElement *object = _get_object_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + str = a2bstr(name); + hres = IHTMLObjectElement_put_name(object, str); + ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08x\n", hres); + SysFreeString(str); + IHTMLObjectElement_Release(object); + + _test_object_name(line, elem, name); +} + #define create_option_elem(d,t,v) _create_option_elem(__LINE__,d,t,v) static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *doc, const char *txt, const char *val) @@ -5914,6 +5948,9 @@ static void test_elems(IHTMLDocument2 *doc) ok(elem != NULL, "elem == NULL\n"); if(elem) { test_object_vspace((IUnknown*)elem, 100); + test_object_name(elem, "objname"); + set_object_name(elem, "test"); + set_object_name(elem, NULL); IHTMLElement_Release(elem); }

1 0

Alexandre Julliard : opengl32: Don' t substitute OpenGL types that are already defined in wgl.h.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: a56c5b185e1817232f3edd3469ff885d26b91b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56c5b185e1817232f3edd346… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 18:06:42 2012 +0100 opengl32: Don't substitute OpenGL types that are already defined in wgl.h. --- dlls/opengl32/make_opengl | 11 +-- dlls/opengl32/opengl_ext.c | 334 +++++++++++++++++++++--------------------- dlls/opengl32/opengl_norm.c | 334 +++++++++++++++++++++--------------------- include/wine/wgl_driver.h | 336 +++++++++++++++++++++--------------------- 4 files changed, 503 insertions(+), 512 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a56c5b185e1817232f3ed…

1 0

Alexandre Julliard : wined3d: Make use of the generated wgl.h header.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: cf2b981ce09ec355cebae075afa6a9dbd247617f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2b981ce09ec355cebae075a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 13:54:32 2012 +0100 wined3d: Make use of the generated wgl.h header. --- dlls/wined3d/utils.c | 6 +- dlls/wined3d/wined3d_gl.h | 2257 +-------------------------------------------- 2 files changed, 5 insertions(+), 2258 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf2b981ce09ec355cebae…

1 0

Alexandre Julliard : opengl32: Generate our own wgl. h header from the OpenGL registry data.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 70e536f46b2b1e505b10074fb69c053a1809d8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e536f46b2b1e505b10074fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 13:14:58 2012 +0100 opengl32: Generate our own wgl.h header from the OpenGL registry data. --- dlls/opengl32/make_opengl | 122 +- include/wine/wgl.h | 5081 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 5173 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70e536f46b2b1e505b100…

1 0

Alexandre Julliard : opengl32: Update to the current OpenGL spec.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 00628bb6460e68a2bb2832005c5cb26658649f64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00628bb6460e68a2bb2832005… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 12:15:09 2012 +0100 opengl32: Update to the current OpenGL spec. --- dlls/opengl32/opengl_ext.c | 250 ++++++++++++++++++++++++------------------- dlls/opengl32/opengl_norm.c | 12 ++- include/wine/wgl_driver.h | 10 ++- 3 files changed, 156 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00628bb6460e68a2bb283…

1 0

Piotr Caban : msvcp90: Destroy string returned by basic_stringbuf_char_str_get.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 654a3ec500f2bcb227c2c81a756947fe5d8504d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=654a3ec500f2bcb227c2c81a7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 15:15:10 2012 +0100 msvcp90: Destroy string returned by basic_stringbuf_char_str_get. --- dlls/msvcp90/tests/ios.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 4370f0e..4875e85 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1094,6 +1094,7 @@ static void test_num_put_put_double(void) str = call_func1(p_basic_string_char_cstr, &pstr); ok(!strcmp(tests[i].str, str), "wrong output, expected = %s found = %s\n", tests[i].str, str); + call_func1(p_basic_string_char_dtor, &pstr); if(tests[i].lcl) call_func1(p_locale_dtor, &lcl); @@ -1120,6 +1121,7 @@ static void test_num_put_put_double(void) AtoW(wide, tests[i].str, strlen(tests[i].str)); ok(!lstrcmpW(wide, wstr), "wrong output, expected = %s found = %s\n", tests[i].str, wine_dbgstr_w(wstr)); + call_func1(p_basic_string_wchar_dtor, &pwstr); if(tests[i].lcl) call_func1(p_locale_dtor, &lcl);

1 0

Daniel Lehman : shell32: Initialize fAnyOperationsAborted in SHFileOperation.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 32f636f6d1adb5bac0268b738990ee6cdf43bafd URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f636f6d1adb5bac0268b738… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Nov 5 20:20:12 2012 -0800 shell32: Initialize fAnyOperationsAborted in SHFileOperation. --- dlls/shell32/shlfileop.c | 1 + dlls/shell32/tests/shlfileop.c | 52 +++++++++++++++++++++++++++++++++------- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index d07c588..787ba75 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1541,6 +1541,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) ZeroMemory(&op, sizeof(op)); op.req = lpFileOp; op.bManyItems = (flFrom.dwNumFiles > 1); + lpFileOp->fAnyOperationsAborted = FALSE; switch (lpFileOp->wFunc) { diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index f1e2a3e..9bf1e73 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -995,7 +995,11 @@ static void test_copy(void) shfo.fFlags |= FOF_NOERRORUI; set_curr_dir_path(from, "test1.txt\0test2.txt\0"); set_curr_dir_path(to, "test3.txt\0"); + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); + ok(shfo.fAnyOperationsAborted != 0xdeadbeef || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Expected TRUE/FALSE fAnyOperationsAborted not 0xdeadbeef\n"); if (retval == DE_FLDDESTISFILE || /* Vista and W2K8 */ retval == DE_INVALIDFILES) /* Win7 */ { @@ -1012,8 +1016,11 @@ static void test_copy(void) /* try to copy many files to nonexistent directory */ DeleteFile(to); shfo.fFlags &= ~FOF_NOERRORUI; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); + ok(!shfo.fAnyOperationsAborted || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Didn't expect aborted operations\n"); ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); ok(DeleteFile("test3.txt\\test1.txt"), "Expected test3.txt\\test1.txt to exist\n"); ok(DeleteFile("test3.txt\\test2.txt"), "Expected test3.txt\\test1.txt to exist\n"); @@ -1024,11 +1031,16 @@ static void test_copy(void) shfo.pFrom = "test1.txt\0test2.txt\0test3.txt\0"; shfo.pTo = "testdir2\\a.txt\0testdir2\\b.txt\0testdir2\\c.txt\0testdir2\\d.txt\0"; shfo.fFlags |= FOF_NOERRORUI | FOF_MULTIDESTFILES; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); + ok(shfo.fAnyOperationsAborted != 0xdeadbeef || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Expected TRUE/FALSE fAnyOperationsAborted not 0xdeadbeef\n"); if (dir_exists("testdir2\\a.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(DeleteFile("testdir2\\a.txt\\test1.txt"), "Expected testdir2\\a.txt\\test1.txt to exist\n"); RemoveDirectory("testdir2\\a.txt"); ok(DeleteFile("testdir2\\b.txt\\test2.txt"), "Expected testdir2\\b.txt\\test2.txt to exist\n"); @@ -1049,11 +1061,15 @@ static void test_copy(void) /* send in FOF_MULTIDESTFILES with too many destination files */ shfo.pFrom = "test1.txt\0test2.txt\0test3.txt\0"; shfo.pTo = "e.txt\0f.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); + ok(shfo.fAnyOperationsAborted != 0xdeadbeef || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Expected TRUE/FALSE fAnyOperationsAborted not 0xdeadbeef\n"); if (dir_exists("e.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(retval == DE_SAMEFILE, "Expected DE_SAMEFILE, got %d\n", retval); ok(DeleteFile("e.txt\\test1.txt"), "Expected e.txt\\test1.txt to exist\n"); RemoveDirectory("e.txt"); @@ -1072,8 +1088,11 @@ static void test_copy(void) /* use FOF_MULTIDESTFILES with files and a source directory */ shfo.pFrom = "test1.txt\0test2.txt\0test4.txt\0"; shfo.pTo = "testdir2\\a.txt\0testdir2\\b.txt\0testdir2\\c.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); + ok(!shfo.fAnyOperationsAborted || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Didn't expect aborted operations\n"); ok(retval == ERROR_SUCCESS || broken(retval == 0x100a1), /* WinMe */ "Expected ERROR_SUCCESS, got %d\n", retval); @@ -1085,13 +1104,17 @@ static void test_copy(void) /* try many dest files without FOF_MULTIDESTFILES flag */ shfo.pFrom = "test1.txt\0test2.txt\0test3.txt\0"; shfo.pTo = "a.txt\0b.txt\0c.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; shfo.fFlags &= ~FOF_MULTIDESTFILES; retval = SHFileOperation(&shfo); + ok(shfo.fAnyOperationsAborted != 0xdeadbeef || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Expected TRUE/FALSE fAnyOperationsAborted not 0xdeadbeef\n"); if (dir_exists("a.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(DeleteFile("a.txt\\test1.txt"), "Expected a.txt\\test1.txt to exist\n"); ok(DeleteFile("a.txt\\test2.txt"), "Expected a.txt\\test2.txt to exist\n"); ok(DeleteFile("a.txt\\test3.txt"), "Expected a.txt\\test3.txt to exist\n"); @@ -1099,7 +1122,11 @@ static void test_copy(void) } else { + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); + ok(shfo.fAnyOperationsAborted || + broken(!shfo.fAnyOperationsAborted), /* NT4 */ + "Expected aborted operations\n"); ok(!file_exists("a.txt"), "Expected a.txt to not exist\n"); } @@ -1157,8 +1184,11 @@ static void test_copy(void) init_shfo_tests(); shfo.pFrom = "test1.txt\0"; shfo.pTo = "b.txt\0c.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); + ok(!shfo.fAnyOperationsAborted || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Didn't expect aborted operations\n"); if (retval == DE_OPCANCELLED) { /* NT4 fails and doesn't copy any files */ @@ -1177,11 +1207,13 @@ static void test_copy(void) /* copy two file to three others, all fail */ shfo.pFrom = "test1.txt\0test2.txt\0"; shfo.pTo = "b.txt\0c.txt\0d.txt\0"; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); if (dir_exists("b.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(DeleteFile("b.txt\\test1.txt"), "Expected b.txt\\test1.txt to exist\n"); RemoveDirectory("b.txt"); ok(DeleteFile("c.txt\\test2.txt"), "Expected c.txt\\test2.txt to exist\n"); @@ -1191,7 +1223,7 @@ static void test_copy(void) { expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(shfo.fAnyOperationsAborted || - broken(!shfo.fAnyOperationsAborted), /* NT4 */ + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ "Expected aborted operations\n"); ok(!DeleteFile("b.txt"), "Expected b.txt to not exist\n"); } @@ -1199,12 +1231,13 @@ static void test_copy(void) /* copy one file and one directory to three others */ shfo.pFrom = "test1.txt\0test4.txt\0"; shfo.pTo = "b.txt\0c.txt\0d.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); if (dir_exists("b.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(DeleteFile("b.txt\\test1.txt"), "Expected b.txt\\test1.txt to exist\n"); RemoveDirectory("b.txt"); ok(RemoveDirectory("c.txt\\test4.txt"), "Expected c.txt\\test4.txt to exist\n"); @@ -1214,7 +1247,7 @@ static void test_copy(void) { expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(shfo.fAnyOperationsAborted || - broken(!shfo.fAnyOperationsAborted), /* NT4 */ + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ "Expected aborted operations\n"); ok(!DeleteFile("b.txt"), "Expected b.txt to not exist\n"); ok(!DeleteFile("c.txt"), "Expected c.txt to not exist\n"); @@ -1383,10 +1416,11 @@ static void test_copy(void) shfo.fFlags = FOF_NOCONFIRMATION; shfo.pFrom = "test1.txt\0"; shfo.pTo = "test2.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; /* without FOF_NOCONFIRMATION the confirmation is Yes/No */ retval = SHFileOperation(&shfo); ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(file_has_content("test2.txt", "test1.txt\n"), "The file was not copied\n"); shfo.pFrom = "test3.txt\0test1.txt\0";

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWPALETTE.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 6eaf601dcecff03c46ff430733c930a932510aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eaf601dcecff03c46ff43073… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 22:13:23 2012 +0100 ddraw: Avoid LPDIRECTDRAWPALETTE. --- include/ddraw.h | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6eaf601dcecff03c46ff4…

1 0

Frédéric Delanoy : cmd/tests: Simplify 'if' comparison tests.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 250ce222b97851d1261023018194268119edf753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=250ce222b97851d1261023018… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 7 00:51:17 2012 +0100 cmd/tests: Simplify 'if' comparison tests. --- programs/cmd/tests/test_builtins.cmd | 91 +++++++++++---------------- programs/cmd/tests/test_builtins.cmd.exp | 100 +++++++++++++++--------------- 2 files changed, 86 insertions(+), 105 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7f90549..e7b8516 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -649,7 +649,6 @@ if 1==0 (echo doom) else(a)tab@echo quake echo --- comparison operators rem NT4 misevaluates conditionals in for loops so we have to use subroutines as workarounds -rem Imbricated for loops parameters are currently not expanded correctly; this prevents usage of simpler imbricated for loops in tests echo ------ for strings rem NT4 stops processing of the whole batch file as soon as it finds a rem comparison operator non fully uppercased, such as lss instead of LSS, so we @@ -662,11 +661,9 @@ if not "-1" LSS "1" (echo negative numbers as well) else echo NT4 if /i foo LSS FoOc echo if /i seems to work for LSS if /I not foo LSS FOOb echo if /I seems to be broken for LSS set STR_PARMS=A B AB BA AA -for %%i in (%STR_PARMS%) do call :LSStest %%i A -for %%i in (%STR_PARMS%) do call :LSStest %%i B -for %%i in (%STR_PARMS%) do call :LSStest %%i AB -for %%i in (%STR_PARMS%) do call :LSStest %%i BA -for %%i in (%STR_PARMS%) do call :LSStest %%i AA +for %%i in (%STR_PARMS%) do ( + for %%j in (%STR_PARMS%) do ( + call :LSStest %%i %%j)) if b LSS B (echo b LSS B) else echo NT4 if /I b LSS B echo b LSS B insensitive if b LSS A echo b LSS A @@ -675,11 +672,9 @@ if a LSS B (echo a LSS B) else echo NT4 if /I a LSS B echo a LSS B insensitive if A LSS b echo A LSS b if /I A LSS b echo A LSS b insensitive -for %%i in (%STR_PARMS%) do call :LEQtest %%i A -for %%i in (%STR_PARMS%) do call :LEQtest %%i B -for %%i in (%STR_PARMS%) do call :LEQtest %%i AB -for %%i in (%STR_PARMS%) do call :LEQtest %%i BA -for %%i in (%STR_PARMS%) do call :LEQtest %%i AA +for %%i in (%STR_PARMS%) do ( + for %%j in (%STR_PARMS%) do ( + call :LEQtest %%i %%j)) if b LEQ B (echo b LEQ B) else echo NT4 if /I b LEQ B echo b LEQ B insensitive if b LEQ A echo b LEQ A @@ -688,27 +683,19 @@ if a LEQ B (echo a LEQ B) else echo NT4 if /I a LEQ B echo a LEQ B insensitive if A LEQ b echo A LEQ b if /I A LEQ b echo A LEQ b insensitive -for %%i in (%STR_PARMS%) do call :EQUtest %%i A -for %%i in (%STR_PARMS%) do call :EQUtest %%i B -for %%i in (%STR_PARMS%) do call :EQUtest %%i AB -for %%i in (%STR_PARMS%) do call :EQUtest %%i BA -for %%i in (%STR_PARMS%) do call :EQUtest %%i AA +for %%i in (%STR_PARMS%) do ( + for %%j in (%STR_PARMS%) do ( + call :EQUtest %%i %%j)) if /I A EQU a echo A EQU a insensitive -for %%i in (%STR_PARMS%) do call :NEQtest %%i A -for %%i in (%STR_PARMS%) do call :NEQtest %%i B -for %%i in (%STR_PARMS%) do call :NEQtest %%i AB -for %%i in (%STR_PARMS%) do call :NEQtest %%i BA -for %%i in (%STR_PARMS%) do call :NEQtest %%i AA -for %%i in (%STR_PARMS%) do call :GEQtest %%i A -for %%i in (%STR_PARMS%) do call :GEQtest %%i B -for %%i in (%STR_PARMS%) do call :GEQtest %%i AB -for %%i in (%STR_PARMS%) do call :GEQtest %%i BA -for %%i in (%STR_PARMS%) do call :GEQtest %%i AA -for %%i in (%STR_PARMS%) do call :GTRtest %%i A -for %%i in (%STR_PARMS%) do call :GTRtest %%i B -for %%i in (%STR_PARMS%) do call :GTRtest %%i AB -for %%i in (%STR_PARMS%) do call :GTRtest %%i BA -for %%i in (%STR_PARMS%) do call :GTRtest %%i AA +for %%i in (%STR_PARMS%) do ( + for %%j in (%STR_PARMS%) do ( + call :NEQtest %%i %%j)) +for %%i in (%STR_PARMS%) do ( + for %%j in (%STR_PARMS%) do ( + call :GEQtest %%i %%j)) +for %%i in (%STR_PARMS%) do ( + for %%j in (%STR_PARMS%) do ( + call :GTRtest %%i %%j)) echo ------ for numbers if -1 LSS 1 (echo negative numbers handled) if not -1 LSS -10 (echo negative numbers handled) @@ -718,34 +705,28 @@ if 4 LSS 0x5 (echo hexa handled) if not -1 LSS -0x1A (echo also in negative form) if 11 LSS 101 (echo 11 LSS 101) set INT_PARMS=0 1 10 9 -for %%i in (%INT_PARMS%) do call :LSStest %%i 0 -for %%i in (%INT_PARMS%) do call :LSStest %%i 1 -for %%i in (%INT_PARMS%) do call :LSStest %%i 10 -for %%i in (%INT_PARMS%) do call :LSStest %%i 9 -for %%i in (%INT_PARMS%) do call :LEQtest %%i 0 -for %%i in (%INT_PARMS%) do call :LEQtest %%i 1 -for %%i in (%INT_PARMS%) do call :LEQtest %%i 10 -for %%i in (%INT_PARMS%) do call :LEQtest %%i 9 -for %%i in (%INT_PARMS%) do call :EQUtest %%i 0 -for %%i in (%INT_PARMS%) do call :EQUtest %%i 1 -for %%i in (%INT_PARMS%) do call :EQUtest %%i 10 -for %%i in (%INT_PARMS%) do call :EQUtest %%i 9 +for %%i in (%INT_PARMS%) do ( + for %%j in (%INT_PARMS%) do ( + call :LSStest %%i %%j)) +for %%i in (%INT_PARMS%) do ( + for %%j in (%INT_PARMS%) do ( + call :LEQtest %%i %%j)) +for %%i in (%INT_PARMS%) do ( + for %%j in (%INT_PARMS%) do ( + call :EQUtest %%i %%j)) if 011 EQU 9 (echo octal ok) if 0xA1 EQU 161 (echo hexa ok) if 0xA1 EQU "161" (echo hexa should be recognized) else (echo string/hexa compare ok) if "0xA1" EQU 161 (echo hexa should be recognized) else (echo string/hexa compare ok) -for %%i in (%INT_PARMS%) do call :NEQtest %%i 0 -for %%i in (%INT_PARMS%) do call :NEQtest %%i 1 -for %%i in (%INT_PARMS%) do call :NEQtest %%i 10 -for %%i in (%INT_PARMS%) do call :NEQtest %%i 9 -for %%i in (%INT_PARMS%) do call :GEQtest %%i 0 -for %%i in (%INT_PARMS%) do call :GEQtest %%i 1 -for %%i in (%INT_PARMS%) do call :GEQtest %%i 10 -for %%i in (%INT_PARMS%) do call :GEQtest %%i 9 -for %%i in (%INT_PARMS%) do call :GTRtest %%i 0 -for %%i in (%INT_PARMS%) do call :GTRtest %%i 1 -for %%i in (%INT_PARMS%) do call :GTRtest %%i 10 -for %%i in (%INT_PARMS%) do call :GTRtest %%i 9 +for %%i in (%INT_PARMS%) do ( + for %%j in (%INT_PARMS%) do ( + call :NEQtest %%i %%j)) +for %%i in (%INT_PARMS%) do ( + for %%j in (%INT_PARMS%) do ( + call :GEQtest %%i %%j)) +for %%i in (%INT_PARMS%) do ( + for %%j in (%INT_PARMS%) do ( + call :GTRtest %%i %%j)) echo ------ for numbers and stringified numbers if not "1" EQU 1 (echo strings and integers not equal) else echo foo if not 1 EQU "1" (echo strings and integers not equal) else echo foo diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d3612b6..1d42a96 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -446,15 +446,15 @@ numbers in quotes are handled as strings negative numbers as well(a)or_broken@NT4 if /i seems to work for LSS A LSS B -AB LSS B -AA LSS B A LSS AB -AA LSS AB A LSS BA +A LSS AA B LSS BA +AB LSS B AB LSS BA +AA LSS B +AA LSS AB AA LSS BA -A LSS AA b LSS B(a)or_broken@NT4 a LSS B(a)or_broken@NT4 a LSS B insensitive @@ -462,18 +462,18 @@ A LSS b A LSS b insensitive A LEQ A A LEQ B -B LEQ B -AB LEQ B -AA LEQ B A LEQ AB -AB LEQ AB -AA LEQ AB A LEQ BA +A LEQ AA +B LEQ B B LEQ BA +AB LEQ B +AB LEQ AB AB LEQ BA BA LEQ BA +AA LEQ B +AA LEQ AB AA LEQ BA -A LEQ AA AA LEQ AA b LEQ B(a)or_broken@NT4 b LEQ B insensitive @@ -487,51 +487,51 @@ AB EQU AB BA EQU BA AA EQU AA A EQU a insensitive -B NEQ A -AB NEQ A -BA NEQ A -AA NEQ A A NEQ B -AB NEQ B -BA NEQ B -AA NEQ B A NEQ AB -B NEQ AB -BA NEQ AB -AA NEQ AB A NEQ BA -B NEQ BA -AB NEQ BA -AA NEQ BA A NEQ AA +B NEQ A +B NEQ AB +B NEQ BA B NEQ AA +AB NEQ A +AB NEQ B +AB NEQ BA AB NEQ AA +BA NEQ A +BA NEQ B +BA NEQ AB BA NEQ AA +AA NEQ A +AA NEQ B +AA NEQ AB +AA NEQ BA A GEQ A B GEQ A -AB GEQ A -BA GEQ A -AA GEQ A B GEQ B -BA GEQ B B GEQ AB +B GEQ AA +AB GEQ A AB GEQ AB +AB GEQ AA +BA GEQ A +BA GEQ B BA GEQ AB BA GEQ BA -B GEQ AA -AB GEQ AA BA GEQ AA +AA GEQ A AA GEQ AA B GTR A +B GTR AB +B GTR AA AB GTR A +AB GTR AA BA GTR A -AA GTR A BA GTR B -B GTR AB BA GTR AB -B GTR AA -AB GTR AA BA GTR AA +AA GTR A ------ for numbers negative numbers handled negative numbers handled @@ -542,19 +542,19 @@ also in negative form 11 LSS 101 0 LSS 1 0 LSS 10 -1 LSS 10 -9 LSS 10 0 LSS 9 +1 LSS 10 1 LSS 9 +9 LSS 10 0 LEQ 0 0 LEQ 1 -1 LEQ 1 0 LEQ 10 +0 LEQ 9 +1 LEQ 1 1 LEQ 10 +1 LEQ 9 10 LEQ 10 9 LEQ 10 -0 LEQ 9 -1 LEQ 9 9 LEQ 9 0 EQU 0 1 EQU 1 @@ -564,34 +564,34 @@ octal ok hexa ok string/hexa compare ok string/hexa compare ok -1 NEQ 0 -10 NEQ 0 -9 NEQ 0 0 NEQ 1 -10 NEQ 1 -9 NEQ 1 0 NEQ 10 -1 NEQ 10 -9 NEQ 10 0 NEQ 9 +1 NEQ 0 +1 NEQ 10 1 NEQ 9 +10 NEQ 0 +10 NEQ 1 10 NEQ 9 +9 NEQ 0 +9 NEQ 1 +9 NEQ 10 0 GEQ 0 1 GEQ 0 -10 GEQ 0 -9 GEQ 0 1 GEQ 1 +10 GEQ 0 10 GEQ 1 -9 GEQ 1 10 GEQ 10 10 GEQ 9 +9 GEQ 0 +9 GEQ 1 9 GEQ 9 1 GTR 0 10 GTR 0 -9 GTR 0 10 GTR 1 -9 GTR 1 10 GTR 9 +9 GTR 0 +9 GTR 1 ------ for numbers and stringified numbers strings and integers not equal strings and integers not equal

1 0