January 2009 - Wine-Commits

Henri Verbeet : ntdll: Fix ExceptionAddress for FPU exceptions.
by Alexandre Julliard Jan. 5, 2009

Jan. 5, 2009

Module: wine Branch: master Commit: 5e418a907208f62a2b1f68da483a8137568f4a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e418a907208f62a2b1f68da4… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Sun Jan 4 20:38:57 2009 +0100 ntdll: Fix ExceptionAddress for FPU exceptions. ExceptionAddress isn't the same as EIP for FPU exceptions, since the exception will be thrown on the next FPU instruction, rather than the instruction that caused the exception. --- dlls/ntdll/signal_i386.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index bd1e52b..08013fb 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1452,6 +1452,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case TRAP_x86_ARITHTRAP: /* Floating point exception */ case TRAP_x86_UNKNOWN: /* Unknown fault code */ rec->ExceptionCode = get_fpu_code( win_context ); + rec->ExceptionAddress = (LPVOID)win_context->FloatSave.ErrorOffset; break; case TRAP_x86_CACHEFLT: /* SIMD exception */ /* TODO:

1 0

Austin English : kernel32: Fix a compiler warning on non-i386.
by Alexandre Julliard Jan. 5, 2009

Jan. 5, 2009

Module: wine Branch: master Commit: f4d7369ba31f9ee12508f33884d2523bf6871d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d7369ba31f9ee12508f3388… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jan 4 13:24:59 2009 -0600 kernel32: Fix a compiler warning on non-i386. --- dlls/kernel32/wowthunk.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/wowthunk.c b/dlls/kernel32/wowthunk.c index e86c582..e7560ec 100644 --- a/dlls/kernel32/wowthunk.c +++ b/dlls/kernel32/wowthunk.c @@ -38,8 +38,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(thunk); -WINE_DECLARE_DEBUG_CHANNEL(relay); -WINE_DECLARE_DEBUG_CHANNEL(snoop); /* * These are the 16-bit side WOW routines. They reside in wownt16.h @@ -59,6 +57,9 @@ DWORD WINAPI FreeLibrary32W16(DWORD); #ifdef __i386__ +WINE_DECLARE_DEBUG_CHANNEL(relay); +WINE_DECLARE_DEBUG_CHANNEL(snoop); + /* symbols exported from relay16.s */ extern DWORD WINAPI wine_call_to_16( FARPROC16 target, DWORD cbArgs, PEXCEPTION_HANDLER handler ); extern void WINAPI wine_call_to_16_regs( CONTEXT86 *context, DWORD cbArgs, PEXCEPTION_HANDLER handler );

1 0

Michael Stefaniuc : include: Change long to LONG in olectl. h for Win64 compatibility.
by Alexandre Julliard Jan. 5, 2009

Jan. 5, 2009

Module: wine Branch: master Commit: 2f746dd5049f9cf46b78508ec279eb327e18a417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f746dd5049f9cf46b78508ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 14:14:23 2009 +0100 include: Change long to LONG in olectl.h for Win64 compatibility. --- include/olectl.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/olectl.h b/include/olectl.h index 49a1f75..ab51fd2 100644 --- a/include/olectl.h +++ b/include/olectl.h @@ -157,10 +157,10 @@ typedef struct tagPICTDESC { } DUMMYUNIONNAME; } PICTDESC, *LPPICTDESC; -typedef long OLE_XPOS_PIXELS; -typedef long OLE_YPOS_PIXELS; -typedef long OLE_XSIZE_PIXELS; -typedef long OLE_YSIZE_PIXELS; +typedef LONG OLE_XPOS_PIXELS; +typedef LONG OLE_YPOS_PIXELS; +typedef LONG OLE_XSIZE_PIXELS; +typedef LONG OLE_YSIZE_PIXELS; typedef float OLE_XPOS_CONTAINER; typedef float OLE_YPOS_CONTAINER; typedef float OLE_XSIZE_CONTAINER;

1 0

Michael Stefaniuc : msi: Change MSIHANDLE to ULONG for Win64 compatibility.
by Alexandre Julliard Jan. 5, 2009

Jan. 5, 2009

Module: wine Branch: master Commit: 6bd893a960eb30d7f3e74b2d23d0e5dd5d5e7f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd893a960eb30d7f3e74b2d2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 14:14:15 2009 +0100 msi: Change MSIHANDLE to ULONG for Win64 compatibility. Also fix the compiler warnings produced by this change. --- dlls/msi/database.c | 14 +++++++------- dlls/msi/format.c | 4 ++-- dlls/msi/handle.c | 8 ++++---- dlls/msi/install.c | 16 ++++++++-------- dlls/msi/msi.c | 10 +++++----- dlls/msi/msiquery.c | 32 ++++++++++++++++---------------- dlls/msi/package.c | 4 ++-- dlls/msi/preview.c | 10 +++++----- dlls/msi/record.c | 26 +++++++++++++------------- dlls/msi/suminfo.c | 20 ++++++++++---------- dlls/msi/tests/db.c | 6 +++--- dlls/msi/tests/format.c | 4 ++-- dlls/msi/tests/package.c | 12 ++++++------ include/msi.h | 2 +- 14 files changed, 84 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bd893a960eb30d7f3e74…

1 0

Alexandre Julliard : libwine: Ignore format modifiers 'h' and 'l' when formatting a string.
by Alexandre Julliard Jan. 5, 2009

Jan. 5, 2009

Module: wine Branch: master Commit: 52035af0e517f201612939fbcd7320dec5ab6246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52035af0e517f201612939fbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 11:58:38 2009 +0100 libwine: Ignore format modifiers 'h' and 'l' when formatting a string. --- libs/wine/string.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libs/wine/string.c b/libs/wine/string.c index b45de92..3c41019 100644 --- a/libs/wine/string.c +++ b/libs/wine/string.c @@ -324,6 +324,8 @@ static int format_string( WCHAR *buffer, size_t len, const char *format, const W } else max = strlenW(str); + if (*format == 'h' || *format == 'l') format++; + assert( *format == 's' ); if (!left_align && width > max)

1 0

Pavel Troller : ntdll: Fix serial.c for linux-2.6.28.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 0f6b925bdc47bb4b7520aa9ee700e268476c02d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f6b925bdc47bb4b7520aa9ee… Author: Pavel Troller <patrol(a)sinus.cz> Date: Sat Jan 3 20:49:30 2009 +0100 ntdll: Fix serial.c for linux-2.6.28. --- dlls/ntdll/serial.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index dc16cc5..40262a4 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -74,6 +74,9 @@ #include "wine/debug.h" #ifdef HAVE_LINUX_SERIAL_H +#ifdef HAVE_ASM_TYPES_H +#include <asm/types.h> +#endif #include <linux/serial.h> #endif

1 0

Gerald Pfeifer : README: Make FreeBSD requirements less conservative, only requiring FreeBSD 6.3.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: c95c75b0f6abadfed71ee30ab8089786a8c944db URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95c75b0f6abadfed71ee30ab… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 3 19:12:50 2009 +0100 README: Make FreeBSD requirements less conservative, only requiring FreeBSD 6.3. --- README | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index baa4929..1f6c384 100644 --- a/README +++ b/README @@ -29,7 +29,7 @@ especially the wealth of information found at http://www.winehq.org. To compile and run Wine, you must have one of the following: Linux version 2.0.36 or above - FreeBSD 7.0 or later + FreeBSD 6.3 or later Solaris x86 9 or later NetBSD-current Mac OS X 10.4 or later @@ -45,7 +45,7 @@ Linux info: FreeBSD info: Wine will generally not work properly on versions before FreeBSD - 7.0. FreeBSD 6.3 has patches available to allow Wine to run. See + 6.3 or 7.0, and FreeBSD 6.3 has additional patches available. See <http://wiki.freebsd.org/Wine> for more information. Solaris info:

1 0

Dylan Smith : richedit: Mask window id on WM_COMMAND notifications.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: fc13c70b783cbd42168857c8c396f78e76e94f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc13c70b783cbd42168857c8c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Jan 4 00:29:10 2009 -0500 richedit: Mask window id on WM_COMMAND notifications. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1f7c7db..abb9078 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4289,7 +4289,7 @@ LRESULT WINAPI RichEdit10ANSIWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM void ME_SendOldNotify(ME_TextEditor *editor, int nCode) { HWND hWnd = editor->hWnd; - SendMessageA(GetParent(hWnd), WM_COMMAND, (nCode<<16)|GetWindowLongW(hWnd, GWLP_ID), (LPARAM)hWnd); + SendMessageA(GetParent(hWnd), WM_COMMAND, MAKEWPARAM(GetWindowLongW(hWnd, GWLP_ID), nCode), (LPARAM)hWnd); } void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam)

1 0

Vitaliy Margolen : dinput: Allow for holes in device status structure.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: d2da2d378eefb1450f8882d80157465d1e272746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2da2d378eefb1450f8882d80… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Jan 3 17:53:22 2009 -0700 dinput: Allow for holes in device status structure. --- dlls/dinput/device.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ebc87eb..20a577b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -432,11 +432,8 @@ static HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *forma break; } } - - if (j == asked_format->dwNumObjs) - same = 0; } - + TRACE("Setting to default value :\n"); for (j = 0; j < asked_format->dwNumObjs; j++) { if (done[j] == 0) {

1 0

Alistair Leslie-Hughes : mshtml: Add missing IHTMLStyle interfaces.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: aece72e3110c7a406ea671df38cf59efc4955a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aece72e3110c7a406ea671df3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jan 3 20:26:01 2009 +1100 mshtml: Add missing IHTMLStyle interfaces. --- include/mshtml.idl | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 125 insertions(+), 2 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index be99f3c..fa3fc97 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -2246,6 +2246,129 @@ methods: } [ + odl, + oleautomation, + dual, + uuid(3050f656-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLStyle3 : IDispatch +{ + [propput, id(DISPID_IHTMLSTYLE3_LAYOUTFLOW), displaybind, bindable] + HRESULT layoutFlow([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE3_LAYOUTFLOW), displaybind, bindable] + HRESULT layoutFlow([retval, out] BSTR * p); + + [propput, id(DISPID_IHTMLSTYLE3_ZOOM), displaybind, bindable] + HRESULT zoom([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE3_ZOOM), displaybind, bindable] + HRESULT zoom([retval, out] VARIANT * p); + + [propput, id(DISPID_IHTMLSTYLE3_WORDWRAP), displaybind, bindable] + HRESULT wordWrap([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE3_WORDWRAP), displaybind, bindable] + HRESULT wordWrap([retval, out] BSTR * p); + + [propput, id(DISPID_IHTMLSTYLE3_TEXTUNDERLINEPOSITION), displaybind, bindable] + HRESULT textUnderlinePosition([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE3_TEXTUNDERLINEPOSITION), displaybind, bindable] + HRESULT textUnderlinePosition([retval, out] BSTR * p); + + [propput, id(DISPID_IHTMLSTYLE3_SCROLLBARBASECOLOR), displaybind, bindable] + HRESULT scrollbarBaseColor([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE3_SCROLLBARBASECOLOR), displaybind, bindable] + HRESULT scrollbarBaseColor([retval, out] VARIANT * p); + + [propput, id(DISPID_IHTMLSTYLE3_SCROLLBARFACECOLOR), displaybind, bindable] + HRESULT scrollbarFaceColor([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE3_SCROLLBARFACECOLOR), displaybind, bindable] + HRESULT scrollbarFaceColor([retval, out] VARIANT * p); + + [propput, id(DISPID_IHTMLSTYLE3_SCROLLBAR3DLIGHTCOLOR), displaybind, bindable] + HRESULT scrollbar3dLightColor([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE3_SCROLLBAR3DLIGHTCOLOR), displaybind, bindable] + HRESULT scrollbar3dLightColor([retval, out] VARIANT * p); + + [propput, id(DISPID_IHTMLSTYLE3_SCROLLBARSHADOWCOLOR), displaybind, bindable] + HRESULT scrollbarShadowColor([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE3_SCROLLBARSHADOWCOLOR), displaybind, bindable] + HRESULT scrollbarShadowColor([retval, out] VARIANT * p); + + [propput, id(DISPID_IHTMLSTYLE3_SCROLLBARHIGHLIGHTCOLOR), displaybind, bindable] + HRESULT scrollbarHighlightColor([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE3_SCROLLBARHIGHLIGHTCOLOR), displaybind, bindable] + HRESULT scrollbarHighlightColor([retval, out] VARIANT * p); + + [propput, id(DISPID_IHTMLSTYLE3_SCROLLBARDARKSHADOWCOLOR), displaybind, bindable] + HRESULT scrollbarDarkShadowColor([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE3_SCROLLBARDARKSHADOWCOLOR), displaybind, bindable] + HRESULT scrollbarDarkShadowColor([retval, out] VARIANT * p); + + [propput, id(DISPID_IHTMLSTYLE3_SCROLLBARARROWCOLOR), displaybind, bindable] + HRESULT scrollbarArrowColor([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE3_SCROLLBARARROWCOLOR), displaybind, bindable] + HRESULT scrollbarArrowColor([retval, out] VARIANT * p); + + [propput, id(DISPID_IHTMLSTYLE3_SCROLLBARTRACKCOLOR), displaybind, bindable] + HRESULT scrollbarTrackColor([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE3_SCROLLBARTRACKCOLOR), displaybind, bindable] + HRESULT scrollbarTrackColor([retval, out] VARIANT * p); + + [propput, id(DISPID_IHTMLSTYLE3_WRITINGMODE), displaybind, bindable] + HRESULT writingMode([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE3_WRITINGMODE), displaybind, bindable] + HRESULT writingMode([retval, out] BSTR * p); + + [propput, id(DISPID_IHTMLSTYLE3_TEXTALIGNLAST), displaybind, bindable] + HRESULT textAlignLast([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE3_TEXTALIGNLAST), displaybind, bindable] + HRESULT textAlignLast([retval, out] BSTR * p); + + [propput, id(DISPID_IHTMLSTYLE3_TEXTKASHIDASPACE), displaybind, bindable] + HRESULT textKashidaSpace([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE3_TEXTKASHIDASPACE), displaybind, bindable] + HRESULT textKashidaSpace([retval, out] VARIANT * p); +} + +/***************************************************************************** + * IHTMLSytyle4 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f816-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLStyle4 : IDispatch +{ + [propput, id(DISPID_IHTMLSTYLE4_TEXTOVERFLOW), displaybind, bindable] + HRESULT textOverflow([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE4_TEXTOVERFLOW), displaybind, bindable] + HRESULT textOverflow([retval, out] BSTR * p); + + [propput, id(DISPID_IHTMLSTYLE4_MINHEIGHT), displaybind, bindable] + HRESULT minHeight([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE4_MINHEIGHT), displaybind, bindable] + HRESULT minHeight([retval, out] VARIANT * p); +} + +[ noncreatable, uuid(3050f285-98b5-11cf-bb82-00aa00bdce0b) ] @@ -2254,8 +2377,8 @@ coclass HTMLStyle [default] dispinterface DispHTMLStyle; interface IHTMLStyle; interface IHTMLStyle2; - /* interface IHTMLStyle3; */ - /* interface IHTMLStyle4; */ + interface IHTMLStyle3; + interface IHTMLStyle4; /* interface IHTMLStyle5; */ }

1 0