July 2016 - Wine-Commits - list.winehq.org

Iván Matellanes : msvcirt: Implement istream constructors/destructors.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: a035f67cf55d312ab02a96a3e4138af8b16d10bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a035f67cf55d312ab02a96a3e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 15 10:26:52 2016 +0100 msvcirt: Implement istream constructors/destructors. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 63 ++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 194 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 248 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a035f67cf55d312ab02a9…

1 0

Jacek Caban : gdi32: Make CreateDIBSection hotpatchable.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 585f6074b0650d2bde9e3acc7d40c553223ee543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=585f6074b0650d2bde9e3acc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 14 15:29:37 2016 +0200 gdi32: Make CreateDIBSection hotpatchable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index c3009a2..fbeeb5b 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1478,8 +1478,8 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, /*********************************************************************** * CreateDIBSection (GDI32.@) */ -HBITMAP WINAPI CreateDIBSection(HDC hdc, const BITMAPINFO *bmi, UINT usage, - VOID **bits, HANDLE section, DWORD offset) +HBITMAP WINAPI DECLSPEC_HOTPATCH CreateDIBSection(HDC hdc, const BITMAPINFO *bmi, UINT usage, + void **bits, HANDLE section, DWORD offset) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer;

1 0

Nikolay Sivov : xmllite/writer: Implement WriteCharEntity().
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 0fd4fae7c574dbfd710732485f3e96718da67a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fd4fae7c574dbfd710732485… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 14 12:43:31 2016 +0300 xmllite/writer: Implement WriteCharEntity(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 12 ++++++++++-- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 12433fa..661b837 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -1217,6 +1217,47 @@ static void test_WriteFullEndElement(void) IStream_Release(stream); } +static void test_WriteCharEntity(void) +{ + static const WCHAR aW[] = {'a',0}; + IXmlWriter *writer; + IStream *stream; + HRESULT hr; + + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* without indentation */ + stream = writer_set_output(writer); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteCharEntity(writer, 0x100); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<a>Ā<a /></a>"); + + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { test_writer_create(); @@ -1235,4 +1276,5 @@ START_TEST(writer) test_indentation(); test_WriteAttributeString(); test_WriteFullEndElement(); + test_WriteCharEntity(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 2e630ee..699095b 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -704,21 +704,29 @@ static HRESULT WINAPI xmlwriter_WriteCData(IXmlWriter *iface, LPCWSTR data) static HRESULT WINAPI xmlwriter_WriteCharEntity(IXmlWriter *iface, WCHAR ch) { + static const WCHAR fmtW[] = {'&','#','x','%','x',';',0}; xmlwriter *This = impl_from_IXmlWriter(iface); + WCHAR bufW[16]; - FIXME("%p %x\n", This, ch); + TRACE("%p %#x\n", This, ch); switch (This->state) { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_ElemStarted: + writer_close_starttag(This); + break; case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; default: ; } - return E_NOTIMPL; + sprintfW(bufW, fmtW, ch); + write_output_buffer(This->output, bufW, -1); + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteChars(IXmlWriter *iface, const WCHAR *pwch, UINT cwch)

1 0

Austin English : ncrypt: Add some stub functions.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 789c4c45ce2731d1b886e52160bce032da0190b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=789c4c45ce2731d1b886e5216… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jul 13 18:18:29 2016 +0200 ncrypt: Add some stub functions. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 14 +++++++------- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 9c09600..6e79eeb 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" +#include "ncrypt.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); @@ -43,3 +44,53 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) return TRUE; } + +SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, + const WCHAR *algid, const WCHAR *name, DWORD keyspec, + DWORD flags) +{ + FIXME("(0x%lx, %p, %s, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(algid), + wine_dbgstr_w(name), keyspec, flags); + return NTE_NOT_SUPPORTED; +} + +SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, + BYTE *output, DWORD outsize, DWORD *result, DWORD flags) +{ + FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, + output, outsize, result, flags); + return NTE_NOT_SUPPORTED; +} + +SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, + BYTE *output, DWORD outsize, DWORD *result, DWORD flags) +{ + FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, + output, outsize, result, flags); + return NTE_NOT_SUPPORTED; +} + +SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) +{ + FIXME("(0x%lx, 0x%08x): stub\n", key, flags); + return NTE_NOT_SUPPORTED; +} + +SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object) +{ + FIXME("(0x%lx): stub\n", object); + return NTE_NOT_SUPPORTED; +} + +SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, + const WCHAR *name, DWORD keyspec, DWORD flags) +{ + FIXME("(0x%lx, %p, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(name), keyspec, flags); + return NTE_NOT_SUPPORTED; +} + +SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) +{ + FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); + return NTE_NOT_SUPPORTED; +} diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 1322f1e..0412760 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -60,20 +60,20 @@ @ stub NCryptCloseKeyProtector @ stub NCryptCloseProtectionDescriptor @ stub NCryptCreateClaim -@ stub NCryptCreatePersistedKey +@ stdcall NCryptCreatePersistedKey(long ptr wstr wstr long long) @ stub NCryptCreateProtectionDescriptor -@ stub NCryptDecrypt +@ stdcall NCryptDecrypt(long ptr long ptr ptr long ptr long) @ stub NCryptDeleteKey @ stub NCryptDeriveKey @ stub NCryptDuplicateKeyProtectorHandle -@ stub NCryptEncrypt +@ stdcall NCryptEncrypt(long ptr long ptr ptr long ptr long) @ stub NCryptEnumAlgorithms @ stub NCryptEnumKeys @ stub NCryptEnumStorageProviders @ stub NCryptExportKey -@ stub NCryptFinalizeKey +@ stdcall NCryptFinalizeKey(long long) @ stub NCryptFreeBuffer -@ stub NCryptFreeObject +@ stdcall NCryptFreeObject(long) @ stub NCryptGetProperty @ stub NCryptGetProtectionDescriptorInfo @ stub NCryptImportKey @@ -81,9 +81,9 @@ @ stub NCryptIsKeyHandle @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey -@ stub NCryptOpenKey +@ stdcall NCryptOpenKey(long ptr wstr long long) @ stub NCryptOpenKeyProtector -@ stub NCryptOpenStorageProvider +@ stdcall NCryptOpenStorageProvider(ptr wstr long) @ stub NCryptProtectKey @ stub NCryptProtectSecret @ stub NCryptQueryProtectionDescriptorName

1 0

Austin English : include: Add initial ncrypt.h.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 6cd6e96259142e6fcdd6772383d3890288e1c0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd6e96259142e6fcdd677238… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jul 13 18:17:57 2016 +0200 include: Add initial ncrypt.h. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ncrypt.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 18c3383..9c20f28a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -504,6 +504,7 @@ HEADER_SRCS = \ msxml6did.h \ msxmldid.h \ nb30.h \ + ncrypt.h \ ndrtypes.h \ netioapi.h \ nldef.h \ diff --git a/include/ncrypt.h b/include/ncrypt.h new file mode 100644 index 0000000..2bfdae0 --- /dev/null +++ b/include/ncrypt.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2016 Austin English + * + * 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 __NCRYPT_H__ +#define __NCRYPT_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef WINAPI +#define WINAPI __stdcall +#endif + +#ifndef __SECSTATUS_DEFINED__ +typedef LONG SECURITY_STATUS; +#define __SECSTATUS_DEFINED__ +#endif + +typedef ULONG_PTR NCRYPT_HANDLE; +typedef ULONG_PTR NCRYPT_PROV_HANDLE; +typedef ULONG_PTR NCRYPT_KEY_HANDLE; +typedef ULONG_PTR NCRYPT_HASH_HANDLE; +typedef ULONG_PTR NCRYPT_SECRET_HANDLE; + +SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, const WCHAR *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); +SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); +SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE, DWORD); +SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE); +SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); + +#ifdef __cplusplus +} +#endif + +#endif /* __NCRYPT_H__ */

1 0

Sebastian Lackner : opengl32/tests: Include wgl.h and remove duplicate declarations.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: f784360cbe3687f15082888ab2b7c9f26561d62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f784360cbe3687f15082888ab… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 8 12:23:40 2016 +0200 opengl32/tests: Include wgl.h and remove duplicate declarations. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index e5e1507..3f203ab 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -21,38 +21,19 @@ #include <windows.h> #include <wingdi.h> #include "wine/test.h" - -void WINAPI glClearColor(float red, float green, float blue, float alpha); -void WINAPI glClear(unsigned int mask); -#define GL_COLOR 0x1800 -typedef unsigned int GLenum; -typedef int GLint; -void WINAPI glCopyPixels(int x, int y, int width, int height, GLenum type); -void WINAPI glFinish(void); -#define GL_NO_ERROR 0x0 -#define GL_INVALID_OPERATION 0x502 -GLenum WINAPI glGetError(void); -#define GL_COLOR_BUFFER_BIT 0x00004000 -const unsigned char * WINAPI glGetString(unsigned int); -#define GL_VENDOR 0x1F00 -#define GL_RENDERER 0x1F01 -#define GL_VERSION 0x1F02 -#define GL_EXTENSIONS 0x1F03 - -#define GL_VIEWPORT 0x0ba2 -void WINAPI glGetIntegerv(GLenum pname, GLint *params); +#include "wine/wgl.h" #define MAX_FORMATS 256 typedef void* HPBUFFERARB; /* WGL_ARB_create_context */ static HGLRC (WINAPI *pwglCreateContextAttribsARB)(HDC hDC, HGLRC hShareContext, const int *attribList); -/* GetLastError */ -#define ERROR_INVALID_VERSION_ARB 0x2095 + #define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 #define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 #define WGL_CONTEXT_FLAGS_ARB 0x2094 + /* Flags for WGL_CONTEXT_FLAGS_ARB */ #define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 #define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002

1 0

Michael Stefaniuc : avifil32: Clean up the IClassFactory creation.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 00de4b59d1c0a8e1f06fb1fd2c75a99363872987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00de4b59d1c0a8e1f06fb1fd2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 10:07:16 2016 +0200 avifil32: Clean up the IClassFactory creation. Also move it to avoid forward declarations of the IClassFactory methods. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/factory.c | 68 +++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index aa0c44e..8ada02b 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -41,20 +41,6 @@ HMODULE AVIFILE_hModule = NULL; static BOOL AVIFILE_bLocked; static UINT AVIFILE_uUseCount; -static HRESULT WINAPI IClassFactory_fnQueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj); -static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface); -static ULONG WINAPI IClassFactory_fnRelease(LPCLASSFACTORY iface); -static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj); -static HRESULT WINAPI IClassFactory_fnLockServer(LPCLASSFACTORY iface,BOOL dolock); - -static const IClassFactoryVtbl iclassfact = { - IClassFactory_fnQueryInterface, - IClassFactory_fnAddRef, - IClassFactory_fnRelease, - IClassFactory_fnCreateInstance, - IClassFactory_fnLockServer -}; - typedef struct { IClassFactory IClassFactory_iface; @@ -67,31 +53,6 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); } -static HRESULT AVIFILE_CreateClassFactory(const CLSID *pclsid, const IID *riid, - LPVOID *ppv) -{ - IClassFactoryImpl *pClassFactory = NULL; - HRESULT hr; - - *ppv = NULL; - - pClassFactory = HeapAlloc(GetProcessHeap(), 0, sizeof(*pClassFactory)); - if (pClassFactory == NULL) - return E_OUTOFMEMORY; - - pClassFactory->IClassFactory_iface.lpVtbl = &iclassfact; - pClassFactory->ref = 0; - pClassFactory->clsid = *pclsid; - - hr = IClassFactory_QueryInterface(&pClassFactory->IClassFactory_iface, riid, ppv); - if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, pClassFactory); - *ppv = NULL; - } - - return hr; -} - static HRESULT WINAPI IClassFactory_fnQueryInterface(LPCLASSFACTORY iface, REFIID riid,LPVOID *ppobj) { @@ -170,6 +131,35 @@ static HRESULT WINAPI IClassFactory_fnLockServer(LPCLASSFACTORY iface,BOOL doloc return S_OK; } +static const IClassFactoryVtbl iclassfact = { + IClassFactory_fnQueryInterface, + IClassFactory_fnAddRef, + IClassFactory_fnRelease, + IClassFactory_fnCreateInstance, + IClassFactory_fnLockServer +}; + +static HRESULT AVIFILE_CreateClassFactory(const CLSID *clsid, const IID *riid, void **ppv) +{ + IClassFactoryImpl *cf; + HRESULT hr; + + *ppv = NULL; + + cf = HeapAlloc(GetProcessHeap(), 0, sizeof(*cf)); + if (!cf) + return E_OUTOFMEMORY; + + cf->IClassFactory_iface.lpVtbl = &iclassfact; + cf->ref = 1; + cf->clsid = *clsid; + + hr = IClassFactory_QueryInterface(&cf->IClassFactory_iface, riid, ppv); + IClassFactory_Release(&cf->IClassFactory_iface); + + return hr; +} + LPCWSTR AVIFILE_BasenameW(LPCWSTR szPath) { #define SLASH(w) ((w) == '/' || (w) == '\\')

1 0

Michael Stefaniuc : avifil32: Use atomic operations to manipulate the refcount.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 72175acdd191773d4ec28cbe2e2300a6640192bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=72175acdd191773d4ec28cbe2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 10:06:18 2016 +0200 avifil32: Use atomic operations to manipulate the refcount. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/factory.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index c74a716..aa0c44e 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -57,11 +57,9 @@ static const IClassFactoryVtbl iclassfact = { typedef struct { - /* IUnknown fields */ IClassFactory IClassFactory_iface; - DWORD dwRef; - - CLSID clsid; + LONG ref; + CLSID clsid; } IClassFactoryImpl; static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) @@ -82,7 +80,7 @@ static HRESULT AVIFILE_CreateClassFactory(const CLSID *pclsid, const IID *riid, return E_OUTOFMEMORY; pClassFactory->IClassFactory_iface.lpVtbl = &iclassfact; - pClassFactory->dwRef = 0; + pClassFactory->ref = 0; pClassFactory->clsid = *pclsid; hr = IClassFactory_QueryInterface(&pClassFactory->IClassFactory_iface, riid, ppv); @@ -109,26 +107,26 @@ static HRESULT WINAPI IClassFactory_fnQueryInterface(LPCLASSFACTORY iface, return E_NOINTERFACE; } -static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface) +static ULONG WINAPI IClassFactory_fnAddRef(IClassFactory *iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", iface); - - return ++(This->dwRef); + TRACE("(%p) ref = %u\n", This, ref); + return ref; } -static ULONG WINAPI IClassFactory_fnRelease(LPCLASSFACTORY iface) +static ULONG WINAPI IClassFactory_fnRelease(IClassFactory *iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", iface); - if ((--(This->dwRef)) > 0) - return This->dwRef; + TRACE("(%p) ref = %u\n", This, ref); - HeapFree(GetProcessHeap(), 0, This); + if(!ref) + HeapFree(GetProcessHeap(), 0, This); - return 0; + return ref; } static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface,

1 0

Sebastian Lackner : ntdll/tests: Use inline implementation of NtCurrentTeb for rtl tests.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: fb45a20b4c2fa0cc0e0b14677a57ac04c3459711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb45a20b4c2fa0cc0e0b14677… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jul 12 00:38:52 2016 +0200 ntdll/tests: Use inline implementation of NtCurrentTeb for rtl tests. Also enable HardErrorDisabled TEB tests on x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index fc0d4b4..43c26bd 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -82,7 +82,6 @@ static RTL_HANDLE * (WINAPI * pRtlAllocateHandle)(RTL_HANDLE_TABLE *, ULONG *); static BOOLEAN (WINAPI * pRtlFreeHandle)(RTL_HANDLE_TABLE *, RTL_HANDLE *); static NTSTATUS (WINAPI *pRtlAllocateAndInitializeSid)(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID*); static NTSTATUS (WINAPI *pRtlFreeSid)(PSID); -static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static DWORD (WINAPI *pRtlGetThreadErrorMode)(void); static NTSTATUS (WINAPI *pRtlSetThreadErrorMode)(DWORD, LPDWORD); static IMAGE_BASE_RELOCATION *(WINAPI *pLdrProcessRelocationBlock)(void*,UINT,USHORT*,INT_PTR); @@ -136,7 +135,6 @@ static void InitFunctionPtrs(void) pRtlFreeHandle = (void *)GetProcAddress(hntdll, "RtlFreeHandle"); pRtlAllocateAndInitializeSid = (void *)GetProcAddress(hntdll, "RtlAllocateAndInitializeSid"); pRtlFreeSid = (void *)GetProcAddress(hntdll, "RtlFreeSid"); - pNtCurrentTeb = (void *)GetProcAddress(hntdll, "NtCurrentTeb"); pRtlGetThreadErrorMode = (void *)GetProcAddress(hntdll, "RtlGetThreadErrorMode"); pRtlSetThreadErrorMode = (void *)GetProcAddress(hntdll, "RtlSetThreadErrorMode"); pLdrProcessRelocationBlock = (void *)GetProcAddress(hntdll, "LdrProcessRelocationBlock"); @@ -897,10 +895,12 @@ static void test_RtlThreadErrorMode(void) mode, oldmode); ok(pRtlGetThreadErrorMode() == 0x70, "RtlGetThreadErrorMode returned 0x%x, expected 0x%x\n", mode, 0x70); - if (!is_wow64 && pNtCurrentTeb) - ok(pNtCurrentTeb()->HardErrorDisabled == 0x70, + if (!is_wow64) + { + ok(NtCurrentTeb()->HardErrorDisabled == 0x70, "The TEB contains 0x%x, expected 0x%x\n", - pNtCurrentTeb()->HardErrorDisabled, 0x70); + NtCurrentTeb()->HardErrorDisabled, 0x70); + } status = pRtlSetThreadErrorMode(0, &mode); ok(status == STATUS_SUCCESS || @@ -911,10 +911,12 @@ static void test_RtlThreadErrorMode(void) mode, 0x70); ok(pRtlGetThreadErrorMode() == 0, "RtlGetThreadErrorMode returned 0x%x, expected 0x%x\n", mode, 0); - if (!is_wow64 && pNtCurrentTeb) - ok(pNtCurrentTeb()->HardErrorDisabled == 0, + if (!is_wow64) + { + ok(NtCurrentTeb()->HardErrorDisabled == 0, "The TEB contains 0x%x, expected 0x%x\n", - pNtCurrentTeb()->HardErrorDisabled, 0); + NtCurrentTeb()->HardErrorDisabled, 0); + } for (mode = 1; mode; mode <<= 1) {

1 0

Dmitry Timoshkov : kernel32/tests: Add tests for GetThreadSelectorEntry.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 6870f3c0494876d2845d17ae164df82090a3d392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6870f3c0494876d2845d17ae1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 14 00:18:18 2016 +0200 kernel32/tests: Add tests for GetThreadSelectorEntry. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 034bdaa..b5ad1da 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1100,6 +1100,46 @@ static void test_SetThreadContext(void) CloseHandle( thread ); } +static void test_GetThreadSelectorEntry(void) +{ + LDT_ENTRY entry; + CONTEXT ctx; + DWORD limit; + void *base; + BOOL ret; + + memset(&ctx, 0x11, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_SEGMENTS | CONTEXT_CONTROL; + ret = GetThreadContext(GetCurrentThread(), &ctx); + ok(ret, "GetThreadContext error %u\n", GetLastError()); + ok(!HIWORD(ctx.SegCs), "expected HIWORD(SegCs) == 0, got %u\n", ctx.SegCs); + ok(!HIWORD(ctx.SegDs), "expected HIWORD(SegDs) == 0, got %u\n", ctx.SegDs); + ok(!HIWORD(ctx.SegFs), "expected HIWORD(SegFs) == 0, got %u\n", ctx.SegFs); + + ret = GetThreadSelectorEntry(GetCurrentThread(), ctx.SegCs, &entry); + ok(ret, "GetThreadSelectorEntry(SegCs) error %u\n", GetLastError()); + ret = GetThreadSelectorEntry(GetCurrentThread(), ctx.SegDs, &entry); + ok(ret, "GetThreadSelectorEntry(SegDs) error %u\n", GetLastError()); + + memset(&entry, 0x11, sizeof(entry)); + ret = GetThreadSelectorEntry(GetCurrentThread(), ctx.SegFs, &entry); + ok(ret, "GetThreadSelectorEntry(SegFs) error %u\n", GetLastError()); + entry.HighWord.Bits.Type &= ~1; /* ignore accessed bit */ + + base = (void *)((entry.HighWord.Bits.BaseHi << 24) | (entry.HighWord.Bits.BaseMid << 16) | entry.BaseLow); + limit = (entry.HighWord.Bits.LimitHi << 16) | entry.LimitLow; + + ok(base == NtCurrentTeb(), "expected %p, got %p\n", NtCurrentTeb(), base); + ok(limit == 0x0fff || limit == 0x4000, "expected 0x0fff or 0x4000, got %#x\n", limit); + ok(entry.HighWord.Bits.Type == 0x12, "expected 0x12, got %#x\n", entry.HighWord.Bits.Type); + ok(entry.HighWord.Bits.Dpl == 3, "expected 3, got %u\n", entry.HighWord.Bits.Dpl); + ok(entry.HighWord.Bits.Pres == 1, "expected 1, got %u\n", entry.HighWord.Bits.Pres); + ok(entry.HighWord.Bits.Sys == 0, "expected 0, got %u\n", entry.HighWord.Bits.Sys); + ok(entry.HighWord.Bits.Reserved_0 == 0, "expected 0, got %u\n", entry.HighWord.Bits.Reserved_0); + ok(entry.HighWord.Bits.Default_Big == 1, "expected 1, got %u\n", entry.HighWord.Bits.Default_Big); + ok(entry.HighWord.Bits.Granularity == 0, "expected 0, got %u\n", entry.HighWord.Bits.Granularity); +} + #endif /* __i386__ */ static HANDLE finish_event; @@ -1965,6 +2005,7 @@ START_TEST(thread) test_GetThreadExitCode(); #ifdef __i386__ test_SetThreadContext(); + test_GetThreadSelectorEntry(); #endif test_QueueUserWorkItem(); test_RegisterWaitForSingleObject();

1 0