May 2012 - Wine-Commits - list.winehq.org

Matteo Bruni : d3dcompiler: Add a stub lexer.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: d2ddd20054fed95439770121fc872fd80e61da42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ddd20054fed95439770121f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 15 16:12:57 2012 +0200 d3dcompiler: Add a stub lexer. --- .gitignore | 1 + dlls/d3dcompiler_43/Makefile.in | 5 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 15 +++ dlls/d3dcompiler_43/hlsl.l | 146 +++++++++++++++++++++++++++++ dlls/d3dcompiler_43/hlsl.y | 11 +- 5 files changed, 171 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7f4bb73..defdcdf 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ dlls/d3dcompiler_43/asmshader.tab.h dlls/d3dcompiler_43/asmshader.yy.c dlls/d3dcompiler_43/hlsl.tab.c dlls/d3dcompiler_43/hlsl.tab.h +dlls/d3dcompiler_43/hlsl.yy.c dlls/dispex/disp_ex.h dlls/dispex/disp_ex_p.c dlls/dxdiagn/fil_data.h diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index 15a9dc4..a13fb74 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -12,7 +12,10 @@ C_SRCS = \ reflection.c \ utils.c -LEX_SRCS = asmshader.l +LEX_SRCS = \ + asmshader.l \ + hlsl.l + BISON_SRCS = \ asmshader.y \ hlsl.y diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 2936077..72c2511 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -154,6 +154,21 @@ static inline BOOL d3dcompiler_free(void *ptr) return HeapFree(GetProcessHeap(), 0, ptr); } +static inline char *d3dcompiler_strdup(const char *string) +{ + char *copy; + SIZE_T len; + + if (!string) + return NULL; + + len = strlen(string); + copy = d3dcompiler_alloc(len + 1); + if (copy) + memcpy(copy, string, len + 1); + return copy; +} + struct asm_parser; /* This structure is only used in asmshader.y, but since the .l file accesses the semantic types diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l new file mode 100644 index 0000000..439f384 --- /dev/null +++ b/dlls/d3dcompiler_43/hlsl.l @@ -0,0 +1,146 @@ +/* + * HLSL parser + * + * Copyright 2008 Stefan Dösinger + * Copyright 2012 Matteo Bruni for CodeWeavers + * + * 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 + */ + +%{ +#include "config.h" +#include "wine/port.h" +#include "wine/debug.h" + +#define YY_NO_UNISTD_H +#include "d3dcompiler_private.h" +#include "hlsl.tab.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser); +%} + +%option noyywrap nounput noinput +%option prefix="hlsl_" + +%x pp pp_line pp_pragma pp_ignore + +RESERVED1 auto|case|catch|char|class|const_cast|default|delete|dynamic_cast|enum +RESERVED2 explicit|friend|goto|long|mutable|new|operator|private|protected|public +RESERVED3 reinterpret_cast|short|signed|sizeof|static_cast|template|this|throw|try +RESERVED4 typename|union|unsigned|using|virtual + +WS [ \t] +NEWLINE (\n)|(\r\n) +STRING \"[^\"]*\" + +ANY (.) + +%% +{RESERVED1} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED2} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED3} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED4} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } + +{WS}+ {} +{NEWLINE} { + hlsl_ctx.line_no++; + } + +^# { + BEGIN pp; + } + +<pp>pragma{WS}+ { + TRACE("Got a #pragma.\n"); + BEGIN pp_pragma; + } +<pp_pragma>pack_matrix{WS}*${WS}*row_major{WS}*$ { + TRACE("#pragma setting row_major mode.\n"); + hlsl_ctx.matrix_majority = HLSL_ROW_MAJOR; + BEGIN pp_ignore; + } +<pp_pragma>pack_matrix{WS}*${WS}*column_major{WS}*$ { + TRACE("#pragma setting column_major mode.\n"); + hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; + BEGIN pp_ignore; + } +<pp_pragma>{NEWLINE} { + FIXME("Unsupported preprocessor #pragma directive at line %u.\n", hlsl_ctx.line_no); + BEGIN INITIAL; + } +<pp_pragma>{ANY} {} +<pp>[0-9]+ { + TRACE("Preprocessor line info.\n"); + BEGIN pp_line; + hlsl_lval.intval = (atoi(yytext)); + return PRE_LINE; + } +<pp_line>{STRING} { + char *string = d3dcompiler_strdup(yytext + 1); + + BEGIN pp_ignore; + string[strlen(string) - 1] = 0; + hlsl_lval.name = string; + return STRING; + } +<pp_line>{WS}+ {} +<pp_line>{NEWLINE} { + FIXME("Malformed preprocessor line directive?\n"); + BEGIN INITIAL; + } +<pp_ignore>{NEWLINE} { + BEGIN INITIAL; + } +<pp_ignore>{ANY} {} +<pp>{NEWLINE} { + FIXME("Unexpected preprocessor directive.\n"); + BEGIN INITIAL; + } +<pp>{ANY} {} + +{ANY} { + return yytext[0]; + } + +%% + +struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD version, const char *entrypoint, char **messages); + +struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, + const char *entrypoint, char **messages) +{ + struct bwriter_shader *ret = NULL; + YY_BUFFER_STATE buffer; + + buffer = hlsl__scan_string(text); + hlsl__switch_to_buffer(buffer); + + ret = parse_hlsl(type, version, entrypoint, messages); + + hlsl__delete_buffer(buffer); + return ret; +} diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 2010f5f..5691848 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -28,11 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser); -int hlsl_lex(void) -{ - FIXME("Lexer.\n"); - return 0; -} +int hlsl_lex(void); struct hlsl_parse_ctx hlsl_ctx; @@ -83,12 +79,15 @@ preproc_directive: PRE_LINE STRING %% -struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, const char *entrypoint, char **messages) +struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD version, const char *entrypoint, char **messages) { hlsl_ctx.line_no = 1; + hlsl_ctx.source_file = d3dcompiler_strdup(""); hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; hlsl_parse(); + d3dcompiler_free(hlsl_ctx.source_file); + return NULL; }

1 0

Dmitry Timoshkov : gdiplus: Measure the passed in string without height clipping in order to compute correct Y offset .
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: bf9aed6f5cbae09463468158015e5615976dcf22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9aed6f5cbae094634681580… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 15 01:35:24 2012 +0900 gdiplus: Measure the passed in string without height clipping in order to compute correct Y offset. --- dlls/gdiplus/graphics.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e352e42..f2c956ea 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5161,14 +5161,18 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string /* Should be no need to explicitly test for StringAlignmentNear as * that is default behavior if no alignment is passed. */ if(format->vertalign != StringAlignmentNear){ - RectF bounds; - GdipMeasureString(graphics, string, length, font, rect, format, &bounds, 0, 0); + RectF bounds, in_rect = *rect; + in_rect.Height = 0.0; /* avoid height clipping */ + GdipMeasureString(graphics, string, length, font, &in_rect, format, &bounds, 0, 0); + + TRACE("bounds %s\n", debugstr_rectf(&bounds)); if(format->vertalign == StringAlignmentCenter) offsety = (rect->Height - bounds.Height) / 2; else if(format->vertalign == StringAlignmentFar) offsety = (rect->Height - bounds.Height); } + TRACE("vertical align %d, offsety %f\n", format->vertalign, offsety); } save_state = SaveDC(hdc);

1 0

Jacek Caban : appwiz.cpl: Moved package subdir to addon_info_t.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: 87538c6233904ecd1e104efbff3eb3fdaeb07a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87538c6233904ecd1e104efbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 11:47:58 2012 +0200 appwiz.cpl: Moved package subdir to addon_info_t. --- dlls/appwiz.cpl/addons.c | 50 ++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 9766f45..2694fb7 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -67,6 +67,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); typedef struct { const char *version; const char *file_name; + const char *subdir_name; const char *sha; } addon_info_t; @@ -74,6 +75,7 @@ static const addon_info_t addons_info[] = { { GECKO_VERSION, "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", + "gecko", GECKO_SHA } }; @@ -171,7 +173,7 @@ static BOOL install_file(const WCHAR *file_name) return TRUE; } -static BOOL install_from_unix_file(const char *dir, const char *file_name) +static BOOL install_from_unix_file(const char *dir, const char *subdir, const char *file_name) { LPWSTR dos_file_name; char *file_path; @@ -182,13 +184,18 @@ static BOOL install_from_unix_file(const char *dir, const char *file_name) static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; len = strlen(dir); - file_path = heap_alloc(len+strlen(file_name)+2); + file_path = heap_alloc(len+strlen(subdir)+strlen(file_name)+3); if(!file_path) return FALSE; memcpy(file_path, dir, len); if(len && file_path[len-1] != '/' && file_path[len-1] != '\\') file_path[len++] = '/'; + if(*subdir) { + strcpy(file_path+len, subdir); + len += strlen(subdir); + file_path[len++] = '/'; + } strcpy(file_path+len, file_name); fd = open(file_path, O_RDONLY); @@ -252,7 +259,7 @@ static BOOL install_from_registered_dir(void) TRACE("Trying %s/%s\n", debugstr_a(package_dir), debugstr_a(addon->file_name)); - ret = install_from_unix_file(package_dir, addon->file_name); + ret = install_from_unix_file(package_dir, "", addon->file_name); heap_free(package_dir); return ret; @@ -260,33 +267,30 @@ static BOOL install_from_registered_dir(void) static BOOL install_from_default_dir(void) { - const char *data_dir, *subdir; - char *package_dir; - int len, len2; + const char *data_dir, *package_dir; + char *dir_buf = NULL; + int len; BOOL ret; - if((data_dir = wine_get_data_dir())) - subdir = "/gecko/"; - else if((data_dir = wine_get_build_dir())) - subdir = "/../gecko/"; - else + if((data_dir = wine_get_data_dir())) { + package_dir = data_dir; + }else if((data_dir = wine_get_build_dir())) { + len = strlen(data_dir); + dir_buf = heap_alloc(len + sizeof("/../")); + memcpy(dir_buf, data_dir, len); + strcpy(dir_buf+len, "/../"); + package_dir = dir_buf; + }else { return FALSE; + } - len = strlen(data_dir); - len2 = strlen(subdir); - - package_dir = heap_alloc(len+len2+1); - memcpy(package_dir, data_dir, len); - memcpy(package_dir+len, subdir, len2+1); - - ret = install_from_unix_file(package_dir, addon->file_name); - - heap_free(package_dir); + ret = install_from_unix_file(package_dir, addon->subdir_name, addon->file_name); + heap_free(dir_buf); if (!ret) - ret = install_from_unix_file(INSTALL_DATADIR "/wine/gecko/", addon->file_name); + ret = install_from_unix_file(INSTALL_DATADIR "/wine/", addon->subdir_name, addon->file_name); if (!ret && strcmp(INSTALL_DATADIR, "/usr/share")) - ret = install_from_unix_file("/usr/share/wine/gecko/", addon->file_name); + ret = install_from_unix_file("/usr/share/wine/", addon->subdir_name, addon->file_name); return ret; }

1 0

Alexandre Julliard : winex11: Add a helper to create a pixmap from an image .
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: 3e8ad9a064cfce36752233a7a7439b11dac01074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8ad9a064cfce36752233a7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 13:48:19 2012 +0200 winex11: Add a helper to create a pixmap from an image. --- dlls/winex11.drv/bitblt.c | 126 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 2 + 2 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 413f4e4..6dec77f 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -937,6 +937,16 @@ static void free_ximage_bits( struct gdi_image_bits *bits ) wine_tsx11_unlock(); } +/* only for use on sanitized BITMAPINFO structures */ +static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) +{ + if (info->bmiHeader.biCompression == BI_BITFIELDS) + return sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD); + if (coloruse == DIB_PAL_COLORS) + return sizeof(BITMAPINFOHEADER) + info->bmiHeader.biClrUsed * sizeof(WORD); + return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] ); +} + /* store the palette or color mask data in the bitmap info structure */ static void set_color_info( const XVisualInfo *vis, BITMAPINFO *info ) { @@ -1464,6 +1474,122 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, /*********************************************************************** + * put_pixmap_image + * + * Simplified equivalent of X11DRV_PutImage that writes directly to a pixmap. + */ +static DWORD put_pixmap_image( Pixmap pixmap, const XVisualInfo *vis, + BITMAPINFO *info, const struct gdi_image_bits *bits ) +{ + DWORD ret; + XImage *image; + struct bitblt_coords coords; + struct gdi_image_bits dst_bits; + const XPixmapFormatValues *format = pixmap_formats[vis->depth]; + const int *mapping = NULL; + + if (!format) return ERROR_INVALID_PARAMETER; + if (info->bmiHeader.biPlanes != 1) goto update_format; + if (info->bmiHeader.biBitCount != format->bits_per_pixel) goto update_format; + /* FIXME: could try to handle 1-bpp using XCopyPlane */ + if (!matching_color_info( vis, info )) goto update_format; + if (!bits) return ERROR_SUCCESS; /* just querying the format */ + + coords.x = 0; + coords.y = 0; + coords.width = info->bmiHeader.biWidth; + coords.height = abs( info->bmiHeader.biHeight ); + SetRect( &coords.visrect, 0, 0, coords.width, coords.height ); + + wine_tsx11_lock(); + image = XCreateImage( gdi_display, visual, vis->depth, ZPixmap, 0, NULL, + coords.width, coords.height, 32, 0 ); + wine_tsx11_unlock(); + if (!image) return ERROR_OUTOFMEMORY; + + if (image->bits_per_pixel == 4 || image->bits_per_pixel == 8) + mapping = X11DRV_PALETTE_PaletteToXPixel; + + if (!(ret = copy_image_bits( info, is_r8g8b8(vis), image, bits, &dst_bits, &coords, mapping, ~0u ))) + { + image->data = dst_bits.ptr; + wine_tsx11_lock(); + XPutImage( gdi_display, pixmap, get_bitmap_gc( vis->depth ), + image, 0, 0, 0, 0, coords.width, coords.height ); + wine_tsx11_unlock(); + image->data = NULL; + } + + wine_tsx11_lock(); + XDestroyImage( image ); + wine_tsx11_unlock(); + if (dst_bits.free) dst_bits.free( &dst_bits ); + return ret; + +update_format: + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = format->bits_per_pixel; + if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; + set_color_info( vis, info ); + return ERROR_BAD_FORMAT; +} + + +/*********************************************************************** + * create_pixmap_from_image + */ +Pixmap create_pixmap_from_image( HDC hdc, const XVisualInfo *vis, const BITMAPINFO *info, + const struct gdi_image_bits *bits, UINT coloruse ) +{ + static const RGBQUAD default_colortable[2] = { { 0x00, 0x00, 0x00 }, { 0xff, 0xff, 0xff } }; + char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + char src_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *dst_info = (BITMAPINFO *)dst_buffer; + BITMAPINFO *src_info = (BITMAPINFO *)src_buffer; + struct gdi_image_bits dst_bits; + Pixmap pixmap; + DWORD err; + HBITMAP dib; + + wine_tsx11_lock(); + pixmap = XCreatePixmap( gdi_display, root_window, + info->bmiHeader.biWidth, abs(info->bmiHeader.biHeight), vis->depth ); + wine_tsx11_unlock(); + if (!pixmap) return 0; + + memcpy( src_info, info, get_dib_info_size( info, coloruse )); + memcpy( dst_info, info, get_dib_info_size( info, coloruse )); + + if (coloruse == DIB_PAL_COLORS || + (err = put_pixmap_image( pixmap, vis, dst_info, bits )) == ERROR_BAD_FORMAT) + { + if (dst_info->bmiHeader.biBitCount == 1) /* set a default color table for 1-bpp */ + memcpy( dst_info->bmiColors, default_colortable, sizeof(default_colortable) ); + dib = CreateDIBSection( hdc, dst_info, coloruse, &dst_bits.ptr, 0, 0 ); + if (dib) + { + if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) + memcpy( src_info->bmiColors, default_colortable, sizeof(default_colortable) ); + SetDIBits( hdc, dib, 0, abs(info->bmiHeader.biHeight), bits->ptr, src_info, coloruse ); + dst_bits.free = NULL; + dst_bits.is_copy = TRUE; + err = put_pixmap_image( pixmap, vis, dst_info, &dst_bits ); + DeleteObject( dib ); + } + else err = ERROR_OUTOFMEMORY; + } + + if (!err) return pixmap; + + wine_tsx11_lock(); + XFreePixmap( gdi_display, pixmap ); + wine_tsx11_unlock(); + return 0; + +} + + +/*********************************************************************** * get_pixmap_image * * Equivalent of X11DRV_GetImage that reads directly from a pixmap. diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d17565b..7ed4bdd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -229,6 +229,8 @@ extern Pixmap X11DRV_get_pixmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, struct bitblt_coords *coords, const int *mapping, unsigned int zeropad_mask ) DECLSPEC_HIDDEN; +extern Pixmap create_pixmap_from_image( HDC hdc, const XVisualInfo *vis, const BITMAPINFO *info, + const struct gdi_image_bits *bits, UINT coloruse ) DECLSPEC_HIDDEN; extern DWORD get_pixmap_image( Pixmap pixmap, int width, int height, const XVisualInfo *vis, BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Use the create_pixmap_from_image helper to create color cursors.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: 70a9bb95186ffd5032a0bd177cb6aea2856816ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a9bb95186ffd5032a0bd177… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 15:46:23 2012 +0200 winex11: Use the create_pixmap_from_image helper to create color cursors. --- dlls/winex11.drv/mouse.c | 53 +++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 2d38406..ef9dca9 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1013,18 +1013,19 @@ done: */ static Cursor create_xlib_cursor( HDC hdc, const ICONINFOEXW *icon, int width, int height ) { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; XColor fg, bg; Cursor cursor = None; - HBITMAP xor_bitmap = 0; - BITMAPINFO *info; + XVisualInfo vis; + Pixmap xor_pixmap, mask_pixmap; + struct gdi_image_bits bits; unsigned int *color_bits = NULL, *ptr; unsigned char *mask_bits = NULL, *xor_bits = NULL; int i, x, y, has_alpha = 0; int rfg, gfg, bfg, rbg, gbg, bbg, fgBits, bgBits; unsigned int width_bytes = (width + 31) / 32 * 4; - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) - return FALSE; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biWidth = width; info->bmiHeader.biHeight = -height; @@ -1048,7 +1049,6 @@ static Cursor create_xlib_cursor( HDC hdc, const ICONINFOEXW *icon, int width, i /* compute fg/bg color and xor bitmap based on average of the color values */ - if (!(xor_bitmap = CreateBitmap( width, height, 1, 1, NULL ))) goto done; rfg = gfg = bfg = rbg = gbg = bbg = fgBits = 0; for (y = 0, ptr = color_bits; y < height; y++) { @@ -1090,8 +1090,8 @@ static Cursor create_xlib_cursor( HDC hdc, const ICONINFOEXW *icon, int width, i else bg.red = bg.green = bg.blue = 0; info->bmiHeader.biBitCount = 1; + info->bmiHeader.biClrUsed = 0; info->bmiHeader.biSizeImage = width_bytes * height; - SetDIBits( hdc, xor_bitmap, 0, height, xor_bits, info, DIB_RGB_COLORS ); /* generate mask from the alpha channel if we have one */ @@ -1100,37 +1100,38 @@ static Cursor create_xlib_cursor( HDC hdc, const ICONINFOEXW *icon, int width, i if (has_alpha) { - /* make sure the bitmaps are owned by x11drv */ - HBITMAP orig = SelectObject( hdc, icon->hbmMask ); - SelectObject( hdc, xor_bitmap ); - SelectObject( hdc, orig ); - memset( mask_bits, 0, width_bytes * height ); for (y = 0, ptr = color_bits; y < height; y++) for (x = 0; x < width; x++, ptr++) if ((*ptr >> 24) > 25) /* more than 10% alpha */ mask_bits[y * width_bytes + x / 8] |= 0x80 >> (x % 8); + } + else /* invert the mask */ + { + ptr = (unsigned int *)mask_bits; + for (i = 0; i < info->bmiHeader.biSizeImage / sizeof(*ptr); i++, ptr++) *ptr ^= ~0u; + } - info->bmiHeader.biBitCount = 1; - info->bmiHeader.biSizeImage = width_bytes * height; - SetDIBits( hdc, icon->hbmMask, 0, height, mask_bits, info, DIB_RGB_COLORS ); + vis.depth = 1; + bits.ptr = xor_bits; + bits.free = NULL; + bits.is_copy = TRUE; + if (!(xor_pixmap = create_pixmap_from_image( hdc, &vis, info, &bits, DIB_RGB_COLORS ))) goto done; - wine_tsx11_lock(); - cursor = XCreatePixmapCursor( gdi_display, - X11DRV_get_pixmap(xor_bitmap), - X11DRV_get_pixmap(icon->hbmMask), - &fg, &bg, icon->xHotspot, icon->yHotspot ); - wine_tsx11_unlock(); - } - else + bits.ptr = mask_bits; + mask_pixmap = create_pixmap_from_image( hdc, &vis, info, &bits, DIB_RGB_COLORS ); + + wine_tsx11_lock(); + if (mask_pixmap) { - cursor = create_cursor_from_bitmaps( xor_bitmap, icon->hbmMask, width, height, 0, 0, - &fg, &bg, icon->xHotspot, icon->yHotspot ); + cursor = XCreatePixmapCursor( gdi_display, xor_pixmap, mask_pixmap, + &fg, &bg, icon->xHotspot, icon->yHotspot ); + XFreePixmap( gdi_display, mask_pixmap ); } + XFreePixmap( gdi_display, xor_pixmap ); + wine_tsx11_unlock(); done: - DeleteObject( xor_bitmap ); - HeapFree( GetProcessHeap(), 0, info ); HeapFree( GetProcessHeap(), 0, color_bits ); HeapFree( GetProcessHeap(), 0, xor_bits ); HeapFree( GetProcessHeap(), 0, mask_bits );

1 0

Alexandre Julliard : winex11: Use the create_pixmap_from_image helper to create monochrome cursors.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: 8ee12778f90d7796fff2f1befa385d576fe7d2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ee12778f90d7796fff2f1bef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 16:18:34 2012 +0200 winex11: Use the create_pixmap_from_image helper to create monochrome cursors. --- dlls/winex11.drv/mouse.c | 126 ++++++++++++++++++++++++++-------------------- 1 files changed, 72 insertions(+), 54 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index ef9dca9..718efa6 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -936,24 +936,51 @@ done: /*********************************************************************** - * create_cursor_from_bitmaps + * create_xlib_monochrome_cursor * - * Create an X11 cursor from source bitmaps. + * Create a monochrome X cursor from a Windows one. */ -static Cursor create_cursor_from_bitmaps( HBITMAP src_xor, HBITMAP src_and, int width, int height, - int xor_y, int and_y, XColor *fg, XColor *bg, - int hotspot_x, int hotspot_y ) +static Cursor create_xlib_monochrome_cursor( HDC hdc, const ICONINFOEXW *icon, int width, int height ) { - HDC src = 0, dst = 0; - HBITMAP bits = 0, mask = 0, mask_inv = 0; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + const int and_y = 0; + const int xor_y = height; + unsigned int width_bytes = (width + 31) / 32 * 4; + unsigned char *mask_bits = NULL; + GC gc; + XColor fg, bg; + XVisualInfo vis; + Pixmap src_pixmap, bits_pixmap, mask_pixmap; + struct gdi_image_bits bits; Cursor cursor = 0; - if (!(src = CreateCompatibleDC( 0 ))) goto done; - if (!(dst = CreateCompatibleDC( 0 ))) goto done; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = -height * 2; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 1; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = width_bytes * height * 2; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + + if (!(mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; + if (!GetDIBits( hdc, icon->hbmMask, 0, height * 2, mask_bits, info, DIB_RGB_COLORS )) goto done; + + vis.depth = 1; + bits.ptr = mask_bits; + bits.free = NULL; + bits.is_copy = TRUE; + if (!(src_pixmap = create_pixmap_from_image( hdc, &vis, info, &bits, DIB_RGB_COLORS ))) goto done; - if (!(bits = CreateBitmap( width, height, 1, 1, NULL ))) goto done; - if (!(mask = CreateBitmap( width, height, 1, 1, NULL ))) goto done; - if (!(mask_inv = CreateBitmap( width, height, 1, 1, NULL ))) goto done; + wine_tsx11_lock(); + bits_pixmap = XCreatePixmap( gdi_display, root_window, width, height, 1 ); + mask_pixmap = XCreatePixmap( gdi_display, root_window, width, height, 1 ); + gc = XCreateGC( gdi_display, src_pixmap, 0, NULL ); + XSetGraphicsExposures( gdi_display, gc, False ); /* We have to do some magic here, as cursors are not fully * compatible between Windows and X11. Under X11, there are @@ -973,45 +1000,41 @@ static Cursor create_cursor_from_bitmaps( HBITMAP src_xor, HBITMAP src_and, int * Bits = not 'And' and 'Xor' or 'And2' and 'Xor2' * Mask = not 'And' or 'Xor' or 'And2' and 'Xor2' */ - SelectObject( src, src_and ); - SelectObject( dst, bits ); - BitBlt( dst, 0, 0, width, height, src, 0, and_y, SRCCOPY ); - SelectObject( dst, mask ); - BitBlt( dst, 0, 0, width, height, src, 0, and_y, SRCCOPY ); - SelectObject( dst, mask_inv ); - BitBlt( dst, 0, 0, width, height, src, 0, and_y, SRCCOPY ); - SelectObject( src, src_xor ); - BitBlt( dst, 0, 0, width, height, src, 0, xor_y, SRCAND /* src & dst */ ); - SelectObject( dst, bits ); - BitBlt( dst, 0, 0, width, height, src, 0, xor_y, SRCERASE /* src & ~dst */ ); - SelectObject( dst, mask ); - BitBlt( dst, 0, 0, width, height, src, 0, xor_y, 0xdd0228 /* src | ~dst */ ); + XSetFunction( gdi_display, gc, GXcopy ); + XCopyArea( gdi_display, src_pixmap, bits_pixmap, gc, 0, and_y, width, height, 0, 0 ); + XCopyArea( gdi_display, src_pixmap, mask_pixmap, gc, 0, and_y, width, height, 0, 0 ); + XSetFunction( gdi_display, gc, GXandReverse ); + XCopyArea( gdi_display, src_pixmap, bits_pixmap, gc, 0, xor_y, width, height, 0, 0 ); + XSetFunction( gdi_display, gc, GXorReverse ); + XCopyArea( gdi_display, src_pixmap, mask_pixmap, gc, 0, xor_y, width, height, 0, 0 ); /* additional white */ - SelectObject( src, mask_inv ); - BitBlt( dst, 1, 1, width, height, src, 0, 0, SRCPAINT /* src | dst */); - SelectObject( dst, bits ); - BitBlt( dst, 1, 1, width, height, src, 0, 0, SRCPAINT /* src | dst */ ); - - wine_tsx11_lock(); - cursor = XCreatePixmapCursor( gdi_display, X11DRV_get_pixmap(bits), X11DRV_get_pixmap(mask), - fg, bg, hotspot_x, hotspot_y ); + XSetFunction( gdi_display, gc, GXand ); + XCopyArea( gdi_display, src_pixmap, src_pixmap, gc, 0, xor_y, width, height, 0, and_y ); + XSetFunction( gdi_display, gc, GXor ); + XCopyArea( gdi_display, src_pixmap, mask_pixmap, gc, 0, and_y, width, height, 1, 1 ); + XCopyArea( gdi_display, src_pixmap, bits_pixmap, gc, 0, and_y, width, height, 1, 1 ); + XFreeGC( gdi_display, gc ); + + fg.red = fg.green = fg.blue = 0xffff; + bg.red = bg.green = bg.blue = 0; + cursor = XCreatePixmapCursor( gdi_display, bits_pixmap, mask_pixmap, + &fg, &bg, icon->xHotspot, icon->yHotspot ); + XFreePixmap( gdi_display, src_pixmap ); + XFreePixmap( gdi_display, bits_pixmap ); + XFreePixmap( gdi_display, mask_pixmap ); wine_tsx11_unlock(); done: - DeleteDC( src ); - DeleteDC( dst ); - DeleteObject( bits ); - DeleteObject( mask ); - DeleteObject( mask_inv ); + HeapFree( GetProcessHeap(), 0, mask_bits ); return cursor; } /*********************************************************************** - * create_xlib_cursor + * create_xlib_color_cursor * - * Create an X cursor from a Windows one. + * Create a color X cursor from a Windows one. */ -static Cursor create_xlib_cursor( HDC hdc, const ICONINFOEXW *icon, int width, int height ) +static Cursor create_xlib_color_cursor( HDC hdc, const ICONINFOEXW *icon, int width, int height ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; @@ -1148,6 +1171,7 @@ static Cursor create_cursor( HANDLE handle ) Cursor cursor = 0; ICONINFOEXW info; BITMAP bm; + HDC hdc; if (!handle) return get_empty_cursor(); @@ -1173,30 +1197,24 @@ static Cursor create_cursor( HANDLE handle ) info.yHotspot = bm.bmHeight / 2; } + hdc = CreateCompatibleDC( 0 ); + if (info.hbmColor) { - HDC hdc = CreateCompatibleDC( 0 ); - if (hdc) - { #ifdef SONAME_LIBXCURSOR - if (pXcursorImagesLoadCursor) - cursor = create_xcursor_cursor( hdc, &info, handle, bm.bmWidth, bm.bmHeight ); + if (pXcursorImagesLoadCursor) + cursor = create_xcursor_cursor( hdc, &info, handle, bm.bmWidth, bm.bmHeight ); #endif - if (!cursor) cursor = create_xlib_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); - } + if (!cursor) cursor = create_xlib_color_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); DeleteObject( info.hbmColor ); - DeleteDC( hdc ); } else { - XColor fg, bg; - fg.red = fg.green = fg.blue = 0xffff; - bg.red = bg.green = bg.blue = 0; - cursor = create_cursor_from_bitmaps( info.hbmMask, info.hbmMask, bm.bmWidth, bm.bmHeight, - bm.bmHeight, 0, &fg, &bg, info.xHotspot, info.yHotspot ); + cursor = create_xlib_monochrome_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); } DeleteObject( info.hbmMask ); + DeleteDC( hdc ); return cursor; }

1 0

Jacek Caban : appwiz.cpl: Moved addon SHA and version to addon_info_t.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: 39d444fb9974562ecd0261e1e188698a51da3e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d444fb9974562ecd0261e1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 11:47:40 2012 +0200 appwiz.cpl: Moved addon SHA and version to addon_info_t. --- dlls/appwiz.cpl/addons.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 0e731e4..9766f45 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,12 +65,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #endif typedef struct { + const char *version; const char *file_name; + const char *sha; } addon_info_t; static const addon_info_t addons_info[] = { { - "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi" + GECKO_VERSION, + "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", + GECKO_SHA } }; @@ -131,10 +135,10 @@ static BOOL sha_check(const WCHAR *file_name) for(i=0; i < sizeof(sha); i++) sprintf(buf + i*2, "%02x", *((unsigned char*)sha+i)); - if(strcmp(buf, GECKO_SHA)) { + if(strcmp(buf, addon->sha)) { WCHAR message[256]; - WARN("Got %s, expected %s\n", buf, GECKO_SHA); + WARN("Got %s, expected %s\n", buf, addon->sha); if(LoadStringW(hInst, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR))) MessageBoxW(NULL, message, NULL, MB_ICONERROR); @@ -426,7 +430,7 @@ static LPWSTR get_url(void) len += MultiByteToWideChar(CP_ACP, 0, ARCH_STRING, sizeof(ARCH_STRING), url+len, size/sizeof(WCHAR)-len)-1; memcpy(url+len, v_formatW, sizeof(v_formatW)); len += sizeof(v_formatW)/sizeof(WCHAR); - MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, url+len, size/sizeof(WCHAR)-len); + MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len); } TRACE("Got URL %s\n", debugstr_w(url));

1 0

Francois Gouget : Assorted typo, spelling, wording and case fixes.
by Alexandre Julliard May 15, 2012

May 15, 2012

1 0

Nikolay Sivov : msxml3: Remove no longer used get_xml() option to mess with encoding attribute.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: edf6162340847742c93af2efffc11274a7d503a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf6162340847742c93af2eff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 15 11:49:58 2012 +0400 msxml3: Remove no longer used get_xml() option to mess with encoding attribute. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 37 ++----------------------------------- dlls/msxml3/pi.c | 2 +- dlls/msxml3/text.c | 2 +- 10 files changed, 11 insertions(+), 44 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 58be87d..0fa00ec 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -497,7 +497,7 @@ static HRESULT WINAPI domattr_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domattr_transformNode( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index b07cd84..1cf3d29 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -452,7 +452,7 @@ static HRESULT WINAPI domcdata_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domcdata_transformNode( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 3dab11b..172a1e6 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -451,7 +451,7 @@ static HRESULT WINAPI domcomment_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domcomment_transformNode( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index cedd258..46b81b0 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -449,7 +449,7 @@ static HRESULT WINAPI domfrag_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domfrag_transformNode( diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index e760c84..26bfd0c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -926,7 +926,7 @@ static HRESULT WINAPI domelem_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, TRUE, FALSE, p); + return node_get_xml(&This->node, TRUE, p); } static HRESULT WINAPI domelem_transformNode( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 313fc2e..f2d46ab 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -444,7 +444,7 @@ static HRESULT WINAPI entityref_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI entityref_transformNode( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 026b5dc..18ddac8 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -329,7 +329,7 @@ extern HRESULT node_get_next_sibling(xmlnode*,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_insert_before(xmlnode*,IXMLDOMNode*,const VARIANT*,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_replace_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode*,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_put_text(xmlnode*,BSTR) DECLSPEC_HIDDEN; -extern HRESULT node_get_xml(xmlnode*,BOOL,BOOL,BSTR*) DECLSPEC_HIDDEN; +extern HRESULT node_get_xml(xmlnode*,BOOL,BSTR*) DECLSPEC_HIDDEN; extern HRESULT node_clone(xmlnode*,VARIANT_BOOL,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_get_prefix(xmlnode*,BSTR*) DECLSPEC_HIDDEN; extern HRESULT node_get_base_name(xmlnode*,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index adc38cb..36602eb 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -787,37 +787,6 @@ BSTR EnsureCorrectEOL(BSTR sInput) return sNew; } -/* Removes encoding information and last character (nullbyte) */ -static BSTR EnsureNoEncoding(BSTR sInput) -{ - static const WCHAR wszEncoding[] = {'e','n','c','o','d','i','n','g','='}; - BSTR sNew; - WCHAR *pBeg, *pEnd; - - pBeg = sInput; - while(*pBeg != '\n' && memcmp(pBeg, wszEncoding, sizeof(wszEncoding))) - pBeg++; - - if(*pBeg == '\n') - { - SysReAllocStringLen(&sInput, sInput, SysStringLen(sInput)-1); - return sInput; - } - pBeg--; - - pEnd = pBeg + sizeof(wszEncoding)/sizeof(WCHAR) + 2; - while(*pEnd != '\"') pEnd++; - pEnd++; - - sNew = SysAllocStringLen(NULL, - pBeg-sInput + SysStringLen(sInput)-(pEnd-sInput)-1); - memcpy(sNew, sInput, (pBeg-sInput)*sizeof(WCHAR)); - memcpy(&sNew[pBeg-sInput], pEnd, (SysStringLen(sInput)-(pEnd-sInput)-1)*sizeof(WCHAR)); - - SysFreeString(sInput); - return sNew; -} - /* * We are trying to replicate the same behaviour as msxml by converting * line endings to \r\n and using indents as \t. The problem is that msxml @@ -825,7 +794,7 @@ static BSTR EnsureNoEncoding(BSTR sInput) * reproduce behaviour exactly. * */ -HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BOOL ensure_no_encoding, BSTR *ret) +HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BSTR *ret) { xmlBufferPtr xml_buf; xmlNodePtr xmldecl; @@ -853,8 +822,6 @@ HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BOOL ensure_no_encoding, BS content = bstr_from_xmlChar(buf_content + (buf_content[0] == ' ' ? 1 : 0)); if(ensure_eol) content = EnsureCorrectEOL(content); - if(ensure_no_encoding) - content = EnsureNoEncoding(content); *ret = content; }else { @@ -1453,7 +1420,7 @@ static HRESULT WINAPI unknode_get_xml( FIXME("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI unknode_transformNode( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 4d1910b..4d1cab7 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -487,7 +487,7 @@ static HRESULT WINAPI dom_pi_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI dom_pi_transformNode( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 705afd0..865c1d4 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -514,7 +514,7 @@ static HRESULT WINAPI domtext_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domtext_transformNode(

1 0

Jacek Caban : appwiz.cpl: Moved config_key value to addon_info_t.
by Alexandre Julliard May 15, 2012

May 15, 2012

Module: wine Branch: master Commit: 5779ce287ad8e147ecd9a8f13a46b112d6c36b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5779ce287ad8e147ecd9a8f13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 11:48:12 2012 +0200 appwiz.cpl: Moved config_key value to addon_info_t. --- dlls/appwiz.cpl/addons.c | 51 +++++++++++++++++++++++++++++---------------- dlls/appwiz.cpl/appwiz.h | 16 ++++++++++++++ 2 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 2694fb7..8703f97 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -69,6 +69,9 @@ typedef struct { const char *file_name; const char *subdir_name; const char *sha; + const char *config_key; + const char *url_config_key; + const char *dir_config_key; } addon_info_t; static const addon_info_t addons_info[] = { @@ -76,17 +79,13 @@ static const addon_info_t addons_info[] = { GECKO_VERSION, "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", "gecko", - GECKO_SHA + GECKO_SHA, + "MSHTML", "GeckoUrl", "GeckoCabDir" } }; static const addon_info_t *addon = &addons_info[0]; -static const WCHAR mshtml_keyW[] = - {'S','o','f','t','w','a','r','e', - '\\','W','i','n','e', - '\\','M','S','H','T','M','L',0}; - static HWND install_dialog = NULL; static LPWSTR url = NULL; @@ -233,6 +232,23 @@ static BOOL install_from_unix_file(const char *dir, const char *subdir, const ch return ret; } +static HKEY open_config_key(void) +{ + HKEY hkey, ret; + DWORD res; + + static const WCHAR wine_keyW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; + + /* @@ Wine registry key: HKCU\Software\Wine\$config_key */ + res = RegOpenKeyW(HKEY_CURRENT_USER, wine_keyW, &hkey); + if(res != ERROR_SUCCESS) + return NULL; + + res = RegOpenKeyA(hkey, addon->config_key, &ret); + RegCloseKey(hkey); + return res == ERROR_SUCCESS ? ret : NULL; +} + static BOOL install_from_registered_dir(void) { char *package_dir; @@ -240,16 +256,15 @@ static BOOL install_from_registered_dir(void) DWORD res, type, size = MAX_PATH; BOOL ret; - /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ - res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey); - if(res != ERROR_SUCCESS) + hkey = open_config_key(); + if(!hkey) return FALSE; package_dir = heap_alloc(size); - res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)package_dir, &size); + res = RegGetValueA(hkey, NULL, addon->dir_config_key, RRF_RT_ANY, &type, (PBYTE)package_dir, &size); if(res == ERROR_MORE_DATA) { package_dir = heap_realloc(package_dir, size); - res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)package_dir, &size); + res = RegGetValueA(hkey, NULL, addon->dir_config_key, RRF_RT_ANY, &type, (PBYTE)package_dir, &size); } RegCloseKey(hkey); if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) { @@ -399,26 +414,26 @@ static IBindStatusCallback InstallCallback = { &InstallCallbackVtbl }; static LPWSTR get_url(void) { + DWORD size = INTERNET_MAX_URL_LENGTH*sizeof(WCHAR); + WCHAR *url, *config_key; HKEY hkey; DWORD res, type; - DWORD size = INTERNET_MAX_URL_LENGTH*sizeof(WCHAR); DWORD returned_size; - LPWSTR url; - static const WCHAR wszGeckoUrl[] = {'G','e','c','k','o','U','r','l',0}; static const WCHAR httpW[] = {'h','t','t','p'}; static const WCHAR arch_formatW[] = {'?','a','r','c','h','='}; static const WCHAR v_formatW[] = {'&','v','='}; - /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ - res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey); - if(res != ERROR_SUCCESS) + hkey = open_config_key(); + if(!hkey) return NULL; url = heap_alloc(size); returned_size = size; - res = RegQueryValueExW(hkey, wszGeckoUrl, NULL, &type, (LPBYTE)url, &returned_size); + config_key = heap_strdupAtoW(addon->url_config_key); + res = RegQueryValueExW(hkey, config_key, NULL, &type, (LPBYTE)url, &returned_size); + heap_free(config_key); RegCloseKey(hkey); if(res != ERROR_SUCCESS || type != REG_SZ) { heap_free(url); diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index 05b9dc8..d4f9375 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -34,3 +34,19 @@ static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); } + +static inline WCHAR *heap_strdupAtoW(const char *str) +{ + WCHAR *ret = NULL; + + if(str) { + size_t len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +}

1 0