December 2014 - Wine-Commits

Henri Verbeet : d3d9: Calculate texture levels in d3d9 instead of wined3d.
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: 3b3b74510b0bc52a5b52a1438517e0381a43be45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3b74510b0bc52a5b52a1438… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 10 13:26:37 2014 +0100 d3d9: Calculate texture levels in d3d9 instead of wined3d. --- dlls/d3d9/texture.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 432d248..c35ccdd 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1296,6 +1296,14 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) surface_flags |= WINED3D_SURFACE_MAPPABLE; + if (!levels) + { + if (usage & D3DUSAGE_AUTOGENMIPMAP) + levels = 1; + else + levels = wined3d_log2i(max(width, height)) + 1; + } + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags, texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture); @@ -1338,6 +1346,14 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) surface_flags |= WINED3D_SURFACE_MAPPABLE; + if (!levels) + { + if (usage & D3DUSAGE_AUTOGENMIPMAP) + levels = 1; + else + levels = wined3d_log2i(edge_length) + 1; + } + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags, texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture); @@ -1376,6 +1392,14 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev desc.depth = depth; desc.size = 0; + if (!levels) + { + if (usage & D3DUSAGE_AUTOGENMIPMAP) + levels = 1; + else + levels = wined3d_log2i(max(max(width, height), depth)) + 1; + } + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, levels, 0, texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture);

1 0

Michael Stefaniuc : msi: Remove no-op toupperW() statement (PVS-Studio).
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: 165c9e7cb991956287b981c0259c71c18f01c73d URL: http://source.winehq.org/git/wine.git/?a=commit;h=165c9e7cb991956287b981c02… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 10 10:59:59 2014 +0100 msi: Remove no-op toupperW() statement (PVS-Studio). --- dlls/msi/action.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1e527da..34697f3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2423,7 +2423,6 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) sprintfW( buf, fmtW, free.QuadPart / 512 ); msi_set_property( package->db, szPrimaryVolumeSpaceAvailable, buf, -1 ); } - toupperW( primary_folder[0] ); msi_set_property( package->db, szPrimaryVolumePath, primary_folder, 2 ); } msi_free( primary_folder );

1 0

André Hentschel : dbghelp: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: b2f967e0865f231991a8c83693bbc81ef5afba74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f967e0865f231991a8c8369… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 23:29:52 2014 +0100 dbghelp: Fix compiler warnings with flag -Wunused-macros. --- dlls/dbghelp/cpu_i386.c | 1 - dlls/dbghelp/cpu_x86_64.c | 18 ++---------------- dlls/dbghelp/msc.c | 2 -- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 87f833f..8a3c074 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -29,7 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -#define STEP_FLAG 0x00000100 /* single step flag */ #define V86_FLAG 0x00020000 #define IS_VM86_MODE(ctx) (ctx->EFlags & V86_FLAG) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index e0ffb11..94f561c 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -76,21 +76,6 @@ typedef struct _UNWIND_INFO */ } UNWIND_INFO, *PUNWIND_INFO; -#define GetUnwindCodeEntry(info, index) \ - ((info)->UnwindCode[index]) - -#define GetLanguageSpecificDataPtr(info) \ - ((PVOID)&GetUnwindCodeEntry((info),((info)->CountOfCodes + 1) & ~1)) - -#define GetExceptionHandler(base, info) \ - ((PEXCEPTION_HANDLER)((base) + *(PULONG)GetLanguageSpecificDataPtr(info))) - -#define GetChainedFunctionEntry(base, info) \ - ((PRUNTIME_FUNCTION)((base) + *(PULONG)GetLanguageSpecificDataPtr(info))) - -#define GetExceptionDataPtr(info) \ - ((PVOID)((PULONG)GetLanguageSpecificData(info) + 1) - static BOOL x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, enum cpu_addr ca, ADDRESS64* addr) { @@ -107,6 +92,8 @@ static BOOL x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, } } +#ifdef __x86_64__ + enum st_mode {stm_start, stm_64bit, stm_done}; /* indexes in Reserved array */ @@ -118,7 +105,6 @@ enum st_mode {stm_start, stm_64bit, stm_done}; #define curr_count (frame->Reserved[__CurrentCount]) /* #define ??? (frame->Reserved[__]) (unused) */ -#ifdef __x86_64__ union handler_data { RUNTIME_FUNCTION chain; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 636655f..3b12a3a 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -58,8 +58,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_msc); -#define MAX_PATHNAME_LEN 1024 - struct pdb_stream_name { const char* name;

1 0

Jacek Caban : mshtml: Added support for copy, paste and cut commands in execCommand.
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: 6b463d85099b8da81ea234884dea27e048e65ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b463d85099b8da81ea234884… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 10 18:59:04 2014 +0100 mshtml: Added support for copy, paste and cut commands in execCommand. --- dlls/mshtml/htmldoc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7a577d9..2d89b45 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1096,6 +1096,10 @@ static HRESULT WINAPI HTMLDocument_clear(IHTMLDocument2 *iface) return S_OK; } +static const WCHAR copyW[] = + {'c','o','p','y',0}; +static const WCHAR cutW[] = + {'c','u','t',0}; static const WCHAR fontnameW[] = {'f','o','n','t','n','a','m','e',0}; static const WCHAR indentW[] = @@ -1106,6 +1110,8 @@ static const WCHAR insertunorderedlistW[] = {'i','n','s','e','r','t','u','n','o','r','d','e','r','e','d','l','i','s','t',0}; static const WCHAR outdentW[] = {'o','u','t','d','e','n','t',0}; +static const WCHAR pasteW[] = + {'p','a','s','t','e',0}; static const WCHAR respectvisibilityindesignW[] = {'r','e','s','p','e','c','t','v','i','s','i','b','i','l','i','t','y','i','n','d','e','s','i','g','n',0}; @@ -1113,11 +1119,14 @@ static const struct { const WCHAR *name; OLECMDID id; }command_names[] = { + {copyW, IDM_COPY}, + {cutW, IDM_CUT}, {fontnameW, IDM_FONTNAME}, {indentW, IDM_INDENT}, {insertorderedlistW, IDM_ORDERLIST}, {insertunorderedlistW, IDM_UNORDERLIST}, {outdentW, IDM_OUTDENT}, + {pasteW, IDM_PASTE}, {respectvisibilityindesignW, IDM_RESPECTVISIBILITY_INDESIGN} };

1 0

Henri Verbeet : ddraw: Use wined3d_log2i() to calculate the level count in ddraw_surface_create().
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: af9ccb490a66d1991587a13b7e2aaa36a07bc7f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af9ccb490a66d1991587a13b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 10 13:26:35 2014 +0100 ddraw: Use wined3d_log2i() to calculate the level count in ddraw_surface_create(). --- dlls/ddraw/surface.c | 9 +-------- dlls/wined3d/utils.c | 31 ------------------------------- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 40 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 556d32f..a4184b8 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5817,14 +5817,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { /* Undocumented feature: Create sublevels until either the * width or the height is 1. */ - DWORD min = desc->dwWidth < desc->dwHeight ? desc->dwWidth : desc->dwHeight; - - desc->u2.dwMipMapCount = 0; - while (min) - { - ++desc->u2.dwMipMapCount; - min >>= 1; - } + desc->u2.dwMipMapCount = wined3d_log2i(min(desc->dwWidth, desc->dwHeight)) + 1; } } else diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 566d921..6ce07b8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3929,37 +3929,6 @@ const struct wine_rb_functions wined3d_ffp_vertex_program_rb_functions = wined3d_ffp_vertex_program_key_compare, }; -/* Return the integer base-2 logarithm of x. Undefined for x == 0. */ -UINT wined3d_log2i(UINT32 x) -{ -#ifdef HAVE___BUILTIN_CLZ - return __builtin_clz(x) ^ 0x1f; -#else - static const UINT l[] = - { - ~0U, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - }; - UINT32 i; - - return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; -#endif -} - const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e8e649a..7935a5d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2824,7 +2824,6 @@ GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) DE /* Math utils */ void multiply_matrix(struct wined3d_matrix *dest, const struct wined3d_matrix *src1, const struct wined3d_matrix *src2) DECLSPEC_HIDDEN; -UINT wined3d_log2i(UINT32 x) DECLSPEC_HIDDEN; unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; void wined3d_release_dc(HWND window, HDC dc) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index baa102a..0cf26e1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -26,6 +26,10 @@ #ifndef __WINE_WINED3D_H #define __WINE_WINED3D_H +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif + #include "wine/list.h" #define WINED3D_OK S_OK @@ -2555,4 +2559,35 @@ HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume, void __cdecl wined3d_volume_preload(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume); +/* Return the integer base-2 logarithm of x. Undefined for x == 0. */ +static inline unsigned int wined3d_log2i(unsigned int x) +{ +#ifdef HAVE___BUILTIN_CLZ + return __builtin_clz(x) ^ 0x1f; +#else + static const unsigned int l[] = + { + ~0u, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + }; + unsigned int i; + + return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; +#endif +} + #endif /* __WINE_WINED3D_H */

1 0

Henri Verbeet : wined3d: Use __builtin_clz() in wined3d_log2i() when available.
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: f5939399f04ac96b71fae16413241d38d032ff10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5939399f04ac96b71fae1641… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 10 13:26:34 2014 +0100 wined3d: Use __builtin_clz() in wined3d_log2i() when available. --- configure | 33 +++++++++++++++++++++++++++++++++ configure.ac | 9 +++++++++ dlls/wined3d/utils.c | 5 +++++ include/config.h.in | 3 +++ 4 files changed, 50 insertions(+) diff --git a/configure b/configure index 2677e43..e679696 100755 --- a/configure +++ b/configure @@ -16448,6 +16448,39 @@ done LIBS="$ac_save_LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clz" >&5 +$as_echo_n "checking for __builtin_clz... " >&6; } +if ${ac_cv_have___builtin_clz+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +return __builtin_clz(1) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_have___builtin_clz="yes" +else + ac_cv_have___builtin_clz="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: $ac_cv_have___builtin_clz" >&5 +$as_echo "$ac_cv_have___builtin_clz" >&6; } +if test "$ac_cv_have___builtin_clz" = "yes" +then + +$as_echo "#define HAVE___BUILTIN_CLZ 1" >>confdefs.h + +fi + case $host_cpu in *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __i386__" >&5 diff --git a/configure.ac b/configure.ac index 8110995..6f4e719 100644 --- a/configure.ac +++ b/configure.ac @@ -2595,6 +2595,15 @@ AC_CHECK_FUNCS(\ ) LIBS="$ac_save_LIBS" +dnl Check for __builtin_clz +AC_CACHE_CHECK([for __builtin_clz], ac_cv_have___builtin_clz, + AC_LINK_IFELSE([AC_LANG_PROGRAM(,[[return __builtin_clz(1)]])], + [ac_cv_have___builtin_clz="yes"], [ac_cv_have___builtin_clz="no"])) +if test "$ac_cv_have___builtin_clz" = "yes" +then + AC_DEFINE(HAVE___BUILTIN_CLZ, 1, [Define to 1 if you have the `__builtin_clz' built-in function.]) +fi + dnl *** check for the need to define platform-specific symbols case $host_cpu in diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d3fb1d6..566d921 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3929,8 +3929,12 @@ const struct wine_rb_functions wined3d_ffp_vertex_program_rb_functions = wined3d_ffp_vertex_program_key_compare, }; +/* Return the integer base-2 logarithm of x. Undefined for x == 0. */ UINT wined3d_log2i(UINT32 x) { +#ifdef HAVE___BUILTIN_CLZ + return __builtin_clz(x) ^ 0x1f; +#else static const UINT l[] = { ~0U, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, @@ -3953,6 +3957,7 @@ UINT wined3d_log2i(UINT32 x) UINT32 i; return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; +#endif } const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, diff --git a/include/config.h.in b/include/config.h.in index 0370c6d..a8ae6c5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1281,6 +1281,9 @@ /* Define to 1 if you have the `_vsnprintf' function. */ #undef HAVE__VSNPRINTF +/* Define to 1 if you have the `__builtin_clz' built-in function. */ +#undef HAVE___BUILTIN_CLZ + /* Define to 1 if you have the `__res_getservers' function. */ #undef HAVE___RES_GETSERVERS

1 0

Martin Storsjo : include: Add hstring.idl and winstring.h.
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: 42b8a7674ab92d13dc4043806b8111ebf0e1094a URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b8a7674ab92d13dc4043806… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Dec 10 10:50:37 2014 +0200 include: Add hstring.idl and winstring.h. --- include/Makefile.in | 2 ++ include/hstring.idl | 41 ++++++++++++++++++++++++++++++++++++++++ include/winstring.h | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 5b1f3ab..c9f683a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -47,6 +47,7 @@ PUBLIC_IDL_H_SRCS = \ fusion.idl \ gameux.idl \ hlink.idl \ + hstring.idl \ htiface.idl \ htiframe.idl \ httprequest.idl \ @@ -618,6 +619,7 @@ SRCDIR_INCLUDES = \ winsock.h \ winsock2.h \ winspool.h \ + winstring.h \ winsvc.h \ wintab.h \ wintabx.h \ diff --git a/include/hstring.idl b/include/hstring.idl new file mode 100644 index 0000000..2623f34 --- /dev/null +++ b/include/hstring.idl @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2014 Martin Storsjo + * + * 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 + */ + +import "wtypes.idl"; + +typedef struct HSTRING__ +{ + int unused; +} HSTRING__; + +typedef [wire_marshal(wireBSTR), unique] HSTRING__* HSTRING; + +cpp_quote("DECLARE_HANDLE(HSTRING_BUFFER);") + +cpp_quote("typedef struct HSTRING_HEADER") +cpp_quote("{") +cpp_quote(" union") +cpp_quote(" {") +cpp_quote(" PVOID Reserved1;") +cpp_quote("#ifdef _WIN64") +cpp_quote(" char Reserved2[24];") +cpp_quote("#else") +cpp_quote(" char Reserved2[20];") +cpp_quote("#endif") +cpp_quote(" } Reserved;") +cpp_quote("} HSTRING_HEADER;") diff --git a/include/winstring.h b/include/winstring.h new file mode 100644 index 0000000..27c299b --- /dev/null +++ b/include/winstring.h @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2014 Martin Storsjo + * + * 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_WINSTRING_H +#define __WINE_WINSTRING_H + +#include <hstring.h> + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI WindowsCompareStringOrdinal(HSTRING str1, HSTRING str2, INT32 *order); +HRESULT WINAPI WindowsConcatString(HSTRING str1, HSTRING str2, HSTRING *out); +HRESULT WINAPI WindowsCreateString(LPCWSTR ptr, UINT32 len, HSTRING *out); +HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, + HSTRING_HEADER *header, HSTRING *out); +HRESULT WINAPI WindowsDeleteString(HSTRING str); +HRESULT WINAPI WindowsDeleteStringBuffer(HSTRING_BUFFER buf); +HRESULT WINAPI WindowsDuplicateString(HSTRING str, HSTRING *out); +UINT32 WINAPI WindowsGetStringLen(HSTRING str); +LPCWSTR WINAPI WindowsGetStringRawBuffer(HSTRING str, UINT32 *len); +BOOL WINAPI WindowsIsStringEmpty(HSTRING str); +HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, HSTRING_BUFFER *out); +HRESULT WINAPI WindowsPromoteStringBuffer(HSTRING_BUFFER buf, HSTRING *out); +HRESULT WINAPI WindowsReplaceString(HSTRING haystack, HSTRING needle, HSTRING replacement, + HSTRING *out); +HRESULT WINAPI WindowsStringHasEmbeddedNull(HSTRING str, BOOL *out); +HRESULT WINAPI WindowsSubstring(HSTRING str, UINT32 pos, HSTRING *out); +HRESULT WINAPI WindowsSubstringWithSpecifiedLength(HSTRING str, UINT32 pos, + UINT32 len, HSTRING *out); +HRESULT WINAPI WindowsTrimStringEnd(HSTRING str, HSTRING charstr, HSTRING *out); +HRESULT WINAPI WindowsTrimStringStart(HSTRING str, HSTRING charstr, HSTRING *out); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_WINSTRING_H */

1 0

Martin Storsjo : msvcr120_app: Add forwarding dll.
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: a44e013b49e362c8bbcec79ebc7277d3658eba31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44e013b49e362c8bbcec79eb… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Dec 10 10:44:44 2014 +0200 msvcr120_app: Add forwarding dll. --- configure | 2 + configure.ac | 1 + dlls/msvcr120_app/Makefile.in | 1 + dlls/msvcr120_app/msvcr120_app.spec | 2158 +++++++++++++++++++++++++++++++++++ tools/make_specfiles | 4 + 5 files changed, 2166 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a44e013b49e362c8bbcec…

1 0

André Hentschel : gdiplus: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: 1d0ff2ded3c214f5e25eb59d600bc1916e6b7f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0ff2ded3c214f5e25eb59d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 23:30:28 2014 +0100 gdiplus: Fix compiler warnings with flag -Wunused-macros. --- dlls/gdiplus/image.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index eec76f6..e6921f5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3876,11 +3876,6 @@ GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filenam * Encoding functions - * These functions encode an image in different image file formats. */ -#define BITMAP_FORMAT_BMP 0x4d42 /* "BM" */ -#define BITMAP_FORMAT_JPEG 0xd8ff -#define BITMAP_FORMAT_GIF 0x4947 -#define BITMAP_FORMAT_PNG 0x5089 -#define BITMAP_FORMAT_APM 0xcdd7 static GpStatus encode_image_WIC(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params)

1 0

Jacek Caban : mshtml: Added support for IDM_CUT command in browser mode.
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: 44c22801e3d13b5bba79fe09b686dd05783ad972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c22801e3d13b5bba79fe09b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 10 19:02:37 2014 +0100 mshtml: Added support for IDM_CUT command in browser mode. --- dlls/mshtml/olecmd.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index a49949d..c45e9c9 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -573,13 +573,26 @@ static HRESULT query_mshtml_cut(HTMLDocument *This, OLECMD *cmd) static HRESULT exec_mshtml_cut(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { + nsIClipboardCommands *clipboard_commands; + nsresult nsres; + TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); if(This->doc_obj->usermode == EDITMODE) return editor_exec_cut(This, cmdexecopt, in, out); - FIXME("Unimplemented in browse mode\n"); - return E_NOTIMPL; + clipboard_commands = get_clipboard_commands(This); + if(!clipboard_commands) + return E_UNEXPECTED; + + nsres = nsIClipboardCommands_CutSelection(clipboard_commands); + nsIClipboardCommands_Release(clipboard_commands); + if(NS_FAILED(nsres)) { + ERR("Paste failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT query_mshtml_paste(HTMLDocument *This, OLECMD *cmd)

1 0