wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Bruno Jesus : wined3d: Recognize GeForce 940M.
by Alexandre Julliard 14 Mar '17

14 Mar '17

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 14 Mar '17

14 Mar '17

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

Alistair Leslie-Hughes : ole32/tests: Stop crash on XP.
by Alexandre Julliard 14 Mar '17

14 Mar '17

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

Pierre Schweitzer : iphlpapi: Flags in IP_ADAPTER_ADDRESSES_LH can be used as a bit field.
by Alexandre Julliard 14 Mar '17

14 Mar '17

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

André Hentschel : iphlpapi: Flesh out NotifyIpInterfaceChange arguments.
by Alexandre Julliard 14 Mar '17

14 Mar '17

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

Nikolay Sivov : schedsvc: Fix xml buffer leak (Valgrind).
by Alexandre Julliard 13 Mar '17

13 Mar '17

Module: wine Branch: master Commit: f8031d06486761b1068a5b4fa8572d08efdfb8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8031d06486761b1068a5b4fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 12 13:12:06 2017 +0300 schedsvc: Fix xml buffer leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/schedsvc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 8be8c0d..c34b485 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -259,9 +259,10 @@ static int detect_encoding(const void *buffer, DWORD size) static HRESULT read_xml(const WCHAR *name, WCHAR **xml) { + char *src, *buff; HANDLE hfile; DWORD size, attrs; - char *src; + HRESULT hr = S_OK; int cp; attrs = GetFileAttributesW(name); @@ -275,7 +276,7 @@ static HRESULT read_xml(const WCHAR *name, WCHAR **xml) return HRESULT_FROM_WIN32(GetLastError()); size = GetFileSize(hfile, NULL); - src = heap_alloc(size + 2); + buff = src = heap_alloc(size + 2); if (!src) { CloseHandle(hfile); @@ -300,9 +301,13 @@ static HRESULT read_xml(const WCHAR *name, WCHAR **xml) size = MultiByteToWideChar(cp, 0, src, -1, NULL, 0); *xml = heap_alloc(size * sizeof(WCHAR)); - if (!*xml) return E_OUTOFMEMORY; - MultiByteToWideChar(cp, 0, src, -1, *xml, size); - return S_OK; + if (*xml) + MultiByteToWideChar(cp, 0, src, -1, *xml, size); + else + hr = E_OUTOFMEMORY; + heap_free(buff); + + return hr; } HRESULT __cdecl SchRpcRetrieveTask(const WCHAR *path, const WCHAR *languages, ULONG *n_languages, WCHAR **xml)

1 0

Nikolay Sivov : msctf/tests: Fix test object leak (Valgrind).
by Alexandre Julliard 13 Mar '17

13 Mar '17

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

Nikolay Sivov : inetcomm/tests: Fix test stream leak (Valgrind).
by Alexandre Julliard 13 Mar '17

13 Mar '17

Module: wine Branch: master Commit: 8b67cfb8e446c38361a128449dbd051f9bd7dc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b67cfb8e446c38361a128449… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 12 12:16:54 2017 +0300 inetcomm/tests: Fix test stream leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index c2026bc..956a5b7 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -323,7 +323,12 @@ static ULONG WINAPI Stream_AddRef(IStream *iface) static ULONG WINAPI Stream_Release(IStream *iface) { TestStream *This = impl_from_IStream(iface); - return InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; } static HRESULT WINAPI Stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead)

1 0

Sebastian Lackner : krnl386.exe16: Ignore access denied error when flushing file.
by Alexandre Julliard 13 Mar '17

13 Mar '17

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

Alexandre Julliard : user32/tests: Re-enable a test about window positions.
by Alexandre Julliard 13 Mar '17

13 Mar '17

Module: wine Branch: master Commit: 413e27eff1cdf55e8f05e61cf465f699b386555e URL: http://source.winehq.org/git/wine.git/?a=commit;h=413e27eff1cdf55e8f05e61cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 13 19:34:23 2017 +0100 user32/tests: Re-enable a test about window positions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 70c1370..6e11ff2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -805,10 +805,7 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR GetWindowRect(hwnd, &rc1); SetRect(&rc2, winpos->x, winpos->y, winpos->x + winpos->cx, winpos->y + winpos->cy); /* note: winpos coordinates are relative to parent */ - MapWindowPoints(GetParent(hwnd), 0, (LPPOINT)&rc2, 2); - if (0) - { - /* Uncomment this once the test succeeds in all cases */ + MapWindowPoints(GetAncestor(hwnd,GA_PARENT), 0, (LPPOINT)&rc2, 2); ok(EqualRect(&rc1, &rc2), "rects do not match %s / %s\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); @@ -817,7 +814,6 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR MapWindowPoints(0, hwnd, (LPPOINT)&rc1, 2); ok(EqualRect(&rc1, &rc2), "rects do not match %s / %s\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); - } break; } case WM_NCCREATE:

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
72
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 March 2017