January 2018 - Wine-commits

Hans Leidekker : iphlpapi: Implement if_indextoname.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: e3fe10719e111c1c8f1a3e12df8bf35c37376736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3fe10719e111c1c8f1a3e12… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 23 09:43:50 2018 +0100 iphlpapi: Implement if_indextoname. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 10 ++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 45 +++++++++++++++++++++++++++++------------- include/netioapi.h | 2 ++ 4 files changed, 44 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index fee9960..b6c9aef 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -159,7 +159,7 @@ @ stdcall IcmpSendEcho2Ex(ptr ptr ptr ptr long long ptr long ptr ptr long long) @ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) -#@ stub if_indextoname +@ stdcall if_indextoname(long ptr) IPHLP_if_indextoname @ stdcall if_nametoindex(str) IPHLP_if_nametoindex #@ stub InitializeIpForwardEntry #@ stub InitializeIpInterfaceEntry diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 94bf825..48a8387 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3235,3 +3235,13 @@ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) return 0; } + +/****************************************************************** + * if_indextoname (IPHLPAPI.@) + */ +PCHAR WINAPI IPHLP_if_indextoname(NET_IFINDEX index, PCHAR name) +{ + TRACE("(%u, %p)\n", index, name); + + return getInterfaceNameByIndex(index, name); +} diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index dd0cb90..6397742 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -97,6 +97,7 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); +static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); static void loadIPHlpApi(void) @@ -148,6 +149,7 @@ static void loadIPHlpApi(void) pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); + pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); } } @@ -1786,7 +1788,7 @@ static void test_interface_identifier_conversion(void) GUID guid; SIZE_T len; WCHAR nameW[IF_MAX_STRING_SIZE + 1]; - char nameA[IF_MAX_STRING_SIZE + 1]; + char nameA[IF_MAX_STRING_SIZE + 1], *name; NET_IFINDEX index, index2; if (!pConvertInterfaceIndexToLuid) @@ -1947,22 +1949,37 @@ static void test_interface_identifier_conversion(void) ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); - /* if_nametoindex */ - if (pif_nametoindex) + if (!pif_nametoindex || !pif_indextoname) { - index2 = pif_nametoindex( NULL ); - ok( !index2, "Got unexpected index %u\n", index2 ); - index2 = pif_nametoindex( nameA ); - ok( index2 == index, "Got index %u for %s, expected %u\n", index2, nameA, index ); - /* Wargaming.net Game Center passes a GUID-like string. */ - index2 = pif_nametoindex( "{00000001-0000-0000-0000-000000000000}" ); - ok( !index2, "Got unexpected index %u\n", index2 ); - index2 = pif_nametoindex( wine_dbgstr_guid( &guid ) ); - ok( !index2, "Got unexpected index %u for input %s\n", index2, wine_dbgstr_guid( &guid ) ); + skip("if_nametoindex/if_indextoname not supported\n"); + return; } - else + + index2 = pif_nametoindex( NULL ); + ok( !index2, "Got unexpected index %u\n", index2 ); + index2 = pif_nametoindex( nameA ); + ok( index2 == index, "Got index %u for %s, expected %u\n", index2, nameA, index ); + /* Wargaming.net Game Center passes a GUID-like string. */ + index2 = pif_nametoindex( "{00000001-0000-0000-0000-000000000000}" ); + ok( !index2, "Got unexpected index %u\n", index2 ); + index2 = pif_nametoindex( wine_dbgstr_guid( &guid ) ); + ok( !index2, "Got unexpected index %u for input %s\n", index2, wine_dbgstr_guid( &guid ) ); + + name = pif_indextoname( 0, NULL ); + ok( name == NULL, "got %s\n", name ); + + name = pif_indextoname( 0, nameA ); + ok( name == NULL, "got %p\n", name ); + + name = pif_indextoname( ~0u, nameA ); + ok( name == NULL, "got %p\n", name ); + + nameA[0] = 0; + name = pif_indextoname( 1, nameA ); + if (name != NULL) { - skip("if_nametoindex not supported\n"); + ok( name[0], "empty name\n" ); + ok( name == nameA, "got %p\n", name ); } } diff --git a/include/netioapi.h b/include/netioapi.h index 4f5f671..1095888 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -174,5 +174,7 @@ void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); +PCHAR WINAPI if_indextoname(NET_IFINDEX,PCHAR); +NET_IFINDEX WINAPI if_nametoindex(PCSTR); #endif /* __WINE_NETIOAPI_H */

1 0

Huw Davies : ole32: Only load the contents stream for the static clsids.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: ce66c8d147f39af529a8a150dbea24e049d3f3cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce66c8d147f39af529a8a150… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 23 08:47:22 2018 +0000 ole32: Only load the contents stream for the static clsids. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index e2ff928..685abdb 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -162,6 +162,9 @@ struct DataCache IAdviseSink *sinkInterface; CLSID clsid; + /* Is the clsid one of the CLSID_Picture classes */ + BOOL clsid_static; + IStorage *presentationStorage; /* list of cache entries */ @@ -1307,9 +1310,13 @@ static HRESULT create_automatic_entry(DataCache *cache, const CLSID *clsid) while (ptr->clsid) { if (IsEqualCLSID( clsid, ptr->clsid )) + { + cache->clsid_static = TRUE; return DataCache_CreateEntry( cache, &ptr->fmt, 0, TRUE, NULL ); + } ptr++; } + cache->clsid_static = FALSE; return S_OK; } @@ -1776,24 +1783,33 @@ static HRESULT parse_pres_streams( DataCache *This, IStorage *stg ) static const FORMATETC static_dib_fmt = { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; -static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *stm ) +static HRESULT parse_contents_stream( DataCache *This, IStorage *stg ) { HRESULT hr; STATSTG stat; const FORMATETC *fmt; + IStream *stm; - hr = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); + hr = IStorage_OpenStream( stg, CONTENTS, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); if (FAILED( hr )) return hr; + hr = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); + if (FAILED( hr )) goto done; + if (IsEqualCLSID( &stat.clsid, &CLSID_Picture_Dib )) fmt = &static_dib_fmt; else { FIXME("unsupported format %s\n", debugstr_guid( &stat.clsid )); - return E_FAIL; + hr = E_FAIL; + goto done; } - return add_cache_entry( This, fmt, 0, stm, contents_stream ); + hr = add_cache_entry( This, fmt, 0, stm, contents_stream ); + +done: + IStream_Release( stm ); + return hr; } /************************************************************************ @@ -1804,42 +1820,38 @@ static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *s * and it will load the presentation information when the * IDataObject_GetData or IViewObject2_Draw methods are called. */ -static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg ) +static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *stg ) { DataCache *This = impl_from_IPersistStorage(iface); HRESULT hr; - IStream *stm; CLSID clsid; DataCacheEntry *entry, *cursor2; - TRACE("(%p, %p)\n", iface, pStg); + TRACE("(%p, %p)\n", iface, stg); IPersistStorage_HandsOffStorage( iface ); LIST_FOR_EACH_ENTRY_SAFE( entry, cursor2, &This->cache_list, DataCacheEntry, entry ) DataCacheEntry_Destroy( This, entry ); - ReadClassStg( pStg, &clsid ); + ReadClassStg( stg, &clsid ); hr = create_automatic_entry( This, &clsid ); if (FAILED( hr )) return hr; This->clsid = clsid; - hr = IStorage_OpenStream( pStg, CONTENTS, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, - 0, &stm ); - if (SUCCEEDED( hr )) + if (This->clsid_static) { - hr = parse_contents_stream( This, pStg, stm ); - IStream_Release( stm ); + hr = parse_contents_stream( This, stg ); + if (FAILED(hr)) hr = parse_pres_streams( This, stg ); } - - if (FAILED(hr)) - hr = parse_pres_streams( This, pStg ); + else + hr = parse_pres_streams( This, stg ); if (SUCCEEDED( hr )) { This->dirty = FALSE; - This->presentationStorage = pStg; + This->presentationStorage = stg; IStorage_AddRef( This->presentationStorage ); } @@ -2978,6 +2990,7 @@ static DataCache* DataCache_Construct( newObject->sinkAdviseFlag = 0; newObject->sinkInterface = 0; newObject->clsid = CLSID_NULL; + newObject->clsid_static = FALSE; newObject->presentationStorage = NULL; list_init(&newObject->cache_list); newObject->last_cache_id = 2;

1 0

Huw Davies : ole32: Explicitly enumerate the presentation streams rather than using EnumElements.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: c4a595e316f61bcb3ab08a1273de84b372b81c69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4a595e316f61bcb3ab08a12… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 23 08:47:23 2018 +0000 ole32: Explicitly enumerate the presentation streams rather than using EnumElements. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 75 +++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 47 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 685abdb..8c5df32 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -446,23 +446,6 @@ static void DataCache_FireOnViewChange( } } -/* Helper for DataCacheEntry_OpenPresStream */ -static BOOL DataCache_IsPresentationStream(const STATSTG *elem) -{ - /* The presentation streams have names of the form "\002OlePresXXX", - * where XXX goes from 000 to 999. */ - static const WCHAR OlePres[] = { 2,'O','l','e','P','r','e','s' }; - - LPCWSTR name = elem->pwcsName; - - return (elem->type == STGTY_STREAM) - && (strlenW(name) == 11) - && (strncmpW(name, OlePres, 8) == 0) - && (name[8] >= '0') && (name[8] <= '9') - && (name[9] >= '0') && (name[9] <= '9') - && (name[10] >= '0') && (name[10] <= '9'); -} - static HRESULT read_clipformat(IStream *stream, CLIPFORMAT *clipformat) { DWORD length; @@ -583,6 +566,15 @@ static HRESULT DataCacheEntry_OpenPresStream(DataCacheEntry *cache_entry, IStrea return hr; } +static HRESULT open_pres_stream( IStorage *stg, int stream_number, IStream **stm ) +{ + WCHAR name[] = {2,'O','l','e','P','r','e','s', + '0' + (stream_number / 100) % 10, + '0' + (stream_number / 10) % 10, + '0' + stream_number % 10, 0}; + + return IStorage_OpenStream( stg, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); +} static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) { @@ -1734,49 +1726,38 @@ static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, DWORD adv return hr; } -static HRESULT parse_pres_streams( DataCache *This, IStorage *stg ) +static HRESULT parse_pres_streams( DataCache *cache, IStorage *stg ) { HRESULT hr; - IEnumSTATSTG *stat_enum; - STATSTG stat; IStream *stm; PresentationDataHeader header; ULONG actual_read; CLIPFORMAT clipformat; FORMATETC fmtetc; + int stream_number = 0; - hr = IStorage_EnumElements( stg, 0, NULL, 0, &stat_enum ); - if (FAILED( hr )) return hr; - - while ((hr = IEnumSTATSTG_Next( stat_enum, 1, &stat, NULL )) == S_OK) + do { - if (DataCache_IsPresentationStream( &stat )) - { - hr = IStorage_OpenStream( stg, stat.pwcsName, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, - 0, &stm ); - if (SUCCEEDED( hr )) - { - hr = read_clipformat( stm, &clipformat ); + hr = open_pres_stream( stg, stream_number, &stm ); + if (FAILED(hr)) break; - if (hr == S_OK) - hr = IStream_Read( stm, &header, sizeof(header), &actual_read ); + hr = read_clipformat( stm, &clipformat ); - if (hr == S_OK && actual_read == sizeof(header)) - { - fmtetc.cfFormat = clipformat; - fmtetc.ptd = NULL; /* FIXME */ - fmtetc.dwAspect = header.dvAspect; - fmtetc.lindex = header.lindex; - fmtetc.tymed = tymed_from_cf( clipformat ); + if (hr == S_OK) hr = IStream_Read( stm, &header, sizeof(header), &actual_read ); - add_cache_entry( This, &fmtetc, header.advf, stm, pres_stream ); - } - IStream_Release( stm ); - } + if (hr == S_OK && actual_read == sizeof(header)) + { + fmtetc.cfFormat = clipformat; + fmtetc.ptd = NULL; /* FIXME */ + fmtetc.dwAspect = header.dvAspect; + fmtetc.lindex = header.lindex; + fmtetc.tymed = tymed_from_cf( clipformat ); + + add_cache_entry( cache, &fmtetc, header.advf, stm, pres_stream ); } - CoTaskMemFree( stat.pwcsName ); - } - IEnumSTATSTG_Release( stat_enum ); + IStream_Release( stm ); + stream_number++; + } while (hr == S_OK); return S_OK; }

1 0

Sergio Gómez Del Real : ole32: Prevent adding additional cache entries to static class caches.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 3bf32809b0dae5973d2185795044809c5af33550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bf32809b0dae5973d218579… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Tue Jan 23 08:47:24 2018 +0000 ole32: Prevent adding additional cache entries to static class caches. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 ++ dlls/ole32/tests/ole2.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 8c5df32..60ddd38 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2453,6 +2453,8 @@ static HRESULT WINAPI DataCache_Cache( return CACHE_S_SAMECACHE; } + if (This->clsid_static) return DV_E_FORMATETC; + hr = DataCache_CreateEntry(This, &fmt_cpy, advf, FALSE, &cache_entry); if (SUCCEEDED(hr)) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 7fcb1aa..d83ca00 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2426,6 +2426,29 @@ static void test_data_cache_cache(void) IDataObject_Release( data ); IOleCache2_Release( cache ); + + /* tests for a static class cache */ + hr = CreateDataCache( NULL, &CLSID_Picture_Dib, &IID_IOleCache2, (void **)&cache ); + + fmt.cfFormat = CF_DIB; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.tymed = TYMED_HGLOBAL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == CACHE_S_SAMECACHE, "got %08x\n", hr ); + + /* aspect other than DVASPECT_CONTENT should fail */ + fmt.dwAspect = DVASPECT_THUMBNAIL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + + /* try caching another clip format */ + fmt.dwAspect = DVASPECT_CONTENT; + fmt.cfFormat = CF_METAFILEPICT; + fmt.tymed = TYMED_MFPICT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + + IOleCache2_Release( cache ); } /* The CLSID_Picture_ classes automatically create appropriate cache entries */

1 0

Huw Davies : gdi32: Allocate the bitmap bits during CreateBitmapIndirect() to catch out-of-memory errors.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 82973cfbd1e1ca04b73d0323d553043fff0db003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82973cfbd1e1ca04b73d0323… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 23 09:44:23 2018 +0000 gdi32: Allocate the bitmap bits during CreateBitmapIndirect() to catch out-of-memory errors. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 20 ++++++++++++++++---- dlls/gdi32/dibdrv/dc.c | 7 ------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index c16793d..0ae5b20 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -145,6 +145,8 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) BITMAP bm; BITMAPOBJ *bmpobj; HBITMAP hbitmap; + INT dib_stride; + SIZE_T size; if (!bmp || bmp->bmType) { @@ -194,10 +196,13 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) /* Windows ignores the provided bm.bmWidthBytes */ bm.bmWidthBytes = get_bitmap_stride( bm.bmWidth, bm.bmBitsPixel ); - /* XP doesn't allow creating bitmaps larger than 128 MB */ - if (bm.bmHeight > 128 * 1024 * 1024 / bm.bmWidthBytes) + + dib_stride = get_dib_stride( bm.bmWidth, bm.bmBitsPixel ); + size = dib_stride * bm.bmHeight; + /* Check for overflow (dib_stride itself must be ok because of the constraint on bm.bmWidth above). */ + if (dib_stride != size / bm.bmHeight) { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + SetLastError( ERROR_INVALID_PARAMETER ); return 0; } @@ -209,10 +214,17 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) } bmpobj->dib.dsBm = bm; - bmpobj->dib.dsBm.bmBits = NULL; + bmpobj->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + if (!bmpobj->dib.dsBm.bmBits) + { + HeapFree( GetProcessHeap(), 0, bmpobj ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return 0; + } if (!(hbitmap = alloc_gdi_handle( bmpobj, OBJ_BITMAP, &bitmap_funcs ))) { + HeapFree( GetProcessHeap(), 0, bmpobj->dib.dsBm.bmBits ); HeapFree( GetProcessHeap(), 0, bmpobj ); return 0; } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index aee305f..2447093 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -168,13 +168,6 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp) BITMAPINFO info; get_ddb_bitmapinfo( bmp, &info ); - if (!bmp->dib.dsBm.bmBits) - { - int width_bytes = get_dib_stride( bmp->dib.dsBm.bmWidth, bmp->dib.dsBm.bmBitsPixel ); - bmp->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - bmp->dib.dsBm.bmHeight * width_bytes ); - if (!bmp->dib.dsBm.bmBits) return FALSE; - } init_dib_info_from_bitmapinfo( dib, &info, bmp->dib.dsBm.bmBits ); } else init_dib_info( dib, &bmp->dib.dsBmih, bmp->dib.dsBm.bmWidthBytes,

1 0

Guo Lv : user32: Make functions use display dc thread-safe.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: daa832f4bf265e459e17d487453f3cc112f6e567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daa832f4bf265e459e17d487… Author: Guo Lv <lvguo(a)deepin.com> Date: Fri Jan 12 13:07:52 2018 +0800 user32: Make functions use display dc thread-safe. Signed-off-by: Guo Lv <lvguo(a)deepin.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 68 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 97f6b57..4b66eb2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -233,6 +233,17 @@ static const WCHAR CSu[] = {'%','u',0}; static const WCHAR CSd[] = {'%','d',0}; static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; +static HDC display_dc; +static CRITICAL_SECTION display_dc_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &display_dc_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": display_dc_section") } +}; +static CRITICAL_SECTION display_dc_section = { &critsect_debug, -1 ,0, 0, 0, 0 }; + + /* Indicators whether system parameter value is loaded */ static char spi_loaded[SPI_INDEX_COUNT]; @@ -604,7 +615,7 @@ static BOOL init_entry_string( struct sysparam_entry *entry, const WCHAR *str ) static inline HDC get_display_dc(void) { static const WCHAR DISPLAY[] = {'D','I','S','P','L','A','Y',0}; - static HDC display_dc; + EnterCriticalSection( &display_dc_section ); if (!display_dc) { display_dc = CreateICW( DISPLAY, NULL, NULL, NULL ); @@ -613,10 +624,21 @@ static inline HDC get_display_dc(void) return display_dc; } +static inline void release_display_dc( HDC hdc ) +{ + LeaveCriticalSection( &display_dc_section ); +} + static inline int get_display_dpi(void) { static int display_dpi; - if (!display_dpi) display_dpi = GetDeviceCaps( get_display_dc(), LOGPIXELSY ); + HDC hdc; + if (!display_dpi) + { + hdc = get_display_dc(); + display_dpi = GetDeviceCaps( hdc, LOGPIXELSY ); + release_display_dc( hdc ); + } return display_dpi; } @@ -629,33 +651,36 @@ static INT CALLBACK real_fontname_proc(const LOGFONTW *lf, const TEXTMETRICW *nt return 0; } -static void get_real_fontname(LOGFONTW *lf) +static void get_real_fontname( HDC hdc, LOGFONTW *lf ) { - EnumFontFamiliesExW(get_display_dc(), lf, real_fontname_proc, (LPARAM)lf, 0); + EnumFontFamiliesExW(hdc, lf, real_fontname_proc, (LPARAM)lf, 0); } /* adjust some of the raw values found in the registry */ static void normalize_nonclientmetrics( NONCLIENTMETRICSW *pncm) { TEXTMETRICW tm; + HDC hdc = get_display_dc(); + if( pncm->iBorderWidth < 1) pncm->iBorderWidth = 1; if( pncm->iCaptionWidth < 8) pncm->iCaptionWidth = 8; if( pncm->iScrollWidth < 8) pncm->iScrollWidth = 8; if( pncm->iScrollHeight < 8) pncm->iScrollHeight = 8; /* adjust some heights to the corresponding font */ - get_text_metr_size( get_display_dc(), &pncm->lfMenuFont, &tm, NULL); + get_text_metr_size( hdc, &pncm->lfMenuFont, &tm, NULL); pncm->iMenuHeight = max( pncm->iMenuHeight, 2 + tm.tmHeight + tm.tmExternalLeading ); - get_real_fontname( &pncm->lfMenuFont ); - get_text_metr_size( get_display_dc(), &pncm->lfCaptionFont, &tm, NULL); + get_real_fontname( hdc, &pncm->lfMenuFont ); + get_text_metr_size( hdc, &pncm->lfCaptionFont, &tm, NULL); pncm->iCaptionHeight = max( pncm->iCaptionHeight, 2 + tm.tmHeight); - get_real_fontname( &pncm->lfCaptionFont ); - get_text_metr_size( get_display_dc(), &pncm->lfSmCaptionFont, &tm, NULL); + get_real_fontname( hdc, &pncm->lfCaptionFont ); + get_text_metr_size( hdc, &pncm->lfSmCaptionFont, &tm, NULL); pncm->iSmCaptionHeight = max( pncm->iSmCaptionHeight, 2 + tm.tmHeight); - get_real_fontname( &pncm->lfSmCaptionFont ); + get_real_fontname( hdc, &pncm->lfSmCaptionFont ); - get_real_fontname( &pncm->lfStatusFont ); - get_real_fontname( &pncm->lfMessageFont ); + get_real_fontname( hdc, &pncm->lfStatusFont ); + get_real_fontname( hdc, &pncm->lfMessageFont ); + release_display_dc( hdc ); } static BOOL CALLBACK enum_monitors( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) @@ -2378,14 +2403,21 @@ INT WINAPI GetSystemMetrics( INT index ) { NONCLIENTMETRICSW ncm; UINT ret; + HDC hdc; /* some metrics are dynamic */ switch (index) { case SM_CXSCREEN: - return GetDeviceCaps( get_display_dc(), HORZRES ); + hdc = get_display_dc(); + ret = GetDeviceCaps( hdc, HORZRES ); + release_display_dc( hdc ); + return ret; case SM_CYSCREEN: - return GetDeviceCaps( get_display_dc(), VERTRES ); + hdc = get_display_dc(); + ret = GetDeviceCaps( hdc, VERTRES ); + release_display_dc( hdc ); + return ret; case SM_CXVSCROLL: case SM_CYHSCROLL: get_entry( &entry_SCROLLWIDTH, 0, &ret ); @@ -2447,7 +2479,9 @@ INT WINAPI GetSystemMetrics( INT index ) case SM_CXMIN: ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); - get_text_metr_size( get_display_dc(), &ncm.lfCaptionFont, NULL, &ret ); + hdc = get_display_dc(); + get_text_metr_size( hdc, &ncm.lfCaptionFont, NULL, &ret ); + release_display_dc( hdc ); return 3 * ncm.iCaptionWidth + ncm.iCaptionHeight + 4 * ret + 2 * GetSystemMetrics(SM_CXFRAME) + 4; case SM_CYMIN: return GetSystemMetrics( SM_CYCAPTION) + 2 * GetSystemMetrics( SM_CYFRAME); @@ -2564,7 +2598,9 @@ INT WINAPI GetSystemMetrics( INT index ) TEXTMETRICW tm; ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); - get_text_metr_size( get_display_dc(), &ncm.lfMenuFont, &tm, NULL); + hdc = get_display_dc(); + get_text_metr_size( hdc, &ncm.lfMenuFont, &tm, NULL); + release_display_dc( hdc ); return tm.tmHeight <= 0 ? 13 : ((tm.tmHeight + tm.tmExternalLeading + 1) / 2) * 2 - 1; } case SM_SLOWMACHINE:

1 0

Alexandre Julliard : user32: Also user the thread-safe display DC in icon functions.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: e7e576d67597924ca14f4c06cb3c9a7f13f3b892 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7e576d67597924ca14f4c06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 23 12:30:22 2018 +0100 user32: Also user the thread-safe display DC in icon functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 78 ++++++++++++++-------------------------------- dlls/user32/sysparams.c | 10 ++---- dlls/user32/user_private.h | 2 ++ 3 files changed, 29 insertions(+), 61 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 1fbec2a..1203250 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -92,15 +92,20 @@ struct animated_cursoricon_object HICON frames[1]; /* list of animated cursor frames */ }; -static HDC get_screen_dc(void) +static HBITMAP create_color_bitmap( int width, int height ) { - static const WCHAR DISPLAYW[] = {'D','I','S','P','L','A','Y',0}; - static HDC screen_dc; - - if (!screen_dc) - screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); + HDC hdc = get_display_dc(); + HBITMAP ret = CreateCompatibleBitmap( hdc, width, height ); + release_display_dc( hdc ); + return ret; +} - return screen_dc; +static int get_display_bpp(void) +{ + HDC hdc = get_display_dc(); + int ret = GetDeviceCaps( hdc, BITSPIXEL ); + release_display_dc( hdc ); + return ret; } static HICON alloc_icon_handle( BOOL is_ani, UINT num_steps ) @@ -811,7 +816,6 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE BOOL ret = FALSE; BOOL do_stretch; HICON hObj = 0; - HDC screen_dc; HDC hdc = 0; LONG bmi_width, bmi_height; WORD bpp; @@ -875,8 +879,6 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE hotspot.y = (hotspot.y * height) / (bmi_height / 2); } - if (!(screen_dc = get_screen_dc())) return 0; - if (!(bmi_copy = HeapAlloc( GetProcessHeap(), 0, max( size, FIELD_OFFSET( BITMAPINFO, bmiColors[2] ))))) return 0; if (!(hdc = CreateCompatibleDC( 0 ))) goto done; @@ -906,8 +908,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE else { if (!(mask = CreateBitmap( width, height, 1, 1, NULL ))) goto done; - if (!(color = CreateBitmap( width, height, GetDeviceCaps( screen_dc, PLANES ), - GetDeviceCaps( screen_dc, BITSPIXEL ), NULL ))) + if (!(color = create_color_bitmap( width, height ))) { DeleteObject( mask ); goto done; @@ -1830,11 +1831,7 @@ INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE xdir, BOOL bIcon, if( dir && !dir->idReserved && (dir->idType & 3) ) { const CURSORICONDIRENTRY* entry; - - const HDC hdc = GetDC(0); - const int depth = (cFlag & LR_MONOCHROME) ? - 1 : GetDeviceCaps(hdc, BITSPIXEL); - ReleaseDC(0, hdc); + int depth = (cFlag & LR_MONOCHROME) ? 1 : get_display_bpp(); if( bIcon ) entry = CURSORICON_FindBestIconRes( dir, ~0u, width, height, depth, LR_DEFAULTSIZE ); @@ -2168,7 +2165,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) height = bmpXor.bmHeight; if (bmpXor.bmPlanes * bmpXor.bmBitsPixel != 1 || bmpAnd.bmPlanes * bmpAnd.bmBitsPixel != 1) { - color = CreateCompatibleBitmap( get_screen_dc(), width, height ); + color = create_color_bitmap( width, height ); mask = CreateBitmap( width, height, 1, 1, NULL ); } else mask = CreateBitmap( width, height * 2, 1, 1, NULL ); @@ -2498,7 +2495,6 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, DWORD compr_dummy, offbits = 0; INT bm_type; HDC screen_mem_dc = NULL; - HDC screen_dc; if (!(loadflags & LR_LOADFROMFILE)) { @@ -2578,22 +2574,21 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (new_height < 0) new_height = -new_height; - screen_dc = get_screen_dc(); - if (!(screen_mem_dc = CreateCompatibleDC( screen_dc ))) goto end; + if (!(screen_mem_dc = CreateCompatibleDC( 0 ))) goto end; bits = (char *)info + (offbits ? offbits : size); if (loadflags & LR_CREATEDIBSECTION) { scaled_info->bmiHeader.biCompression = 0; /* DIBSection can't be compressed */ - hbitmap = CreateDIBSection(screen_dc, scaled_info, DIB_RGB_COLORS, NULL, 0, 0); + hbitmap = CreateDIBSection(0, scaled_info, DIB_RGB_COLORS, NULL, 0, 0); } else { if (is_dib_monochrome(fix_info)) hbitmap = CreateBitmap(new_width, new_height, 1, 1, NULL); else - hbitmap = CreateCompatibleBitmap(screen_dc, new_width, new_height); + hbitmap = create_color_bitmap(new_width, new_height); } orig_bm = SelectObject(screen_mem_dc, hbitmap); @@ -2672,13 +2667,7 @@ HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, case IMAGE_ICON: case IMAGE_CURSOR: depth = 1; - if (!(loadflags & LR_MONOCHROME)) - { - HDC screen_dc; - - if ((screen_dc = get_screen_dc())) - depth = GetDeviceCaps( screen_dc, BITSPIXEL ); - } + if (!(loadflags & LR_MONOCHROME)) depth = get_display_bpp(); return CURSORICON_Load(hinst, name, desiredx, desiredy, depth, (type == IMAGE_CURSOR), loadflags); } return 0; @@ -2818,37 +2807,18 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, } if (monochrome) - { res = CreateBitmap(desiredx, desiredy, 1, 1, NULL); - } else - { - HDC screenDC = GetDC(NULL); - res = CreateCompatibleBitmap(screenDC, desiredx, desiredy); - ReleaseDC(NULL, screenDC); - } + res = create_color_bitmap(desiredx, desiredy); } if (res) { /* Only copy the bitmap if it's a DIB section or if it's compatible to the screen */ - BOOL copyContents; - - if (objSize == sizeof(DIBSECTION)) - { - copyContents = TRUE; - } - else - { - HDC screenDC = GetDC(NULL); - int screen_depth = GetDeviceCaps(screenDC, BITSPIXEL); - ReleaseDC(NULL, screenDC); - - copyContents = (ds.dsBm.bmBitsPixel == 1 || ds.dsBm.bmBitsPixel == screen_depth); - } - - if (copyContents) + if (objSize == sizeof(DIBSECTION) || + ds.dsBm.bmBitsPixel == 1 || + ds.dsBm.bmBitsPixel == get_display_bpp()) { /* The source bitmap may already be selected in a device context, use GetDIBits/StretchDIBits and not StretchBlt */ @@ -2901,7 +2871,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, { struct cursoricon_object *icon; HICON res = 0; - int depth = (flags & LR_MONOCHROME) ? 1 : GetDeviceCaps( get_screen_dc(), BITSPIXEL ); + int depth = (flags & LR_MONOCHROME) ? 1 : get_display_bpp(); if (flags & LR_DEFAULTSIZE) { diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4b66eb2..f80cea1 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -612,19 +612,15 @@ static BOOL init_entry_string( struct sysparam_entry *entry, const WCHAR *str ) return init_entry( entry, str, (strlenW(str) + 1) * sizeof(WCHAR), REG_SZ ); } -static inline HDC get_display_dc(void) +HDC get_display_dc(void) { static const WCHAR DISPLAY[] = {'D','I','S','P','L','A','Y',0}; EnterCriticalSection( &display_dc_section ); - if (!display_dc) - { - display_dc = CreateICW( DISPLAY, NULL, NULL, NULL ); - __wine_make_gdi_object_system( display_dc, TRUE ); - } + if (!display_dc) display_dc = CreateDCW( DISPLAY, NULL, NULL, NULL ); return display_dc; } -static inline void release_display_dc( HDC hdc ) +void release_display_dc( HDC hdc ) { LeaveCriticalSection( &display_dc_section ); } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 052fdd8..0ffdcdd 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -227,6 +227,8 @@ extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN; extern void invalidate_dce( struct tagWND *win, const RECT *rect ) DECLSPEC_HIDDEN; +extern HDC get_display_dc(void) DECLSPEC_HIDDEN; +extern void release_display_dc( HDC hdc ) DECLSPEC_HIDDEN; extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN; extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, struct window_surface *new_surface,

1 0

Zebediah Figura : quartz: Wait for the PullPin thread to terminate.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 55b37182056ed5a00b0a7796109d10265cc36492 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55b37182056ed5a00b0a7796… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 19 17:54:39 2018 -0600 quartz: Wait for the PullPin thread to terminate. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/pin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 355d87d..5197d5c 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -541,11 +541,7 @@ static void PullPin_Thread_Stop(PullPin *This) TRACE("(%p)->()\n", This); EnterCriticalSection(This->pin.pCritSec); - { - CloseHandle(This->hThread); - This->hThread = NULL; - SetEvent(This->hEventStateChanged); - } + SetEvent(This->hEventStateChanged); LeaveCriticalSection(This->pin.pCritSec); IBaseFilter_Release(This->pin.pinInfo.pFilter); @@ -831,6 +827,10 @@ HRESULT WINAPI PullPin_Disconnect(IPin *iface) } LeaveCriticalSection(This->pin.pCritSec); + WaitForSingleObject(This->hThread, INFINITE); + CloseHandle(This->hThread); + This->hThread = NULL; + return hr; }

1 0

Michael Stefaniuc : kernel32/tests: Fix the HeapReAlloc name in two comments.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 0efd18f45a1ce74d217eabcc70804b52299f02df URL: https://source.winehq.org/git/wine.git/?a=commit;h=0efd18f45a1ce74d217eabcc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jan 21 22:05:33 2018 +0100 kernel32/tests: Fix the HeapReAlloc name in two comments. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 2c91bb9..67dc8b6 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -568,7 +568,7 @@ static void test_HeapCreate(void) ok(HeapFree(heap,0,mem3),"HeapFree didn't pass successfully\n"); } - /* Check that HeapRealloc works */ + /* Check that HeapReAlloc works */ mem2a=HeapReAlloc(heap,HEAP_ZERO_MEMORY,mem2,memchunk+5*sysInfo.dwPageSize); ok(mem2a!=NULL,"HeapReAlloc failed\n"); if(mem2a) { @@ -582,7 +582,7 @@ static void test_HeapCreate(void) ok(!error,"HeapReAlloc should have zeroed out its allocated memory\n"); } - /* Check that HeapRealloc honours HEAP_REALLOC_IN_PLACE_ONLY */ + /* Check that HeapReAlloc honours HEAP_REALLOC_IN_PLACE_ONLY */ error=FALSE; mem1a=HeapReAlloc(heap,HEAP_REALLOC_IN_PLACE_ONLY,mem1,memchunk+sysInfo.dwPageSize); if(mem1a!=NULL) {

1 0

Sebastian Lackner : include: Add shellscalingapi.h.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 7fadaa8e6dfaaaa8e4d293f07a7bb7f9e8162bbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fadaa8e6dfaaaa8e4d293f0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jan 22 21:55:34 2018 -0700 include: Add shellscalingapi.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/shellscalingapi.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index bb6f8d6..b975dd5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -617,6 +617,7 @@ HEADER_SRCS = \ sfc.h \ shdispid.h \ shellapi.h \ + shellscalingapi.h \ shlguid.h \ shlobj.h \ shlwapi.h \ diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h new file mode 100644 index 0000000..fb49a30 --- /dev/null +++ b/include/shellscalingapi.h @@ -0,0 +1,37 @@ +/* + * Copyright 2016 Sebastian Lackner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_SHELLSCALINGAPI_H +#define __WINE_SHELLSCALINGAPI_H + +typedef enum MONITOR_DPI_TYPE +{ + MDT_EFFECTIVE_DPI = 0, + MDT_ANGULAR_DPI = 1, + MDT_RAW_DPI = 2, + MDT_DEFAULT = MDT_EFFECTIVE_DPI, +} MONITOR_DPI_TYPE; + +typedef enum PROCESS_DPI_AWARENESS +{ + PROCESS_DPI_UNAWARE, + PROCESS_SYSTEM_DPI_AWARE, + PROCESS_PER_MONITOR_DPI_AWARE +} PROCESS_DPI_AWARENESS; + +#endif /* __WINE_SHELLSCALINGAPI_H */

1 0