October 2012 - Wine-Commits

Alexandre Julliard : winex11: Refuse to set the pixel format for HWND_MESSAGE windows.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 53806917a3fc32460201a40a9edd6d8d24983c25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53806917a3fc32460201a40a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 18:14:15 2012 +0200 winex11: Refuse to set the pixel format for HWND_MESSAGE windows. --- dlls/winex11.drv/opengl.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 6945bd1..96954cc 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1196,6 +1196,7 @@ static void free_gl_drawable( struct gl_drawable *gl ) */ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) { + HWND parent = GetAncestor( hwnd, GA_PARENT ); XSetWindowAttributes attrib; struct gl_drawable *gl, *prev; int format; @@ -1215,9 +1216,9 @@ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) gl->rect.right = min( max( 1, gl->rect.right ), 65535 ); gl->rect.bottom = min( max( 1, gl->rect.bottom ), 65535 ); - if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ + if (parent == GetDesktopWindow()) /* top-level window */ { - Window parent = X11DRV_get_whole_window( hwnd ); + Window xparent = X11DRV_get_whole_window( hwnd ); gl->type = DC_GL_WINDOW; gl->colormap = XCreateColormap( gdi_display, root_window, gl->visual->visual, @@ -1230,8 +1231,8 @@ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) attrib.backing_store = NotUseful; /* put the initial rect outside of the window, it will be moved into place by SetWindowPos */ OffsetRect( &gl->rect, gl->rect.right, gl->rect.bottom ); - if (parent) - gl->drawable = XCreateWindow( gdi_display, parent, gl->rect.left, gl->rect.top, + if (xparent) + gl->drawable = XCreateWindow( gdi_display, xparent, gl->rect.left, gl->rect.top, gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, 0, default_visual.depth, InputOutput, gl->visual->visual, CWBitGravity | CWWinGravity | CWBackingStore | CWColormap, @@ -1241,6 +1242,10 @@ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) else XFreeColormap( gdi_display, gl->colormap ); } + else if (!GetAncestor( parent, GA_PARENT )) + { + FIXME( "can't set format of HWND_MESSAGE window %p\n", hwnd ); + } #ifdef SONAME_LIBXCOMPOSITE else if(usexcomposite) {

1 0

Alexandre Julliard : ntoskrnl.exe: Add missing WINAPIs.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: b560c56f3f33d0048fc069a5b1938c2f2b0c7236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b560c56f3f33d0048fc069a5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 18:37:28 2012 +0200 ntoskrnl.exe: Add missing WINAPIs. --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a127551..632cea5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1493,8 +1493,8 @@ PVOID WINAPI MmMapIoSpace( PHYSICAL_ADDRESS PhysicalAddress, DWORD NumberOfBytes /*********************************************************************** * MmMapLockedPagesSpecifyCache (NTOSKRNL.EXE.@) */ -PVOID MmMapLockedPagesSpecifyCache(PMDLX MemoryDescriptorList, KPROCESSOR_MODE AccessMode, MEMORY_CACHING_TYPE CacheType, - PVOID BaseAddress, ULONG BugCheckOnFailure, MM_PAGE_PRIORITY Priority) +PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDLX MemoryDescriptorList, KPROCESSOR_MODE AccessMode, MEMORY_CACHING_TYPE CacheType, + PVOID BaseAddress, ULONG BugCheckOnFailure, MM_PAGE_PRIORITY Priority) { FIXME("(%p, %u, %u, %p, %u, %u): stub\n", MemoryDescriptorList, AccessMode, CacheType, BaseAddress, BugCheckOnFailure, Priority); @@ -1515,7 +1515,7 @@ PVOID WINAPI MmPageEntireDriver(PVOID AddrInSection) /*********************************************************************** * MmProbeAndLockPages (NTOSKRNL.EXE.@) */ -void MmProbeAndLockPages(PMDLX MemoryDescriptorList, KPROCESSOR_MODE AccessMode, LOCK_OPERATION Operation) +void WINAPI MmProbeAndLockPages(PMDLX MemoryDescriptorList, KPROCESSOR_MODE AccessMode, LOCK_OPERATION Operation) { FIXME("(%p, %u, %u): stub\n", MemoryDescriptorList, AccessMode, Operation); } @@ -1533,7 +1533,7 @@ void WINAPI MmResetDriverPaging(PVOID AddrInSection) /*********************************************************************** * MmUnlockPages (NTOSKRNL.EXE.@) */ -void MmUnlockPages(PMDLX MemoryDescriptorList) +void WINAPI MmUnlockPages(PMDLX MemoryDescriptorList) { FIXME("(%p): stub\n", MemoryDescriptorList); }

1 0

Jacek Caban : mshtml: Added support for script 'for' and 'event' attributes .
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: d40b1ae8dc7285eabedf9bafadd90137231be0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d40b1ae8dc7285eabedf9bafa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:46:20 2012 +0200 mshtml: Added support for script 'for' and 'event' attributes. --- dlls/mshtml/htmldoc3.c | 2 +- dlls/mshtml/htmlevent.c | 15 +++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/mutation.c | 1 + dlls/mshtml/script.c | 212 ++++++++++++++++++++++++++++++++++++++++-- 6 files changed, 225 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d40b1ae8dc7285eabedf9…

1 0

Jacek Caban : mshtml: Store information if script was already parsed in script element object.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 4503edd614da9c75644ab7c5005e0f9857aae0bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4503edd614da9c75644ab7c50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:45:40 2012 +0200 mshtml: Store information if script was already parsed in script element object. --- dlls/mshtml/htmlscript.c | 22 ++++++++++++++-------- dlls/mshtml/mshtml_private.h | 13 ++++++++++++- dlls/mshtml/mutation.c | 11 +++++++++-- dlls/mshtml/script.c | 36 +++++++++++++++++++----------------- 4 files changed, 54 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 99478ea..d6241ae 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -32,14 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { - HTMLElement element; - - IHTMLScriptElement IHTMLScriptElement_iface; - - nsIDOMHTMLScriptElement *nsscript; -} HTMLScriptElement; - static inline HTMLScriptElement *impl_from_IHTMLScriptElement(IHTMLScriptElement *iface) { return CONTAINING_RECORD(iface, HTMLScriptElement, IHTMLScriptElement_iface); @@ -327,6 +319,20 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLScriptElement_get_readystate }; +HRESULT script_elem_from_nsscript(HTMLDocumentNode *doc, nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret) +{ + HTMLDOMNode *node; + HRESULT hres; + + hres = get_node(doc, (nsIDOMNode*)nsscript, TRUE, &node); + if(FAILED(hres)) + return hres; + + assert(node->vtbl == &HTMLScriptElementImplVtbl); + *ret = impl_from_HTMLDOMNode(node); + return S_OK; +} + static const tid_t HTMLScriptElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLScriptElement_tid, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e26b594..9cdc410 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -741,6 +741,17 @@ void init_binding_ui(HTMLDocumentObj*) DECLSPEC_HIDDEN; void HTMLDocumentNode_SecMgr_Init(HTMLDocumentNode*) DECLSPEC_HIDDEN; +typedef struct { + HTMLElement element; + + IHTMLScriptElement IHTMLScriptElement_iface; + + nsIDOMHTMLScriptElement *nsscript; + BOOL parsed; +} HTMLScriptElement; + +HRESULT script_elem_from_nsscript(HTMLDocumentNode*,nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; + HRESULT HTMLCurrentStyle_Create(HTMLElement*,IHTMLCurrentStyle**) DECLSPEC_HIDDEN; void ConnectionPoint_Init(ConnectionPoint*,ConnectionPointContainer*,REFIID,cp_static_data_t*) DECLSPEC_HIDDEN; @@ -904,7 +915,7 @@ HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN; void release_script_hosts(HTMLInnerWindow*) DECLSPEC_HIDDEN; void connect_scripts(HTMLInnerWindow*) DECLSPEC_HIDDEN; -void doc_insert_script(HTMLInnerWindow*,nsIDOMHTMLScriptElement*) DECLSPEC_HIDDEN; +void doc_insert_script(HTMLInnerWindow*,HTMLScriptElement*) DECLSPEC_HIDDEN; IDispatch *script_parse_event(HTMLInnerWindow*,LPCWSTR) DECLSPEC_HIDDEN; HRESULT exec_script(HTMLInnerWindow*,const WCHAR*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; void set_script_mode(HTMLOuterWindow*,SCRIPTMODE) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 129094e..7b8bf89 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -294,8 +294,10 @@ static nsresult run_end_load(HTMLDocumentNode *This, nsISupports *arg1, nsISuppo static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_iface, nsISupports *parser_iface) { nsIDOMHTMLScriptElement *nsscript; + HTMLScriptElement *script_elem; nsIParser *nsparser = NULL; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", doc, script_iface); @@ -313,17 +315,22 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa } } + hres = script_elem_from_nsscript(doc, nsscript, &script_elem); + nsIDOMHTMLScriptElement_Release(nsscript); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + if(nsparser) nsIParser_BeginEvaluatingParserInsertedScript(nsparser); - doc_insert_script(doc->window, nsscript); + doc_insert_script(doc->window, script_elem); if(nsparser) { nsIParser_EndEvaluatingParserInsertedScript(nsparser); nsIParser_Release(nsparser); } - nsIDOMHTMLScriptElement_Release(nsscript); + IHTMLScriptElement_Release(&script_elem->IHTMLScriptElement_iface); return NS_OK; } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 823c7b3..ceb88d7 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -731,34 +731,34 @@ static void parse_extern_script(ScriptHost *script_host, LPCWSTR src) heap_free(text); } -static void parse_inline_script(ScriptHost *script_host, nsIDOMHTMLScriptElement *nsscript) +static void parse_inline_script(ScriptHost *script_host, HTMLScriptElement *script_elem) { const PRUnichar *text; nsAString text_str; nsresult nsres; nsAString_Init(&text_str, NULL); + nsres = nsIDOMHTMLScriptElement_GetText(script_elem->nsscript, &text_str); + nsAString_GetData(&text_str, &text); - nsres = nsIDOMHTMLScriptElement_GetText(nsscript, &text_str); - - if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&text_str, &text); - parse_text(script_host, text); - }else { + if(NS_FAILED(nsres)) { ERR("GetText failed: %08x\n", nsres); + }else if(*text) { + script_elem->parsed = TRUE; + parse_text(script_host, text); } nsAString_Finish(&text_str); } -static void parse_script_elem(ScriptHost *script_host, nsIDOMHTMLScriptElement *nsscript) +static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script_elem) { nsAString src_str, event_str; const PRUnichar *src; nsresult nsres; nsAString_Init(&event_str, NULL); - nsres = nsIDOMHTMLScriptElement_GetEvent(nsscript, &event_str); + nsres = nsIDOMHTMLScriptElement_GetEvent(script_elem->nsscript, &event_str); if(NS_SUCCEEDED(nsres)) { const PRUnichar *event; @@ -774,15 +774,17 @@ static void parse_script_elem(ScriptHost *script_host, nsIDOMHTMLScriptElement * nsAString_Finish(&event_str); nsAString_Init(&src_str, NULL); - nsres = nsIDOMHTMLScriptElement_GetSrc(nsscript, &src_str); + nsres = nsIDOMHTMLScriptElement_GetSrc(script_elem->nsscript, &src_str); nsAString_GetData(&src_str, &src); - if(NS_FAILED(nsres)) + if(NS_FAILED(nsres)) { ERR("GetSrc failed: %08x\n", nsres); - else if(*src) + }else if(*src) { + script_elem->parsed = TRUE; parse_extern_script(script_host, src); - else - parse_inline_script(script_host, nsscript); + }else { + parse_inline_script(script_host, script_elem); + } nsAString_Finish(&src_str); } @@ -887,12 +889,12 @@ static ScriptHost *get_script_host(HTMLInnerWindow *window, const GUID *guid) return create_script_host(window, guid); } -void doc_insert_script(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscript) +void doc_insert_script(HTMLInnerWindow *window, HTMLScriptElement *script_elem) { ScriptHost *script_host; GUID guid; - if(!get_script_guid(window, nsscript, &guid)) { + if(!get_script_guid(window, script_elem->nsscript, &guid)) { WARN("Could not find script GUID\n"); return; } @@ -908,7 +910,7 @@ void doc_insert_script(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscrip return; if(script_host->parse) - parse_script_elem(script_host, nsscript); + parse_script_elem(script_host, script_elem); } IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text)

1 0

Jacek Caban : mshtml: Store nsIDOMNodeSelector in HTMLDocumentNode.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 359a9041b1c4747ee7bcbaae13bf9c3535553968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=359a9041b1c4747ee7bcbaae1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 15:44:10 2012 +0200 mshtml: Store nsIDOMNodeSelector in HTMLDocumentNode. --- dlls/mshtml/htmldoc.c | 16 ++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 8 +------- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 322751a..6954d17 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2101,6 +2101,11 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) while(!list_empty(&This->plugin_hosts)) detach_plugin_host(LIST_ENTRY(list_head(&This->plugin_hosts), PluginHost, entry)); + if(This->nsnode_selector) { + nsIDOMNodeSelector_Release(This->nsnode_selector); + This->nsnode_selector = NULL; + } + if(This->nsdoc) { assert(!This->window); release_document_mutation(This); @@ -2126,6 +2131,8 @@ static void HTMLDocumentNode_traverse(HTMLDOMNode *iface, nsCycleCollectionTrave { HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + if(This->nsnode_selector) + note_cc_edge((nsISupports*)This->nsnode_selector, "This->nsnode_selector", cb); if(This->nsdoc) note_cc_edge((nsISupports*)This->nsdoc, "This->nsdoc", cb); } @@ -2134,6 +2141,11 @@ static void HTMLDocumentNode_unlink(HTMLDOMNode *iface) { HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + if(This->nsnode_selector) { + nsIDOMNodeSelector_Release(This->nsnode_selector); + This->nsnode_selector = NULL; + } + if(This->nsdoc) { nsIDOMHTMLDocument *nsdoc = This->nsdoc; @@ -2285,6 +2297,7 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindo HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_obj, HTMLInnerWindow *window, HTMLDocumentNode **ret) { HTMLDocumentNode *doc; + nsresult nsres; doc = alloc_doc_node(doc_obj, window); if(!doc) @@ -2298,6 +2311,9 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob nsIDOMHTMLDocument_AddRef(nsdoc); doc->nsdoc = nsdoc; + nsres = nsIDOMHTMLDocument_QueryInterface(nsdoc, &IID_nsIDOMNodeSelector, (void**)&doc->nsnode_selector); + assert(nsres == NS_OK); + init_document_mutation(doc); doc_init_events(doc); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index aec754f..dd41224 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -689,6 +689,7 @@ struct HTMLDocumentNode { HTMLInnerWindow *window; nsIDOMHTMLDocument *nsdoc; + nsIDOMNodeSelector *nsnode_selector; BOOL content_ready; event_target_t *body_event_target; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index fea8b4c..bec5ed6 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2004,19 +2004,13 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) */ selector = heap_alloc(sizeof(selector_formatW)+SysStringLen(frag)*sizeof(WCHAR)); if(selector) { - nsIDOMNodeSelector *node_selector; nsIDOMElement *nselem = NULL; nsAString selector_str; - nsres = nsIDOMHTMLDocument_QueryInterface(window->base.inner_window->doc->nsdoc, &IID_nsIDOMNodeSelector, - (void**)&node_selector); - assert(nsres == NS_OK); - sprintfW(selector, selector_formatW, frag); nsAString_InitDepend(&selector_str, selector); /* NOTE: Gecko doesn't set result to NULL if there is no match, so nselem must be initialized */ - nsres = nsIDOMNodeSelector_QuerySelector(node_selector, &selector_str, &nselem); - nsIDOMNodeSelector_Release(node_selector); + nsres = nsIDOMNodeSelector_QuerySelector(window->base.inner_window->doc->nsnode_selector, &selector_str, &nselem); nsAString_Finish(&selector_str); heap_free(selector); if(NS_SUCCEEDED(nsres) && nselem) {

1 0

Christian Costa : scsiport.sys: Add stub implementation of scsiport.sys.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: ce44d1e506dd647f55366932a4215d182391b96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce44d1e506dd647f55366932a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 2 06:23:49 2012 +0200 scsiport.sys: Add stub implementation of scsiport.sys. --- configure | 1 + configure.ac | 1 + dlls/scsiport.sys/Makefile.in | 8 ++++++ dlls/scsiport.sys/scsiport.c | 39 ++++++++++++++++++++++++++++ dlls/scsiport.sys/scsiport.sys.spec | 48 +++++++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2be377a..d18cc0e 100755 --- a/configure +++ b/configure @@ -15663,6 +15663,7 @@ wine_fn_config_dll schannel enable_schannel wine_fn_config_test dlls/schannel/tests schannel_test wine_fn_config_dll scrrun enable_scrrun wine_fn_config_test dlls/scrrun/tests scrrun_test +wine_fn_config_dll scsiport.sys enable_scsiport_sys wine_fn_config_dll secur32 enable_secur32 implib wine_fn_config_test dlls/secur32/tests secur32_test wine_fn_config_dll security enable_security diff --git a/configure.ac b/configure.ac index eb57696..5c7e9a2 100644 --- a/configure.ac +++ b/configure.ac @@ -2936,6 +2936,7 @@ WINE_CONFIG_DLL(schannel) WINE_CONFIG_TEST(dlls/schannel/tests) WINE_CONFIG_DLL(scrrun) WINE_CONFIG_TEST(dlls/scrrun/tests) +WINE_CONFIG_DLL(scsiport.sys) WINE_CONFIG_DLL(secur32,,[implib]) WINE_CONFIG_TEST(dlls/secur32/tests) WINE_CONFIG_DLL(security) diff --git a/dlls/scsiport.sys/Makefile.in b/dlls/scsiport.sys/Makefile.in new file mode 100644 index 0000000..40c3b62 --- /dev/null +++ b/dlls/scsiport.sys/Makefile.in @@ -0,0 +1,8 @@ +MODULE = scsiport.sys +IMPORTS = ntoskrnl.exe +EXTRADLLFLAGS = -Wb,--subsystem,native + +C_SRCS = \ + scsiport.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/scsiport.sys/scsiport.c b/dlls/scsiport.sys/scsiport.c new file mode 100644 index 0000000..f689153 --- /dev/null +++ b/dlls/scsiport.sys/scsiport.c @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2012 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(scsiport); + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) +{ + TRACE("(%p, %s)\n", driver, debugstr_w(path->Buffer)); + + return STATUS_SUCCESS; +} diff --git a/dlls/scsiport.sys/scsiport.sys.spec b/dlls/scsiport.sys/scsiport.sys.spec new file mode 100644 index 0000000..55a373e --- /dev/null +++ b/dlls/scsiport.sys/scsiport.sys.spec @@ -0,0 +1,48 @@ +@ stub DllInitialize +@ stub PortNotification +@ stub ScsiDebugPrint +@ stub ScsiPortCompleteRequest +@ stub ScsiPortConvertPhysicalAddressToUlong +@ stub ScsiPortConvertUlongToPhysicalAddress +@ stub ScsiPortFlushDma +@ stub ScsiPortFreeDeviceBase +@ stub ScsiPortGetBusData +@ stub ScsiPortGetDeviceBase +@ stub ScsiPortGetLogicalUnit +@ stub ScsiPortGetPhysicalAddress +@ stub ScsiPortGetSrb +@ stub ScsiPortGetUncachedExtension +@ stub ScsiPortGetVirtualAddress +@ stub ScsiPortInitialize +@ stub ScsiPortIoMapTransfer +@ stub ScsiPortLogError +@ stub ScsiPortMoveMemory +@ stub ScsiPortNotification +@ stub ScsiPortQuerySystemTime +@ stub ScsiPortReadPortBufferUchar +@ stub ScsiPortReadPortBufferUlong +@ stub ScsiPortReadPortBufferUshort +@ stub ScsiPortReadPortUchar +@ stub ScsiPortReadPortUlong +@ stub ScsiPortReadPortUshort +@ stub ScsiPortReadRegisterBufferUchar +@ stub ScsiPortReadRegisterBufferUlong +@ stub ScsiPortReadRegisterBufferUshort +@ stub ScsiPortReadRegisterUchar +@ stub ScsiPortReadRegisterUlong +@ stub ScsiPortReadRegisterUshort +@ stub ScsiPortSetBusDataByOffset +@ stub ScsiPortStallExecution +@ stub ScsiPortValidateRange +@ stub ScsiPortWritePortBufferUchar +@ stub ScsiPortWritePortBufferUlong +@ stub ScsiPortWritePortBufferUshort +@ stub ScsiPortWritePortUchar +@ stub ScsiPortWritePortUlong +@ stub ScsiPortWritePortUshort +@ stub ScsiPortWriteRegisterBufferUchar +@ stub ScsiPortWriteRegisterBufferUlong +@ stub ScsiPortWriteRegisterBufferUshort +@ stub ScsiPortWriteRegisterUchar +@ stub ScsiPortWriteRegisterUlong +@ stub ScsiPortWriteRegisterUshort

1 0

Christian Costa : ntoskrnl.exe: Add stub for IoAcquireCancelSpinLock and IoReleaseCancelSpinLock.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 84465b420b43231887bb87eafab4ec5beb4c13ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=84465b420b43231887bb87eaf… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 2 06:36:52 2012 +0200 ntoskrnl.exe: Add stub for IoAcquireCancelSpinLock and IoReleaseCancelSpinLock. --- dlls/ntoskrnl.exe/ntoskrnl.c | 18 ++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c66bb55..2cf7983 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -284,6 +284,24 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) /*********************************************************************** + * IoAcquireCancelSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI IoAcquireCancelSpinLock(PKIRQL irql) +{ + FIXME("(%p): stub\n", irql); +} + + +/*********************************************************************** + * IoReleaseCancelSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI IoReleaseCancelSpinLock(PKIRQL irql) +{ + FIXME("(%p): stub\n", irql); +} + + +/*********************************************************************** * IoAllocateDriverObjectExtension (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoAllocateDriverObjectExtension( PDRIVER_OBJECT DriverObject, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 561c8e1..3a871de 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -303,7 +303,7 @@ @ stub InbvSetTextColor @ stub InbvSolidColorFill @ stub InitSafeBootMode -@ stub IoAcquireCancelSpinLock +@ stdcall IoAcquireCancelSpinLock(ptr) @ stub IoAcquireRemoveLockEx @ stub IoAcquireVpbSpinLock @ stub IoAdapterObjectType @@ -432,7 +432,7 @@ @ stub IoRegisterLastChanceShutdownNotification @ stub IoRegisterPlugPlayNotification @ stdcall IoRegisterShutdownNotification(ptr) -@ stub IoReleaseCancelSpinLock +@ stdcall IoReleaseCancelSpinLock(ptr) @ stub IoReleaseRemoveLockAndWaitEx @ stub IoReleaseRemoveLockEx @ stub IoReleaseVpbSpinLock

1 0

Christian Costa : ntoskrnl.exe: Implement IoAllocateMdl.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 5c65471681cad45c21fd80b8bb243590dc032470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c65471681cad45c21fd80b8b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 2 00:09:51 2012 +0200 ntoskrnl.exe: Implement IoAllocateMdl. --- dlls/ntoskrnl.exe/ntoskrnl.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2cf7983..ba2034d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -415,13 +415,34 @@ PVOID WINAPI IoAllocateErrorLogEntry( PVOID IoObject, UCHAR EntrySize ) PMDL WINAPI IoAllocateMdl( PVOID VirtualAddress, ULONG Length, BOOLEAN SecondaryBuffer, BOOLEAN ChargeQuota, PIRP Irp ) { PMDL mdl; + ULONG_PTR address = (ULONG_PTR)VirtualAddress; + ULONG_PTR page_address; + SIZE_T nb_pages, mdl_size; - FIXME("partial stub: %p, %u, %i, %i, %p\n", VirtualAddress, Length, SecondaryBuffer, ChargeQuota, Irp); + TRACE("(%p, %u, %i, %i, %p)\n", VirtualAddress, Length, SecondaryBuffer, ChargeQuota, Irp); - mdl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MDL)); + if (Irp) + FIXME("Attaching the MDL to an IRP is not yet supported\n"); + + if (ChargeQuota) + FIXME("Charge quota is not yet supported\n"); + + /* FIXME: We suppose that page size is 4096 */ + page_address = address & ~(4096 - 1); + nb_pages = (((address + Length - 1) & ~(4096 - 1)) - page_address) / 4096 + 1; + + mdl_size = sizeof(MDL) + nb_pages * sizeof(PVOID); + + mdl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mdl_size); if (!mdl) return NULL; + mdl->Size = mdl_size; + mdl->Process = IoGetCurrentProcess(); + mdl->StartVa = (PVOID)page_address; + mdl->ByteCount = Length; + mdl->ByteOffset = address - page_address; + return mdl; }

1 0

Christian Costa : ntoskrnl.exe: Add stub for PsImpersonateClient.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: e3607c9858b4d7de6a0435a8d31c04d2cd85ac8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3607c9858b4d7de6a0435a8d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 2 00:10:38 2012 +0200 ntoskrnl.exe: Add stub for PsImpersonateClient. --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ba2034d..a127551 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1660,6 +1660,18 @@ BOOLEAN WINAPI PsGetVersion(ULONG *major, ULONG *minor, ULONG *build, UNICODE_ST /*********************************************************************** + * PsImpersonateClient (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsImpersonateClient(PETHREAD Thread, PACCESS_TOKEN Token, BOOLEAN CopyOnOpen, + BOOLEAN EffectiveOnly, SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) +{ + FIXME("(%p, %p, %u, %u, %u): stub\n", Thread, Token, CopyOnOpen, EffectiveOnly, ImpersonationLevel); + + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * PsSetCreateProcessNotifyRoutine (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine( PCREATE_PROCESS_NOTIFY_ROUTINE callback, BOOLEAN remove ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3a871de..b169815 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -885,7 +885,7 @@ @ stub PsGetThreadTeb @ stub PsGetThreadWin32Thread @ stdcall PsGetVersion(ptr ptr ptr ptr) -@ stub PsImpersonateClient +@ stdcall PsImpersonateClient(ptr ptr long long long) @ stub PsInitialSystemProcess @ stub PsIsProcessBeingDebugged @ stub PsIsSystemThread

1 0

Henri Verbeet : wined3d: wined3d_device_set_depth_stencil() never fails.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 6e5cf8c69885733c78135983cfaf39d791760160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5cf8c69885733c78135983c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:11 2012 +0200 wined3d: wined3d_device_set_depth_stencil() never fails. --- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 5 ++--- dlls/wined3d/device.c | 6 +++--- include/wine/wined3d.h | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 751ba05..4f6162c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1085,7 +1085,7 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, struct d3d8_surface *rt_impl = unsafe_impl_from_IDirect3DSurface8(render_target); struct d3d8_surface *ds_impl = unsafe_impl_from_IDirect3DSurface8(depth_stencil); struct wined3d_surface *original_ds = NULL; - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, render_target %p, depth_stencil %p.\n", iface, render_target, depth_stencil); @@ -1123,8 +1123,8 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, } original_ds = wined3d_device_get_depth_stencil(device->wined3d_device); - hr = wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL); - if (SUCCEEDED(hr) && render_target) + wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL); + if (render_target) { hr = wined3d_device_set_render_target(device->wined3d_device, 0, rt_impl->wined3d_surface, TRUE); if (FAILED(hr)) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index af2a92f..4d5c762 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1224,15 +1224,14 @@ static HRESULT WINAPI d3d9_device_SetDepthStencilSurface(IDirect3DDevice9Ex *ifa { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *ds_impl = unsafe_impl_from_IDirect3DSurface9(depth_stencil); - HRESULT hr; TRACE("iface %p, depth_stencil %p.\n", iface, depth_stencil); wined3d_mutex_lock(); - hr = wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL); + wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetDepthStencilSurface(IDirect3DDevice9Ex *iface, IDirect3DSurface9 **depth_stencil) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fa35105..f9ff67c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4568,7 +4568,7 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, struct wined3d_surface *depth_stencil) +void CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, struct wined3d_surface *depth_stencil) { struct wined3d_surface *prev = device->fb.depth_stencil; @@ -4578,7 +4578,7 @@ HRESULT CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, st if (prev == depth_stencil) { TRACE("Trying to do a NOP SetRenderTarget operation.\n"); - return WINED3D_OK; + return; } if (prev) @@ -4617,7 +4617,7 @@ HRESULT CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, st device_invalidate_state(device, STATE_FRAMEBUFFER); - return WINED3D_OK; + return; } HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d527949..bc3e17f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2195,7 +2195,7 @@ void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, int x_screen_space, int y_screen_space, DWORD flags); HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device, UINT x_hotspot, UINT y_hotspot, struct wined3d_surface *cursor_surface); -HRESULT __cdecl wined3d_device_set_depth_stencil(struct wined3d_device *device, struct wined3d_surface *depth_stencil); +void __cdecl wined3d_device_set_depth_stencil(struct wined3d_device *device, struct wined3d_surface *depth_stencil); HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp);

1 0