September 2013 - Wine-commits

Michael Stefaniuc : msxml3: Avoid shadowing a function parameter.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: f695cb6da14acdf3f776d8bdaab14c340d9d4196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f695cb6da14acdf3f776d8bda… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 3 09:50:00 2013 +0200 msxml3: Avoid shadowing a function parameter. --- dlls/msxml3/saxreader.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 9362941..2f632ef 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2817,13 +2817,13 @@ static ULONG WINAPI saxxmlreader_Release( for (i = 0; i < SAXHandler_Last; i++) { - struct saxanyhandler_iface *iface = &This->saxhandlers[i].u.anyhandler; + struct saxanyhandler_iface *saxiface = &This->saxhandlers[i].u.anyhandler; - if (iface->handler) - IUnknown_Release(iface->handler); + if (saxiface->handler) + IUnknown_Release(saxiface->handler); - if (iface->vbhandler) - IUnknown_Release(iface->vbhandler); + if (saxiface->vbhandler) + IUnknown_Release(saxiface->vbhandler); } SysFreeString(This->xmldecl_version);

1 0

Dmitry Timoshkov : ntdll: Avoid a needless goto.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: c25776a98149642ce7670a9bbbab5b3e5b95b5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25776a98149642ce7670a9bb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 3 17:24:52 2013 +0900 ntdll: Avoid a needless goto. --- dlls/ntdll/serial.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index de699ef..b4f9aa9 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -1322,7 +1322,7 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDevice, attr.SecurityQualityOfService = NULL; status = NtCreateEvent(&hev, EVENT_ALL_ACCESS, &attr, SynchronizationEvent, FALSE); - if (status) goto done; + if (status) return status; } status = io_control(hDevice, hev, UserApcRoutine, UserApcContext, piosb, dwIoControlCode, lpInBuffer, nInBufferSize, @@ -1340,6 +1340,5 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDevice, else status = io_control(hDevice, hEvent, UserApcRoutine, UserApcContext, piosb, dwIoControlCode, lpInBuffer, nInBufferSize, lpOutBuffer, nOutBufferSize); -done: return status; }

1 0

Alexandre Julliard : ntdll: Add stubs for the SRW lock functions.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 4af4df5af3cffd3e1b18932e4fbedbae10c8b2b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4af4df5af3cffd3e1b18932e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 3 11:08:42 2013 +0200 ntdll: Add stubs for the SRW lock functions. --- dlls/kernel32/kernel32.spec | 10 +++++----- dlls/kernel32/thread.c | 40 ---------------------------------------- dlls/ntdll/ntdll.spec | 5 +++++ dlls/ntdll/sync.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 2 ++ include/winternl.h | 5 +++++ 6 files changed, 57 insertions(+), 45 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c0eda71..57cc38b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -133,8 +133,8 @@ # functions exported by name, ordinal doesn't matter -@ stdcall AcquireSRWLockExclusive(ptr) -@ stdcall AcquireSRWLockShared(ptr) +@ stdcall AcquireSRWLockExclusive(ptr) ntdll.RtlAcquireSRWLockExclusive +@ stdcall AcquireSRWLockShared(ptr) ntdll.RtlAcquireSRWLockShared @ stdcall ActivateActCtx(ptr ptr) @ stdcall AddAtomA(str) @ stdcall AddAtomW(wstr) @@ -753,7 +753,7 @@ @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) @ stdcall InitializeCriticalSectionEx(ptr long long) @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead -@ stdcall InitializeSRWLock(ptr) +@ stdcall InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock @ stdcall -arch=i386 InterlockedCompareExchange (ptr long long) @ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr int64 int64) ntdll.RtlInterlockedCompareExchange64 @ stdcall -arch=i386 InterlockedDecrement(ptr) @@ -1015,8 +1015,8 @@ @ stdcall ReleaseActCtx(ptr) @ stdcall ReleaseMutex(long) @ stdcall ReleaseSemaphore(long long ptr) -@ stdcall ReleaseSRWLockExclusive(ptr) -@ stdcall ReleaseSRWLockShared(ptr) +@ stdcall ReleaseSRWLockExclusive(ptr) ntdll.RtlReleaseSRWLockExclusive +@ stdcall ReleaseSRWLockShared(ptr) ntdll.RtlReleaseSRWLockShared @ stdcall RemoveDirectoryA(str) @ stdcall RemoveDirectoryW(wstr) # @ stub RemoveLocalAlternateComputerNameA diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index c82ef58..5d87cdd 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -832,43 +832,3 @@ BOOL WINAPI GetThreadPreferredUILanguages( DWORD flags, PULONG count, PCZZWSTR b *buffersize = 0; return TRUE; } - -/*********************************************************************** - * InitializeSRWLock (KERNEL32.@) - */ -VOID WINAPI InitializeSRWLock( PSRWLOCK srwlock ) -{ - FIXME( "(%p): stub\n", srwlock ); -} - -/*********************************************************************** - * AcquireSRWLockExclusive (KERNEL32.@) - */ -VOID WINAPI AcquireSRWLockExclusive( PSRWLOCK srwlock ) -{ - FIXME( "(%p): stub\n", srwlock ); -} - -/*********************************************************************** - * ReleaseSRWLockExclusive (KERNEL32.@) - */ -VOID WINAPI ReleaseSRWLockExclusive( PSRWLOCK srwlock ) -{ - FIXME( "(%p): stub\n", srwlock ); -} - -/*********************************************************************** - * AcquireSRWLockShared (KERNEL32.@) - */ -VOID WINAPI AcquireSRWLockShared( PSRWLOCK srwlock ) -{ - FIXME( "(%p): stub\n", srwlock ); -} - -/*********************************************************************** - * ReleaseSRWLockShared (KERNEL32.@) - */ -VOID WINAPI ReleaseSRWLockShared( PSRWLOCK srwlock ) -{ - FIXME( "(%p): stub\n", srwlock ); -} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index cb120da..860b4c6 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -391,6 +391,8 @@ @ stdcall RtlAcquirePebLock() @ stdcall RtlAcquireResourceExclusive(ptr long) @ stdcall RtlAcquireResourceShared(ptr long) +@ stdcall RtlAcquireSRWLockExclusive(ptr) +@ stdcall RtlAcquireSRWLockShared(ptr) @ stdcall RtlActivateActivationContext(long ptr ptr) @ stub RtlActivateActivationContextEx @ stub RtlActivateActivationContextUnsafeFast @@ -680,6 +682,7 @@ # @ stub RtlInitializeRangeList @ stdcall RtlInitializeResource(ptr) @ stdcall RtlInitializeSListHead(ptr) +@ stdcall RtlInitializeSRWLock(ptr) @ stdcall RtlInitializeSid(ptr ptr long) # @ stub RtlInitializeStackTraceDataBase @ stub RtlInsertElementGenericTable @@ -809,6 +812,8 @@ @ stub RtlReleaseMemoryStream @ stdcall RtlReleasePebLock() @ stdcall RtlReleaseResource(ptr) +@ stdcall RtlReleaseSRWLockExclusive(ptr) +@ stdcall RtlReleaseSRWLockShared(ptr) @ stub RtlRemoteCall @ stdcall RtlRemoveVectoredExceptionHandler(ptr) @ stub RtlResetRtlTranslations diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index f466dab..af1dba9 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1353,3 +1353,43 @@ DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN fu return RtlRunOnceComplete( once, 0, context ? *context : NULL ); } + +/*********************************************************************** + * RtlInitializeSRWLock (NTDLL.@) + */ +void WINAPI RtlInitializeSRWLock( RTL_SRWLOCK *lock ) +{ + lock->Ptr = NULL; +} + +/*********************************************************************** + * RtlAcquireSRWLockExclusive (NTDLL.@) + */ +void WINAPI RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) +{ + FIXME( "%p stub\n", lock ); +} + +/*********************************************************************** + * RtlAcquireSRWLockShared (NTDLL.@) + */ +void WINAPI RtlAcquireSRWLockShared( RTL_SRWLOCK *lock ) +{ + FIXME( "%p stub\n", lock ); +} + +/*********************************************************************** + * RtlReleaseSRWLockExclusive (NTDLL.@) + */ +void WINAPI RtlReleaseSRWLockExclusive( RTL_SRWLOCK *lock ) +{ + FIXME( "%p stub\n", lock ); +} + +/*********************************************************************** + * RtlReleaseSRWLockShared (NTDLL.@) + */ +void WINAPI RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) +{ + FIXME( "%p stub\n", lock ); +} diff --git a/include/winbase.h b/include/winbase.h index 88b5e4f..cfdea58 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -61,6 +61,8 @@ typedef PRTL_CRITICAL_SECTION_DEBUG LPCRITICAL_SECTION_DEBUG; typedef RTL_SRWLOCK SRWLOCK; typedef PRTL_SRWLOCK PSRWLOCK; +#define SRWLOCK_INIT RTL_SRWLOCK_INIT + typedef WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACK; #define CONDITION_VARIABLE_INIT RTL_CONDITION_VARIABLE_INIT diff --git a/include/winternl.h b/include/winternl.h index bb7a381..47d9a09 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2256,6 +2256,8 @@ NTSYSAPI NTSTATUS WINAPI NtYieldExecution(void); NTSYSAPI void WINAPI RtlAcquirePebLock(void); NTSYSAPI BYTE WINAPI RtlAcquireResourceExclusive(LPRTL_RWLOCK,BYTE); NTSYSAPI BYTE WINAPI RtlAcquireResourceShared(LPRTL_RWLOCK,BYTE); +NTSYSAPI void WINAPI RtlAcquireSRWLockExclusive(RTL_SRWLOCK*); +NTSYSAPI void WINAPI RtlAcquireSRWLockShared(RTL_SRWLOCK*); NTSYSAPI NTSTATUS WINAPI RtlActivateActivationContext(DWORD,HANDLE,ULONG_PTR*); NTSYSAPI NTSTATUS WINAPI RtlAddAce(PACL,DWORD,DWORD,PACE_HEADER,DWORD); NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedAce(PACL,DWORD,DWORD,PSID); @@ -2419,6 +2421,7 @@ NTSYSAPI NTSTATUS WINAPI RtlInitializeCriticalSectionEx(RTL_CRITICAL_SECTION *, NTSYSAPI void WINAPI RtlInitializeBitMap(PRTL_BITMAP,PULONG,ULONG); NTSYSAPI void WINAPI RtlInitializeHandleTable(ULONG,ULONG,RTL_HANDLE_TABLE *); NTSYSAPI void WINAPI RtlInitializeResource(LPRTL_RWLOCK); +NTSYSAPI void WINAPI RtlInitializeSRWLock(RTL_SRWLOCK*); NTSYSAPI BOOL WINAPI RtlInitializeSid(PSID,PSID_IDENTIFIER_AUTHORITY,BYTE); NTSYSAPI NTSTATUS WINAPI RtlInt64ToUnicodeString(ULONGLONG,ULONG,UNICODE_STRING *); NTSYSAPI NTSTATUS WINAPI RtlIntegerToChar(ULONG,ULONG,ULONG,PCHAR); @@ -2471,6 +2474,8 @@ NTSYSAPI NTSTATUS WINAPI RtlRegisterWait(PHANDLE,HANDLE,RTL_WAITORTIMERCALLBACK NTSYSAPI void WINAPI RtlReleaseActivationContext(HANDLE); NTSYSAPI void WINAPI RtlReleasePebLock(void); NTSYSAPI void WINAPI RtlReleaseResource(LPRTL_RWLOCK); +NTSYSAPI void WINAPI RtlReleaseSRWLockExclusive(RTL_SRWLOCK*); +NTSYSAPI void WINAPI RtlReleaseSRWLockShared(RTL_SRWLOCK*); NTSYSAPI ULONG WINAPI RtlRemoveVectoredExceptionHandler(PVOID); NTSYSAPI void WINAPI RtlRestoreLastWin32Error(DWORD); NTSYSAPI void WINAPI RtlSecondsSince1970ToTime(DWORD,LARGE_INTEGER *);

1 0

Matteo Bruni : d3d8/tests: Add cnd instruction test.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: bcecdbda88b40c0e8a0a852d68527d10d4cd314f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcecdbda88b40c0e8a0a852d6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 3 16:29:40 2013 +0200 d3d8/tests: Add cnd instruction test. --- dlls/d3d8/tests/visual.c | 526 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 526 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bcecdbda88b40c0e8a0a8…

1 0

Matteo Bruni : d3dcompiler: Skip search of the parent include for the initial file.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 3f221611f02f1f220af451ead1e9c9fa1d1513e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f221611f02f1f220af451ead… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 3 16:29:41 2013 +0200 d3dcompiler: Skip search of the parent include for the initial file. --- dlls/d3dcompiler_43/compiler.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index ac8fdc5..371f670 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -149,8 +149,10 @@ static char *wpp_lookup_mem(const char *filename, int type, const char *parent_n char *path; int i; + TRACE("Looking for include %s.\n", debugstr_a(filename)); + parent_include = NULL; - if(parent_name[0] != '\0') + if (strcmp(parent_name, initial_filename)) { for(i = 0; i < includes_size; i++) { @@ -162,7 +164,7 @@ static char *wpp_lookup_mem(const char *filename, int type, const char *parent_n } if(parent_include == NULL) { - ERR("Parent include file missing\n"); + ERR("Parent include %s missing.\n", debugstr_a(parent_name)); return NULL; } } @@ -178,6 +180,8 @@ static void *wpp_open_mem(const char *filename, int type) struct mem_file_desc *desc; HRESULT hr; + TRACE("Opening include %s.\n", debugstr_a(filename)); + if(!strcmp(filename, initial_filename)) { current_shader.pos = 0;

1 0

Matteo Bruni : d3dx9: Add / improve traces in some shader-related functions .
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 1f6173a69f6ab0640a6b4734d72c060f5601812f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6173a69f6ab0640a6b4734d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 3 16:29:42 2013 +0200 d3dx9: Add / improve traces in some shader-related functions. --- dlls/d3dx9_36/shader.c | 38 +++++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index ef1c55f..6edbc33 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -311,6 +311,9 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR HRESULT hr; struct D3DXIncludeImpl includefromfile; + TRACE("filename %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n", + debugstr_w(filename), defines, include, flags, shader, error_messages); + if(FAILED(map_view_of_file(filename, &buffer, &len))) return D3DXERR_INVALIDDATA; @@ -334,6 +337,9 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resou HRSRC res; DWORD len; + TRACE("module %p, resource %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n", + module, debugstr_a(resource), defines, include, flags, shader, error_messages); + if (!(res = FindResourceA(module, resource, (const char *)RT_RCDATA))) return D3DXERR_INVALIDDATA; if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) @@ -366,8 +372,10 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO { HRESULT hr; - TRACE("data %p, length %u, defines %p, include %p, function %s, profile %s, flags %#x, shader %p, error_msgs %p, constant_table %p\n", - data, length, defines, include, function, profile, flags, shader, error_msgs, constant_table); + TRACE("data %s, length %u, defines %p, include %p, function %s, profile %s, " + "flags %#x, shader %p, error_msgs %p, constant_table %p.\n", + debugstr_a(data), length, defines, include, debugstr_a(function), debugstr_a(profile), + flags, shader, error_msgs, constant_table); hr = D3DCompile(data, length, NULL, (D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, function, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_msgs); @@ -423,6 +431,11 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO struct D3DXIncludeImpl includefromfile; char *filename_a; + TRACE("filename %s, defines %p, include %p, entrypoint %s, profile %s, " + "flags %#x, shader %p, error_messages %p, constant_table %p.\n", + debugstr_w(filename), defines, include, debugstr_a(entrypoint), debugstr_a(profile), + flags, shader, error_messages, constant_table); + if (FAILED(map_view_of_file(filename, &buffer, &len))) return D3DXERR_INVALIDDATA; @@ -462,6 +475,11 @@ HRESULT WINAPI D3DXCompileShaderFromResourceA(HMODULE module, const char *resour HRSRC res; DWORD len; + TRACE("module %p, resource %s, defines %p, include %p, entrypoint %s, profile %s, " + "flags %#x, shader %p, error_messages %p, constant_table %p.\n", + module, debugstr_a(resource), defines, include, debugstr_a(entrypoint), debugstr_a(profile), + flags, shader, error_messages, constant_table); + if (!(res = FindResourceA(module, resource, (const char *)RT_RCDATA))) return D3DXERR_INVALIDDATA; if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) @@ -494,7 +512,9 @@ HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, const WCHAR *resou HRESULT WINAPI D3DXPreprocessShader(const char *data, UINT data_len, const D3DXMACRO *defines, ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { - TRACE("Forward to D3DPreprocess\n"); + TRACE("data %s, data_len %u, defines %p, include %p, shader %p, error_messages %p.\n", + debugstr_a(data), data_len, defines, include, shader, error_messages); + return D3DPreprocess(data, data_len, NULL, (const D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, (ID3DBlob **)shader, (ID3DBlob **)error_messages); @@ -507,6 +527,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileA(const char *filename, const D3DXMAC DWORD len; HRESULT ret; + TRACE("filename %s, defines %p, include %p, shader %p, error_messages %p.\n", + debugstr_a(filename), defines, include, shader, error_messages); + if (!filename) return D3DXERR_INVALIDDATA; len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); @@ -528,6 +551,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA HRESULT hr; struct D3DXIncludeImpl includefromfile; + TRACE("filename %s, defines %p, include %p, shader %p, error_messages %p.\n", + debugstr_w(filename), defines, include, shader, error_messages); + if (FAILED(map_view_of_file(filename, &buffer, &len))) return D3DXERR_INVALIDDATA; @@ -553,6 +579,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *res HRSRC res; DWORD len; + TRACE("module %p, resource %s, defines %p, include %p, shader %p, error_messages %p.\n", + module, debugstr_a(resource), defines, include, shader, error_messages); + if (!(res = FindResourceA(module, resource, (const char *)RT_RCDATA))) return D3DXERR_INVALIDDATA; if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) @@ -568,6 +597,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *re HRSRC res; DWORD len; + TRACE("module %p, resource %s, defines %p, include %p, shader %p, error_messages %p.\n", + module, debugstr_w(resource), defines, include, shader, error_messages); + if (!(res = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) return D3DXERR_INVALIDDATA; if (FAILED(load_resource_into_memory(module, res, &buffer, &len)))

1 0

Matteo Bruni : d3dx9: Use the ID3DXInclude object to open the initial file in D3DX[ Assemble|Compile|Preprocess]ShaderFromFile.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 613d27ebebd30d559c6bbb7b8c233b8f59cacb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613d27ebebd30d559c6bbb7b8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 3 16:29:43 2013 +0200 d3dx9: Use the ID3DXInclude object to open the initial file in D3DX[Assemble|Compile|Preprocess]ShaderFromFile. --- dlls/d3dx9_36/shader.c | 64 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 44 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 6edbc33..41be22c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -306,27 +306,38 @@ HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { - void *buffer; + const void *buffer; DWORD len; HRESULT hr; struct D3DXIncludeImpl includefromfile; + char *filename_a; TRACE("filename %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n", debugstr_w(filename), defines, include, flags, shader, error_messages); - if(FAILED(map_view_of_file(filename, &buffer, &len))) - return D3DXERR_INVALIDDATA; - if(!include) { includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; include = &includefromfile.ID3DXInclude_iface; } - hr = D3DXAssembleShader(buffer, len, defines, include, flags, - shader, error_messages); + len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); + filename_a = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + if (!filename_a) + return E_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); - UnmapViewOfFile(buffer); + hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, filename_a); + return D3DXERR_INVALIDDATA; + } + + hr = D3DXAssembleShader(buffer, len, defines, include, flags, shader, error_messages); + + ID3DXInclude_Close(include, buffer); + HeapFree(GetProcessHeap(), 0, filename_a); return hr; } @@ -425,7 +436,7 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table) { - void *buffer; + const void *buffer; DWORD len, filename_len; HRESULT hr; struct D3DXIncludeImpl includefromfile; @@ -436,9 +447,6 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO debugstr_w(filename), defines, include, debugstr_a(entrypoint), debugstr_a(profile), flags, shader, error_messages, constant_table); - if (FAILED(map_view_of_file(filename, &buffer, &len))) - return D3DXERR_INVALIDDATA; - if (!include) { includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; @@ -448,12 +456,16 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO filename_len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); filename_a = HeapAlloc(GetProcessHeap(), 0, filename_len * sizeof(char)); if (!filename_a) - { - UnmapViewOfFile(buffer); return E_OUTOFMEMORY; - } WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, filename_len, NULL, NULL); + hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, filename_a); + return D3DXERR_INVALIDDATA; + } + hr = D3DCompile(buffer, len, filename_a, (const D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, entrypoint, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_messages); @@ -462,8 +474,8 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO hr = D3DXGetShaderConstantTable(ID3DXBuffer_GetBufferPointer(*shader), constant_table); + ID3DXInclude_Close(include, buffer); HeapFree(GetProcessHeap(), 0, filename_a); - UnmapViewOfFile(buffer); return hr; } @@ -546,29 +558,41 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileA(const char *filename, const D3DXMAC HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines, ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { - void *buffer; + const void *buffer; DWORD len; HRESULT hr; struct D3DXIncludeImpl includefromfile; + char *filename_a; TRACE("filename %s, defines %p, include %p, shader %p, error_messages %p.\n", debugstr_w(filename), defines, include, shader, error_messages); - if (FAILED(map_view_of_file(filename, &buffer, &len))) - return D3DXERR_INVALIDDATA; - if (!include) { includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; include = &includefromfile.ID3DXInclude_iface; } + len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); + filename_a = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + if (!filename_a) + return E_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + + hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, filename_a); + return D3DXERR_INVALIDDATA; + } + hr = D3DPreprocess(buffer, len, NULL, (const D3D_SHADER_MACRO *)defines, (ID3DInclude *) include, (ID3DBlob **)shader, (ID3DBlob **)error_messages); - UnmapViewOfFile(buffer); + ID3DXInclude_Close(include, buffer); + HeapFree(GetProcessHeap(), 0, filename_a); return hr; }

1 0

Matteo Bruni : d3dx9/tests: Add some more tests for D3DX[ Assemble|Preprocess]ShaderFromFile.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 686f0a62dfa255aff3de03fbfe3c16482cc3d4e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=686f0a62dfa255aff3de03fbf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 3 16:29:44 2013 +0200 d3dx9/tests: Add some more tests for D3DX[Assemble|Preprocess]ShaderFromFile. --- dlls/d3dx9_36/tests/asm.c | 235 ++++++++++++++++++++++++++++----------------- 1 files changed, 148 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=686f0a62dfa255aff3de0…

1 0

Jacek Caban : atl110: Added new DLL.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: b308a5c7adadd8481f2f006026c6d0910e0a02ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b308a5c7adadd8481f2f00602… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 3 11:37:21 2013 +0200 atl110: Added new DLL. --- configure | 1 + configure.ac | 1 + dlls/atl110/Makefile.in | 7 +++ dlls/atl110/atl110.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/atl110/atl110.spec | 52 ++++++++++++++++++++++++++ include/atlbase.h | 1 + tools/make_specfiles | 1 + 7 files changed, 157 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 0ca39bc..3514c1d 100755 --- a/configure +++ b/configure @@ -15913,6 +15913,7 @@ wine_fn_config_dll atl enable_atl implib wine_fn_config_test dlls/atl/tests atl_test wine_fn_config_dll atl100 enable_atl100 implib wine_fn_config_test dlls/atl100/tests atl100_test +wine_fn_config_dll atl110 enable_atl110 wine_fn_config_dll atl80 enable_atl80 implib wine_fn_config_test dlls/atl80/tests atl80_test wine_fn_config_dll authz enable_authz diff --git a/configure.ac b/configure.ac index 9b21643..8306fe2 100644 --- a/configure.ac +++ b/configure.ac @@ -2595,6 +2595,7 @@ WINE_CONFIG_DLL(atl,,[implib]) WINE_CONFIG_TEST(dlls/atl/tests) WINE_CONFIG_DLL(atl100,,[implib]) WINE_CONFIG_TEST(dlls/atl100/tests) +WINE_CONFIG_DLL(atl110) WINE_CONFIG_DLL(atl80,,[implib]) WINE_CONFIG_TEST(dlls/atl80/tests) WINE_CONFIG_DLL(authz) diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in new file mode 100644 index 0000000..f9d98d3 --- /dev/null +++ b/dlls/atl110/Makefile.in @@ -0,0 +1,7 @@ +MODULE = atl110.dll +IMPORTS = atl100 ole32 user32 +EXTRADEFS = -D_ATL_VER=_ATL_VER_110 + +C_SRCS = atl110.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/atl110/atl110.c b/dlls/atl110/atl110.c new file mode 100644 index 0000000..f704bd9 --- /dev/null +++ b/dlls/atl110/atl110.c @@ -0,0 +1,94 @@ +/* + * Copyright 2013 Jacek Caban for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winuser.h" +#include "atlbase.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atl); + +/*********************************************************************** + * AtlGetVersion [atl110.@] + */ +DWORD WINAPI AtlGetVersion(void *pReserved) +{ + return _ATL_VER; +} + +/********************************************************************** + * AtlAxWin class window procedure + */ +static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) +{ + if ( wMsg == WM_CREATE ) + { + DWORD len = GetWindowTextLengthW( hWnd ) + 1; + WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + if (!ptr) + return 1; + GetWindowTextW( hWnd, ptr, len ); + AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, ptr ); + return 0; + } + return DefWindowProcW( hWnd, wMsg, wParam, lParam ); +} + +BOOL WINAPI AtlAxWinInit(void) +{ + WNDCLASSEXW wcex; + const WCHAR AtlAxWin110[] = {'A','t','l','A','x','W','i','n','1','1','0',0}; + const WCHAR AtlAxWinLic110[] = {'A','t','l','A','x','W','i','n','L','i','c','1','1','0',0}; + + FIXME("semi-stub\n"); + + if ( FAILED( OleInitialize(NULL) ) ) + return FALSE; + + wcex.cbSize = sizeof(wcex); + wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = GetModuleHandleW( NULL ); + wcex.hIcon = NULL; + wcex.hCursor = NULL; + wcex.hbrBackground = NULL; + wcex.lpszMenuName = NULL; + wcex.hIconSm = 0; + + wcex.lpfnWndProc = AtlAxWin_wndproc; + wcex.lpszClassName = AtlAxWin110; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + wcex.lpszClassName = AtlAxWinLic110; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + return TRUE; +} diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec new file mode 100644 index 0000000..aed22bd --- /dev/null +++ b/dlls/atl110/atl110.spec @@ -0,0 +1,52 @@ +10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise +11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise +12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects +20 stub AtlComModuleRevokeClassObjects +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD +24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop +25 stub AtlSetErrorInfo +26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC +27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel +28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric +29 stub AtlDevModeW2A +30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface +34 stdcall AtlGetVersion(ptr) +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW +36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW +38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx +41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +42 stdcall AtlAxWinInit() +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData +44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData +45 stub AtlWinModuleRegisterWndClassInfoW +46 stub AtlWinModuleRegisterWndClassInfoA +47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl +48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load +53 stub AtlIPersistPropertyBag_Save +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib +58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc +59 stub AtlAxCreateControlLic +60 stub AtlAxCreateControlLicEx +61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +62 stub AtlWinModuleRegisterClassExW +63 stub AtlWinModuleRegisterClassExA +64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc +65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit +66 stub AtlWinModuleTerm +67 stdcall AtlSetPerUserRegistration(long) atl100.AtlSetPerUserRegistration +68 stdcall AtlGetPerUserRegistration(ptr) atl100.AtlGetPerUserRegistration diff --git a/include/atlbase.h b/include/atlbase.h index 1f91f55..660fbf5 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -29,6 +29,7 @@ #define _ATL_VER_70 0x0700 #define _ATL_VER_80 0x0800 #define _ATL_VER_100 0x0a00 +#define _ATL_VER_110 0x0b00 #ifndef _ATL_VER #define _ATL_VER _ATL_VER_100 diff --git a/tools/make_specfiles b/tools/make_specfiles index 1a57692..c0de805 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -115,6 +115,7 @@ my @dll_groups = ], [ "atl100", + "atl110", "atl", "atl80", ],

1 0

Jacek Caban : crypt32: Use CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL flag for root store certificate' s chain validation.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 9db146f54414f7ac812e33c0d0ed92bf11cc2296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db146f54414f7ac812e33c0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 3 14:14:27 2013 +0200 crypt32: Use CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL flag for root store certificate's chain validation. --- dlls/crypt32/rootstore.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 4e4e4e4..a6a4f34 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -256,9 +256,10 @@ static void check_and_store_certs(HCERTSTORE from, HCERTSTORE to) { CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; PCCERT_CHAIN_CONTEXT chain; - BOOL ret = CertGetCertificateChain(engine, cert, NULL, from, - &chainPara, 0, NULL, &chain); + BOOL ret; + ret = CertGetCertificateChain(engine, cert, NULL, from, + &chainPara, CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL, NULL, &chain); if (!ret) TRACE("rejecting %s: %s\n", get_cert_common_name(cert), "chain creation failed");

1 0