January 2013 - Wine-commits

Nikolay Sivov : user32: Accept BI_BITFIELDS format for icons when creating icons.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 4c24882e3e1e7e373fc35f19a077c4acf9f57f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c24882e3e1e7e373fc35f19a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 23 23:18:07 2013 +0400 user32: Accept BI_BITFIELDS format for icons when creating icons. --- dlls/user32/cursoricon.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 8f6f9ce..25059e0 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -813,7 +813,8 @@ static HICON create_icon_from_bmi( BITMAPINFO *bmi, HMODULE module, LPCWSTR resn if ( (bmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) && (bmi->bmiHeader.biSize != sizeof(BITMAPINFOHEADER) || - bmi->bmiHeader.biCompression != BI_RGB) ) + (bmi->bmiHeader.biCompression != BI_RGB && + bmi->bmiHeader.biCompression != BI_BITFIELDS)) ) { WARN_(cursor)("\tinvalid resource bitmap header.\n"); return 0;

1 0

Jacek Caban : mshtml: Get rid of PRUint8 type.
by Alexandre Julliard 23 Jan '13

23 Jan '13

Module: wine Branch: master Commit: 2d100f4e988342aee82b745672230a0998557669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d100f4e988342aee82b74567… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 18:43:39 2013 +0100 mshtml: Get rid of PRUint8 type. --- dlls/mshtml/nsiface.idl | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 8a359d9..b6692fb 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -45,7 +45,6 @@ typedef nsIIDRef nsCIDRef; typedef WCHAR PRUnichar; typedef ULONG PRUint32; typedef WORD PRUint16; -typedef BYTE PRUint8; typedef ULONGLONG PRUint64; /* @@ -57,7 +56,7 @@ typedef ULONGLONG PRUint64; #define int32_t LONG #define int64_t INT64 -#define uint8_t PRUint8 +#define uint8_t UINT8 #define uint16_t PRUint16 #define uint32_t PRUint32 #define uint64_t PRUint64

1 0

Jacek Caban : mshtml: Get rid of PRUint16 type.
by Alexandre Julliard 23 Jan '13

23 Jan '13

Module: wine Branch: master Commit: cef2907da7389d3f000c0fb43acb2146a0e6d543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef2907da7389d3f000c0fb43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 18:43:55 2013 +0100 mshtml: Get rid of PRUint16 type. --- dlls/mshtml/editor.c | 4 ++-- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmldoc3.c | 2 +- dlls/mshtml/htmlelemcol.c | 2 +- dlls/mshtml/htmlevent.c | 4 ++-- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsiface.idl | 3 +-- dlls/mshtml/txtrange.c | 6 +++--- 9 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 6fee9c7..ccbdd59 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -218,7 +218,7 @@ static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_ PRUint32 child_cnt, i; nsIDOMNode *child_node; nsIDOMNodeList *node_list; - PRUint16 node_type; + UINT16 node_type; nsIDOMElement_HasChildNodes(elem, &has_children); if(!has_children) @@ -266,7 +266,7 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) nsIDOMNode *node = NULL, *tmp_node; nsAString tag_str; LPCWSTR tag; - PRUint16 node_type; + UINT16 node_type; nsresult nsres; *ret = 0; diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a7b87a8..bfcf466 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -646,7 +646,7 @@ static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, if(eid == EVENTID_CLICK) { nsIDOMMouseEvent *mouse_event; - PRUint16 button; + UINT16 button; nsresult nsres; TRACE("CLICK\n"); diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index f5e2f54..e1efa7a 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -74,7 +74,7 @@ HRESULT get_doc_elem_by_id(HTMLDocumentNode *doc, const WCHAR *id, HTMLElement * assert(nsres == NS_OK); if(nsnode && nselem) { - PRUint16 pos; + UINT16 pos; nsres = nsIDOMNode_CompareDocumentPosition(nsnode, (nsIDOMNode*)nselem, &pos); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 11cc5a5..39e259c 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -79,7 +79,7 @@ static void elem_vector_normalize(elem_vector_t *buf) static inline BOOL is_elem_node(nsIDOMNode *node) { - PRUint16 type=0; + UINT16 type=0; nsIDOMNode_GetNodeType(node, &type); diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 68a3942..f849d60 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -564,7 +564,7 @@ static HRESULT WINAPI HTMLEventObj_get_keyCode(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_button(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - PRUint16 button = 0; + UINT16 button = 0; TRACE("(%p)->(%p)\n", This, p); @@ -1049,7 +1049,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e BOOL prevent_default = FALSE; HTMLInnerWindow *window; HTMLDOMNode *node; - PRUint16 node_type; + UINT16 node_type; nsresult nsres; HRESULT hres; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 4269f6c..2c804b6 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -373,7 +373,7 @@ static HRESULT WINAPI HTMLDOMNode_Invoke(IHTMLDOMNode *iface, DISPID dispIdMembe static HRESULT WINAPI HTMLDOMNode_get_nodeType(IHTMLDOMNode *iface, LONG *p) { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - PRUint16 type = -1; + UINT16 type = -1; TRACE("(%p)->(%p)\n", This, p); @@ -1085,7 +1085,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNode **ret) { - PRUint16 node_type; + UINT16 node_type; HRESULT hres; nsIDOMNode_GetNodeType(nsnode, &node_type); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 6086846..215bb38 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -914,7 +914,7 @@ static HRESULT nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNo nsIDOMNodeList *node_list = NULL; cpp_bool has_children = FALSE; nsIContent *nscontent; - PRUint16 type; + UINT16 type; nsresult nsres; nsIDOMNode_HasChildNodes(nsnode, &has_children); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index b6692fb..31bd347 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -44,7 +44,6 @@ typedef nsIIDRef nsCIDRef; typedef WCHAR PRUnichar; typedef ULONG PRUint32; -typedef WORD PRUint16; typedef ULONGLONG PRUint64; /* @@ -57,7 +56,7 @@ typedef ULONGLONG PRUint64; #define int64_t INT64 #define uint8_t UINT8 -#define uint16_t PRUint16 +#define uint16_t UINT16 #define uint32_t PRUint32 #define uint64_t PRUint64 diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 085aa84..813fad7 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -54,7 +54,7 @@ typedef struct { } wstrbuf_t; typedef struct { - PRUint16 type; + UINT16 type; nsIDOMNode *node; PRUint32 off; nsAString str; @@ -116,9 +116,9 @@ static int string_to_nscmptype(LPCWSTR str) return -1; } -static PRUint16 get_node_type(nsIDOMNode *node) +static UINT16 get_node_type(nsIDOMNode *node) { - PRUint16 type = 0; + UINT16 type = 0; if(node) nsIDOMNode_GetNodeType(node, &type);

1 0

Jacek Caban : mshtml: Get rid of PRUint32 outside XPCOM C API.
by Alexandre Julliard 23 Jan '13

23 Jan '13

Module: wine Branch: master Commit: 07e72de9a4ddaff75c05a351d7d84e96be619b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e72de9a4ddaff75c05a351d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 18:44:42 2013 +0100 mshtml: Get rid of PRUint32 outside XPCOM C API. --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/editor.c | 4 ++-- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 4 ++-- dlls/mshtml/htmlelemcol.c | 6 +++--- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlimg.c | 4 ++-- dlls/mshtml/htmlnode.c | 6 +++--- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmlstylesheet.c | 4 ++-- dlls/mshtml/htmltextnode.c | 2 +- dlls/mshtml/htmlwindow.c | 8 ++++---- dlls/mshtml/mshtml_private.h | 6 +++--- dlls/mshtml/navigate.c | 12 ++++++------ dlls/mshtml/nsembed.c | 20 +++++++++++--------- dlls/mshtml/nsiface.idl | 3 +-- dlls/mshtml/nsio.c | 30 +++++++++++++++--------------- dlls/mshtml/nsservice.c | 4 ++-- dlls/mshtml/propbag.c | 2 +- dlls/mshtml/script.c | 2 +- dlls/mshtml/txtrange.c | 4 ++-- 22 files changed, 66 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07e72de9a4ddaff75c05a…

1 0

Jacek Caban : mshtml: Get rid of PRUint64 type.
by Alexandre Julliard 23 Jan '13

23 Jan '13

Module: wine Branch: master Commit: 7867ce8560dd237b22c475e8983690927b2b7a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7867ce8560dd237b22c475e89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 18:44:56 2013 +0100 mshtml: Get rid of PRUint64 type. --- dlls/mshtml/navigate.c | 4 ++-- dlls/mshtml/nsiface.idl | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 72afc10..f0edca0 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -138,7 +138,7 @@ static nsresult NSAPI nsInputStream_Close(nsIInputStream *iface) return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsInputStream_Available(nsIInputStream *iface, PRUint64 *_retval) +static nsresult NSAPI nsInputStream_Available(nsIInputStream *iface, UINT64 *_retval) { nsProtocolStream *This = impl_from_nsIInputStream(iface); FIXME("(%p)->(%p)\n", This, _retval); @@ -1001,7 +1001,7 @@ HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) { - PRUint64 available = 0; + UINT64 available = 0; UINT32 data_len = 0; char *data, *post_data; nsresult nsres; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index d12b465..647566f 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -43,7 +43,6 @@ typedef REFIID nsIIDRef; typedef nsIIDRef nsCIDRef; typedef WCHAR PRUnichar; -typedef ULONGLONG PRUint64; /* * Mozilla uses stdint.h types for its headers. Following defines make this IDL file @@ -57,7 +56,7 @@ typedef ULONGLONG PRUint64; #define uint8_t UINT8 #define uint16_t UINT16 #define uint32_t UINT32 -#define uint64_t PRUint64 +#define uint64_t UINT64 typedef uint64_t DOMTimeStamp; typedef uint32_t nsLoadFlags;

1 0

Jacek Caban : winhttp: Test that the data is really read in test_secure_connection.
by Alexandre Julliard 23 Jan '13

23 Jan '13

Module: wine Branch: master Commit: 0ebbd991c1fce7e3bf6648a4c995ae36b642c5cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ebbd991c1fce7e3bf6648a4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 15:48:02 2013 +0100 winhttp: Test that the data is really read in test_secure_connection. --- dlls/winhttp/tests/winhttp.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 132551c..fd0db18 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -792,7 +792,7 @@ static void test_secure_connection(void) static const WCHAR google[] = {'w','w','w','.','g','o','o','g','l','e','.','c','o','m',0}; HINTERNET ses, con, req; - DWORD size, status, policy, bitness; + DWORD size, status, policy, bitness, read_size; BOOL ret; CERT_CONTEXT *cert; WINHTTP_CERTIFICATE_INFO info; @@ -873,13 +873,16 @@ static void test_secure_connection(void) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); ok(!ret, "succeeded unexpectedly\n"); + read_size = 0; for (;;) { size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); if (!size) break; + read_size += size; } + ok(read_size > 2014, "read_size = %u\n", read_size); cleanup: WinHttpCloseHandle(req);

1 0

André Hentschel : configure: Add ARM64 define.
by Alexandre Julliard 23 Jan '13

23 Jan '13

Module: wine Branch: master Commit: e80de55bca6a1296e8bb04542a35362d42294e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80de55bca6a1296e8bb04542… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 22 20:02:03 2013 +0100 configure: Add ARM64 define. --- configure | 26 ++++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ec6a94b..ccd0283 100755 --- a/configure +++ b/configure @@ -14995,6 +14995,32 @@ if test $ac_cv_cpp_def___powerpc__ = yes; then : CFLAGS="$CFLAGS -D__powerpc__" LINTFLAGS="$LINTFLAGS -D__powerpc__" fi ;; + *aarch64*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __aarch64__" >&5 +$as_echo_n "checking whether we need to define __aarch64__... " >&6; } +if ${ac_cv_cpp_def___aarch64__+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __aarch64__ +yes +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : + ac_cv_cpp_def___aarch64__=yes +else + ac_cv_cpp_def___aarch64__=no +fi +rm -f conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___aarch64__" >&5 +$as_echo "$ac_cv_cpp_def___aarch64__" >&6; } +if test $ac_cv_cpp_def___aarch64__ = yes; then : + CFLAGS="$CFLAGS -D__aarch64__" + LINTFLAGS="$LINTFLAGS -D__aarch64__" +fi ;; *arm*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __arm__" >&5 $as_echo_n "checking whether we need to define __arm__... " >&6; } if ${ac_cv_cpp_def___arm__+:} false; then : diff --git a/configure.ac b/configure.ac index fd760cf..dde896f 100644 --- a/configure.ac +++ b/configure.ac @@ -2486,6 +2486,7 @@ case $host_cpu in *sparc*) WINE_CHECK_DEFINE([__sparc__]) ;; *powerpc64*) WINE_CHECK_DEFINE([__powerpc64__]) ;; *powerpc*) WINE_CHECK_DEFINE([__powerpc__]) ;; + *aarch64*) WINE_CHECK_DEFINE([__aarch64__]) ;; *arm*) WINE_CHECK_DEFINE([__arm__]) ;; esac

1 0

André Hentschel : dbghelp: Implement rudimentary stack walk for ARM64.
by Alexandre Julliard 23 Jan '13

23 Jan '13

Module: wine Branch: master Commit: 49f59ccf7136df09fb1cd2a6e56a13986674c7f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f59ccf7136df09fb1cd2a6e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 22 20:34:28 2013 +0100 dbghelp: Implement rudimentary stack walk for ARM64. --- dlls/dbghelp/cpu_arm64.c | 100 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 99 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c index 26407f7..c816fe3 100644 --- a/dlls/dbghelp/cpu_arm64.c +++ b/dlls/dbghelp/cpu_arm64.c @@ -46,11 +46,109 @@ static unsigned arm64_get_addr(HANDLE hThread, const CONTEXT* ctx, } } +#ifdef __aarch64__ +enum st_mode {stm_start, stm_arm64, stm_done}; + +/* indexes in Reserved array */ +#define __CurrentModeCount 0 + +#define curr_mode (frame->Reserved[__CurrentModeCount] & 0x0F) +#define curr_count (frame->Reserved[__CurrentModeCount] >> 4) + +#define set_curr_mode(m) {frame->Reserved[__CurrentModeCount] &= ~0x0F; frame->Reserved[__CurrentModeCount] |= (m & 0x0F);} +#define inc_curr_count() (frame->Reserved[__CurrentModeCount] += 0x10) + +/* fetch_next_frame() + * + * modify (at least) context.Pc using unwind information + * either out of debug info (dwarf), or simple Lr trace + */ +static BOOL fetch_next_frame(struct cpu_stack_walk* csw, + CONTEXT* context, DWORD_PTR curr_pc) +{ + DWORD_PTR xframe; + DWORD_PTR oldReturn = context->X30; + + if (dwarf2_virtual_unwind(csw, curr_pc, context, &xframe)) + { + context->Sp = xframe; + context->Pc = oldReturn; + return TRUE; + } + + if (context->Pc == context->X30) return FALSE; + context->Pc = oldReturn; + + return TRUE; +} + +static BOOL arm64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) +{ + unsigned deltapc = curr_count <= 1 ? 0 : 4; + + /* sanity check */ + if (curr_mode >= stm_done) return FALSE; + + TRACE("Enter: PC=%s Frame=%s Return=%s Stack=%s Mode=%s Count=%s\n", + wine_dbgstr_addr(&frame->AddrPC), + wine_dbgstr_addr(&frame->AddrFrame), + wine_dbgstr_addr(&frame->AddrReturn), + wine_dbgstr_addr(&frame->AddrStack), + curr_mode == stm_start ? "start" : "ARM64", + wine_dbgstr_longlong(curr_count)); + + if (curr_mode == stm_start) + { + /* Init done */ + set_curr_mode(stm_arm64); + frame->AddrReturn.Mode = frame->AddrStack.Mode = AddrModeFlat; + /* don't set up AddrStack on first call. Either the caller has set it up, or + * we will get it in the next frame + */ + memset(&frame->AddrBStore, 0, sizeof(frame->AddrBStore)); + } + else + { + if (context->Sp != frame->AddrStack.Offset) FIXME("inconsistent Stack Pointer\n"); + if (context->Pc != frame->AddrPC.Offset) FIXME("inconsistent Program Counter\n"); + + if (frame->AddrReturn.Offset == 0) goto done_err; + if (!fetch_next_frame(csw, context, frame->AddrPC.Offset - deltapc)) + goto done_err; + } + + memset(&frame->Params, 0, sizeof(frame->Params)); + + /* set frame information */ + frame->AddrStack.Offset = context->Sp; + frame->AddrReturn.Offset = context->X30; + frame->AddrFrame.Offset = context->X29; + frame->AddrPC.Offset = context->Pc; + + frame->Far = TRUE; + frame->Virtual = TRUE; + inc_curr_count(); + + TRACE("Leave: PC=%s Frame=%s Return=%s Stack=%s Mode=%s Count=%s FuncTable=%p\n", + wine_dbgstr_addr(&frame->AddrPC), + wine_dbgstr_addr(&frame->AddrFrame), + wine_dbgstr_addr(&frame->AddrReturn), + wine_dbgstr_addr(&frame->AddrStack), + curr_mode == stm_start ? "start" : "ARM", + wine_dbgstr_longlong(curr_count), + frame->FuncTableEntry); + + return TRUE; +done_err: + set_curr_mode(stm_done); + return FALSE; +} +#else static BOOL arm64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) { - FIXME("not done for ARM64\n"); return FALSE; } +#endif static unsigned arm64_map_dwarf_register(unsigned regno) {

1 0

André Hentschel : dbghelp: Remove useless code in ARM stack walk.
by Alexandre Julliard 23 Jan '13

23 Jan '13

Module: wine Branch: master Commit: 9d49dd82e8c3e40b9aa847d14af6cda3a37f5fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d49dd82e8c3e40b9aa847d14… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 22 20:35:21 2013 +0100 dbghelp: Remove useless code in ARM stack walk. --- dlls/dbghelp/cpu_arm.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 769bc95..740db0f 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -99,13 +99,6 @@ static BOOL arm_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CON if (curr_mode == stm_start) { - if ((frame->AddrPC.Mode == AddrModeFlat) && - (frame->AddrFrame.Mode != AddrModeFlat)) - { - WARN("Bad AddrPC.Mode / AddrFrame.Mode combination\n"); - goto done_err; - } - /* Init done */ set_curr_mode(stm_arm); frame->AddrReturn.Mode = frame->AddrStack.Mode = AddrModeFlat;

1 0

Ričardas Barkauskas : advapi32: Add AddMandatoryAce stub.
by Alexandre Julliard 23 Jan '13

23 Jan '13

Module: wine Branch: master Commit: 9a448b5d6a42033ed8b3354e6b576aa70c574c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a448b5d6a42033ed8b3354e6… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Jan 22 23:52:09 2013 +0200 advapi32: Add AddMandatoryAce stub. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 21357fa..38342dc 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -25,7 +25,7 @@ @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) # @ stub AddAuditAccessObjectAce # @ stub AddConditionalAce -# @ stub AddMandatoryAce +@ stdcall AddMandatoryAce(ptr long long long ptr) # @ stub AddUsersToEncryptedFileEx # @ stub ADVAPI32_1000 # @ stub AddUsersToEncryptedFile diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 954a1c5..8e2f39c 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1567,6 +1567,12 @@ BOOL WINAPI AddAce( return set_ntstatus(RtlAddAce(pAcl, dwAceRevision, dwStartingAceIndex, pAceList, nAceListLength)); } +BOOL WINAPI AddMandatoryAce(ACL *acl, DWORD ace_revision, DWORD ace_flags, DWORD mandatory_policy, PSID label_sid) +{ + FIXME("%p %x %x %x %p - stub\n", acl, ace_revision, ace_flags, mandatory_policy, label_sid); + return FALSE; +} + /****************************************************************************** * DeleteAce [ADVAPI32.@] */

1 0