July 2014 - Wine-Commits - list.winehq.org

Austin English : dbghelp: Ignore a few more symbol ids.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 8980a6fa5c1128650d478739debef10f56bcd300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8980a6fa5c1128650d478739d… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 11 19:17:35 2014 -0700 dbghelp: Ignore a few more symbol ids. --- dlls/dbghelp/msc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index d797a4a..5e8804f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1988,7 +1988,12 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo case S_SECTINFO_V3: case S_SUBSECTINFO_V3: case S_ENTRYPOINT_V3: + case 0x113e: case 0x1139: + case 0x1141: + case 0x1142: + case 0x1143: + case 0x1144: TRACE("Unsupported symbol id %x\n", sym->generic.id); break;

1 0

Frédéric Delanoy : French translation for release 1.7.22
by Jeremy Newman July 14, 2014

July 14, 2014

Module: website Branch: master Commit: e25c954b5ecd51a18e38689c38d102eccbf0a680 URL: http://source.winehq.org/git/website.git/?a=commit;h=e25c954b5ecd51a18e3868… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 12 09:57:20 2014 +0200 French translation for release 1.7.22 --- news/fr/2014071101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014071101.xml b/news/fr/2014071101.xml new file mode 100644 index 0000000..c3b315b --- /dev/null +++ b/news/fr/2014071101.xml @@ -0,0 +1,15 @@ +<news> +<date>11 juillet 2014</date> +<title>Sortie de Wine 1.7.22</title> +<body> + La version de développement 1.7.22 de Wine est disponible. + <a href="{$root}/announce/1.7.22">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des paires de crochets Unicode.</li> + <li>Meilleure prise en charge des cookies Internet.</li> + <li>Le pilote OS X CoreAudio utilise AUHAL au lieu de AudioQueue.</li> + <li>Prise en charge initiale des informations géographiques.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.22.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.22
by Jeremy Newman July 14, 2014

July 14, 2014

Module: website Branch: master Commit: a18208d21a2b8266fe71d396965273b3c074f602 URL: http://source.winehq.org/git/website.git/?a=commit;h=a18208d21a2b8266fe71d3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jul 12 06:28:09 2014 +0200 Polish translation for release 1.7.22 --- news/pl/2014071101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2014071101.xml b/news/pl/2014071101.xml new file mode 100644 index 0000000..8c1ca3e --- /dev/null +++ b/news/pl/2014071101.xml @@ -0,0 +1,16 @@ +<news> +<date>Lipiec 11, 2014</date> +<title>Wydano Wine 1.7.22</title> +<body> + Wydanie rozwojowe Wine 1.7.22 jest już dostępne. + <a href="{$root}/announce/1.7.22">Co nowego</a> w tym wydaniu: +<ul> + <li>Obsługa par znaków Unicode służących do wtrąceń w zdaniach.</li> + <li>Ulepszona obsługa ciasteczek internetowych.</li> + <li>Sterownik CoreAudio dla OS X używa AUHAL zamiast AudioQueue.</li> + <li>Wstępna obsługa informacji geograficznych.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.22.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.22
by Alexandre Julliard July 11, 2014

July 11, 2014

Module: website Branch: master Commit: 85d7538ee80caa1c36a4dfaba37bb786eb5402c9 URL: http://source.winehq.org/git/website.git/?a=commit;h=85d7538ee80caa1c36a4df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 11 20:37:42 2014 +0200 Wine release 1.7.22 --- news/en/2014071101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014071101.xml b/news/en/2014071101.xml new file mode 100644 index 0000000..972fc75 --- /dev/null +++ b/news/en/2014071101.xml @@ -0,0 +1,16 @@ +<news> +<date>July 11, 2014</date> +<title>Wine 1.7.22 Released</title> +<body> + The Wine development release 1.7.22 is now available. + <a href="{$root}/announce/1.7.22">What's new</a> in this release: +<ul> + <li>Support for Unicode bracketing pairs.</li> + <li>Improved Internet cookie support.</li> + <li>OS X CoreAudio driver uses AUHAL instead of AudioQueue.</li> + <li>Initial support for geographical information.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.22.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.7.22.
by Alexandre Julliard July 11, 2014

July 11, 2014

Module: wine Branch: master Commit: 307b7fe71879b718512dadc09fd4b533f6bdd151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=307b7fe71879b718512dadc09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 11 20:29:24 2014 +0200 Release 1.7.22. --- ANNOUNCE | 528 ++++++++++++++++++++++++++------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 233 insertions(+), 316 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=307b7fe71879b718512da…

1 0

Jacek Caban : wininet: Don' t allow overriding httponly cookies with non-httponly ones.
by Alexandre Julliard July 11, 2014

July 11, 2014

Module: wine Branch: master Commit: f72975d811a7622f32d66315276a9c8857f20090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f72975d811a7622f32d663152… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 11 12:20:31 2014 +0200 wininet: Don't allow overriding httponly cookies with non-httponly ones. --- dlls/wininet/cookie.c | 8 ++++++++ dlls/wininet/tests/internet.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 0af8c38..8bf8953 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -963,6 +963,14 @@ DWORD set_cookie(const WCHAR *domain, const WCHAR *path, const WCHAR *cookie_nam if ((thisCookie = COOKIE_findCookie(thisCookieDomain, cookie_name))) { + if ((thisCookie->flags & INTERNET_COOKIE_HTTPONLY) && !(flags & INTERNET_COOKIE_HTTPONLY)) { + WARN("An attempt to override httponly cookie\n"); + SetLastError(ERROR_INVALID_OPERATION); + heap_free(data); + if (value != data) heap_free(value); + return COOKIE_STATE_REJECT; + } + if (!(thisCookie->flags & INTERNET_COOKIE_IS_SESSION)) update_persistent = TRUE; COOKIE_deleteCookie(thisCookie, FALSE); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 17e16ab..688f786 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -595,6 +595,21 @@ static void test_cookie_attrs(void) ret = InternetGetCookieExA("http://cookie.attrs.com/", NULL, buf, &size, INTERNET_COOKIE_HTTPONLY, NULL); ok(ret, "InternetGetCookieEx failed: %u\n", GetLastError()); ok(!strcmp(buf, "A=data"), "data = %s\n", buf); + + /* Try to override httponly cookie with non-httponly one */ + ret = InternetSetCookieA("http://cookie.attrs.com/bar", NULL, "A=test"); + ok(!ret && GetLastError() == ERROR_INVALID_OPERATION, "InternetSetCookie returned: %x (%u)\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + state = InternetSetCookieExA("http://cookie.attrs.com/bar", NULL, "A=data", 0, 0); + ok(state == COOKIE_STATE_REJECT && GetLastError() == ERROR_INVALID_OPERATION, + "InternetSetCookieEx returned: %x (%u)\n", ret, GetLastError()); + + size = sizeof(buf); + ret = InternetGetCookieExA("http://cookie.attrs.com/", NULL, buf, &size, INTERNET_COOKIE_HTTPONLY, NULL); + ok(ret, "InternetGetCookieEx failed: %u\n", GetLastError()); + ok(!strcmp(buf, "A=data"), "data = %s\n", buf); + } static void test_cookie_url(void)

1 0

Qian Hong : gdiplus: Set outer pointer to NULL when image loading functions fail.
by Alexandre Julliard July 11, 2014

July 11, 2014

Module: wine Branch: master Commit: deb1f047a7dc1c3bc84ab4a0b6588d7b32a261c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb1f047a7dc1c3bc84ab4a0b… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jul 11 15:55:53 2014 +0800 gdiplus: Set outer pointer to NULL when image loading functions fail. --- dlls/gdiplus/image.c | 4 ++++ dlls/gdiplus/tests/image.c | 30 +++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 20098ca..7964cd8 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1387,6 +1387,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename, if(!filename || !bitmap) return InvalidParameter; + *bitmap = NULL; + stat = GdipCreateStreamOnFile(filename, GENERIC_READ, &stream); if(stat != Ok) @@ -2945,6 +2947,8 @@ GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR* filename, if (!filename || !image) return InvalidParameter; + *image = NULL; + stat = GdipCreateStreamOnFile(filename, GENERIC_READ, &stream); if (stat != Ok) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index db0bc6a..b88238b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -374,24 +374,48 @@ static void test_GdipImageGetFrameDimensionsCount(void) static void test_LoadingImages(void) { GpStatus stat; + GpBitmap *bm; + GpImage *img; + static const WCHAR nonexistentW[] = {'n','o','n','e','x','i','s','t','e','n','t',0}; stat = GdipCreateBitmapFromFile(0, 0); expect(InvalidParameter, stat); - stat = GdipCreateBitmapFromFile(0, (GpBitmap**)0xdeadbeef); + bm = (GpBitmap *)0xdeadbeef; + stat = GdipCreateBitmapFromFile(0, &bm); expect(InvalidParameter, stat); + ok(bm == (GpBitmap *)0xdeadbeef, "returned %p\n", bm); + + bm = (GpBitmap *)0xdeadbeef; + stat = GdipCreateBitmapFromFile(nonexistentW, &bm); + todo_wine expect(InvalidParameter, stat); + ok(!bm, "returned %p\n", bm); stat = GdipLoadImageFromFile(0, 0); expect(InvalidParameter, stat); - stat = GdipLoadImageFromFile(0, (GpImage**)0xdeadbeef); + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFile(0, &img); expect(InvalidParameter, stat); + ok(img == (GpImage *)0xdeadbeef, "returned %p\n", img); + + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFile(nonexistentW, &img); + todo_wine expect(OutOfMemory, stat); + ok(!img, "returned %p\n", img); stat = GdipLoadImageFromFileICM(0, 0); expect(InvalidParameter, stat); - stat = GdipLoadImageFromFileICM(0, (GpImage**)0xdeadbeef); + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFileICM(0, &img); expect(InvalidParameter, stat); + ok(img == (GpImage *)0xdeadbeef, "returned %p\n", img); + + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFileICM(nonexistentW, &img); + todo_wine expect(OutOfMemory, stat); + ok(!img, "returned %p\n", img); } static void test_SavingImages(void)

1 0

Nikolay Sivov : kernel32: Partially implement GetGeoInfo().
by Alexandre Julliard July 11, 2014

July 11, 2014

Module: wine Branch: master Commit: b4acc62e6304b1a13cca26df19da82065abcc4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4acc62e6304b1a13cca26df1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 11 06:36:18 2014 +0400 kernel32: Partially implement GetGeoInfo(). --- dlls/kernel32/locale.c | 464 ++++++++++++++++++++++++++++++++++++++++++- dlls/kernel32/tests/locale.c | 111 +++++++++-- include/winnls.h | 4 +- 3 files changed, 553 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4acc62e6304b1a13cca2…

1 0

Tag wine-1.7.22 : Alexandre Julliard : Release 1.7.22
by Alexandre Julliard July 11, 2014

July 11, 2014

Module: wine Branch: refs/tags/wine-1.7.22 Tag: 4c9393a7c1eb0c5665e68e3523b57bc74e56dc00 URL: http://source.winehq.org/git/wine.git/?a=tag;h=4c9393a7c1eb0c5665e68e3523b5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 11 20:29:24 2014 +0200 Release 1.7.22

1 0

Piotr Caban : urlmon: Recognize <body> tag in FindMimeFromData function.
by Alexandre Julliard July 11, 2014

July 11, 2014

Module: wine Branch: master Commit: df8a1ce6097b9ecff38ad4caec8900a4f0870f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df8a1ce6097b9ecff38ad4cae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 11 16:23:08 2014 +0200 urlmon: Recognize <body> tag in FindMimeFromData function. --- dlls/urlmon/mimefilter.c | 7 ++++++- dlls/urlmon/tests/misc.c | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c index 4f47a04..55cd200 100644 --- a/dlls/urlmon/mimefilter.c +++ b/dlls/urlmon/mimefilter.c @@ -280,7 +280,12 @@ static BOOL text_html_filter(const BYTE *b, DWORD size) && (b[1] == 'h' || b[1] == 'H') && (b[2] == 'e' || b[2] == 'E') && (b[3] == 'a' || b[3] == 'A') - && (b[4] == 'd' || b[4] == 'D'))) return TRUE; + && (b[4] == 'd' || b[4] == 'D')) + || (b[0] == '<' + && (b[1] == 'b' || b[1] == 'B') + && (b[2] == 'o' || b[2] == 'O') + && (b[3] == 'd' || b[3] == 'D') + && (b[4] == 'y' || b[4] == 'Y'))) return TRUE; return FALSE; } diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 7071aa9..4c845aa 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -575,6 +575,8 @@ static BYTE data93[] = {'<','?','x','m','l',' ',' ','<','h','t','m','l','>'}; static BYTE data94[] = {'<','h','t','m','l','>','<','?','x','m','l',' ',' '}; static BYTE data95[] = {'{','\\','r','t','f','<','?','x','m','l',' ',' '}; static BYTE data96[] = {'<','?','x','m','l',' '}; +static BYTE data97[] = "<body"; +static BYTE data98[] = "blah<BoDyblahblah"; static const struct { BYTE *data; @@ -681,6 +683,8 @@ static const struct { {data94, sizeof(data94), "text/html", "text/plain"}, {data95, sizeof(data95), "text/xml", "text/richtext"}, {data96, sizeof(data96), "text/plain"}, + {data97, sizeof(data97), "text/html", "text/plain"}, + {data98, sizeof(data98), "text/html", "text/plain"}, {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm"}, {NULL, 0, "text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm", "application/octet-stream"},

1 0

Vincent Povirk : winex11: Leave fullscreen state alone when minimizing.
by Alexandre Julliard July 11, 2014

July 11, 2014

Module: wine Branch: master Commit: 5e5a9d6f937c69b1546a922205ba8daa40ebb1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5a9d6f937c69b1546a92220… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 10 15:29:29 2014 -0500 winex11: Leave fullscreen state alone when minimizing. --- dlls/winex11.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 77cf304..06e2294 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -974,6 +974,8 @@ void update_net_wm_states( struct x11drv_win_data *data ) if (data->whole_window == root_window) return; style = GetWindowLongW( data->hwnd, GWL_STYLE ); + if (style & WS_MINIMIZE) + new_state |= data->net_wm_state & (1 << NET_WM_STATE_FULLSCREEN); if (is_window_rect_fullscreen( &data->whole_rect )) { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION)

1 0

Shuai Meng : vbscript: Implemented Sgn.
by Alexandre Julliard July 11, 2014

July 11, 2014

Module: wine Branch: master Commit: 0b13d721c27c2ede6a0e15d7822b37f6ef57f84e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b13d721c27c2ede6a0e15d78… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Fri Jul 11 11:47:45 2014 +0800 vbscript: Implemented Sgn. --- dlls/vbscript/global.c | 53 ++++++++++++++++++++------------------------- dlls/vbscript/tests/api.vbs | 31 ++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 56 insertions(+), 29 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index fa53757..fa06353 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -182,35 +182,15 @@ HRESULT to_int(VARIANT *v, int *ret) static HRESULT to_double(VARIANT *v, double *ret) { - switch(V_VT(v)) { - case VT_I2: - *ret = V_I2(v); - break; - case VT_I4: - *ret = V_I4(v); - break; - case VT_R4: - *ret = V_R4(v); - break; - case VT_R8: - *ret = V_R8(v); - break; - case VT_BSTR: { - VARIANT dst; - HRESULT hres; + VARIANT dst; + HRESULT hres; - V_VT(&dst) = VT_EMPTY; - hres = VariantChangeType(&dst, v, VARIANT_LOCALBOOL, VT_R8); - if(FAILED(hres)) - return hres; - *ret = V_R8(&dst); - break; - } - default: - FIXME("arg %s not supported\n", debugstr_variant(v)); - return E_NOTIMPL; - } + V_VT(&dst) = VT_EMPTY; + hres = VariantChangeType(&dst, v, 0, VT_R8); + if(FAILED(hres)) + return hres; + *ret = V_R8(&dst); return S_OK; } @@ -1284,8 +1264,23 @@ static HRESULT Global_Int(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + double v; + short val; + HRESULT hres; + + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_double(arg, &v); + if (FAILED(hres)) + return hres; + + val = v == 0 ? 0 : (v > 0 ? 1 : -1); + return return_short(res, val); } static HRESULT Global_Now(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 abdb6c7..33596d3 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -878,4 +878,35 @@ Call ok(getVT(VarType(CBool(0.5))) = "VT_I2", "getVT(VarType(CBool(0.5))) = " & Call ok(VarType(CByte(255)) = vbByte, "VarType(CByte(255)) = " & VarType(CByte(255))) Call ok(getVT(VarType(CByte(255))) = "VT_I2", "getVT(VarType(CByte(255))) = " & getVT(VarType(CByte(255)))) +Call ok(Sgn(Empty) = 0, "Sgn(MyEmpty) = " & Sgn(Empty)) +Call ok(getVT(Sgn(Empty)) = "VT_I2", "getVT(Sgn(MyEmpty)) = " & getVT(Sgn(Empty))) +Call ok(Sgn(0) = 0, "Sgn(0) = " & Sgn(0)) +Call ok(getVT(Sgn(0)) = "VT_I2", "getVT(Sgn(0)) = " & getVT(Sgn(0))) +Call ok(Sgn(-32769) = -1, "Sgn(-32769) = " & Sgn(-32769)) +Call ok(getVT(Sgn(-32769)) = "VT_I2", "getVT(Sgn(-32769)) = " & getVT(Sgn(-32769))) +Call ok(Sgn(CSng(-0.5)) = -1, "Sgn(CSng(-0.5)) = " & Sgn(CSng(-0.5))) +Call ok(getVT(Sgn(CSng(-0.5))) = "VT_I2", "getVT(Sgn(CSng(-0.5))) = " & getVT(Sgn(CSng(-0.5)))) +Call ok(Sgn(0.5) = 1, "Sgn(0.5) = " & Sgn(0.5)) +Call ok(getVT(Sgn(0.5)) = "VT_I2", "getVT(Sgn(0.5)) = " & getVT(Sgn(0.5))) +Call ok(Sgn(CCur(-1)) = -1, "Sgn(CCur(-1)) = " & Sgn(CCur(-1))) +Call ok(getVT(Sgn(CCur(-1))) = "VT_I2", "getVT(Sgn(CCur(-1))) = " & getVT(Sgn(CCur(-1)))) +Call ok(Sgn(CStr(-1)) = -1, "Sgn(CStr(-1)) = " & Sgn(CStr(-1))) +Call ok(getVT(Sgn(CStr(-1))) = "VT_I2", "getVT(Sgn(CStr(-1))) = " & getVT(Sgn(CStr(-1)))) +Call ok(Sgn(False) = 0, "Sgn(False) = " & Sgn(False)) +Call ok(getVT(Sgn(False)) = "VT_I2", "getVT(Sgn(False)) = " & getVT(Sgn(False))) +Call ok(Sgn(True) = -1, "Sgn(True) = " & Sgn(True)) +Call ok(getVT(Sgn(True)) = "VT_I2", "getVT(Sgn(True)) = " & getVT(Sgn(True))) +Call ok(Sgn(CByte(1)) = 1, "Sgn(CByte(1)) = " & Sgn(CByte(1))) +Call ok(getVT(Sgn(CByte(1))) ="VT_I2", "getVT(Sgn(CByte(1))) = " & getVT(Sgn(CByte(1)))) + +Sub testSgnError(strings, error_num) + on error resume next + + Call Err.clear() + Call Sgn(strings) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +Call testSgnError(Null, 94) + Call reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index c2fedd6..ed9491c 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -406,6 +406,7 @@ HRESULT map_hres(HRESULT) DECLSPEC_HIDDEN; #define VBSE_PERMISSION_DENIED 70 #define VBSE_PATH_FILE_ACCESS 75 #define VBSE_PATH_NOT_FOUND 76 +#define VBSE_ILLEGAL_NULL_USE 94 #define VBSE_OLE_NOT_SUPPORTED 430 #define VBSE_OLE_NO_PROP_OR_METHOD 438 #define VBSE_ACTION_NOT_SUPPORTED 445

1 0

Shuai Meng : vbscript: Implemented VarType.
by Alexandre Julliard July 11, 2014

July 11, 2014

Module: wine Branch: master Commit: 393f4bc5475f87150187d3c0f19db99db169feac URL: http://source.winehq.org/git/wine.git/?a=commit;h=393f4bc5475f87150187d3c0f… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Fri Jul 11 11:43:28 2014 +0800 vbscript: Implemented VarType. --- dlls/vbscript/global.c | 12 ++++++++++-- dlls/vbscript/tests/api.vbs | 21 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5a12729..fa53757 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -602,8 +602,16 @@ static HRESULT Global_Oct(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_VarType(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(V_VT(arg) & ~VT_TYPEMASK) { + FIXME("not supported %s\n", debugstr_variant(arg)); + return E_NOTIMPL; + } + + return return_short(res, V_VT(arg)); } static HRESULT Global_IsDate(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 ded9b8b..abdb6c7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -857,4 +857,25 @@ 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(VarType(Empty) = vbEmpty, "VarType(Empty) = " & VarType(Empty)) +Call ok(getVT(VarType(Empty)) = "VT_I2", "getVT(VarType(Empty)) = " & getVT(VarType(Empty))) +Call ok(VarType(Null) = vbNull, "VarType(Null) = " & VarType(Null)) +Call ok(getVT(VarType(Null)) = "VT_I2", "getVT(VarType(Null)) = " & getVT(VarType(Null))) +Call ok(VarType(255) = vbInteger, "VarType(255) = " & VarType(255)) +Call ok(getVT(VarType(255)) = "VT_I2", "getVT(VarType(255)) = " & getVT(VarType(255))) +Call ok(VarType(32768) = vbLong, "VarType(32768) = " & VarType(32768)) +Call ok(getVT(VarType(32768)) = "VT_I2", "getVT(VarType(32768)) = " & getVT(VarType(32768))) +Call ok(VarType(CSng(0.5)) = vbSingle, "VarType(CSng(0.5)) = " & VarType(CSng(0.5))) +Call ok(getVT(VarType(CSng(0.5))) = "VT_I2", "getVT(VarType(CSng(0.5))) = " & getVT(VarType(CSng(0.5)))) +Call ok(VarType(-0.5) = vbDouble, "VarType(-0.5) = " & VarType(-0.5)) +Call ok(getVT(VarType(-0.5)) = "VT_I2", "getVT(VarType(-0.5)) = " & getVT(VarType(-0.5))) +Call ok(VarType(CCur(0.5)) = vbCurrency, "VarType(CCur(0.5)) = " & VarType(CCur(0.5))) +Call ok(getVT(VarType(CCur(0.5))) = "VT_I2", "getVT(VarType(CCur(0.5))) = " & getVT(VarType(CCur(0.5)))) +Call ok(VarType(CStr(0.5)) = vbString, "VarType(CStr(0.5)) = " & VarType(CStr(0.5))) +Call ok(getVT(VarType(CStr(0.5))) = "VT_I2", "getVT(VarType(CStr(0.5))) = " & getVT(VarType(CStr(0.5)))) +Call ok(VarType(CBool(0.5)) = vbBoolean, "VarType(CBool(0.5)) = " & VarType(CBool(0.5))) +Call ok(getVT(VarType(CBool(0.5))) = "VT_I2", "getVT(VarType(CBool(0.5))) = " & getVT(VarType(CBool(0.5)))) +Call ok(VarType(CByte(255)) = vbByte, "VarType(CByte(255)) = " & VarType(CByte(255))) +Call ok(getVT(VarType(CByte(255))) = "VT_I2", "getVT(VarType(CByte(255))) = " & getVT(VarType(CByte(255)))) + Call reportSuccess()

1 0

Qian Hong : gdi32/tests: Improve font name localization tests by not requiring a strict language match.
by Alexandre Julliard July 10, 2014

July 10, 2014

Module: wine Branch: master Commit: 887a6832bb6e70c5813da7dd65cb89a7eb17ce64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887a6832bb6e70c5813da7dd6… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Jul 10 12:59:13 2014 +0800 gdi32/tests: Improve font name localization tests by not requiring a strict language match. --- dlls/gdi32/tests/font.c | 251 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 218 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=887a6832bb6e70c5813da…

1 0

Gediminas Jakutis : d3dx9: Implement D3DXCreateTorus() + tests.
by Alexandre Julliard July 10, 2014

July 10, 2014

Module: wine Branch: master Commit: fe802d92bbe40d68e3ce61e1f30de1f0db531224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe802d92bbe40d68e3ce61e1f… Author: Gediminas Jakutis <gediminas(a)varciai.lt> Date: Thu Jul 10 04:26:11 2014 +0300 d3dx9: Implement D3DXCreateTorus() + tests. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 107 +++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/mesh.c | 160 ++++++++++++++++++++++++++++++++++++++++++++ include/d3dx9shape.h | 2 + 4 files changed, 270 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe802d92bbe40d68e3ce6…

1 0

Piotr Caban : msvcrt: Always set fd to -1 in _sopen_s on failure.
by Alexandre Julliard July 10, 2014

July 10, 2014

Module: wine Branch: master Commit: a5665693053b15a148407481c603a848fa183726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5665693053b15a148407481c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 10 15:12:12 2014 +0200 msvcrt: Always set fd to -1 in _sopen_s on failure. --- dlls/msvcrt/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8b12ae9..0e5deba 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2185,6 +2185,9 @@ int CDECL MSVCRT__sopen_s( int *fd, const char *path, int oflags, int shflags, i MSVCRT_wchar_t *pathW; int ret; + if (!MSVCRT_CHECK_PMT(fd != NULL)) + return MSVCRT_EINVAL; + *fd = -1; if(!MSVCRT_CHECK_PMT(path && (pathW = msvcrt_wstrdupa(path)))) return MSVCRT_EINVAL;

1 0

Austin English : advapi32: Fix a memory leak in test_process_security.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 718f1bf1b9c63a5e42a9cf6217a76f130e2c5611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718f1bf1b9c63a5e42a9cf621… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jul 9 11:41:34 2014 -0700 advapi32: Fix a memory leak in test_process_security. --- dlls/advapi32/tests/security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b1dc3fe..b44496a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2665,6 +2665,7 @@ static void test_process_security(void) STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); winetest_wait_child_process( info.hProcess ); + FreeSid(EveryoneSid); CloseHandle( info.hProcess ); CloseHandle( info.hThread ); CloseHandle( event );

1 0

Stefan Dösinger : d3d9/tests: Fix some ok() call style issues.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 9329e996b4726187c3b3a5477ee58985e3c7b931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9329e996b4726187c3b3a5477… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 8 15:58:46 2014 +0200 d3d9/tests: Fix some ok() call style issues. --- dlls/d3d9/tests/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 14b68b3..f3771d9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7279,7 +7279,7 @@ static void test_volume_locking(void) } else { - ok (locked_box.pBits == NULL, "Failed lock set pBits = %p, expected NULL.\n", locked_box.pBits); + ok(locked_box.pBits == NULL, "Failed lock set pBits = %p, expected NULL.\n", locked_box.pBits); } IDirect3DVolumeTexture9_Release(texture); } @@ -8885,13 +8885,13 @@ static void test_writeonly_resource(void) hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &ptr, 0); ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); - ok (!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); + ok(!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); hr = IDirect3DVertexBuffer9_Unlock(buffer); ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &ptr, D3DLOCK_READONLY); ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); - ok (!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); + ok(!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); hr = IDirect3DVertexBuffer9_Unlock(buffer); ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr);

1 0

Stefan Dösinger : d3d9: Ignore SetPriority and GetPriority calls on surfaces.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: eb0daf08c69b8b3e0eeb74cb76e2521a53cf90dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0daf08c69b8b3e0eeb74cb7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 8 15:58:42 2014 +0200 d3d9: Ignore SetPriority and GetPriority calls on surfaces. --- dlls/d3d9/surface.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index bf8b41a..ef5f648 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -169,30 +169,14 @@ static HRESULT WINAPI d3d9_surface_FreePrivateData(IDirect3DSurface9 *iface, REF static DWORD WINAPI d3d9_surface_SetPriority(IDirect3DSurface9 *iface, DWORD priority) { - struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - DWORD ret; - - TRACE("iface %p, priority %u.\n", iface, priority); - - wined3d_mutex_lock(); - ret = wined3d_surface_set_priority(surface->wined3d_surface, priority); - wined3d_mutex_unlock(); - - return ret; + TRACE("iface %p, priority %u. Ignored on surfaces.\n", iface, priority); + return 0; } static DWORD WINAPI d3d9_surface_GetPriority(IDirect3DSurface9 *iface) { - struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - DWORD ret; - - TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); - ret = wined3d_surface_get_priority(surface->wined3d_surface); - wined3d_mutex_unlock(); - - return ret; + TRACE("iface %p. Ignored on surfaces.\n", iface); + return 0; } static void WINAPI d3d9_surface_PreLoad(IDirect3DSurface9 *iface)

1 0

Huw Davies : comctl32: Propagate the return value of WM_ERASEBKGND.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 552ad2d93e9a457855d6281c97bba213c885e66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=552ad2d93e9a457855d6281c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 9 08:46:57 2014 +0100 comctl32: Propagate the return value of WM_ERASEBKGND. --- dlls/comctl32/pager.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 3b2c11c..74bca5e 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -985,16 +985,17 @@ PAGER_EraseBackground (const PAGER_INFO* infoPtr, HDC hdc) { POINT pt, ptorig; HWND parent; + LRESULT ret; pt.x = 0; pt.y = 0; parent = GetParent(infoPtr->hwndSelf); MapWindowPoints(infoPtr->hwndSelf, parent, &pt, 1); OffsetWindowOrgEx (hdc, pt.x, pt.y, &ptorig); - SendMessageW (parent, WM_ERASEBKGND, (WPARAM)hdc, 0); + ret = SendMessageW (parent, WM_ERASEBKGND, (WPARAM)hdc, 0); SetWindowOrgEx (hdc, ptorig.x, ptorig.y, 0); - return 0; + return ret; }

1 0

Grazvydas Ignotas : kernel32: Don' t return uninitialized values on failures.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 4f62801aee06922731b9ed5d82caa7dd5daf8a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f62801aee06922731b9ed5d8… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jul 9 03:05:51 2014 +0300 kernel32: Don't return uninitialized values on failures. --- dlls/kernel32/sync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d9f69c3..8210624 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -458,7 +458,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateEventExA( SECURITY_ATTRIBUTES *sa, LPCSTR */ HANDLE WINAPI DECLSPEC_HOTPATCH CreateEventExW( SECURITY_ATTRIBUTES *sa, LPCWSTR name, DWORD flags, DWORD access ) { - HANDLE ret; + HANDLE ret = 0; UNICODE_STRING nameW; OBJECT_ATTRIBUTES attr; NTSTATUS status; @@ -632,7 +632,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateMutexExA( SECURITY_ATTRIBUTES *sa, LPCSTR */ HANDLE WINAPI DECLSPEC_HOTPATCH CreateMutexExW( SECURITY_ATTRIBUTES *sa, LPCWSTR name, DWORD flags, DWORD access ) { - HANDLE ret; + HANDLE ret = 0; UNICODE_STRING nameW; OBJECT_ATTRIBUTES attr; NTSTATUS status;

1 0

Sebastian Lackner : oleaut32/tests: Add additional tests for VarDecAdd.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 04f11ee55ae70b4d2af92a259680580b9234a090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f11ee55ae70b4d2af92a259… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 7 21:11:51 2014 +0200 oleaut32/tests: Add additional tests for VarDecAdd. --- dlls/oleaut32/tests/vartype.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index b873d82..8ca3f14 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4408,9 +4408,40 @@ static void test_VarDecAdd(void) ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + SETDEC64(l,1,0,0xffffffff,0xffffffff,0xffffffff);SETDEC(r,1,0,0,1); MATH2(VarDecAdd); + todo_wine EXPECTDEC64(0,0,0x19999999,0x99999999,0x9999999A); + + SETDEC64(l,0,0,0xe22ea493,0xb30310a7,0x70000000);SETDEC64(r,0,0,0xe22ea493,0xb30310a7,0x70000000); MATH2(VarDecAdd); + ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", + S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + + SETDEC64(l,1,0,0xe22ea493,0xb30310a7,0x70000000);SETDEC64(r,1,0,0xe22ea493,0xb30310a7,0x70000000); MATH2(VarDecAdd); + todo_wine EXPECTDEC64(0,0,0x2d3c8750,0xbd670354,0xb0000000); + SETDEC(l,3,128,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); todo_wine EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFF84); + SETDEC(l,3,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); + ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", + S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + + SETDEC(l,4,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); + ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", + S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + + SETDEC(l,5,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); + ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", + S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + + SETDEC(l,6,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); + MATH2(VarDecAdd); todo_wine EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFFFF); + + SETDEC(l,3,128,0,123456); SETDEC64(r,0,0,0x19999999,0x99999999,0x99999999); + MATH2(VarDecAdd); todo_wine EXPECTDEC64(1,0,-1,0xFFFFFFFF,0xFFFFFB27); + + SETDEC(l,3,128,0,123567); SETDEC64(r,0,0,0x19999999,0x99999999,0x99999999); + MATH2(VarDecAdd); todo_wine EXPECTDEC64(1,0,-1,0xFFFFFFFF,0xFFFFFB26); + /* Promotes to the highest scale, so here the results are in the scale of 2 */ SETDEC(l,2,0,0,0); SETDEC(r,0,0,0,0); MATH2(VarDecAdd); EXPECTDEC(2,0,0,0); SETDEC(l,2,0,0,100); SETDEC(r,0,0,0,1); MATH2(VarDecAdd); EXPECTDEC(2,0,0,200);

1 0

Aric Stewart : usp10: Implement N0: bracketing pairs.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 710e23797f76dd71d84655571f466aefad7647ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=710e23797f76dd71d84655571… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 9 08:57:21 2014 -0500 usp10: Implement N0: bracketing pairs. --- dlls/usp10/bidi.c | 281 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 216 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=710e23797f76dd71d8465…

1 0

Huw Davies : tools: Only allow the absolute difference in bracket pairs to be less than 128, since we need the sign.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 4ac5d66dfea809d87cc4cb1c50f082878174d110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac5d66dfea809d87cc4cb1c5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 9 15:12:30 2014 +0100 tools: Only allow the absolute difference in bracket pairs to be less than 128, since we need the sign. --- tools/make_unicode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_unicode b/tools/make_unicode index be81ec7..c8365cd 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1345,7 +1345,7 @@ sub dump_bracket($) { my $type = $3; die "unknown bracket $type" unless defined $bracket_types{$type}; - die "characters too distant $1 and $2" if abs(hex($2) - hex($1)) >= 256; + die "characters too distant $1 and $2" if abs(hex($2) - hex($1)) >= 128; $bracket_table[hex $1] = (hex($2) - hex($1)) % 255; $bracket_table[hex $1] += $bracket_types{$type} << 8; next;

1 0

Stefan Dösinger : d3d9/tests: Add a test for SetPriority and GetPriority.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 509c49bdb5f9bf2b24d1ec5daa3245e73bf8256d URL: http://source.winehq.org/git/wine.git/?a=commit;h=509c49bdb5f9bf2b24d1ec5da… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 8 15:58:44 2014 +0200 d3d9/tests: Add a test for SetPriority and GetPriority. --- dlls/d3d9/tests/device.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b11771f..14b68b3 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -8987,6 +8987,135 @@ done: DestroyWindow(window); } +static void test_resource_priority(void) +{ + IDirect3DDevice9 *device; + IDirect3DSurface9 *surface; + IDirect3DTexture9 *texture; + IDirect3DVertexBuffer9 *buffer; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + static const struct + { + D3DPOOL pool; + const char *name; + BOOL can_set_priority; + } + test_data[] = + { + {D3DPOOL_DEFAULT, "D3DPOOL_DEFAULT", FALSE}, + {D3DPOOL_SYSTEMMEM, "D3DPOOL_SYSTEMMEM", FALSE}, + {D3DPOOL_MANAGED, "D3DPOOL_MANAGED", TRUE}, + {D3DPOOL_SCRATCH, "D3DPOOL_SCRATCH", FALSE} + }; + unsigned int i; + DWORD priority; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + for (i = 0; i < sizeof(test_data) / sizeof(*test_data); i++) + { + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 0, 0, D3DFMT_X8R8G8B8, + test_data[i].pool, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x, pool %s.\n", hr, test_data[i].name); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + + priority = IDirect3DTexture9_GetPriority(texture); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DTexture9_SetPriority(texture, 1); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DTexture9_GetPriority(texture); + if (test_data[i].can_set_priority) + { + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DTexture9_SetPriority(texture, 2); + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + } + else + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + + priority = IDirect3DSurface9_GetPriority(surface); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DSurface9_SetPriority(surface, 1); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DSurface9_GetPriority(surface); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + + IDirect3DSurface9_Release(surface); + IDirect3DTexture9_Release(texture); + + if (test_data[i].pool != D3DPOOL_MANAGED) + { + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 16, 16, D3DFMT_X8R8G8B8, + test_data[i].pool, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, pool %s.\n", hr, test_data[i].name); + + priority = IDirect3DSurface9_GetPriority(surface); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DSurface9_SetPriority(surface, 1); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DSurface9_GetPriority(surface); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + + IDirect3DSurface9_Release(surface); + } + + if (test_data[i].pool != D3DPOOL_SCRATCH) + { + hr = IDirect3DDevice9_CreateVertexBuffer(device, 256, 0, 0, + test_data[i].pool, &buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x, pool %s.\n", hr, test_data[i].name); + + priority = IDirect3DVertexBuffer9_GetPriority(buffer); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DVertexBuffer9_SetPriority(buffer, 1); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DVertexBuffer9_GetPriority(buffer); + if (test_data[i].can_set_priority) + { + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DVertexBuffer9_SetPriority(buffer, 0); + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + } + else + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + + IDirect3DVertexBuffer9_Release(buffer); + } + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 16, 16, D3DFMT_X8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &surface, NULL); + + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + priority = IDirect3DSurface9_GetPriority(surface); + ok(priority == 0, "Got unexpected priority %u.\n", priority); + priority = IDirect3DSurface9_SetPriority(surface, 1); + ok(priority == 0, "Got unexpected priority %u.\n", priority); + priority = IDirect3DSurface9_GetPriority(surface); + ok(priority == 0, "Got unexpected priority %u.\n", priority); + + IDirect3DSurface9_Release(surface); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -9086,6 +9215,7 @@ START_TEST(device) test_mipmap_lock(); test_writeonly_resource(); test_lost_device(); + test_resource_priority(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0