November 2018 - Wine-Commits

Fabian Maurer : mscoree: Add test for registration-less COM components.
by Alexandre Julliard Nov. 6, 2018

Nov. 6, 2018

Module: wine Branch: master Commit: ef19a461616f5dbfaefcb2b886caca94a9144ddf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef19a461616f5dbfaefcb2b8… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Nov 3 13:24:29 2018 +0100 mscoree: Add test for registration-less COM components. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43270 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/Makefile.in | 6 +- dlls/mscoree/tests/comtest.c | 356 ++++++++++++++++++++++++++++++++ dlls/mscoree/tests/comtest.cs | 41 ++++ dlls/mscoree/tests/comtest_dll.manifest | 16 ++ dlls/mscoree/tests/comtest_exe.manifest | 11 + dlls/mscoree/tests/interfaces.idl | 35 ++++ dlls/mscoree/tests/resource.rc | 30 +++ 7 files changed, 494 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef19a461616f5dbfaefc…

1 0

Austin English : ntoskrnl.exe: Add MmCopyVirtualMemory stub.
by Alexandre Julliard Nov. 6, 2018

Nov. 6, 2018

Module: wine Branch: master Commit: b3252feb3fc7c11c17801706a4ce4aaacfebddf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3252feb3fc7c11c17801706… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Nov 6 01:51:03 2018 -0600 ntoskrnl.exe: Add MmCopyVirtualMemory stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 00d93a2..4a5ac16 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4016,3 +4016,14 @@ PVOID WINAPI PsGetProcessWow64Process(PEPROCESS process) FIXME("stub: %p\n", process); return NULL; } + +/********************************************************************* + * MmCopyVirtualMemory (NTOSKRNL.@) + */ +NTSTATUS WINAPI MmCopyVirtualMemory(PEPROCESS fromprocess, PVOID fromaddress, PEPROCESS toprocess, + PVOID toaddress, SIZE_T bufsize, KPROCESSOR_MODE mode, + PSIZE_T copied) +{ + FIXME("stub: %p %p %p %p %lu %d %p\n", fromprocess, fromaddress, toprocess, toaddress, bufsize, mode, copied); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3e8315c..76d8fb3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -668,6 +668,7 @@ @ stub MmBuildMdlForNonPagedPool @ stub MmCanFileBeTruncated @ stub MmCommitSessionMappedView +@ stdcall MmCopyVirtualMemory(ptr ptr ptr ptr long long ptr) @ stub MmCreateMdl @ stdcall MmCreateSection(ptr long ptr ptr long long long ptr) @ stub MmDisableModifiedWriteOfSection

1 0

Sven Baars : mfplat: Add IMFAttributes interface to IMFByteStream.
by Alexandre Julliard Nov. 6, 2018

Nov. 6, 2018

Module: wine Branch: master Commit: b8b4c041eaecbc66da063834525c43934ec04dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8b4c041eaecbc66da063834… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Nov 3 22:25:07 2018 +0100 mfplat: Add IMFAttributes interface to IMFByteStream. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 80 ++++++++++++++++++++++++++++++++++++++++++---- dlls/mfplat/tests/mfplat.c | 53 ++++++++++++++++++++++++++++-- 2 files changed, 124 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5980721..f38ca7b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -847,8 +847,8 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size) typedef struct _mfbytestream { + mfattributes attributes; IMFByteStream IMFByteStream_iface; - LONG ref; } mfbytestream; static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) @@ -867,6 +867,10 @@ static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID r { *out = &This->IMFByteStream_iface; } + else if(IsEqualGUID(riid, &IID_IMFAttributes)) + { + *out = &This->attributes.IMFAttributes_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -881,17 +885,17 @@ static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID r static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) { mfbytestream *This = impl_from_IMFByteStream(iface); - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->attributes.ref); TRACE("(%p) ref=%u\n", This, ref); return ref; } -static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) +static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) { mfbytestream *This = impl_from_IMFByteStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->attributes.ref); TRACE("(%p) ref=%u\n", This, ref); @@ -1044,7 +1048,7 @@ static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) return E_NOTIMPL; } -static const IMFByteStreamVtbl mfbytesteam_vtbl = +static const IMFByteStreamVtbl mfbytestream_vtbl = { mfbytestream_QueryInterface, mfbytestream_AddRef, @@ -1066,6 +1070,67 @@ static const IMFByteStreamVtbl mfbytesteam_vtbl = mfbytestream_Close }; +static inline mfbytestream *impl_from_IMFByteStream_IMFAttributes(IMFAttributes *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfbytestream_attributes_QueryInterface( + IMFAttributes *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFByteStream_QueryInterface(&This->IMFByteStream_iface, riid, out); +} + +static ULONG WINAPI mfbytestream_attributes_AddRef(IMFAttributes *iface) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFByteStream_AddRef(&This->IMFByteStream_iface); +} + +static ULONG WINAPI mfbytestream_attributes_Release(IMFAttributes *iface) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFByteStream_Release(&This->IMFByteStream_iface); +} + +static const IMFAttributesVtbl mfbytestream_attributes_vtbl = +{ + mfbytestream_attributes_QueryInterface, + mfbytestream_attributes_AddRef, + mfbytestream_attributes_Release, + mfattributes_GetItem, + mfattributes_GetItemType, + mfattributes_CompareItem, + mfattributes_Compare, + mfattributes_GetUINT32, + mfattributes_GetUINT64, + mfattributes_GetDouble, + mfattributes_GetGUID, + mfattributes_GetStringLength, + mfattributes_GetString, + mfattributes_GetAllocatedString, + mfattributes_GetBlobSize, + mfattributes_GetBlob, + mfattributes_GetAllocatedBlob, + mfattributes_GetUnknown, + mfattributes_SetItem, + mfattributes_DeleteItem, + mfattributes_DeleteAllItems, + mfattributes_SetUINT32, + mfattributes_SetUINT64, + mfattributes_SetDouble, + mfattributes_SetGUID, + mfattributes_SetString, + mfattributes_SetBlob, + mfattributes_SetUnknown, + mfattributes_LockStore, + mfattributes_UnlockStore, + mfattributes_GetCount, + mfattributes_GetItemByIndex, + mfattributes_CopyAllItems +}; + HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) { mfbytestream *object; @@ -1076,8 +1141,9 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt if(!object) return E_OUTOFMEMORY; - object->ref = 1; - object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + init_attribute_object(&object->attributes, 0); + object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; + object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 17cdc46..4605e20 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -258,8 +258,12 @@ static void test_MFCreateAttributes(void) static void test_MFCreateMFByteStreamOnStream(void) { IMFByteStream *bytestream; + IMFByteStream *bytestream2; IStream *stream; + IMFAttributes *attributes = NULL; + IUnknown *unknown; HRESULT hr; + ULONG ref; if(!pMFCreateMFByteStreamOnStream) { @@ -270,11 +274,56 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = pMFCreateMFByteStreamOnStream(stream, &bytestream ); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - IStream_Release(stream); + hr = IUnknown_QueryInterface(bytestream, &IID_IUnknown, + (void **)&unknown); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); + ref = IUnknown_Release(unknown); + ok(ref == 1, "got %u\n", ref); + + hr = IUnknown_QueryInterface(unknown, &IID_IMFByteStream, + (void **)&bytestream2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bytestream2 == bytestream, "got %p\n", bytestream2); + ref = IMFByteStream_Release(bytestream2); + ok(ref == 1, "got %u\n", ref); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + (void **)&attributes); + ok(hr == S_OK || + /* w7pro64 */ + broken(hr == E_NOINTERFACE), "got 0x%08x\n", hr); + + if (hr != S_OK) + { + win_skip("Can not retrieve IMFAttributes interface from IMFByteStream\n"); + IStream_Release(stream); + IMFByteStream_Release(bytestream); + return; + } + + ok(attributes != NULL, "got NULL\n"); + + hr = IUnknown_QueryInterface(attributes, &IID_IUnknown, + (void **)&unknown); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); + ref = IUnknown_Release(unknown); + ok(ref == 2, "got %u\n", ref); + + hr = IUnknown_QueryInterface(attributes, &IID_IMFByteStream, + (void **)&bytestream2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bytestream2 == bytestream, "got %p\n", bytestream2); + ref = IMFByteStream_Release(bytestream2); + ok(ref == 2, "got %u\n", ref); + + IMFAttributes_Release(attributes); IMFByteStream_Release(bytestream); + IStream_Release(stream); } static void test_MFCreateMemoryBuffer(void)

1 0

Austin English : ntoskrnl.exe: Add PsGetProcessWow64Process stub.
by Alexandre Julliard Nov. 6, 2018

Nov. 6, 2018

Module: wine Branch: master Commit: 454ba90abff809ac68a987c72d31df714c4f764e URL: https://source.winehq.org/git/wine.git/?a=commit;h=454ba90abff809ac68a987c7… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Nov 6 01:51:02 2018 -0600 ntoskrnl.exe: Add PsGetProcessWow64Process stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 16 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 9fbf22d..00d93a2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3991,13 +3991,28 @@ void WINAPI IoReleaseRemoveLockAndWaitEx(PIO_REMOVE_LOCK lock, PVOID tag, ULONG FIXME("stub: %p %p %u\n", lock, tag, size); } +/********************************************************************* + * DbgQueryDebugFilterState (NTOSKRNL.@) + */ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level) { FIXME("stub: %d %d\n", component, level); return STATUS_NOT_IMPLEMENTED; } +/********************************************************************* + * ExReleaseResourceLite (NTOSKRNL.@) + */ void WINAPI ExReleaseResourceLite(PERESOURCE resource) { FIXME("stub: %p\n", resource); } + +/********************************************************************* + * PsGetProcessWow64Process (NTOSKRNL.@) + */ +PVOID WINAPI PsGetProcessWow64Process(PEPROCESS process) +{ + FIXME("stub: %p\n", process); + return NULL; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c10fa2f..3e8315c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -886,6 +886,7 @@ @ stub PsGetProcessSessionId @ stub PsGetProcessWin32Process @ stub PsGetProcessWin32WindowStation +@ stdcall -arch=x86_64 PsGetProcessWow64Process(ptr) @ stub PsGetThreadFreezeCount @ stub PsGetThreadHardErrorsAreDisabled @ stub PsGetThreadId

1 0

Henri Verbeet : d3d9/tests: Use create_window() in more tests.
by Alexandre Julliard Nov. 6, 2018

Nov. 6, 2018

Module: wine Branch: master Commit: 77ca0cc93220a94871737ca5e524c64af01b9411 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77ca0cc93220a94871737ca5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 14:01:00 2018 +0330 d3d9/tests: Use create_window() in more tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 324 +++++++++++++++++------------------------------ 1 file changed, 118 insertions(+), 206 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77ca0cc93220a9487173…

1 0

Dmitry Timoshkov : include: Add _Inout_updates_opt_z_ stub definition.
by Alexandre Julliard Nov. 6, 2018

Nov. 6, 2018

Module: wine Branch: master Commit: b7d8ff720cfbfe35e0246d4e323eb2f55e2a697b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7d8ff720cfbfe35e0246d4e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 6 13:40:43 2018 +0300 include: Add _Inout_updates_opt_z_ stub definition. Allows to use Wine headers with Visual Studio 12.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index c8b4491..c69f7f9 100644 --- a/include/sal.h +++ b/include/sal.h @@ -61,6 +61,7 @@ #define _Inout_updates_bytes_(count) #define _Inout_updates_opt_(count) #define _Inout_updates_z_(count) +#define _Inout_updates_opt_z_(count) #define _Inout_z_ #define _Inout_z_bytecap_(count) #define _Inout_z_cap_(count)

1 0

Dmitry Timoshkov : crypt32: Look for the provider that supports the specified content OID in CryptMsgOpenToEncode (CMSG_HASHED).
by Alexandre Julliard Nov. 6, 2018

Nov. 6, 2018

Module: wine Branch: master Commit: fa713c3d235e0780bffda8d22738561c52b630fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa713c3d235e0780bffda8d2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 6 13:41:05 2018 +0300 crypt32: Look for the provider that supports the specified content OID in CryptMsgOpenToEncode(CMSG_HASHED). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index f37c462..26f2616 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -567,7 +567,12 @@ static HCRYPTMSG CHashEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, prov = info->hCryptProv; else { - prov = I_CryptGetDefaultCryptProv(0); + prov = I_CryptGetDefaultCryptProv(algID); + if (!prov) + { + SetLastError(E_INVALIDARG); + return NULL; + } dwFlags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } msg = CryptMemAlloc(sizeof(CHashEncodeMsg));

1 0

Alex Henrie : advapi32: Fix memory leak in QueryServiceConfig2W (Coverity) .
by Alexandre Julliard Nov. 6, 2018

Nov. 6, 2018

Module: wine Branch: master Commit: c296a21cdb2957f43768bec6a05cb1b6fa478596 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c296a21cdb2957f43768bec6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 4 14:15:24 2018 -0700 advapi32: Fix memory leak in QueryServiceConfig2W (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 11f4da0..718c964 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1663,6 +1663,7 @@ BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe if (!needed) { + if (dwLevel == SERVICE_CONFIG_DESCRIPTION) heap_free(bufptr); SetLastError(ERROR_INVALID_ADDRESS); return FALSE; }

1 0

Hans Leidekker : winhttp: Get rid of cookie_t.
by Alexandre Julliard Nov. 6, 2018

Nov. 6, 2018

Module: wine Branch: master Commit: ef26d7d4221c7e60968e929e5c055c9328a4bbce URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef26d7d4221c7e60968e929e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 6 16:08:58 2018 +0100 winhttp: Get rid of cookie_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/cookie.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 668daba..098db68 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -30,13 +30,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); -typedef struct +struct cookie { struct list entry; WCHAR *name; WCHAR *value; WCHAR *path; -} cookie_t; +}; static domain_t *add_domain( session_t *session, WCHAR *name ) { @@ -54,14 +54,14 @@ static domain_t *add_domain( session_t *session, WCHAR *name ) return domain; } -static cookie_t *find_cookie( domain_t *domain, const WCHAR *path, const WCHAR *name ) +static struct cookie *find_cookie( domain_t *domain, const WCHAR *path, const WCHAR *name ) { struct list *item; - cookie_t *cookie; + struct cookie *cookie; LIST_FOR_EACH( item, &domain->cookies ) { - cookie = LIST_ENTRY( item, cookie_t, entry ); + cookie = LIST_ENTRY( item, struct cookie, entry ); if (!strcmpW( cookie->path, path ) && !strcmpW( cookie->name, name )) { TRACE("found %s=%s\n", debugstr_w(cookie->name), debugstr_w(cookie->value)); @@ -80,7 +80,7 @@ static BOOL domain_match( const WCHAR *name, domain_t *domain, BOOL partial ) return TRUE; } -static void free_cookie( cookie_t *cookie ) +static void free_cookie( struct cookie *cookie ) { heap_free( cookie->name ); heap_free( cookie->value ); @@ -88,7 +88,7 @@ static void free_cookie( cookie_t *cookie ) heap_free( cookie ); } -static void delete_cookie( cookie_t *cookie ) +static void delete_cookie( struct cookie *cookie ) { list_remove( &cookie->entry ); free_cookie( cookie ); @@ -96,12 +96,12 @@ static void delete_cookie( cookie_t *cookie ) void delete_domain( domain_t *domain ) { - cookie_t *cookie; + struct cookie *cookie; struct list *item, *next; LIST_FOR_EACH_SAFE( item, next, &domain->cookies ) { - cookie = LIST_ENTRY( item, cookie_t, entry ); + cookie = LIST_ENTRY( item, struct cookie, entry ); delete_cookie( cookie ); } @@ -110,10 +110,10 @@ void delete_domain( domain_t *domain ) heap_free( domain ); } -static BOOL add_cookie( session_t *session, cookie_t *cookie, WCHAR *domain_name, WCHAR *path ) +static BOOL add_cookie( session_t *session, struct cookie *cookie, WCHAR *domain_name, WCHAR *path ) { domain_t *domain = NULL; - cookie_t *old_cookie; + struct cookie *old_cookie; struct list *item; if (!(cookie->path = strdupW( path ))) return FALSE; @@ -140,9 +140,9 @@ static BOOL add_cookie( session_t *session, cookie_t *cookie, WCHAR *domain_name return domain != NULL; } -static cookie_t *parse_cookie( const WCHAR *string ) +static struct cookie *parse_cookie( const WCHAR *string ) { - cookie_t *cookie; + struct cookie *cookie; const WCHAR *p; int len; @@ -151,7 +151,7 @@ static cookie_t *parse_cookie( const WCHAR *string ) while (len && string[len - 1] == ' ') len--; if (!len) return NULL; - if (!(cookie = heap_alloc_zero( sizeof(cookie_t) ))) return NULL; + if (!(cookie = heap_alloc_zero( sizeof(struct cookie) ))) return NULL; list_init( &cookie->entry ); if (!(cookie->name = heap_alloc( (len + 1) * sizeof(WCHAR) ))) @@ -250,7 +250,7 @@ BOOL set_cookies( request_t *request, const WCHAR *cookies ) WCHAR *cookie_domain = NULL, *cookie_path = NULL; struct attr *attr, *domain = NULL, *path = NULL; session_t *session = request->connect->session; - cookie_t *cookie; + struct cookie *cookie; int len, used; len = strlenW( cookies ); @@ -319,7 +319,7 @@ BOOL add_cookie_headers( request_t *request ) LIST_FOR_EACH( cookie_cursor, &domain->cookies ) { - cookie_t *cookie = LIST_ENTRY( cookie_cursor, cookie_t, entry ); + struct cookie *cookie = LIST_ENTRY( cookie_cursor, struct cookie, entry ); TRACE("comparing path %s with %s\n", debugstr_w(request->path), debugstr_w(cookie->path));

1 0

Henri Verbeet : wined3d: Get rid of WINED3DUSAGE_TEXTURE.
by Alexandre Julliard Nov. 6, 2018

Nov. 6, 2018

Module: wine Branch: master Commit: 03c1422a71b030dcfa931b4a2054fb26f65bacec URL: https://source.winehq.org/git/wine.git/?a=commit;h=03c1422a71b030dcfa931b4a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 14:00:59 2018 +0330 wined3d: Get rid of WINED3DUSAGE_TEXTURE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/texture.c | 6 +++--- dlls/d3d11/utils.c | 10 +--------- dlls/d3d8/texture.c | 4 +--- dlls/d3d9/texture.c | 4 +--- dlls/ddraw/surface.c | 3 --- dlls/dxgi/device.c | 2 -- dlls/wined3d/directx.c | 4 ---- dlls/wined3d/resource.c | 1 - dlls/wined3d/swapchain.c | 2 -- dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 7 +++---- 13 files changed, 11 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03c1422a71b030dcfa93…

1 0