wine-commits November 2007

wine-commits@winehq.org

3 participants
757 discussions

Rob Shearman : server: Change the get_dll_info server request to allow retrieving the image file name of a process .
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: bf2a35b78d93fc5762d711fc889aca51eb01ea0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf2a35b78d93fc5762d711fc8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 20 09:30:50 2007 +0000 server: Change the get_dll_info server request to allow retrieving the image file name of a process. Implement NtQueryInformationProcess(ProcessImageFileName). --- dlls/ntdll/process.c | 22 +++++++++++++++++++++- dlls/ntdll/tests/info.c | 36 ++++++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 3 ++- server/process.c | 15 ++++++++++++--- server/protocol.def | 1 + server/trace.c | 1 + 6 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index b059c94..b5e6a64 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -137,7 +137,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( UNIMPLEMENTED_INFO_CLASS(ProcessDeviceMap); UNIMPLEMENTED_INFO_CLASS(ProcessSessionInformation); UNIMPLEMENTED_INFO_CLASS(ProcessForegroundInformation); - UNIMPLEMENTED_INFO_CLASS(ProcessImageFileName); UNIMPLEMENTED_INFO_CLASS(ProcessLUIDDeviceMapsEnabled); UNIMPLEMENTED_INFO_CLASS(ProcessBreakOnTermination); UNIMPLEMENTED_INFO_CLASS(ProcessDebugObjectHandle); @@ -309,6 +308,27 @@ NTSTATUS WINAPI NtQueryInformationProcess( } else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessImageFileName: + SERVER_START_REQ(get_dll_info) + { + UNICODE_STRING *image_file_name_str = ProcessInformation; + + req->handle = ProcessHandle; + req->base_address = NULL; /* main module */ + wine_server_set_reply( req, image_file_name_str ? image_file_name_str + 1 : NULL, + ProcessInformationLength > sizeof(UNICODE_STRING) ? ProcessInformationLength - sizeof(UNICODE_STRING) : 0 ); + ret = wine_server_call( req ); + if (ret == STATUS_BUFFER_TOO_SMALL) ret = STATUS_INFO_LENGTH_MISMATCH; + + len = sizeof(UNICODE_STRING) + reply->filename_len; + if (ret == STATUS_SUCCESS) + { + image_file_name_str->MaximumLength = image_file_name_str->Length = reply->filename_len; + image_file_name_str->Buffer = (PWSTR)(image_file_name_str + 1); + } + } + SERVER_END_REQ; + break; default: FIXME("(%p,info_class=%d,%p,0x%08x,%p) Unknown information class\n", ProcessHandle,ProcessInformationClass, diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 526c62e..08ab192 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -19,6 +19,7 @@ */ #include "ntdll_test.h" +#include <winnls.h> static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -754,6 +755,37 @@ static void test_query_process_handlecount(void) } } +static void test_query_process_image_file_name(void) +{ + DWORD status; + ULONG ReturnLength; + UNICODE_STRING image_file_name; + void *buffer; + char *file_nameA; + INT len; + + status = pNtQueryInformationProcess(NULL, ProcessImageFileName, &image_file_name, sizeof(image_file_name), NULL); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, &image_file_name, 2, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, &image_file_name, sizeof(image_file_name), &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + + buffer = HeapAlloc(GetProcessHeap(), 0, ReturnLength); + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, buffer, ReturnLength, &ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + memcpy(&image_file_name, buffer, sizeof(image_file_name)); + len = WideCharToMultiByte(CP_ACP, 0, image_file_name.Buffer, image_file_name.Length/sizeof(WCHAR), NULL, 0, NULL, NULL); + file_nameA = HeapAlloc(GetProcessHeap(), 0, len + 1); + WideCharToMultiByte(CP_ACP, 0, image_file_name.Buffer, image_file_name.Length/sizeof(WCHAR), file_nameA, len, NULL, NULL); + file_nameA[len] = '\0'; + HeapFree(GetProcessHeap(), 0, buffer); + trace("process image file name: %s\n", file_nameA); + HeapFree(GetProcessHeap(), 0, file_nameA); +} + static void test_readvirtualmemory(void) { @@ -886,6 +918,10 @@ START_TEST(info) trace("Starting test_query_process_handlecount()\n"); test_query_process_handlecount(); + /* 27 ProcessImageFileName */ + trace("Starting test_query_process_image_file_name()\n"); + test_query_process_image_file_name(); + /* belongs into it's own file */ trace("Starting test_readvirtualmemory()\n"); test_readvirtualmemory(); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9c56089..5564ae3 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -672,6 +672,7 @@ struct get_dll_info_reply struct reply_header __header; size_t size; void* entry_point; + data_size_t filename_len; /* VARARG(filename,unicode_str); */ }; @@ -4905,6 +4906,6 @@ union generic_reply struct add_fd_completion_reply add_fd_completion_reply; }; -#define SERVER_PROTOCOL_VERSION 331 +#define SERVER_PROTOCOL_VERSION 332 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index 7031e14..e276dc4 100644 --- a/server/process.c +++ b/server/process.c @@ -1129,16 +1129,25 @@ DECL_HANDLER(get_dll_info) if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_INFORMATION ))) { - struct process_dll *dll = find_process_dll( process, req->base_address ); + struct process_dll *dll; + + if (req->base_address) + dll = find_process_dll( process, req->base_address ); + else /* NULL means main module */ + dll = list_head( &process->dlls ) ? + LIST_ENTRY(list_head( &process->dlls ), struct process_dll, entry) : NULL; if (dll) { reply->size = dll->size; reply->entry_point = NULL; /* FIXME */ + reply->filename_len = dll->namelen; if (dll->filename) { - data_size_t len = min( dll->namelen, get_reply_max_size() ); - set_reply_data( dll->filename, len ); + if (dll->namelen <= get_reply_max_size()) + set_reply_data( dll->filename, dll->namelen ); + else + set_error( STATUS_BUFFER_TOO_SMALL ); } } else diff --git a/server/protocol.def b/server/protocol.def index dfb5d48..ae5f2ac 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -620,6 +620,7 @@ typedef union @REPLY size_t size; /* module size */ void* entry_point; + data_size_t filename_len; /* buffer len in bytes required to store filename */ VARARG(filename,unicode_str); /* file name of module */ @END diff --git a/server/trace.c b/server/trace.c index c580139..38a2991 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1004,6 +1004,7 @@ static void dump_get_dll_info_reply( const struct get_dll_info_reply *req ) { fprintf( stderr, " size=%lu,", (unsigned long)req->size ); fprintf( stderr, " entry_point=%p,", req->entry_point ); + fprintf( stderr, " filename_len=%u,", req->filename_len ); fprintf( stderr, " filename=" ); dump_varargs_unicode_str( cur_size ); }

1 0

Jacek Caban : mshtml: Change FIXME that is usually invalid to TRACE.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: b61bc4b92ec2951bdf2f3c2c23726f3d03e4efcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b61bc4b92ec2951bdf2f3c2c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 01:51:41 2007 +0100 mshtml: Change FIXME that is usually invalid to TRACE. --- dlls/mshtml/navigate.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 5e05a64..96369cb 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -647,8 +647,8 @@ static HRESULT WINAPI BSCServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { BSCallback *This = SERVPROV_THIS(iface); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); - return E_NOTIMPL; + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + return E_NOINTERFACE; } #undef SERVPROV_THIS

1 0

Jacek Caban : mshtml: Added more loading tests.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: 843703030af9344989944a01e8ba6bfbcab6367f URL: http://source.winehq.org/git/wine.git/?a=commit;h=843703030af9344989944a01e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 01:51:30 2007 +0100 mshtml: Added more loading tests. --- dlls/mshtml/tests/htmldoc.c | 169 ++++++++++++++++++++++++++++--------------- 1 files changed, 109 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=843703030af9344989944…

1 0

Jacek Caban : mshtml: Reload page in exec_editmode if available.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: 5d9e64554b69d7bb4065738985fbdfe4529c11cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9e64554b69d7bb406573898… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 01:51:03 2007 +0100 mshtml: Reload page in exec_editmode if available. --- dlls/mshtml/olecmd.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index db2d629..326b0b0 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -534,8 +534,6 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, IMoniker *mon; HRESULT hres; - static const WCHAR wszAboutBlank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); if(in || out) @@ -546,9 +544,20 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, This->usermode = EDITMODE; + if(This->mon) { + CLSID clsid = IID_NULL; + hres = IMoniker_GetClassID(This->mon, &clsid); + if(SUCCEEDED(hres)) { + /* We should use IMoniker::Save here */ + FIXME("Use CLSID %s\n", debugstr_guid(&clsid)); + } + } + if(This->frame) IOleInPlaceFrame_SetStatusText(This->frame, NULL); + This->readystate = READYSTATE_UNINITIALIZED; + if(This->client) { IOleCommandTarget *cmdtrg; @@ -581,14 +590,24 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if(This->nscontainer) set_ns_editmode(This->nscontainer); - hres = CreateURLMoniker(NULL, wszAboutBlank, &mon); - if(FAILED(hres)) { - FIXME("CreateURLMoniker failed: %08x\n", hres); - return hres; - } - update_doc(This, UPDATE_UI); + if(This->mon) { + /* FIXME: We should find nicer way to do this */ + remove_doc_tasks(This); + + mon = This->mon; + IMoniker_AddRef(mon); + }else { + static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; + + hres = CreateURLMoniker(NULL, about_blankW, &mon); + if(FAILED(hres)) { + FIXME("CreateURLMoniker failed: %08x\n", hres); + return hres; + } + } + hres = IPersistMoniker_Load(PERSISTMON(This), TRUE, mon, NULL, 0); IMoniker_Release(mon); if(FAILED(hres))

1 0

Jacek Caban : mshtml: Always initialize output in exec_fontname.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: 2702dfffbf40f473aafb7c4d26f842edc93af47d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2702dfffbf40f473aafb7c4d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 01:50:19 2007 +0100 mshtml: Always initialize output in exec_fontname. --- dlls/mshtml/editor.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 827fa07..53938e9 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -586,6 +586,9 @@ static HRESULT exec_fontname(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, DWORD len; nsresult nsres; + V_VT(out) = VT_BSTR; + V_BSTR(out) = NULL; + nsparam = create_nscommand_params(); nsres = get_ns_command_state(This->nscontainer, NSCMD_FONTFACE, nsparam); @@ -600,7 +603,6 @@ static HRESULT exec_fontname(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, MultiByteToWideChar(CP_ACP, 0, stra, -1, strw, -1); nsfree(stra); - V_VT(out) = VT_BSTR; V_BSTR(out) = SysAllocString(strw); mshtml_free(strw); }

1 0

Jacek Caban : mshtml: Use call_set_active_object in exec_editmode.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: ebc89a02d37dd0447bc2d4425b76ffd0fca9f886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc89a02d37dd0447bc2d4425… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 01:49:50 2007 +0100 mshtml: Use call_set_active_object in exec_editmode. --- dlls/mshtml/olecmd.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index b76ea31..db2d629 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -595,11 +595,10 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return hres; if(This->ui_active) { - OLECHAR wszHTMLDocument[30]; RECT rcBorderWidths; if(This->ip_window) - IOleInPlaceUIWindow_SetActiveObject(This->ip_window, NULL, NULL); + call_set_active_object(This->ip_window, NULL); if(This->hostui) IDocHostUIHandler_HideUI(This->hostui); @@ -607,11 +606,8 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This), This->frame, This->ip_window); - LoadStringW(hInst, IDS_HTMLDOCUMENT, wszHTMLDocument, - sizeof(wszHTMLDocument)/sizeof(WCHAR)); - if(This->ip_window) - IOleInPlaceUIWindow_SetActiveObject(This->ip_window, ACTOBJ(This), wszHTMLDocument); + call_set_active_object(This->ip_window, ACTOBJ(This)); memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths);

1 0

Jacek Caban : mshtml: Move IOleInPlaceFrame:: SetActiveObject call to separated function.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: 3f444cae92f5269ce3972abdfc8934ba7cbce83d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f444cae92f5269ce3972abdf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 01:49:36 2007 +0100 mshtml: Move IOleInPlaceFrame::SetActiveObject call to separated function. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/view.c | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a35347e..2bf926b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -398,6 +398,7 @@ BOOL install_wine_gecko(BOOL); void hlink_frame_navigate(HTMLDocument*,IHlinkFrame*,LPCWSTR,nsIInputStream*,DWORD); void call_property_onchanged(ConnectionPoint*,DISPID); +HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*); void *nsalloc(size_t); void nsfree(void*); diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index e1f13dc..5872091 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -415,6 +415,18 @@ void hide_tooltip(HTMLDocument *This) SendMessageW(This->tooltips_hwnd, TTM_ACTIVATE, FALSE, 0); } +HRESULT call_set_active_object(IOleInPlaceUIWindow *window, IOleInPlaceActiveObject *act_obj) +{ + static WCHAR html_documentW[30]; + + if(act_obj && !html_documentW[0]) { + LoadStringW(hInst, IDS_HTMLDOCUMENT, html_documentW, + sizeof(html_documentW)/sizeof(WCHAR)); + } + + return IOleInPlaceFrame_SetActiveObject(window, act_obj, act_obj ? html_documentW : NULL); +} + /********************************************************** * IOleDocumentView implementation */ @@ -564,7 +576,6 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f } if(fUIActivate) { - OLECHAR wszHTMLDocument[30]; RECT rcBorderWidths; if(This->ui_active) @@ -583,12 +594,9 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f update_doc(This, UPDATE_UI); - LoadStringW(hInst, IDS_HTMLDOCUMENT, wszHTMLDocument, - sizeof(wszHTMLDocument)/sizeof(WCHAR)); - hres = IOleInPlaceSite_OnUIActivate(This->ipsite); if(SUCCEEDED(hres)) { - IOleInPlaceFrame_SetActiveObject(This->frame, ACTOBJ(This), wszHTMLDocument); + call_set_active_object((IOleInPlaceUIWindow*)This->frame, ACTOBJ(This)); }else { FIXME("OnUIActivate failed: %08x\n", hres); IOleInPlaceFrame_Release(This->frame); @@ -604,7 +612,7 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f IDocHostUIHandler_HideUI(This->hostui); if(This->ip_window) - IOleInPlaceUIWindow_SetActiveObject(This->ip_window, ACTOBJ(This), wszHTMLDocument); + call_set_active_object(This->ip_window, ACTOBJ(This)); memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths); @@ -614,9 +622,9 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f if(This->ui_active) { This->ui_active = FALSE; if(This->ip_window) - IOleInPlaceUIWindow_SetActiveObject(This->ip_window, NULL, NULL); + call_set_active_object(This->ip_window, NULL); if(This->frame) - IOleInPlaceFrame_SetActiveObject(This->frame, NULL, NULL); + call_set_active_object((IOleInPlaceUIWindow*)This->frame, NULL); if(This->hostui) IDocHostUIHandler_HideUI(This->hostui); if(This->ipsite)

1 0

Stefan Dösinger : d3d9: Free the converted declaration data after creating the declaration.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: 22ac3704ba892edc58b63823a522ef733097bf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=22ac3704ba892edc58b63823a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 16 19:06:58 2007 +0100 d3d9: Free the converted declaration data after creating the declaration. --- dlls/d3d9/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 261a3ff..f4024a2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1128,6 +1128,7 @@ IDirect3DVertexDeclaration9 *getConvertedDecl(IDirect3DDevice9Impl *This, DWORD if (hr != S_OK) return NULL; hr = IDirect3DDevice9Impl_CreateVertexDeclaration((IDirect3DDevice9 *) This, elements, &pDecl); + HeapFree(GetProcessHeap(), 0, elements); /* CreateVertexDeclaration makes a copy */ if (hr != S_OK) return NULL; if(This->declArraySize == This->numConvertedDecls) {

1 0

Stefan Dösinger : d3d8: Destroy the window after the visual test.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: f0c479d6f712991ca466423610b59caa914a9beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c479d6f712991ca46642361… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 16 18:40:38 2007 +0100 d3d8: Destroy the window after the visual test. --- dlls/d3d8/tests/visual.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 744e623..d1e2192 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -800,5 +800,10 @@ START_TEST(visual) } cleanup: - if(device_ptr) IDirect3DDevice8_Release(device_ptr); + if(device_ptr) { + D3DDEVICE_CREATION_PARAMETERS creation_parameters; + IDirect3DDevice8_GetCreationParameters(device_ptr, &creation_parameters); + IDirect3DDevice8_Release(device_ptr); + DestroyWindow(creation_parameters.hFocusWindow); + } }

1 0

Stefan Dösinger : wined3d: Use standard wine lists for the resource list.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: 1fc1fe3c6e0ced257082262c6cc03e1a83fab544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc1fe3c6e0ced257082262c6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 16 20:28:45 2007 +0100 wined3d: Use standard wine lists for the resource list. --- dlls/wined3d/device.c | 56 ++++++++-------------------------------- dlls/wined3d/directx.c | 1 + dlls/wined3d/palette.c | 10 +++--- dlls/wined3d/resource.c | 9 +++--- dlls/wined3d/wined3d_private.h | 10 ++----- 5 files changed, 24 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index eb656bb..30ac0b7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -179,9 +179,9 @@ static ULONG WINAPI IWineD3DDeviceImpl_Release(IWineD3DDevice *iface) { /* NOTE: You must release the parent if the object was created via a callback ** ***************************/ - if (This->resources != NULL ) { + if (!list_empty(&This->resources)) { FIXME("(%p) Device released with resources still bound, acceptable but unexpected\n", This); - dumpResources(This->resources); + dumpResources(&This->resources); } if(This->contexts) ERR("Context array not freed!\n"); @@ -6622,18 +6622,18 @@ static BOOL WINAPI IWineD3DDeviceImpl_ShowCursor(IWineD3DDevice* iface, BOO static HRESULT WINAPI IWineD3DDeviceImpl_TestCooperativeLevel(IWineD3DDevice* iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + IWineD3DResourceImpl *resource; TRACE("(%p) : state (%u)\n", This, This->state); + /* TODO: Implement wrapping of the WndProc so that mimimize and maxamise can be monitored and the states adjusted. */ switch (This->state) { case WINED3D_OK: return WINED3D_OK; case WINED3DERR_DEVICELOST: { - ResourceList *resourceList = This->resources; - while (NULL != resourceList) { - if (((IWineD3DResourceImpl *)resourceList->resource)->resource.pool == WINED3DPOOL_DEFAULT /* TODO: IWineD3DResource_GetPool(resourceList->resource)*/) - return WINED3DERR_DEVICENOTRESET; - resourceList = resourceList->next; + LIST_FOR_EACH_ENTRY(resource, &This->resources, IWineD3DResourceImpl, resource.resource_list_entry) { + if (resource->resource.pool == WINED3DPOOL_DEFAULT) + return WINED3DERR_DEVICENOTRESET; } return WINED3DERR_DEVICELOST; } @@ -6876,51 +6876,17 @@ static void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT i *****************************************************/ static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResource *resource){ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - ResourceList* resourceList; - - TRACE("(%p) : resource %p\n", This, resource); - /* add a new texture to the frot of the linked list */ - resourceList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ResourceList)); - resourceList->resource = resource; - - /* Get the old head */ - resourceList->next = This->resources; - - This->resources = resourceList; - TRACE("Added resource %p with element %p pointing to %p\n", resource, resourceList, resourceList->next); - return; + TRACE("(%p) : Adding Resource %p\n", This, resource); + list_add_head(&This->resources, &((IWineD3DResourceImpl *) resource)->resource.resource_list_entry); } static void WINAPI IWineD3DDeviceImpl_RemoveResource(IWineD3DDevice *iface, IWineD3DResource *resource){ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - ResourceList* resourceList = NULL; - ResourceList* previousResourceList = NULL; - - TRACE("(%p) : resource %p\n", This, resource); - resourceList = This->resources; + TRACE("(%p) : Removing resource %p\n", This, resource); - while (resourceList != NULL) { - if(resourceList->resource == resource) break; - previousResourceList = resourceList; - resourceList = resourceList->next; - } - - if (resourceList == NULL) { - FIXME("Attempted to remove resource %p that hasn't been stored\n", resource); - return; - } else { - TRACE("Found resource %p with element %p pointing to %p (previous %p)\n", resourceList->resource, resourceList, resourceList->next, previousResourceList); - } - /* make sure we don't leave a hole in the list */ - if (previousResourceList != NULL) { - previousResourceList->next = resourceList->next; - } else { - This->resources = resourceList->next; - } - - return; + list_remove(&((IWineD3DResourceImpl *) resource)->resource.resource_list_entry); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8ed2d92..696ce10 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2695,6 +2695,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, object->adapter = numAdapters ? &Adapters[Adapter] : NULL; IWineD3D_AddRef(object->wineD3D); object->parent = parent; + list_init(&object->resources); if(This->dxVersion == 7) { object->surface_alignment = 8; diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index a1dcc9f..506b4fe 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -107,7 +107,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_GetEntries(IWineD3DPalette *iface, DW static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, DWORD Flags, DWORD Start, DWORD Count, PALETTEENTRY *PalEnt) { IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; - ResourceList *res; + IWineD3DResourceImpl *res; TRACE("(%p)->(%08x,%d,%d,%p)\n",This,Flags,Start,Count,PalEnt); @@ -134,11 +134,11 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, DW /* If the palette is attached to the render target, update all render targets */ - for(res = This->wineD3DDevice->resources; res != NULL; res=res->next) { - if(IWineD3DResource_GetType(res->resource) == WINED3DRTYPE_SURFACE) { - IWineD3DSurfaceImpl *impl = (IWineD3DSurfaceImpl *) res->resource; + LIST_FOR_EACH_ENTRY(res, &This->wineD3DDevice->resources, IWineD3DResourceImpl, resource.resource_list_entry) { + if(IWineD3DResource_GetType((IWineD3DResource *) res) == WINED3DRTYPE_SURFACE) { + IWineD3DSurfaceImpl *impl = (IWineD3DSurfaceImpl *) res; if(impl->palette == This) - IWineD3DSurface_RealizePalette( (IWineD3DSurface *) res->resource); + IWineD3DSurface_RealizePalette((IWineD3DSurface *) res); } } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 9faaea5..151af2c 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -248,12 +248,11 @@ HRESULT WINAPI IWineD3DResourceImpl_GetParent(IWineD3DResource *iface, IUnknown return WINED3D_OK; } -void dumpResources(ResourceList *resources) { - ResourceList *iterator = resources; +void dumpResources(struct list *list) { + IWineD3DResourceImpl *resource; - while(iterator) { - FIXME("Leftover resource %p with type %d,%s\n", iterator->resource, IWineD3DResource_GetType(iterator->resource), debug_d3dresourcetype(IWineD3DResource_GetType(iterator->resource))); - iterator = iterator->next; + LIST_FOR_EACH_ENTRY(resource, list, IWineD3DResourceImpl, resource.resource_list_entry) { + FIXME("Leftover resource %p with type %d,%s\n", resource, IWineD3DResource_GetType((IWineD3DResource *) resource), debug_d3dresourcetype(IWineD3DResource_GetType((IWineD3DResource *) resource))); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dbcff48..c77d2af 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -625,13 +625,8 @@ extern BOOL pbuffer_support; /* allocate one pbuffer per surface */ extern BOOL pbuffer_per_surface; -typedef struct ResourceList { - IWineD3DResource *resource; - struct ResourceList *next; -} ResourceList; - /* A helper function that dumps a resource list */ -void dumpResources(ResourceList *resources); +void dumpResources(struct list *list); /***************************************************************************** * IWineD3DDevice implementation structure @@ -681,7 +676,7 @@ struct IWineD3DDeviceImpl IWineD3DSwapChain **swapchains; UINT NumberOfSwapChains; - ResourceList *resources; /* a linked list to track resources created by the device */ + struct list resources; /* a linked list to track resources created by the device */ /* Render Target Support */ IWineD3DSurface **render_targets; @@ -821,6 +816,7 @@ typedef struct IWineD3DResourceClass BYTE *allocatedMemory; /* Pointer to the real data location */ BYTE *heapMemory; /* Pointer to the HeapAlloced block of memory */ struct list privateData; + struct list resource_list_entry; } IWineD3DResourceClass;

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2007