August 2006 - Wine-Commits - list.winehq.org

Dan Hipschman : widl: Allow format-string functions to work with objects.
by Alexandre Julliard Aug. 18, 2006

Aug. 18, 2006

Module: wine Branch: master Commit: 9b16916ed13e0b26ab3f375f2deb5cb146fda1b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9b16916ed13e0b26ab3f375… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Aug 17 18:08:38 2006 -0700 widl: Allow format-string functions to work with objects. --- tools/widl/client.c | 6 +++--- tools/widl/proxy.c | 6 +++--- tools/widl/server.c | 6 +++--- tools/widl/typegen.c | 22 +++++++++++----------- tools/widl/typegen.h | 10 +++++----- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 3bc47b2..64cf8c5 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -440,7 +440,7 @@ void write_client(ifref_t *ifaces) if (!client) return; - write_formatstringsdecl(client, indent, ifaces); + write_formatstringsdecl(client, indent, ifaces, 0); for (; iface; iface = PREV_LINK(iface)) { @@ -479,8 +479,8 @@ void write_client(ifref_t *ifaces) fprintf(client, "\n"); - write_procformatstring(client, ifaces); - write_typeformatstring(client, ifaces); + write_procformatstring(client, ifaces, 0); + write_typeformatstring(client, ifaces, 0); fclose(client); } diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 608c856..2c4fa10 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -110,7 +110,7 @@ static void init_proxy(ifref_t *ifaces) print_proxy( "\n"); print_proxy( "#include \"%s\"\n", header_name); print_proxy( "\n"); - write_formatstringsdecl(proxy, indent, ifaces); + write_formatstringsdecl(proxy, indent, ifaces, 1); write_stubdescproto(); } @@ -1031,8 +1031,8 @@ void write_proxies(ifref_t *ifaces) print_proxy( "#error Currently only Wine and WIN32 are supported.\n"); print_proxy( "#endif\n"); print_proxy( "\n"); - write_procformatstring(proxy, ifaces); - write_typeformatstring(proxy, ifaces); + write_procformatstring(proxy, ifaces, 1); + write_typeformatstring(proxy, ifaces, 1); fprintf(proxy, "const CInterfaceProxyVtbl* _%s_ProxyVtblList[] =\n", file_id); fprintf(proxy, "{\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index 69eddb8..9f6c5ac 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -582,7 +582,7 @@ void write_server(ifref_t *ifaces) if (!server) return; - write_formatstringsdecl(server, indent, ifaces); + write_formatstringsdecl(server, indent, ifaces, 0); for (; iface; iface = PREV_LINK(iface)) { @@ -620,8 +620,8 @@ void write_server(ifref_t *ifaces) fprintf(server, "\n"); - write_procformatstring(server, ifaces); - write_typeformatstring(server, ifaces); + write_procformatstring(server, ifaces, 0); + write_typeformatstring(server, ifaces, 0); fclose(server); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 632bc8a..2d7e07f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -142,13 +142,13 @@ static void write_formatdesc(FILE *f, in print_file(f, indent, "\n"); } -void write_formatstringsdecl(FILE *f, int indent, ifref_t *ifaces) +void write_formatstringsdecl(FILE *f, int indent, ifref_t *ifaces, int for_objects) { print_file(f, indent, "#define TYPE_FORMAT_STRING_SIZE %d\n", - get_size_typeformatstring(ifaces)); + get_size_typeformatstring(ifaces, for_objects)); print_file(f, indent, "#define PROC_FORMAT_STRING_SIZE %d\n", - get_size_procformatstring(ifaces)); + get_size_procformatstring(ifaces, for_objects)); fprintf(f, "\n"); write_formatdesc(f, indent, "TYPE"); @@ -275,7 +275,7 @@ #undef CASE_BASETYPE return size; } -void write_procformatstring(FILE *file, const ifref_t *ifaces) +void write_procformatstring(FILE *file, const ifref_t *ifaces, int for_objects) { const ifref_t *iface = ifaces; int indent = 0; @@ -293,7 +293,7 @@ void write_procformatstring(FILE *file, for (; iface; iface = PREV_LINK(iface)) { - if (is_object(iface->iface->attrs) || is_local(iface->iface->attrs)) + if (for_objects != is_object(iface->iface->attrs) || is_local(iface->iface->attrs)) continue; if (iface->iface->funcs) @@ -1385,7 +1385,7 @@ #define CASE_BASETYPE(fctype) \ } -void write_typeformatstring(FILE *file, const ifref_t *ifaces) +void write_typeformatstring(FILE *file, const ifref_t *ifaces, int for_objects) { int indent = 0; var_t *var; @@ -1405,7 +1405,7 @@ void write_typeformatstring(FILE *file, for (; iface; iface = PREV_LINK(iface)) { - if (is_object(iface->iface->attrs) || is_local(iface->iface->attrs)) + if (for_objects != is_object(iface->iface->attrs) || is_local(iface->iface->attrs)) continue; if (iface->iface->funcs) @@ -1900,7 +1900,7 @@ size_t get_size_typeformatstring_var(con return type_offset; } -size_t get_size_procformatstring(const ifref_t *ifaces) +size_t get_size_procformatstring(const ifref_t *ifaces, int for_objects) { const ifref_t *iface = ifaces; size_t size = 1; @@ -1911,7 +1911,7 @@ size_t get_size_procformatstring(const i for (; iface; iface = PREV_LINK(iface)) { - if (is_object(iface->iface->attrs) || is_local(iface->iface->attrs)) + if (for_objects != is_object(iface->iface->attrs) || is_local(iface->iface->attrs)) continue; if (iface->iface->funcs) @@ -1946,7 +1946,7 @@ size_t get_size_procformatstring(const i return size; } -size_t get_size_typeformatstring(const ifref_t *ifaces) +size_t get_size_typeformatstring(const ifref_t *ifaces, int for_objects) { const ifref_t *iface = ifaces; size_t size = 3; @@ -1957,7 +1957,7 @@ size_t get_size_typeformatstring(const i for (; iface; iface = PREV_LINK(iface)) { - if (is_object(iface->iface->attrs) || is_local(iface->iface->attrs)) + if (for_objects != is_object(iface->iface->attrs) || is_local(iface->iface->attrs)) continue; if (iface->iface->funcs) diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 4509032..d4885fb 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -35,16 +35,16 @@ enum remoting_phase PHASE_FREE }; -void write_formatstringsdecl(FILE *f, int indent, ifref_t *ifaces); -void write_procformatstring(FILE *file, const ifref_t *ifaces); -void write_typeformatstring(FILE *file, const ifref_t *ifaces); +void write_formatstringsdecl(FILE *f, int indent, ifref_t *ifaces, int for_objects); +void write_procformatstring(FILE *file, const ifref_t *ifaces, int for_objects); +void write_typeformatstring(FILE *file, const ifref_t *ifaces, int for_objects); size_t get_type_memsize(const type_t *type); unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment, enum pass pass); void print_phase_basetype(FILE *file, int indent, enum remoting_phase phase, enum pass pass, const var_t *var, const char *varname); void write_remoting_arguments(FILE *file, int indent, const func_t *func, unsigned int *type_offset, enum pass pass, enum remoting_phase phase); size_t get_size_procformatstring_var(const var_t *var); size_t get_size_typeformatstring_var(const var_t *var); -size_t get_size_procformatstring(const ifref_t *ifaces); -size_t get_size_typeformatstring(const ifref_t *ifaces); +size_t get_size_procformatstring(const ifref_t *ifaces, int for_objects); +size_t get_size_typeformatstring(const ifref_t *ifaces, int for_objects); int write_expr_eval_routines(FILE *file, const char *iface); void write_expr_eval_routine_list(FILE *file, const char *iface);

1 0

Robert Reif : advapi32: Fix test_LookupAccountSid to work on win9x.
by Alexandre Julliard Aug. 18, 2006

Aug. 18, 2006

Module: wine Branch: master Commit: e8e501f44b428d66c2f64d4d74a2150ec7816c3e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e8e501f44b428d66c2f64d4… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Aug 17 15:24:21 2006 -0400 advapi32: Fix test_LookupAccountSid to work on win9x. --- dlls/advapi32/tests/security.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 51d76e0..9cf2af6 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -892,7 +892,12 @@ static void test_LookupAccountSid(void) ret = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS, 0, 0, 0, 0, 0, 0, &pUsersSid); - ok(ret, "AllocateAndInitializeSid failed with error %ld\n", GetLastError()); + ok(ret || (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), + "AllocateAndInitializeSid failed with error %ld\n", GetLastError()); + + /* not running on NT so give up */ + if (!ret && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + return; /* try NULL account */ acc_size = MAX_PATH;

1 0

Jacek Caban : mshtml: Fix Advise implementation for IPropertyNotifySink.
by Alexandre Julliard Aug. 18, 2006

Aug. 18, 2006

Module: wine Branch: master Commit: 572691e68588edc7300a702833393ed126016960 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=572691e68588edc7300a702… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 23:16:56 2006 +0200 mshtml: Fix Advise implementation for IPropertyNotifySink. --- dlls/mshtml/conpoint.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index f668e18..db66160 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -128,11 +128,10 @@ static HRESULT WINAPI ConnectionPoint_Ad TRACE("(%p)->(%p %p)\n", This, pUnkSink, pdwCookie); hres = IUnknown_QueryInterface(pUnkSink, &This->iid, (void**)&sink); - if(FAILED(hres) && !IsEqualGUID(&IID_IPropertyNotifySink, &This->iid)) { + if(FAILED(hres) && !IsEqualGUID(&IID_IPropertyNotifySink, &This->iid)) hres = IUnknown_QueryInterface(pUnkSink, &IID_IDispatch, (void**)&sink); - if(FAILED(hres)) - return CONNECT_E_CANNOTCONNECT; - } + if(FAILED(hres)) + return CONNECT_E_CANNOTCONNECT; if(This->sinks) { for(i=0; i<This->sinks_size; i++) {

1 0

Jacek Caban : mshtml: Switch nsWebBrowset to editing mode in exec_editmod.
by Alexandre Julliard Aug. 18, 2006

Aug. 18, 2006

Module: wine Branch: master Commit: e3990ddf7bfce090ca4557dce505634a269512a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e3990ddf7bfce090ca4557d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 21:00:55 2006 +0200 mshtml: Switch nsWebBrowset to editing mode in exec_editmod. --- dlls/mshtml/nsiface.idl | 17 +++++++++++++++ dlls/mshtml/olecmd.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index ee17638..46e0a23 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -108,6 +108,7 @@ typedef nsISupports nsIDOMHTMLFormElemen typedef nsISupports nsIDOMHTMLOptionsCollection; typedef nsISupports nsIDOMHTMLCollection; typedef nsISupports nsIDOMRange; +typedef nsISupports nsIEditor; [ object, @@ -1157,6 +1158,22 @@ interface nsIWindowWatcher : nsISupports nsresult SetActiveWindow(nsIDOMWindow *aActiveWindow); } +[ + object, + uuid(d39fd2b4-3978-45d2-a4be-ba448171b61b) +] +interface nsIEditingSession : nsISupports +{ + nsresult GetEditorStatus(PRUint32 *aEditorStatus); + nsresult MakeWindowEditable(nsIDOMWindow *window, const char *aEditorType, + PRBool doAfterUriLoad); + nsresult WindowIsEditable(nsIDOMWindow *window, PRBool *_retval); + nsresult GetEditorForWindow(nsIDOMWindow *window, nsIEditor **_retval); + nsresult SetupEditorOnWindow(nsIDOMWindow *window); + nsresult TearDownEditorOnWindow(nsIDOMWindow *window); + nsresult SetEditorOnControllers(nsIDOMWindow *aWindow, nsIEditor *aEditor); +} + /* * NOTE: * This is a private Wine interface that is implemented by our implementation diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 1669aaa..a95f5b1 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -247,11 +247,59 @@ static HRESULT exec_browsemode(HTMLDocum return S_OK; } +static void setup_ns_editing(NSContainer *This) +{ + nsIInterfaceRequestor *iface_req; + nsIEditingSession *editing_session = NULL; + nsIURIContentListener *listener = NULL; + nsIDOMWindow *dom_window = NULL; + nsresult nsres; + + nsres = nsIWebBrowser_QueryInterface(This->webbrowser, + &IID_nsIInterfaceRequestor, (void**)&iface_req); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIInterfaceRequestor: %08lx\n", nsres); + return; + } + + nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsIEditingSession, + (void**)&editing_session); + nsIInterfaceRequestor_Release(iface_req); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIEditingSession: %08lx\n", nsres); + return; + } + + nsres = nsIWebBrowser_GetContentDOMWindow(This->webbrowser, &dom_window); + nsIDOMWindow_Release(dom_window); + if(NS_FAILED(nsres)) { + ERR("Could not get content DOM window: %08lx\n", nsres); + nsIEditingSession_Release(editing_session); + return; + } + + nsres = nsIEditingSession_MakeWindowEditable(editing_session, dom_window, NULL, FALSE); + nsIEditingSession_Release(editing_session); + if(NS_FAILED(nsres)) { + ERR("MakeWindowEditable failed: %08lx\n", nsres); + return; + } + + /* MakeWindowEditable changes WebBrowser's parent URI content listener. + * It seams to be a bug in Gecko. To workaround it we set our content + * listener again and Gecko's one as its parent. + */ + nsIWebBrowser_GetParentURIContentListener(This->webbrowser, &listener); + nsIURIContentListener_SetParentContentListener(NSURICL(This), listener); + nsIURIContentListener_Release(listener); + nsIWebBrowser_SetParentURIContentListener(This->webbrowser, NSURICL(This)); +} + static HRESULT exec_editmode(HTMLDocument *This) { HRESULT hres; - FIXME("(%p)\n", This); + TRACE("(%p)\n", This); This->usermode = EDITMODE; @@ -306,6 +354,9 @@ static HRESULT exec_editmode(HTMLDocumen } } + if(This->nscontainer) + setup_ns_editing(This->nscontainer); + return S_OK; }

1 0

Stefan Leichter : shlwapi: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard Aug. 18, 2006

Aug. 18, 2006

Module: wine Branch: master Commit: 684b6c24a319cae1da5b2283ca3e55c62e55ae31 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=684b6c24a319cae1da5b228… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Aug 17 18:57:42 2006 +0200 shlwapi: Print 64bit integers with wine_dbgstr_longlong. --- dlls/shlwapi/string.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 34cc5fa..b03bdfb 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1563,7 +1563,7 @@ LPSTR WINAPI StrFormatKBSizeA(LONGLONG l char szBuff[256], *szOut = szBuff + sizeof(szBuff) - 1; LONGLONG ulKB = (llBytes + 1023) >> 10; - TRACE("(%lld,%p,%d)\n", llBytes, lpszDest, cchMax); + TRACE("(0x%s,%p,%d)\n", wine_dbgstr_longlong(llBytes), lpszDest, cchMax); *szOut-- = '\0'; *szOut-- = 'B'; @@ -1591,7 +1591,7 @@ LPWSTR WINAPI StrFormatKBSizeW(LONGLONG WCHAR szBuff[256], *szOut = szBuff + sizeof(szBuff)/sizeof(WCHAR) - 1; LONGLONG ulKB = (llBytes + 1023) >> 10; - TRACE("(%lld,%p,%d)\n", llBytes, lpszDest, cchMax); + TRACE("(0x%s,%p,%d)\n", wine_dbgstr_longlong(llBytes), lpszDest, cchMax); *szOut-- = '\0'; *szOut-- = 'B'; @@ -2265,7 +2265,7 @@ #define PB (KB*KB*KB*KB*KB) double dBytes; UINT i = 0; - TRACE("(%lld,%p,%d)\n", llBytes, lpszDest, cchMax); + TRACE("(0x%s,%p,%d)\n", wine_dbgstr_longlong(llBytes), lpszDest, cchMax); if (!lpszDest || !cchMax) return lpszDest;

1 0

Huw Davies : rpcrt4: Remember to skip over the conformance description.
by Alexandre Julliard Aug. 18, 2006

Aug. 18, 2006

Module: wine Branch: master Commit: 59be6e06000fe7424856697544b47c017acad993 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=59be6e06000fe7424856697… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 17 15:31:32 2006 +0100 rpcrt4: Remember to skip over the conformance description. --- dlls/rpcrt4/ndr_marshall.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 9657ab9..b83fd1e 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2365,6 +2365,8 @@ void WINAPI NdrConformantArrayFree(PMIDL TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); if (pFormat[0] != RPC_FC_CARRAY) FIXME("format=%d\n", pFormat[0]); + pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); + EmbeddedPointerFree(pStubMsg, pMemory, pFormat); }

1 0

Oleg Krylov : comctl32: Fix ImageList_Replace function to correctly apply image mask.
by Alexandre Julliard Aug. 18, 2006

Aug. 18, 2006

Module: wine Branch: master Commit: 496d63473520ed203c4ba1f2d371b725d7bb879b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=496d63473520ed203c4ba1f… Author: Oleg Krylov <oleg.krylov(a)gmail.com> Date: Thu Aug 17 16:08:22 2006 +0300 comctl32: Fix ImageList_Replace function to correctly apply image mask. --- dlls/comctl32/imagelist.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index cbd8f34..cc3078e 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2158,6 +2158,7 @@ ImageList_Replace (HIMAGELIST himl, INT { HDC hdcImage; BITMAP bmp; + HBITMAP hOldBitmap; TRACE("%p %d %p %p\n", himl, i, hbmImage, hbmMask); @@ -2175,29 +2176,34 @@ ImageList_Replace (HIMAGELIST himl, INT GetObjectA (hbmImage, sizeof(BITMAP), (LPVOID)&bmp); /* Replace Image */ - SelectObject (hdcImage, hbmImage); + hOldBitmap = SelectObject (hdcImage, hbmImage); StretchBlt (himl->hdcImage, i * himl->cx, 0, himl->cx, himl->cy, hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); if (himl->hbmMask) { - /* Replace Mask */ - SelectObject (hdcImage, hbmMask); + HDC hdcTemp; + HBITMAP hOldBitmapTemp; - StretchBlt (himl->hdcMask, i * himl->cx, 0, himl->cx, himl->cy, - hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); + hdcTemp = CreateCompatibleDC(0); + hOldBitmapTemp = SelectObject(hdcTemp, hbmMask); + StretchBlt (himl->hdcMask, i * himl->cx, 0, himl->cx, himl->cy, + hdcTemp, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); + SelectObject(hdcTemp, hOldBitmapTemp); + DeleteDC(hdcTemp); /* Remove the background from the image */ - StretchBlt (himl->hdcImage, - i*himl->cx, 0, himl->cx, himl->cy, - hdcImage, - 0, 0, bmp.bmWidth, bmp.bmHeight, + BitBlt (himl->hdcImage, + i*himl->cx, 0, bmp.bmWidth, bmp.bmHeight, + himl->hdcMask, + i*himl->cx, 0, 0x220326); /* NOTSRCAND */ } + SelectObject (hdcImage, hOldBitmap); DeleteDC (hdcImage); return TRUE;

1 0

Paul Vriens : wintrust.h: Added some defines.
by Alexandre Julliard Aug. 18, 2006

Aug. 18, 2006

Module: wine Branch: master Commit: 5ffb0174b049ea9e4cd5d392bccb00be2414c3ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ffb0174b049ea9e4cd5d39… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Aug 18 08:42:47 2006 +0200 wintrust.h: Added some defines. --- include/wintrust.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/wintrust.h b/include/wintrust.h index 26be598..3d2ba8c 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -76,6 +76,20 @@ typedef struct WINTRUST_CERT_INFO_ FILETIME* psftVerifyAsOf; } WINTRUST_CERT_INFO, *PWINTRUST_CERT_INFO; +/* dwUIChoice */ +#define WTD_UI_ALL 1 +#define WTD_UI_NONE 2 +#define WTD_UI_NOBAD 3 +#define WTD_UI_NOGOOD 4 +/* fdwRevocationChecks */ +#define WTD_REVOKE_NONE 0 +#define WTD_REVOKE_WHOLECHAIN 1 +/* dwUnionChoice */ +#define WTD_CHOICE_FILE 1 +#define WTD_CHOICE_CATALOG 2 +#define WTD_CHOICE_BLOB 3 +#define WTD_CHOICE_SIGNER 4 +#define WTD_CHOICE_CERT 5 typedef struct _WINTRUST_DATA {

1 0

Alexandre Julliard : user: Defer all ExitWindowsEx processing to wineboot.
by Alexandre Julliard Aug. 18, 2006

Aug. 18, 2006

Module: wine Branch: master Commit: 8653598a662258c8809d85a77c337cd439e5cb6e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8653598a662258c8809d85a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 17 20:54:21 2006 +0200 user: Defer all ExitWindowsEx processing to wineboot. --- dlls/user/user_main.c | 209 +++++-------------------------------------- programs/explorer/desktop.c | 7 - 2 files changed, 23 insertions(+), 193 deletions(-) diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c index 743bded..4a2915a 100644 --- a/dlls/user/user_main.c +++ b/dlls/user/user_main.c @@ -26,7 +26,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "winreg.h" -#include "tlhelp32.h" #include "controls.h" #include "user_private.h" @@ -284,201 +283,39 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWO /*********************************************************************** - * USER_GetProcessHandleList(Internal) - */ -static HANDLE *USER_GetProcessHandleList(void) -{ - DWORD count, i, n; - HANDLE *list; - PROCESSENTRY32 pe; - HANDLE hSnapshot; - BOOL r; - - hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 ); - if (!hSnapshot) - { - ERR("cannot create snapshot\n"); - return FALSE; - } - - /* count the number of processes plus one */ - for (count=0; ;count++) - { - pe.dwSize = sizeof pe; - if (count) - r = Process32Next( hSnapshot, &pe ); - else - r = Process32First( hSnapshot, &pe ); - if (!r) - break; - } - - /* allocate memory make a list of the process handles */ - list = HeapAlloc( GetProcessHeap(), 0, (count+1)*sizeof(HANDLE) ); - n=0; - for (i=0; i<count; i++) - { - pe.dwSize = sizeof pe; - if (i) - r = Process32Next( hSnapshot, &pe ); - else - r = Process32First( hSnapshot, &pe ); - if (!r) - break; - - /* don't kill ourselves */ - if (GetCurrentProcessId() == pe.th32ProcessID ) - continue; - - /* open the process so we don't can track it */ - list[n] = OpenProcess( PROCESS_QUERY_INFORMATION| - PROCESS_TERMINATE, - FALSE, pe.th32ProcessID ); - - /* check it didn't terminate already */ - if( list[n] ) - n++; - } - list[n]=0; - CloseHandle( hSnapshot ); - - if (!r) - ERR("Error enumerating processes\n"); - - TRACE("return %lu processes\n", n); - - return list; -} - - -/*********************************************************************** - * USER_KillProcesses (Internal) - */ -static DWORD USER_KillProcesses(void) -{ - DWORD n, r, i; - HANDLE *handles; - const DWORD dwShutdownTimeout = 10000; - - TRACE("terminating other processes\n"); - - /* kill it and add it to our list of object to wait on */ - handles = USER_GetProcessHandleList(); - for (n=0; handles && handles[n]; n++) - TerminateProcess( handles[n], 0 ); - - /* wait for processes to exit */ - for (i=0; i<n; i+=MAXIMUM_WAIT_OBJECTS) - { - int n_objs = ((n-i)>MAXIMUM_WAIT_OBJECTS) ? MAXIMUM_WAIT_OBJECTS : (n-i); - r = WaitForMultipleObjects( n_objs, &handles[i], TRUE, dwShutdownTimeout ); - if (r==WAIT_TIMEOUT) - ERR("wait failed!\n"); - } - - /* close the handles */ - for (i=0; i<n; i++) - CloseHandle( handles[i] ); - - HeapFree( GetProcessHeap(), 0, handles ); - - return n; -} - - -/*********************************************************************** - * USER_DoShutdown (Internal) - */ -static void USER_DoShutdown(void) -{ - DWORD i, n; - const DWORD nRetries = 10; - - for (i=0; i<nRetries; i++) - { - n = USER_KillProcesses(); - TRACE("Killed %ld processes, attempt %ld\n", n, i); - if(!n) - break; - } -} - - -/*********************************************************************** * ExitWindowsEx (USER32.@) */ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reason ) { - TRACE("(%x,%lx)\n", flags, reason); - - if (!WIN_IsCurrentThread( GetDesktopWindow() )) - { - BOOL ret = PostMessageW( GetDesktopWindow(), WM_USER + 666, - MAKEWPARAM( flags, 0xbabe ), reason); - if (ret) - return TRUE; - /* this can happen if explorer hasn't been started or created the - * desktop window yet */ - WARN("PostMessage failed with error %ld\n", GetLastError()); - /* fall through to doing it in the same process */ - } + static const WCHAR winebootW[] = { '\\','w','i','n','e','b','o','o','t',0 }; + static const WCHAR killW[] = { ' ','-','-','k','i','l','l',0 }; + static const WCHAR end_sessionW[] = { ' ','-','-','e','n','d','-','s','e','s','s','i','o','n',0 }; + static const WCHAR forceW[] = { ' ','-','-','f','o','r','c','e',0 }; + static const WCHAR shutdownW[] = { ' ','-','-','s','h','u','t','d','o','w','n',0 }; - if ((flags & EWX_FORCE) == 0) - { - HWND *list; + WCHAR cmdline[MAX_PATH + 64]; + PROCESS_INFORMATION pi; + STARTUPINFOW si; - /* We have to build a list of all windows first, as in EnumWindows */ - list = WIN_ListChildren( GetDesktopWindow() ); - if (list) - { - HWND *phwnd; - UINT send_flags; - DWORD_PTR result=1; - - /* Send a WM_QUERYENDSESSION / WM_ENDSESSION message pair to - * each window. Note: it might be better to send all the - * WM_QUERYENDSESSION messages, aggregate the results and then - * send all the WM_ENDSESSION messages with the results but - * that's not what Windows does. - */ - send_flags=(flags & EWX_FORCEIFHUNG) ? SMTO_ABORTIFHUNG : SMTO_NORMAL; - for (phwnd = list; *phwnd; phwnd++) - { - /* Make sure that the window still exists */ - if (!IsWindow( *phwnd )) continue; - if (SendMessageTimeoutW( *phwnd, WM_QUERYENDSESSION, 0, 0, send_flags, 0, &result)) - { - DWORD_PTR dummy; - SendMessageTimeoutW( *phwnd, WM_ENDSESSION, result, 0, send_flags, 0, &dummy ); - if (!result) break; - } - } - HeapFree( GetProcessHeap(), 0, list ); + GetSystemDirectoryW( cmdline, MAX_PATH ); + lstrcatW( cmdline, winebootW ); - if (!result) - return TRUE; - } + if (flags & EWX_FORCE) lstrcatW( cmdline, killW ); + else + { + lstrcatW( cmdline, end_sessionW ); + if (flags & EWX_FORCEIFHUNG) lstrcatW( cmdline, forceW ); } + if (!(flags & EWX_REBOOT)) lstrcatW( cmdline, shutdownW ); - /* USER_DoShutdown will kill all processes except the current process */ - USER_DoShutdown(); - - if (flags & EWX_REBOOT) + memset( &si, 0, sizeof si ); + si.cb = sizeof si; + if (!CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) { - WCHAR winebootW[] = { 'w','i','n','e','b','o','o','t',0 }; - PROCESS_INFORMATION pi; - STARTUPINFOW si; - - memset( &si, 0, sizeof si ); - si.cb = sizeof si; - if (CreateProcessW( NULL, winebootW, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) - { - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } - else - MESSAGE("wine: Failed to start wineboot\n"); + ERR( "Failed to run %s\n", debugstr_w(cmdline) ); + return FALSE; } - + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); return TRUE; } diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index e552599..0b8bfbb 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -64,13 +64,6 @@ static LRESULT WINAPI desktop_wnd_proc( } return 0; - /* simple check to prevent applications accidentally triggering the - * ExitWindowsEx code if they send random messages to the desktop window */ - case WM_USER + 666: - if (HIWORD(wp) == 0xbabe) - return ExitWindowsEx( LOWORD(wp), lp ); - return DefWindowProcW( hwnd, message, wp, lp ); - default: return DefWindowProcW( hwnd, message, wp, lp ); }

1 0

Paul Vriens : secur32: Make tests loadable on NT4.
by Alexandre Julliard Aug. 18, 2006

Aug. 18, 2006

Module: wine Branch: master Commit: e1b1fa757cc7f83ca63ecd8b7efc0752d8c9a0fb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e1b1fa757cc7f83ca63ecd8… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Aug 17 13:42:28 2006 +0200 secur32: Make tests loadable on NT4. --- dlls/secur32/tests/Makefile.in | 2 - dlls/secur32/tests/schannel.c | 101 +++++++++++++++++++++++++--------------- 2 files changed, 63 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e1b1fa757cc7f83ca63…

1 0