December 2012 - Wine-Commits

Tag wine-1.5.19 : Alexandre Julliard : Release 1.5.19
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: refs/tags/wine-1.5.19 Tag: 291815d84e84ad9c559db7ea45563790d51b3896 URL: http://source.winehq.org/git/wine.git/?a=tag;h=291815d84e84ad9c559db7ea4556… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 20:17:36 2012 +0100 Release 1.5.19

1 0

Jacek Caban : vbscript: Use simplified constant implementation for more constants.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: d10d989feddd5dfc8ffac7d9e5cf8ff357c0a3b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10d989feddd5dfc8ffac7d9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 7 13:00:35 2012 +0100 vbscript: Use simplified constant implementation for more constants. --- dlls/vbscript/global.c | 56 ++++++------------------------------------------ 1 files changed, 7 insertions(+), 49 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 420a5a5..cba4edc 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1638,48 +1638,6 @@ static HRESULT Global_vbSystemModal(vbdisp_t *This, VARIANT *arg, unsigned args_ return E_NOTIMPL; } -static HRESULT Global_vbOK(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDOK); -} - -static HRESULT Global_vbCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDCANCEL); -} - -static HRESULT Global_vbAbort(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDABORT); -} - -static HRESULT Global_vbRetry(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDRETRY); -} - -static HRESULT Global_vbIgnore(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDIGNORE); -} - -static HRESULT Global_vbYes(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDYES); -} - -static HRESULT Global_vbNo(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDNO); -} - static HRESULT Global_vbTrue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -1907,13 +1865,13 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBDEFAULTBUTTON4, Global_vbDefaultButton4, BP_GET}, {DISPID_GLOBAL_VBAPPLICATIONMODAL, Global_vbApplicationModal, BP_GET}, {DISPID_GLOBAL_VBSYSTEMMODAL, Global_vbSystemModal, BP_GET}, - {DISPID_GLOBAL_VBOK, Global_vbOK, BP_GET}, - {DISPID_GLOBAL_VBCANCEL, Global_vbCancel, BP_GET}, - {DISPID_GLOBAL_VBABORT, Global_vbAbort, BP_GET}, - {DISPID_GLOBAL_VBRETRY, Global_vbRetry, BP_GET}, - {DISPID_GLOBAL_VBIGNORE, Global_vbIgnore, BP_GET}, - {DISPID_GLOBAL_VBYES, Global_vbYes, BP_GET}, - {DISPID_GLOBAL_VBNO, Global_vbNo, BP_GET}, + {DISPID_GLOBAL_VBOK, NULL, BP_GET, IDOK}, + {DISPID_GLOBAL_VBCANCEL, NULL, BP_GET, IDCANCEL}, + {DISPID_GLOBAL_VBABORT, NULL, BP_GET, IDABORT}, + {DISPID_GLOBAL_VBRETRY, NULL, BP_GET, IDRETRY}, + {DISPID_GLOBAL_VBIGNORE, NULL, BP_GET, IDIGNORE}, + {DISPID_GLOBAL_VBYES, NULL, BP_GET, IDYES}, + {DISPID_GLOBAL_VBNO, NULL, BP_GET, IDNO}, {DISPID_GLOBAL_VBEMPTY, NULL, BP_GET, VT_EMPTY}, {DISPID_GLOBAL_VBNULL, NULL, BP_GET, VT_NULL}, {DISPID_GLOBAL_VBINTEGER, NULL, BP_GET, VT_I2},

1 0

Henri Verbeet : ddraw: Avoid LPDDPIXELFORMAT.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: 9a7bb01a9590fd74fa1c5bb5785c64772a4cb59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7bb01a9590fd74fa1c5bb57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 7 00:07:04 2012 +0100 ddraw: Avoid LPDDPIXELFORMAT. --- include/d3dtypes.h | 2 +- include/ddraw.h | 10 +++++----- include/ddrawi.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/d3dtypes.h b/include/d3dtypes.h index 256d99a..01752b7 100644 --- a/include/d3dtypes.h +++ b/include/d3dtypes.h @@ -73,7 +73,7 @@ typedef LONG D3DFIXED; typedef HRESULT (CALLBACK *LPD3DVALIDATECALLBACK)(LPVOID lpUserArg, DWORD dwOffset); typedef HRESULT (CALLBACK *LPD3DENUMTEXTUREFORMATSCALLBACK)(LPDDSURFACEDESC lpDdsd, LPVOID lpContext); -typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(LPDDPIXELFORMAT lpDDPixFmt, LPVOID lpContext); +typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(DDPIXELFORMAT *format, void *ctx); #ifndef DX_SHARED_DEFINES diff --git a/include/ddraw.h b/include/ddraw.h index 25ea77e..536a58e 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1891,7 +1891,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown) /*48*/ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; /*4c*/ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; /*50*/ STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; -/*54*/ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; +/*54*/ STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; /*58*/ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; /*5c*/ STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; /*60*/ STDMETHOD(IsLost)(THIS) PURE; @@ -2025,7 +2025,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown) STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; - STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; + STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; @@ -2171,7 +2171,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown) STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; - STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; + STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; @@ -2322,7 +2322,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; - STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; + STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; @@ -2489,7 +2489,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; - STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; + STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; diff --git a/include/ddrawi.h b/include/ddrawi.h index a695a1c..1210d2c 100644 --- a/include/ddrawi.h +++ b/include/ddrawi.h @@ -820,7 +820,7 @@ typedef struct _DDRAWI_DIRECTDRAW_GBL { /* DirectX 6.0 */ ULONG_PTR lpD3DHALCallbacks3; DWORD dwNumZPixelFormats; - LPDDPIXELFORMAT lpZPixelFormats; + DDPIXELFORMAT *lpZPixelFormats; LPDDRAWI_DDMOTIONCOMP_INT mcList; DWORD hDDVxd; DDSCAPSEX ddsCapsMore;

1 0

Hans Leidekker : configure: Fix detection of fallocate on old glibc.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: 3244be050048e2ce5e60c2d4a5a5dac193e4b2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3244be050048e2ce5e60c2d4a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 7 09:22:40 2012 +0100 configure: Fix detection of fallocate on old glibc. --- configure | 35 ++++++++++++++++++++++++++++++++++- configure.ac | 10 +++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 2da5477..c1e10d7 100755 --- a/configure +++ b/configure @@ -12931,7 +12931,6 @@ for ac_func in \ chsize \ dlopen \ epoll_create \ - fallocate \ ffs \ finite \ fnmatch \ @@ -13494,6 +13493,40 @@ $as_echo "#define HAVE_SCHED_SETAFFINITY 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fallocate" >&5 +$as_echo_n "checking for fallocate... " >&6; } +if ${wine_cv_have_fallocate+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _GNU_SOURCE +#include <fcntl.h> +int +main () +{ +fallocate(-1, 0, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + wine_cv_have_fallocate=yes +else + wine_cv_have_fallocate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_fallocate" >&5 +$as_echo "$wine_cv_have_fallocate" >&6; } +if test "$wine_cv_have_fallocate" = "yes" +then + +$as_echo "#define HAVE_FALLOCATE 1" >>confdefs.h + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } diff --git a/configure.ac b/configure.ac index 4c7655a..01d84cd 100644 --- a/configure.ac +++ b/configure.ac @@ -1976,7 +1976,6 @@ AC_CHECK_FUNCS(\ chsize \ dlopen \ epoll_create \ - fallocate \ ffs \ finite \ fnmatch \ @@ -2117,6 +2116,15 @@ then AC_DEFINE(HAVE_SCHED_SETAFFINITY, 1, [Define to 1 if you have the `sched_setaffinity' function.]) fi +AC_CACHE_CHECK([for fallocate],wine_cv_have_fallocate, + AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#define _GNU_SOURCE +#include <fcntl.h>]], [[fallocate(-1, 0, 0, 0);]])],[wine_cv_have_fallocate=yes],[wine_cv_have_fallocate=no])) +if test "$wine_cv_have_fallocate" = "yes" +then + AC_DEFINE(HAVE_FALLOCATE, 1, [Define to 1 if you have the `fallocate' function.]) +fi + dnl **** Check for types **** AC_C_INLINE

1 0

André Hentschel : winedbg: Add load/ str multiple operators to Thumb2 disassembler.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: 8818e259544a6f28dcef4e298f1310a9e61ca965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8818e259544a6f28dcef4e298… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 7 00:27:27 2012 +0100 winedbg: Add load/str multiple operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 85eb0ef..c3963c4 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1118,6 +1118,35 @@ static UINT thumb2_disasm_coprocdatatrans(UINT inst, ADDRESS64 *addr) return 0; } +static UINT thumb2_disasm_ldrstrmul(UINT inst, ADDRESS64 *addr) +{ + short load = (inst >> 20) & 0x01; + short writeback = (inst >> 21) & 0x01; + short decbefore = (inst >> 24) & 0x01; + short i; + short last=15; + for (i=15;i>=0;i--) + if ((inst>>i) & 1) + { + last = i; + break; + } + + if (writeback && get_nibble(inst, 4) == 13) + dbg_printf("\n\t%s\t{", load ? "pop" : "push"); + else + dbg_printf("\n\t%s%s\t%s%s, {", load ? "ldm" : "stm", decbefore ? "db" : "ia", + tbl_regs[get_nibble(inst, 4)], writeback ? "!" : ""); + for (i=0;i<=15;i++) + if ((inst>>i) & 1) + { + if (i == last) dbg_printf("%s", tbl_regs[i]); + else dbg_printf("%s, ", tbl_regs[i]); + } + dbg_printf("}"); + return 0; +} + struct inst_arm { UINT mask; @@ -1196,6 +1225,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 }, { 0xee000000, 0xec000000, thumb2_disasm_coprocdatatrans }, + { 0xfe402000, 0xe8000000, thumb2_disasm_ldrstrmul }, { 0x00000000, 0x00000000, NULL } };

1 0

Henri Verbeet : ddraw: Avoid LPDDSURFACEDESC2.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: fb37ac56d9395fea24d8d13ec9c84087625df6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb37ac56d9395fea24d8d13ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 7 00:07:06 2012 +0100 ddraw: Avoid LPDDSURFACEDESC2. --- dlls/ddraw/ddraw.c | 2 +- include/ddraw.h | 30 +++++++++++++++++------------- include/ddrawi.h | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e4e50df..97b071f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3078,7 +3078,7 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, if (TRACE_ON(ddraw)) { TRACE(" (%p) Requesting surface desc :\n", iface); - DDRAW_dump_surface_desc((LPDDSURFACEDESC2)surface_desc); + DDRAW_dump_surface_desc((DDSURFACEDESC2 *)surface_desc); } WARN("Application tried to create an explicit front or back buffer\n"); diff --git a/include/ddraw.h b/include/ddraw.h index e198ae4..0b8128f 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1059,7 +1059,7 @@ typedef BOOL (CALLBACK *LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID); DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK) typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK)(DDSURFACEDESC *desc, void *ctx); -typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID); +typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK2)(DDSURFACEDESC2 *desc, void *ctx); typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK)(struct IDirectDrawSurface *surface, DDSURFACEDESC *surface_desc, void *ctx); typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK2)(struct IDirectDrawSurface4 *surface, @@ -1647,11 +1647,13 @@ DECLARE_INTERFACE_(IDirectDraw4,IUnknown) struct IDirectDrawSurface4 **surface, IUnknown *outer) PURE; /*1c*/ STDMETHOD(DuplicateSurface)(THIS_ struct IDirectDrawSurface4 *src_surface, struct IDirectDrawSurface4 **dst_surface) PURE; -/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE; -/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback) PURE; +/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD flags, DDSURFACEDESC2 *surface_desc, + void *ctx, LPDDENUMMODESCALLBACK2 cb) PURE; +/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD flags, DDSURFACEDESC2 *surface_desc, + void *ctx, LPDDENUMSURFACESCALLBACK2 cb) PURE; /*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE; /*2c*/ STDMETHOD(GetCaps)(THIS_ DDCAPS *driver_caps, DDCAPS *hel_caps) PURE; -/*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; +/*30*/ STDMETHOD(GetDisplayMode)(THIS_ DDSURFACEDESC2 *surface_desc) PURE; /*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; /*38*/ STDMETHOD(GetGDISurface)(THIS_ struct IDirectDrawSurface4 **surface) PURE; /*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; @@ -1763,11 +1765,13 @@ DECLARE_INTERFACE_(IDirectDraw7,IUnknown) struct IDirectDrawSurface7 **surface, IUnknown *outer) PURE; /*1c*/ STDMETHOD(DuplicateSurface)(THIS_ struct IDirectDrawSurface7 *src_surface, struct IDirectDrawSurface7 **dst_surface) PURE; -/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE; -/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpEnumSurfacesCallback) PURE; +/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD flags, DDSURFACEDESC2 *surface_desc, + void *ctx, LPDDENUMMODESCALLBACK2 cb) PURE; +/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD flags, DDSURFACEDESC2 *surface_desc, + void *ctx, LPDDENUMSURFACESCALLBACK7 cb) PURE; /*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE; /*2c*/ STDMETHOD(GetCaps)(THIS_ DDCAPS *driver_caps, DDCAPS *hel_caps) PURE; -/*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; +/*30*/ STDMETHOD(GetDisplayMode)(THIS_ DDSURFACEDESC2 *surface_desc) PURE; /*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; /*38*/ STDMETHOD(GetGDISurface)(THIS_ struct IDirectDrawSurface7 **surface) PURE; /*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; @@ -2329,10 +2333,10 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; - STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; + STDMETHOD(GetSurfaceDesc)(THIS_ DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; - STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; + STDMETHOD(Lock)(THIS_ RECT *rect, DDSURFACEDESC2 *surface_desc, DWORD flags, HANDLE event) PURE; STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; STDMETHOD(Restore)(THIS) PURE; STDMETHOD(SetClipper)(THIS_ IDirectDrawClipper *clipper) PURE; @@ -2349,7 +2353,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE; STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE; /* added in v3 */ - STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags) PURE; + STDMETHOD(SetSurfaceDesc)(THIS_ DDSURFACEDESC2 *surface_desc, DWORD flags) PURE; /* added in v4 */ STDMETHOD(SetPrivateData)(THIS_ REFGUID tag, LPVOID pData, DWORD cbSize, DWORD dwFlags) PURE; STDMETHOD(GetPrivateData)(THIS_ REFGUID tag, LPVOID pBuffer, LPDWORD pcbBufferSize) PURE; @@ -2496,10 +2500,10 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; - STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; + STDMETHOD(GetSurfaceDesc)(THIS_ DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; - STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; + STDMETHOD(Lock)(THIS_ RECT *rect, DDSURFACEDESC2 *surface_desc, DWORD flags, HANDLE event) PURE; STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; STDMETHOD(Restore)(THIS) PURE; STDMETHOD(SetClipper)(THIS_ IDirectDrawClipper *clipper) PURE; @@ -2516,7 +2520,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE; STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE; /* added in v3 */ - STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags) PURE; + STDMETHOD(SetSurfaceDesc)(THIS_ DDSURFACEDESC2 *surface_desc, DWORD flags) PURE; /* added in v4 */ STDMETHOD(SetPrivateData)(THIS_ REFGUID tag, LPVOID pData, DWORD cbSize, DWORD dwFlags) PURE; STDMETHOD(GetPrivateData)(THIS_ REFGUID tag, LPVOID pBuffer, LPDWORD pcbBufferSize) PURE; diff --git a/include/ddrawi.h b/include/ddrawi.h index 37ff1b6..5422ed7 100644 --- a/include/ddrawi.h +++ b/include/ddrawi.h @@ -951,7 +951,7 @@ typedef struct _DDRAWI_DDRAWSURFACE_MORE { DWORD qwDDrawReserved8[2]; LPVOID lpDDrawReserved9; DWORD cSurfaces; - LPDDSURFACEDESC2 pCreatedDDSurfaceDesc2; + DDSURFACEDESC2 *pCreatedDDSurfaceDesc2; LPDDRAWI_DDRAWSURFACE_LCL *slist; DWORD dwFVF; LPVOID lpVB;

1 0

Jacek Caban : msxml3: Added basic URL validation in safe mode.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: f49376bd083e37c9d00dc561407b297d7e201928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49376bd083e37c9d00dc5614… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 7 11:53:26 2012 +0100 msxml3: Added basic URL validation in safe mode. --- dlls/msxml3/httprequest.c | 60 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 848a470..d8ab1b9 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -758,6 +758,53 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * return hr; } +static HRESULT verify_uri(httprequest *This, IUri *uri) +{ + DWORD scheme, base_scheme; + BSTR host, base_host; + HRESULT hr; + + if(!(This->safeopt & INTERFACESAFE_FOR_UNTRUSTED_DATA)) + return S_OK; + + if(!This->base_uri) + return E_ACCESSDENIED; + + hr = IUri_GetScheme(uri, &scheme); + if(FAILED(hr)) + return hr; + + hr = IUri_GetScheme(This->base_uri, &base_scheme); + if(FAILED(hr)) + return hr; + + if(scheme != base_scheme) { + WARN("Schemes don't match\n"); + return E_ACCESSDENIED; + } + + if(scheme == INTERNET_SCHEME_UNKNOWN) { + FIXME("Unknown scheme\n"); + return E_ACCESSDENIED; + } + + hr = IUri_GetHost(uri, &host); + if(FAILED(hr)) + return hr; + + hr = IUri_GetHost(This->base_uri, &base_host); + if(SUCCEEDED(hr)) { + if(strcmpiW(host, base_host)) { + WARN("Hosts don't match\n"); + hr = E_ACCESSDENIED; + } + SysFreeString(base_host); + } + + SysFreeString(host); + return hr; +} + static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, VARIANT async, VARIANT user, VARIANT password) { @@ -767,6 +814,7 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, static const WCHAR MethodDeleteW[] = {'D','E','L','E','T','E',0}; static const WCHAR MethodPropFindW[] = {'P','R','O','P','F','I','N','D',0}; VARIANT str, is_async; + IUri *uri; HRESULT hr; if (!method || !url) return E_INVALIDARG; @@ -807,14 +855,22 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, } if(This->base_uri) - hr = CoInternetCombineUrlEx(This->base_uri, url, 0, &This->uri, 0); + hr = CoInternetCombineUrlEx(This->base_uri, url, 0, &uri, 0); else - hr = CreateUri(url, 0, 0, &This->uri); + hr = CreateUri(url, 0, 0, &uri); if(FAILED(hr)) { WARN("Could not create IUri object: %08x\n", hr); return hr; } + hr = verify_uri(This, uri); + if(FAILED(hr)) { + IUri_Release(uri); + return hr; + } + + This->uri = uri; + VariantInit(&is_async); hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); This->async = hr == S_OK && V_BOOL(&is_async);

1 0

Jacek Caban : msxml3: Added URL validation tests.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: e310a88402374e954e05eeedeebcf7c97c196561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e310a88402374e954e05eeede… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 7 11:53:38 2012 +0100 msxml3: Added URL validation tests. --- dlls/msxml3/tests/httpreq.c | 178 ++++++++++++++++++++++++++++++++----------- 1 files changed, 134 insertions(+), 44 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 9e2f99b..654749b 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -127,6 +127,21 @@ static void free_bstrs(void) alloced_bstrs_count = 0; } +static BSTR a2bstr(const char *str) +{ + BSTR ret; + int len; + + if(!str) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = SysAllocStringLen(NULL, len); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + typedef struct { IServiceProvider IServiceProvider_iface; @@ -537,7 +552,7 @@ static HRESULT WINAPI htmldoc2_put_URL(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI htmldoc2_get_URL(IHTMLDocument2 *iface, BSTR *p) { CHECK_EXPECT2(htmldoc2_get_url); - *p = SysAllocString(NULL); + *p = a2bstr("http://test.winehq.org/"); return S_OK; } @@ -1317,6 +1332,92 @@ static IDispatch* create_dispevent(void) return (IDispatch*)&event->IDispatch_iface; } +static IXMLHttpRequest *create_xhr(void) +{ + IXMLHttpRequest *ret; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLHttpRequest, (void**)&ret); + + return SUCCEEDED(hr) ? ret : NULL; +} + +static void set_safety_opt(IUnknown *unk, DWORD mask, DWORD opts) +{ + IObjectSafety *obj_safety; + HRESULT hr; + + hr = IUnknown_QueryInterface(unk, &IID_IObjectSafety, (void**)&obj_safety); + ok(hr == S_OK, "Could not get IObjectSafety iface: %08x\n", hr); + + hr = IObjectSafety_SetInterfaceSafetyOptions(obj_safety, &IID_IDispatch, mask, mask&opts); + ok(hr == S_OK, "SetInterfaceSafetyOptions failed: %08x\n", hr); + + IObjectSafety_Release(obj_safety); +} + +static void set_xhr_site(IXMLHttpRequest *xhr) +{ + IObjectWithSite *obj_site; + HRESULT hr; + + hr = IXMLHttpRequest_QueryInterface(xhr, &IID_IObjectWithSite, (void**)&obj_site); + ok(hr == S_OK, "Could not get IObjectWithSite iface: %08x\n", hr); + + SET_EXPECT(site_qi_IServiceProvider); + SET_EXPECT(sp_queryservice_SID_SBindHost); + SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); + SET_EXPECT(sp_queryservice_SID_secmgr_htmldoc2); + SET_EXPECT(sp_queryservice_SID_secmgr_xmldomdoc); + SET_EXPECT(sp_queryservice_SID_secmgr_secmgr); + + /* calls to IHTMLDocument2 */ + SET_EXPECT(htmldoc2_get_all); + SET_EXPECT(collection_get_length); + SET_EXPECT(htmldoc2_get_url); + + SET_EXPECT(site_qi_IXMLDOMDocument); + SET_EXPECT(site_qi_IOleClientSite); + + hr = IObjectWithSite_SetSite(obj_site, &testsite.IUnknown_iface); + EXPECT_HR(hr, S_OK); + + CHECK_CALLED(site_qi_IServiceProvider); +todo_wine + CHECK_CALLED(sp_queryservice_SID_SBindHost); + CHECK_CALLED(sp_queryservice_SID_SContainerDispatch_htmldoc2); +todo_wine { + CHECK_CALLED(sp_queryservice_SID_secmgr_htmldoc2); + CHECK_CALLED(sp_queryservice_SID_secmgr_xmldomdoc); + /* this one isn't very reliable + CHECK_CALLED(sp_queryservice_SID_secmgr_secmgr); */ + + CHECK_CALLED(htmldoc2_get_all); + CHECK_CALLED(collection_get_length); + CHECK_CALLED(htmldoc2_get_url); + + CHECK_CALLED(site_qi_IXMLDOMDocument); + CHECK_CALLED(site_qi_IOleClientSite); +} + + IObjectWithSite_Release(obj_site); +} + +#define test_open(a,b,c,d) _test_open(__LINE__,a,b,c,d) +static void _test_open(unsigned line, IXMLHttpRequest *xhr, const char *method, const char *url, HRESULT exhres) +{ + VARIANT empty, vfalse; + HRESULT hr; + + V_VT(&empty) = VT_EMPTY; + V_VT(&vfalse) = VT_BOOL; + V_BOOL(&vfalse) = VARIANT_FALSE; + + hr = IXMLHttpRequest_open(xhr, _bstr_(method), _bstr_(url), vfalse, empty, empty); + ok_(__FILE__,line)(hr == exhres, "open(%s %s) failed: %08x, expected %08x\n", method, url, hr, exhres); +} + static void test_XMLHTTP(void) { static const char bodyA[] = "mode=Test"; @@ -1337,13 +1438,7 @@ static void test_XMLHTTP(void) HRESULT hr; HGLOBAL g; - hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, - &IID_IXMLHttpRequest, (void**)&xhr); - if (FAILED(hr)) - { - win_skip("IXMLHTTPRequest is not available (0x%08x)\n", hr); - return; - } + xhr = create_xhr(); VariantInit(&dummy); V_VT(&dummy) = VT_ERROR; @@ -1629,43 +1724,10 @@ todo_wine { EXPECT_REF(obj_site2, 1); ok(obj_site != obj_site2, "expected new instance\n"); } - SET_EXPECT(site_qi_IServiceProvider); - SET_EXPECT(sp_queryservice_SID_SBindHost); - SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); - SET_EXPECT(sp_queryservice_SID_secmgr_htmldoc2); - SET_EXPECT(sp_queryservice_SID_secmgr_xmldomdoc); - SET_EXPECT(sp_queryservice_SID_secmgr_secmgr); - - /* calls to IHTMLDocument2 */ - SET_EXPECT(htmldoc2_get_all); - SET_EXPECT(collection_get_length); - SET_EXPECT(htmldoc2_get_url); - - SET_EXPECT(site_qi_IXMLDOMDocument); - SET_EXPECT(site_qi_IOleClientSite); - - hr = IObjectWithSite_SetSite(obj_site, &testsite.IUnknown_iface); - EXPECT_HR(hr, S_OK); - - CHECK_CALLED(site_qi_IServiceProvider); -todo_wine - CHECK_CALLED(sp_queryservice_SID_SBindHost); - CHECK_CALLED(sp_queryservice_SID_SContainerDispatch_htmldoc2); -todo_wine { - CHECK_CALLED(sp_queryservice_SID_secmgr_htmldoc2); - CHECK_CALLED(sp_queryservice_SID_secmgr_xmldomdoc); - /* this one isn't very reliable - CHECK_CALLED(sp_queryservice_SID_secmgr_secmgr); */ - - CHECK_CALLED(htmldoc2_get_all); - CHECK_CALLED(collection_get_length); - CHECK_CALLED(htmldoc2_get_url); - - CHECK_CALLED(site_qi_IXMLDOMDocument); - CHECK_CALLED(site_qi_IOleClientSite); -} IObjectWithSite_Release(obj_site); + set_xhr_site(xhr); + /* try to set site another time */ /* to be removed once IObjectWithSite is properly separated */ @@ -1691,11 +1753,39 @@ todo_wine { free_bstrs(); } +static void test_safe_httpreq(void) +{ + IXMLHttpRequest *xhr; + + xhr = create_xhr(); + + set_safety_opt((IUnknown*)xhr, INTERFACESAFE_FOR_UNTRUSTED_DATA, -1); + set_xhr_site(xhr); + + /* different scheme */ + test_open(xhr, "GET", "https://test.winehq.org/tests/hello.html", E_ACCESSDENIED); + + /* different host */ + test_open(xhr, "GET", "http://tests.winehq.org/tests/hello.html", E_ACCESSDENIED); + test_open(xhr, "GET", "http://www.test.winehq.org/tests/hello.html", E_ACCESSDENIED); + + IXMLHttpRequest_Release(xhr); +} + START_TEST(httpreq) { + IXMLHttpRequest *xhr; + CoInitialize(NULL); - test_XMLHTTP(); + if((xhr = create_xhr())) { + IXMLHttpRequest_Release(xhr); + + test_XMLHTTP(); + test_safe_httpreq(); + }else { + win_skip("IXMLHTTPRequest is not available\n"); + } CoUninitialize(); }

1 0

Francois Gouget : gdi32: Make make_rgb_colorref() static.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: 166e7c7381b1c3848d328dd281ae57e02f4b6b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=166e7c7381b1c3848d328dd28… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 7 12:31:16 2012 +0100 gdi32: Make make_rgb_colorref() static. --- dlls/gdi32/dibdrv/dibdrv.h | 1 - dlls/gdi32/dibdrv/objects.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index b780268..4152f2e 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -245,7 +245,6 @@ extern void free_dib_info(dib_info *dib) DECLSPEC_HIDDEN; extern void free_pattern_brush(dib_brush *brush) DECLSPEC_HIDDEN; extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; -extern COLORREF make_rgb_colorref( HDC hdc, const dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) DECLSPEC_HIDDEN; extern DWORD get_pixel_color( HDC hdc, const dib_info *dib, COLORREF color, BOOL mono_fixup ) DECLSPEC_HIDDEN; extern int clip_rect_to_dib( const dib_info *dib, RECT *rc ) DECLSPEC_HIDDEN; extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 96c0e7a..5ff9d1a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -135,7 +135,7 @@ static inline BOOL rgbquad_equal(const RGBQUAD *a, const RGBQUAD *b) return FALSE; } -COLORREF make_rgb_colorref( HDC hdc, const dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) +static COLORREF make_rgb_colorref( HDC hdc, const dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) { *pixel = 0; *got_pixel = FALSE;

1 0

Alexandre Julliard : gdi32: Simplify list processing by using the LIST_FOR_EACH_ENTRY macro.
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: d3c128346b50c546d9e247a76cc0f87ad1a3a4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c128346b50c546d9e247a76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 14:29:28 2012 +0100 gdi32: Simplify list processing by using the LIST_FOR_EACH_ENTRY macro. --- dlls/gdi32/freetype.c | 183 ++++++++++++++++++------------------------------ 1 files changed, 69 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3c128346b50c546d9e24…

1 0