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

Henri Verbeet : wined3d: Don' t partially initialize contexts in AddContextToArray().
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 6ed7906852106f8bfbc86c4f253b36c208b26e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ed7906852106f8bfbc86c4f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 14 21:53:24 2010 +0100 wined3d: Don't partially initialize contexts in AddContextToArray(). Just add a context to the device's context array. --- dlls/wined3d/context.c | 91 +++++++++++++++++++++++------------------------- 1 files changed, 44 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5f2167a..428e670 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -929,51 +929,24 @@ static void Context_MarkStateDirty(struct wined3d_context *context, DWORD state, * new render target or swapchain is created. Thus performance is not an issue * here. * - * Params: - * This: Device to add the context for - * hdc: device context - * glCtx: WGL context to add - * *****************************************************************************/ -static struct wined3d_context *AddContextToArray(IWineD3DDeviceImpl *This, - HWND win_handle, HDC hdc, HGLRC glCtx) +static BOOL AddContextToArray(IWineD3DDeviceImpl *This, struct wined3d_context *context) { struct wined3d_context **oldArray = This->contexts; - DWORD state; 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 NULL; + return FALSE; } if(oldArray) { memcpy(This->contexts, oldArray, sizeof(*This->contexts) * This->numContexts); } - - This->contexts[This->numContexts] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**This->contexts)); - if(This->contexts[This->numContexts] == NULL) { - ERR("Unable to allocate a new context\n"); - HeapFree(GetProcessHeap(), 0, This->contexts); - This->contexts = oldArray; - return NULL; - } - - This->contexts[This->numContexts]->hdc = hdc; - This->contexts[This->numContexts]->glCtx = glCtx; - This->contexts[This->numContexts]->win_handle = win_handle; HeapFree(GetProcessHeap(), 0, oldArray); + This->contexts[This->numContexts++] = context; - /* Mark all states dirty to force a proper initialization of the states on the first use of the context - */ - for(state = 0; state <= STATE_HIGHEST; state++) { - if (This->StateTable[state].representative) - Context_MarkStateDirty(This->contexts[This->numContexts], state, This->StateTable); - } - - This->numContexts++; - TRACE("Created context %p\n", This->contexts[This->numContexts - 1]); - return This->contexts[This->numContexts - 1]; + return TRUE; } /* This function takes care of WineD3D pixel format selection. */ @@ -1168,12 +1141,13 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; const struct GlPixelFormatDesc *color_format_desc; const struct GlPixelFormatDesc *ds_format_desc; - struct wined3d_context *ret = NULL; + struct wined3d_context *ret; PIXELFORMATDESCRIPTOR pfd; BOOL auxBuffers = FALSE; int numSamples = 0; int pixel_format; unsigned int s; + DWORD state; HGLRC ctx; HDC hdc; int res; @@ -1181,6 +1155,13 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface TRACE("device %p, target %p, window %p, present parameters %p.\n", This, target, win_handle, pPresentParms); + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)); + if (!ret) + { + ERR("Failed to allocate context memory.\n"); + return NULL; + } + if (!(hdc = GetDC(win_handle))) { ERR("Failed to retrieve a device context.\n"); @@ -1249,7 +1230,7 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface if (!pixel_format) { ERR("Can't find a suitable pixel format.\n"); - return NULL; + goto out; } DescribePixelFormat(hdc, pixel_format, sizeof(pfd), &pfd); @@ -1274,7 +1255,7 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface if (!res) { ERR("wglSetPixelFormatWINE failed on HDC %p for pixel_format %d.\n", hdc, pixel_format); - return NULL; + goto out; } } else if (oldPixelFormat) @@ -1288,7 +1269,7 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface else { ERR("SetPixelFormat failed on HDC %p for pixel format %d.\n", hdc, pixel_format); - return NULL; + goto out; } } @@ -1307,8 +1288,9 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface ERR("Failed to create a WGL context\n"); goto out; } - ret = AddContextToArray(This, win_handle, hdc, ctx); - if(!ret) { + + if (!AddContextToArray(This, ret)) + { ERR("Failed to add the newly created context to the context list\n"); if (!pwglDeleteContext(ctx)) { @@ -1317,13 +1299,29 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface } goto out; } - ret->valid = 1; + ret->gl_info = &This->adapter->gl_info; + + /* Mark all states dirty to force a proper initialization of the states + * on the first use of the context. */ + for (state = 0; state <= STATE_HIGHEST; ++state) + { + if (This->StateTable[state].representative) + Context_MarkStateDirty(ret, state, This->StateTable); + } + ret->surface = (IWineD3DSurface *) target; ret->current_rt = (IWineD3DSurface *)target; + ret->tid = GetCurrentThreadId(); + ret->render_offscreen = surface_is_offscreen((IWineD3DSurface *) target); ret->draw_buffer_dirty = TRUE; - ret->tid = GetCurrentThreadId(); + ret->valid = 1; + + ret->glCtx = ctx; + ret->win_handle = win_handle; + ret->hdc = hdc; + if(This->shader_backend->shader_dirtifyable_constants((IWineD3DDevice *) This)) { /* Create the dirty constants array and initialize them to dirty */ ret->vshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, @@ -1462,17 +1460,16 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); + TRACE("Created context %p.\n", ret); + return ret; out: - if (ret) - { - HeapFree(GetProcessHeap(), 0, ret->free_event_queries); - HeapFree(GetProcessHeap(), 0, ret->free_occlusion_queries); - HeapFree(GetProcessHeap(), 0, ret->pshader_const_dirty); - HeapFree(GetProcessHeap(), 0, ret->vshader_const_dirty); - HeapFree(GetProcessHeap(), 0, ret); - } + HeapFree(GetProcessHeap(), 0, ret->free_event_queries); + HeapFree(GetProcessHeap(), 0, ret->free_occlusion_queries); + HeapFree(GetProcessHeap(), 0, ret->pshader_const_dirty); + HeapFree(GetProcessHeap(), 0, ret->vshader_const_dirty); + HeapFree(GetProcessHeap(), 0, ret); return NULL; }

1 0

Henri Verbeet : wined3d: Move device context array functions to device.c.
by Alexandre Julliard 15 Mar '10

15 Mar '10

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

Henri Verbeet : ntdll: Fix the ProcessDebugPort information length in NtQueryInformationProcess() .
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 4ce43cd919d9754de081c352bde8d286746b9765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce43cd919d9754de081c352b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 14 21:53:26 2010 +0100 ntdll: Fix the ProcessDebugPort information length in NtQueryInformationProcess(). --- dlls/ntdll/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index ba51df5..9be1339 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -293,7 +293,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( case ProcessDebugPort: /* "These are not the debuggers you are looking for." * * set it to 0 aka "no debugger" to satisfy copy protections */ - len = 4; + len = sizeof(DWORD_PTR); if (ProcessInformationLength == len) memset(ProcessInformation, 0, ProcessInformationLength); else

1 0

Henri Verbeet : ntdll: Improve support for the ProcessDebugPort info class in NtQueryInformationProcess ().
by Alexandre Julliard 15 Mar '10

15 Mar '10

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

Andrew Nguyen : dxdiagn: Fix string copy behavior with an excessively short buffer in IDxDiagContainer ::EnumPropNames.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: af28d72aafed672b815e5a69a0d14a46c75b730d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af28d72aafed672b815e5a69a… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Mar 14 16:36:53 2010 -0600 dxdiagn: Fix string copy behavior with an excessively short buffer in IDxDiagContainer::EnumPropNames. --- dlls/dxdiagn/container.c | 10 +++--- dlls/dxdiagn/tests/container.c | 62 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 6 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 3829bb8..0682145 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -196,16 +196,16 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, p = This->properties; while (NULL != p) { - if (dwIndex == i) { - if (cchPropName <= strlenW(p->vName)) { - return DXDIAG_E_INSUFFICIENT_BUFFER; - } + if (dwIndex == i) { + TRACE("Found property name %s, copying string\n", debugstr_w(p->vName)); lstrcpynW(pwszPropName, p->vName, cchPropName); - return S_OK; + return (cchPropName <= strlenW(p->vName)) ? + DXDIAG_E_INSUFFICIENT_BUFFER : S_OK; } p = p->next; ++i; } + TRACE("Failed to find property name at specified index\n"); return E_INVALIDARG; } diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index d1541e3..e525709 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -394,7 +394,6 @@ static void test_EnumPropNames(void) IDxDiagContainer *child = NULL; DWORD count, index, propcount; static const WCHAR testW[] = {'t','e','s','t',0}; - static const WCHAR zerotestW[] = {0,'e','s','t',0}; if (!create_root_IDxDiagContainer()) { @@ -460,6 +459,67 @@ static void test_EnumPropNames(void) ok(!memcmp(property, testW, sizeof(testW)), "Expected the property buffer to be unchanged, got %s\n", wine_dbgstr_w(property)); + trace("Starting property enumeration of the %s container:\n", wine_dbgstr_w(container)); + + /* We should be able to enumerate as many properties as the value that + * IDxDiagContainer::GetNumberOfProps returns. */ + for (index = 0; index <= propcount; index++) + { + /* A buffer size of 1 is unlikely to be valid, as only a null terminator + * could be stored, and it is unlikely that a property name could be empty. */ + DWORD buffersize = 1; + + memcpy(property, testW, sizeof(testW)); + hr = IDxDiagContainer_EnumPropNames(child, index, property, buffersize); + if (hr == E_INVALIDARG) + { + /* We should get here when index is one more than the maximum index value. */ + ok(propcount == index, + "Expected IDxDiagContainer::EnumPropNames to return E_INVALIDARG " + "on the last index %d, got 0x%08x\n", index, hr); + ok(!memcmp(property, testW, sizeof(testW)), + "Expected the property buffer to be unchanged, got %s\n", wine_dbgstr_w(property)); + break; + } + else if (hr == DXDIAG_E_INSUFFICIENT_BUFFER) + { + WCHAR temp[256]; + + ok(property[0] == '\0', + "Expected the property buffer string to be empty, got %s\n", wine_dbgstr_w(property)); + hr = IDxDiagContainer_EnumPropNames(child, index, temp, sizeof(temp)/sizeof(WCHAR)); + ok(hr == S_OK, + "Expected IDxDiagContainer::EnumPropNames to return S_OK, got 0x%08x\n", hr); + + /* Show that the DirectX SDK's stipulation that the buffer be at + * least 256 characters long is a mere suggestion, and smaller sizes + * can be acceptable also. IDxDiagContainer::EnumPropNames doesn't + * provide a way of getting the exact size required, so the buffersize + * value will be iterated to at most 256 characters. */ + for (buffersize = 2; buffersize <= 256; buffersize++) + { + memcpy(property, testW, sizeof(testW)); + hr = IDxDiagContainer_EnumPropNames(child, index, property, buffersize); + if (hr != DXDIAG_E_INSUFFICIENT_BUFFER) + break; + + ok(!memcmp(temp, property, sizeof(WCHAR)*(buffersize - 1)), + "Expected truncated property name string, got %s\n", wine_dbgstr_w(property)); + } + + ok(hr == S_OK, + "Expected IDxDiagContainer::EnumPropNames to return S_OK, " + "got hr = 0x%08x, buffersize = %d\n", hr, buffersize); + if (hr == S_OK) + trace("child[%d] = %s, length = %d\n", index, wine_dbgstr_w(property), buffersize); + } + else + { + ok(0, "IDxDiagContainer::EnumPropNames unexpectedly returned 0x%08x\n", hr); + break; + } + } + IDxDiagContainer_Release(child); cleanup:

1 0

Jeff Latimer : comctl32: cchTextMax needs to be set for LVS_OWNERDATA as it uses LVN_GETDISPINFO notifications .
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 4f20455e4c467d79a044558816a7cae90552b03e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f20455e4c467d79a04455881… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Mar 16 00:08:29 2010 +1100 comctl32: cchTextMax needs to be set for LVS_OWNERDATA as it uses LVN_GETDISPINFO notifications. --- dlls/comctl32/listview.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9afbf10..de85491 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5635,6 +5635,7 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem) static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL isW) { HWND hwndSelf = infoPtr->hwndSelf; + WCHAR szDispText[DISP_TEXT_SIZE] = { 0 }; NMLVDISPINFOW dispInfo; INT editedItem = infoPtr->nEditLabelItem; BOOL bSame; @@ -5665,7 +5666,9 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL dispInfo.item.iItem = editedItem; dispInfo.item.iSubItem = 0; dispInfo.item.stateMask = ~0; - if (!LISTVIEW_GetItemW(infoPtr, &dispInfo.item)) + dispInfo.item.pszText = szDispText; + dispInfo.item.cchTextMax = DISP_TEXT_SIZE; + if (!LISTVIEW_GetItemT(infoPtr, &dispInfo.item, isW)) { res = FALSE; goto cleanup;

1 0

Vincent Povirk : oleaut32: Return type mismatch errors in ITypeLibComp_fnBind.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: da409d6a7b3daa4a529e6657adbb4b6f90e95f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da409d6a7b3daa4a529e6657a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 12 14:54:46 2010 -0600 oleaut32: Return type mismatch errors in ITypeLibComp_fnBind. --- dlls/oleaut32/tests/typelib.c | 2 +- dlls/oleaut32/typelib.c | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 5f4d997..452ab7d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -150,7 +150,7 @@ static void test_TypeComp(void) /* test getting a function within a TKIND_MODULE with INVOKE_PROPERTYGET */ ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszSavePicture); hr = ITypeComp_Bind(pTypeComp, wszSavePicture, ulHash, INVOKE_PROPERTYGET, &pTypeInfo, &desckind, &bindptr); - todo_wine ok(hr == TYPE_E_TYPEMISMATCH, + ok(hr == TYPE_E_TYPEMISMATCH, "ITypeComp_Bind should have failed with TYPE_E_TYPEMISMATCH instead of 0x%08x\n", hr); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 445eac5..87aba81 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4722,6 +4722,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( { ITypeLibImpl *This = impl_from_ITypeComp(iface); ITypeInfoImpl *pTypeInfo; + int typemismatch=0; TRACE("(%s, 0x%x, 0x%x, %p, %p, %p)\n", debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); @@ -4761,6 +4762,8 @@ static HRESULT WINAPI ITypeLibComp_fnBind( TRACE("found in module or in enum: %s\n", debugstr_w(szName)); return S_OK; } + else if (hr == TYPE_E_TYPEMISMATCH) + typemismatch = 1; } if ((pTypeInfo->TypeAttr.typekind == TKIND_COCLASS) && @@ -4833,11 +4836,21 @@ static HRESULT WINAPI ITypeLibComp_fnBind( ITypeInfo_AddRef(*ppTInfo); return S_OK; } + else if (hr == TYPE_E_TYPEMISMATCH) + typemismatch = 1; } } - TRACE("name not found %s\n", debugstr_w(szName)); - return S_OK; + if (typemismatch) + { + TRACE("type mismatch %s\n", debugstr_w(szName)); + return TYPE_E_TYPEMISMATCH; + } + else + { + TRACE("name not found %s\n", debugstr_w(szName)); + return S_OK; + } } static HRESULT WINAPI ITypeLibComp_fnBindType(

1 0

Juan Lang : wininet: Handle proxy entries of the form <proto>=<proxy>, and allow multiple proxies.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: de6a0a86be0847713c58111db5dcc95bf7476d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de6a0a86be0847713c58111db… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Mar 13 09:36:46 2010 -0800 wininet: Handle proxy entries of the form <proto>=<proxy>, and allow multiple proxies. --- dlls/wininet/http.c | 13 ++++--- dlls/wininet/internet.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wininet/internet.h | 1 + 3 files changed, 101 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ab7e1da..f72cf3b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1343,9 +1343,12 @@ static WCHAR *HTTP_BuildProxyRequestUrl(http_request_t *req) static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *lpwhs, http_request_t *lpwhr) { WCHAR buf[MAXHOSTNAME]; + WCHAR protoProxy[MAXHOSTNAME + 15]; + DWORD protoProxyLen = sizeof(protoProxy) / sizeof(protoProxy[0]); WCHAR proxy[MAXHOSTNAME + 15]; /* 15 == "http://" + sizeof(port#) + ":/\0" */ static WCHAR szNul[] = { 0 }; URL_COMPONENTSW UrlComponents; + static const WCHAR protoHttp[] = { 'h','t','t','p',0 }; static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }; static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',0 }; @@ -1354,11 +1357,13 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *lpwhs, http_reque UrlComponents.lpszHostName = buf; UrlComponents.dwHostNameLength = MAXHOSTNAME; + if (!INTERNET_FindProxyForProtocol(hIC->lpszProxy, protoHttp, protoProxy, &protoProxyLen)) + return FALSE; if( CSTR_EQUAL != CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - hIC->lpszProxy,strlenW(szHttp),szHttp,strlenW(szHttp)) ) - sprintfW(proxy, szFormat, hIC->lpszProxy); + protoProxy,strlenW(szHttp),szHttp,strlenW(szHttp)) ) + sprintfW(proxy, szFormat, protoProxy); else - strcpyW(proxy, hIC->lpszProxy); + strcpyW(proxy, protoProxy); if( !InternetCrackUrlW(proxy, 0, 0, &UrlComponents) ) return FALSE; if( UrlComponents.dwHostNameLength == 0 ) @@ -4251,8 +4256,6 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, } if(hIC->lpszProxy && hIC->dwAccessType == INTERNET_OPEN_TYPE_PROXY) { - if(strchrW(hIC->lpszProxy, ' ')) - FIXME("Several proxies not implemented.\n"); if(hIC->lpszProxyBypass) FIXME("Proxy bypass is ignored.\n"); } diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d03d1b3..683a605 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -363,6 +363,98 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) } /*********************************************************************** + * INTERNET_FindProxyForProtocol + * + * Searches the proxy string for a proxy of the given protocol. + * Returns the found proxy, or the default proxy if none of the given + * protocol is found. + * + * PARAMETERS + * szProxy [In] proxy string to search + * proto [In] protocol to search for, e.g. "http" + * foundProxy [Out] found proxy + * foundProxyLen [In/Out] length of foundProxy buffer, in WCHARs + * + * RETURNS + * TRUE if a proxy is found, FALSE if not. If foundProxy is too short, + * *foundProxyLen is set to the required size in WCHARs, including the + * NULL terminator, and the last error is set to ERROR_INSUFFICIENT_BUFFER. + */ +BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundProxy, DWORD *foundProxyLen) +{ + LPCWSTR ptr; + BOOL ret = FALSE; + + TRACE("(%s, %s)\n", debugstr_w(szProxy), debugstr_w(proto)); + + /* First, look for the specified protocol (proto=scheme://host:port) */ + for (ptr = szProxy; !ret && ptr && *ptr; ) + { + LPCWSTR end, equal; + + if (!(end = strchrW(ptr, ' '))) + end = ptr + strlenW(ptr); + if ((equal = strchrW(ptr, '=')) && equal < end && + equal - ptr == strlenW(proto) && + !strncmpiW(proto, ptr, strlenW(proto))) + { + if (end - equal > *foundProxyLen) + { + WARN("buffer too short for %s\n", + debugstr_wn(equal + 1, end - equal - 1)); + *foundProxyLen = end - equal; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + } + else + { + memcpy(foundProxy, equal + 1, (end - equal) * sizeof(WCHAR)); + foundProxy[end - equal] = 0; + ret = TRUE; + } + } + if (*end == ' ') + ptr = end + 1; + else + ptr = end; + } + if (!ret) + { + /* It wasn't found: look for no protocol */ + for (ptr = szProxy; !ret && ptr && *ptr; ) + { + LPCWSTR end, equal; + + if (!(end = strchrW(ptr, ' '))) + end = ptr + strlenW(ptr); + if (!(equal = strchrW(ptr, '='))) + { + if (end - ptr + 1 > *foundProxyLen) + { + WARN("buffer too short for %s\n", + debugstr_wn(ptr, end - ptr)); + *foundProxyLen = end - ptr + 1; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + } + else + { + memcpy(foundProxy, ptr, (end - ptr) * sizeof(WCHAR)); + foundProxy[end - ptr] = 0; + ret = TRUE; + } + } + if (*end == ' ') + ptr = end + 1; + else + ptr = end; + } + } + if (ret) + TRACE("found proxy for %s: %s\n", debugstr_w(proto), + debugstr_w(foundProxy)); + return ret; +} + +/*********************************************************************** * InternetInitializeAutoProxyDll (WININET.@) * * Setup the internal proxy diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index cb6933c..6fdb5dc 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -418,6 +418,7 @@ VOID SendAsyncCallback(object_header_t *hdr, DWORD_PTR dwContext, VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo, DWORD dwStatusInfoLength); +BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundProxy, DWORD *foundProxyLen); BOOL NETCON_connected(WININET_NETCONNECTION *connection); DWORD NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL);

1 0

Henri Verbeet : server: Debugging our own process is disallowed.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 6c0ecd0955bc85c51802efe74f425fb64e2fd928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0ecd0955bc85c51802efe74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 14 21:53:19 2010 +0100 server: Debugging our own process is disallowed. --- dlls/kernel32/tests/debugger.c | 3 +++ server/debugger.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index d37217a..8d3a802 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -537,6 +537,9 @@ static void test_debug_loop(int argc, char **argv) } pid = GetCurrentProcessId(); + ret = DebugActiveProcess(pid); + ok(!ret, "DebugActiveProcess() succeeded on own process.\n"); + get_file_name(blackbox_file); cmd = HeapAlloc(GetProcessHeap(), 0, strlen(argv[0]) + strlen(arguments) + strlen(blackbox_file) + 10); sprintf(cmd, "%s%s%08x %s", argv[0], arguments, pid, blackbox_file); diff --git a/server/debugger.c b/server/debugger.c index 727f3be..533347c 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -421,6 +421,7 @@ void generate_debug_event( struct thread *thread, int code, const void *arg ) static int debugger_attach( struct process *process, struct thread *debugger ) { if (process->debugger) goto error; /* already being debugged */ + if (debugger->process == process) goto error; if (!is_process_init_done( process )) goto error; /* still starting up */ if (list_empty( &process->thread_list )) goto error; /* no thread running in the process */

1 0

Henri Verbeet : ddraw: Print unhandled vertex processing flags in IDirect3DExecuteBufferImpl_Execute ().
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: ae437ab5b8f10db2f67a8cf7853c962e37800779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae437ab5b8f10db2f67a8cf78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 14 21:53:20 2010 +0100 ddraw: Print unhandled vertex processing flags in IDirect3DExecuteBufferImpl_Execute(). --- dlls/ddraw/executebuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 129a0b8..29fd65e 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -489,7 +489,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, memcpy(dst, src, ci->dwCount * sizeof(D3DTLVERTEX)); } else { - ERR("Unhandled vertex processing !\n"); + ERR("Unhandled vertex processing flag %#x.\n", ci->dwFlags); } instr += size;

1 0