wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Nikolay Sivov : msxml3: Fix xml declaration output when it' s specified in loaded document (in case of stream).
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 46d08bb6cefa6372ef3f597a130d14ee62c662dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=46d08bb6cefa6372ef3f597a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 8 22:49:43 2012 +0400 msxml3: Fix xml declaration output when it's specified in loaded document (in case of stream). --- dlls/msxml3/domdoc.c | 13 +++++++--- dlls/msxml3/main.c | 1 - dlls/msxml3/tests/domdoc.c | 55 ++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 59 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 0c0df36..5ac03e1 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -371,13 +371,17 @@ void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node) /* unlinks a first "<?xml" child if it was created */ xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc) { - xmlNodePtr node; + static const xmlChar xmlA[] = "xml"; + xmlNodePtr node, first_child; assert(doc != NULL); - if (doc->standalone != -1) + /* xml declaration node could be created automatically after parsing or added + to a tree later */ + first_child = doc->children; + if (first_child && first_child->type == XML_PI_NODE && xmlStrEqual(first_child->name, xmlA)) { - node = doc->children; + node = first_child; xmlUnlinkNode( node ); } else @@ -2383,8 +2387,9 @@ static HRESULT WINAPI domdoc_save( ret = IUnknown_QueryInterface(pUnk, &IID_IStream, (void**)&stream); if(ret == S_OK) { + int options = get_doc(This)->standalone == -1 ? XML_SAVE_NO_DECL : 0; ctx = xmlSaveToIO(domdoc_stream_save_writecallback, - domdoc_stream_save_closecallback, stream, NULL, XML_SAVE_NO_DECL); + domdoc_stream_save_closecallback, stream, NULL, options); if(!ctx) { diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 1553e77..6ecfdbc 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -209,7 +209,6 @@ static void init_libxslt(void) #endif } - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { MSXML_hInstance = hInstDLL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d51b863..46b628f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1504,9 +1504,16 @@ static const WCHAR szComplete6[] = { '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 }; -static const CHAR szNonUnicodeXML[] = -"<?xml version='1.0' encoding='Windows-1252'?>\n" -"<open></open>\n"; +#define DECL_WIN_1252 \ +"<?xml version=\"1.0\" encoding=\"Windows-1252\"?>" + +static const char win1252xml[] = +DECL_WIN_1252 +"<open></open>"; + +static const char win1252decl[] = +DECL_WIN_1252 +; static const char szExampleXML[] = "<?xml version='1.0' encoding='utf-8'?>\n" @@ -2327,7 +2334,7 @@ if (0) /* try a BSTR containing a Windows-1252 document */ b = VARIANT_TRUE; - str = SysAllocStringByteLen( szNonUnicodeXML, sizeof(szNonUnicodeXML) - 1 ); + str = SysAllocStringByteLen( win1252xml, strlen(win1252xml) ); r = IXMLDOMDocument_loadXML( doc, str, &b ); ok( r == S_FALSE, "loadXML succeeded\n"); ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); @@ -7238,10 +7245,14 @@ static void test_save(void) IXMLDOMElement *root; BSTR sOrig, sNew, filename; char buffer[100]; + IStream *stream; + HGLOBAL global; + VARIANT_BOOL b; DWORD read = 0; VARIANT dest; HANDLE hfile; HRESULT hr; + char *ptr; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; @@ -7327,6 +7338,40 @@ static void test_save(void) hr = IXMLDOMDocument_save(doc, dest); EXPECT_HR(hr, S_OK); + /* loaded data contains xml declaration */ + hr = IXMLDOMDocument_loadXML(doc, _bstr_(win1252xml), &b); + EXPECT_HR(hr, S_OK); + + CreateStreamOnHGlobal(NULL, TRUE, &stream); + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)stream; + hr = IXMLDOMDocument_save(doc, dest); + EXPECT_HR(hr, S_OK); + + hr = GetHGlobalFromStream(stream, &global); + EXPECT_HR(hr, S_OK); + ptr = GlobalLock(global); + ok(!memcmp(ptr, win1252decl, strlen(win1252decl)), "got wrong xml declaration\n"); + GlobalUnlock(global); + IStream_Release(stream); + + /* loaded data without xml declaration */ + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<a/>"), &b); + EXPECT_HR(hr, S_OK); + + CreateStreamOnHGlobal(NULL, TRUE, &stream); + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)stream; + hr = IXMLDOMDocument_save(doc, dest); + EXPECT_HR(hr, S_OK); + + hr = GetHGlobalFromStream(stream, &global); + EXPECT_HR(hr, S_OK); + ptr = GlobalLock(global); + ok(ptr[0] == '<' && ptr[1] != '?', "got wrong start tag %c%c\n", ptr[0], ptr[1]); + GlobalUnlock(global); + IStream_Release(stream); + IXMLDOMDocument_Release(doc); free_bstrs(); } @@ -10697,7 +10742,7 @@ static void test_load(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to create test file\n"); if(hfile == INVALID_HANDLE_VALUE) return; - ret = WriteFile(hfile, szNonUnicodeXML, sizeof(szNonUnicodeXML)-1, &written, NULL); + ret = WriteFile(hfile, win1252xml, strlen(win1252xml), &written, NULL); ok(ret, "WriteFile failed\n"); CloseHandle(hfile);

1 0

Nikolay Sivov : msxml3: Don' t use stream written value when saving to stream.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 1a0552443ce8c2392a3d2cbe296a392b6741b0fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0552443ce8c2392a3d2cbe2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 7 12:13:08 2012 +0400 msxml3: Don't use stream written value when saving to stream. --- dlls/msxml3/domdoc.c | 3 +- dlls/msxml3/tests/domdoc.c | 156 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 141 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 080eb3d..0c0df36 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2328,13 +2328,14 @@ static int XMLCALL domdoc_stream_save_writecallback(void *ctx, const char *buffe HRESULT hr; hr = IStream_Write((IStream*)ctx, buffer, len, &written); + TRACE("0x%08x %p %d %u\n", hr, buffer, len, written); if (hr != S_OK) { WARN("stream write error: 0x%08x\n", hr); return -1; } else - return written; + return len; } static int XMLCALL domdoc_stream_save_closecallback(void *ctx) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9919f4e..d51b863 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1288,6 +1288,118 @@ static const IServiceProviderVtbl testprovVtbl = testprov_t testprov = { { &testprovVtbl } }; +/* IStream */ +static HRESULT WINAPI istream_QueryInterface(IStream *iface, REFIID riid, void **ppvObject) +{ + *ppvObject = NULL; + + if (IsEqualGUID(riid, &IID_IStream) || + IsEqualGUID(riid, &IID_IUnknown)) + *ppvObject = iface; + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI istream_AddRef(IStream *iface) +{ + return 2; +} + +static ULONG WINAPI istream_Release(IStream *iface) +{ + return 1; +} + +static HRESULT WINAPI istream_Read(IStream *iface, void *ptr, ULONG len, ULONG *pread) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Write(IStream *iface, const void *ptr, ULONG len, ULONG *written) +{ + *written = len/2; + return S_OK; +} + +static HRESULT WINAPI istream_Seek(IStream *iface, LARGE_INTEGER move, DWORD origin, ULARGE_INTEGER *new_pos) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_SetSize(IStream *iface, ULARGE_INTEGER size) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_CopyTo(IStream *iface, IStream *stream, ULARGE_INTEGER len, + ULARGE_INTEGER *pread, ULARGE_INTEGER *written) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Commit(IStream *iface, DWORD flags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Revert(IStream *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_LockRegion(IStream *iface, ULARGE_INTEGER offset, + ULARGE_INTEGER len, DWORD locktype) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset, + ULARGE_INTEGER len, DWORD locktype) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Stat(IStream *iface, STATSTG *pstatstg, DWORD flag) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Clone(IStream *iface, IStream **stream) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IStreamVtbl StreamVtbl = { + istream_QueryInterface, + istream_AddRef, + istream_Release, + istream_Read, + istream_Write, + istream_Seek, + istream_SetSize, + istream_CopyTo, + istream_Commit, + istream_Revert, + istream_LockRegion, + istream_UnlockRegion, + istream_Stat, + istream_Clone +}; + +static IStream savestream = { &StreamVtbl }; + #define EXPECT_CHILDREN(node) _expect_children((IXMLDOMNode*)node, __LINE__) static void _expect_children(IXMLDOMNode *node, int line) { @@ -7124,10 +7236,10 @@ static void test_save(void) { IXMLDOMDocument *doc, *doc2; IXMLDOMElement *root; - VARIANT file, vDoc; BSTR sOrig, sNew, filename; char buffer[100]; DWORD read = 0; + VARIANT dest; HANDLE hfile; HRESULT hr; @@ -7148,10 +7260,10 @@ static void test_save(void) hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); EXPECT_HR(hr, S_OK); - V_VT(&vDoc) = VT_UNKNOWN; - V_UNKNOWN(&vDoc) = (IUnknown*)doc2; + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)doc2; - hr = IXMLDOMDocument_save(doc, vDoc); + hr = IXMLDOMDocument_save(doc, dest); EXPECT_HR(hr, S_OK); hr = IXMLDOMDocument_get_xml(doc, &sOrig); @@ -7169,10 +7281,10 @@ static void test_save(void) IXMLDOMDocument_Release(doc2); /* save to path */ - V_VT(&file) = VT_BSTR; - V_BSTR(&file) = _bstr_("test.xml"); + V_VT(&dest) = VT_BSTR; + V_BSTR(&dest) = _bstr_("test.xml"); - hr = IXMLDOMDocument_save(doc, file); + hr = IXMLDOMDocument_save(doc, dest); EXPECT_HR(hr, S_OK); hfile = CreateFileA("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); @@ -7188,24 +7300,34 @@ static void test_save(void) /* save to path VT_BSTR | VT_BYREF */ filename = _bstr_("test.xml"); - V_VT(&file) = VT_BSTR | VT_BYREF; - V_BSTRREF(&file) = &filename; + V_VT(&dest) = VT_BSTR | VT_BYREF; + V_BSTRREF(&dest) = &filename; - hr = IXMLDOMDocument_save(doc, file); + hr = IXMLDOMDocument_save(doc, dest); EXPECT_HR(hr, S_OK); - IXMLDOMDocument_Release(doc); - hfile = CreateFileA("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); ok(hfile != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); if(hfile == INVALID_HANDLE_VALUE) return; - ReadFile(hfile, buffer, sizeof(buffer), &read, NULL); - ok(read != 0, "could not read file\n"); - ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); + if (hfile != INVALID_HANDLE_VALUE) + { + ReadFile(hfile, buffer, sizeof(buffer), &read, NULL); + ok(read != 0, "could not read file\n"); + ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); - CloseHandle(hfile); - DeleteFile("test.xml"); + CloseHandle(hfile); + DeleteFile("test.xml"); + } + + /* save to stream */ + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)&savestream; + + hr = IXMLDOMDocument_save(doc, dest); + EXPECT_HR(hr, S_OK); + + IXMLDOMDocument_Release(doc); free_bstrs(); }

1 0

Henri Verbeet : winex11: Get rid of xrandr.h.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 6c4465f4acadde4e29eff6eb81463c90e27e9c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4465f4acadde4e29eff6eb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 8 16:06:39 2012 +0200 winex11: Get rid of xrandr.h. --- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 3 --- dlls/winex11.drv/xrandr.c | 15 ++++++++++----- dlls/winex11.drv/xrandr.h | 32 -------------------------------- 4 files changed, 11 insertions(+), 40 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98fe198..9ce0bbd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -664,6 +664,7 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XF86VM_Cleanup(void) DECLSPEC_HIDDEN; +void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 7118486..8012df3 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -47,7 +47,6 @@ #include "winreg.h" #include "x11drv.h" -#include "xrandr.h" #include "xcomposite.h" #include "wine/server.h" #include "wine/debug.h" @@ -576,10 +575,8 @@ static BOOL process_attach(void) /* initialize XVidMode */ X11DRV_XF86VM_Init(); -#ifdef SONAME_LIBXRANDR /* initialize XRandR */ X11DRV_XRandR_Init(); -#endif #ifdef SONAME_LIBXCOMPOSITE X11DRV_XComposite_Init(); #endif diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index f8134fb..4d988ef 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -20,24 +20,22 @@ #include "config.h" #include "wine/port.h" +#include "wine/debug.h" #include <string.h> #include <stdio.h> +WINE_DEFAULT_DEBUG_CHANNEL(xrandr); + #ifdef SONAME_LIBXRANDR #include <X11/Xlib.h> #include <X11/extensions/Xrandr.h> #include "x11drv.h" -#include "xrandr.h" - #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "wine/library.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(xrandr); static void *xrandr_handle; @@ -299,4 +297,11 @@ void X11DRV_XRandR_Init(void) TRACE("Enabling XRandR\n"); } +#else /* SONAME_LIBXRANDR */ + +void X11DRV_XRandR_Init(void) +{ + TRACE("XRandR support not compiled in.\n"); +} + #endif /* SONAME_LIBXRANDR */ diff --git a/dlls/winex11.drv/xrandr.h b/dlls/winex11.drv/xrandr.h deleted file mode 100644 index 7a12fbb..0000000 --- a/dlls/winex11.drv/xrandr.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Wine X11drv Xrandr interface - * - * Copyright 2003 Alexander James Pasadyn - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#ifndef __WINE_XRANDR_H -#define __WINE_XRANDR_H - -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - -#ifdef SONAME_LIBXRANDR - -void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; - -#endif /* SONAME_LIBXRANDR */ -#endif /* __WINE_XRANDR_H */

1 0

Henri Verbeet : winex11: Get rid of xvidmode.h.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: eafc8d0b3440dc842dc50822aa6d4a49f8662d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafc8d0b3440dc842dc50822a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 8 16:06:38 2012 +0200 winex11: Get rid of xvidmode.h. --- dlls/winex11.drv/x11drv.h | 3 +++ dlls/winex11.drv/x11drv_main.c | 5 ----- dlls/winex11.drv/xvidmode.c | 13 +++++++++++-- dlls/winex11.drv/xvidmode.h | 37 ------------------------------------- 4 files changed, 14 insertions(+), 44 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0bfbc6f..98fe198 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -662,6 +662,9 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, unsigned int nmodes, int reserve_depths) DECLSPEC_HIDDEN; +void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; +void X11DRV_XF86VM_Cleanup(void) DECLSPEC_HIDDEN; + /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 528715b..7118486 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -47,7 +47,6 @@ #include "winreg.h" #include "x11drv.h" -#include "xvidmode.h" #include "xrandr.h" #include "xcomposite.h" #include "wine/server.h" @@ -575,10 +574,8 @@ static BOOL process_attach(void) xinerama_init( WidthOfScreen(screen), HeightOfScreen(screen) ); X11DRV_Settings_Init(); -#ifdef SONAME_LIBXXF86VM /* initialize XVidMode */ X11DRV_XF86VM_Init(); -#endif #ifdef SONAME_LIBXRANDR /* initialize XRandR */ X11DRV_XRandR_Init(); @@ -625,10 +622,8 @@ static void thread_detach(void) static void process_detach(void) { X11DRV_Clipboard_Cleanup(); -#ifdef SONAME_LIBXXF86VM /* cleanup XVidMode */ X11DRV_XF86VM_Cleanup(); -#endif X11DRV_XRender_Finalize(); /* cleanup GDI */ diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index f452da2..a308fff 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -34,8 +34,6 @@ #include <X11/extensions/xf86vmproto.h> #endif -#include "xvidmode.h" - #include "windef.h" #include "wingdi.h" #include "ddrawi.h" @@ -408,6 +406,17 @@ static BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp) return ret; } +#else /* SONAME_LIBXXF86VM */ + +void X11DRV_XF86VM_Init(void) +{ + TRACE("XVidMode support not compiled in.\n"); +} + +void X11DRV_XF86VM_Cleanup(void) +{ +} + #endif /* SONAME_LIBXXF86VM */ /*********************************************************************** diff --git a/dlls/winex11.drv/xvidmode.h b/dlls/winex11.drv/xvidmode.h deleted file mode 100644 index ac6ea2e..0000000 --- a/dlls/winex11.drv/xvidmode.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * DirectDraw HAL XVidMode interface - * - * Copyright 2001 TransGaming Technologies, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#ifndef __WINE_XVIDMODE_H -#define __WINE_XVIDMODE_H - -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - -#ifdef SONAME_LIBXXF86VM -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" - -void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; -void X11DRV_XF86VM_Cleanup(void) DECLSPEC_HIDDEN; - -#endif /* SONAME_LIBXXF86VM */ -#endif /* __WINE_XVIDMODE_H */

1 0

Henri Verbeet : d3d9: Implement d3d9_device_ResetEx().
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 73eceafb17b66e957ffedb338513949e78806133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73eceafb17b66e957ffedb338… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 8 16:06:37 2012 +0200 d3d9: Implement d3d9_device_ResetEx(). --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 30 +++++++++++++++++++++++++++--- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 35 ++++++++++++++++++++--------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 6 files changed, 52 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e3fee4a..c135012 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -598,7 +598,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, wined3d_mutex_lock(); wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); - if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, reset_enum_callback))) + if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback))) { hr = wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); device->lost = FALSE; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 67a2aad..04a073d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -583,7 +583,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if wined3d_mutex_lock(); wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); - hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, reset_enum_callback); + hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback); if (FAILED(hr)) device->not_reset = TRUE; else @@ -2954,9 +2954,33 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex static HRESULT WINAPI d3d9_device_ResetEx(IDirect3DDevice9Ex *iface, D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode) { - FIXME("iface %p, present_parameters %p, mode %p stub!\n", iface, present_parameters, mode); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_swapchain_desc swapchain_desc; + struct wined3d_display_mode wined3d_mode; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, present_parameters %p, mode %p.\n", iface, present_parameters, mode); + + if (mode) + { + wined3d_mode.width = mode->Width; + wined3d_mode.height = mode->Height; + wined3d_mode.refresh_rate = mode->RefreshRate; + wined3d_mode.format_id = wined3dformat_from_d3dformat(mode->Format); + wined3d_mode.scanline_ordering = mode->ScanLineOrdering; + } + + wined3d_mutex_lock(); + wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); + hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, + mode ? &wined3d_mode : NULL, reset_enum_callback); + if (FAILED(hr)) + device->not_reset = TRUE; + else + device->not_reset = FALSE; + wined3d_mutex_unlock(); + + return hr; } static HRESULT WINAPI d3d9_device_GetDisplayModeEx(IDirect3DDevice9Ex *iface, diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 356d726..d628629 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3020,7 +3020,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, swapchain_desc.backbuffer_format = mode.format_id; hr = wined3d_device_reset(ddraw->wined3d_device, - &swapchain_desc, ddraw_reset_enum_callback); + &swapchain_desc, NULL, ddraw_reset_enum_callback); if (FAILED(hr)) { ERR("Failed to reset device.\n"); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b73f01..0acbded 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5136,18 +5136,18 @@ err: /* Do not call while under the GL lock. */ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, - const struct wined3d_swapchain_desc *swapchain_desc, + const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback) { struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; - struct wined3d_display_mode mode; + struct wined3d_display_mode m; BOOL DisplayModeChanged = FALSE; BOOL update_desc = FALSE; unsigned int i; HRESULT hr; - TRACE("device %p, swapchain_desc %p.\n", device, swapchain_desc); + TRACE("device %p, swapchain_desc %p, mode %p, callback %p.\n", device, swapchain_desc, mode, callback); if (FAILED(hr = wined3d_device_get_swapchain(device, 0, &swapchain))) { @@ -5254,21 +5254,26 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (swapchain_desc->enable_auto_depth_stencil) wined3d_device_set_depth_stencil(device, device->auto_depth_stencil); - if (swapchain_desc->windowed) + if (mode) + { + DisplayModeChanged = TRUE; + m = *mode; + } + else if (swapchain_desc->windowed) { - mode.width = swapchain->orig_width; - mode.height = swapchain->orig_height; - mode.refresh_rate = 0; - mode.format_id = swapchain->desc.backbuffer_format; - mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + m.width = swapchain->orig_width; + m.height = swapchain->orig_height; + m.refresh_rate = 0; + m.format_id = swapchain->desc.backbuffer_format; + m.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } else { - mode.width = swapchain_desc->backbuffer_width; - mode.height = swapchain_desc->backbuffer_height; - mode.refresh_rate = swapchain_desc->refresh_rate; - mode.format_id = swapchain_desc->backbuffer_format; - mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + m.width = swapchain_desc->backbuffer_width; + m.height = swapchain_desc->backbuffer_height; + m.refresh_rate = swapchain_desc->refresh_rate; + m.format_id = swapchain_desc->backbuffer_format; + m.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } /* Should Width == 800 && Height == 0 set 800x600? */ @@ -5339,7 +5344,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (!swapchain_desc->windowed != !swapchain->desc.windowed || DisplayModeChanged) { - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode))) + if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, &m))) { WARN("Failed to set display mode, hr %#x.\n", hr); wined3d_swapchain_decref(swapchain); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5b358b8..3a0ac25 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -101,7 +101,7 @@ @ cdecl wined3d_device_present(ptr ptr ptr ptr ptr long) @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) -@ cdecl wined3d_device_reset(ptr ptr ptr) +@ cdecl wined3d_device_reset(ptr ptr ptr ptr) @ cdecl wined3d_device_restore_fullscreen_window(ptr ptr) @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_clip_plane(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b85b257..4576937 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2188,7 +2188,8 @@ HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, const struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf); void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, - const struct wined3d_swapchain_desc *swapchain_desc, wined3d_device_reset_cb callback); + const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, + wined3d_device_reset_cb callback); void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window); HRESULT __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Fix the .spec.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 3543e1d198cbc63ec3094cf8eac0d698454fb292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3543e1d198cbc63ec3094cf8e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 8 16:06:36 2012 +0200 wined3d: Fix the .spec. --- dlls/wined3d/wined3d.spec | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9e0cb65..5b358b8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -8,11 +8,11 @@ @ cdecl wined3d_check_device_type(ptr long long long long long) @ cdecl wined3d_create(long long) @ cdecl wined3d_decref(ptr) -@ cdecl wined3d_enum_adapter_modes(ptr long long long ptr) +@ cdecl wined3d_enum_adapter_modes(ptr long long long long ptr) @ cdecl wined3d_get_adapter_count(ptr) -@ cdecl wined3d_get_adapter_display_mode(ptr long ptr) +@ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) -@ cdecl wined3d_get_adapter_mode_count(ptr long long) +@ cdecl wined3d_get_adapter_mode_count(ptr long long long) @ cdecl wined3d_get_adapter_monitor(ptr long) @ cdecl wined3d_get_device_caps(ptr long long ptr) @ cdecl wined3d_incref(ptr) @@ -35,7 +35,7 @@ @ cdecl wined3d_device_acquire_focus_window(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) @ cdecl wined3d_device_begin_stateblock(ptr) -@ cdecl wined3d_device_clear(ptr long ptr long long float long) +@ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr) @ cdecl wined3d_device_color_fill(ptr ptr ptr ptr) @ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) @@ -60,7 +60,7 @@ @ cdecl wined3d_device_get_creation_parameters(ptr ptr) @ cdecl wined3d_device_get_depth_stencil(ptr ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) -@ cdecl wined3d_device_get_display_mode(ptr long ptr) +@ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) @ cdecl wined3d_device_get_front_buffer_data(ptr long ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_index_buffer(ptr ptr) @@ -98,7 +98,7 @@ @ cdecl wined3d_device_init_3d(ptr ptr) @ cdecl wined3d_device_init_gdi(ptr ptr) @ cdecl wined3d_device_multiply_transform(ptr long ptr) -@ cdecl wined3d_device_present(ptr ptr ptr ptr ptr) +@ cdecl wined3d_device_present(ptr ptr ptr ptr ptr long) @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) @ cdecl wined3d_device_reset(ptr ptr ptr) @@ -174,9 +174,9 @@ @ cdecl wined3d_rendertarget_view_get_resource(ptr) @ cdecl wined3d_rendertarget_view_incref(ptr) -@ cdecl wined3d_shader_create_gs(ptr ptr ptr ptr ptr ptr) -@ cdecl wined3d_shader_create_ps(ptr ptr ptr ptr ptr ptr) -@ cdecl wined3d_shader_create_vs(ptr ptr ptr ptr ptr ptr) +@ cdecl wined3d_shader_create_gs(ptr ptr ptr ptr ptr ptr long) +@ cdecl wined3d_shader_create_ps(ptr ptr ptr ptr ptr ptr long) +@ cdecl wined3d_shader_create_vs(ptr ptr ptr ptr ptr ptr long) @ cdecl wined3d_shader_decref(ptr) @ cdecl wined3d_shader_get_byte_code(ptr ptr ptr) @ cdecl wined3d_shader_get_parent(ptr) @@ -190,7 +190,7 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) -@ cdecl wined3d_surface_create(ptr long long long long long long long long long long long ptr ptr ptr) +@ cdecl wined3d_surface_create(ptr long long long long long long long long long long ptr ptr ptr) @ cdecl wined3d_surface_decref(ptr) @ cdecl wined3d_surface_flip(ptr ptr long) @ cdecl wined3d_surface_get_blt_status(ptr long) @@ -223,7 +223,7 @@ @ cdecl wined3d_swapchain_decref(ptr) @ cdecl wined3d_swapchain_get_back_buffer(ptr long long ptr) @ cdecl wined3d_swapchain_get_device(ptr) -@ cdecl wined3d_swapchain_get_display_mode(ptr ptr) +@ cdecl wined3d_swapchain_get_display_mode(ptr ptr ptr) @ cdecl wined3d_swapchain_get_front_buffer_data(ptr ptr) @ cdecl wined3d_swapchain_get_gamma_ramp(ptr ptr) @ cdecl wined3d_swapchain_get_parent(ptr)

1 0

Henri Verbeet : secur32: Only read complete records in schan_InitializeSecurityContextW().
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 2025e81585abf41bf8f9adb14c13b4dfba9ad691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2025e81585abf41bf8f9adb14… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 8 16:06:35 2012 +0200 secur32: Only read complete records in schan_InitializeSecurityContextW(). --- dlls/secur32/schannel.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index af34e66..cc287dc 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -668,6 +668,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( struct schan_buffers *out_buffers; struct schan_credentials *cred; struct schan_transport transport; + SIZE_T expected_size = ~0UL; SECURITY_STATUS ret; TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, @@ -714,7 +715,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( } else { - unsigned int expected_size; + SIZE_T record_size = 0; unsigned char *ptr; SecBuffer *buffer; int idx; @@ -727,17 +728,29 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INCOMPLETE_MESSAGE; buffer = &pInput->pBuffers[idx]; - if (buffer->cbBuffer < 5) - return SEC_E_INCOMPLETE_MESSAGE; - ptr = buffer->pvBuffer; - expected_size = 5 + ((ptr[3] << 8) | ptr[4]); - if (buffer->cbBuffer < expected_size) + expected_size = 0; + + while (buffer->cbBuffer > expected_size + 5) + { + record_size = 5 + ((ptr[3] << 8) | ptr[4]); + + if (buffer->cbBuffer < expected_size + record_size) + break; + + expected_size += record_size; + ptr += record_size; + } + + if (!expected_size) { - TRACE("Expected %u bytes, but buffer only contains %u bytes.\n", expected_size, buffer->cbBuffer); + TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", + max(6, record_size), buffer->cbBuffer); return SEC_E_INCOMPLETE_MESSAGE; } + TRACE("Using expected_size %lu.\n", expected_size); + ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX); } @@ -745,6 +758,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( transport.ctx = ctx; init_schan_buffers(&transport.in, pInput, schan_init_sec_ctx_get_next_buffer); + transport.in.limit = expected_size; init_schan_buffers(&transport.out, pOutput, schan_init_sec_ctx_get_next_buffer); schan_imp_set_session_transport(ctx->session, &transport);

1 0

André Hentschel : winedbg: Add new operators regarding data processing to ARM disassembler.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 338f5e9cb6d6863ed3269deee93c4af664b321e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=338f5e9cb6d6863ed3269deee… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jul 7 15:16:50 2012 +0200 winedbg: Add new operators regarding data processing to ARM disassembler. --- programs/winedbg/be_arm.c | 54 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 46 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 7095208..1362ef1 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -178,6 +178,48 @@ static UINT arm_disasm_branchxchg(UINT inst, ADDRESS64 *addr) return 0; } +static UINT arm_disasm_mrstrans(UINT inst, ADDRESS64 *addr) +{ + short src = (inst >> 22) & 0x01; + + dbg_printf("\n\tmrs%s\t%s, %s", get_cond(inst), tbl_regs[get_nibble(inst, 3)], + src ? "spsr" : "cpsr"); + return 0; +} + +static UINT arm_disasm_msrtrans(UINT inst, ADDRESS64 *addr) +{ + short immediate = (inst >> 25) & 0x01; + short dst = (inst >> 22) & 0x01; + short simple = (inst >> 16) & 0x01; + + if (simple || !immediate) + { + dbg_printf("\n\tmsr%s\t%s, %s", get_cond(inst), dst ? "spsr" : "cpsr", + tbl_regs[get_nibble(inst, 0)]); + return 0; + } + + dbg_printf("\n\tmsr%s\t%s, #%u", get_cond(inst), dst ? "spsr" : "cpsr", + ROR32(inst & 0xff, 2 * get_nibble(inst, 2))); + return 0; +} + +static UINT arm_disasm_wordmov(UINT inst, ADDRESS64 *addr) +{ + short top = (inst >> 22) & 0x01; + + dbg_printf("\n\tmov%s%s\t%s, #%u", top ? "t" : "w", get_cond(inst), + tbl_regs[get_nibble(inst, 3)], (get_nibble(inst, 4) << 12) | (inst & 0x0fff)); + return 0; +} + +static UINT arm_disasm_nop(UINT inst, ADDRESS64 *addr) +{ + dbg_printf("\n\tnop%s", get_cond(inst)); + return 0; +} + static UINT arm_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) { short condcodes = (inst >> 20) & 0x01; @@ -186,14 +228,6 @@ static UINT arm_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) short no_op1 = (opcode & 0x0d) == 0x0d; short no_dst = (opcode & 0x0c) == 0x08; - /* check for nop */ - if (get_nibble(inst, 3) == 15 /* r15 */ && condcodes == 0 && - opcode >= 8 /* tst */ && opcode <= 11 /* cmn */) - { - dbg_printf("\n\tnop"); - return 0; - } - dbg_printf("\n\t%s%s%s", tbl_dataops[opcode], condcodes ? "s" : "", get_cond(inst)); if (!no_dst) dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); else dbg_printf("\t"); @@ -741,6 +775,10 @@ static const struct inst_arm tbl_arm[] = { { 0x0e000090, 0x00000090, arm_disasm_halfwordtrans }, { 0x0ffffff0, 0x012fff00, arm_disasm_branchreg }, { 0x0ffffff0, 0x012fff10, arm_disasm_branchxchg }, + { 0x0fbf0fff, 0x010f0000, arm_disasm_mrstrans }, + { 0x0dbef000, 0x0128f000, arm_disasm_msrtrans }, + { 0x0fb00000, 0x03000000, arm_disasm_wordmov }, + { 0x0fffffff, 0x0320f000, arm_disasm_nop }, { 0x0c000000, 0x00000000, arm_disasm_dataprocessing }, { 0x0c000000, 0x04000000, arm_disasm_singletrans }, { 0x0e000000, 0x08000000, arm_disasm_blocktrans },

1 0

André Hentschel : winedbg: Add swap operator to ARM disassembler.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: b96d613337537477b1571c88170011a1db8d5c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96d613337537477b1571c881… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jul 7 15:12:20 2012 +0200 winedbg: Add swap operator to ARM disassembler. --- programs/winedbg/be_arm.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 3beb60a..7095208 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -156,6 +156,16 @@ static UINT arm_disasm_longmul(UINT inst, ADDRESS64 *addr) return 0; } +static UINT arm_disasm_swp(UINT inst, ADDRESS64 *addr) +{ + short byte = (inst >> 22) & 0x01; + + dbg_printf("\n\tswp%s%s\t%s, %s, [%s]", get_cond(inst), byte ? "b" : "", + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 0)], + tbl_regs[get_nibble(inst, 4)]); + return 0; +} + static UINT arm_disasm_branchreg(UINT inst, ADDRESS64 *addr) { dbg_printf("\n\tb%s\t%s", get_cond(inst), tbl_regs[get_nibble(inst, 0)]); @@ -727,6 +737,7 @@ static const struct inst_arm tbl_arm[] = { { 0x0e000000, 0x0a000000, arm_disasm_branch }, { 0x0fc000f0, 0x00000090, arm_disasm_mul }, { 0x0f8000f0, 0x00800090, arm_disasm_longmul }, + { 0x0fb00ff0, 0x01000090, arm_disasm_swp }, { 0x0e000090, 0x00000090, arm_disasm_halfwordtrans }, { 0x0ffffff0, 0x012fff00, arm_disasm_branchreg }, { 0x0ffffff0, 0x012fff10, arm_disasm_branchxchg },

1 0

André Hentschel : winedbg: Add multiplication operators to ARM disassembler.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 498614dda69f04f688de35e1b93c6ab844812d47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=498614dda69f04f688de35e1b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jul 7 15:11:06 2012 +0200 winedbg: Add multiplication operators to ARM disassembler. --- programs/winedbg/be_arm.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index bc19c98..3beb60a 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -127,6 +127,35 @@ static UINT arm_disasm_branch(UINT inst, ADDRESS64 *addr) return 0; } +static UINT arm_disasm_mul(UINT inst, ADDRESS64 *addr) +{ + short accu = (inst >> 21) & 0x01; + short condcodes = (inst >> 20) & 0x01; + + if (accu) + dbg_printf("\n\tmla%s%s\t%s, %s, %s, %s", get_cond(inst), condcodes ? "s" : "", + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], + tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 3)]); + else + dbg_printf("\n\tmul%s%s\t%s, %s, %s", get_cond(inst), condcodes ? "s" : "", + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], + tbl_regs[get_nibble(inst, 2)]); + return 0; +} + +static UINT arm_disasm_longmul(UINT inst, ADDRESS64 *addr) +{ + short sign = (inst >> 22) & 0x01; + short accu = (inst >> 21) & 0x01; + short condcodes = (inst >> 20) & 0x01; + + dbg_printf("\n\t%s%s%s%s\t%s, %s, %s, %s", sign ? "s" : "u", accu ? "mlal" : "mull", + get_cond(inst), condcodes ? "s" : "", + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)], tbl_regs[get_nibble(inst, 2)]); + return 0; +} + static UINT arm_disasm_branchreg(UINT inst, ADDRESS64 *addr) { dbg_printf("\n\tb%s\t%s", get_cond(inst), tbl_regs[get_nibble(inst, 0)]); @@ -696,6 +725,8 @@ struct inst_arm static const struct inst_arm tbl_arm[] = { { 0x0e000000, 0x0a000000, arm_disasm_branch }, + { 0x0fc000f0, 0x00000090, arm_disasm_mul }, + { 0x0f8000f0, 0x00800090, arm_disasm_longmul }, { 0x0e000090, 0x00000090, arm_disasm_halfwordtrans }, { 0x0ffffff0, 0x012fff00, arm_disasm_branchreg }, { 0x0ffffff0, 0x012fff10, arm_disasm_branchxchg },

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
72
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 July 2012