wine-commits October 2006

wine-commits@winehq.org

3 participants
1032 discussions

Frank Richter : mshtml: Update German translation.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: d6068d99e0b0c46429dd2f5ae052b752bd4cf136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6068d99e0b0c46429dd2f5ae… Author: Frank Richter <frank.richter(a)gmail.com> Date: Sun Oct 22 16:47:38 2006 +0200 mshtml: Update German translation. --- dlls/mshtml/De.rc | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/De.rc b/dlls/mshtml/De.rc index 6cfe2f3..0aa2d96 100644 --- a/dlls/mshtml/De.rc +++ b/dlls/mshtml/De.rc @@ -23,8 +23,24 @@ LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_HTMLDISABLED "Die HTML Darstellung ist zur Zeit ausgeschalten." - IDS_HTMLDOCUMENT "HTML Dokument" + IDS_HTMLDISABLED "Die HTML-Darstellung ist zur Zeit ausgeschaltet." + IDS_HTMLDOCUMENT "HTML-Dokument" + IDS_DOWNLOADING "Lade herunter..." + IDS_INSTALLING "Installiere..." +} + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine-Gecko-Installation" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Diese Anwendung versucht, eine HTML-Seite anzuzeigen. Wine muss " \ + "Gecko (Mozilla HTML-Bibliothek) installieren um die Seite " \ + "anzuzeigen. Klicken Sie auf �Installieren�, um Gecko automatisch " \ + "herunterzuladen und zu installieren.", ID_DWL_STATUS, 10, 10, 240, 40, SS_CENTER + CONTROL "Fortschritt", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 + PUSHBUTTON "Abbrechen", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Installieren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP } /* FIXME: This should be in shdoclc.dll */

1 0

Huw Davies : oledlg: Only send the end dialog msg if the button is actually clicked.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 9c8dd8fb867ecfd47e99c1c06b9677fec1ca1cd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8dd8fb867ecfd47e99c1c06… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 20 16:54:53 2006 +0100 oledlg: Only send the end dialog msg if the button is actually clicked. --- dlls/oledlg/pastespl.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index ccfceca..8e01f4b 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -605,8 +605,14 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND } case IDOK: case IDCANCEL: - send_end_dialog_msg(hdlg, ps_struct, LOWORD(wp)); - return FALSE; + switch(HIWORD(wp)) + { + case BN_CLICKED: + send_end_dialog_msg(hdlg, ps_struct, LOWORD(wp)); + return FALSE; + default: + return FALSE; + } } return FALSE; default:

1 0

Jacek Caban : urlmon: Added image/tiff mime filter.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: b9b812da703934400b19806c2ea110e7ec1aca36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b812da703934400b19806c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 21 22:56:23 2006 +0200 urlmon: Added image/tiff mime filter. --- dlls/urlmon/tests/misc.c | 13 ++++++++++++- dlls/urlmon/urlmon_main.c | 7 +++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index c7d8280..17657e7 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -335,6 +335,7 @@ static const WCHAR mimeImagePjpeg[] = {' static const WCHAR mimeImageGif[] = {'i','m','a','g','e','/','g','i','f',0}; static const WCHAR mimeImageBmp[] = {'i','m','a','g','e','/','b','m','p',0}; static const WCHAR mimeImageXPng[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; +static const WCHAR mimeImageTiff[] = {'i','m','a','g','e','/','t','i','f','f',0}; static const struct { LPCWSTR url; @@ -387,6 +388,11 @@ static BYTE data35[] = {0x89,'P','N','G' static BYTE data36[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,'x','x'}; static BYTE data37[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,'<','h','t','m','l','>'}; static BYTE data38[] = {0x00,0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,'x'}; +static BYTE data39[] = {0x4d,0x4d,0x00,0x2a}; +static BYTE data40[] = {0x4d,0x4d,0x00,0x2a,'<','h','t','m','l','>',0}; +static BYTE data41[] = {0x4d,0x4d,0xff}; +static BYTE data42[] = {0x4d,0x4d}; +static BYTE data43[] = {0x00,0x4d,0x4d,0x00}; static const struct { BYTE *data; @@ -430,7 +436,12 @@ static const struct { {data35, sizeof(data35), mimeImageXPng}, {data36, sizeof(data36), mimeAppOctetStream}, {data37, sizeof(data37), mimeTextHtml}, - {data38, sizeof(data38), mimeAppOctetStream} + {data38, sizeof(data38), mimeAppOctetStream}, + {data39, sizeof(data39), mimeImageTiff}, + {data40, sizeof(data40), mimeTextHtml}, + {data41, sizeof(data41), mimeImageTiff}, + {data42, sizeof(data42), mimeTextPlain}, + {data43, sizeof(data43), mimeAppOctetStream} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index b083871..044c2f8 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -440,6 +440,11 @@ static BOOL image_pjpeg_filter(LPVOID bu return size > 2 && *(BYTE*)buf == 0xff && *((BYTE*)buf+1) == 0xd8; } +static BOOL image_tiff_filter(LPVOID buf, DWORD size) +{ + return size > 2 && *(WORD*)buf == 0x4d4d; +} + static BOOL image_xpng_filter(LPVOID buf, DWORD size) { static const BYTE xpng_header[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a}; @@ -508,6 +513,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR wszImageGif[] = {'i','m','a','g','e','/','g','i','f',0}; static const WCHAR wszImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; + static const WCHAR wszImageTiff[] = {'i','m','a','g','e','/','t','i','f','f',0}; static const WCHAR wszImageXPng[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; static const WCHAR wszImageBmp[] = {'i','m','a','g','e','/','b','m','p',0}; static const WCHAR wszTextPlain[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; @@ -521,6 +527,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC {wszTextHtml, text_html_filter}, {wszImageGif, image_gif_filter}, {wszImagePjpeg, image_pjpeg_filter}, + {wszImageTiff, image_tiff_filter}, {wszImageXPng, image_xpng_filter}, {wszImageBmp, image_bmp_filter}, {wszTextPlain, text_plain_filter},

1 0

Jacek Caban : shdocvw: Fix windows style of windows without parents.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 6e63a9e5f58db1eb4b7915c1969c1b7d839a091d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e63a9e5f58db1eb4b7915c19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 21 22:54:38 2006 +0200 shdocvw: Fix windows style of windows without parents. --- dlls/shdocvw/oleobject.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 0131d9a..aef1dd1 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -95,9 +95,12 @@ static void create_shell_embedding_hwnd( This->doc_host.frame_hwnd = This->shell_embedding_hwnd = CreateWindowExW( WS_EX_WINDOWEDGE, wszShellEmbedding, wszShellEmbedding, - WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP, + WS_CLIPSIBLINGS | WS_CLIPCHILDREN + | (parent ? WS_CHILD | WS_TABSTOP : WS_POPUP | WS_MAXIMIZEBOX), 0, 0, 0, 0, parent, NULL, shdocvw_hinstance, This); + + TRACE("parent=%p hwnd=%p\n", parent, This->shell_embedding_hwnd); } static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site, HWND parent_hwnd)

1 0

Jacek Caban : wininet: Use HTTP_ADDHDR_FLAG_REPLACE flag in HTTP_HttpSendRequest to add Content-Length header .
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: cc7a86ec7e7a264ec19872ecbbf26bf33ac76d4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc7a86ec7e7a264ec19872ecb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:39:00 2006 +0200 wininet: Use HTTP_ADDHDR_FLAG_REPLACE flag in HTTP_HttpSendRequest to add Content-Length header. --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c33e8bf..0d564be 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2240,7 +2240,8 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0}; WCHAR contentLengthStr[sizeof szContentLength/2 /* includes \n\r */ + 20 /* int */ ]; sprintfW(contentLengthStr, szContentLength, dwContentLength); - HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD); + HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, + HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); } Host = HTTP_GetHeader(lpwhr,szHost);

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_className implementation.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 9d058e9143cec4e48d65a12fbda9d23fc42da939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d058e9143cec4e48d65a12fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:38:39 2006 +0200 mshtml: Added IHTMLElement::get_className implementation. --- dlls/mshtml/htmlelem.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index db968e8..4fad4ec 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -188,8 +188,28 @@ static HRESULT WINAPI HTMLElement_put_cl static HRESULT WINAPI HTMLElement_get_className(IHTMLElement *iface, BSTR *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString class_str; + nsresult nsres; + HRESULT hres = S_OK; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&class_str, NULL); + nsres = nsIDOMHTMLElement_GetClassName(This->nselem, &class_str); + + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *class; + nsAString_GetData(&class_str, &class, NULL); + *p = SysAllocString(class); + }else { + ERR("GetClassName failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&class_str); + + TRACE("className=%s\n", debugstr_w(*p)); + return hres; } static HRESULT WINAPI HTMLElement_put_id(IHTMLElement *iface, BSTR v)

1 0

Jacek Caban : mshtml: Don't return empty string in IHTMLSelectElement:: get_name.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 637310be274e5c7ec124ee6686b915ae2af1714a URL: http://source.winehq.org/git/wine.git/?a=commit;h=637310be274e5c7ec124ee668… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:38:13 2006 +0200 mshtml: Don't return empty string in IHTMLSelectElement::get_name. --- dlls/mshtml/htmlselect.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index ce1b40b..4a01ef1 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -178,8 +178,15 @@ static HRESULT WINAPI HTMLSelectElement_ nsres = nsIDOMHTMLSelectElement_GetName(This->nsselect, &name_str); if(NS_SUCCEEDED(nsres)) { + static const WCHAR wszGarbage[] = {'g','a','r','b','a','g','e',0}; + nsAString_GetData(&name_str, &name, NULL); - *p = SysAllocString(name); + + /* + * Native never returns empty string here. If an element has no name, + * name of previous element or ramdom data is returned. + */ + *p = SysAllocString(*name ? name : wszGarbage); }else { ERR("GetName failed: %08x\n", nsres); }

1 0

Jeff Latimer : tools: Add addtional help to runtest.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 6d1b4af58b8a3e5b85d7ad8956a82b3cebc1eee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1b4af58b8a3e5b85d7ad895… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sat Oct 21 19:35:57 2006 +1000 tools: Add addtional help to runtest. --- tools/runtest | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/runtest b/tools/runtest index b440aab..43f513f 100755 --- a/tools/runtest +++ b/tools/runtest @@ -28,6 +28,8 @@ usage() Usage: $0 [options] input_file +input_file: the source code for the test program + Options: -q quiet mode -v verbose mode (can be specified multiple times)

1 0

Eric Pouech : advapi32: Fixed a couple items from previous patch ( spotted by G Pfeifer).
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 5425cb35edc741e58279a88db4931db5b95d8fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=5425cb35edc741e58279a88db… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Oct 21 13:18:29 2006 +0200 advapi32: Fixed a couple items from previous patch (spotted by G Pfeifer). --- dlls/advapi32/lsa.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 8c58334..2e1a04d 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -59,9 +59,8 @@ static void dumpLsaAttributes(PLSA_OBJEC static void* ADVAPI_GetDomainName(unsigned sz, unsigned ofs) { HKEY key; - BOOL useDefault = TRUE; LONG ret; - BYTE* ptr; + BYTE* ptr = NULL; UNICODE_STRING* ustr; static const WCHAR wVNETSUP[] = { @@ -84,26 +83,26 @@ static void* ADVAPI_GetDomainName(unsign ustr = (UNICODE_STRING*)(ptr + ofs); ustr->MaximumLength = size; ustr->Buffer = (WCHAR*)(ptr + sz); - if ((ret = RegQueryValueExW(key, wg, NULL, NULL, - (LPBYTE)ustr->Buffer, &size)) == ERROR_SUCCESS) + ret = RegQueryValueExW(key, wg, NULL, NULL, (LPBYTE)ustr->Buffer, &size); + if (ret != ERROR_SUCCESS) { - ustr->Length = (USHORT)(size - sizeof(WCHAR)); - useDefault = FALSE; - } - else HeapFree(GetProcessHeap(), 0, ptr); + ptr = NULL; + } + else ustr->Length = size - sizeof(WCHAR); } RegCloseKey(key); } - if (useDefault) + if (!ptr) { static const WCHAR wDomain[] = {'D','O','M','A','I','N','\0'}; ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz + sizeof(wDomain)); + if (!ptr) return NULL; ustr = (UNICODE_STRING*)(ptr + ofs); ustr->MaximumLength = sizeof(wDomain); ustr->Buffer = (WCHAR*)(ptr + sz); - ustr->Length = (USHORT)(sizeof(wDomain) - sizeof(WCHAR)); + ustr->Length = sizeof(wDomain) - sizeof(WCHAR); memcpy(ustr->Buffer, wDomain, sizeof(wDomain)); } return ptr;

1 0

Eric Pouech : winedbg: Added a few more cases where we inspect if i386 instructions
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: ec087dac4ff9eac712aeaa1f54d22415b1886c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec087dac4ff9eac712aeaa1f5… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Oct 21 09:40:11 2006 +0200 winedbg: Added a few more cases where we inspect if i386 instructions are actually calls (based on previous work by Jeff Latimer). --- programs/winedbg/be_i386.c | 155 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 141 insertions(+), 14 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 696e125..dc8f824 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -379,30 +379,157 @@ static unsigned be_i386_is_break_insn(co return c == 0xCC; } +static unsigned get_size(ADDRESS_MODE am) +{ + if (am == AddrModeReal || am == AddrMode1616) return 16; + return 32; +} + +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_i386_is_func_call(const void* insn, ADDRESS64* callee) { - BYTE ch; - int delta; + BYTE ch; + int delta; + short segment; + unsigned dst = 0; + unsigned operand_size; + ADDRESS_MODE cs_addr_mode; + + cs_addr_mode = get_selector_type(dbg_curr_thread->handle, &dbg_context, + dbg_context.SegCs); + operand_size = get_size(cs_addr_mode); + + /* get operand_size (also getting rid of the various prefixes */ + do + { + if (!dbg_read_memory(insn, &ch, sizeof(ch))) return FALSE; + if (ch == 0x66) + { + operand_size = 48 - operand_size; /* 16 => 32, 32 => 16 */ + insn = (const char*)insn + 1; + } + } while (ch == 0x66 || ch == 0x67); - if (!dbg_read_memory(insn, &ch, sizeof(ch))) return FALSE; switch (ch) { - case 0xe8: - dbg_read_memory((const char*)insn + 1, &delta, sizeof(delta)); - - callee->Mode = AddrModeFlat; - callee->Offset = (DWORD)insn; - be_i386_disasm_one_insn(callee, FALSE); - callee->Offset += delta; + case 0xe8: /* relative near call */ + callee->Mode = cs_addr_mode; + if (!fetch_value((const char*)insn + 1, operand_size, &delta)) + return FALSE; + callee->Segment = dbg_context.SegCs; + callee->Offset = (DWORD)insn + 1 + (operand_size / 8) + delta; + return TRUE; + case 0x9a: /* absolute far call */ + if (!dbg_read_memory((const char*)insn + 1 + operand_size / 8, + &segment, sizeof(segment))) + return FALSE; + callee->Mode = get_selector_type(dbg_curr_thread->handle, &dbg_context, + segment); + if (!fetch_value((const char*)insn + 1, operand_size, &delta)) + return FALSE; + callee->Segment = segment; + callee->Offset = delta; return TRUE; + case 0xff: if (!dbg_read_memory((const char*)insn + 1, &ch, sizeof(ch))) return FALSE; - ch &= 0x38; - if (ch != 0x10 && ch != 0x18) return FALSE; - /* fall through */ - case 0x9a: + /* keep only the CALL and LCALL insn:s */ + switch ((ch >> 3) & 0x07) + { + case 0x02: + segment = dbg_context.SegCs; + break; + case 0x03: + if (!dbg_read_memory((const char*)insn + 1 + operand_size / 8, + &segment, sizeof(segment))) + return FALSE; + break; + default: return FALSE; + } + /* FIXME: we only support the 32 bit far calls for now */ + if (operand_size != 32) + { + WINE_FIXME("Unsupported yet call insn (0xFF 0x%02x) with 16 bit operand-size at %p\n", ch, insn); + return FALSE; + } + 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 */ + WINE_FIXME("Unsupported yet call insn (0xFF 0x%02x) (addr32) at %p\n", ch, insn); + return FALSE; + default: + switch (ch & 0x07) + { + case 0x00: dst = dbg_context.Eax; break; + case 0x01: dst = dbg_context.Ecx; break; + case 0x02: dst = dbg_context.Edx; break; + case 0x03: dst = dbg_context.Ebx; break; + case 0x04: dst = dbg_context.Esp; break; + case 0x05: dst = dbg_context.Ebp; break; + case 0x06: dst = dbg_context.Esi; break; + case 0x07: dst = dbg_context.Edi; break; + } + if ((ch >> 6) != 0x03) /* indirect address */ + { + if (ch >> 6) /* we got a displacement */ + { + if (!fetch_value((const char*)insn + 2, (ch >> 6) == 0x01 ? 8 : 32, &delta)) + return FALSE; + dst += delta; + } + if (((ch >> 3) & 0x07) == 0x03) /* LCALL */ + { + if (!dbg_read_memory((const char*)dst + operand_size, &segment, sizeof(segment))) + return FALSE; + } + else segment = dbg_context.SegCs; + if (!dbg_read_memory((const char*)dst, &delta, sizeof(delta))) + return FALSE; + callee->Mode = get_selector_type(dbg_curr_thread->handle, &dbg_context, + segment); + callee->Segment = segment; + callee->Offset = delta; + } + else + { + callee->Mode = cs_addr_mode; + callee->Segment = dbg_context.SegCs; + callee->Offset = dst; + } + } + return TRUE; + case 0xCD: WINE_FIXME("Unsupported yet call insn (0x%02x) at %p\n", ch, insn); /* fall through */

1 0

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 October 2006