March 2010 - Wine-commits - list.winehq.org

Henri Verbeet : kernel32: Implement CheckRemoteDebuggerPresent().
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: ef058b3030db46601b5a4a532c481da116ce32d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef058b3030db46601b5a4a532… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 14 21:53:28 2010 +0100 kernel32: Implement CheckRemoteDebuggerPresent(). --- dlls/kernel32/debugger.c | 16 ++++++++++++- dlls/kernel32/tests/debugger.c | 44 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index d732d8b..e9b5992 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -21,6 +21,8 @@ #include <stdio.h> #include <string.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "winerror.h" #include "wine/server.h" #include "kernel_private.h" @@ -432,13 +434,23 @@ BOOL WINAPI IsDebuggerPresent(void) */ BOOL WINAPI CheckRemoteDebuggerPresent(HANDLE process, PBOOL DebuggerPresent) { + NTSTATUS status; + DWORD_PTR port; + if(!process || !DebuggerPresent) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - FIXME("(%p)->(%p): Stub!\n", process, DebuggerPresent); - *DebuggerPresent = FALSE; + + status = NtQueryInformationProcess(process, ProcessDebugPort, &port, sizeof(port), NULL); + if (status != STATUS_SUCCESS) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + + *DebuggerPresent = !!port; return TRUE; } diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 8d3a802..057b977 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -44,6 +44,7 @@ static char** myARGV; static BOOL (WINAPI *pCheckRemoteDebuggerPresent)(HANDLE,PBOOL); static BOOL (WINAPI *pDebugActiveProcessStop)(DWORD); static BOOL (WINAPI *pDebugSetProcessKillOnExit)(BOOL); +static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static LONG child_failures; @@ -498,6 +499,7 @@ static void doChild(int argc, char **argv) const char *blackbox_file; HANDLE parent; DWORD ppid; + BOOL debug; BOOL ret; blackbox_file = argv[4]; @@ -506,15 +508,46 @@ static void doChild(int argc, char **argv) parent = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, ppid); child_ok(!!parent, "OpenProcess failed, last error %#x.\n", GetLastError()); + ret = pCheckRemoteDebuggerPresent(parent, &debug); + child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); + child_ok(!debug, "Expected debug == 0, got %#x.\n", debug); + ret = DebugActiveProcess(ppid); child_ok(ret, "DebugActiveProcess failed, last error %#x.\n", GetLastError()); + ret = pCheckRemoteDebuggerPresent(parent, &debug); + child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); + child_ok(debug, "Expected debug != 0, got %#x.\n", debug); + ret = pDebugActiveProcessStop(ppid); child_ok(ret, "DebugActiveProcessStop failed, last error %#x.\n", GetLastError()); + ret = pCheckRemoteDebuggerPresent(parent, &debug); + child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); + child_ok(!debug, "Expected debug == 0, got %#x.\n", debug); + ret = CloseHandle(parent); child_ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ret = IsDebuggerPresent(); + 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); + + if (pNtCurrentTeb) + { + pNtCurrentTeb()->Peb->BeingDebugged = FALSE; + + ret = IsDebuggerPresent(); + 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; + } + blackbox.failures = child_failures; save_blackbox(blackbox_file, &blackbox, sizeof(blackbox)); } @@ -526,13 +559,14 @@ static void test_debug_loop(int argc, char **argv) char blackbox_file[MAX_PATH]; PROCESS_INFORMATION pi; STARTUPINFOA si; + BOOL debug; DWORD pid; char *cmd; BOOL ret; - if (!pDebugActiveProcessStop) + if (!pDebugActiveProcessStop || !pCheckRemoteDebuggerPresent) { - win_skip("DebugActiveProcessStop not available, skipping test.\n"); + win_skip("DebugActiveProcessStop or CheckRemoteDebuggerPresent not available, skipping test.\n"); return; } @@ -551,6 +585,10 @@ static void test_debug_loop(int argc, char **argv) HeapFree(GetProcessHeap(), 0, cmd); + ret = pCheckRemoteDebuggerPresent(pi.hProcess, &debug); + ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); + ok(debug, "Expected debug != 0, got %#x.\n", debug); + for (;;) { DEBUG_EVENT ev; @@ -586,6 +624,8 @@ START_TEST(debugger) pCheckRemoteDebuggerPresent=(void*)GetProcAddress(hdll, "CheckRemoteDebuggerPresent"); pDebugActiveProcessStop=(void*)GetProcAddress(hdll, "DebugActiveProcessStop"); pDebugSetProcessKillOnExit=(void*)GetProcAddress(hdll, "DebugSetProcessKillOnExit"); + hdll=GetModuleHandle("ntdll.dll"); + if (hdll) pNtCurrentTeb = (void*)GetProcAddress(hdll, "NtCurrentTeb"); myARGC=winetest_get_mainargs(&myARGV); if (myARGC >= 3 && strcmp(myARGV[2], "crash") == 0)

1 0

Yann Droneaud : cmd: Added some expansion tests.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 9bad2febf30f5484516a238fb907e9c001f510d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bad2febf30f5484516a238fb… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Tue Mar 9 13:15:35 2010 +0100 cmd: Added some expansion tests. --- programs/cmd/tests/test_builtins.cmd | 15 +++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 15 +++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index ed2b75b..e346ffa 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -23,6 +23,21 @@ cd dummydir echo %~dp0 cd .. rmdir dummydir +echo %CD% +echo %% +echo P% +echo %P +echo %UNKNOWN%S +echo P%UNKNOWN% +echo P%UNKNOWN%S +echo %ERRORLEVEL +echo %ERRORLEVEL% +echo %ERRORLEVEL%%ERRORLEVEL% +echo %ERRORLEVEL%% +echo %ERRORLEVEL%%% +echo P%ERRORLEVEL% +echo %ERRORLEVEL%S +echo P%ERRORLEVEL%S echo ------------ Testing if/else -------------- echo if/else should work with blocks diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2c0e980..a8b2fc0 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -16,6 +16,21 @@ bar ~dp0 should be directory containing batch file @pwd@\ @pwd@\ +(a)pwd@ +% +P +P +S +P +PS +ERRORLEVEL +0 +00 +0 +0% +P0 +0S +P0S ------------ Testing if/else -------------- if/else should work with blocks if seems to work

1 0

Detlef Riekenberg : msvcr70: Add msvcr70.dll with forwards to msvcrt.dll.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 83178a4fd2baaab6b080e05b275470f97fe9a3a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83178a4fd2baaab6b080e05b2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Mar 13 01:42:54 2010 +0100 msvcr70: Add msvcr70.dll with forwards to msvcrt.dll. --- configure | 9 + configure.ac | 1 + dlls/msvcr70/Makefile.in | 14 + dlls/msvcr70/msvcr70.c | 37 ++ dlls/msvcr70/msvcr70.spec | 841 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 902 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83178a4fd2baaab6b080e…

1 0

Detlef Riekenberg : msvcr80: Add msvcr80.dll with forwards to msvcrt.dll.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: a949a700d22b510da703386faa7a4f6165a8e6f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a949a700d22b510da703386fa… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 12 19:22:25 2010 +0100 msvcr80: Add msvcr80.dll with forwards to msvcrt.dll. --- configure | 9 + configure.ac | 1 + dlls/msvcr80/Makefile.in | 14 + dlls/msvcr80/msvcr80.c | 37 ++ dlls/msvcr80/msvcr80.spec | 1468 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 1529 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a949a700d22b510da7033…

1 0

Detlef Riekenberg : msvcr90: Add msvcr90.dll with forwards to msvcrt.dll.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: c8195ebdb9298c8ac2aeb1335dfca9a107f0ad54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8195ebdb9298c8ac2aeb1335… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 12 17:25:50 2010 +0100 msvcr90: Add msvcr90.dll with forwards to msvcrt.dll. --- configure | 9 + configure.ac | 1 + dlls/msvcr90/Makefile.in | 14 + dlls/msvcr90/msvcr90.c | 37 ++ dlls/msvcr90/msvcr90.spec | 1452 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 1513 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8195ebdb9298c8ac2aeb…

1 0

Maarten Lankhorst : mmdevapi: Implement property store.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 90c30b3ad1104a55cfb7e7672e20ced60e12decb URL: http://source.winehq.org/git/wine.git/?a=commit;h=90c30b3ad1104a55cfb7e7672… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 21 14:06:37 2010 +0100 mmdevapi: Implement property store. --- dlls/mmdevapi/devenum.c | 336 +++++++++++++++++++++++++++++++++++++++++++++- dlls/mmdevapi/mmdevapi.h | 3 + 2 files changed, 334 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90c30b3ad1104a55cfb7e…

1 0

Maarten Lankhorst : mmdevapi: Add IMMEndpoint to IMMDevice.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 99f3ee3804b85226e7df8332f49747dc6c43928f URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f3ee3804b85226e7df8332f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 21 14:16:20 2010 +0100 mmdevapi: Add IMMEndpoint to IMMDevice. --- dlls/mmdevapi/devenum.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mmdevapi/mmdevapi.h | 1 + 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 452384b..32a337a 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -84,7 +84,7 @@ static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl; static const IMMDeviceCollectionVtbl MMDevColVtbl; static const IMMDeviceVtbl MMDeviceVtbl; static const IPropertyStoreVtbl MMDevPropVtbl; - +static const IMMEndpointVtbl MMEndpointVtbl; typedef struct MMDevColImpl { @@ -138,6 +138,7 @@ static void MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD state, } lstrcpyW(cur->alname, name); cur->lpVtbl = &MMDeviceVtbl; + cur->lpEndpointVtbl = &MMEndpointVtbl; cur->ref = 0; InitializeCriticalSection(&cur->crst); cur->crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": MMDevice.crst"); @@ -215,6 +216,8 @@ static HRESULT WINAPI MMDevice_QueryInterface(IMMDevice *iface, REFIID riid, voi if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMMDevice)) *ppv = This; + else if (IsEqualIID(riid, &IID_IMMEndpoint)) + *ppv = &This->lpEndpointVtbl; if (*ppv) { IUnknown_AddRef((IUnknown*)*ppv); @@ -303,6 +306,46 @@ static const IMMDeviceVtbl MMDeviceVtbl = MMDevice_GetState }; +static MMDevice *get_this_from_endpoint(IMMEndpoint *iface) +{ + return (MMDevice*)((char*)iface - offsetof(MMDevice,lpEndpointVtbl)); +} + +static HRESULT WINAPI MMEndpoint_QueryInterface(IMMEndpoint *iface, REFIID riid, void **ppv) +{ + MMDevice *This = get_this_from_endpoint(iface); + return IMMDevice_QueryInterface((IMMDevice*)This, riid, ppv); +} + +static ULONG WINAPI MMEndpoint_AddRef(IMMEndpoint *iface) +{ + MMDevice *This = get_this_from_endpoint(iface); + return IMMDevice_AddRef((IMMDevice*)This); +} + +static ULONG WINAPI MMEndpoint_Release(IMMEndpoint *iface) +{ + MMDevice *This = get_this_from_endpoint(iface); + return IMMDevice_Release((IMMDevice*)This); +} + +static HRESULT WINAPI MMEndpoint_GetDataFlow(IMMEndpoint *iface, EDataFlow *flow) +{ + MMDevice *This = get_this_from_endpoint(iface); + if (!flow) + return E_POINTER; + *flow = This->flow; + return S_OK; +} + +static const IMMEndpointVtbl MMEndpointVtbl = +{ + MMEndpoint_QueryInterface, + MMEndpoint_AddRef, + MMEndpoint_Release, + MMEndpoint_GetDataFlow +}; + static HRESULT MMDevCol_Create(IMMDeviceCollection **ppv, EDataFlow flow, DWORD state) { MMDevColImpl *This; diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 15ba4ae..cc4b3f2 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -24,6 +24,7 @@ extern HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERT typedef struct MMDevice { const IMMDeviceVtbl *lpVtbl; + const IMMEndpointVtbl *lpEndpointVtbl; LONG ref; CRITICAL_SECTION crst;

1 0

Henri Verbeet : d3dx9_36: ID3DXBuffer is a base interface for ID3DXConstantTable.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: d85730c8e35817b1563d5f8d8279296e3e319f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d85730c8e35817b1563d5f8d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 14 21:53:21 2010 +0100 d3dx9_36: ID3DXBuffer is a base interface for ID3DXConstantTable. --- dlls/d3dx9_36/shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c65f674..6cad032 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -291,6 +291,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable* TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ID3DXBuffer) || IsEqualGUID(riid, &IID_ID3DXConstantTable)) { ID3DXConstantTable_AddRef(iface);

1 0

Henri Verbeet : d3dx9_36: Not implementing an interface is not an internal error.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: a8b76781bf8c3770d40e7e9935d9e8d95f2f1382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b76781bf8c3770d40e7e993… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 14 21:53:22 2010 +0100 d3dx9_36: Not implementing an interface is not an internal error. --- dlls/d3dx9_36/math.c | 2 +- dlls/d3dx9_36/shader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index c2193c8..eb29573 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -793,7 +793,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *ifac return S_OK; } *ppobj = NULL; - ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + WARN("(%p)->(%s,%p), not found\n", This, debugstr_guid(riid), ppobj); return E_NOINTERFACE; } diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 6cad032..b9deec1 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -299,7 +299,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable* return S_OK; } - ERR("Interface %s not found\n", debugstr_guid(riid)); + WARN("Interface %s not found.\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Henri Verbeet : wined3d: Kill pbuffer offscreen rendering support.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 8a107bc63a4c6f55026a4174afda440c90e64f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a107bc63a4c6f55026a4174a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 14 21:53:23 2010 +0100 wined3d: Kill pbuffer offscreen rendering support. Our pbuffer support is broken, nobody cares. --- dlls/wined3d/context.c | 342 ++++++++++++++-------------------------- dlls/wined3d/device.c | 17 +-- dlls/wined3d/directx.c | 48 ++---- dlls/wined3d/surface.c | 2 - dlls/wined3d/swapchain.c | 6 +- dlls/wined3d/wined3d_gl.h | 26 --- dlls/wined3d/wined3d_main.c | 5 - dlls/wined3d/wined3d_private.h | 12 +- 8 files changed, 139 insertions(+), 319 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a107bc63a4c6f55026a4…

1 0