March 2017 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : ole32/tests: Stop crash on XP.
by Alexandre Julliard March 14, 2017

March 14, 2017

Module: wine Branch: master Commit: 3ca00ff8573c3941e8ee911467e01938b1d17cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca00ff8573c3941e8ee91146… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 14 00:40:36 2017 +0000 ole32/tests: Stop crash on XP. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 8f6ff71..20d2962 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3569,7 +3569,13 @@ static void test_GlobalOptions(void) hres = CoCreateInstance(&CLSID_GlobalOptions, NULL, CLSCTX_INPROC_SERVER, &IID_IGlobalOptions, (void**)&global_options); - ok(hres == S_OK, "CoCreateInstance(CLSID_GlobalOptions) failed: %08x\n", hres); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "CoCreateInstance(CLSID_GlobalOptions) failed: %08x\n", hres); + if(FAILED(hres)) + { + win_skip("CLSID_GlobalOptions not available\n"); + CoUninitialize(); + return; + } IGlobalOptions_Release(global_options);

1 0

André Hentschel : iphlpapi: Flesh out NotifyIpInterfaceChange arguments.
by Alexandre Julliard March 14, 2017

March 14, 2017

Module: wine Branch: master Commit: 8c03b845c014f81c028a199a55d4cfca7816d9dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c03b845c014f81c028a199a5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 11 15:05:08 2017 +0100 iphlpapi: Flesh out NotifyIpInterfaceChange arguments. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- include/netioapi.h | 41 +++++++++++++++++++++++++++++++++++++++++ include/nldef.h | 26 ++++++++++++++++++++++++++ include/ws2def.h | 3 ++- 4 files changed, 71 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 51d05ed..953af88 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2640,8 +2640,8 @@ DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped) /****************************************************************** * NotifyIpInterfaceChange (IPHLPAPI.@) */ -DWORD WINAPI NotifyIpInterfaceChange(ULONG family, PVOID callback, PVOID context, - BOOLEAN init_notify, PHANDLE handle) +DWORD WINAPI NotifyIpInterfaceChange(ADDRESS_FAMILY family, PIPINTERFACE_CHANGE_CALLBACK callback, + PVOID context, BOOLEAN init_notify, PHANDLE handle) { FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", family, callback, context, init_notify, handle); diff --git a/include/netioapi.h b/include/netioapi.h index 7c4917b..b34d019 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -90,6 +90,45 @@ typedef struct _MIB_IF_TABLE2 MIB_IF_ROW2 Table[1]; } MIB_IF_TABLE2, *PMIB_IF_TABLE2; +typedef struct _MIB_IPINTERFACE_ROW +{ + ADDRESS_FAMILY Family; + NET_LUID InterfaceLuid; + NET_IFINDEX InterfaceIndex; + ULONG MaxReassemblySize; + ULONG64 InterfaceIdentifier; + ULONG MinRouterAdvertisementInterval; + ULONG MaxRouterAdvertisementInterval; + BOOLEAN AdvertisingEnabled; + BOOLEAN ForwardingEnabled; + BOOLEAN WeakHostSend; + BOOLEAN WeakHostReceive; + BOOLEAN UseAutomaticMetric; + BOOLEAN UseNeighborUnreachabilityDetection; + BOOLEAN ManagedAddressConfigurationSupported; + BOOLEAN OtherStatefulConfigurationSupported; + BOOLEAN AdvertiseDefaultRoute; + NL_ROUTER_DISCOVERY_BEHAVIOR RouterDiscoveryBehavior; + ULONG DadTransmits; + ULONG BaseReachableTime; + ULONG RetransmitTime; + ULONG PathMtuDiscoveryTimeout; + NL_LINK_LOCAL_ADDRESS_BEHAVIOR LinkLocalAddressBehavior; + ULONG LinkLocalAddressTimeout; + ULONG ZoneIndices[ScopeLevelCount]; + ULONG SitePrefixLength; + ULONG Metric; + ULONG NlMtu; + BOOLEAN Connected; + BOOLEAN SupportsWakeUpPatterns; + BOOLEAN SupportsNeighborDiscovery; + BOOLEAN SupportsRouterDiscovery; + ULONG ReachableTime; + NL_INTERFACE_OFFLOAD_ROD TransmitOffload; + NL_INTERFACE_OFFLOAD_ROD ReceiveOffload; + BOOLEAN DisableDefaultRoutes; +} MIB_IPINTERFACE_ROW, *PMIB_IPINTERFACE_ROW; + typedef struct _MIB_UNICASTIPADDRESS_ROW { SOCKADDR_INET Address; @@ -106,6 +145,8 @@ typedef struct _MIB_UNICASTIPADDRESS_ROW LARGE_INTEGER CreationTimeStamp; } MIB_UNICASTIPADDRESS_ROW, *PMIB_UNICASTIPADDRESS_ROW; +typedef VOID (WINAPI *PIPINTERFACE_CHANGE_CALLBACK)(PVOID, PMIB_IPINTERFACE_ROW, + MIB_NOTIFICATION_TYPE); typedef VOID (WINAPI *PUNICAST_IPADDRESS_CHANGE_CALLBACK)(PVOID, PMIB_UNICASTIPADDRESS_ROW, MIB_NOTIFICATION_TYPE); diff --git a/include/nldef.h b/include/nldef.h index 550d323..1f96773 100644 --- a/include/nldef.h +++ b/include/nldef.h @@ -48,6 +48,21 @@ typedef enum IpDadStatePreferred, } NL_DAD_STATE; +typedef enum _NL_LINK_LOCAL_ADDRESS_BEHAVIOR +{ + LinkLocalAlwaysOff = 0, + LinkLocalDelayed, + LinkLocalAlwaysOn, + LinkLocalUnchanged = -1, +} NL_LINK_LOCAL_ADDRESS_BEHAVIOR; + +typedef enum _NL_ROUTER_DISCOVERY_BEHAVIOR +{ + RouterDiscoveryDisabled = 0, + RouterDiscoveryEnabled, + RouterDiscoveryDhcp, + RouterDiscoveryUnchanged = -1, +} NL_ROUTER_DISCOVERY_BEHAVIOR; typedef enum { @@ -75,5 +90,16 @@ typedef enum MAKE_ROUTE_PROTOCOL(NT_STATIC_NON_DOD, 10007), } NL_ROUTE_PROTOCOL, *PNL_ROUTE_PROTOCOL; +typedef struct _NL_INTERFACE_OFFLOAD_ROD +{ + BOOLEAN NlChecksumSupported : 1; + BOOLEAN NlOptionsSupported : 1; + BOOLEAN TlDatagramChecksumSupported : 1; + BOOLEAN TlStreamChecksumSupported : 1; + BOOLEAN TlStreamOptionsSupported : 1; + BOOLEAN FastPathCompatible : 1; + BOOLEAN TlLargeSendOffloadSupported : 1; + BOOLEAN TlGiantSendOffloadSupported : 1; +} NL_INTERFACE_OFFLOAD_ROD, *PNL_INTERFACE_OFFLOAD_ROD; #endif /* __WINE_NLDEF_H */ diff --git a/include/ws2def.h b/include/ws2def.h index fa21c06..b92bf68 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -77,7 +77,8 @@ typedef enum { ScopeLevelAdmin = 4, ScopeLevelSite = 5, ScopeLevelOrganization = 8, - ScopeLevelGlobal = 14 + ScopeLevelGlobal = 14, + ScopeLevelCount = 16, } SCOPE_LEVEL; typedef struct

1 0

Pierre Schweitzer : iphlpapi: Flags in IP_ADAPTER_ADDRESSES_LH can be used as a bit field.
by Alexandre Julliard March 14, 2017

March 14, 2017

Module: wine Branch: master Commit: 30a27f0ba7fb275ab64d4b49fcddc44b8422a21f URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a27f0ba7fb275ab64d4b49f… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Mon Mar 13 19:39:50 2017 +0100 iphlpapi: Flags in IP_ADAPTER_ADDRESSES_LH can be used as a bit field. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- include/iptypes.h | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 953af88..6f16807 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1067,7 +1067,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index { IP_ADAPTER_UNICAST_ADDRESS *ua; struct WS_sockaddr_in *sa; - aa->Flags |= IP_ADAPTER_IPV4_ENABLED; + aa->u1.s1.Ipv4Enabled = TRUE; ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; for (i = 0; i < num_v4addrs; i++) { @@ -1101,7 +1101,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index IP_ADAPTER_UNICAST_ADDRESS *ua; struct WS_sockaddr_in6 *sa; - aa->Flags |= IP_ADAPTER_IPV6_ENABLED; + aa->u1.s1.Ipv6Enabled = TRUE; if (aa->FirstUnicastAddress) { for (ua = aa->FirstUnicastAddress; ua->Next; ua = ua->Next) diff --git a/include/iptypes.h b/include/iptypes.h index e4fa90c..c1a253d 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -244,7 +244,21 @@ typedef struct _IP_ADAPTER_ADDRESSES_LH { PWCHAR FriendlyName; BYTE PhysicalAddress[MAX_ADAPTER_ADDRESS_LENGTH]; DWORD PhysicalAddressLength; - DWORD Flags; + union { + DWORD Flags; + struct { + DWORD DdnsEnabled : 1; + DWORD RegisterAdapterSuffix : 1; + DWORD Dhcpv4Enabled : 1; + DWORD ReceiveOnly : 1; + DWORD NoMulticast : 1; + DWORD Ipv6OtherStatefulConfig : 1; + DWORD NetbiosOverTcpipEnabled : 1; + DWORD Ipv4Enabled : 1; + DWORD Ipv6Enabled : 1; + DWORD Ipv6ManagedAddressConfigurationSupported : 1; + } DUMMYSTRUCTNAME1; + } DUMMYUNIONNAME1; DWORD Mtu; DWORD IfType; IF_OPER_STATUS OperStatus;

1 0

Bruno Jesus : wined3d: Recognize GeForce 940M.
by Alexandre Julliard March 14, 2017

March 14, 2017

Module: wine Branch: master Commit: 992dcc4db520e83750a06e72588303b46840ab1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=992dcc4db520e83750a06e725… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Mar 13 11:09:28 2017 -0300 wined3d: Recognize GeForce 940M. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 51c6ad2..fcedc9a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1372,6 +1372,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX870M, "NVIDIA GeForce GTX 870M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX880M, "NVIDIA GeForce GTX 880M", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_940M, "NVIDIA GeForce 940M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1881,6 +1882,7 @@ cards_nvidia_binary[] = {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ + {"GeForce 940M", CARD_NVIDIA_GEFORCE_940M}, /* GeForce 900 - midend mobile */ {"GTX 880M", CARD_NVIDIA_GEFORCE_GTX880M}, /* GeForce 800 - mobile */ {"GTX 870M", CARD_NVIDIA_GEFORCE_GTX870M}, /* GeForce 800 - mobile */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b3e543..f9829a0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2144,6 +2144,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX870M = 0x1199, CARD_NVIDIA_GEFORCE_GTX880M = 0x1198, + CARD_NVIDIA_GEFORCE_940M = 0x1347, CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,

1 0

Alistair Leslie-Hughes : oledb32: Ignore IRunnableObject in IDataSourceLocator_QueryInterface.
by Alexandre Julliard March 14, 2017

March 14, 2017

Module: wine Branch: master Commit: d4e14aa0145adf5759d3ef746dd63dc5c6914c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e14aa0145adf5759d3ef746… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 12 06:26:54 2017 +0000 oledb32: Ignore IRunnableObject in IDataSourceLocator_QueryInterface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 5 +++++ dlls/oledb32/tests/database.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 11ed3e9..5c4bdad 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -73,6 +73,11 @@ static HRESULT WINAPI dslocator_QueryInterface(IDataSourceLocator *iface, REFIID { *ppvoid = &This->IDataInitialize_iface; } + else if (IsEqualIID(riid, &IID_IRunnableObject)) + { + TRACE("IID_IRunnableObject returning NULL\n"); + return E_NOINTERFACE; + } if(*ppvoid) { diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 7f71f8b..f39c2f5 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -859,6 +859,7 @@ static void test_dslocator(void) if(SUCCEEDED(hr)) { IDataInitialize *datainit, *datainit2; + IRunnableObject *runable; COMPATIBLE_LONG hwnd = 0; if (0) /* Crashes under Window 7 */ @@ -898,6 +899,9 @@ static void test_dslocator(void) ok(hr == S_OK, "got %08x\n", hr); ok(datainit == datainit2, "Got %p, previous %p\n", datainit, datainit2); + hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IRunnableObject, (void **)&runable); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + IDataInitialize_Release(datainit2); IDataInitialize_Release(datainit);

1 0

Nikolay Sivov : msctf/tests: Fix test object leak (Valgrind).
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: 8d03bef891baf603ca20ea0ce9bc9831a1b3660d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d03bef891baf603ca20ea0ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 12 12:26:05 2017 +0300 msctf/tests: Fix test object leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 7c12936..34a2709 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1692,6 +1692,7 @@ static void test_startSession(void) ITfContext_Release(cxt); ITfContext_Release(cxt2); ITfContext_Release(cxt3); + ITextStoreACP_Release(ts); } static void test_endSession(void)

1 0

Sebastian Lackner : krnl386.exe16: Ignore access denied error when flushing file.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: 59103375b9d54d2e3713a042fdb06a4d5531ef28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59103375b9d54d2e3713a042f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Mar 11 07:26:34 2017 +0100 krnl386.exe16: Ignore access denied error when flushing file. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/int21.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 605c945..308fc49 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -5282,7 +5282,8 @@ void WINAPI DOSVM_Int21Handler( CONTEXT *context ) case 0x68: /* "FFLUSH" - COMMIT FILE */ TRACE( "FFLUSH - handle %d\n", BX_reg(context) ); - if (!FlushFileBuffers( DosFileHandleToWin32Handle(BX_reg(context)) )) + if (!FlushFileBuffers( DosFileHandleToWin32Handle(BX_reg(context)) ) && + GetLastError() != ERROR_ACCESS_DENIED) bSetDOSExtendedError = TRUE; break; @@ -5307,7 +5308,8 @@ void WINAPI DOSVM_Int21Handler( CONTEXT *context ) case 0x6a: /* COMMIT FILE */ TRACE( "COMMIT FILE - handle %d\n", BX_reg(context) ); - if (!FlushFileBuffers( DosFileHandleToWin32Handle(BX_reg(context)) )) + if (!FlushFileBuffers( DosFileHandleToWin32Handle(BX_reg(context)) ) && + GetLastError() != ERROR_ACCESS_DENIED) bSetDOSExtendedError = TRUE; break;

1 0

Nikolay Sivov : dwrite: Added support for oblique simulation in bitmap rendering mode.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: 2175cdc3060e63411f3a8cf7ac43a3c43a29e5c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2175cdc3060e63411f3a8cf7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 13 20:44:09 2017 +0300 dwrite: Added support for oblique simulation in bitmap rendering mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 68 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 596e8a5..35a7ebf 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -74,6 +74,7 @@ MAKE_FUNCPTR(FT_Glyph_Transform); MAKE_FUNCPTR(FT_Init_FreeType); MAKE_FUNCPTR(FT_Library_Version); MAKE_FUNCPTR(FT_Load_Glyph); +MAKE_FUNCPTR(FT_Matrix_Multiply); MAKE_FUNCPTR(FT_New_Memory_Face); MAKE_FUNCPTR(FT_Outline_Copy); MAKE_FUNCPTR(FT_Outline_Decompose); @@ -194,6 +195,7 @@ BOOL init_freetype(void) LOAD_FUNCPTR(FT_Init_FreeType) LOAD_FUNCPTR(FT_Library_Version) LOAD_FUNCPTR(FT_Load_Glyph) + LOAD_FUNCPTR(FT_Matrix_Multiply) LOAD_FUNCPTR(FT_New_Memory_Face) LOAD_FUNCPTR(FT_Outline_Copy) LOAD_FUNCPTR(FT_Outline_Decompose) @@ -596,35 +598,61 @@ static BOOL is_face_scalable(IDWriteFontFace4 *fontface) return FALSE; } +static BOOL get_glyph_transform(struct dwrite_glyphbitmap *bitmap, FT_Matrix *ret) +{ + USHORT simulations = IDWriteFontFace4_GetSimulations(bitmap->fontface); + FT_Matrix m; + + ret->xx = 1 << 16; + ret->xy = 0; + ret->yx = 0; + ret->yy = 1 << 16; + + /* Some fonts provide mostly bitmaps and very few outlines, for example for .notdef. + Disable transform if that's the case. */ + if (!(is_face_scalable(bitmap->fontface) && (bitmap->m || + (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE)))) + return FALSE; + + if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) { + m.xx = 1 << 16; + m.xy = (1 << 16) / 3; + m.yx = 0; + m.yy = 1 << 16; + pFT_Matrix_Multiply(&m, ret); + } + + if (bitmap->m) { + ft_matrix_from_dwrite_matrix(bitmap->m, &m); + pFT_Matrix_Multiply(&m, ret); + } + + return TRUE; +} + void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) { FTC_ImageTypeRec imagetype; FT_BBox bbox = { 0 }; + BOOL needs_transform; FT_Glyph glyph; + FT_Matrix m; EnterCriticalSection(&freetype_cs); - /* Some fonts provide mostly bitmaps and very few outlines, for example for .notdef, - disable transform if that's the case. */ - if (bitmap->m) { - if (!is_face_scalable(bitmap->fontface)) - bitmap->m = NULL; - } + needs_transform = get_glyph_transform(bitmap, &m); imagetype.face_id = bitmap->fontface; imagetype.width = 0; imagetype.height = bitmap->emsize; - imagetype.flags = bitmap->m ? FT_LOAD_NO_BITMAP : FT_LOAD_DEFAULT; + imagetype.flags = needs_transform ? FT_LOAD_NO_BITMAP : FT_LOAD_DEFAULT; if (pFTC_ImageCache_Lookup(image_cache, &imagetype, bitmap->index, &glyph, NULL) == 0) { - if (bitmap->m) { + if (needs_transform) { FT_Glyph glyph_copy; if (pFT_Glyph_Copy(glyph, &glyph_copy) == 0) { - FT_Matrix ft_matrix; - - ft_matrix_from_dwrite_matrix(bitmap->m, &ft_matrix); - pFT_Glyph_Transform(glyph_copy, &ft_matrix, NULL); + pFT_Glyph_Transform(glyph_copy, &m, NULL); pFT_Glyph_Get_CBox(glyph_copy, FT_GLYPH_BBOX_PIXELS, &bbox); pFT_Done_Glyph(glyph_copy); } @@ -759,30 +787,26 @@ static BOOL freetype_get_aa_glyph_bitmap(struct dwrite_glyphbitmap *bitmap, FT_G BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) { FTC_ImageTypeRec imagetype; + BOOL needs_transform; BOOL ret = FALSE; FT_Glyph glyph; + FT_Matrix m; EnterCriticalSection(&freetype_cs); - if (bitmap->m) { - if (!is_face_scalable(bitmap->fontface)) - bitmap->m = NULL; - } + needs_transform = get_glyph_transform(bitmap, &m); imagetype.face_id = bitmap->fontface; imagetype.width = 0; imagetype.height = bitmap->emsize; - imagetype.flags = bitmap->m ? FT_LOAD_NO_BITMAP : FT_LOAD_DEFAULT; + imagetype.flags = needs_transform ? FT_LOAD_NO_BITMAP : FT_LOAD_DEFAULT; if (pFTC_ImageCache_Lookup(image_cache, &imagetype, bitmap->index, &glyph, NULL) == 0) { FT_Glyph glyph_copy; - if (bitmap->m) { + if (needs_transform) { if (pFT_Glyph_Copy(glyph, &glyph_copy) == 0) { - FT_Matrix ft_matrix; - - ft_matrix_from_dwrite_matrix(bitmap->m, &ft_matrix); - pFT_Glyph_Transform(glyph_copy, &ft_matrix, NULL); + pFT_Glyph_Transform(glyph_copy, &m, NULL); glyph = glyph_copy; } }

1 0

Jacek Caban : wininet: Get rid of no longer needed get_avail_data from data stream implementations.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: 2952c637e34916e64402c56b8fa9bb5eb6cd586c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2952c637e34916e64402c56b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 13 14:47:32 2017 +0100 wininet: Get rid of no longer needed get_avail_data from data stream implementations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 42 ------------------------------------------ dlls/wininet/internet.h | 1 - dlls/wininet/netconnection.c | 26 -------------------------- 3 files changed, 69 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 40f91fb..fd58b1f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -381,7 +381,6 @@ static WCHAR *get_host_header( http_request_t *req ) } struct data_stream_vtbl_t { - DWORD (*get_avail_data)(data_stream_t*,http_request_t*); BOOL (*end_of_data)(data_stream_t*,http_request_t*); DWORD (*read)(data_stream_t*,http_request_t*,BYTE*,DWORD,DWORD*,BOOL); BOOL (*drain_content)(data_stream_t*,http_request_t*); @@ -440,12 +439,6 @@ typedef struct { BOOL end_of_data; } gzip_stream_t; -static DWORD gzip_get_avail_data(data_stream_t *stream, http_request_t *req) -{ - /* Allow reading only from read buffer */ - return 0; -} - static BOOL gzip_end_of_data(data_stream_t *stream, http_request_t *req) { gzip_stream_t *gzip_stream = (gzip_stream_t*)stream; @@ -534,7 +527,6 @@ static void gzip_destroy(data_stream_t *stream) } static const data_stream_vtbl_t gzip_stream_vtbl = { - gzip_get_avail_data, gzip_end_of_data, gzip_read, gzip_drain_content, @@ -2614,18 +2606,6 @@ static DWORD refill_read_buffer(http_request_t *req, BOOL allow_blocking, DWORD return res; } -static DWORD netconn_get_avail_data(data_stream_t *stream, http_request_t *req) -{ - netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; - DWORD avail = 0; - - if(is_valid_netconn(req->netconn)) - NETCON_query_data_available(req->netconn, &avail); - return netconn_stream->content_length == ~0u - ? avail - : min(avail, netconn_stream->content_length-netconn_stream->content_read); -} - static BOOL netconn_end_of_data(data_stream_t *stream, http_request_t *req) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; @@ -2682,7 +2662,6 @@ static void netconn_destroy(data_stream_t *stream) } static const data_stream_vtbl_t netconn_stream_vtbl = { - netconn_get_avail_data, netconn_end_of_data, netconn_read, netconn_drain_content, @@ -2839,26 +2818,6 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, return ERROR_SUCCESS; } -static DWORD chunked_get_avail_data(data_stream_t *stream, http_request_t *req) -{ - chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; - DWORD avail = 0; - - if(chunked_stream->state != CHUNKED_STREAM_STATE_READING_CHUNK) { - DWORD res, read; - - /* try to process to the next chunk */ - res = chunked_read(stream, req, NULL, 0, &read, FALSE); - if(res != ERROR_SUCCESS || chunked_stream->state != CHUNKED_STREAM_STATE_READING_CHUNK) - return 0; - } - - if(is_valid_netconn(req->netconn) && chunked_stream->buf_size < chunked_stream->chunk_size) - NETCON_query_data_available(req->netconn, &avail); - - return min(avail + chunked_stream->buf_size, chunked_stream->chunk_size); -} - static BOOL chunked_drain_content(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; @@ -2872,7 +2831,6 @@ static void chunked_destroy(data_stream_t *stream) } static const data_stream_vtbl_t chunked_stream_vtbl = { - chunked_get_avail_data, chunked_end_of_data, chunked_read, chunked_drain_content, diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6a49bf1..4cd1856 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -454,7 +454,6 @@ DWORD NETCON_secure_connect(netconn_t*,server_t*) DECLSPEC_HIDDEN; DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) DECLSPEC_HIDDEN; DWORD NETCON_recv(netconn_t*,void*,size_t,BOOL,int*) DECLSPEC_HIDDEN; -BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) DECLSPEC_HIDDEN; BOOL NETCON_is_alive(netconn_t*) DECLSPEC_HIDDEN; LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 63b84aa..bab046f 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -869,32 +869,6 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, BOOL blocking, i } } -/****************************************************************************** - * NETCON_query_data_available - * Returns the number of bytes of peeked data plus the number of bytes of - * queued, but unread data. - */ -BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) -{ - *available = 0; - - if(!connection->secure) - { - ULONG unread; - int retval = ioctlsocket(connection->socket, FIONREAD, &unread); - if (!retval) - { - TRACE("%d bytes of queued, but unread data\n", unread); - *available += unread; - } - } - else - { - *available = connection->peek_len; - } - return TRUE; -} - BOOL NETCON_is_alive(netconn_t *netconn) { int len;

1 0

Jacek Caban : wininet: Always use non-blocking reads in HTTP_ReceiveRequestData.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: 295291b4be81b01693f494be3b1f8a3370263f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=295291b4be81b01693f494be3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 13 14:47:19 2017 +0100 wininet: Always use non-blocking reads in HTTP_ReceiveRequestData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 38 +++++++------------------------------- dlls/wininet/tests/http.c | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 78ee9b1..40f91fb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2614,21 +2614,6 @@ static DWORD refill_read_buffer(http_request_t *req, BOOL allow_blocking, DWORD return res; } -/* return the size of data available to be read immediately (the read section must be held) */ -static DWORD get_avail_data( http_request_t *req ) -{ - DWORD avail = req->read_size; - - /* - * Different Windows versions have different limits of returned data, but all - * of them return no more than centrain amount. We use READ_BUFFER_SIZE as a limit. - */ - if(avail < READ_BUFFER_SIZE) - avail += req->data_stream->vtbl->get_avail_data(req->data_stream, req); - - return min(avail, READ_BUFFER_SIZE); -} - static DWORD netconn_get_avail_data(data_stream_t *stream, http_request_t *req) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; @@ -2978,21 +2963,17 @@ static void send_request_complete(http_request_t *req, DWORD_PTR result, DWORD e sizeof(INTERNET_ASYNC_RESULT)); } -static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD *ret_size) +static void HTTP_ReceiveRequestData(http_request_t *req) { - DWORD res, read = 0, avail = 0; - BOOL allow_blocking; + DWORD res, read = 0; TRACE("%p\n", req); EnterCriticalSection( &req->read_section ); - allow_blocking = !first_notif || !req->read_size; - res = refill_read_buffer(req, allow_blocking, &read); - if(res == ERROR_SUCCESS) { - avail = get_avail_data(req); + res = refill_read_buffer(req, FALSE, &read); + if(res == ERROR_SUCCESS) read += req->read_size; - } LeaveCriticalSection( &req->read_section ); @@ -3006,12 +2987,7 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD return; } - if(ret_size) - *ret_size = avail; - if(first_notif) - avail = 0; - - send_request_complete(req, req->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)req->hdr.hInternet : 1, avail); + send_request_complete(req, req->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)req->hdr.hInternet : 1, 0); } /* read data from the http connection (the read section must be held) */ @@ -5202,7 +5178,7 @@ lend: { if (res == ERROR_SUCCESS) { if(bEndRequest && request->contentLength && request->bytesWritten == request->bytesToWrite) - HTTP_ReceiveRequestData(request, TRUE, NULL); + HTTP_ReceiveRequestData(request); else send_request_complete(request, request->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)request->hdr.hInternet : 1, 0); @@ -5309,7 +5285,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ create_cache_entry(request); if (res == ERROR_SUCCESS && request->contentLength) - HTTP_ReceiveRequestData(request, TRUE, NULL); + HTTP_ReceiveRequestData(request); else send_request_complete(request, res == ERROR_SUCCESS, res); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b8f4297..441a782 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4995,6 +4995,21 @@ static void test_http_read(int port) close_async_handle(req.session, hCompleteEvent, 2); + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Connection: close\r\n" + "\r\n"); + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf), NULL); + send_response_ex_and_wait("123", TRUE, &ib, NULL, 0, 3); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "123", 0); + + SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); + SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); + close_async_handle(req.session, hCompleteEvent, 2); + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + trace("Testing InternetQueryDataAvailable...\n"); open_read_test_request(port, &req,

1 0