wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

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

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: 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 : 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 : 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

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

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

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

Henri Verbeet : d3dx9: Avoid LPCVOID.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 76e35a293957bdeafff54436f3b82ffb8f784d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76e35a293957bdeafff54436f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 3 09:47:25 2013 +0200 d3dx9: Avoid LPCVOID. --- dlls/d3dx9_36/d3dx9_36_private.h | 3 ++- dlls/d3dx9_36/effect.c | 8 ++++---- dlls/d3dx9_36/mesh.c | 13 +++++-------- dlls/d3dx9_36/shader.c | 7 ++++--- dlls/d3dx9_36/skin.c | 9 ++++----- dlls/d3dx9_36/tests/asm.c | 5 +++-- dlls/d3dx9_36/tests/effect.c | 12 ++++++------ dlls/d3dx9_36/tests/shader.c | 6 +++--- dlls/d3dx9_36/util.c | 8 ++++---- include/d3dx9effect.h | 8 ++++---- include/d3dx9mesh.h | 10 ++++++---- include/d3dx9shader.h | 2 +- include/d3dx9tex.h | 2 +- include/d3dx9xof.h | 4 ++-- 14 files changed, 49 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76e35a293957bdeafff54…

1 0

Henri Verbeet : d3dx9: Avoid LPSTR.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 77ee90b59fd790002086e9f259b671def6a74a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ee90b59fd790002086e9f25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 3 09:47:24 2013 +0200 d3dx9: Avoid LPSTR. --- dlls/d3dx9_36/effect.c | 10 +++++----- dlls/d3dx9_36/mesh.c | 14 ++++++++------ dlls/d3dx9_36/tests/mesh.c | 2 +- include/d3dx9anim.h | 4 ++-- include/d3dx9mesh.h | 6 +++--- include/d3dx9xof.h | 4 ++-- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5b9b05f..776c7c6 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -604,7 +604,7 @@ static void free_parameter_state(struct d3dx_parameter *param, BOOL element, BOO switch (param->type) { case D3DXPT_STRING: - HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + HeapFree(GetProcessHeap(), 0, *(char **)param->data); if (!child) HeapFree(GetProcessHeap(), 0, param->data); break; @@ -621,7 +621,7 @@ static void free_parameter_state(struct d3dx_parameter *param, BOOL element, BOO } else { - HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + HeapFree(GetProcessHeap(), 0, *(char **)param->data); } if (!child) HeapFree(GetProcessHeap(), 0, param->data); break; @@ -637,7 +637,7 @@ static void free_parameter_state(struct d3dx_parameter *param, BOOL element, BOO } else { - HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + HeapFree(GetProcessHeap(), 0, *(char **)param->data); } /* samplers have always own data, so free that */ HeapFree(GetProcessHeap(), 0, param->data); @@ -654,7 +654,7 @@ static void free_parameter_state(struct d3dx_parameter *param, BOOL element, BOO { if (st != ST_CONSTANT) { - HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + HeapFree(GetProcessHeap(), 0, *(char **)param->data); } HeapFree(GetProcessHeap(), 0, param->data); } @@ -4417,7 +4417,7 @@ static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr, { case D3DXPT_STRING: /* re-read with size (sizeof(DWORD) = 4) */ - hr = d3dx9_parse_name((LPSTR *)param->data, *ptr - 4); + hr = d3dx9_parse_name((char **)param->data, *ptr - 4); if (hr != D3D_OK) { WARN("Failed to parse string data\n"); diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 19c92b9..a735a35 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2638,7 +2638,7 @@ struct mesh_data { DWORD nb_bones; }; -static HRESULT parse_texture_filename(ID3DXFileData *filedata, LPSTR *filename_out) +static HRESULT parse_texture_filename(ID3DXFileData *filedata, char **filename_out) { HRESULT hr; SIZE_T data_size; @@ -2658,12 +2658,13 @@ static HRESULT parse_texture_filename(ID3DXFileData *filedata, LPSTR *filename_o if (FAILED(hr)) return hr; /* FIXME: String must be retrieved directly instead of through a pointer once ID3DXFILE is fixed */ - if (data_size < sizeof(LPSTR)) { + if (data_size < sizeof(filename_in)) + { WARN("truncated data (%lu bytes)\n", data_size); filedata->lpVtbl->Unlock(filedata); return E_FAIL; } - filename_in = *(LPSTR*)data; + filename_in = *(char **)data; filename = HeapAlloc(GetProcessHeap(), 0, strlen(filename_in) + 1); if (!filename) { @@ -3398,7 +3399,7 @@ static HRESULT generate_effects(ID3DXBuffer *materials, DWORD num_materials, for (j = 0; j < ARRAY_SIZE(material_effects); j++) { - defaults->pParamName = (LPSTR)out_ptr; + defaults->pParamName = (char *)out_ptr; strcpy(defaults->pParamName, material_effects[j].param_name); defaults->pValue = defaults->pParamName + material_effects[j].name_size; defaults->Type = D3DXEDT_FLOATS; @@ -3408,8 +3409,9 @@ static HRESULT generate_effects(ID3DXBuffer *materials, DWORD num_materials, defaults++; } - if (material_ptr->pTextureFilename) { - defaults->pParamName = (LPSTR)out_ptr; + if (material_ptr->pTextureFilename) + { + defaults->pParamName = (char *)out_ptr; strcpy(defaults->pParamName, texture_paramname); defaults->pValue = defaults->pParamName + sizeof(texture_paramname); defaults->Type = D3DXEDT_STRING; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index a2c3709..911fe63 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1781,7 +1781,7 @@ static void check_generated_effects_(int line, const D3DXMATERIAL *materials, DW static char *strdupA(const char *p) { - LPSTR ret; + char *ret; if (!p) return NULL; ret = HeapAlloc(GetProcessHeap(), 0, strlen(p) + 1); if (ret) strcpy(ret, p); diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 578d56d..e340328 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -92,7 +92,7 @@ typedef struct _D3DXMESHDATA typedef struct _D3DXMESHCONTAINER { - LPSTR Name; + char *Name; D3DXMESHDATA MeshData; LPD3DXMATERIAL pMaterials; LPD3DXEFFECTINSTANCE pEffects; @@ -104,7 +104,7 @@ typedef struct _D3DXMESHCONTAINER typedef struct _D3DXFRAME { - LPSTR Name; + char *Name; D3DXMATRIX TransformationMatrix; LPD3DXMESHCONTAINER pMeshContainer; struct _D3DXFRAME *pFrameSibling; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 864be69..b71fc33 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -193,12 +193,12 @@ typedef D3DXATTRIBUTERANGE* LPD3DXATTRIBUTERANGE; typedef struct _D3DXMATERIAL { D3DMATERIAL9 MatD3D; - LPSTR pTextureFilename; + char *pTextureFilename; } D3DXMATERIAL, *LPD3DXMATERIAL; typedef struct _D3DXEFFECTDEFAULT { - LPSTR pParamName; + char *pParamName; D3DXEFFECTDEFAULTTYPE Type; DWORD NumBytes; LPVOID pValue; @@ -206,7 +206,7 @@ typedef struct _D3DXEFFECTDEFAULT typedef struct _D3DXEFFECTINSTANCE { - LPSTR pEffectFilename; + char *pEffectFilename; DWORD NumDefaults; LPD3DXEFFECTDEFAULT pDefaults; } D3DXEFFECTINSTANCE, *LPD3DXEFFECTINSTANCE; diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index ff0fc3b..b15d9da 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -110,7 +110,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveData,IUnknown,"cef08cfb-7b4f-4429-9624-2a690 STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileSaveObject methods ***/ STDMETHOD(GetSave)(THIS_ ID3DXFileSaveObject **save_obj) PURE; - STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE; + STDMETHOD(GetName)(THIS_ char *name, SIZE_T *size) PURE; STDMETHOD(GetId)(THIS_ LPGUID) PURE; STDMETHOD(GetType)(THIS_ GUID*) PURE; STDMETHOD(AddDataObject)(THIS_ REFGUID template_guid, const char *name, const GUID *guid, @@ -145,7 +145,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileData,IUnknown,"cef08cfd-7b4f-4429-9624-2a690a933 STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileData methods ***/ STDMETHOD(GetEnum)(THIS_ ID3DXFileEnumObject **enum_obj) PURE; - STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE; + STDMETHOD(GetName)(THIS_ char *name, SIZE_T *size) PURE; STDMETHOD(GetId)(THIS_ LPGUID) PURE; STDMETHOD(Lock)(THIS_ SIZE_T*, LPCVOID*) PURE; STDMETHOD(Unlock)(THIS) PURE;

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2013