wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Janne Hakonen : iphlpapi: Changed return value of NotifyAddrChange() stub and added test cases.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 6a631ba1cc1a25099cfc68a3e44b82f0f73c7f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a631ba1cc1a25099cfc68a3e… Author: Janne Hakonen <joyer83(a)live.fi> Date: Tue Feb 8 20:43:59 2011 +0200 iphlpapi: Changed return value of NotifyAddrChange() stub and added test cases. (cherry picked from commit 82a2ec13f01b48e78d28d630914db311b55f4948) --- dlls/iphlpapi/iphlpapi_main.c | 3 +- dlls/iphlpapi/tests/iphlpapi.c | 87 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 53cad0e..e88e0a9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1703,7 +1703,8 @@ DWORD WINAPI IpRenewAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped) { FIXME("(Handle %p, overlapped %p): stub\n", Handle, overlapped); - return ERROR_NOT_SUPPORTED; + if (Handle) *Handle = INVALID_HANDLE_VALUE; + return ERROR_IO_PENDING; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 8e03863..dc1e9bc 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -64,6 +64,8 @@ typedef DWORD (WINAPI *GetTcpTableFunc)(PMIB_TCPTABLE,PDWORD,BOOL); typedef DWORD (WINAPI *GetUdpTableFunc)(PMIB_UDPTABLE,PDWORD,BOOL); typedef DWORD (WINAPI *GetPerAdapterInfoFunc)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); typedef DWORD (WINAPI *GetAdaptersAddressesFunc)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); +typedef DWORD (WINAPI *NotifyAddrChangeFunc)(PHANDLE,LPOVERLAPPED); +typedef BOOL (WINAPI *CancelIPChangeNotifyFunc)(LPOVERLAPPED); static GetNumberOfInterfacesFunc gGetNumberOfInterfaces = NULL; static GetIpAddrTableFunc gGetIpAddrTable = NULL; @@ -83,6 +85,8 @@ static GetTcpTableFunc gGetTcpTable = NULL; static GetUdpTableFunc gGetUdpTable = NULL; static GetPerAdapterInfoFunc gGetPerAdapterInfo = NULL; static GetAdaptersAddressesFunc gGetAdaptersAddresses = NULL; +static NotifyAddrChangeFunc gNotifyAddrChange = NULL; +static CancelIPChangeNotifyFunc gCancelIPChangeNotify = NULL; static void loadIPHlpApi(void) { @@ -122,6 +126,10 @@ static void loadIPHlpApi(void) hLibrary, "GetUdpTable"); gGetPerAdapterInfo = (GetPerAdapterInfoFunc)GetProcAddress(hLibrary, "GetPerAdapterInfo"); gGetAdaptersAddresses = (GetAdaptersAddressesFunc)GetProcAddress(hLibrary, "GetAdaptersAddresses"); + gNotifyAddrChange = (NotifyAddrChangeFunc)GetProcAddress( + hLibrary, "NotifyAddrChange"); + gCancelIPChangeNotify = (CancelIPChangeNotifyFunc)GetProcAddress( + hLibrary, "CancelIPChangeNotify"); } } @@ -144,6 +152,8 @@ static void freeIPHlpApi(void) gGetUdpStatistics = NULL; gGetTcpTable = NULL; gGetUdpTable = NULL; + gNotifyAddrChange = NULL; + gCancelIPChangeNotify = NULL; FreeLibrary(hLibrary); hLibrary = NULL; } @@ -796,24 +806,95 @@ static void testGetPerAdapterInfo(void) HeapFree( GetProcessHeap(), 0, buffer ); } +static void testNotifyAddrChange(void) +{ + DWORD ret, bytes; + OVERLAPPED overlapped; + HANDLE handle; + BOOL success; + + if (!gNotifyAddrChange) + { + win_skip("NotifyAddrChange not present\n"); + return; + } + if (!gCancelIPChangeNotify) + { + win_skip("CancelIPChangeNotify not present\n"); + return; + } + + handle = NULL; + ZeroMemory(&overlapped, sizeof(overlapped)); + ret = gNotifyAddrChange(&handle, &overlapped); + if (ret == ERROR_NOT_SUPPORTED) + { + win_skip("NotifyAddrChange is not supported\n"); + return; + } + ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); + ret = GetLastError(); + todo_wine ok(ret == ERROR_IO_PENDING, "GetLastError returned %d, excepted ERROR_IO_PENDING\n", ret); + success = gCancelIPChangeNotify(&overlapped); + todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); + + ZeroMemory(&overlapped, sizeof(overlapped)); + success = gCancelIPChangeNotify(&overlapped); + ok(success == FALSE, "CancelIPChangeNotify returned TRUE, expected FALSE\n"); + + handle = NULL; + ZeroMemory(&overlapped, sizeof(overlapped)); + overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ret = gNotifyAddrChange(&handle, &overlapped); + ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); + todo_wine ok(handle != INVALID_HANDLE_VALUE, "NotifyAddrChange returned invalid file handle\n"); + success = GetOverlappedResult(handle, &overlapped, &bytes, FALSE); + todo_wine ok(success == FALSE, "GetOverlappedResult returned TRUE, excepted FALSE\n"); + ret = GetLastError(); + todo_wine ok(ret == ERROR_IO_INCOMPLETE, "GetLastError returned %d, excepted ERROR_IO_INCOMPLETE\n", ret); + success = gCancelIPChangeNotify(&overlapped); + todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); + + if (winetest_interactive) + { + handle = NULL; + ZeroMemory(&overlapped, sizeof(overlapped)); + overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + trace("Testing asyncronous ipv4 address change notification. Please " + "change ipv4 address of one of your network interfaces\n"); + ret = gNotifyAddrChange(&handle, &overlapped); + ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); + success = GetOverlappedResult(handle, &overlapped, &bytes, TRUE); + ok(success == TRUE, "GetOverlappedResult returned FALSE, excepted TRUE\n"); + } + + /* test syncronous functionality */ + if (winetest_interactive) + { + trace("Testing syncronous ipv4 address change notification. Please " + "change ipv4 address of one of your network interfaces\n"); + ret = gNotifyAddrChange(NULL, NULL); + todo_wine ok(ret == NO_ERROR, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); + } +} + /* still-to-be-tested 2K-onward functions: AddIPAddress -CancelIPChangeNotify CreateProxyArpEntry DeleteIPAddress DeleteProxyArpEntry EnableRouter FlushIpNetTable GetAdapterIndex -NotifyAddrChange -NotifyRouteChange +NotifyRouteChange + CancelIPChangeNotify SendARP UnenableRouter */ static void testWin2KFunctions(void) { testGetPerAdapterInfo(); + testNotifyAddrChange(); } static void test_GetAdaptersAddresses(void)

1 0

Gerald Pfeifer : wpp: Add explicit casts when mixing unsigned and signed integers.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 139cbe1a262c3078b85ecbb7821dcb3514e9ee5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=139cbe1a262c3078b85ecbb78… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Feb 26 21:01:02 2011 +0100 wpp: Add explicit casts when mixing unsigned and signed integers. (cherry picked from commit 0d92426d2b5c45dad3f11d7b524726a931bb6b88) --- libs/wpp/ppy.y | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index b50e120..a9c5a68 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -61,7 +61,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.si = v1.val.si OP (signed) v2.val.ui; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.si = v1.val.ui OP v2.val.si; \ + r.val.si = (signed) v1.val.ui OP v2.val.si; \ else \ r.val.ui = v1.val.ui OP v2.val.ui; @@ -72,7 +72,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.sl = v1.val.sl OP (signed long) v2.val.ul; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.sl = v1.val.ul OP v2.val.sl; \ + r.val.sl = (signed long) v1.val.ul OP v2.val.sl; \ else \ r.val.ul = v1.val.ul OP v2.val.ul; @@ -83,7 +83,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.sll = v1.val.sll OP (wrc_sll_t) v2.val.ull; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.sll = v1.val.ull OP v2.val.sll; \ + r.val.sll = (wrc_sll_t) v1.val.ull OP v2.val.sll; \ else \ r.val.ull = v1.val.ull OP v2.val.ull;

1 0

Gerald Pfeifer : wpp: Add explicit casts when mixing signed and unsigned integers.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: d987cecd4fe93802e66eccce506b5c01f992775a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d987cecd4fe93802e66eccce5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Feb 16 02:50:46 2011 +0100 wpp: Add explicit casts when mixing signed and unsigned integers. (cherry picked from commit 7a3226be4696a01ddf4f9fe8494224455a6c9a0a) --- libs/wpp/ppy.y | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index 5f1566e..b50e120 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -59,7 +59,7 @@ if(cv_signed(v1) && cv_signed(v2)) \ r.val.si = v1.val.si OP v2.val.si; \ else if(cv_signed(v1) && !cv_signed(v2)) \ - r.val.si = v1.val.si OP v2.val.ui; \ + r.val.si = v1.val.si OP (signed) v2.val.ui; \ else if(!cv_signed(v1) && cv_signed(v2)) \ r.val.si = v1.val.ui OP v2.val.si; \ else \ @@ -70,7 +70,7 @@ if(cv_signed(v1) && cv_signed(v2)) \ r.val.sl = v1.val.sl OP v2.val.sl; \ else if(cv_signed(v1) && !cv_signed(v2)) \ - r.val.sl = v1.val.sl OP v2.val.ul; \ + r.val.sl = v1.val.sl OP (signed long) v2.val.ul; \ else if(!cv_signed(v1) && cv_signed(v2)) \ r.val.sl = v1.val.ul OP v2.val.sl; \ else \ @@ -81,7 +81,7 @@ if(cv_signed(v1) && cv_signed(v2)) \ r.val.sll = v1.val.sll OP v2.val.sll; \ else if(cv_signed(v1) && !cv_signed(v2)) \ - r.val.sll = v1.val.sll OP v2.val.ull; \ + r.val.sll = v1.val.sll OP (wrc_sll_t) v2.val.ull; \ else if(!cv_signed(v1) && cv_signed(v2)) \ r.val.sll = v1.val.ull OP v2.val.sll; \ else \

1 0

Gerald Pfeifer : wpp: Fix the output type for the "unsigned OP signed" cases in BIN_OP_INT and friends.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: e1e1821fbc7595aaaefd17f727d3399ba89ab9dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e1821fbc7595aaaefd17f72… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 13 00:54:05 2011 +0100 wpp: Fix the output type for the "unsigned OP signed" cases in BIN_OP_INT and friends. (cherry picked from commit 7f6d6b835dc361eab32e939c2745bd37930de888) --- libs/wpp/ppy.y | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index 5a63494..5f1566e 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -61,7 +61,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.si = v1.val.si OP v2.val.ui; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.ui = v1.val.ui OP v2.val.si; \ + r.val.si = v1.val.ui OP v2.val.si; \ else \ r.val.ui = v1.val.ui OP v2.val.ui; @@ -72,7 +72,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.sl = v1.val.sl OP v2.val.ul; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.ul = v1.val.ul OP v2.val.sl; \ + r.val.sl = v1.val.ul OP v2.val.sl; \ else \ r.val.ul = v1.val.ul OP v2.val.ul; @@ -83,7 +83,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.sll = v1.val.sll OP v2.val.ull; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.ull = v1.val.ull OP v2.val.sll; \ + r.val.sll = v1.val.ull OP v2.val.sll; \ else \ r.val.ull = v1.val.ull OP v2.val.ull;

1 0

Dmitry Timoshkov : gdi32: EnumFontFamilies should also match against fully qualified face name.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 4dc82f4c20261afee89e0bcffa33a9aa29e8232b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc82f4c20261afee89e0bcff… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 14 17:54:25 2011 +0800 gdi32: EnumFontFamilies should also match against fully qualified face name. (cherry picked from commit 2aaf6c2c8cdde2e09ddfa745f1dab48cbf693769) --- dlls/gdi32/freetype.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cd1497e..a4d892f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4055,6 +4055,54 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, free_font(font); } +static BOOL family_matches(Family *family, const LOGFONTW *lf) +{ + struct list *face_elem_ptr; + + if (!strcmpiW(lf->lfFaceName, family->FamilyName)) return TRUE; + + LIST_FOR_EACH(face_elem_ptr, &family->faces) + { + static const WCHAR spaceW[] = { ' ',0 }; + WCHAR full_family_name[LF_FULLFACESIZE]; + Face *face = LIST_ENTRY(face_elem_ptr, Face, entry); + + if (strlenW(family->FamilyName) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) + { + FIXME("Length of %s + %s + 2 is longer than LF_FULLFACESIZE\n", + debugstr_w(family->FamilyName), debugstr_w(face->StyleName)); + continue; + } + + strcpyW(full_family_name, family->FamilyName); + strcatW(full_family_name, spaceW); + strcatW(full_family_name, face->StyleName); + if (!strcmpiW(lf->lfFaceName, full_family_name)) return TRUE; + } + + return FALSE; +} + +static BOOL face_matches(Face *face, const LOGFONTW *lf) +{ + static const WCHAR spaceW[] = { ' ',0 }; + WCHAR full_family_name[LF_FULLFACESIZE]; + + if (!strcmpiW(lf->lfFaceName, face->family->FamilyName)) return TRUE; + + if (strlenW(face->family->FamilyName) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) + { + FIXME("Length of %s + %s + 2 is longer than LF_FULLFACESIZE\n", + debugstr_w(face->family->FamilyName), debugstr_w(face->StyleName)); + return FALSE; + } + + strcpyW(full_family_name, face->family->FamilyName); + strcatW(full_family_name, spaceW); + strcatW(full_family_name, face->StyleName); + return !strcmpiW(lf->lfFaceName, full_family_name); +} + /************************************************************* * WineEngEnumFonts * @@ -4098,9 +4146,12 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - if(!strcmpiW(plf->lfFaceName, family->FamilyName)) { + if(family_matches(family, plf)) { LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); + + if (!face_matches(face, plf)) continue; + GetEnumStructs(face, &elf, &ntm, &type); for(i = 0; i < 32; i++) { if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */

1 0

Dmitry Timoshkov : gdi32: Use graphics mode specified at the EMF creation time when playing EMR_EXTTEXTOUT record .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: c229ad767b250475abaa4311b1749eab8e5df940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c229ad767b250475abaa4311b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 24 18:19:56 2011 +0800 gdi32: Use graphics mode specified at the EMF creation time when playing EMR_EXTTEXTOUT record. (cherry picked from commit 9bc5946cdedda3925f958667683d092f2ed4ea2e) --- dlls/gdi32/enhmetafile.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 15f7c1b..b8863fd 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1133,6 +1133,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( const EMREXTTEXTOUTA *pExtTextOutA = (const EMREXTTEXTOUTA *)mr; RECT rc; const INT *dx = NULL; + int old_mode; rc.left = pExtTextOutA->emrtext.rcl.left; rc.top = pExtTextOutA->emrtext.rcl.top; @@ -1142,6 +1143,11 @@ BOOL WINAPI PlayEnhMetaFileRecord( pExtTextOutA->emrtext.ptlReference.x, pExtTextOutA->emrtext.ptlReference.y, rc.left, rc.top, rc.right, rc.bottom, pExtTextOutA->emrtext.fOptions); + old_mode = SetGraphicsMode(hdc, pExtTextOutA->iGraphicsMode); + /* Reselect the font back into the dc so that the transformation + gets updated. */ + SelectObject(hdc, GetCurrentObject(hdc, OBJ_FONT)); + /* Linux version of pstoedit produces EMFs with offDx set to 0. * These files can be enumerated and played under Win98 just * fine, but at least Win2k chokes on them. @@ -1153,6 +1159,8 @@ BOOL WINAPI PlayEnhMetaFileRecord( pExtTextOutA->emrtext.fOptions, &rc, (LPCSTR)((const BYTE *)mr + pExtTextOutA->emrtext.offString), pExtTextOutA->emrtext.nChars, dx); + + SetGraphicsMode(hdc, old_mode); break; } @@ -1161,6 +1169,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( const EMREXTTEXTOUTW *pExtTextOutW = (const EMREXTTEXTOUTW *)mr; RECT rc; const INT *dx = NULL; + int old_mode; rc.left = pExtTextOutW->emrtext.rcl.left; rc.top = pExtTextOutW->emrtext.rcl.top; @@ -1170,6 +1179,11 @@ BOOL WINAPI PlayEnhMetaFileRecord( pExtTextOutW->emrtext.ptlReference.x, pExtTextOutW->emrtext.ptlReference.y, rc.left, rc.top, rc.right, rc.bottom, pExtTextOutW->emrtext.fOptions); + old_mode = SetGraphicsMode(hdc, pExtTextOutW->iGraphicsMode); + /* Reselect the font back into the dc so that the transformation + gets updated. */ + SelectObject(hdc, GetCurrentObject(hdc, OBJ_FONT)); + /* Linux version of pstoedit produces EMFs with offDx set to 0. * These files can be enumerated and played under Win98 just * fine, but at least Win2k chokes on them. @@ -1181,6 +1195,8 @@ BOOL WINAPI PlayEnhMetaFileRecord( pExtTextOutW->emrtext.fOptions, &rc, (LPCWSTR)((const BYTE *)mr + pExtTextOutW->emrtext.offString), pExtTextOutW->emrtext.nChars, dx); + + SetGraphicsMode(hdc, old_mode); break; }

1 0

Alexander Kochetkov : gdi32: Fix scaling factors for EMR_EXTTEXTOUTW.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: e70490623e3d800860ce78d3f3d295cdf67ab082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70490623e3d800860ce78d3f… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Sat Feb 19 01:56:01 2011 +0300 gdi32: Fix scaling factors for EMR_EXTTEXTOUTW. (cherry picked from commit 005915f405bcf36b9f1a1694ec212559933f9aad) --- dlls/gdi32/enhmfdrv/graphics.c | 30 ++++++++- dlls/gdi32/tests/metafile.c | 136 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index e066d0d..95a8353 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -728,6 +728,8 @@ BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, int textHeight = 0; int textWidth = 0; const UINT textAlign = GetTextAlign(physDev->hdc); + const INT graphicsMode = GetGraphicsMode(physDev->hdc); + FLOAT exScale, eyScale; nSize = sizeof(*pemr) + ((count+1) & ~1) * sizeof(WCHAR) + count * sizeof(INT); @@ -735,12 +737,32 @@ BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, wine_dbgstr_rect(lprect), count, nSize); pemr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nSize); + if (graphicsMode == GM_COMPATIBLE) + { + const INT horzSize = GetDeviceCaps(physDev->hdc, HORZSIZE); + const INT horzRes = GetDeviceCaps(physDev->hdc, HORZRES); + const INT vertSize = GetDeviceCaps(physDev->hdc, VERTSIZE); + const INT vertRes = GetDeviceCaps(physDev->hdc, VERTRES); + SIZE wndext, vportext; + + GetViewportExtEx(physDev->hdc, &vportext); + GetWindowExtEx(physDev->hdc, &wndext); + exScale = 100.0 * ((FLOAT)horzSize / (FLOAT)horzRes) / + ((FLOAT)wndext.cx / (FLOAT)vportext.cx); + eyScale = 100.0 * ((FLOAT)vertSize / (FLOAT)vertRes) / + ((FLOAT)wndext.cy / (FLOAT)vportext.cy); + } + else + { + exScale = 0.0; + eyScale = 0.0; + } + pemr->emr.iType = EMR_EXTTEXTOUTW; pemr->emr.nSize = nSize; - - pemr->iGraphicsMode = GetGraphicsMode(physDev->hdc); - pemr->exScale = pemr->eyScale = 1.0; /* FIXME */ - + pemr->iGraphicsMode = graphicsMode; + pemr->exScale = exScale; + pemr->eyScale = eyScale; pemr->emrtext.ptlReference.x = x; pemr->emrtext.ptlReference.y = y; pemr->emrtext.nChars = count; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 9ce3ece..158669a 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -264,6 +264,141 @@ static void test_ExtTextOut(void) DestroyWindow(hwnd); } +struct eto_scale_test_record +{ + INT graphics_mode; + INT map_mode; + double ex_scale; + double ey_scale; + BOOL processed; +}; + +static int CALLBACK eto_scale_enum_proc(HDC hdc, HANDLETABLE *handle_table, + const ENHMETARECORD *emr, int n_objs, LPARAM param) +{ + struct eto_scale_test_record *test = (struct eto_scale_test_record*)param; + + if (emr->iType == EMR_EXTTEXTOUTW) + { + const EMREXTTEXTOUTW *pExtTextOutW = (const EMREXTTEXTOUTW *)emr; + trace("gm %d, mm %d, scale %f, %f, expected %f, %f\n", + test->graphics_mode, test->map_mode, + pExtTextOutW->exScale, pExtTextOutW->eyScale, + test->ex_scale, test->ey_scale); + ok(fabs(test->ex_scale - pExtTextOutW->exScale) < 0.001, + "Got exScale %f, expected %f\n", pExtTextOutW->exScale, test->ex_scale); + ok(fabs(test->ey_scale - pExtTextOutW->eyScale) < 0.001, + "Got eyScale %f, expected %f\n", pExtTextOutW->eyScale, test->ey_scale); + test->processed = TRUE; + } + + return 1; +} + +static void test_ExtTextOutScale(void) +{ + const RECT rc = { 0, 0, 100, 100 }; + const WCHAR str[] = {'a',0 }; + struct eto_scale_test_record test; + HDC hdcDisplay, hdcMetafile; + HENHMETAFILE hMetafile; + HWND hwnd; + SIZE wndext, vportext; + int horzSize, vertSize, horzRes, vertRes; + int ret; + int i; + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, + 0, 0, 200, 200, 0, 0, 0, NULL); + ok(hwnd != 0, "CreateWindowExA failed\n"); + + hdcDisplay = GetDC(hwnd); + ok(hdcDisplay != 0, "GetDC failed\n"); + + horzSize = GetDeviceCaps(hdcDisplay, HORZSIZE); + horzRes = GetDeviceCaps(hdcDisplay, HORZRES); + vertSize = GetDeviceCaps(hdcDisplay, VERTSIZE); + vertRes = GetDeviceCaps(hdcDisplay, VERTRES); + ok(horzSize && horzRes && vertSize && vertRes, "GetDeviceCaps failed\n"); + + for (i = 0; i < 16; i++) + { + test.graphics_mode = i / 8 + 1; + test.map_mode = i % 8 + 1; + + ret = SetGraphicsMode(hdcDisplay, test.graphics_mode); + ok(ret, "SetGraphicsMode failed\n"); + ret = SetMapMode(hdcDisplay, test.map_mode); + ok(ret, "SetMapMode failed\n"); + + if ((test.map_mode == MM_ISOTROPIC) || (test.map_mode == MM_ANISOTROPIC)) + { + ret = SetWindowExtEx(hdcDisplay, 1, 1, NULL); + ok(ret, "SetWindowExtEx failed\n"); + ret = SetViewportExtEx(hdcDisplay, -20, -10, NULL); + ok(ret, "SetViewportExtEx failed\n"); + } + + ret = GetViewportExtEx(hdcDisplay, &vportext); + ok(ret, "GetViewportExtEx failed\n"); + ret = GetWindowExtEx(hdcDisplay, &wndext); + ok(ret, "GetWindowExtEx failed\n"); + + trace("gm %d, mm %d, wnd %d,%d, vp %d,%d horz %d,%d vert %d,%d\n", + test.graphics_mode, test.map_mode, + wndext.cx, wndext.cy, vportext.cx, vportext.cy, + horzSize, horzRes, vertSize, vertRes); + + if (test.graphics_mode == GM_COMPATIBLE) + { + test.ex_scale = 100.0 * ((FLOAT)horzSize / (FLOAT)horzRes) / + ((FLOAT)wndext.cx / (FLOAT)vportext.cx); + test.ey_scale = 100.0 * ((FLOAT)vertSize / (FLOAT)vertRes) / + ((FLOAT)wndext.cy / (FLOAT)vportext.cy); + } + else + { + test.ex_scale = 0.0; + test.ey_scale = 0.0; + } + + hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA failed\n"); + + ret = SetGraphicsMode(hdcMetafile, test.graphics_mode); + ok(ret, "SetGraphicsMode failed\n"); + ret = SetMapMode(hdcMetafile, test.map_mode); + ok(ret, "SetMapMode failed\n"); + + if ((test.map_mode == MM_ISOTROPIC) || (test.map_mode == MM_ANISOTROPIC)) + { + ret = SetWindowExtEx(hdcMetafile, 1, 1, NULL); + ok(ret, "SetWindowExtEx failed\n"); + ret = SetViewportExtEx(hdcMetafile, -20, -10, NULL); + ok(ret, "SetViewportExtEx failed\n"); + } + + ret = ExtTextOutW(hdcMetafile, 0, 0, 0, 0, str, 1, NULL); + ok(ret, "ExtTextOutW failed\n"); + + hMetafile = CloseEnhMetaFile(hdcMetafile); + ok(hMetafile != 0, "CloseEnhMetaFile failed\n"); + + test.processed = 0; + ret = EnumEnhMetaFile(hdcDisplay, hMetafile, eto_scale_enum_proc, &test, &rc); + ok(ret, "EnumEnhMetaFile failed\n"); + ok(test.processed, "EnumEnhMetaFile couldn't find EMR_EXTTEXTOUTW record\n"); + + ret = DeleteEnhMetaFile(hMetafile); + ok(ret, "DeleteEnhMetaFile failed\n"); + } + + ret = ReleaseDC(hwnd, hdcDisplay); + ok(ret, "ReleaseDC failed\n"); + DestroyWindow(hwnd); +} + + static void check_dc_state(HDC hdc, int restore_no, int wnd_org_x, int wnd_org_y, int wnd_ext_x, int wnd_ext_y, int vp_org_x, int vp_org_y, int vp_ext_x, int vp_ext_y) @@ -2748,6 +2883,7 @@ START_TEST(metafile) /* For enhanced metafiles (enhmfdrv) */ test_ExtTextOut(); + test_ExtTextOutScale(); test_SaveDC(); test_emf_BitBlt();

1 0

Henri Verbeet : wined3d: Don' t use floating point textures without ARB_texture_float.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 53baeddd67c018683c5f2e252c10dd51dfb7bcc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53baeddd67c018683c5f2e252… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 8 11:50:34 2010 +0100 wined3d: Don't use floating point textures without ARB_texture_float. The floating point formats from ARB_texture_rg are only defined when ARB_texture_float is also supported. It would have been nice if the formats table itself was able to express this, but as far as I'm aware this is only an issue for ARB_texture_rg, so it's probably not worth changing. (cherry picked from commit 7a64870014b22f4c9ce1b2557f1ab18ef425f226) --- dlls/wined3d/utils.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b63a5f8..49a2659 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1136,6 +1136,12 @@ static BOOL init_format_texture_info(struct wined3d_gl_info *gl_info) if (!gl_info->supported[format_texture_info[i].extension]) continue; + /* ARB_texture_rg defines floating point formats, but only if + * ARB_texture_float is also supported. */ + if (!gl_info->supported[ARB_TEXTURE_FLOAT] + && (desc->Flags & WINED3DFMT_FLAG_FLOAT)) + continue; + desc = &gl_info->gl_formats[fmt_idx]; desc->glInternal = format_texture_info[i].gl_internal; desc->glGammaInternal = format_texture_info[i].gl_srgb_internal;

1 0

Igor Egorov : kernel32: Add stderr redirection for native Unix programs started from Windows program .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 0fd791641a785428be969e075096f66acbce5c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fd791641a785428be969e075… Author: Igor Egorov <atohom(a)gmail.com> Date: Fri Feb 4 18:47:10 2011 -0800 kernel32: Add stderr redirection for native Unix programs started from Windows program. (cherry picked from commit b970462825d52b333ca8a2be615777c2212f651b) --- dlls/kernel32/process.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 558294a..a56889e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1448,7 +1448,7 @@ static char **build_envp( const WCHAR *envW ) static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHAR *env, const char *newdir, DWORD flags, STARTUPINFOW *startup ) { - int fd[2], stdin_fd = -1, stdout_fd = -1; + int fd[2], stdin_fd = -1, stdout_fd = -1, stderr_fd = -1; int pid, err; char **argv, **envp; @@ -1469,25 +1469,30 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA if (!(flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS))) { - HANDLE hstdin, hstdout; + HANDLE hstdin, hstdout, hstderr; if (startup->dwFlags & STARTF_USESTDHANDLES) { hstdin = startup->hStdInput; hstdout = startup->hStdOutput; + hstderr = startup->hStdError; } else { hstdin = GetStdHandle(STD_INPUT_HANDLE); hstdout = GetStdHandle(STD_OUTPUT_HANDLE); + hstderr = GetStdHandle(STD_ERROR_HANDLE); } if (is_console_handle( hstdin )) hstdin = wine_server_ptr_handle( console_handle_unmap( hstdin )); if (is_console_handle( hstdout )) hstdout = wine_server_ptr_handle( console_handle_unmap( hstdout )); + if (is_console_handle( hstderr )) + hstderr = wine_server_ptr_handle( console_handle_unmap( hstderr )); wine_server_handle_to_fd( hstdin, FILE_READ_DATA, &stdin_fd, NULL ); wine_server_handle_to_fd( hstdout, FILE_WRITE_DATA, &stdout_fd, NULL ); + wine_server_handle_to_fd( hstderr, FILE_WRITE_DATA, &stderr_fd, NULL ); } argv = build_argv( cmdline, 0 ); @@ -1526,6 +1531,11 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA dup2( stdout_fd, 1 ); close( stdout_fd ); } + if (stderr_fd != -1) + { + dup2( stderr_fd, 2 ); + close( stderr_fd ); + } } /* Reset signals that we previously set to SIG_IGN */ @@ -1543,6 +1553,7 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA HeapFree( GetProcessHeap(), 0, envp ); if (stdin_fd != -1) close( stdin_fd ); if (stdout_fd != -1) close( stdout_fd ); + if (stderr_fd != -1) close( stderr_fd ); close( fd[1] ); if ((pid != -1) && (read( fd[0], &err, sizeof(err) ) > 0)) /* exec failed */ {

1 0

Huw Davies : widl: Initialise [out] only conformant arrays.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 97675d453537e3430c96248e7a58701479e11c85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97675d453537e3430c96248e7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 2 11:14:36 2011 +0000 widl: Initialise [out] only conformant arrays. This isn't strictly what midl does, however VB relies on the array in IEnumVARIANT_Next() being zero initialised. Native uses stubless proxies, where the initialisation is performed in NdrStubCall2(). (cherry picked from commit 09dd285d8c6458643a5eb6eb5dfa999368a46c74) --- tools/widl/typegen.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c4e51cd..26f3d26 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4017,10 +4017,22 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char if (type_array_has_conformance(var->type)) { unsigned int size; - type_t *type = var->type; + type_t *type; fprintf(file, " = NdrAllocate(&__frame->_StubMsg, "); - for ( ; + for (type = var->type; + is_array(type) && type_array_has_conformance(type); + type = type_array_get_element(type)) + { + write_expr(file, type_array_get_conformance(type), TRUE, + TRUE, NULL, NULL, local_var_prefix); + fprintf(file, " * "); + } + size = type_memsize(type); + fprintf(file, "%u);\n", size); + + print_file(file, indent, "memset(%s%s, 0, ", local_var_prefix, var->name); + for (type = var->type; is_array(type) && type_array_has_conformance(type); type = type_array_get_element(type)) {

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
94
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 April 2011