September 2013 - Wine-Commits

Nikolay Sivov : kernel32/tests: Some tests for initial thread activation context.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: ab08d2a5ba3a5ac9778af269912151337b3e7b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab08d2a5ba3a5ac9778af2699… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 5 11:27:45 2013 +0400 kernel32/tests: Some tests for initial thread activation context. --- dlls/kernel32/tests/thread.c | 201 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 185 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 9be0484..0f3564f 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -30,6 +30,7 @@ #include <winbase.h> #include <winnt.h> #include <winerror.h> +#include <winnls.h> /* Specify the number of simultaneous threads to test */ #define NUM_THREADS 4 @@ -54,6 +55,14 @@ # endif #endif +#ifdef __i386__ +#define ARCH "x86" +#elif defined __x86_64__ +#define ARCH "amd64" +#else +#define ARCH "none" +#endif + static BOOL (WINAPI *pGetThreadPriorityBoost)(HANDLE,PBOOL); static HANDLE (WINAPI *pOpenThread)(DWORD,BOOL,DWORD); static BOOL (WINAPI *pQueueUserWorkItem)(LPTHREAD_START_ROUTINE,PVOID,ULONG); @@ -65,6 +74,11 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static BOOL (WINAPI *pSetThreadErrorMode)(DWORD,PDWORD); static DWORD (WINAPI *pGetThreadErrorMode)(void); static DWORD (WINAPI *pRtlGetThreadErrorMode)(void); +static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); +static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); +static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); +static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); +static void (WINAPI *pReleaseActCtx)(HANDLE); static HANDLE create_target_process(const char *arg) { @@ -258,6 +272,28 @@ static DWORD WINAPI threadFunc_CloseHandle(LPVOID p) return 0; } +struct thread_actctx_param +{ + HANDLE thread_context; + HANDLE handle; +}; + +static DWORD WINAPI thread_actctx_func(void *p) +{ + struct thread_actctx_param *param = (struct thread_actctx_param*)p; + HANDLE cur; + BOOL ret; + + cur = (void*)0xdeadbeef; + ret = pGetCurrentActCtx(&cur); + ok(ret, "thread GetCurrentActCtx failed, %u\n", GetLastError()); +todo_wine + ok(cur == param->handle, "got %p, expected %p\n", cur, param->handle); + param->thread_context = cur; + + return 0; +} + static void create_function_addr_events(HANDLE events[2]) { char buffer[256]; @@ -1432,28 +1468,160 @@ static void test_thread_fpu_cw(void) } #endif +static const char manifest_dep[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.2.3.4\" name=\"testdep1\" type=\"win32\" processorArchitecture=\"" ARCH "\"/>" +" <file name=\"testdep.dll\" />" +"</assembly>"; + +static const char manifest_main[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\" />" +"<dependency>" +" <dependentAssembly>" +" <assemblyIdentity type=\"win32\" name=\"testdep1\" version=\"1.2.3.4\" processorArchitecture=\"" ARCH "\" />" +" </dependentAssembly>" +"</dependency>" +"</assembly>"; + +static void create_manifest_file(const char *filename, const char *manifest) +{ + WCHAR path[MAX_PATH]; + HANDLE file; + DWORD size; + + MultiByteToWideChar( CP_ACP, 0, filename, -1, path, MAX_PATH ); + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + WriteFile(file, manifest, strlen(manifest), &size, NULL); + CloseHandle(file); +} + +static HANDLE test_create(const char *file) +{ + WCHAR path[MAX_PATH]; + ACTCTXW actctx; + HANDLE handle; + + MultiByteToWideChar(CP_ACP, 0, file, -1, path, MAX_PATH); + memset(&actctx, 0, sizeof(ACTCTXW)); + actctx.cbSize = sizeof(ACTCTXW); + actctx.lpSource = path; + + handle = pCreateActCtxW(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); + + ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); + ok(actctx.dwFlags == 0, "dwFlags=%d\n", actctx.dwFlags); + ok(actctx.lpSource == path, "lpSource=%p\n", actctx.lpSource); + ok(actctx.wProcessorArchitecture == 0, "wProcessorArchitecture=%d\n", actctx.wProcessorArchitecture); + ok(actctx.wLangId == 0, "wLangId=%d\n", actctx.wLangId); + ok(actctx.lpAssemblyDirectory == NULL, "lpAssemblyDirectory=%p\n", actctx.lpAssemblyDirectory); + ok(actctx.lpResourceName == NULL, "lpResourceName=%p\n", actctx.lpResourceName); + ok(actctx.lpApplicationName == NULL, "lpApplicationName=%p\n", actctx.lpApplicationName); + ok(actctx.hModule == NULL, "hModule=%p\n", actctx.hModule); + + return handle; +} + +static void test_thread_actctx(void) +{ + struct thread_actctx_param param; + HANDLE thread, handle, context; + ULONG_PTR cookie; + DWORD tid, ret; + BOOL b; + + if (!pActivateActCtx) + { + win_skip("skipping activation context tests\n"); + return; + } + + create_manifest_file("testdep1.manifest", manifest_dep); + create_manifest_file("main.manifest", manifest_main); + + context = test_create("main.manifest"); + DeleteFileA("testdep1.manifest"); + DeleteFileA("main.manifest"); + + handle = (void*)0xdeadbeef; + b = pGetCurrentActCtx(&handle); + ok(b, "GetCurentActCtx failed: %u\n", GetLastError()); + ok(handle == 0, "active context %p\n", handle); + + b = pActivateActCtx(context, &cookie); + ok(b, "activation failed: %u\n", GetLastError()); + + handle = 0; + b = pGetCurrentActCtx(&handle); + ok(b, "GetCurentActCtx failed: %u\n", GetLastError()); + ok(handle != 0, "no active context\n"); + + param.handle = NULL; + b = pGetCurrentActCtx(&param.handle); + ok(b && param.handle != NULL, "failed to get context, %u\n", GetLastError()); + + param.thread_context = (void*)0xdeadbeef; + thread = CreateThread(NULL, 0, thread_actctx_func, &param, 0, &tid); + ok(thread != NULL, "failed, got %u\n", GetLastError()); + + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "wait timeout\n"); +todo_wine + ok(param.thread_context == context, "got wrong thread context %p, %p\n", param.thread_context, context); + CloseHandle(thread); + + /* similar test for CreateRemoteThread() */ + param.thread_context = (void*)0xdeadbeef; + thread = CreateRemoteThread(GetCurrentProcess(), NULL, 0, thread_actctx_func, &param, 0, &tid); + ok(thread != NULL, "failed, got %u\n", GetLastError()); + + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "wait timeout\n"); +todo_wine + ok(param.thread_context == context, "got wrong thread context %p, %p\n", param.thread_context, context); + CloseHandle(thread); + + b = pDeactivateActCtx(0, cookie); + ok(b, "DeactivateActCtx failed: %u\n", GetLastError()); + pReleaseActCtx(context); +} + +static void init_funcs(void) +{ + HMODULE hKernel32 = GetModuleHandle("kernel32"); + +/* Neither Cygwin nor mingW export OpenThread, so do a dynamic check + so that the compile passes */ + +#define X(f) p##f = (void*)GetProcAddress(hKernel32, #f) + X(GetThreadPriorityBoost); + X(OpenThread); + X(QueueUserWorkItem); + X(SetThreadIdealProcessor); + X(SetThreadPriorityBoost); + X(RegisterWaitForSingleObject); + X(UnregisterWait); + X(IsWow64Process); + X(SetThreadErrorMode); + X(GetThreadErrorMode); + X(ActivateActCtx); + X(CreateActCtxW); + X(DeactivateActCtx); + X(GetCurrentActCtx); + X(ReleaseActCtx); +#undef X +} + START_TEST(thread) { - HINSTANCE lib; HINSTANCE ntdll; int argc; char **argv; argc = winetest_get_mainargs( &argv ); -/* Neither Cygwin nor mingW export OpenThread, so do a dynamic check - so that the compile passes -*/ - lib=GetModuleHandleA("kernel32.dll"); - ok(lib!=NULL,"Couldn't get a handle for kernel32.dll\n"); - pGetThreadPriorityBoost=(void *)GetProcAddress(lib,"GetThreadPriorityBoost"); - pOpenThread=(void *)GetProcAddress(lib,"OpenThread"); - pQueueUserWorkItem=(void *)GetProcAddress(lib,"QueueUserWorkItem"); - pSetThreadIdealProcessor=(void *)GetProcAddress(lib,"SetThreadIdealProcessor"); - pSetThreadPriorityBoost=(void *)GetProcAddress(lib,"SetThreadPriorityBoost"); - pRegisterWaitForSingleObject=(void *)GetProcAddress(lib,"RegisterWaitForSingleObject"); - pUnregisterWait=(void *)GetProcAddress(lib,"UnregisterWait"); - pIsWow64Process=(void *)GetProcAddress(lib,"IsWow64Process"); - pSetThreadErrorMode=(void *)GetProcAddress(lib,"SetThreadErrorMode"); - pGetThreadErrorMode=(void *)GetProcAddress(lib,"GetThreadErrorMode"); + + init_funcs(); ntdll=GetModuleHandleA("ntdll.dll"); if (ntdll) @@ -1507,4 +1675,5 @@ START_TEST(thread) #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) test_thread_fpu_cw(); #endif + test_thread_actctx(); }

1 0

Henri Verbeet : d3dcompiler: Avoid LPCSTR.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 36190dd5e6812ac2f57c1d74d0c785dee23c96f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36190dd5e6812ac2f57c1d74d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 5 09:54:42 2013 +0200 d3dcompiler: Avoid LPCSTR. --- dlls/d3dcompiler_43/reflection.c | 12 ++++++------ dlls/d3dcompiler_43/tests/asm.c | 6 ++---- include/d3d11shader.h | 24 ++++++++++++------------ 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index f516e4a..77e7ac3 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -445,7 +445,7 @@ static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompil } static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByName( - ID3D11ShaderReflection *iface, LPCSTR name) + ID3D11ShaderReflection *iface, const char *name) { struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); unsigned int i; @@ -547,7 +547,7 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetPatchConstantP } static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetVariableByName( - ID3D11ShaderReflection *iface, LPCSTR name) + ID3D11ShaderReflection *iface, const char *name) { struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); unsigned int i, k; @@ -582,7 +582,7 @@ static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_sha } static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDescByName( - ID3D11ShaderReflection *iface, LPCSTR name, D3D11_SHADER_INPUT_BIND_DESC *desc) + ID3D11ShaderReflection *iface, const char *name, D3D11_SHADER_INPUT_BIND_DESC *desc) { struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); unsigned int i; @@ -767,7 +767,7 @@ static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_ref } static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByName( - ID3D11ShaderReflectionConstantBuffer *iface, LPCSTR name) + ID3D11ShaderReflectionConstantBuffer *iface, const char *name) { struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); unsigned int i; @@ -924,7 +924,7 @@ static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflect } static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByName( - ID3D11ShaderReflectionType *iface, LPCSTR name) + ID3D11ShaderReflectionType *iface, const char *name) { struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); unsigned int i; @@ -953,7 +953,7 @@ static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflect return &null_type.ID3D11ShaderReflectionType_iface; } -static LPCSTR STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeName( +static const char * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeName( ID3D11ShaderReflectionType *iface, UINT index) { struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index e966f94..cb1453f 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -27,10 +27,8 @@ perhaps with a different name? */ #define D3DXERR_INVALIDDATA 0x88760b59 -HRESULT WINAPI D3DAssemble(LPCVOID data, SIZE_T datasize, LPCSTR filename, - const D3D_SHADER_MACRO *defines, LPD3DINCLUDE include, - UINT flags, - LPD3DBLOB* shader, LPD3DBLOB* error_messages); +HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filename, const D3D_SHADER_MACRO *defines, + ID3DInclude *include, UINT flags, ID3DBlob **shader, ID3DBlob **error_messages); struct shader_test { const char *text; diff --git a/include/d3d11shader.h b/include/d3d11shader.h index 6a0ee51..ea271f6 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -35,7 +35,7 @@ typedef D3D_TESSELLATOR_OUTPUT_PRIMITIVE D3D11_TESSELLATOR_OUTPUT_PRIMITIVE; typedef struct _D3D11_SHADER_DESC { UINT Version; - LPCSTR Creator; + const char *Creator; UINT Flags; UINT ConstantBuffers; UINT BoundResources; @@ -76,7 +76,7 @@ typedef struct _D3D11_SHADER_DESC typedef struct _D3D11_SHADER_VARIABLE_DESC { - LPCSTR Name; + const char *Name; UINT StartOffset; UINT Size; UINT uFlags; @@ -96,12 +96,12 @@ typedef struct _D3D11_SHADER_TYPE_DESC UINT Elements; UINT Members; UINT Offset; - LPCSTR Name; + const char *Name; } D3D11_SHADER_TYPE_DESC; typedef struct _D3D11_SHADER_BUFFER_DESC { - LPCSTR Name; + const char *Name; D3D_CBUFFER_TYPE Type; UINT Variables; UINT Size; @@ -110,7 +110,7 @@ typedef struct _D3D11_SHADER_BUFFER_DESC typedef struct _D3D11_SHADER_INPUT_BIND_DESC { - LPCSTR Name; + const char *Name; D3D_SHADER_INPUT_TYPE Type; UINT BindPoint; UINT BindCount; @@ -122,7 +122,7 @@ typedef struct _D3D11_SHADER_INPUT_BIND_DESC typedef struct _D3D11_SIGNATURE_PARAMETER_DESC { - LPCSTR SemanticName; + const char *SemanticName; UINT SemanticIndex; UINT Register; D3D_NAME SystemValueType; @@ -139,8 +139,8 @@ DECLARE_INTERFACE(ID3D11ShaderReflectionType) { STDMETHOD(GetDesc)(THIS_ D3D11_SHADER_TYPE_DESC *desc) PURE; STDMETHOD_(struct ID3D11ShaderReflectionType *, GetMemberTypeByIndex)(THIS_ UINT index) PURE; - STDMETHOD_(struct ID3D11ShaderReflectionType *, GetMemberTypeByName)(THIS_ LPCSTR name) PURE; - STDMETHOD_(LPCSTR, GetMemberTypeName)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionType *, GetMemberTypeByName)(THIS_ const char *name) PURE; + STDMETHOD_(const char *, GetMemberTypeName)(THIS_ UINT index) PURE; STDMETHOD(IsEqual)(THIS_ struct ID3D11ShaderReflectionType *type) PURE; STDMETHOD_(struct ID3D11ShaderReflectionType *, GetSubType)(THIS) PURE; STDMETHOD_(struct ID3D11ShaderReflectionType *, GetBaseClass)(THIS) PURE; @@ -170,7 +170,7 @@ DECLARE_INTERFACE(ID3D11ShaderReflectionConstantBuffer) { STDMETHOD(GetDesc)(THIS_ D3D11_SHADER_BUFFER_DESC *desc) PURE; STDMETHOD_(struct ID3D11ShaderReflectionVariable *, GetVariableByIndex)(THIS_ UINT index) PURE; - STDMETHOD_(struct ID3D11ShaderReflectionVariable *, GetVariableByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionVariable *, GetVariableByName)(THIS_ const char *name) PURE; }; #undef INTERFACE @@ -186,13 +186,13 @@ DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) /* ID3D11ShaderReflection methods */ STDMETHOD(GetDesc)(THIS_ D3D11_SHADER_DESC *desc) PURE; STDMETHOD_(struct ID3D11ShaderReflectionConstantBuffer *, GetConstantBufferByIndex)(THIS_ UINT index) PURE; - STDMETHOD_(struct ID3D11ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ const char *name) PURE; STDMETHOD(GetResourceBindingDesc)(THIS_ UINT index, D3D11_SHADER_INPUT_BIND_DESC *desc) PURE; STDMETHOD(GetInputParameterDesc)(THIS_ UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) PURE; STDMETHOD(GetOutputParameterDesc)(THIS_ UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) PURE; STDMETHOD(GetPatchConstantParameterDesc)(THIS_ UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) PURE; - STDMETHOD_(struct ID3D11ShaderReflectionVariable *, GetVariableByName)(THIS_ LPCSTR name) PURE; - STDMETHOD(GetResourceBindingDescByName)(THIS_ LPCSTR name, D3D11_SHADER_INPUT_BIND_DESC *desc) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionVariable *, GetVariableByName)(THIS_ const char *name) PURE; + STDMETHOD(GetResourceBindingDescByName)(THIS_ const char *name, D3D11_SHADER_INPUT_BIND_DESC *desc) PURE; STDMETHOD_(UINT, GetMovInstructionCount)(THIS) PURE; STDMETHOD_(UINT, GetMovcInstructionCount)(THIS) PURE; STDMETHOD_(UINT, GetConversionInstructionCount)(THIS) PURE;

1 0

Henri Verbeet : wined3d: Enforce WINED3DUSAGE_DEPTHSTENCIL format restrictions on resource creation .
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: ad178a5b55a4ca0e9c9a288baecfba9c17120860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad178a5b55a4ca0e9c9a288ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 5 09:54:41 2013 +0200 wined3d: Enforce WINED3DUSAGE_DEPTHSTENCIL format restrictions on resource creation. --- dlls/wined3d/resource.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 6138764..e97af48 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -90,6 +90,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * { if ((usage & WINED3DUSAGE_RENDERTARGET) && !(format->flags & WINED3DFMT_FLAG_RENDERTARGET)) return WINED3DERR_INVALIDCALL; + if ((usage & WINED3DUSAGE_DEPTHSTENCIL) && !(format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + return WINED3DERR_INVALIDCALL; } resource->ref = 1;

1 0

Michael Stefaniuc : dplayx: Merge the extra struct into IDirectPlaySPImpl.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 11756086b4fef4d6769a315b93fd7cf0a1ee0333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11756086b4fef4d6769a315b9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 4 23:59:07 2013 +0200 dplayx: Merge the extra struct into IDirectPlaySPImpl. --- dlls/dplayx/dplaysp.c | 122 ++++++++++++------------------------------------- 1 files changed, 30 insertions(+), 92 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index e8fea40..780834c 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -33,34 +33,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); -/* Prototypes */ -static BOOL DPSP_CreateDirectPlaySP( void *lpSP, IDirectPlayImpl *dp ); -static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ); - -/* Predefine the interface */ -typedef struct IDirectPlaySPImpl IDirectPlaySPImpl; - -typedef struct tagDirectPlaySPData -{ - LPVOID lpSpRemoteData; - DWORD dwSpRemoteDataSize; /* Size of data pointed to by lpSpRemoteData */ - - LPVOID lpSpLocalData; - DWORD dwSpLocalDataSize; /* Size of data pointed to by lpSpLocalData */ - - IDirectPlayImpl *dplay; /* FIXME: This should perhaps be iface not impl */ - -} DirectPlaySPData; - -#define DPSP_IMPL_FIELDS \ - DirectPlaySPData* sp; - -struct IDirectPlaySPImpl +typedef struct IDirectPlaySPImpl { const IDirectPlaySPVtbl *lpVtbl; LONG ref; - DPSP_IMPL_FIELDS -}; + void *remote_data; + DWORD remote_data_size; + void *local_data; + DWORD local_data_size; + IDirectPlayImpl *dplay; /* FIXME: This should perhaps be iface not impl */ +} IDirectPlaySPImpl; /* Forward declaration of virtual tables */ static const IDirectPlaySPVtbl directPlaySPVT; @@ -92,6 +74,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) { IDirectPlaySPImpl *This = *ppvObj; This->lpVtbl = &directPlaySPVT; + This->dplay = dp; } else { @@ -102,49 +85,8 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) return E_NOINTERFACE; } - /* Initialize it */ - if( DPSP_CreateDirectPlaySP( *ppvObj, dp ) ) - { - IDirectPlaySP_AddRef( (LPDIRECTPLAYSP)*ppvObj ); - return S_OK; - } - - /* Initialize failed, destroy it */ - DPSP_DestroyDirectPlaySP( *ppvObj ); - - HeapFree( GetProcessHeap(), 0, *ppvObj ); - *ppvObj = NULL; - - return DPERR_NOMEMORY; -} - -static BOOL DPSP_CreateDirectPlaySP( void *lpSP, IDirectPlayImpl *dp ) -{ - IDirectPlaySPImpl *This = lpSP; - - This->sp = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->sp) ) ); - - if ( This->sp == NULL ) - { - return FALSE; - } - - This->sp->dplay = dp; - - return TRUE; -} - -static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ) -{ - IDirectPlaySPImpl *This = lpSP; - - HeapFree( GetProcessHeap(), 0, This->sp->lpSpRemoteData ); - HeapFree( GetProcessHeap(), 0, This->sp->lpSpLocalData ); - - /* FIXME: Need to delete player queue */ - - HeapFree( GetProcessHeap(), 0, This->sp ); - return TRUE; + IDirectPlaySP_AddRef( (LPDIRECTPLAYSP)*ppvObj ); + return S_OK; } static inline IDirectPlaySPImpl *impl_from_IDirectPlaySP( IDirectPlaySP *iface ) @@ -188,7 +130,8 @@ static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface ) if( !ref ) { - DPSP_DestroyDirectPlaySP( This ); + HeapFree( GetProcessHeap(), 0, This->remote_data ); + HeapFree( GetProcessHeap(), 0, This->local_data ); HeapFree( GetProcessHeap(), 0, This ); } @@ -269,7 +212,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData( IDirectPlaySP *iface, D TRACE( "(%p)->(0x%08x,%p,%p,0x%08x)\n", This, idPlayer, lplpData, lpdwDataSize, dwFlags ); - hr = DP_GetSPPlayerData( This->sp->dplay, idPlayer, (LPVOID*)&lpPlayerData ); + hr = DP_GetSPPlayerData( This->dplay, idPlayer, (void**)&lpPlayerData ); if( FAILED(hr) ) { @@ -336,9 +279,8 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage( IDirectPlaySP *iface, voi data.dwMessageSize = 0; /* Pass this message to the dplay interface to handle */ - hr = DP_HandleMessage( This->sp->dplay, lpMessageBody, dwMessageBodySize, - lpMessageHeader, wCommandId, wVersion, - &data.lpMessage, &data.dwMessageSize ); + hr = DP_HandleMessage( This->dplay, lpMessageBody, dwMessageBodySize, lpMessageHeader, + wCommandId, wVersion, &data.lpMessage, &data.dwMessageSize ); if( FAILED(hr) ) { @@ -352,7 +294,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage( IDirectPlaySP *iface, voi data.idNameServer = 0; data.lpISP = iface; - hr = (This->sp->dplay->dp2->spData.lpCB->Reply)( &data ); + hr = This->dplay->dp2->spData.lpCB->Reply( &data ); if( FAILED(hr) ) { @@ -616,7 +558,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData( IDirectPlaySP *iface, D TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n", This, idPlayer, lpData, dwDataSize, dwFlags ); - hr = DP_GetSPPlayerData( This->sp->dplay, idPlayer, (LPVOID*)&lpPlayerEntry ); + hr = DP_GetSPPlayerData( This->dplay, idPlayer, (void**)&lpPlayerEntry ); if( FAILED(hr) ) { /* Player must not exist */ @@ -637,7 +579,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData( IDirectPlaySP *iface, D lpPlayerEntry->dwPlayerRemoteDataSize = dwDataSize; } - hr = DP_SetSPPlayerData( This->sp->dplay, idPlayer, lpPlayerEntry ); + hr = DP_SetSPPlayerData( This->dplay, idPlayer, lpPlayerEntry ); return hr; } @@ -684,23 +626,19 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPData( IDirectPlaySP *iface, void ** /* Yes, we're supposed to return a pointer to the memory we have stored! */ if( dwFlags == DPSET_REMOTE ) { - *lpdwDataSize = This->sp->dwSpRemoteDataSize; - *lplpData = This->sp->lpSpRemoteData; + *lpdwDataSize = This->remote_data_size; + *lplpData = This->remote_data; - if( This->sp->lpSpRemoteData == NULL ) - { + if( !This->remote_data ) hr = DPERR_GENERIC; - } } else if( dwFlags == DPSET_LOCAL ) { - *lpdwDataSize = This->sp->dwSpLocalDataSize; - *lplpData = This->sp->lpSpLocalData; + *lpdwDataSize = This->local_data_size; + *lplpData = This->local_data; - if( This->sp->lpSpLocalData == NULL ) - { + if( !This->local_data ) hr = DPERR_GENERIC; - } } return hr; @@ -737,15 +675,15 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPData( IDirectPlaySP *iface, void *l /* If we have data already allocated, free it and replace it */ if( dwFlags == DPSET_REMOTE ) { - HeapFree( GetProcessHeap(), 0, This->sp->lpSpRemoteData ); - This->sp->dwSpRemoteDataSize = dwDataSize; - This->sp->lpSpRemoteData = lpSpData; + HeapFree( GetProcessHeap(), 0, This->remote_data ); + This->remote_data_size = dwDataSize; + This->remote_data = lpSpData; } else if ( dwFlags == DPSET_LOCAL ) { - HeapFree( GetProcessHeap(), 0, This->sp->lpSpLocalData ); - This->sp->lpSpLocalData = lpSpData; - This->sp->dwSpLocalDataSize = dwDataSize; + HeapFree( GetProcessHeap(), 0, This->local_data ); + This->local_data = lpSpData; + This->local_data_size = dwDataSize; } return DP_OK;

1 0

Michael Stefaniuc : dplayx: Introduce impl_from_IDirectPlaySP().
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 008cc60821f029ce7212a103ca34f9c2df761415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=008cc60821f029ce7212a103c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 4 23:49:25 2013 +0200 dplayx: Introduce impl_from_IDirectPlaySP(). --- dlls/dplayx/dplaysp.c | 143 ++++++++++++++++--------------------------------- 1 files changed, 46 insertions(+), 97 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 3a2f36d..aac2811 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -188,6 +188,11 @@ static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ) return TRUE; } +static inline IDirectPlaySPImpl *impl_from_IDirectPlaySP( IDirectPlaySP *iface ) +{ + return CONTAINING_RECORD( iface, IDirectPlaySPImpl, lpVtbl ); +} + static HRESULT WINAPI IDirectPlaySPImpl_QueryInterface( IDirectPlaySP *iface, REFIID riid, void **ppvObj ) { @@ -226,8 +231,8 @@ static HRESULT WINAPI IDirectPlaySPImpl_QueryInterface( IDirectPlaySP *iface, RE static ULONG WINAPI IDirectPlaySPImpl_AddRef( IDirectPlaySP *iface ) { + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); ULONG ulInterfaceRefCount, ulObjRefCount; - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); @@ -240,8 +245,8 @@ static ULONG WINAPI IDirectPlaySPImpl_AddRef( IDirectPlaySP *iface ) static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface ) { + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); ULONG ulInterfaceRefCount, ulObjRefCount; - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); @@ -264,16 +269,10 @@ static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface ) return ulInterfaceRefCount; } -static HRESULT WINAPI IDirectPlaySPImpl_AddMRUEntry -( LPDIRECTPLAYSP iface, - LPCWSTR lpSection, - LPCWSTR lpKey, - LPCVOID lpData, - DWORD dwDataSize, - DWORD dwMaxEntries -) +static HRESULT WINAPI IDirectPlaySPImpl_AddMRUEntry( IDirectPlaySP *iface, LPCWSTR lpSection, + LPCWSTR lpKey, const void *lpData, DWORD dwDataSize, DWORD dwMaxEntries ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); /* Should be able to call the comctl32 undocumented MRU routines. I suspect that the interface works appropriately */ @@ -283,17 +282,11 @@ static HRESULT WINAPI IDirectPlaySPImpl_AddMRUEntry return DP_OK; } -static HRESULT WINAPI IDirectPlaySPImpl_CreateAddress -( LPDIRECTPLAYSP iface, - REFGUID guidSP, - REFGUID guidDataType, - LPCVOID lpData, - DWORD dwDataSize, - LPVOID lpAddress, - LPDWORD lpdwAddressSize -) +static HRESULT WINAPI IDirectPlaySPImpl_CreateAddress( IDirectPlaySP *iface, REFGUID guidSP, + REFGUID guidDataType, const void *lpData, DWORD dwDataSize, void *lpAddress, + DWORD *lpdwAddressSize ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); FIXME( "(%p)->(%s,%s,%p,0x%08x,%p,%p): stub\n", This, debugstr_guid(guidSP), debugstr_guid(guidDataType), @@ -302,15 +295,11 @@ static HRESULT WINAPI IDirectPlaySPImpl_CreateAddress return DP_OK; } -static HRESULT WINAPI IDirectPlaySPImpl_EnumAddress -( LPDIRECTPLAYSP iface, - LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, - LPCVOID lpAddress, - DWORD dwAddressSize, - LPVOID lpContext -) +static HRESULT WINAPI IDirectPlaySPImpl_EnumAddress( IDirectPlaySP *iface, + LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, const void *lpAddress, DWORD dwAddressSize, + void *lpContext ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); TRACE( "(%p)->(%p,%p,0x%08x,%p)\n", This, lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext ); @@ -320,15 +309,10 @@ static HRESULT WINAPI IDirectPlaySPImpl_EnumAddress return DP_OK; } -static HRESULT WINAPI IDirectPlaySPImpl_EnumMRUEntries -( LPDIRECTPLAYSP iface, - LPCWSTR lpSection, - LPCWSTR lpKey, - LPENUMMRUCALLBACK lpEnumMRUCallback, - LPVOID lpContext -) +static HRESULT WINAPI IDirectPlaySPImpl_EnumMRUEntries( IDirectPlaySP *iface, LPCWSTR lpSection, + LPCWSTR lpKey, LPENUMMRUCALLBACK lpEnumMRUCallback, void *lpContext ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); /* Should be able to call the comctl32 undocumented MRU routines. I suspect that the interface works appropriately */ @@ -338,13 +322,10 @@ static HRESULT WINAPI IDirectPlaySPImpl_EnumMRUEntries return DP_OK; } -static HRESULT WINAPI IDirectPlaySPImpl_GetPlayerFlags -( LPDIRECTPLAYSP iface, - DPID idPlayer, - LPDWORD lpdwPlayerFlags -) +static HRESULT WINAPI IDirectPlaySPImpl_GetPlayerFlags( IDirectPlaySP *iface, DPID idPlayer, + DWORD *lpdwPlayerFlags ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); FIXME( "(%p)->(0x%08x,%p): stub\n", This, idPlayer, lpdwPlayerFlags ); @@ -352,17 +333,12 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetPlayerFlags return DP_OK; } -static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData -( LPDIRECTPLAYSP iface, - DPID idPlayer, - LPVOID* lplpData, - LPDWORD lpdwDataSize, - DWORD dwFlags -) +static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData( IDirectPlaySP *iface, DPID idPlayer, + void **lplpData, DWORD *lpdwDataSize, DWORD dwFlags ) { + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); HRESULT hr; LPDP_SPPLAYERDATA lpPlayerData; - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; TRACE( "(%p)->(0x%08x,%p,%p,0x%08x)\n", This, idPlayer, lplpData, lpdwDataSize, dwFlags ); @@ -395,21 +371,16 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData return hr; } -static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage -( LPDIRECTPLAYSP iface, - LPVOID lpMessageBody, - DWORD dwMessageBodySize, - LPVOID lpMessageHeader -) +static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage( IDirectPlaySP *iface, void *lpMessageBody, + DWORD dwMessageBodySize, void *lpMessageHeader ) { + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); LPDPMSG_SENDENVELOPE lpMsg = lpMessageBody; HRESULT hr = DPERR_GENERIC; WORD wCommandId; WORD wVersion; DPSP_REPLYDATA data; - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; - FIXME( "(%p)->(%p,0x%08x,%p): mostly stub\n", This, lpMessageBody, dwMessageBodySize, lpMessageHeader ); @@ -709,20 +680,14 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage #endif } -static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData -( LPDIRECTPLAYSP iface, - DPID idPlayer, - LPVOID lpData, - DWORD dwDataSize, - DWORD dwFlags -) +static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData( IDirectPlaySP *iface, DPID idPlayer, + void *lpData, DWORD dwDataSize, DWORD dwFlags ) { + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); HRESULT hr; LPDP_SPPLAYERDATA lpPlayerEntry; LPVOID lpPlayerData; - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; - /* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n", This, idPlayer, lpData, dwDataSize, dwFlags ); @@ -753,15 +718,11 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData return hr; } -static HRESULT WINAPI IDirectPlaySPImpl_CreateCompoundAddress -( LPDIRECTPLAYSP iface, - LPCDPCOMPOUNDADDRESSELEMENT lpElements, - DWORD dwElementCount, - LPVOID lpAddress, - LPDWORD lpdwAddressSize -) +static HRESULT WINAPI IDirectPlaySPImpl_CreateCompoundAddress( IDirectPlaySP *iface, + const DPCOMPOUNDADDRESSELEMENT *lpElements, DWORD dwElementCount, void *lpAddress, + DWORD *lpdwAddressSize ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); FIXME( "(%p)->(%p,0x%08x,%p,%p): stub\n", This, lpElements, dwElementCount, lpAddress, lpdwAddressSize ); @@ -769,15 +730,11 @@ static HRESULT WINAPI IDirectPlaySPImpl_CreateCompoundAddress return DP_OK; } -static HRESULT WINAPI IDirectPlaySPImpl_GetSPData -( LPDIRECTPLAYSP iface, - LPVOID* lplpData, - LPDWORD lpdwDataSize, - DWORD dwFlags -) +static HRESULT WINAPI IDirectPlaySPImpl_GetSPData( IDirectPlaySP *iface, void **lplpData, + DWORD *lpdwDataSize, DWORD dwFlags ) { + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); HRESULT hr = DP_OK; - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; /* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ TRACE( "(%p)->(%p,%p,0x%08x)\n", @@ -827,17 +784,12 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPData return hr; } -static HRESULT WINAPI IDirectPlaySPImpl_SetSPData -( LPDIRECTPLAYSP iface, - LPVOID lpData, - DWORD dwDataSize, - DWORD dwFlags -) +static HRESULT WINAPI IDirectPlaySPImpl_SetSPData( IDirectPlaySP *iface, void *lpData, + DWORD dwDataSize, DWORD dwFlags ) { + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); LPVOID lpSpData; - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; - /* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ TRACE( "(%p)->(%p,0x%08x,0x%08x)\n", This, lpData, dwDataSize, dwFlags ); @@ -879,13 +831,10 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPData return DP_OK; } -static VOID WINAPI IDirectPlaySPImpl_SendComplete -( LPDIRECTPLAYSP iface, - LPVOID unknownA, - DWORD unknownB -) +static void WINAPI IDirectPlaySPImpl_SendComplete( IDirectPlaySP *iface, void *unknownA, + DWORD unknownB ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); FIXME( "(%p)->(%p,0x%08x): stub\n", This, unknownA, unknownB );

1 0

Alexandre Julliard : ntdll: Add a configure check for the tcdrain function.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: f21961cc1427faad65abf36df217a8c888cae7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21961cc1427faad65abf36df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 5 00:10:19 2013 +0200 ntdll: Add a configure check for the tcdrain function. Also remove the tcgetattr check that is no longer used. --- configure | 2 +- configure.ac | 2 +- dlls/ntdll/file.c | 9 +-------- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/serial.c | 26 ++++++++++++++++++++++++++ include/config.h.in | 4 ++-- 6 files changed, 32 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 56c983f..6b2c2c8 100755 --- a/configure +++ b/configure @@ -13436,7 +13436,7 @@ for ac_func in \ strtoll \ strtoull \ symlink \ - tcgetattr \ + tcdrain \ thr_kill2 \ timegm \ usleep \ diff --git a/configure.ac b/configure.ac index 3a0007c..7c1cb1c 100644 --- a/configure.ac +++ b/configure.ac @@ -2063,7 +2063,7 @@ AC_CHECK_FUNCS(\ strtoll \ strtoull \ symlink \ - tcgetattr \ + tcdrain \ thr_kill2 \ timegm \ usleep \ diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 83e286e..9420df5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2777,14 +2777,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock if (!ret && type == FD_TYPE_SERIAL) { - while (tcdrain( fd ) == -1) - { - if (errno != EINTR) - { - ret = FILE_GetNtStatus(); - break; - } - } + ret = COMM_FlushBuffersFile( fd ); } else { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3d9264d..a13c55b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -142,6 +142,7 @@ extern NTSTATUS TAPE_DeviceIoControl(HANDLE hDevice, ULONG IoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize) DECLSPEC_HIDDEN; +extern NTSTATUS COMM_FlushBuffersFile( int fd ) DECLSPEC_HIDDEN; /* file I/O */ struct stat; diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index b4f9aa9..07ba633 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -1342,3 +1342,29 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDevice, lpOutBuffer, nOutBufferSize); return status; } + +NTSTATUS COMM_FlushBuffersFile( int fd ) +{ +#ifdef HAVE_TCDRAIN + while (tcdrain( fd ) == -1) + { + if (errno != EINTR) return FILE_GetNtStatus(); + } + return STATUS_SUCCESS; +#elif defined(TIOCDRAIN) + while (ioctl( fd, TIOCDRAIN ) == -1) + { + if (errno != EINTR) return FILE_GetNtStatus(); + } + return STATUS_SUCCESS; +#elif defined(TCSBRK) + while (ioctl( fd, TCSBRK, 1 ) == -1) + { + if (errno != EINTR) return FILE_GetNtStatus(); + } + return STATUS_SUCCESS; +#else + ERR( "not supported\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif +} diff --git a/include/config.h.in b/include/config.h.in index aac10a5..44b34ce 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1068,8 +1068,8 @@ /* Define to 1 if you have the <sys/wait.h> header file. */ #undef HAVE_SYS_WAIT_H -/* Define to 1 if you have the `tcgetattr' function. */ -#undef HAVE_TCGETATTR +/* Define to 1 if you have the `tcdrain' function. */ +#undef HAVE_TCDRAIN /* Define to 1 if you have the <termios.h> header file. */ #undef HAVE_TERMIOS_H

1 0

Piotr Caban : oleaut32: Add ICreateTypeInfo2::SetVarName implementation.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: a2ea406eee40c74251d98d6f6a81b8fc349e02b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ea406eee40c74251d98d6f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 4 22:28:50 2013 +0200 oleaut32: Add ICreateTypeInfo2::SetVarName implementation. --- dlls/oleaut32/tests/typelib.c | 16 ++++++++++++++-- dlls/oleaut32/typelib.c | 13 +++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 8b91212..b873ac2 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4287,13 +4287,14 @@ static void test_SetVarDocString(void) static OLECHAR nameW[] = {'n','a','m','e',0}; static OLECHAR doc1W[] = {'d','o','c','1',0}; static OLECHAR doc2W[] = {'d','o','c','2',0}; + static OLECHAR var_nameW[] = {'v','a','r','n','a','m','e',0}; CHAR filenameA[MAX_PATH]; WCHAR filenameW[MAX_PATH]; ICreateTypeLib2 *ctl; ICreateTypeInfo *cti; ITypeLib *tl; ITypeInfo *ti; - BSTR docstr; + BSTR namestr, docstr; VARDESC desc, *pdesc; HRESULT hr; VARIANT v; @@ -4324,6 +4325,15 @@ static void test_SetVarDocString(void) hr = ICreateTypeInfo_AddVarDesc(cti, 0, &desc); ok(hr == S_OK, "got %08x\n", hr); + hr = ICreateTypeInfo_SetVarName(cti, 0, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetVarName(cti, 1, var_nameW); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetVarName(cti, 0, var_nameW); + ok(hr == S_OK, "got %08x\n", hr); + hr = ICreateTypeInfo_SetVarDocString(cti, 0, NULL); ok(hr == E_INVALIDARG, "got %08x\n", hr); @@ -4359,10 +4369,12 @@ static void test_SetVarDocString(void) ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue)); ok(V_INT(U(pdesc)->lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(pdesc)->lpvarValue)); - hr = ITypeInfo_GetDocumentation(ti, pdesc->memid, NULL, &docstr, NULL, NULL); + hr = ITypeInfo_GetDocumentation(ti, pdesc->memid, &namestr, &docstr, NULL, NULL); ok(hr == S_OK, "got %08x\n", hr); + ok(memcmp(namestr, var_nameW, sizeof(var_nameW)) == 0, "got wrong name: %s\n", wine_dbgstr_w(namestr)); ok(memcmp(docstr, doc2W, sizeof(doc2W)) == 0, "got wrong docstring: %s\n", wine_dbgstr_w(docstr)); + SysFreeString(namestr); SysFreeString(docstr); ITypeInfo_ReleaseVarDesc(ti, pdesc); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4f55755..a27f5f4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -10688,8 +10688,17 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarName(ICreateTypeInfo2 *iface, UINT index, LPOLESTR name) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(name)); - return E_NOTIMPL; + + TRACE("%p %u %s\n", This, index, wine_dbgstr_w(name)); + + if(!name) + return E_INVALIDARG; + + if(index >= This->cVars) + return TYPE_E_ELEMENTNOTFOUND; + + This->vardescs[index].Name = TLB_append_str(&This->pTypeLib->name_list, name); + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeDescAlias(ICreateTypeInfo2 *iface,

1 0

Michael Stefaniuc : dplayx: Fix the initial refcount of the IDPLobbySPImpl object.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: b9a2efdf2419c359cf3f60e31615deb87b5849cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a2efdf2419c359cf3f60e31… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 4 23:45:28 2013 +0200 dplayx: Fix the initial refcount of the IDPLobbySPImpl object. --- dlls/dplayx/lobbysp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 72198da..3528f94 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -240,7 +240,7 @@ HRESULT dplobbysp_create( REFIID riid, void **ppv, IDirectPlayImpl *dp ) return DPERR_OUTOFMEMORY; obj->IDPLobbySP_iface.lpVtbl = &dpLobbySPVT; - obj->ref = 0; + obj->ref = 1; obj->dplay = dp; hr = IDPLobbySP_QueryInterface( &obj->IDPLobbySP_iface, riid, ppv );

1 0

Michael Stefaniuc : dplayx: Use consistent naming for the IDirectPlaySP methods.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 12245de80168e7f08c33df49ff34237ce8e7730f URL: http://source.winehq.org/git/wine.git/?a=commit;h=12245de80168e7f08c33df49f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 4 23:47:25 2013 +0200 dplayx: Use consistent naming for the IDirectPlaySP methods. --- dlls/dplayx/dplaysp.c | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 899348e..3a2f36d 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -188,12 +188,8 @@ static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ) return TRUE; } -/* Interface implementation */ - -static HRESULT WINAPI DPSP_QueryInterface -( LPDIRECTPLAYSP iface, - REFIID riid, - LPVOID* ppvObj ) +static HRESULT WINAPI IDirectPlaySPImpl_QueryInterface( IDirectPlaySP *iface, REFIID riid, + void **ppvObj ) { IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); @@ -228,8 +224,7 @@ static HRESULT WINAPI DPSP_QueryInterface return S_OK; } -static ULONG WINAPI DPSP_AddRef -( LPDIRECTPLAYSP iface ) +static ULONG WINAPI IDirectPlaySPImpl_AddRef( IDirectPlaySP *iface ) { ULONG ulInterfaceRefCount, ulObjRefCount; IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; @@ -243,8 +238,7 @@ static ULONG WINAPI DPSP_AddRef return ulObjRefCount; } -static ULONG WINAPI DPSP_Release -( LPDIRECTPLAYSP iface ) +static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface ) { ULONG ulInterfaceRefCount, ulObjRefCount; IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; @@ -899,11 +893,9 @@ static VOID WINAPI IDirectPlaySPImpl_SendComplete static const IDirectPlaySPVtbl directPlaySPVT = { - - DPSP_QueryInterface, - DPSP_AddRef, - DPSP_Release, - + IDirectPlaySPImpl_QueryInterface, + IDirectPlaySPImpl_AddRef, + IDirectPlaySPImpl_Release, IDirectPlaySPImpl_AddMRUEntry, IDirectPlaySPImpl_CreateAddress, IDirectPlaySPImpl_EnumAddress,

1 0

Alexandre Julliard : winetest: Expire old queue files after a month.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: tools Branch: master Commit: d104f7a7905d5bfeccab790ad38377bc17fdadad URL: http://source.winehq.org/git/tools.git/?a=commit;h=d104f7a7905d5bfeccab790a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 5 19:33:39 2013 +0200 winetest: Expire old queue files after a month. --- winetest/winetest.cron | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 0ff60be..eaacf4f 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -23,5 +23,10 @@ if [ ! -f $lock ]; then # remove old test builds (cd builds && find . -mtime +$expire -name winetest\*.exe -print0 | xargs -0 rm -f) + + # remove old queue files + find queue -maxdepth 1 -mtime +30 -name err\* -print0 | xargs -0 rm -rf + find queue -maxdepth 1 -mtime +30 -name CGI\* -print0 | xargs -0 rm -f + rm $lock fi

1 0