wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Michael Stefaniuc : user32: Don't print the function name twice in a FIXME.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: adc6b60f17b4b05ff6aa2c059a8f5acaa4da98f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc6b60f17b4b05ff6aa2c059… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 4 00:21:03 2010 +0100 user32: Don't print the function name twice in a FIXME. --- dlls/user32/win.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3953f09..9a19b2a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3310,7 +3310,7 @@ BOOL WINAPI GetWindowInfo( HWND hwnd, PWINDOWINFO pwi) */ BOOL WINAPI SwitchDesktop( HDESK hDesktop) { - FIXME("SwitchDesktop(hwnd %p) stub!\n", hDesktop); + FIXME("(hwnd %p) stub!\n", hDesktop); return TRUE; }

1 0

Michael Stefaniuc : shell32: Don't print the function name twice in an ERR.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 816a25427654d1adf7a9e03f0e0c2f80bd812d41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=816a25427654d1adf7a9e03f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 4 00:20:48 2010 +0100 shell32: Don't print the function name twice in an ERR. --- dlls/shell32/classes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index f4aa870..0556f97 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -426,7 +426,7 @@ BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD pdwAttributes) if (!_ILIsPidlSimple(pidlFolder)) { static int firstHit = 1; if (firstHit) { - ERR("HCR_GetFolderAttributes should be called for simple PIDL's only!\n"); + ERR("should be called for simple PIDL's only!\n"); firstHit = 0; } return FALSE;

1 0

Michael Stefaniuc : shlwapi: Don't print the function name twice in an ERR.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 36d269ac2259214e65f6e44f29fb564739f87927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d269ac2259214e65f6e44f2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 4 00:20:57 2010 +0100 shlwapi: Don't print the function name twice in an ERR. --- dlls/shlwapi/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index c6fa977..19083dc 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2314,7 +2314,7 @@ HRESULT WINAPI UrlCreateFromPathW(LPCWSTR pszPath, LPWSTR pszUrl, LPDWORD pcchUr */ HRESULT WINAPI SHAutoComplete(HWND hwndEdit, DWORD dwFlags) { - FIXME("SHAutoComplete stub\n"); + FIXME("stub\n"); return S_FALSE; }

1 0

Michael Stefaniuc : riched20: Don't print the function name twice in ERR/ WARN.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: fc3e2ba95432f27ee67417e909d3637016b23c92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc3e2ba95432f27ee67417e90… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 4 00:20:29 2010 +0100 riched20: Don't print the function name twice in ERR/WARN. The ERR/WARN macros already print the function name. --- dlls/riched20/reader.c | 49 +++++++++++++++++++++-------------------------- 1 files changed, 22 insertions(+), 27 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index de468c7..9f88cf7 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -787,7 +787,6 @@ static void ReadFontTbl(RTF_Info *info) RTFFont *fp = NULL; char buf[rtfBufSiz], *bp; int old = -1; - const char *fn = "ReadFontTbl"; for (;;) { @@ -803,19 +802,19 @@ static void ReadFontTbl(RTF_Info *info) else if (RTFCheckCM (info, rtfGroup, rtfBeginGroup)) old = 0; /* brace */ else /* can't tell! */ - ERR ( "%s: Cannot determine format\n", fn); + ERR ("cannot determine format\n"); } if (old == 0) /* need to find "{" here */ { if (!RTFCheckCM (info, rtfGroup, rtfBeginGroup)) - ERR ( "%s: missing \"{\"\n", fn); + ERR ("missing \"{\"\n"); RTFGetToken (info); /* yes, skip to next token */ if (info->rtfClass == rtfEOF) break; } fp = New (RTFFont); if (fp == NULL) { - ERR ( "%s: cannot allocate font entry\n", fn); + ERR ("cannot allocate font entry\n"); break; } @@ -841,8 +840,8 @@ static void ReadFontTbl(RTF_Info *info) { default: /* ignore token but announce it */ - WARN ("%s: unknown token \"%s\"\n", - fn, info->rtfTextBuf); + WARN ("unknown token \"%s\"\n", + info->rtfTextBuf); break; case rtfFontFamily: fp->rtfFFamily = info->rtfMinor; @@ -903,7 +902,7 @@ static void ReadFontTbl(RTF_Info *info) *bp = '\0'; fp->rtfFName = RTFStrSave (buf); if (fp->rtfFName == NULL) - ERR ( "%s: cannot allocate font name\n", fn); + ERR ("cannot allocate font name\n"); /* already have next token; don't read one */ /* at bottom of loop */ continue; @@ -911,8 +910,7 @@ static void ReadFontTbl(RTF_Info *info) else { /* ignore token but announce it */ - WARN ( "%s: unknown token \"%s\"\n", - fn,info->rtfTextBuf); + WARN ("unknown token \"%s\"\n", info->rtfTextBuf); } RTFGetToken (info); if (info->rtfClass == rtfEOF) @@ -924,7 +922,7 @@ static void ReadFontTbl(RTF_Info *info) { RTFGetToken (info); if (!RTFCheckCM (info, rtfGroup, rtfEndGroup)) - ERR ( "%s: missing \"}\"\n", fn); + ERR ("missing \"}\"\n"); if (info->rtfClass == rtfEOF) break; } @@ -938,7 +936,7 @@ static void ReadFontTbl(RTF_Info *info) } } if (!fp || (fp->rtfFNum == -1)) - ERR( "%s: missing font number\n", fn); + ERR("missing font number\n"); /* * Could check other pieces of structure here, too, I suppose. */ @@ -967,7 +965,6 @@ static void ReadColorTbl(RTF_Info *info) { RTFColor *cp; int cnum = 0; - const char *fn = "ReadColorTbl"; int group_level = 1; for (;;) @@ -990,7 +987,7 @@ static void ReadColorTbl(RTF_Info *info) cp = New (RTFColor); if (cp == NULL) { - ERR ( "%s: cannot allocate color entry\n", fn); + ERR ("cannot allocate color entry\n"); break; } cp->rtfCNum = cnum++; @@ -1013,7 +1010,7 @@ static void ReadColorTbl(RTF_Info *info) if (info->rtfClass == rtfEOF) break; if (!RTFCheckCM (info, rtfText, ';')) - ERR ("%s: malformed entry\n", fn); + ERR ("malformed entry\n"); } RTFRouteToken (info); /* feed "}" back to router */ } @@ -1029,7 +1026,6 @@ static void ReadStyleSheet(RTF_Info *info) RTFStyle *sp; RTFStyleElt *sep, *sepLast; char buf[rtfBufSiz], *bp; - const char *fn = "ReadStyleSheet"; int real_style; for (;;) @@ -1041,7 +1037,7 @@ static void ReadStyleSheet(RTF_Info *info) break; sp = New (RTFStyle); if (sp == NULL) { - ERR ( "%s: cannot allocate stylesheet entry\n", fn); + ERR ("cannot allocate stylesheet entry\n"); break; } sp->rtfSName = NULL; @@ -1055,7 +1051,7 @@ static void ReadStyleSheet(RTF_Info *info) sp->rtfExpanding = 0; info->styleList = sp; if (!RTFCheckCM (info, rtfGroup, rtfBeginGroup)) - ERR ( "%s: missing \"{\"\n", fn); + ERR ("missing \"{\"\n"); real_style = TRUE; for (;;) { @@ -1067,7 +1063,7 @@ static void ReadStyleSheet(RTF_Info *info) { if (RTFCheckMM (info, rtfSpecialChar, rtfOptDest)) { RTFGetToken(info); - ERR( "%s: skipping optional destination\n", fn); + ERR("skipping optional destination\n"); RTFSkipGroup(info); info->rtfClass = rtfGroup; info->rtfMajor = rtfEndGroup; @@ -1110,7 +1106,7 @@ static void ReadStyleSheet(RTF_Info *info) sep = New (RTFStyleElt); if (sep == NULL) { - ERR ( "%s: cannot allocate style element\n", fn); + ERR ("cannot allocate style element\n"); break; } sep->rtfSEClass = info->rtfClass; @@ -1119,7 +1115,7 @@ static void ReadStyleSheet(RTF_Info *info) sep->rtfSEParam = info->rtfParam; sep->rtfSEText = RTFStrSave (info->rtfTextBuf); if (sep->rtfSEText == NULL) - ERR ( "%s: cannot allocate style element text\n", fn); + ERR ("cannot allocate style element text\n"); if (sepLast == NULL) sp->rtfSSEList = sep; /* first element */ else /* add to end */ @@ -1133,7 +1129,7 @@ static void ReadStyleSheet(RTF_Info *info) * This passes over "{\*\keycode ... }, among * other things. A temporary (perhaps) hack. */ - ERR( "%s: skipping begin\n", fn); + ERR("skipping begin\n"); RTFSkipGroup (info); continue; } @@ -1154,19 +1150,18 @@ static void ReadStyleSheet(RTF_Info *info) *bp = '\0'; sp->rtfSName = RTFStrSave (buf); if (sp->rtfSName == NULL) - ERR ( "%s: cannot allocate style name\n", fn); + ERR ("cannot allocate style name\n"); } else /* unrecognized */ { /* ignore token but announce it */ - WARN ( "%s: unknown token \"%s\"\n", - fn, info->rtfTextBuf); + WARN ("unknown token \"%s\"\n", info->rtfTextBuf); } } if (real_style) { RTFGetToken (info); if (!RTFCheckCM (info, rtfGroup, rtfEndGroup)) - ERR ( "%s: missing \"}\"\n", fn); + ERR ("missing \"}\"\n"); /* * Check over the style structure. A name is a must. * If no style number was specified, check whether it's the @@ -1178,12 +1173,12 @@ static void ReadStyleSheet(RTF_Info *info) * Some German RTF writers use "Standard" instead of "Normal". */ if (sp->rtfSName == NULL) - ERR ( "%s: missing style name\n", fn); + ERR ("missing style name\n"); if (sp->rtfSNum < 0) { if (strncmp (buf, "Normal", 6) != 0 && strncmp (buf, "Standard", 8) != 0) - ERR ( "%s: missing style number\n", fn); + ERR ("missing style number\n"); sp->rtfSNum = rtfNormalStyleNum; } if (sp->rtfSNextPar == -1) /* if \snext not given, */

1 0

Michael Stefaniuc : msi: Don't print the function name twice in a WARN.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 643f55ababe7f90bbfe2afb93550dd598c5a3541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=643f55ababe7f90bbfe2afb93… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 4 00:20:37 2010 +0100 msi: Don't print the function name twice in a WARN. --- dlls/msi/msiquery.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index ddbb28d..b673832 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -831,7 +831,7 @@ UINT WINAPI MsiDatabaseCommit( MSIHANDLE hdb ) return ERROR_INVALID_HANDLE; IWineMsiRemoteDatabase_Release( remote_database ); - WARN("MsiDatabaseCommit not allowed during a custom action!\n"); + WARN("not allowed during a custom action!\n"); return ERROR_SUCCESS; }

1 0

Nikolay Sivov : msxml3: Use existing helpers for heap allocations.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: d8a9a691e6c651fe4ccf96162e196e46bd7d04bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a9a691e6c651fe4ccf96162… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Feb 3 22:47:53 2010 +0300 msxml3: Use existing helpers for heap allocations. --- dlls/msxml3/attribute.c | 4 +- dlls/msxml3/bsc.c | 10 +++---- dlls/msxml3/cdata.c | 8 +++--- dlls/msxml3/comment.c | 4 +- dlls/msxml3/docfrag.c | 4 +- dlls/msxml3/domdoc.c | 40 +++++++++++++++--------------- dlls/msxml3/domimpl.c | 4 +- dlls/msxml3/element.c | 22 ++++++++-------- dlls/msxml3/entityref.c | 4 +- dlls/msxml3/httprequest.c | 4 +- dlls/msxml3/node.c | 8 +++--- dlls/msxml3/nodelist.c | 4 +- dlls/msxml3/nodemap.c | 10 +++--- dlls/msxml3/parseerror.c | 4 +- dlls/msxml3/pi.c | 4 +- dlls/msxml3/queryresult.c | 2 +- dlls/msxml3/saxreader.c | 60 +++++++++++++++++++++------------------------ dlls/msxml3/schema.c | 4 +- dlls/msxml3/text.c | 8 +++--- dlls/msxml3/xmldoc.c | 4 +- dlls/msxml3/xmlelem.c | 18 ++++++------ 21 files changed, 112 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8a9a691e6c651fe4ccf9…

1 0

Nikolay Sivov : msxml4: Add self-registration for CLSID_DOMDocument40, accept it in classfactory.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: bc3153affa78ee62742a81fb224da13cb6e67810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3153affa78ee62742a81fb2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Feb 3 22:34:45 2010 +0300 msxml4: Add self-registration for CLSID_DOMDocument40, accept it in classfactory. --- dlls/msxml3/factory.c | 3 +- dlls/msxml4/Makefile.in | 5 +- dlls/msxml4/msxml4.spec | 6 +- dlls/msxml4/regsvr.c | 393 +++++++++++++++++++++++++++++++++++++++++++++++ include/msxml2.idl | 8 + tools/wine.inf.in | 1 + 6 files changed, 410 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc3153affa78ee62742a8…

1 0

Nikolay Sivov : Fix remaining copy&paste typos in self-registration functions comments.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 4d7d648b9741f89cc0bf31510b84430c7c80ef2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7d648b9741f89cc0bf31510… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Feb 3 20:28:32 2010 +0300 Fix remaining copy&paste typos in self-registration functions comments. --- dlls/browseui/regsvr.c | 4 ++-- dlls/hnetcfg/regsvr.c | 4 ++-- dlls/msctf/regsvr.c | 4 ++-- dlls/wbemprox/regsvr.c | 4 ++-- dlls/wmiutils/regsvr.c | 4 ++-- dlls/wuapi/regsvr.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/browseui/regsvr.c b/dlls/browseui/regsvr.c index 62b4ea6..e9d9b97 100644 --- a/dlls/browseui/regsvr.c +++ b/dlls/browseui/regsvr.c @@ -482,7 +482,7 @@ static struct regsvr_interface const interface_list[] = { }; /*********************************************************************** - * DllRegisterServer (HHCTRL.@) + * DllRegisterServer (BROWSEUI.@) */ HRESULT WINAPI DllRegisterServer(void) { @@ -497,7 +497,7 @@ HRESULT WINAPI DllRegisterServer(void) } /*********************************************************************** - * DllUnregisterServer (HHCTRL.@) + * DllUnregisterServer (BROWSEUI.@) */ HRESULT WINAPI DllUnregisterServer(void) { diff --git a/dlls/hnetcfg/regsvr.c b/dlls/hnetcfg/regsvr.c index e739cc0..829590a 100644 --- a/dlls/hnetcfg/regsvr.c +++ b/dlls/hnetcfg/regsvr.c @@ -400,7 +400,7 @@ static struct regsvr_interface const interface_list[] = { }; /*********************************************************************** - * DllRegisterServer (INETCOMM.@) + * DllRegisterServer (HNETCFG.@) */ HRESULT WINAPI DllRegisterServer(void) { @@ -415,7 +415,7 @@ HRESULT WINAPI DllRegisterServer(void) } /*********************************************************************** - * DllUnregisterServer (INETCOMM.@) + * DllUnregisterServer (HNETCFG.@) */ HRESULT WINAPI DllUnregisterServer(void) { diff --git a/dlls/msctf/regsvr.c b/dlls/msctf/regsvr.c index a47d984..aa050ed 100644 --- a/dlls/msctf/regsvr.c +++ b/dlls/msctf/regsvr.c @@ -474,7 +474,7 @@ static struct regsvr_interface const interface_list[] = { }; /*********************************************************************** - * DllRegisterServer (HHCTRL.@) + * DllRegisterServer (MSCTF.@) */ HRESULT WINAPI DllRegisterServer(void) { @@ -489,7 +489,7 @@ HRESULT WINAPI DllRegisterServer(void) } /*********************************************************************** - * DllUnregisterServer (HHCTRL.@) + * DllUnregisterServer (MSCTF.@) */ HRESULT WINAPI DllUnregisterServer(void) { diff --git a/dlls/wbemprox/regsvr.c b/dlls/wbemprox/regsvr.c index 60f3515..1e95483 100644 --- a/dlls/wbemprox/regsvr.c +++ b/dlls/wbemprox/regsvr.c @@ -394,7 +394,7 @@ static struct regsvr_interface const interface_list[] = { }; /*********************************************************************** - * DllRegisterServer (INETCOMM.@) + * DllRegisterServer (WBEMPROX.@) */ HRESULT WINAPI DllRegisterServer(void) { @@ -409,7 +409,7 @@ HRESULT WINAPI DllRegisterServer(void) } /*********************************************************************** - * DllUnregisterServer (INETCOMM.@) + * DllUnregisterServer (WBEMPROX.@) */ HRESULT WINAPI DllUnregisterServer(void) { diff --git a/dlls/wmiutils/regsvr.c b/dlls/wmiutils/regsvr.c index bc5aeee..d6c987f 100644 --- a/dlls/wmiutils/regsvr.c +++ b/dlls/wmiutils/regsvr.c @@ -394,7 +394,7 @@ static struct regsvr_interface const interface_list[] = { }; /*********************************************************************** - * DllRegisterServer (INETCOMM.@) + * DllRegisterServer (WMIUTILS.@) */ HRESULT WINAPI DllRegisterServer(void) { @@ -409,7 +409,7 @@ HRESULT WINAPI DllRegisterServer(void) } /*********************************************************************** - * DllUnregisterServer (INETCOMM.@) + * DllUnregisterServer (WMIUTILS.@) */ HRESULT WINAPI DllUnregisterServer(void) { diff --git a/dlls/wuapi/regsvr.c b/dlls/wuapi/regsvr.c index 10d3974..167368c 100644 --- a/dlls/wuapi/regsvr.c +++ b/dlls/wuapi/regsvr.c @@ -400,7 +400,7 @@ static struct regsvr_interface const interface_list[] = { }; /*********************************************************************** - * DllRegisterServer (INETCOMM.@) + * DllRegisterServer (WUAPI.@) */ HRESULT WINAPI DllRegisterServer(void) { @@ -415,7 +415,7 @@ HRESULT WINAPI DllRegisterServer(void) } /*********************************************************************** - * DllUnregisterServer (INETCOMM.@) + * DllUnregisterServer (WUAPI.@) */ HRESULT WINAPI DllUnregisterServer(void) {

1 0

Eric Pouech : dbghelp: Remove a couple of unnneeded include files.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: a414e782f0a378eb309b2d9498d7a7ad45df286a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a414e782f0a378eb309b2d949… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:48:27 2010 +0100 dbghelp: Remove a couple of unnneeded include files. --- dlls/dbghelp/cpu_ppc.c | 1 - dlls/dbghelp/cpu_x86_64.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c index da440f8..fca5ec7 100644 --- a/dlls/dbghelp/cpu_ppc.c +++ b/dlls/dbghelp/cpu_ppc.c @@ -23,7 +23,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "dbghelp_private.h" -#include "wine/winbase16.h" #include "winternl.h" #include "wine/debug.h" diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index d7fb138..cd0e32c 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -23,7 +23,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "dbghelp_private.h" -#include "wine/winbase16.h" #include "winternl.h" #include "wine/debug.h"

1 0

Eric Pouech : winedbg: Implement is_func_call on x86_64 CPU.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: b50e5719477ba95e39a8fdf88b647e2daee98049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b50e5719477ba95e39a8fdf88… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:48:03 2010 +0100 winedbg: Implement is_func_call on x86_64 CPU. --- programs/winedbg/be_x86_64.c | 117 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 115 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index a0e5637..682bd05 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -162,6 +162,10 @@ static const struct dbg_internal_var* be_x86_64_init_registers(CONTEXT* ctx) return be_x86_64_ctx; } +#define f_mod(b) ((b)>>6) +#define f_reg(b) (((b)>>3)&0x7) +#define f_rm(b) ((b)&0x7) + static unsigned be_x86_64_is_step_over_insn(const void* insn) { BYTE ch; @@ -233,10 +237,119 @@ static unsigned be_x86_64_is_break_insn(const void* insn) return dbg_read_memory(insn, &c, sizeof(c)) && c == 0xCC; } +static BOOL fetch_value(const char* addr, unsigned sz, int* value) +{ + char value8; + short value16; + + switch (sz) + { + case 8: + if (!dbg_read_memory(addr, &value8, sizeof(value8))) return FALSE; + *value = value8; + break; + case 16: + if (!dbg_read_memory(addr, &value16, sizeof(value16))) return FALSE; + *value = value16; + case 32: + if (!dbg_read_memory(addr, value, sizeof(*value))) return FALSE; + break; + default: return FALSE; + } + return TRUE; +} + static unsigned be_x86_64_is_func_call(const void* insn, ADDRESS64* callee) { - dbg_printf("not done is_func_call\n"); - return FALSE; + BYTE ch; + LONG delta; + short segment; + unsigned op_size = 32, rex = 0; + DWORD64 dst; + + /* we assume 64bit mode all over the place */ + for (;;) + { + if (!dbg_read_memory(insn, &ch, sizeof(ch))) return FALSE; + if (ch == 0x66) op_size = 16; + else if (ch == 0x67) WINE_FIXME("prefix not supported %x\n", ch); + else if (ch >= 0x40 && ch <= 0x4f) rex = ch & 0xf; + else break; + insn = (const char*)insn + 1; + } while (0); + + /* that's the only mode we support anyway */ + callee->Mode = AddrModeFlat; + callee->Segment = dbg_context.SegCs; + + switch (ch) + { + case 0xe8: /* relative near call */ + assert(op_size == 32); + if (!fetch_value((const char*)insn + 1, sizeof(delta), &delta)) + return FALSE; + callee->Offset = (DWORD_PTR)insn + 1 + 4 + delta; + return TRUE; + + case 0xff: + if (!dbg_read_memory((const char*)insn + 1, &ch, sizeof(ch))) + return FALSE; + WINE_TRACE("Got 0xFF %x (&C7=%x) with rex=%x\n", ch, ch & 0xC7, rex); + /* keep only the CALL and LCALL insn:s */ + switch (f_reg(ch)) + { + case 0x02: + segment = dbg_context.SegCs; + break; + default: return FALSE; + } + if (rex == 0) switch (ch & 0xC7) /* keep Mod R/M only (skip reg) */ + { + case 0x04: + case 0x44: + case 0x84: + WINE_FIXME("Unsupported yet call insn (0xFF 0x%02x) (SIB bytes) at %p\n", ch, insn); + return FALSE; + case 0x05: /* addr32 */ + if (f_reg(ch) == 0x2) + { + /* rip-relative to next insn */ + if (!dbg_read_memory((const char*)insn + 2, &delta, sizeof(delta)) || + !dbg_read_memory((const char*)insn + 6 + delta, &dst, sizeof(dst))) + return FALSE; + + callee->Offset = dst; + return TRUE; + } + WINE_FIXME("Unsupported yet call insn (0xFF 0x%02x) at %p\n", ch, insn); + return FALSE; + default: + switch (f_rm(ch)) + { + case 0x00: dst = dbg_context.Rax; break; + case 0x01: dst = dbg_context.Rcx; break; + case 0x02: dst = dbg_context.Rdx; break; + case 0x03: dst = dbg_context.Rbx; break; + case 0x04: dst = dbg_context.Rsp; break; + case 0x05: dst = dbg_context.Rbp; break; + case 0x06: dst = dbg_context.Rsi; break; + case 0x07: dst = dbg_context.Rdi; break; + } + if (f_mod(ch) != 0x03) + WINE_FIXME("Unsupported yet call insn (0xFF 0x%02x) at %p\n", ch, insn); + else + { + callee->Offset = dst; + } + break; + } + else + WINE_FIXME("Unsupported yet call insn (rex=0x%02x 0xFF 0x%02x) at %p\n", rex, ch, insn); + return FALSE; + + default: + return FALSE; + } } extern void be_x86_64_disasm_one_insn(ADDRESS64* addr, int display);

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010