September 2013 - Wine-Commits

Huw Davies : fonts: Fix glyph names and advance widths.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 8460e6b3752e628cbaadadfe152cdf361e9b1f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8460e6b3752e628cbaadadfe1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 12 12:34:06 2013 +0100 fonts: Fix glyph names and advance widths. --- fonts/wingding.sfd | 15 +++++++-------- fonts/wingding.ttf | Bin 4332 -> 4356 bytes 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd index 33573e5..4178988 100644 --- a/fonts/wingding.sfd +++ b/fonts/wingding.sfd @@ -13,7 +13,6 @@ Descent: 410 LayerCount: 2 Layer: 0 1 "Back" 1 Layer: 1 1 "Fore" 0 -NeedsXUIDChange: 1 FSType: 0 OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 @@ -75,9 +74,9 @@ SplineSet EndSplineSet EndChar -StartChar: ogonek +StartChar: boxcheckbld Encoding: 254 731 1 -Width: 1896 +Width: 1826 Flags: W LayerCount: 2 Fore @@ -104,9 +103,9 @@ SplineSet EndSplineSet EndChar -StartChar: registered +StartChar: box2 Encoding: 168 174 2 -Width: 1884 +Width: 1825 Flags: W LayerCount: 2 Fore @@ -124,10 +123,10 @@ SplineSet EndSplineSet EndChar -StartChar: G +StartChar: handptup Encoding: 71 71 3 -Width: 1581 -Flags: HW +Width: 1124 +Flags: W LayerCount: 2 Fore SplineSet diff --git a/fonts/wingding.ttf b/fonts/wingding.ttf index 0c963c0..2935d7d 100644 Binary files a/fonts/wingding.ttf and b/fonts/wingding.ttf differ

1 0

Piotr Caban : msvcrt: Add support for vtordisp functions demangling.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 0df84ecf11cfeae695a95ba6887c69a02d67e186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df84ecf11cfeae695a95ba68… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 12 12:51:26 2013 +0200 msvcrt: Add support for vtordisp functions demangling. --- dlls/msvcrt/tests/cpp.c | 4 +++- dlls/msvcrt/undname.c | 42 +++++++++++++++++++++++++++++++++--------- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 3693014..fa6d4dd 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1309,7 +1309,9 @@ static void test_demangle(void) /* 122 */ {"?_R2@?BN@???$_Fabs(a)N@std@@YANAEBV?$complex(a)N@1(a)PEAH@Z(a)4NB", "double const `double __cdecl std::_Fabs<double>(class std::complex<double> const & __ptr64,int * __ptr64)'::`29'::_R2", "?_R2@?BN@???$_Fabs(a)N@std@@YANAEBV?$complex(a)N@1(a)PEAH@Z(a)4NB"}, - +/* 123 */ {"?vtordisp_thunk(a)std@@$4PPPPPPPM(a)3EAA_NXZ", + "[thunk]:public: virtual bool __cdecl std::vtordisp_thunk`vtordisp{4294967292,4}' (void) __ptr64", + "[thunk]:public: virtual bool __cdecl std::vtordisp_thunk`vtordisp{-4,4}' (void) __ptr64"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index a997351..ec974a0 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -331,7 +331,7 @@ static const char* get_number(struct parsed_symbol* sym) if (*sym->current != '@') return NULL; ptr = und_alloc(sym, 17); - sprintf(ptr, "%s%d", sgn ? "-" : "", ret); + sprintf(ptr, "%s%u", sgn ? "-" : "", ret); sym->current++; } else return NULL; @@ -1103,13 +1103,24 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) * 'X' public: thunk * 'Y' * 'Z' + * "$0" private: thunk vtordisp + * "$1" private: thunk vtordisp + * "$2" protected: thunk vtordisp + * "$3" protected: thunk vtordisp + * "$4" public: thunk vtordisp + * "$5" public: thunk vtordisp */ accmem = *sym->current++; - if (accmem < 'A' || accmem > 'Z') goto done; + if (accmem == '$') + { + accmem = *sym->current++; + if (accmem < '0' || accmem > '5') goto done; + } + else if (accmem < 'A' || accmem > 'Z') goto done; if (!(sym->flags & UNDNAME_NO_ACCESS_SPECIFIERS)) { - switch ((accmem - 'A') / 8) + switch (accmem >= '0' && accmem <= '5' ? (accmem - '0') / 2 : (accmem - 'A') / 8) { case 0: access = "private: "; break; case 1: access = "protected: "; break; @@ -1118,7 +1129,12 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) } if (!(sym->flags & UNDNAME_NO_MEMBER_TYPE)) { - if (accmem <= 'X') + if (accmem >= '0' && accmem <= '5') + { + access = str_printf(sym, "[thunk]:%s", access); + member_type = "virtual "; + } + else if (accmem <= 'X') { switch ((accmem - 'A') % 8) { @@ -1134,7 +1150,15 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) name = get_class_string(sym, 0); - if ((accmem - 'A') % 8 == 6 || (accmem - '8') % 8 == 7) /* a thunk */ + if (accmem >= '0' && accmem <='5') /* vtordisp thunk */ + { + const char *n1 = get_number(sym); + const char *n2 = get_number(sym); + + if (!n1 || !n2) goto done; + name = str_printf(sym, "%s`vtordisp{%s,%s}' ", name, n1, n2); + } + else if ((accmem - 'A') % 8 == 6 || (accmem - 'A') % 8 == 7) /* a thunk */ name = str_printf(sym, "%s`adjustor{%s}' ", name, get_number(sym)); if (accmem <= 'X') @@ -1194,7 +1218,7 @@ done: } /****************************************************************** - * handle_template + * handle_template * Does the final parsing and handling for a name with templates */ static BOOL handle_template(struct parsed_symbol* sym) @@ -1443,10 +1467,10 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) /* Function/Data type and access level */ if (*sym->current >= '0' && *sym->current <= '9') ret = handle_data(sym); - else if (*sym->current >= 'A' && *sym->current <= 'Z') - ret = handle_method(sym, do_after == 3); - else if (*sym->current == '$') + else if (sym->current[0] == '$' && (sym->current[1] < '0' || sym->current[1] > '9')) ret = handle_template(sym); + else if ((*sym->current >= 'A' && *sym->current <= 'Z') || *sym->current == '$') + ret = handle_method(sym, do_after == 3); else ret = FALSE; done: if (ret) assert(sym->result);

1 0

Piotr Caban : msvcrt: Don't forward _wcsnicmp to ntdll.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 2734ae07860b7c58d0d441155f1254f1c981e0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=2734ae07860b7c58d0d441155… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 12 12:50:19 2013 +0200 msvcrt: Don't forward _wcsnicmp to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a8578bd..23d29a3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1112,7 +1112,7 @@ # stub _wcslwr_s_l(wstr long ptr) @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l -@ cdecl _wcsnicmp(wstr wstr long) ntdll._wcsnicmp +@ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp # stub _wcsnicmp_l(wstr wstr long ptr) @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a140e62..5f47ee5 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -86,6 +86,14 @@ INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str } /********************************************************************* + * _wcsnicmp (MSVCRT.@) + */ +INT CDECL MSVCRT__wcsnicmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, INT n) +{ + return strncmpiW(str1, str2, n); +} + +/********************************************************************* * _wcsicoll_l (MSVCRT.@) */ int CDECL MSVCRT__wcsicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT__locale_t locale)

1 0

Ken Thomases : user32: Fix mouseRect computation for starting position when sizing window.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: c7d2bcfb6114fb13eeee8d0513f4587472d20019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d2bcfb6114fb13eeee8d051… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 11 23:45:52 2013 -0500 user32: Fix mouseRect computation for starting position when sizing window. The mouseRect is the limit of the mouse position to keep the window between its minimum and maximum sizes. The computation was correct if the mouse started precisely on the window border. But if the mouse is not exactly at the border, then the mouse limit has to account for that, because the window will be resized based on the distance from the starting point. --- dlls/user32/winpos.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 308e7ea..22ee290 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2677,23 +2677,23 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) if (ON_LEFT_BORDER(hittest)) { - mouseRect.left = max( mouseRect.left, sizingRect.right-maxTrack.x ); - mouseRect.right = min( mouseRect.right, sizingRect.right-minTrack.x ); + mouseRect.left = max( mouseRect.left, sizingRect.right-maxTrack.x+capturePoint.x-sizingRect.left ); + mouseRect.right = min( mouseRect.right, sizingRect.right-minTrack.x+capturePoint.x-sizingRect.left ); } else if (ON_RIGHT_BORDER(hittest)) { - mouseRect.left = max( mouseRect.left, sizingRect.left+minTrack.x ); - mouseRect.right = min( mouseRect.right, sizingRect.left+maxTrack.x ); + mouseRect.left = max( mouseRect.left, sizingRect.left+minTrack.x+capturePoint.x-sizingRect.right ); + mouseRect.right = min( mouseRect.right, sizingRect.left+maxTrack.x+capturePoint.x-sizingRect.right ); } if (ON_TOP_BORDER(hittest)) { - mouseRect.top = max( mouseRect.top, sizingRect.bottom-maxTrack.y ); - mouseRect.bottom = min( mouseRect.bottom,sizingRect.bottom-minTrack.y); + mouseRect.top = max( mouseRect.top, sizingRect.bottom-maxTrack.y+capturePoint.y-sizingRect.top ); + mouseRect.bottom = min( mouseRect.bottom,sizingRect.bottom-minTrack.y+capturePoint.y-sizingRect.top); } else if (ON_BOTTOM_BORDER(hittest)) { - mouseRect.top = max( mouseRect.top, sizingRect.top+minTrack.y ); - mouseRect.bottom = min( mouseRect.bottom, sizingRect.top+maxTrack.y ); + mouseRect.top = max( mouseRect.top, sizingRect.top+minTrack.y+capturePoint.y-sizingRect.bottom ); + mouseRect.bottom = min( mouseRect.bottom, sizingRect.top+maxTrack.y+capturePoint.y-sizingRect.bottom ); } /* Retrieve a default cache DC (without using the window style) */

1 0

Stefan Dösinger : d3d9/tests: D3DCMP_GREATER is broken on r500.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 53741d2bb92b68379885e280c1b4c7c088478994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53741d2bb92b68379885e280c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 12 12:23:32 2013 +0200 d3d9/tests: D3DCMP_GREATER is broken on r500. --- dlls/d3d9/tests/visual.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1deba5f..f047cd7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2558,15 +2558,21 @@ static void z_range_test(IDirect3DDevice9 *device) else ok(color_match(color, 0x00ffff00, 0), "Z range failed: Got color 0x%08x, expected 0x00ffff00.\n", color); - /* Not clipped, > z buffer clear value(0.75) */ + /* Not clipped, > z buffer clear value(0.75). + * + * On the r500 driver on Windows D3DCMP_GREATER and D3DCMP_GREATEREQUAL are broken for depth + * values > 0.5. The range appears to be distorted, apparently an incoming value of ~0.875 is + * equal to a stored depth buffer value of 0.5. */ color = getPixelColor(device, 31, 238); ok(color_match(color, 0x00ff0000, 0), "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); color = getPixelColor(device, 31, 241); ok(color_match(color, 0x00ffff00, 0), "Z range failed: Got color 0x%08x, expected 0x00ffff00.\n", color); color = getPixelColor(device, 100, 238); - ok(color_match(color, 0x00ff0000, 0), "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); + ok(color_match(color, 0x00ff0000, 0) || broken(color_match(color, 0x00ffffff, 0)), + "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); color = getPixelColor(device, 100, 241); - ok(color_match(color, 0x00ffff00, 0), "Z range failed: Got color 0x%08x, expected 0x00ffff00.\n", color); + ok(color_match(color, 0x00ffff00, 0) || broken(color_match(color, 0x00ffffff, 0)), + "Z range failed: Got color 0x%08x, expected 0x00ffff00.\n", color); /* Not clipped, < z buffer clear value */ color = getPixelColor(device, 104, 238); @@ -2638,7 +2644,8 @@ static void z_range_test(IDirect3DDevice9 *device) color = getPixelColor(device, 31, 238); ok(color_match(color, 0x00ff0000, 0), "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); color = getPixelColor(device, 100, 238); - ok(color_match(color, 0x00ff0000, 0), "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); + ok(color_match(color, 0x00ff0000, 0) || broken(color_match(color, 0x00ffffff, 0)), + "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); /* 0.75 < z < 0.0 */ color = getPixelColor(device, 104, 238);

1 0

Bruno Jesus : ws2_32/tests: Add more WSASocket tests.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 260250539d9a87170549a1df1ee4e0b47ad6b40e URL: http://source.winehq.org/git/wine.git/?a=commit;h=260250539d9a87170549a1df1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 12 01:02:34 2013 -0300 ws2_32/tests: Add more WSASocket tests. --- dlls/ws2_32/tests/sock.c | 101 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 94 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2675e97..3c3658f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -970,14 +970,18 @@ out: /* Tests for WSAStartup */ static void test_WithoutWSAStartup(void) { - LPVOID ptr; + DWORD err; WSASetLastError(0xdeadbeef); - ptr = gethostbyname("localhost"); + ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSANOTINITIALISED, "Expected 10093, received %d\n", err); - ok(ptr == NULL, "gethostbyname() succeeded unexpectedly: %d\n", WSAGetLastError()); - ok(WSAGetLastError() == WSANOTINITIALISED, "gethostbyname() failed with unexpected error: %d\n", - WSAGetLastError()); + WSASetLastError(0xdeadbeef); + ok(gethostbyname("localhost") == NULL, "gethostbyname() succeeded unexpectedly\n"); + err = WSAGetLastError(); + ok(err == WSANOTINITIALISED, "Expected 10093, received %d\n", err); } static void test_WithWSAStartup(void) @@ -1777,7 +1781,8 @@ static void test_WSASocket(void) UINT pi_size; SetLastError(0xdeadbeef); - ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); + ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); err = WSAGetLastError(); todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); @@ -1791,13 +1796,70 @@ todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); + SetLastError(0xdeadbeef); + ok(WSASocketA(0, SOCK_STREAM, -1, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(0, -1, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(0, -1, 0, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(0, -1, -1, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(-1, SOCK_STREAM, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); + sock = WSASocketA(AF_INET, 0, IPPROTO_TCP, NULL, 0, 0); todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); SetLastError(0xdeadbeef); - ok(WSASocketA(0, SOCK_STREAM, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); + ok(WSASocketA(0, SOCK_STREAM, 0, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(0, 0, 0xdead, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, 0xdead, 0, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(0, 0xdead, 0, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); err = WSAGetLastError(); todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); @@ -1858,6 +1920,31 @@ todo_wine closesocket(sock); /* find what parameters are used first: plain parameters or protocol info struct */ + pi[0].iProtocol = -1; + pi[0].iSocketType = -1; + pi[0].iAddressFamily = -1; + ok(WSASocketA(0, 0, IPPROTO_UDP, &pi[0], 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); + + pi[0].iProtocol = 0; + pi[0].iSocketType = 0; + pi[0].iAddressFamily = 0; + sock = WSASocketA(0, 0, IPPROTO_UDP, &pi[0], 0, 0); + if(sock != INVALID_SOCKET) + { + win_skip("must work only in OS <= 2003\n"); + closesocket(sock); + } + else + { + err = WSAGetLastError(); +todo_wine + ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); + } + pi[0].iProtocol = IPPROTO_UDP; pi[0].iSocketType = SOCK_DGRAM; pi[0].iAddressFamily = AF_INET;

1 0

Aric Stewart : gdi32: ABC value signs remain the same despite any changes in layout direction or viewport .
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 3f4ef58b0fdb771ffacb64812c32aa625892a16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4ef58b0fdb771ffacb64812… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 12 13:01:56 2013 -0500 gdi32: ABC value signs remain the same despite any changes in layout direction or viewport. --- dlls/gdi32/font.c | 19 +++++---- dlls/gdi32/tests/font.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 104 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 68b2713..7fd5bd3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2700,9 +2700,9 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, { /* convert device units to logical */ for( i = firstChar; i <= lastChar; i++, abc++ ) { - abc->abcA = INTERNAL_XDSTOWS(dc, abc->abcA); - abc->abcB = INTERNAL_XDSTOWS(dc, abc->abcB); - abc->abcC = INTERNAL_XDSTOWS(dc, abc->abcC); + abc->abcA = width_to_LP(dc, abc->abcA); + abc->abcB = width_to_LP(dc, abc->abcB); + abc->abcC = width_to_LP(dc, abc->abcC); } } @@ -2752,9 +2752,9 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count, { /* convert device units to logical */ for( i = 0; i < count; i++, abc++ ) { - abc->abcA = INTERNAL_XDSTOWS(dc, abc->abcA); - abc->abcB = INTERNAL_XDSTOWS(dc, abc->abcB); - abc->abcC = INTERNAL_XDSTOWS(dc, abc->abcC); + abc->abcA = width_to_LP(dc, abc->abcA); + abc->abcB = width_to_LP(dc, abc->abcB); + abc->abcC = width_to_LP(dc, abc->abcC); } } @@ -3352,11 +3352,12 @@ BOOL WINAPI GetCharABCWidthsFloatW( HDC hdc, UINT first, UINT last, LPABCFLOAT a if (ret) { /* convert device units to logical */ + FLOAT scale = fabs( dc->xformVport2World.eM11 ); for (i = first; i <= last; i++, abcf++) { - abcf->abcfA = abc[i - first].abcA * dc->xformVport2World.eM11; - abcf->abcfB = abc[i - first].abcB * dc->xformVport2World.eM11; - abcf->abcfC = abc[i - first].abcC * dc->xformVport2World.eM11; + abcf->abcfA = abc[i - first].abcA * scale; + abcf->abcfB = abc[i - first].abcB * scale; + abcf->abcfC = abc[i - first].abcC * scale; } } HeapFree( GetProcessHeap(), 0, abc ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 11299f3..99c5eef 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1113,17 +1113,50 @@ static int CALLBACK create_font_proc(const LOGFONT *lpelfe, return 1; } +static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, ABC *base_abci, ABC *base_abcw, ABCFLOAT *base_abcf, INT todo) +{ + ABC abc[1]; + ABCFLOAT abcf[1]; + BOOL ret = FALSE; + + ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc); + ok(ret, "%s: GetCharABCWidthsI should have succeeded\n", description); + ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); + if (todo) todo_wine ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + else ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + if (todo) todo_wine ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + else ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + + ret = pGetCharABCWidthsW(hdc, 'i', 'i', abc); + ok(ret, "%s: GetCharABCWidthsW should have succeeded\n", description); + ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); + if (todo) todo_wine ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + else ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + if (todo) todo_wine ok(abc->abcC * base_abcw->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + else ok(abc->abcC * base_abcw->abcC >= 0, "%s: abcC's should be unchanged\n", description); + + ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); + ok(ret, "%s: GetCharABCWidthsFloatW should have succeeded\n", description); + ok (abcf->abcfB > 0.0, "%s: abcfB should be positive\n", description); + if (todo) todo_wine ok(abcf->abcfA * base_abcf->abcfA >= 0.0, "%s: abcfA's sign should be unchanged\n", description); + else ok(abcf->abcfA * base_abcf->abcfA >= 0.0, "%s: abcfA's should be unchanged\n", description); + if (todo) todo_wine ok(abcf->abcfC * base_abcf->abcfC >= 0.0, "%s: abcfC's sign should be unchanged\n", description); + else ok(abcf->abcfC * base_abcf->abcfC >= 0.0, "%s: abcfC's sign should be unchanged\n", description); +} + static void test_GetCharABCWidths(void) { - static const WCHAR str[] = {'a',0}; + static const WCHAR str[] = {'i',0}; BOOL ret; HDC hdc; LOGFONTA lf; HFONT hfont; ABC abc[1]; + ABC abcw[1]; ABCFLOAT abcf[1]; WORD glyphs[1]; DWORD nb; + HWND hwnd; static const struct { UINT first; @@ -1266,6 +1299,66 @@ static void test_GetCharABCWidths(void) } ReleaseDC(NULL, hdc); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = 20; + + trace("ABC sign test for a varity of transforms:\n"); + hfont = CreateFontIndirectA(&lf); + hwnd = CreateWindowEx(0, "static", "", WS_POPUP, 0,0,100,100, + 0, 0, 0, NULL); + hdc = GetDC(hwnd); + SetMapMode(hdc, MM_ANISOTROPIC); + SelectObject(hdc, hfont); + + nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); + ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); + + ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc); + ok(ret, "GetCharABCWidthsI should have succeeded\n"); + ret = pGetCharABCWidthsW(hdc, 'i', 'i', abcw); + ok(ret, "GetCharABCWidthsI should have succeeded\n"); + ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); + ok(ret, "GetCharABCWidthsFloatW should have succeeded\n"); + + ABCWidths_helper("LTR", hdc, glyphs, abc, abcw, abcf, 0); + SetWindowExtEx(hdc, -1, -1, NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ABCWidths_helper("LTR -1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + SetGraphicsMode(hdc, GM_ADVANCED); + ABCWidths_helper("LTR -1 advanced", hdc, glyphs, abc, abcw, abcf, 1); + SetWindowExtEx(hdc, 1, 1, NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ABCWidths_helper("LTR 1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + SetGraphicsMode(hdc, GM_ADVANCED); + ABCWidths_helper("LTR 1 advanced", hdc, glyphs, abc, abcw, abcf, 0); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + + trace("RTL layout\n"); + hwnd = CreateWindowEx(WS_EX_LAYOUTRTL, "static", "", WS_POPUP, 0,0,100,100, + 0, 0, 0, NULL); + hdc = GetDC(hwnd); + SetMapMode(hdc, MM_ANISOTROPIC); + SelectObject(hdc, hfont); + + ABCWidths_helper("RTL", hdc, glyphs, abc, abcw, abcf, 0); + SetWindowExtEx(hdc, -1, -1, NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ABCWidths_helper("RTL -1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + SetGraphicsMode(hdc, GM_ADVANCED); + ABCWidths_helper("RTL -1 advanced", hdc, glyphs, abc, abcw, abcf, 0); + SetWindowExtEx(hdc, 1, 1, NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ABCWidths_helper("RTL 1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + SetGraphicsMode(hdc, GM_ADVANCED); + ABCWidths_helper("RTL 1 advanced", hdc, glyphs, abc, abcw, abcf, 1); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + DeleteObject(hfont); } static void test_text_extents(void)

1 0

Andrew Eikum : mshtml: Free advpack after use.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 93c01b81882df7c8ff887dcb7786f5235f5b6969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c01b81882df7c8ff887dcb7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 12 10:58:57 2013 -0500 mshtml: Free advpack after use. --- dlls/mshtml/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index f81255a..4c7c489 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -461,6 +461,8 @@ static HRESULT register_server(BOOL do_register) hres = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable); + FreeLibrary(hAdvpack); + for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) heap_free(pse[i].pszValue);

1 0

Stefan Dösinger : d3d9/tests: Clean up z_range_test a bit.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: ed504576941126464b3799f311f63df98224e8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed504576941126464b3799f31… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 12 12:23:31 2013 +0200 d3d9/tests: Clean up z_range_test a bit. --- dlls/d3d9/tests/visual.c | 232 +++++++++++++++++++++------------------------- 1 files changed, 107 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed504576941126464b379…

1 0

Stefan Dösinger : wined3d: Explicitly pass the state information to buffer_internal_preload.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: b8eb171b6bd4f930aee265af981223fd7a557b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8eb171b6bd4f930aee265af9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 12 12:23:30 2013 +0200 wined3d: Explicitly pass the state information to buffer_internal_preload. --- dlls/wined3d/buffer.c | 12 +++++++----- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 84fe45a..2deb7d2 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -728,7 +728,8 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined } /* Context activation is done by the caller. */ -void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context) +void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, + const struct wined3d_state *state) { DWORD flags = buffer->flags & (WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); struct wined3d_device *device = buffer->resource.device; @@ -763,12 +764,13 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte } } - /* Reading the declaration makes only sense if the stateblock is finalized and the buffer bound to a stream */ - if (device->isInDraw && buffer->resource.bind_count > 0) + /* Reading the declaration makes only sense if we have valid state information + * (i.e., if this function is called during draws). */ + if (state) { DWORD fixup_flags = 0; - if (!use_vs(&device->state)) + if (!use_vs(state)) { if (!context->gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) fixup_flags |= WINED3D_BUFFER_FIXUP_D3DCOLOR; @@ -935,7 +937,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) { struct wined3d_context *context; context = context_acquire(buffer->resource.device, NULL); - buffer_internal_preload(buffer, context); + buffer_internal_preload(buffer, context, NULL); context_release(context); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f870700..af3addc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2498,7 +2498,7 @@ void context_stream_info_from_declaration(struct wined3d_context *context, element = &stream_info->elements[i]; buffer = state->streams[element->stream_idx].buffer; - buffer_internal_preload(buffer, context); + buffer_internal_preload(buffer, context, state); /* If the preload dropped the buffer object, update the stream info. */ if (buffer->buffer_object != element->data.buffer_object) @@ -2583,7 +2583,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de if (state->index_buffer) { if (context->stream_info.all_vbo) - buffer_internal_preload(state->index_buffer, context); + buffer_internal_preload(state->index_buffer, context, state); else buffer_get_sysmem(state->index_buffer, context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a1b7238..a30db57 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2525,8 +2525,8 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN; -void buffer_internal_preload(struct wined3d_buffer *buffer, - struct wined3d_context *context) DECLSPEC_HIDDEN; +void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, + const struct wined3d_state *state) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view {

1 0