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

Maarten Lankhorst : mmdevapi: Add IMMEndpoint to IMMDevice.
by Alexandre Julliard March 15, 2010

March 15, 2010

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

Maarten Lankhorst : mmdevapi: Implement property store.
by Alexandre Julliard March 15, 2010

March 15, 2010

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

Detlef Riekenberg : msvcr80: Add msvcr80.dll with forwards to msvcrt.dll.
by Alexandre Julliard March 15, 2010

March 15, 2010

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

Yann Droneaud : cmd: Added some expansion tests.
by Alexandre Julliard March 15, 2010

March 15, 2010

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 March 15, 2010

March 15, 2010

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

Henri Verbeet : kernel32: Implement CheckRemoteDebuggerPresent().
by Alexandre Julliard March 15, 2010

March 15, 2010

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

Detlef Riekenberg : msvcr90: Add msvcr90.dll with forwards to msvcrt.dll.
by Alexandre Julliard March 15, 2010

March 15, 2010

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

Henri Verbeet : ntdll: Improve support for the ProcessDebugPort info class in NtQueryInformationProcess ().
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: f0a5045254111774130846bd7b56224c06a2b999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a5045254111774130846bd7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 14 21:53:27 2010 +0100 ntdll: Improve support for the ProcessDebugPort info class in NtQueryInformationProcess(). --- dlls/ntdll/process.c | 19 +++++++++- dlls/ntdll/tests/info.c | 83 ++++++++++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 4 +- server/process.c | 1 + server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 7 files changed, 107 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 9be1339..6fdceae 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -295,7 +295,24 @@ NTSTATUS WINAPI NtQueryInformationProcess( * set it to 0 aka "no debugger" to satisfy copy protections */ len = sizeof(DWORD_PTR); if (ProcessInformationLength == len) - memset(ProcessInformation, 0, ProcessInformationLength); + { + if (!ProcessInformation) + ret = STATUS_ACCESS_VIOLATION; + else if (!ProcessHandle) + ret = STATUS_INVALID_HANDLE; + else + { + SERVER_START_REQ(get_process_info) + { + req->handle = wine_server_obj_handle( ProcessHandle ); + if ((ret = wine_server_call( req )) == STATUS_SUCCESS) + { + *(DWORD_PTR *)ProcessInformation = reply->debugger_present ? ~(DWORD_PTR)0 : 0; + } + } + SERVER_END_REQ; + } + } else ret = STATUS_INFO_LENGTH_MISMATCH; break; diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c7d451c..a8e19f9 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -20,6 +20,7 @@ #include "ntdll_test.h" #include <winnls.h> +#include <stdio.h> static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -751,6 +752,78 @@ static void test_query_process_times(void) "Inconsistent length %d\n", ReturnLength); } +static void test_query_process_debug_port(int argc, char **argv) +{ + DWORD_PTR debug_port = 0xdeadbeef; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFO si = { 0 }; + NTSTATUS status; + BOOL ret; + + sprintf(cmdline, "%s %s %s", argv[0], argv[1], "debuggee"); + + si.cb = sizeof(si); + ret = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + if (!ret) return; + + status = pNtQueryInformationProcess(NULL, ProcessDebugPort, + NULL, 0, NULL); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status); + + status = pNtQueryInformationProcess(NULL, ProcessDebugPort, + NULL, sizeof(debug_port), NULL); + ok(status == STATUS_INVALID_HANDLE || status == STATUS_ACCESS_VIOLATION, + "Expected STATUS_INVALID_HANDLE, got %#x.\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort, + NULL, sizeof(debug_port), NULL); + ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + + status = pNtQueryInformationProcess(NULL, ProcessDebugPort, + &debug_port, sizeof(debug_port), NULL); + ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort, + &debug_port, sizeof(debug_port) - 1, NULL); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort, + &debug_port, sizeof(debug_port) + 1, NULL); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort, + &debug_port, sizeof(debug_port), NULL); + ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); + ok(debug_port == 0, "Expected port 0, got %#lx.\n", debug_port); + + status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugPort, + &debug_port, sizeof(debug_port), NULL); + ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); + ok(debug_port == ~(DWORD_PTR)0, "Expected port %#lx, got %#lx.\n", ~(DWORD_PTR)0, debug_port); + + for (;;) + { + DEBUG_EVENT ev; + + ret = WaitForDebugEvent(&ev, INFINITE); + ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError()); + if (!ret) break; + + if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; + + ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); + ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError()); + if (!ret) break; + } + + ret = CloseHandle(pi.hThread); + ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ret = CloseHandle(pi.hProcess); + ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); +} + static void test_query_process_handlecount(void) { NTSTATUS status; @@ -978,9 +1051,15 @@ static void test_affinity(void) START_TEST(info) { + char **argv; + int argc; + if(!InitFunctionPtrs()) return; + argc = winetest_get_mainargs(&argv); + if (argc >= 3) return; /* Child */ + /* NtQuerySystemInformation */ /* 0x0 SystemBasicInformation */ @@ -1049,6 +1128,10 @@ START_TEST(info) trace("Starting test_query_process_times()\n"); test_query_process_times(); + /* 0x7 ProcessDebugPort */ + trace("Starting test_process_debug_port()\n"); + test_query_process_debug_port(argc, argv); + /* 0x14 ProcessHandleCount */ trace("Starting test_query_process_handlecount()\n"); test_query_process_handlecount(); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 47c032e..0c3155d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -725,7 +725,7 @@ struct get_process_info_reply int exit_code; int priority; cpu_type_t cpu; - char __pad_60[4]; + int debugger_present; }; @@ -5397,6 +5397,6 @@ union generic_reply struct free_user_handle_reply free_user_handle_reply; }; -#define SERVER_PROTOCOL_VERSION 395 +#define SERVER_PROTOCOL_VERSION 396 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index e4dca68..36e462a 100644 --- a/server/process.c +++ b/server/process.c @@ -1091,6 +1091,7 @@ DECL_HANDLER(get_process_info) reply->start_time = process->start_time; reply->end_time = process->end_time; reply->cpu = process->cpu; + reply->debugger_present = !!process->debugger; release_object( process ); } } diff --git a/server/protocol.def b/server/protocol.def index 04f6e2b..e9c5cba 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -692,6 +692,7 @@ typedef union int exit_code; /* process exit code */ int priority; /* priority class */ cpu_type_t cpu; /* CPU that this process is running on */ + int debugger_present; /* process is being debugged */ @END diff --git a/server/request.h b/server/request.h index 41c6409..11382d8 100644 --- a/server/request.h +++ b/server/request.h @@ -697,6 +697,7 @@ C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, end_time) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 48 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 52 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, cpu) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, debugger_present) == 60 ); C_ASSERT( sizeof(struct get_process_info_reply) == 64 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, mask) == 16 ); diff --git a/server/trace.c b/server/trace.c index a250a2e..4b13ed5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1118,6 +1118,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority ); dump_cpu_type( ", cpu=", &req->cpu ); + fprintf( stderr, ", debugger_present=%d", req->debugger_present ); } static void dump_set_process_info_request( const struct set_process_info_request *req )

1 0

Henri Verbeet : d3dx9_36: Not implementing an interface is not an internal error.
by Alexandre Julliard March 15, 2010

March 15, 2010

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: Move device context array functions to device.c.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: 4b671f4d5471662b3ab98acb69ecc17778fd4978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b671f4d5471662b3ab98acb6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 14 21:53:25 2010 +0100 wined3d: Move device context array functions to device.c. --- dlls/wined3d/context.c | 94 +--------------------------------------- dlls/wined3d/device.c | 62 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 66 insertions(+), 92 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 428e670..c8dcb6e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -920,35 +920,6 @@ static void Context_MarkStateDirty(struct wined3d_context *context, DWORD state, context->isStateDirty[idx] |= (1 << shift); } -/***************************************************************************** - * AddContextToArray - * - * Adds a context to the context array. Helper function for context_create(). - * - * This method is not called in performance-critical code paths, only when a - * new render target or swapchain is created. Thus performance is not an issue - * here. - * - *****************************************************************************/ -static BOOL AddContextToArray(IWineD3DDeviceImpl *This, struct wined3d_context *context) -{ - struct wined3d_context **oldArray = This->contexts; - - This->contexts = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->contexts) * (This->numContexts + 1)); - if(This->contexts == NULL) { - ERR("Unable to grow the context array\n"); - This->contexts = oldArray; - return FALSE; - } - if(oldArray) { - memcpy(This->contexts, oldArray, sizeof(*This->contexts) * This->numContexts); - } - HeapFree(GetProcessHeap(), 0, oldArray); - This->contexts[This->numContexts++] = context; - - return TRUE; -} - /* This function takes care of WineD3D pixel format selection. */ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, const struct GlPixelFormatDesc *color_format_desc, const struct GlPixelFormatDesc *ds_format_desc, @@ -1289,7 +1260,7 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface goto out; } - if (!AddContextToArray(This, ret)) + if (!device_context_add(This, ret)) { ERR("Failed to add the newly created context to the context list\n"); if (!pwglDeleteContext(ctx)) @@ -1474,67 +1445,6 @@ out: } /***************************************************************************** - * RemoveContextFromArray - * - * Removes a context from the context manager. The opengl context is not - * destroyed or unset. context is not a valid pointer after that call. - * - * Similar to the former call this isn't a performance critical function. A - * helper function for context_destroy(). - * - * Params: - * This: Device to activate the context for - * context: Context to remove - * - *****************************************************************************/ -static void RemoveContextFromArray(IWineD3DDeviceImpl *This, struct wined3d_context *context) -{ - struct wined3d_context **new_array; - BOOL found = FALSE; - UINT i; - - TRACE("Removing ctx %p\n", context); - - for (i = 0; i < This->numContexts; ++i) - { - if (This->contexts[i] == context) - { - found = TRUE; - break; - } - } - - if (!found) - { - ERR("Context %p doesn't exist in context array\n", context); - return; - } - - while (i < This->numContexts - 1) - { - This->contexts[i] = This->contexts[i + 1]; - ++i; - } - - --This->numContexts; - if (!This->numContexts) - { - HeapFree(GetProcessHeap(), 0, This->contexts); - This->contexts = NULL; - return; - } - - new_array = HeapReAlloc(GetProcessHeap(), 0, This->contexts, This->numContexts * sizeof(*This->contexts)); - if (!new_array) - { - ERR("Failed to shrink context array. Oh well.\n"); - return; - } - - This->contexts = new_array; -} - -/***************************************************************************** * context_destroy * * Destroys a wined3d context @@ -1564,7 +1474,7 @@ void context_destroy(IWineD3DDeviceImpl *This, struct wined3d_context *context) HeapFree(GetProcessHeap(), 0, context->vshader_const_dirty); HeapFree(GetProcessHeap(), 0, context->pshader_const_dirty); - RemoveContextFromArray(This, context); + device_context_remove(This, context); if (destroy) HeapFree(GetProcessHeap(), 0, context); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2747517..38bde16 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -494,6 +494,68 @@ void device_preload_textures(IWineD3DDeviceImpl *device) } } +BOOL device_context_add(IWineD3DDeviceImpl *device, struct wined3d_context *context) +{ + struct wined3d_context **new_array; + + TRACE("Adding context %p.\n", context); + + if (!device->contexts) new_array = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_array)); + else new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts, sizeof(*new_array) * (device->numContexts + 1)); + + if (!new_array) + { + ERR("Failed to grow the context array.\n"); + return FALSE; + } + + new_array[device->numContexts++] = context; + device->contexts = new_array; + return TRUE; +} + +void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *context) +{ + struct wined3d_context **new_array; + BOOL found = FALSE; + UINT i; + + TRACE("Removing context %p.\n", context); + + for (i = 0; i < device->numContexts; ++i) + { + if (device->contexts[i] == context) + { + found = TRUE; + break; + } + } + + if (!found) + { + ERR("Context %p doesn't exist in context array.\n", context); + return; + } + + if (!--device->numContexts) + { + HeapFree(GetProcessHeap(), 0, device->contexts); + device->contexts = NULL; + return; + } + + memmove(&device->contexts[i], &device->contexts[i + 1], (device->numContexts - i) * sizeof(*device->contexts)); + new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts, device->numContexts * sizeof(*device->contexts)); + if (!new_array) + { + ERR("Failed to shrink context array. Oh well.\n"); + return; + } + + device->contexts = new_array; +} + + /********************************************************** * IUnknown parts follows **********************************************************/ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0537ff1..750b36e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1710,6 +1710,8 @@ struct IWineD3DDeviceImpl struct WineD3DRectPatch *currentPatch; }; +BOOL device_context_add(IWineD3DDeviceImpl *device, struct wined3d_context *context) DECLSPEC_HIDDEN; +void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, UINT adapter_idx, WINED3DDEVTYPE device_type, HWND focus_window, DWORD flags, IUnknown *parent, IWineD3DDeviceParent *device_parent) DECLSPEC_HIDDEN;

1 0