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

Józef Kucia : wined3d: Recognize SM4.1 sampleinfo opcode.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: f8a3124bf654516b3f94a9a97ddff66ec712eda3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a3124bf654516b3f94a9a97… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 15 11:16:22 2016 +0200 wined3d: Recognize SM4.1 sampleinfo opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 12 ++++++++++-- dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ab3c793..1760d6f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5359,6 +5359,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_SAMPLE_C */ NULL, /* WINED3DSIH_SAMPLE_C_LZ */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, + /* WINED3DSIH_SAMPLE_INFO */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL, /* WINED3DSIH_SAMPLE_POS */ NULL, /* WINED3DSIH_SETP */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2099d6e..ef3adbd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8777,6 +8777,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SAMPLE_C */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_C_LZ */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_GRAD */ shader_glsl_sample, + /* WINED3DSIH_SAMPLE_INFO */ NULL, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_POS */ NULL, /* WINED3DSIH_SETP */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5b6c22a..7ccc1d4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -189,6 +189,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_SAMPLE_C */ "sample_c", /* WINED3DSIH_SAMPLE_C_LZ */ "sample_c_lz", /* WINED3DSIH_SAMPLE_GRAD */ "sample_d", + /* WINED3DSIH_SAMPLE_INFO */ "sample_info", /* WINED3DSIH_SAMPLE_LOD */ "sample_l", /* WINED3DSIH_SAMPLE_POS */ "sample_pos", /* WINED3DSIH_SETP */ "setp", @@ -2420,8 +2421,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe { shader_addline(&buffer, "p"); } - else if (ins.handler_idx == WINED3DSIH_RESINFO - && ins.flags) + else if (ins.handler_idx == WINED3DSIH_RESINFO && ins.flags) { switch (ins.flags) { @@ -2430,6 +2430,14 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe default: shader_addline(&buffer, "_unrecognized(%#x)", ins.flags); } } + else if (ins.handler_idx == WINED3DSIH_SAMPLE_INFO && ins.flags) + { + switch (ins.flags) + { + case WINED3DSI_SAMPLE_INFO_UINT: shader_addline(&buffer, "_uint"); break; + default: shader_addline(&buffer, "_unrecognized(%#x)", ins.flags); + } + } if (wined3d_shader_instruction_has_texel_offset(&ins)) shader_addline(&buffer, "(%d,%d,%d)", ins.texel_offset.u, ins.texel_offset.v, ins.texel_offset.w); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 063770e..7b82bbb 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -206,6 +206,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_LOD = 0x6c, WINED3D_SM4_OP_GATHER4 = 0x6d, WINED3D_SM4_OP_SAMPLE_POS = 0x6e, + WINED3D_SM4_OP_SAMPLE_INFO = 0x6f, WINED3D_SM5_OP_HS_DECLS = 0x71, WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72, WINED3D_SM5_OP_HS_FORK_PHASE = 0x73, @@ -806,6 +807,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_LOD, WINED3DSIH_LOD, "f", "fRS"}, {WINED3D_SM4_OP_GATHER4, WINED3DSIH_GATHER4, "u", "fRS"}, {WINED3D_SM4_OP_SAMPLE_POS, WINED3DSIH_SAMPLE_POS, "f", "Ru"}, + {WINED3D_SM4_OP_SAMPLE_INFO, WINED3DSIH_SAMPLE_INFO, "f", "R"}, {WINED3D_SM5_OP_HS_DECLS, WINED3DSIH_HS_DECLS, "", ""}, {WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_CONTROL_POINT_PHASE, "", ""}, {WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0cbae86..0450181 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -495,6 +495,7 @@ enum wined3d_tessellator_partitioning #define WINED3DSI_INDEXED_DYNAMIC 0x4 #define WINED3DSI_RESINFO_RCP_FLOAT 0x1 #define WINED3DSI_RESINFO_UINT 0x2 +#define WINED3DSI_SAMPLE_INFO_UINT 0x1 #define WINED3DSI_SAMPLER_COMPARISON_MODE 0x1 enum wined3d_shader_rel_op @@ -705,6 +706,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_SAMPLE_C, WINED3DSIH_SAMPLE_C_LZ, WINED3DSIH_SAMPLE_GRAD, + WINED3DSIH_SAMPLE_INFO, WINED3DSIH_SAMPLE_LOD, WINED3DSIH_SAMPLE_POS, WINED3DSIH_SETP,

1 0

Michael Stefaniuc : avifil32: Use atomic operations to manipulate the refcount.
by Alexandre Julliard 15 Jul '16

15 Jul '16

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

1 0

Michael Stefaniuc : avifil32: Clean up the IClassFactory creation.
by Alexandre Julliard 15 Jul '16

15 Jul '16

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

1 0

Michael Stefaniuc : avifil32: Avoid using the LPCLASSFACTORY COM iface type.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 5dc2626ba4b22eb6cb48aea129d4851e559529de URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dc2626ba4b22eb6cb48aea12… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 10:07:53 2016 +0200 avifil32: Avoid using the LPCLASSFACTORY COM iface type. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/factory.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 8ada02b..30fa604 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -53,8 +53,8 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); } -static HRESULT WINAPI IClassFactory_fnQueryInterface(LPCLASSFACTORY iface, - REFIID riid,LPVOID *ppobj) +static HRESULT WINAPI IClassFactory_fnQueryInterface(IClassFactory *iface, REFIID riid, + void **ppobj) { TRACE("(%p,%p,%p)\n", iface, riid, ppobj); @@ -90,9 +90,8 @@ static ULONG WINAPI IClassFactory_fnRelease(IClassFactory *iface) return ref; } -static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface, - LPUNKNOWN pOuter, - REFIID riid,LPVOID *ppobj) +static HRESULT WINAPI IClassFactory_fnCreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) { IClassFactoryImpl *This = impl_from_IClassFactory(iface); @@ -122,7 +121,7 @@ static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface, return E_NOINTERFACE; } -static HRESULT WINAPI IClassFactory_fnLockServer(LPCLASSFACTORY iface,BOOL dolock) +static HRESULT WINAPI IClassFactory_fnLockServer(IClassFactory *iface, BOOL dolock) { TRACE("(%p,%d)\n",iface,dolock);

1 0

Sebastian Lackner : kernel32/tests: Use inline implementation of NtCurrentTeb for debugger tests.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 4e0edaac1fa82272821a8d8e9ad96e4601e8e4b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0edaac1fa82272821a8d8e9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jul 12 00:35:51 2016 +0200 kernel32/tests: Use inline implementation of NtCurrentTeb for debugger tests. Also enable BeingDebugged PEB tests on x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 73320c6..82faf3f 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -39,7 +39,6 @@ static BOOL (WINAPI *pCheckRemoteDebuggerPresent)(HANDLE,PBOOL); static BOOL (WINAPI *pDebugActiveProcessStop)(DWORD); static BOOL (WINAPI *pDebugSetProcessKillOnExit)(BOOL); static BOOL (WINAPI *pIsDebuggerPresent)(void); -static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static LONG child_failures; @@ -579,18 +578,15 @@ static void doChild(int argc, char **argv) child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); child_ok(debug, "Expected debug != 0, got %#x.\n", debug); - if (pNtCurrentTeb) - { - pNtCurrentTeb()->Peb->BeingDebugged = FALSE; + NtCurrentTeb()->Peb->BeingDebugged = FALSE; - ret = pIsDebuggerPresent(); - child_ok(!ret, "Expected ret != 0, got %#x.\n", ret); - ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug); - child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); - child_ok(debug, "Expected debug != 0, got %#x.\n", debug); + ret = pIsDebuggerPresent(); + child_ok(!ret, "Expected ret != 0, got %#x.\n", ret); + ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug); + child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); + child_ok(debug, "Expected debug != 0, got %#x.\n", debug); - pNtCurrentTeb()->Peb->BeingDebugged = TRUE; - } + NtCurrentTeb()->Peb->BeingDebugged = TRUE; blackbox.failures = child_failures; save_blackbox(blackbox_file, &blackbox, sizeof(blackbox)); @@ -815,8 +811,6 @@ START_TEST(debugger) pDebugActiveProcessStop=(void*)GetProcAddress(hdll, "DebugActiveProcessStop"); pDebugSetProcessKillOnExit=(void*)GetProcAddress(hdll, "DebugSetProcessKillOnExit"); pIsDebuggerPresent=(void*)GetProcAddress(hdll, "IsDebuggerPresent"); - hdll=GetModuleHandleA("ntdll.dll"); - if (hdll) pNtCurrentTeb = (void*)GetProcAddress(hdll, "NtCurrentTeb"); myARGC=winetest_get_mainargs(&myARGV); if (myARGC >= 3 && strcmp(myARGV[2], "crash") == 0)

1 0

Sebastian Lackner : ntdll/tests: Use inline implementation of NtCurrentTeb for exception tests.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 8e8e03de63495586ac2c34d673a6162817aa36f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e8e03de63495586ac2c34d67… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jul 12 00:38:09 2016 +0200 ntdll/tests: Use inline implementation of NtCurrentTeb for exception tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 64f3dff..a086436 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -38,7 +38,6 @@ static void *code_mem; -static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pNtSetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pRtlRaiseException)(EXCEPTION_RECORD *rec); @@ -241,16 +240,16 @@ static void run_exception_test(void *handler, const void* context, DWORD oldaccess, oldaccess2; exc_frame.frame.Handler = handler; - exc_frame.frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; + exc_frame.frame.Prev = NtCurrentTeb()->Tib.ExceptionList; exc_frame.context = context; memcpy(code_mem, code, code_size); if(access) VirtualProtect(code_mem, code_size, access, &oldaccess); - pNtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; + NtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; func(); - pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; + NtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; if(access) VirtualProtect(code_mem, code_size, oldaccess, &oldaccess2); @@ -266,7 +265,7 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce ok(rec->ExceptionAddress == (char *)code_mem + 0xb, "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0xb); - if (pNtCurrentTeb()->Peb->BeingDebugged) + if (NtCurrentTeb()->Peb->BeingDebugged) ok((void *)context->Eax == pRtlRaiseException || broken( is_wow64 && context->Eax == 0xf00f00f1 ), /* broken on vista */ "debugger managed to modify Eax to %x should be %p\n", @@ -363,11 +362,11 @@ static void run_rtlraiseexception_test(DWORD exceptioncode) record.NumberParameters = 0; frame.Handler = rtlraiseexception_handler; - frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; + frame.Prev = NtCurrentTeb()->Tib.ExceptionList; memcpy(code_mem, call_one_arg_code, sizeof(call_one_arg_code)); - pNtCurrentTeb()->Tib.ExceptionList = &frame; + NtCurrentTeb()->Tib.ExceptionList = &frame; if (have_vectored_api) { vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &rtlraiseexception_vectored_handler); @@ -380,7 +379,7 @@ static void run_rtlraiseexception_test(DWORD exceptioncode) if (have_vectored_api) pRtlRemoveVectoredExceptionHandler(vectored_handler); - pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; + NtCurrentTeb()->Tib.ExceptionList = frame.Prev; } static void test_rtlraiseexception(void) @@ -448,30 +447,30 @@ static void test_unwind(void) /* add first unwind handler */ frame1->Handler = unwind_handler; - frame1->Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = frame1; + frame1->Prev = NtCurrentTeb()->Tib.ExceptionList; + NtCurrentTeb()->Tib.ExceptionList = frame1; /* add second unwind handler */ frame2->Handler = unwind_handler; - frame2->Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = frame2; + frame2->Prev = NtCurrentTeb()->Tib.ExceptionList; + NtCurrentTeb()->Tib.ExceptionList = frame2; /* test unwind to current frame */ unwind_expected_eax = 0xDEAD0000; retval = func(pRtlUnwind, frame2, NULL, 0xDEAD0000); ok(retval == 0xDEAD0000, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0000); - ok(pNtCurrentTeb()->Tib.ExceptionList == frame2, "Exception record points to %p instead of %p\n", - pNtCurrentTeb()->Tib.ExceptionList, frame2); + ok(NtCurrentTeb()->Tib.ExceptionList == frame2, "Exception record points to %p instead of %p\n", + NtCurrentTeb()->Tib.ExceptionList, frame2); /* unwind to frame1 */ unwind_expected_eax = 0xDEAD0000; retval = func(pRtlUnwind, frame1, NULL, 0xDEAD0000); ok(retval == 0xDEAD0001, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0001); - ok(pNtCurrentTeb()->Tib.ExceptionList == frame1, "Exception record points to %p instead of %p\n", - pNtCurrentTeb()->Tib.ExceptionList, frame1); + ok(NtCurrentTeb()->Tib.ExceptionList == frame1, "Exception record points to %p instead of %p\n", + NtCurrentTeb()->Tib.ExceptionList, frame1); /* restore original handler */ - pNtCurrentTeb()->Tib.ExceptionList = frame1->Prev; + NtCurrentTeb()->Tib.ExceptionList = frame1->Prev; } static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, @@ -861,7 +860,7 @@ static void test_debugger(void) if (de.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT) { - if(de.u.CreateProcessInfo.lpBaseOfImage != pNtCurrentTeb()->Peb->ImageBaseAddress) + if(de.u.CreateProcessInfo.lpBaseOfImage != NtCurrentTeb()->Peb->ImageBaseAddress) { skip("child process loaded at different address, terminating it\n"); pNtTerminateProcess(pi.hProcess, 0); @@ -2163,7 +2162,6 @@ START_TEST(exception) return; } - pNtCurrentTeb = (void *)GetProcAddress( hntdll, "NtCurrentTeb" ); pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); @@ -2185,11 +2183,6 @@ START_TEST(exception) pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); #ifdef __i386__ - if (!pNtCurrentTeb) - { - skip( "NtCurrentTeb not found\n" ); - return; - } if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; if (pRtlAddVectoredExceptionHandler && pRtlRemoveVectoredExceptionHandler) @@ -2210,7 +2203,7 @@ START_TEST(exception) } /* child must be run under a debugger */ - if (!pNtCurrentTeb()->Peb->BeingDebugged) + if (!NtCurrentTeb()->Peb->BeingDebugged) { ok(FALSE, "child process not being debugged?\n"); return;

1 0

Sebastian Lackner : ntdll/tests: Use inline implementation of NtCurrentTeb for rtl tests.
by Alexandre Julliard 15 Jul '16

15 Jul '16

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

1 0

Sebastian Lackner : opengl32/tests: Include wgl.h and remove duplicate declarations.
by Alexandre Julliard 15 Jul '16

15 Jul '16

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

1 0

Austin English : include: Add more NTE_* definitions.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: d0bc3a25c3168b49c1598a3f9843114559af2bba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0bc3a25c3168b49c1598a3f9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jul 13 02:05:28 2016 -0500 include: Add more NTE_* definitions. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index ba9e245..9c1b7f1 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2639,6 +2639,16 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define NTE_TOKEN_KEYSET_STORAGE_FULL _HRESULT_TYPEDEF_(0x80090023) #define NTE_TEMPORARY_PROFILE _HRESULT_TYPEDEF_(0x80090024) #define NTE_FIXEDPARAMETER _HRESULT_TYPEDEF_(0x80090025) +#define NTE_INVALID_HANDLE _HRESULT_TYPEDEF_(0x80090026) +#define NTE_INVALID_PARAMETER _HRESULT_TYPEDEF_(0x80090027) +#define NTE_BUFFER_TOO_SMALL _HRESULT_TYPEDEF_(0x80090028) +#define NTE_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80090029) +#define NTE_NO_MORE_ITEMS _HRESULT_TYPEDEF_(0x8009002A) +#define NTE_BUFFERS_OVERLAP _HRESULT_TYPEDEF_(0x8009002B) +#define NTE_DECRYPTION_FAILURE _HRESULT_TYPEDEF_(0x8009002C) +#define NTE_INTERNAL_ERROR _HRESULT_TYPEDEF_(0x8009002D) +#define NTE_UI_REQUIRED _HRESULT_TYPEDEF_(0x8009002E) +#define NTE_HMAC_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x8009002F) #define NTE_OP_OK _HRESULT_TYPEDEF_(0) #define SEC_E_INSUFFICIENT_MEMORY _HRESULT_TYPEDEF_(0x80090300)

1 0

Austin English : include: Add initial ncrypt.h.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 6cd6e96259142e6fcdd6772383d3890288e1c0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd6e96259142e6fcdd677238… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jul 13 18:17:57 2016 +0200 include: Add initial ncrypt.h. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ncrypt.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 18c3383..9c20f28a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -504,6 +504,7 @@ HEADER_SRCS = \ msxml6did.h \ msxmldid.h \ nb30.h \ + ncrypt.h \ ndrtypes.h \ netioapi.h \ nldef.h \ diff --git a/include/ncrypt.h b/include/ncrypt.h new file mode 100644 index 0000000..2bfdae0 --- /dev/null +++ b/include/ncrypt.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2016 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __NCRYPT_H__ +#define __NCRYPT_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef WINAPI +#define WINAPI __stdcall +#endif + +#ifndef __SECSTATUS_DEFINED__ +typedef LONG SECURITY_STATUS; +#define __SECSTATUS_DEFINED__ +#endif + +typedef ULONG_PTR NCRYPT_HANDLE; +typedef ULONG_PTR NCRYPT_PROV_HANDLE; +typedef ULONG_PTR NCRYPT_KEY_HANDLE; +typedef ULONG_PTR NCRYPT_HASH_HANDLE; +typedef ULONG_PTR NCRYPT_SECRET_HANDLE; + +SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, const WCHAR *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); +SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); +SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE, DWORD); +SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE); +SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); + +#ifdef __cplusplus +} +#endif + +#endif /* __NCRYPT_H__ */

1 0