wine-commits July 2014

wine-commits@winehq.org

2 participants
287 discussions

Jacek Caban : wininet: Include trailing slash in URL cache hashes.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 2aaff6e19f9ef97a241d7ca36497d47d52b4c523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aaff6e19f9ef97a241d7ca36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 16 11:06:24 2014 +0200 wininet: Include trailing slash in URL cache hashes. --- dlls/wininet/tests/urlcache.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/wininet/urlcache.c | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 35ef77d..f735d73 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -1035,6 +1035,45 @@ static void test_GetDiskInfoA(void) ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); } +static BOOL cache_entry_exists(const char *url) +{ + static char buf[10000]; + DWORD size = sizeof(buf); + BOOL ret; + + ret = GetUrlCacheEntryInfoA(url, (void*)buf, &size); + ok(ret || GetLastError() == ERROR_FILE_NOT_FOUND, "GetUrlCacheEntryInfoA returned %x (%u)\n", ret, GetLastError()); + + return ret; +} + +static void test_trailing_slash(void) +{ + char filename[MAX_PATH]; + BYTE zero_byte = 0; + BOOL ret; + + static const FILETIME filetime_zero; + static char url_with_slash[] = "http://testing.cache.com/"; + + + ret = CreateUrlCacheEntryA(url_with_slash, 0, "html", filename, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + + create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); + + ret = CommitUrlCacheEntryA("Visited: http://testing.cache.com/", NULL, filetime_zero, filetime_zero, + NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + + ok(cache_entry_exists("Visited: http://testing.cache.com/"), "cache entry does not exist\n"); + ok(!cache_entry_exists("Visited: http://testing.cache.com"), "cache entry exists\n"); + + ret = DeleteUrlCacheEntryA("Visited: http://testing.cache.com/"); + ok(ret, "DeleteCacheEntryA failed\n"); + DeleteFileA(filename); +} + START_TEST(urlcache) { HMODULE hdll; @@ -1058,4 +1097,5 @@ START_TEST(urlcache) test_urlcacheW(); test_FindCloseUrlCache(); test_GetDiskInfoA(); + test_trailing_slash(); } diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f0a731b..3487aa8 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1487,7 +1487,7 @@ static DWORD urlcache_hash_key(LPCSTR lpszKey) for (i = 0; i < sizeof(key) / sizeof(key[0]); i++) key[i] = lookupTable[(*lpszKey + i) & 0xFF]; - for (lpszKey++; *lpszKey && ((lpszKey[0] != '/') || (lpszKey[1] != 0)); lpszKey++) + for (lpszKey++; *lpszKey; lpszKey++) { for (i = 0; i < sizeof(key) / sizeof(key[0]); i++) key[i] = lookupTable[*lpszKey ^ key[i]];

1 0

Shuai Meng : vbscript/tests: Added tests for the subtype of TypeName.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 95db4ce751ca4393c7eb5f090056778f8da2c8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95db4ce751ca4393c7eb5f090… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue Jul 15 23:06:01 2014 +0800 vbscript/tests: Added tests for the subtype of TypeName. --- dlls/vbscript/tests/api.vbs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0d27c8d..813f5e8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -845,17 +845,26 @@ MyObject.myval = 0 Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) -Dim MyEmpty +Call ok(TypeName(Empty) = "Empty", "TypeName(MyEmpty) = " & TypeName(Empty)) +Call ok(getVT(TypeName(Empty)) = "VT_BSTR", "getVT(TypeName(Empty)) = " & getVT(TypeName(Empty))) +Call ok(TypeName(Null) = "Null", "TypeName(Null) = " & TypeName(Null)) +Call ok(getVT(TypeName(Null)) = "VT_BSTR", "getVT(TypeName(Null)) = " & getVT(TypeName(Null))) Call ok(TypeName(CByte(255)) = "Byte", "TypeName(CByte(255)) = " & TypeName(CByte(255))) +Call ok(getVT(TypeName(CByte(255))) = "VT_BSTR", "getVT(TypeName(CByte(255))) = " & getVT(TypeName(CByte(255)))) Call ok(TypeName(255) = "Integer", "TypeName(255) = " & TypeName(255)) +Call ok(getVT(TypeName(255)) = "VT_BSTR", "getVT(TypeName(255)) = " & getVT(TypeName(255))) Call ok(TypeName(32768) = "Long", "TypeName(32768) = " & TypeName(32768)) +Call ok(getVT(TypeName(32768)) = "VT_BSTR", "getVT(TypeName(32768)) = " & getVT(TypeName(32768))) Call ok(TypeName(CSng(0.5)) = "Single", "TypeName(CSng(0.5)) = " & TypeName(CSng(0.5))) +Call ok(getVT(TypeName(CSng(0.5))) = "VT_BSTR", "getVT(TypeName(CSng(0.5))) = " & getVT(TypeName(CSng(0.5)))) Call ok(TypeName(-0.5) = "Double", "TypeName(-0.5) = " & TypeName(-0.5)) +Call ok(getVT(TypeName(-0.5)) = "VT_BSTR", "getVT(TypeName(-0.5)) = " & getVT(TypeName(-0.5))) Call ok(TypeName(CCur(0.5)) = "Currency", "TypeName(CCur(0.5)) = " & TypeName(CCur(0.5))) +Call ok(getVT(TypeName(CCur(0.5))) = "VT_BSTR", "getVT(TypeName(CCur(0.5))) = " & getVT(TypeName(CCur(0.5)))) Call ok(TypeName(CStr(0.5)) = "String", "TypeName(CStr(0.5)) = " & TypeName(CStr(0.5))) +Call ok(getVT(TypeName(CStr(0.5))) = "VT_BSTR", "getVT(TypeName(CStr(0.5))) = " & getVT(TypeName(CStr(0.5)))) Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True)) -Call ok(TypeName(MyEmpty) = "Empty", "TypeName(MyEmpty) = " & TypeName(Empty)) -Call ok(TypeName(Null) = "Null", "TypeName(Null) = " & TypeName(Null)) +Call ok(getVT(TypeName(True)) = "VT_BSTR", "getVT(TypeName(True)) = " & getVT(TypeName(True))) Call ok(VarType(Empty) = vbEmpty, "VarType(Empty) = " & VarType(Empty)) Call ok(getVT(VarType(Empty)) = "VT_I2", "getVT(VarType(Empty)) = " & getVT(VarType(Empty)))

1 0

Shuai Meng : vbscript: Implemented Abs.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 997820f735c468b7826b7630aef844fdbbbff663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997820f735c468b7826b7630a… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue Jul 15 23:02:55 2014 +0800 vbscript: Implemented Abs. --- dlls/vbscript/global.c | 19 +++++++++++++++++-- dlls/vbscript/tests/api.vbs | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index fa06353..af7a27d 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1246,8 +1246,23 @@ static HRESULT Global_ChrW(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Abs(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + VARIANT dst; + + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + hres = VarAbs(arg, &dst); + if(FAILED(hres)) + return hres; + + if (res) + *res = dst; + else + VariantClear(&dst); + + return S_OK; } static HRESULT Global_Fix(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 33596d3..0d27c8d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -909,4 +909,43 @@ End Sub Call testSgnError(Null, 94) +Call ok(Abs(Empty) = 0, "Abs(Empty) = " & Abs(Empty)) +Call ok(getVT(Abs(Empty)) = "VT_I2", "getVT(Abs(Empty)) = " & getVT(Abs(Empty))) +Call ok(IsNull(Abs(Null)), "Is Abs(Null) not Null?") +Call ok(getVT(Abs(Null)) = "VT_NULL", "getVT(Abs(Null)) = " & getVT(Abs(Null))) +Call ok(Abs(0) = 0, "Abs(0) = " & Abs(0)) +Call ok(getVT(Abs(0)) = "VT_I2", "getVT(Abs(0)) = " & getVT(Abs(0))) +Call ok(Abs(-32769) = 32769, "Abs(-32769) = " & Abs(-32769)) +Call ok(getVT(Abs(-32769)) = "VT_I4", "getVT(Abs(-32769)) = " & getVT(Abs(-32769))) +Call ok(Abs(CSng(-0.5)) = 0.5, "Abs(CSng(-0.5)) = " & Abs(CSng(-0.5))) +Call ok(getVT(Abs(CSng(-0.5))) = "VT_R4", "getVT(Abs(CSng(-0.5))) = " & getVT(Abs(CSng(-0.5)))) +Call ok(Abs(0.5) = 0.5, "Abs(0.5) = " & Abs(0.5)) +Call ok(getVT(Abs(0.5)) = "VT_R8", "getVT(Abs(0.5)) = " & getVT(Abs(0.5))) +Call ok(Abs(CCur(-1)) = 1, "Abs(CCur(-1)) = " & Abs(CCur(-1))) +Call ok(getVT(Abs(CCur(-1))) = "VT_CY", "getVT(Abs(CCur(-1))) = " & getVT(Abs(CCur(-1)))) +Call ok(Abs("-1") = 1, "Abs(""-1"") = " & Abs("-1")) +Call ok(getVT(Abs("-1")) = "VT_R8", "getVT(Abs(""-1"")) = " & getVT(Abs("-1"))) +Call ok(Abs(False) = 0, "Abs(False) = " & Abs(False)) +Call ok(getVT(Abs(False)) = "VT_I2", "getVT(Abs(False)) = " & getVT(Abs(False))) +Call ok(Abs(True) = 1, "Abs(True) = " & Abs(True)) +Call ok(getVT(Abs(True)) = "VT_I2", "getVT(Abs(True)) = " & getVT(Abs(True))) +Call ok(Abs(CByte(1)) = 1, "Abs(CByte(1)) = " & Abs(CByte(1))) +Call ok(getVT(Abs(CByte(1))) = "VT_UI1", "getVT(Abs(CByte(1))) = " & getVT(Abs(CByte(1)))) + +Sub testAbsError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = Abs(strings) + Call ok(Err.number = error_num1, "Err.number1 = " & Err.number) + + Call Err.clear() + Call Abs(strings) + Call ok(Err.number = error_num2, "Err.number2 = " & Err.number) +End Sub + +Call testAbsError("strings", 13, 13) +Call testAbsError(-4, 0, 0) + Call reportSuccess()

1 0

Henri Verbeet : d3d9/tests: Get rid of struct vertex_floatcolor.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 30437f9fe4f2761af1d2b646bca28b1969c2f9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30437f9fe4f2761af1d2b646b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 16 09:09:51 2014 +0200 d3d9/tests: Get rid of struct vertex_floatcolor. --- dlls/d3d9/tests/visual.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6a475a6..117c8eb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7943,11 +7943,6 @@ done: DestroyWindow(window); } -struct vertex_floatcolor { - float x, y, z; - float r, g, b, a; -}; - static void fixed_function_decl_test(void) { IDirect3DVertexDeclaration9 *dcl_float = NULL, *dcl_short = NULL, *dcl_ubyte = NULL, *dcl_color = NULL; @@ -8029,12 +8024,17 @@ static void fixed_function_decl_test(void) {{1.0f, -1.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}}, {{1.0f, 0.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}}, }; - static const struct vertex_floatcolor quad4[] = + static const struct + { + struct vec3 position; + struct vec4 color; + } + quad4[] = { - { 0.0f, 0.0f, 0.1f, 1.0, 0.0, 0.0, 0.0}, - { 0.0f, 1.0f, 0.1f, 1.0, 0.0, 0.0, 0.0}, - { 1.0f, 0.0f, 0.1f, 1.0, 0.0, 0.0, 0.0}, - { 1.0f, 1.0f, 0.1f, 1.0, 0.0, 0.0, 0.0}, + {{0.0f, 0.0f, 0.1f}, {1.0f, 0.0f, 0.0f, 0.0f}}, + {{0.0f, 1.0f, 0.1f}, {1.0f, 0.0f, 0.0f, 0.0f}}, + {{1.0f, 0.0f, 0.1f}, {1.0f, 0.0f, 0.0f, 0.0f}}, + {{1.0f, 1.0f, 0.1f}, {1.0f, 0.0f, 0.0f, 0.0f}}, }; static const DWORD colors[] = {

1 0

Henri Verbeet : d3d9/tests: Get rid of struct vertex_shortcolor.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 0cae65d494492c03af8063ee34130dd043b627bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cae65d494492c03af8063ee3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 16 09:09:50 2014 +0200 d3d9/tests: Get rid of struct vertex_shortcolor. --- dlls/d3d9/tests/visual.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e099f9c..6a475a6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7943,10 +7943,6 @@ done: DestroyWindow(window); } -struct vertex_shortcolor { - float x, y, z; - unsigned short r, g, b, a; -}; struct vertex_floatcolor { float x, y, z; float r, g, b, a; @@ -8021,12 +8017,17 @@ static void fixed_function_decl_test(void) {{ 0.0f, 0.0f, 0.1f}, 0x00ffff00}, {{ 0.0f, 1.0f, 0.1f}, 0x00ffff00}, }; - static const struct vertex_shortcolor quad3[] = /* short */ + static const struct + { + struct vec3 position; + struct { unsigned short x, y, z, w; } color; + } + quad3[] = /* USHORT4N */ { - { 0.0f, -1.0f, 0.1f, 0x0000, 0x0000, 0xffff, 0xffff}, - { 0.0f, 0.0f, 0.1f, 0x0000, 0x0000, 0xffff, 0xffff}, - { 1.0f, -1.0f, 0.1f, 0x0000, 0x0000, 0xffff, 0xffff}, - { 1.0f, 0.0f, 0.1f, 0x0000, 0x0000, 0xffff, 0xffff}, + {{0.0f, -1.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}}, + {{0.0f, 0.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}}, + {{1.0f, -1.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}}, + {{1.0f, 0.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}}, }; static const struct vertex_floatcolor quad4[] = {

1 0

Henri Verbeet : d3d9/tests: Get rid of struct nvertex.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 1ccf7f5e745543744e4ba301f83e5d9da015d362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccf7f5e745543744e4ba301f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 16 09:09:49 2014 +0200 d3d9/tests: Get rid of struct nvertex. --- dlls/d3d9/tests/visual.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index caf8f75..e099f9c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -209,13 +209,6 @@ static void cleanup_device(IDirect3DDevice9 *device) } } -struct nvertex -{ - float x, y, z; - float nx, ny, nz; - DWORD diffuse; -}; - static void test_sanity(void) { IDirect3DDevice9 *device; @@ -303,19 +296,25 @@ static void lighting_test(void) {{-1.0f, 1.0f, 0.1f}, 0x8000ff00}, {{ 1.0f, 1.0f, 0.1f}, 0x80000000}, }; - static const struct nvertex unlitnquad[] = + static const struct { - { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - }; - static const struct nvertex litnquad[] = + struct vec3 position; + struct vec3 normal; + DWORD diffuse; + } + unlitnquad[] = + { + {{0.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{0.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{1.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + }, + litnquad[] = { - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + {{0.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{0.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{1.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, }; static const WORD Indices[] = {0, 1, 2, 2, 3, 0};

1 0

Henri Verbeet : d3d9/tests: Get rid of struct tvertex.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 86ba5b604e764248934ecbc3283c8dff9bfab235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ba5b604e764248934ecbc32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 16 09:09:48 2014 +0200 d3d9/tests: Get rid of struct tvertex. --- dlls/d3d9/tests/visual.c | 138 ++++++++++++++++++++++++++--------------------- 1 file changed, 76 insertions(+), 62 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b481ddc..caf8f75 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -209,12 +209,6 @@ static void cleanup_device(IDirect3DDevice9 *device) } } -struct tvertex -{ - float x, y, z, rhw; - DWORD diffuse; -}; - struct nvertex { float x, y, z; @@ -2650,19 +2644,24 @@ static void z_range_test(void) {{ 1.0f, 0.0f, -1.1f}, 0xff0000ff}, {{ 1.0f, 1.0f, -1.1f}, 0xff0000ff}, }; - static const struct tvertex quad3[] = + static const struct { - {640.0f, 240.0f, -1.1f, 1.0f, 0xffffff00}, - {640.0f, 480.0f, -1.1f, 1.0f, 0xffffff00}, - { 0.0f, 240.0f, 1.1f, 1.0f, 0xffffff00}, - { 0.0f, 480.0f, 1.1f, 1.0f, 0xffffff00}, - }; - static const struct tvertex quad4[] = + struct vec4 position; + DWORD diffuse; + } + quad3[] = + { + {{640.0f, 240.0f, -1.1f, 1.0f}, 0xffffff00}, + {{640.0f, 480.0f, -1.1f, 1.0f}, 0xffffff00}, + {{ 0.0f, 240.0f, 1.1f, 1.0f}, 0xffffff00}, + {{ 0.0f, 480.0f, 1.1f, 1.0f}, 0xffffff00}, + }, + quad4[] = { - {640.0f, 240.0f, -1.1f, 1.0f, 0xff00ff00}, - {640.0f, 480.0f, -1.1f, 1.0f, 0xff00ff00}, - { 0.0f, 240.0f, 1.1f, 1.0f, 0xff00ff00}, - { 0.0f, 480.0f, 1.1f, 1.0f, 0xff00ff00}, + {{640.0f, 240.0f, -1.1f, 1.0f}, 0xff00ff00}, + {{640.0f, 480.0f, -1.1f, 1.0f}, 0xff00ff00}, + {{ 0.0f, 240.0f, 1.1f, 1.0f}, 0xff00ff00}, + {{ 0.0f, 480.0f, 1.1f, 1.0f}, 0xff00ff00}, }; static const DWORD shader_code[] = { @@ -8078,12 +8077,17 @@ static void fixed_function_decl_test(void) 0.0f, 0.0f, 0.1f, 0.0f, 1.0f, 0.1f, }; - static const struct tvertex quad_transformed[] = + static const struct + { + struct vec4 position; + DWORD diffuse; + } + quad_transformed[] = { - { 90, 110, 0.1, 2.0, 0x00ffff00}, - { 570, 110, 0.1, 2.0, 0x00ffff00}, - { 90, 300, 0.1, 2.0, 0x00ffff00}, - { 570, 300, 0.1, 2.0, 0x00ffff00} + {{ 90.0f, 110.0f, 0.1f, 2.0f}, 0x00ffff00}, + {{570.0f, 110.0f, 0.1f, 2.0f}, 0x00ffff00}, + {{ 90.0f, 300.0f, 0.1f, 2.0f}, 0x00ffff00}, + {{570.0f, 300.0f, 0.1f, 2.0f}, 0x00ffff00}, }; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -12312,33 +12316,38 @@ static void depth_clamp_test(void) HWND window; HRESULT hr; - static const struct tvertex quad1[] = + static const struct { - { 0.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, - {640.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, - { 0.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, - {640.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, - }; - static const struct tvertex quad2[] = + struct vec4 position; + DWORD diffuse; + } + quad1[] = { - { 0.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, - {640.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, - { 0.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, - {640.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, - }; - static const struct tvertex quad3[] = + {{ 0.0f, 0.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{640.0f, 0.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{ 0.0f, 480.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{640.0f, 480.0f, 5.0f, 1.0f}, 0xff002b7f}, + }, + quad2[] = { - {112.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, - {208.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, - {112.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, - {208.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, - }; - static const struct tvertex quad4[] = + {{ 0.0f, 300.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{640.0f, 300.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{ 0.0f, 360.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{640.0f, 360.0f, 10.0f, 1.0f}, 0xfff9e814}, + }, + quad3[] = + { + {{112.0f, 108.0f, 5.0f, 1.0f}, 0xffffffff}, + {{208.0f, 108.0f, 5.0f, 1.0f}, 0xffffffff}, + {{112.0f, 204.0f, 5.0f, 1.0f}, 0xffffffff}, + {{208.0f, 204.0f, 5.0f, 1.0f}, 0xffffffff}, + }, + quad4[] = { - { 42.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, - {112.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, - { 42.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, - {112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, + {{ 42.0f, 41.0f, 10.0f, 1.0f}, 0xffffffff}, + {{112.0f, 41.0f, 10.0f, 1.0f}, 0xffffffff}, + {{ 42.0f, 108.0f, 10.0f, 1.0f}, 0xffffffff}, + {{112.0f, 108.0f, 10.0f, 1.0f}, 0xffffffff}, }; static const struct { @@ -12482,26 +12491,31 @@ done: static void depth_bounds_test(void) { - const struct tvertex quad1[] = + static const struct { - { 0, 0, 0.0f, 1, 0xfff9e814}, - { 640, 0, 0.0f, 1, 0xfff9e814}, - { 0, 480, 1.0f, 1, 0xfff9e814}, - { 640, 480, 1.0f, 1, 0xfff9e814}, - }; - const struct tvertex quad2[] = + struct vec4 position; + DWORD diffuse; + } + quad1[] = { - { 0, 0, 0.6f, 1, 0xff002b7f}, - { 640, 0, 0.6f, 1, 0xff002b7f}, - { 0, 480, 0.6f, 1, 0xff002b7f}, - { 640, 480, 0.6f, 1, 0xff002b7f}, - }; - const struct tvertex quad3[] = + {{ 0.0f, 0.0f, 0.0f, 1.0f}, 0xfff9e814}, + {{640.0f, 0.0f, 0.0f, 1.0f}, 0xfff9e814}, + {{ 0.0f, 480.0f, 1.0f, 1.0f}, 0xfff9e814}, + {{640.0f, 480.0f, 1.0f, 1.0f}, 0xfff9e814}, + }, + quad2[] = + { + {{ 0.0f, 0.0f, 0.6f, 1.0f}, 0xff002b7f}, + {{640.0f, 0.0f, 0.6f, 1.0f}, 0xff002b7f}, + {{ 0.0f, 480.0f, 0.6f, 1.0f}, 0xff002b7f}, + {{640.0f, 480.0f, 0.6f, 1.0f}, 0xff002b7f}, + }, + quad3[] = { - { 0, 100, 0.6f, 1, 0xfff91414}, - { 640, 100, 0.6f, 1, 0xfff91414}, - { 0, 160, 0.6f, 1, 0xfff91414}, - { 640, 160, 0.6f, 1, 0xfff91414}, + {{ 0.0f, 100.0f, 0.6f, 1.0f}, 0xfff91414}, + {{640.0f, 100.0f, 0.6f, 1.0f}, 0xfff91414}, + {{ 0.0f, 160.0f, 0.6f, 1.0f}, 0xfff91414}, + {{640.0f, 160.0f, 0.6f, 1.0f}, 0xfff91414}, }; union {

1 0

Henri Verbeet : d3d9/tests: Get rid of struct vertex.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 51f5bc903a26570ba1c3205d863e99e92fe07d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f5bc903a26570ba1c3205d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 16 09:09:47 2014 +0200 d3d9/tests: Get rid of struct vertex. --- dlls/d3d9/tests/visual.c | 541 ++++++++++++++++++++++++++++------------------- 1 file changed, 320 insertions(+), 221 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51f5bc903a26570ba1c32…

1 0

Julian Rüger : German translation for release 1.7.22
by Jeremy Newman 16 Jul '14

16 Jul '14

Module: website Branch: master Commit: fdfe513040af7374b4b73ca30f90f1b2824c3022 URL: http://source.winehq.org/git/website.git/?a=commit;h=fdfe513040af7374b4b73c… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jul 16 00:24:37 2014 +0200 German translation for release 1.7.22 --- news/de/2014071101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014071101.xml b/news/de/2014071101.xml new file mode 100644 index 0000000..8f5d33b --- /dev/null +++ b/news/de/2014071101.xml @@ -0,0 +1,16 @@ +<news> +<date>11. Juli 2014</date> +<title>Wine 1.7.22 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.22 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.22">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von Unicode-Klammerpaaren.</li> + <li>Verbesserte Internet-Cookie Unterstützung.</li> + <li>OS X CoreAudio-Treiber benutzt AUHAL an Stelle von AudioQueue.</li> + <li>Anfängliche Unterstützung von Geografischen Informationen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.22.tar.bz2">verfügbar</a>. +15 Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Jacek Caban : wininet: Added new cookie_set_t type and use it in get_cookie.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: e24ce4c128d91f7eb0bf727246ec36eb2fbc4092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e24ce4c128d91f7eb0bf72724… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 15 17:13:03 2014 +0200 wininet: Added new cookie_set_t type and use it in get_cookie. --- dlls/wininet/cookie.c | 158 +++++++++++++++++++++++++++++++++--------------- dlls/wininet/http.c | 17 ++---- dlls/wininet/internet.h | 2 +- 3 files changed, 114 insertions(+), 63 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 2c8dd84..d98a127 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -555,15 +555,23 @@ static BOOL COOKIE_crackUrlSimple(LPCWSTR lpszUrl, LPWSTR hostName, int hostName return TRUE; } -DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD *size, DWORD flags) +typedef struct { + cookie_t **cookies; + unsigned cnt; + unsigned size; + + unsigned string_len; +} cookie_set_t; + +static DWORD get_cookie(const WCHAR *host, const WCHAR *path, DWORD flags, cookie_set_t *res) { static const WCHAR empty_path[] = { '/',0 }; - unsigned cnt = 0, len, name_len, domain_count = 0, cookie_count = 0; WCHAR *ptr, subpath[INTERNET_MAX_PATH_LENGTH]; const WCHAR *p; cookie_domain_t *domain; cookie_container_t *container; + unsigned len; FILETIME tm; GetSystemTimeAsFileTime(&tm); @@ -600,8 +608,6 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD return ERROR_NO_MORE_ITEMS; } - ptr = cookie_data; - for(domain = get_cookie_domain(host, FALSE); domain; domain = domain->parent) { TRACE("Trying %s domain...\n", debugstr_w(domain->domain)); @@ -613,7 +619,6 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD if(!cookie_match_path(container, path)) continue; - domain_count++; TRACE("found domain %p\n", domain->domain); LIST_FOR_EACH_SAFE(cursor, cursor2, &container->cookie_list) { @@ -630,62 +635,93 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD if((cookie_iter->flags & INTERNET_COOKIE_HTTPONLY) && !(flags & INTERNET_COOKIE_HTTPONLY)) continue; - if (cookie_count) - cnt += 2; /* '; ' */ - cnt += name_len = strlenW(cookie_iter->name); - if ((len = strlenW(cookie_iter->data))) { - cnt += 1; /* = */ - cnt += len; + if(res->size) { + cookie_t **new_cookies = heap_realloc(res->cookies, res->size*2*sizeof(*res->cookies)); + if(!new_cookies) + continue; + res->cookies = new_cookies; + res->size *= 2; + }else { + res->cookies = heap_alloc(4*sizeof(*res->cookies)); + if(!res->cookies) + continue; + res->size = 4; } - if(ptr) { - if(*size > cnt) { - if(cookie_count) { - *ptr++ = ';'; - *ptr++ = ' '; - } + if(res->cnt) + res->string_len += 2; /* '; ' */ + res->cookies[res->cnt++] = cookie_iter; - memcpy(ptr, cookie_iter->name, name_len*sizeof(WCHAR)); - ptr += name_len; - - if(len) { - *ptr++ = '='; - memcpy(ptr, cookie_iter->data, len*sizeof(WCHAR)); - ptr += len; - } - - assert(cookie_data+cnt == ptr); - TRACE("Cookie: %s\n", debugstr_wn(cookie_data, cnt)); - }else { - /* Stop writing data, just compute the size */ - ptr = NULL; - } - } - - cookie_count++; + res->string_len += strlenW(cookie_iter->name); + if(*cookie_iter->data) + res->string_len += 1 /* = */ + strlenW(cookie_iter->data); } } } LeaveCriticalSection(&cookie_cs); + return ERROR_SUCCESS; +} - if(ptr) - *ptr = 0; +static void cookie_set_to_string(const cookie_set_t *cookie_set, WCHAR *str) +{ + WCHAR *ptr = str; + unsigned i, len; - if (!cnt) { - TRACE("no cookies found for %s\n", debugstr_w(host)); - return ERROR_NO_MORE_ITEMS; + for(i=0; i<cookie_set->cnt; i++) { + if(i) { + *ptr++ = ';'; + *ptr++ = ' '; + } + + len = strlenW(cookie_set->cookies[i]->name); + memcpy(ptr, cookie_set->cookies[i]->name, len*sizeof(WCHAR)); + ptr += len; + + if(*cookie_set->cookies[i]->data) { + *ptr++ = '='; + len = strlenW(cookie_set->cookies[i]->data); + memcpy(ptr, cookie_set->cookies[i]->data, len*sizeof(WCHAR)); + ptr += len; + } } - if(!cookie_data || !ptr) { - *size = (cnt + 1) * sizeof(WCHAR); - TRACE("returning %u\n", *size); - return cookie_data ? ERROR_INSUFFICIENT_BUFFER : ERROR_SUCCESS; + assert(ptr-str == cookie_set->string_len); + TRACE("%s\n", debugstr_wn(str, ptr-str)); +} + +DWORD get_cookie_header(const WCHAR *host, const WCHAR *path, WCHAR **ret) +{ + cookie_set_t cookie_set = {0}; + WCHAR *header, *ptr; + DWORD res; + + static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '}; + + res = get_cookie(host, path, INTERNET_COOKIE_HTTPONLY, &cookie_set); + if(res != ERROR_SUCCESS) + return res; + if(!cookie_set.cnt) { + *ret = NULL; + return ERROR_SUCCESS; } - *size = cnt + 1; + ptr = header = heap_alloc(sizeof(cookieW) + (cookie_set.string_len + 3 /* crlf0 */) * sizeof(WCHAR)); + if(!header) + return ERROR_NOT_ENOUGH_MEMORY; + + memcpy(ptr, cookieW, sizeof(cookieW)); + ptr += sizeof(cookieW)/sizeof(*cookieW); + + cookie_set_to_string(&cookie_set, ptr); + heap_free(cookie_set.cookies); + ptr += cookie_set.string_len; - TRACE("Returning %u (from %u domains): %s\n", cnt, domain_count, debugstr_w(cookie_data)); + *ptr++ = '\r'; + *ptr++ = '\n'; + *ptr++ = 0; + + *ret = header; return ERROR_SUCCESS; } @@ -706,6 +742,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, LPWSTR lpCookieData, LPDWORD lpdwSize, DWORD flags, void *reserved) { WCHAR host[INTERNET_MAX_HOST_NAME_LENGTH], path[INTERNET_MAX_PATH_LENGTH]; + cookie_set_t cookie_set = {0}; DWORD res; BOOL ret; @@ -727,10 +764,33 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, return FALSE; } - res = get_cookie(host, path, lpCookieData, lpdwSize, flags); - if(res != ERROR_SUCCESS) + res = get_cookie(host, path, flags, &cookie_set); + if(res != ERROR_SUCCESS) { SetLastError(res); - return res == ERROR_SUCCESS; + return FALSE; + } + + if(!cookie_set.cnt) { + TRACE("no cookies found for %s\n", debugstr_w(host)); + SetLastError(ERROR_NO_MORE_ITEMS); + return FALSE; + } + + if(!lpCookieData || cookie_set.string_len+1 > *lpdwSize) { + *lpdwSize = (cookie_set.string_len + 1) * sizeof(WCHAR); + TRACE("returning %u\n", *lpdwSize); + if(lpCookieData) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + }else { + *lpdwSize = cookie_set.string_len + 1; + cookie_set_to_string(&cookie_set, lpCookieData); + lpCookieData[cookie_set.string_len] = 0; + } + + heap_free(cookie_set.cookies); + return ret; } /*********************************************************************** diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8ff42a2..2486fbf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4176,24 +4176,15 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) static void HTTP_InsertCookies(http_request_t *request) { - DWORD cookie_size, size, cnt = 0; WCHAR *cookies; + DWORD res; - static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' ',0}; - - if(get_cookie(request->server->name, request->path, NULL, &cookie_size, INTERNET_COOKIE_HTTPONLY) != ERROR_SUCCESS) - return; - - size = sizeof(cookieW) + cookie_size * sizeof(WCHAR) + sizeof(szCrLf); - if(!(cookies = heap_alloc(size))) + res = get_cookie_header(request->server->name, request->path, &cookies); + if(res != ERROR_SUCCESS || !cookies) return; - cnt += sprintfW(cookies, cookieW); - get_cookie(request->server->name, request->path, cookies+cnt, &cookie_size, INTERNET_COOKIE_HTTPONLY); - strcatW(cookies, szCrLf); - + get_cookie_header(request->server->name, request->path, &cookies); HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE); - heap_free(cookies); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 2647f98..54f688d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -420,7 +420,7 @@ DWORD HTTP_Connect(appinfo_t*,LPCWSTR, BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, struct sockaddr *psa, socklen_t *sa_len) DECLSPEC_HIDDEN; -DWORD get_cookie(const WCHAR*,const WCHAR*,WCHAR*,DWORD*,DWORD) DECLSPEC_HIDDEN; +DWORD get_cookie_header(const WCHAR*,const WCHAR*,WCHAR**) DECLSPEC_HIDDEN; DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD) DECLSPEC_HIDDEN; void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
29
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 July 2014