June 2014 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Use get_elem_attr_value helper in check_event_attr.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: df62eea18639ca985ce740d0b7d10e9c6b0b4b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df62eea18639ca985ce740d0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:37 2014 +0200 mshtml: Use get_elem_attr_value helper in check_event_attr. --- dlls/mshtml/htmlevent.c | 15 ++++----------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/mutation.c | 6 +++--- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ee384ee..484f3f7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1523,24 +1523,19 @@ void update_cp_events(HTMLInnerWindow *window, event_target_t **event_target_ptr } } -void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) +void check_event_attr(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) { const PRUnichar *attr_value; - nsAString attr_name_str, attr_value_str; + nsAString attr_value_str; IDispatch *disp; HTMLDOMNode *node; int i; nsresult nsres; HRESULT hres; - nsAString_Init(&attr_value_str, NULL); - nsAString_Init(&attr_name_str, NULL); - for(i=0; i < EVENTID_LAST; i++) { - nsAString_SetData(&attr_name_str, event_info[i].attr_name); - nsres = nsIDOMElement_GetAttribute(nselem, &attr_name_str, &attr_value_str); + nsres = get_elem_attr_value(nselem, event_info[i].attr_name, &attr_value_str, &attr_value); if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&attr_value_str, &attr_value); if(!*attr_value) continue; @@ -1555,11 +1550,9 @@ void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) } IDispatch_Release(disp); } + nsAString_Finish(&attr_value_str); } } - - nsAString_Finish(&attr_value_str); - nsAString_Finish(&attr_name_str); } HRESULT doc_init_events(HTMLDocumentNode *doc) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 528eded..d2426d3 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -49,7 +49,7 @@ typedef enum { } eventid_t; eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; -void check_event_attr(HTMLDocumentNode*,nsIDOMElement*) DECLSPEC_HIDDEN; +void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; void release_event_target(event_target_t*) DECLSPEC_HIDDEN; void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; HRESULT set_event_handler(event_target_t**,HTMLDocumentNode*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 23b37b5..b79ec1f 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -638,16 +638,16 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, nsIDOMHTMLIFrameElement *nsiframe; nsIDOMHTMLFrameElement *nsframe; nsIDOMHTMLScriptElement *nsscript; + nsIDOMHTMLElement *nselem; nsIDOMComment *nscomment; - nsIDOMElement *nselem; nsresult nsres; TRACE("(%p)->(%p %p)\n", This, aDocument, aContent); - nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMElement, (void**)&nselem); + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { check_event_attr(This, nselem); - nsIDOMElement_Release(nselem); + nsIDOMHTMLElement_Release(nselem); } nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMComment, (void**)&nscomment);

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in HTMLFormElement_get_dispid.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 04ea007cbb4733cd84fcc48b6341c819472a6fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ea007cbb4733cd84fcc48b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:48 2014 +0200 mshtml: Use get_elem_attr_value helper in HTMLFormElement_get_dispid. --- dlls/mshtml/htmlform.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 5b9982c..6cbf1f6 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -568,7 +568,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, { HTMLFormElement *This = impl_from_HTMLDOMNode(iface); nsIDOMHTMLCollection *elements; - nsAString nsname, nsstr; + nsAString nsstr, name_str; UINT32 len, i; nsresult nsres; HRESULT hres = DISP_E_UNKNOWNNAME; @@ -604,7 +604,6 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, } } - nsAString_InitDepend(&nsname, nameW); nsAString_Init(&nsstr, NULL); for(i = 0; i < len; ++i) { nsIDOMNode *nsitem; @@ -644,21 +643,22 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, } /* compare by name attr */ - nsres = nsIDOMHTMLElement_GetAttribute(nshtml_elem, &nsname, &nsstr); + nsres = get_elem_attr_value(nshtml_elem, nameW, &name_str, &str); nsIDOMHTMLElement_Release(nshtml_elem); - nsAString_GetData(&nsstr, &str); - if(!strcmpiW(str, name)) { - /* FIXME: using index for dispid */ - *pid = MSHTML_DISPID_CUSTOM_MIN + i; - hres = S_OK; - break; + if(NS_SUCCEEDED(nsres)) { + if(!strcmpiW(str, name)) { + nsAString_Finish(&name_str); + /* FIXME: using index for dispid */ + *pid = MSHTML_DISPID_CUSTOM_MIN + i; + hres = S_OK; + break; + } + nsAString_Finish(&name_str); } } - nsAString_Finish(&nsname); - nsAString_Finish(&nsstr); + nsAString_Finish(&nsstr); nsIDOMHTMLCollection_Release(elements); - return hres; }

1 0

Jacek Caban : mshtml: Use elem_string_attr_getter helper in HTMLLabelElement_get_htmlFor implementation.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 75a2e8c4f0f92c89b9079702feb5853b20ee2de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a2e8c4f0f92c89b9079702f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:58 2014 +0200 mshtml: Use elem_string_attr_getter helper in HTMLLabelElement_get_htmlFor implementation. --- dlls/mshtml/htmlinput.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e6fb184..f5e086c 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1334,29 +1334,10 @@ static HRESULT WINAPI HTMLLabelElement_put_htmlFor(IHTMLLabelElement *iface, BST static HRESULT WINAPI HTMLLabelElement_get_htmlFor(IHTMLLabelElement *iface, BSTR *p) { HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface); - nsAString for_str, val_str; - nsresult nsres; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - nsAString_InitDepend(&for_str, forW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &for_str, &val_str); - nsAString_Finish(&for_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *val; - - nsAString_GetData(&val_str, &val); - *p = SysAllocString(val); - hres = *p ? S_OK : E_OUTOFMEMORY; - }else { - ERR("GetAttribute failed: %08x\n", nsres); - hres = E_FAIL; - } - - nsAString_Finish(&val_str); - return hres; + return elem_string_attr_getter(&This->element, forW, p); } static HRESULT WINAPI HTMLLabelElement_put_accessKey(IHTMLLabelElement *iface, BSTR v)

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in npplugin.c.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: a0c2d641d435703f55a661df1c83b2e78d60f703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c2d641d435703f55a661df1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:30:12 2014 +0200 mshtml: Use get_elem_attr_value helper in npplugin.c. --- dlls/mshtml/npplugin.c | 60 ++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 0ce72ff..ca0d9fd 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -211,10 +211,11 @@ typedef struct _NPPluginFuncs { NPP_LostFocusPtr lostfocus; } NPPluginFuncs; -static nsIDOMElement *get_dom_element(NPP instance) +static nsIDOMHTMLElement *get_dom_element(NPP instance) { nsISupports *instance_unk = (nsISupports*)instance->ndata; nsIPluginInstance *plugin_instance; + nsIDOMHTMLElement *html_elem; nsIDOMElement *elem; nsresult nsres; @@ -231,17 +232,24 @@ static nsIDOMElement *get_dom_element(NPP instance) return NULL; } - return elem; + nsres = nsIDOMElement_QueryInterface(elem, &IID_nsIDOMHTMLElement, (void**)&html_elem); + nsIDOMElement_Release(elem); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMHTMLElement iface: %08x\n", nsres); + return NULL; + } + + return html_elem; } -static HTMLInnerWindow *get_elem_window(nsIDOMElement *elem) +static HTMLInnerWindow *get_elem_window(nsIDOMHTMLElement *elem) { nsIDOMWindow *nswindow; nsIDOMDocument *nsdoc; HTMLOuterWindow *window; nsresult nsres; - nsres = nsIDOMElement_GetOwnerDocument(elem, &nsdoc); + nsres = nsIDOMHTMLElement_GetOwnerDocument(elem, &nsdoc); if(NS_FAILED(nsres)) return NULL; @@ -287,29 +295,22 @@ static BOOL parse_classid(const PRUnichar *classid, CLSID *clsid) return SUCCEEDED(hres); } -static BOOL get_elem_clsid(nsIDOMElement *elem, CLSID *clsid) +static BOOL get_elem_clsid(nsIDOMHTMLElement *elem, CLSID *clsid) { - nsAString attr_str, val_str; + const PRUnichar *val; + nsAString val_str; nsresult nsres; BOOL ret = FALSE; static const PRUnichar classidW[] = {'c','l','a','s','s','i','d',0}; - nsAString_InitDepend(&attr_str, classidW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMElement_GetAttribute(elem, &attr_str, &val_str); - nsAString_Finish(&attr_str); + nsres = get_elem_attr_value(elem, classidW, &val_str, &val); if(NS_SUCCEEDED(nsres)) { - const PRUnichar *val; - - nsAString_GetData(&val_str, &val); if(*val) ret = parse_classid(val, clsid); - }else { - ERR("GetAttribute failed: %08x\n", nsres); + nsAString_Finish(&val_str); } - nsAString_Finish(&val_str); return ret; } @@ -529,35 +530,28 @@ static void install_codebase(const WCHAR *url) WARN("FAILED: %08x\n", hres); } -static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem) +static void check_codebase(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem) { - nsAString attr_str, val_str; BOOL is_on_list = FALSE; install_entry_t *iter; + const PRUnichar *val; + nsAString val_str; IUri *uri = NULL; nsresult nsres; HRESULT hres; static const PRUnichar codebaseW[] = {'c','o','d','e','b','a','s','e',0}; - nsAString_InitDepend(&attr_str, codebaseW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMElement_GetAttribute(nselem, &attr_str, &val_str); - nsAString_Finish(&attr_str); + nsres = get_elem_attr_value(nselem, codebaseW, &val_str, &val); if(NS_SUCCEEDED(nsres)) { - const PRUnichar *val; - - nsAString_GetData(&val_str, &val); if(*val) { hres = CoInternetCombineUrlEx(window->base.outer_window->uri, val, 0, &uri, 0); if(FAILED(hres)) uri = NULL; } - }else { - ERR("GetAttribute failed: %08x\n", nsres); + nsAString_Finish(&val_str); } - nsAString_Finish(&val_str); if(!uri) return; @@ -599,7 +593,7 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem) IUri_Release(uri); } -static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMElement *nselem, CLSID *clsid) +static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem, CLSID *clsid) { IClassFactoryEx *cfex; IClassFactory *cf; @@ -645,7 +639,7 @@ static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMElement *n static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, INT16 argc, char **argn, char **argv, NPSavedData *saved) { - nsIDOMElement *nselem; + nsIDOMHTMLElement *nselem; HTMLInnerWindow *window; IUnknown *obj; CLSID clsid; @@ -662,7 +656,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I window = get_elem_window(nselem); if(!window) { ERR("Could not get element's window object\n"); - nsIDOMElement_Release(nselem); + nsIDOMHTMLElement_Release(nselem); return NPERR_GENERIC_ERROR; } @@ -671,7 +665,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I PluginHost *host; HRESULT hres; - hres = create_plugin_host(window->doc, nselem, obj, &clsid, &host); + hres = create_plugin_host(window->doc, (nsIDOMElement*)nselem, obj, &clsid, &host); IUnknown_Release(obj); if(SUCCEEDED(hres)) instance->pdata = host; @@ -681,7 +675,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I err = NPERR_GENERIC_ERROR; } - nsIDOMElement_Release(nselem); + nsIDOMHTMLElement_Release(nselem); return err; }

1 0

Nikolay Sivov : ntdll: Fix LdrLockLoaderLock()/LdrUnlockLoaderLock() on 64bit.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 5a8d73283cf637e3d00dbb781cc4cd49027a29b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a8d73283cf637e3d00dbb781… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 28 08:58:59 2014 +0400 ntdll: Fix LdrLockLoaderLock()/LdrUnlockLoaderLock() on 64bit. --- dlls/kernel32/module.c | 7 ++++--- dlls/kernel32/tests/loader.c | 6 +++--- dlls/ntdll/actctx.c | 4 ++-- dlls/ntdll/loader.c | 4 ++-- dlls/ntdll/tests/rtl.c | 15 ++++++++------- include/winternl.h | 4 ++-- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index d1555f1..514b6be 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -538,7 +538,7 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) { NTSTATUS status = STATUS_SUCCESS; HMODULE ret; - ULONG magic; + ULONG_PTR magic; BOOL lock; if (!module) @@ -666,7 +666,8 @@ DWORD WINAPI GetModuleFileNameA( */ DWORD WINAPI GetModuleFileNameW( HMODULE hModule, LPWSTR lpFileName, DWORD size ) { - ULONG magic, len = 0; + ULONG len = 0; + ULONG_PTR magic; LDR_MODULE *pldr; NTSTATUS nts; WIN16_SUBSYSTEM_TIB *win16_tib; @@ -911,7 +912,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) if (flags & LOAD_LIBRARY_AS_DATAFILE) { - ULONG magic; + ULONG_PTR magic; LdrLockLoaderLock( 0, NULL, &magic ); if (!LdrGetDllHandle( load_path, flags, libname, &hModule )) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e749238..af43779 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -61,8 +61,8 @@ static void (WINAPI *pLdrShutdownProcess)(void); static BOOLEAN (WINAPI *pRtlDllShutdownInProgress)(void); static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_T *, ULONG, ULONG); static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); -static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG *, ULONG *); -static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG); +static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG *, ULONG_PTR *); +static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); static void (WINAPI *pRtlAcquirePebLock)(void); static void (WINAPI *pRtlReleasePebLock)(void); static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRIPTOR, @@ -1367,7 +1367,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) if (ret == WAIT_OBJECT_0) break; else if (ret == WAIT_OBJECT_0 + 1) { - ULONG loader_lock_magic; + ULONG_PTR loader_lock_magic; trace("%04u: mutex_thread_proc: Entering loader lock\n", GetCurrentThreadId()); ret = pLdrLockLoaderLock(0, NULL, &loader_lock_magic); ok(!ret, "LdrLockLoaderLock error %#x\n", ret); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 14e196f..9a9dec9 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2435,7 +2435,7 @@ static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name ) static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, unsigned int extra_len ) { NTSTATUS status; - ULONG magic; + ULONG_PTR magic; LDR_MODULE *pldr; LdrLockLoaderLock(0, NULL, &magic); @@ -2934,7 +2934,7 @@ static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags, ULONG class ) } else if (flags & (QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS|QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE)) { - ULONG magic; + ULONG_PTR magic; LDR_MODULE *pldr; if (!*handle) return STATUS_INVALID_PARAMETER; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6471290..79aa341 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1340,7 +1340,7 @@ NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* pmod) * Note: some flags are not implemented. * Flag 0x01 is used to raise exceptions on errors. */ -NTSTATUS WINAPI LdrLockLoaderLock( ULONG flags, ULONG *result, ULONG *magic ) +NTSTATUS WINAPI LdrLockLoaderLock( ULONG flags, ULONG *result, ULONG_PTR *magic ) { if (flags & ~0x2) FIXME( "flags %x not supported\n", flags ); @@ -1372,7 +1372,7 @@ NTSTATUS WINAPI LdrLockLoaderLock( ULONG flags, ULONG *result, ULONG *magic ) /****************************************************************** * LdrUnlockLoaderUnlock (NTDLL.@) */ -NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG magic ) +NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG_PTR magic ) { if (magic) { diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 72cee05..e8eb04a 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -90,8 +90,8 @@ static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); static NTSTATUS (WINAPI *pLdrAddRefDll)(ULONG, HMODULE); -static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG*); -static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG); +static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG_PTR*); +static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -1549,7 +1549,8 @@ static void test_LdrAddRefDll(void) static void test_LdrLockLoaderLock(void) { - ULONG result, magic; + ULONG_PTR magic; + ULONG result; NTSTATUS status; if (!pLdrLockLoaderLock) @@ -1564,12 +1565,12 @@ static void test_LdrLockLoaderLock(void) status = pLdrLockLoaderLock(0x10, &result, &magic); ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); ok(result == 0, "got %d\n", result); - ok(magic == 0, "got 0x%08x\n", magic); + ok(magic == 0, "got %lx\n", magic); magic = 0xdeadbeef; status = pLdrLockLoaderLock(0x10, NULL, &magic); ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); - ok(magic == 0, "got 0x%08x\n", magic); + ok(magic == 0, "got %lx\n", magic); result = 10; status = pLdrLockLoaderLock(0x10, &result, NULL); @@ -1580,7 +1581,7 @@ static void test_LdrLockLoaderLock(void) magic = 0xdeadbeef; status = pLdrLockLoaderLock(0x2, NULL, &magic); ok(status == STATUS_INVALID_PARAMETER_2, "got 0x%08x\n", status); - ok(magic == 0, "got 0x%08x\n", magic); + ok(magic == 0, "got %lx\n", magic); /* magic pointer is null */ result = 10; @@ -1594,7 +1595,7 @@ static void test_LdrLockLoaderLock(void) status = pLdrLockLoaderLock(0x2, &result, &magic); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); ok(result == 1, "got %d\n", result); - ok(magic != 0, "got 0x%08x\n", magic); + ok(magic != 0, "got %lx\n", magic); pLdrUnlockLoaderLock(0, magic); } diff --git a/include/winternl.h b/include/winternl.h index d7f2f50..a95a016 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2020,14 +2020,14 @@ NTSYSAPI NTSTATUS WINAPI LdrGetDllHandle(LPCWSTR, ULONG, const UNICODE_STRING*, NTSYSAPI NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, ULONG, void**); NTSYSAPI void WINAPI LdrInitializeThunk(void*,ULONG_PTR,ULONG_PTR,ULONG_PTR); NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); -NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG*); +NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG_PTR*); IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock(void*,UINT,USHORT*,INT_PTR); NTSYSAPI NTSTATUS WINAPI LdrQueryImageFileExecutionOptions(const UNICODE_STRING*,LPCWSTR,ULONG,void*,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI LdrQueryProcessModuleInformation(SYSTEM_MODULE_INFORMATION*, ULONG, ULONG*); NTSYSAPI void WINAPI LdrShutdownProcess(void); NTSYSAPI void WINAPI LdrShutdownThread(void); NTSYSAPI NTSTATUS WINAPI LdrUnloadDll(HMODULE); -NTSYSAPI NTSTATUS WINAPI LdrUnlockLoaderLock(ULONG,ULONG); +NTSYSAPI NTSTATUS WINAPI LdrUnlockLoaderLock(ULONG,ULONG_PTR); NTSYSAPI NTSTATUS WINAPI NtAcceptConnectPort(PHANDLE,ULONG,PLPC_MESSAGE,BOOLEAN,PLPC_SECTION_WRITE,PLPC_SECTION_READ); NTSYSAPI NTSTATUS WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,NTSTATUS*); NTSYSAPI NTSTATUS WINAPI NtAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN);

1 0

Vincent Povirk : ole32: Don't store file size in FileLockBytesImpl.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: d32abd77266acf10a22213ded73b548710482427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d32abd77266acf10a22213ded… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 27 14:14:45 2014 -0500 ole32: Don't store file size in FileLockBytesImpl. --- dlls/ole32/filelockbytes.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index 9bd1163..52c1d26 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -49,7 +49,6 @@ typedef struct FileLockBytesImpl { ILockBytes ILockBytes_iface; LONG ref; - ULARGE_INTEGER filesize; HANDLE hfile; DWORD flProtect; LPWSTR pwcsName; @@ -108,8 +107,6 @@ HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsN This->ILockBytes_iface.lpVtbl = &FileLockBytesImpl_Vtbl; This->ref = 1; This->hfile = hFile; - This->filesize.u.LowPart = GetFileSize(This->hfile, - &This->filesize.u.HighPart); This->flProtect = GetProtectMode(openFlags); if(pwcsName) { @@ -129,8 +126,6 @@ HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsN else This->pwcsName = NULL; - TRACE("file len %u\n", This->filesize.u.LowPart); - *pLockBytes = &This->ILockBytes_iface; return S_OK; @@ -248,7 +243,6 @@ static HRESULT WINAPI FileLockBytesImpl_WriteAt( ULONG* pcbWritten) /* [out] */ { FileLockBytesImpl* This = impl_from_ILockBytes(iface); - ULONG size_needed = ulOffset.u.LowPart + cb; ULONG bytes_left = cb; const BYTE *writePtr = pv; BOOL ret; @@ -266,14 +260,6 @@ static HRESULT WINAPI FileLockBytesImpl_WriteAt( if (pcbWritten) *pcbWritten = 0; - if (size_needed > This->filesize.u.LowPart) - { - ULARGE_INTEGER newSize; - newSize.u.HighPart = 0; - newSize.u.LowPart = size_needed; - ILockBytes_SetSize(iface, newSize); - } - offset.QuadPart = ulOffset.QuadPart; ret = SetFilePointerEx(This->hfile, offset, NULL, FILE_BEGIN); @@ -316,10 +302,7 @@ static HRESULT WINAPI FileLockBytesImpl_SetSize(ILockBytes* iface, ULARGE_INTEGE HRESULT hr = S_OK; LARGE_INTEGER newpos; - if (This->filesize.u.LowPart == newSize.u.LowPart) - return hr; - - TRACE("from %u to %u\n", This->filesize.u.LowPart, newSize.u.LowPart); + TRACE("new size %u\n", newSize.u.LowPart); newpos.QuadPart = newSize.QuadPart; if (SetFilePointerEx(This->hfile, newpos, NULL, FILE_BEGIN)) @@ -327,7 +310,6 @@ static HRESULT WINAPI FileLockBytesImpl_SetSize(ILockBytes* iface, ULARGE_INTEGE SetEndOfFile(This->hfile); } - This->filesize = newSize; return hr; } @@ -412,7 +394,8 @@ static HRESULT WINAPI FileLockBytesImpl_Stat(ILockBytes* iface, pstatstg->pwcsName = NULL; pstatstg->type = STGTY_LOCKBYTES; - pstatstg->cbSize = This->filesize; + + pstatstg->cbSize.u.LowPart = GetFileSize(This->hfile, &pstatstg->cbSize.u.HighPart); /* FIXME: If the implementation is exported, we'll need to set other fields. */ return S_OK;

1 0

Huw Davies : riched20: Don' t skip the final carriage return in SFF_SELECTION mode.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: b89c7c8fc2b1e1de06ddb49a8cc8326b45573961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89c7c8fc2b1e1de06ddb49a8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 29 15:47:42 2014 +0100 riched20: Don't skip the final carriage return in SFF_SELECTION mode. --- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index bc5bc08..0127616 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1620,7 +1620,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre CR/LF counters, since RTF streaming presents only \para tokens, which are converted according to the standard rules: \r for 2.0, \r\n for 1.0 */ - if (stripLastCR) { + if (stripLastCR && !(format & SFF_SELECTION)) { int newto; ME_GetSelection(editor, &selStart, &selEnd); newto = ME_GetCursorOfs(selEnd); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index e14d7f6..2a85357 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5072,10 +5072,12 @@ static void test_EM_STREAMIN(void) LRESULT result; EDITSTREAM es; char buffer[1024] = {0}, tmp[16]; + CHARRANGE range; const char * streamText0 = "{\\rtf1 TestSomeText}"; const char * streamText0a = "{\\rtf1 TestSomeText\\par}"; const char * streamText0b = "{\\rtf1 TestSomeText\\par\\par}"; + const char * ptr; const char * streamText1 = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang12298{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 System;}}\r\n" @@ -5132,7 +5134,8 @@ static void test_EM_STREAMIN(void) ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); /* Native richedit 2.0 ignores last \par */ - es.dwCookie = (DWORD_PTR)&streamText0a; + ptr = streamText0a; + es.dwCookie = (DWORD_PTR)&ptr; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); @@ -5161,6 +5164,43 @@ static void test_EM_STREAMIN(void) "EM_STREAMIN: Test 0-b set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test 0-b set error %d, expected %d\n", es.dwError, 0); + /* Show that when using SFF_SELECTION the last \par is not ignored. */ + ptr = streamText0a; + es.dwCookie = (DWORD_PTR)&ptr; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + ok(result == 12, "got %ld, expected %d\n", result, 12); + + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok (result == 12, + "EM_STREAMIN: Test 0-a returned %ld, expected 12\n", result); + result = strcmp (buffer,"TestSomeText"); + ok (result == 0, + "EM_STREAMIN: Test 0-a set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0-a set error %d, expected %d\n", es.dwError, 0); + + range.cpMin = 0; + range.cpMax = -1; + result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&range); + ok (result == 13, "got %ld\n", result); + + ptr = streamText0a; + es.dwCookie = (DWORD_PTR)&ptr; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + + result = SendMessageA(hwndRichEdit, EM_STREAMIN, SFF_SELECTION | SF_RTF, (LPARAM)&es); + ok(result == 13, "got %ld, expected 13\n", result); + + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok (result == 14, + "EM_STREAMIN: Test SFF_SELECTION 0-a returned %ld, expected 14\n", result); + result = strcmp (buffer,"TestSomeText\r\n"); + ok (result == 0, + "EM_STREAMIN: Test SFF_SELECTION 0-a set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test SFF_SELECTION 0-a set error %d, expected %d\n", es.dwError, 0); + es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback;

1 0

Austin English : user32: Fix a comment.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 2227abbc2cf4c89e28ab95ec3381650cb90f7951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2227abbc2cf4c89e28ab95ec3… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 29 16:16:07 2014 -0700 user32: Fix a comment. --- dlls/user32/tests/winstation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 7f91b8b..0889dac 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -519,7 +519,7 @@ static void test_inputdesktop(void) ret = CloseDesktop(input_desk); ok(ret, "CloseDesktop failed!\n"); - /* by default, GetThreadDesktop is the input desktop, SendInput should success. */ + /* by default, GetThreadDesktop is the input desktop, SendInput should succeed. */ old_thread_desk = GetThreadDesktop(GetCurrentThreadId()); ok(old_thread_desk != NULL, "GetThreadDesktop faile!\n"); memset(name, 0, sizeof(name));

1 0

Michael Müller : server: Fix return value for FSCTL_PIPE_WAIT if pipe does not exist.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 9602fa7a9317f1bf856fe441dd0aeb7d0cbfa9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9602fa7a9317f1bf856fe441d… Author: Michael Müller <michael(a)fds-team.de> Date: Sat May 31 02:44:36 2014 +0200 server: Fix return value for FSCTL_PIPE_WAIT if pipe does not exist. --- dlls/kernel32/tests/pipe.c | 6 ++++++ server/named_pipe.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index b192f96..f7c7531 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -60,6 +60,12 @@ static void test_CreateNamedPipe(int pipemode) trace("test_CreateNamedPipe starting in byte mode\n"); else trace("test_CreateNamedPipe starting in message mode\n"); + + /* Wait for non existing pipe */ + ret = WaitNamedPipeA(PIPENAME, 2000); + ok(ret == 0, "WaitNamedPipe returned %d for non existing pipe\n", ret); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + /* Bad parameter checks */ hnp = CreateNamedPipeA("not a named pipe", PIPE_ACCESS_DUPLEX, pipemode | PIPE_WAIT, /* nMaxInstances */ 1, diff --git a/server/named_pipe.c b/server/named_pipe.c index 4c85104..4b23ba2 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -900,7 +900,7 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c name.len = (buffer->NameLength / sizeof(WCHAR)) * sizeof(WCHAR); if (!(pipe = (struct named_pipe *)find_object( device->pipes, &name, OBJ_CASE_INSENSITIVE ))) { - set_error( STATUS_PIPE_NOT_AVAILABLE ); + set_error( STATUS_OBJECT_NAME_NOT_FOUND ); return 0; } if (!(server = find_available_server( pipe )))

1 0

Nikolay Sivov : include: Add more error codes.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 056a8f1d2362240d9db6889895e0f500636e2e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=056a8f1d2362240d9db688989… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 1 21:10:06 2014 +0400 include: Add more error codes. --- include/winbase.h | 1 - include/winerror.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/include/winbase.h b/include/winbase.h index 29ff218..7432983 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1045,7 +1045,6 @@ typedef struct COPYFILE2_EXTENDED_PARAMETERS #define WAIT_ABANDONED STATUS_ABANDONED_WAIT_0 #define WAIT_ABANDONED_0 STATUS_ABANDONED_WAIT_0 #define WAIT_IO_COMPLETION STATUS_USER_APC -#define WAIT_TIMEOUT STATUS_TIMEOUT #define STILL_ACTIVE STATUS_PENDING #define FILE_BEGIN 0 diff --git a/include/winerror.h b/include/winerror.h index 9d988fb..3c3a53b 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -239,6 +239,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_MAX_THRDS_REACHED 164 #define ERROR_LOCK_FAILED 167 #define ERROR_BUSY 170 +#define ERROR_DEVICE_SUPPORT_IN_PROGRESS 171 #define ERROR_CANCEL_VIOLATION 173 #define ERROR_ATOMIC_LOCKS_NOT_SUPPORTED 174 #define ERROR_INVALID_SEGMENT_NUMBER 180 @@ -272,6 +273,16 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_TOO_MANY_MODULES 214 #define ERROR_NESTING_NOT_ALLOWED 215 #define ERROR_EXE_MACHINE_TYPE_MISMATCH 216 +#define ERROR_EXE_CANNOT_MODIFY_SIGNED_BINARY 217 +#define ERROR_EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY 218 +#define ERROR_FILE_CHECKED_OUT 220 +#define ERROR_CHECKOUT_REQUIRED 221 +#define ERROR_BAD_FILE_TYPE 222 +#define ERROR_FILE_TOO_LARGE 223 +#define ERROR_FORMS_AUTH_REQUIRED 224 +#define ERROR_VIRUS_INFECTED 225 +#define ERROR_VIRUS_DELETED 226 +#define ERROR_PIPE_LOCAL 229 #define ERROR_BAD_PIPE 230 #define ERROR_PIPE_BUSY 231 #define ERROR_NO_DATA 232 @@ -280,6 +291,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_VC_DISCONNECTED 240 #define ERROR_INVALID_EA_NAME 254 #define ERROR_EA_LIST_INCONSISTENT 255 +#define WAIT_TIMEOUT 258 #define ERROR_NO_MORE_ITEMS 259 #define ERROR_CANNOT_COPY 266 #define ERROR_DIRECTORY 267 @@ -294,8 +306,44 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_OPLOCK_NOT_GRANTED 300 #define ERROR_INVALID_OPLOCK_PROTOCOL 301 #define ERROR_DISK_TOO_FRAGMENTED 302 +#define ERROR_DELETE_PENDING 303 +#define ERROR_INCOMPATIBLE_WITH_GLOBAL_SHORT_NAME_REGISTRY_SETTING 304 +#define ERROR_SHORT_NAMES_NOT_ENABLED_ON_VOLUME 305 +#define ERROR_SECURITY_STREAM_IS_INCONSISTENT 306 +#define ERROR_INVALID_LOCK_RANGE 307 +#define ERROR_IMAGE_SUBSYSTEM_NOT_PRESENT 308 +#define ERROR_NOTIFICATION_GUID_ALREADY_DEFINED 309 +#define ERROR_INVALID_EXCEPTION_HANDLER 310 +#define ERROR_DUPLICATE_PRIVILEGES 311 +#define ERROR_NO_RANGES_PROCESSED 312 +#define ERROR_NOT_ALLOWED_ON_SYSTEM_FILE 313 +#define ERROR_DISK_RESOURCES_EXHAUSTED 314 +#define ERROR_INVALID_TOKEN 315 +#define ERROR_DEVICE_FEATURE_NOT_SUPPORTED 316 #define ERROR_MR_MID_NOT_FOUND 317 #define ERROR_SCOPE_NOT_FOUND 318 +#define ERROR_UNDEFINED_SCOPE 319 +#define ERROR_INVALID_CAP 320 +#define ERROR_DEVICE_UNREACHABLE 321 +#define ERROR_DEVICE_NO_RESOURCES 322 +#define ERROR_DATA_CHECKSUM_ERROR 323 +#define ERROR_INTERMIXED_KERNEL_EA_OPERATION 324 +#define ERROR_FILE_LEVEL_TRIM_NOT_SUPPORTED 326 +#define ERROR_OFFSET_ALIGNMENT_VIOLATION 327 +#define ERROR_INVALID_FIELD_IN_PARAMETER_LIST 328 +#define ERROR_OPERATION_IN_PROGRESS 329 +#define ERROR_BAD_DEVICE_PATH 330 +#define ERROR_TOO_MANY_DESCRIPTORS 331 +#define ERROR_SCRUB_DATA_DISABLED 332 +#define ERROR_NOT_REDUNDANT_STORAGE 333 +#define ERROR_RESIDENT_FILE_NOT_SUPPORTED 334 +#define ERROR_COMPRESSED_FILE_NOT_SUPPORTED 335 +#define ERROR_DIRECTORY_NOT_SUPPORTED 336 +#define ERROR_NOT_READ_FROM_COPY 337 +#define ERROR_FT_WRITE_FAILURE 338 +#define ERROR_FT_DI_SCAN_REQUIRED 339 +#define ERROR_INVALID_KERNEL_INFO_VERSION 340 +#define ERROR_INVALID_PEP_INFO_VERSION 341 #define ERROR_FAIL_NOACTION_REBOOT 350 #define ERROR_FAIL_SHUTDOWN 351 #define ERROR_FAIL_RESTART 352 @@ -463,7 +511,15 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_FIRMWARE_UPDATED 728 #define ERROR_DRIVERS_LEAKING_LOCKED_PAGES 729 #define ERROR_WAKE_SYSTEM 730 +#define ERROR_WAIT_1 731 +#define ERROR_WAIT_2 732 +#define ERROR_WAIT_3 733 +#define ERROR_WAIT_63 734 #define ERROR_ABANDONED_WAIT_0 735 +#define ERROR_ABANDONED_WAIT_63 736 +#define ERROR_USER_APC 737 +#define ERROR_KERNEL_APC 738 +#define ERROR_ALERTED 739 #define ERROR_ELEVATION_REQUIRED 740 #define ERROR_REPARSE 741 #define ERROR_OPLOCK_BREAK_IN_PROGRESS 742 @@ -515,6 +571,8 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_LOST_WRITEBEHIND_DATA_NETWORK_DISCONNECTED 788 #define ERROR_LOST_WRITEBEHIND_DATA_NETWORK_SERVER_ERROR 789 #define ERROR_LOST_WRITEBEHIND_DATA_LOCAL_DISK_ERROR 790 +#define ERROR_NO_ACE_CONDITION 804 +#define ERROR_INVALID_ACE_CONDITION 805 #define ERROR_EA_ACCESS_DENIED 994 #define ERROR_OPERATION_ABORTED 995 #define ERROR_IO_INCOMPLETE 996

1 0