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

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedGray16 palette.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 179ed52bd39df7436688a8b7db9150e3b4d99ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=179ed52bd39df7436688a8b7d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 16:55:53 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedGray16 palette. --- dlls/windowscodecs/palette.c | 22 ++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 19 +++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index ffd5877..03f5774a 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -98,6 +98,23 @@ static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface) return ref; } +static WICColor *generate_gray16_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 16; + entries = HeapAlloc(GetProcessHeap(), 0, 16 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 16; i++) + { + entries[i] = 0xff000000; + entries[i] |= (i<<20) | (i<<16) | (i<<12) | (i<<8) | (i<<4) | i; + } + return entries; +} + static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, WICBitmapPaletteType type, BOOL add_transparent) { @@ -127,6 +144,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, colors[3] = 0xffffffff; break; + case WICBitmapPaletteTypeFixedGray16: + colors = generate_gray16_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + default: FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); return E_NOTIMPL; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 1768e1a..aba8168 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -148,6 +149,19 @@ static void test_custom_palette(void) IWICImagingFactory_Release(factory); } +static void generate_gray16_palette(DWORD *entries, UINT count) +{ + UINT i; + + assert(count == 16); + + for (i = 0; i < 16; i++) + { + entries[i] = 0xff000000; + entries[i] |= (i << 20) | (i << 16) | (i << 12) | (i << 8) | (i << 4) | i; + } +} + static void test_predefined_palette(void) { static struct test_data @@ -161,6 +175,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedBW, 1, 1, 2, { 0xff000000, 0xffffffff } }, { WICBitmapPaletteTypeFixedGray4, 0, 1, 4, { 0xff000000, 0xff555555, 0xffaaaaaa, 0xffffffff } }, + { WICBitmapPaletteTypeFixedGray16, 0, 1, 16, { 0 } }, }; IWICImagingFactory *factory; IWICPalette *palette; @@ -210,6 +225,10 @@ static void test_predefined_palette(void) if (ret == td[i].count) { UINT j; + + if (td[i].type == WICBitmapPaletteTypeFixedGray16) + generate_gray16_palette(td[i].color, td[i].count); + for (j = 0; j < count; j++) { ok(color[j] == td[i].color[j], "%u:[%u]: expected %#x, got %#x\n",

1 0

Alexandre Julliard : winex11: Get rid of the no longer needed drawable rect in the X11 device.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 4b0f27f664ea3fcbfd2c0c0b2fec872895aec76b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b0f27f664ea3fcbfd2c0c0b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 12 14:19:58 2012 -0500 winex11: Get rid of the no longer needed drawable rect in the X11 device. --- dlls/winex11.drv/init.c | 10 +++------- dlls/winex11.drv/opengl.c | 3 +-- dlls/winex11.drv/window.c | 5 +---- dlls/winex11.drv/x11drv.h | 2 -- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index e582bda..7dcf8da 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -144,7 +144,6 @@ static BOOL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, physDev->depth = screen_depth; physDev->color_shifts = &X11DRV_PALETTE_default_shifts; - physDev->drawable_rect = virtual_screen_rect; SetRect( &physDev->dc_rect, 0, 0, virtual_screen_rect.right - virtual_screen_rect.left, virtual_screen_rect.bottom - virtual_screen_rect.top ); push_dc_driver( pdev, &physDev->dev, &x11drv_funcs ); @@ -165,8 +164,7 @@ static BOOL X11DRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) if (!physDev) return FALSE; physDev->depth = 1; - SetRect( &physDev->drawable_rect, 0, 0, 1, 1 ); - physDev->dc_rect = physDev->drawable_rect; + SetRect( &physDev->dc_rect, 0, 0, 1, 1 ); push_dc_driver( pdev, &physDev->dev, &x11drv_funcs ); if (orig) return TRUE; /* we already went through Xrender if we have an orig device */ if (xrender_funcs && !xrender_funcs->pCreateCompatibleDC( NULL, pdev )) return FALSE; @@ -352,13 +350,11 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d const struct x11drv_escape_set_drawable *data = in_data; physDev->dc_rect = data->dc_rect; physDev->drawable = data->drawable; - physDev->drawable_rect = data->drawable_rect; wine_tsx11_lock(); XSetSubwindowMode( gdi_display, physDev->gc, data->mode ); wine_tsx11_unlock(); - TRACE( "SET_DRAWABLE hdc %p drawable %lx dc_rect %s drawable_rect %s\n", - dev->hdc, physDev->drawable, wine_dbgstr_rect(&physDev->dc_rect), - wine_dbgstr_rect(&physDev->drawable_rect) ); + TRACE( "SET_DRAWABLE hdc %p drawable %lx dc_rect %s\n", + dev->hdc, physDev->drawable, wine_dbgstr_rect(&physDev->dc_rect) ); return TRUE; } break; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 44882cb..b32fe95 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2224,8 +2224,7 @@ static HDC WINAPI X11DRV_wglGetPbufferDCARB(HPBUFFERARB hPbuffer) escape.code = X11DRV_SET_DRAWABLE; escape.drawable = object->drawable; escape.mode = IncludeInferiors; - SetRect( &escape.drawable_rect, 0, 0, object->width, object->height ); - escape.dc_rect = escape.drawable_rect; + SetRect( &escape.dc_rect, 0, 0, object->width, object->height ); escape.fbconfig_id = object->fmt->fmt_id; escape.gl_drawable = object->drawable; escape.pixmap = 0; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 29317aa..b202586 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2324,7 +2324,6 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, escape.dc_rect.top = win_rect->top - top_rect->top; escape.dc_rect.right = win_rect->right - top_rect->left; escape.dc_rect.bottom = win_rect->bottom - top_rect->top; - escape.drawable_rect = *top_rect; if (top == hwnd) { @@ -2355,7 +2354,6 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, POINT pt = { 0, 0 }; MapWindowPoints( top, parent, &pt, 1 ); OffsetRect( &escape.dc_rect, pt.x, pt.y ); - OffsetRect( &escape.drawable_rect, -pt.x, -pt.y ); } else escape.drawable = X11DRV_get_client_window( top ); @@ -2380,10 +2378,9 @@ void CDECL X11DRV_ReleaseDC( HWND hwnd, HDC hdc ) escape.code = X11DRV_SET_DRAWABLE; escape.drawable = root_window; escape.mode = IncludeInferiors; - escape.drawable_rect = virtual_screen_rect; SetRect( &escape.dc_rect, 0, 0, virtual_screen_rect.right - virtual_screen_rect.left, virtual_screen_rect.bottom - virtual_screen_rect.top ); - OffsetRect( &escape.dc_rect, -escape.drawable_rect.left, -escape.drawable_rect.top ); + OffsetRect( &escape.dc_rect, -virtual_screen_rect.left, -virtual_screen_rect.top ); escape.fbconfig_id = 0; escape.gl_drawable = 0; escape.pixmap = 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9ce0bbd..0c4154b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -118,7 +118,6 @@ typedef struct GC gc; /* X Window GC */ Drawable drawable; RECT dc_rect; /* DC rectangle relative to drawable */ - RECT drawable_rect; /* Drawable rectangle relative to screen */ RECT *bounds; /* Graphics bounds */ HRGN region; /* Device region (visible region & clip region) */ X_PHYSPEN pen; @@ -298,7 +297,6 @@ struct x11drv_escape_set_drawable Drawable drawable; /* X drawable */ int mode; /* ClipByChildren or IncludeInferiors */ RECT dc_rect; /* DC rectangle relative to drawable */ - RECT drawable_rect;/* Drawable rectangle relative to screen */ XID fbconfig_id; /* fbconfig id used by the GL drawable */ Drawable gl_drawable; /* GL drawable */ Pixmap pixmap; /* Pixmap for a GLXPixmap gl_drawable */

1 0

Vincent Povirk : gdiplus: Fix GdipImageRotateFlip for images from streams.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 577740f0d79522da15232cf03de38df9e2c7945a URL: http://source.winehq.org/git/wine.git/?a=commit;h=577740f0d79522da15232cf03… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 12 09:17:09 2012 -0500 gdiplus: Fix GdipImageRotateFlip for images from streams. --- dlls/gdiplus/image.c | 8 ++++++-- dlls/gdiplus/tests/image.c | 11 +++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index db79eca..233a9eac 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1971,8 +1971,6 @@ static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette) { assert(src->image.type == ImageTypeBitmap); assert(dst->image.type == ImageTypeBitmap); - assert(src->image.stream == NULL); - assert(dst->image.stream == NULL); GdipFree(dst->bitmapbits); DeleteDC(dst->hdc); @@ -2001,6 +1999,12 @@ static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette) if (dst->metadata_reader) IWICMetadataReader_Release(dst->metadata_reader); dst->metadata_reader = src->metadata_reader; + if (dst->image.stream) + IStream_Release(dst->image.stream); + dst->image.stream = src->image.stream; + dst->image.frame_count = src->image.frame_count; + dst->image.current_frame = src->image.current_frame; + dst->image.format = src->image.format; src->image.type = ~0; GdipFree(src); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 29182aa..750b084 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2345,6 +2345,17 @@ static void test_multiframegif(void) expect(Ok, stat); expect(0xffffffff, color); + /* rotate/flip discards the information about other frames */ + stat = GdipImageRotateFlip((GpImage*)bmp, Rotate90FlipNone); + expect(Ok, stat); + + count = 12345; + stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); + expect(Ok, stat); + expect(1, count); + + expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bmp, __LINE__, FALSE); + GdipDisposeImage((GpImage*)bmp); IStream_Release(stream);

1 0

Matteo Bruni : d3dcompiler: Track the location of each lexer token.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 40cbcabc0b3c9e1c6e78e206d6531d24c517d172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40cbcabc0b3c9e1c6e78e206d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 12 16:01:33 2012 +0200 d3dcompiler: Track the location of each lexer token. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 7 ++++- dlls/d3dcompiler_43/hlsl.l | 9 ++++++++ dlls/d3dcompiler_43/hlsl.y | 30 ++++++++++++++++++++++++---- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index aa02eb9..1286f00 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -705,7 +705,7 @@ struct hlsl_ir_node enum hlsl_ir_node_type type; struct hlsl_type *data_type; - char *source_file; + const char *source_file; unsigned int line; unsigned int column; }; @@ -823,8 +823,11 @@ struct parse_variable_def struct hlsl_parse_ctx { - char *source_file; + const char **source_files; + unsigned int source_files_count; + const char *source_file; unsigned int line_no; + unsigned int column; enum parse_status status; struct compilation_messages messages; diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l index 55b6b63..1e3b4a9 100644 --- a/dlls/d3dcompiler_43/hlsl.l +++ b/dlls/d3dcompiler_43/hlsl.l @@ -29,6 +29,14 @@ #include "hlsl.tab.h" WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser); + +#define YY_USER_ACTION \ + do { \ + hlsl_lloc.first_column = hlsl_ctx.column; \ + hlsl_lloc.first_line = hlsl_ctx.line_no; \ + hlsl_ctx.column += yyleng; \ + } while(0); + %} %option noyywrap nounput noinput @@ -206,6 +214,7 @@ row_major {return KW_ROW_MAJOR; } {WS}+ {} {NEWLINE} { hlsl_ctx.line_no++; + hlsl_ctx.column = 1; } ^# { diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 240eaaf..48c43a2 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -95,7 +95,7 @@ void hlsl_report_message(const char *filename, DWORD line, DWORD column, static void hlsl_error(const char *s) { - hlsl_report_message(hlsl_ctx.source_file, hlsl_ctx.line_no, 1, HLSL_LEVEL_ERROR, "%s", s); + hlsl_report_message(hlsl_ctx.source_file, hlsl_ctx.line_no, hlsl_ctx.column, HLSL_LEVEL_ERROR, "%s", s); } static void debug_dump_decl(struct hlsl_type *type, DWORD modifiers, const char *declname, unsigned int line_no) @@ -177,6 +177,7 @@ static unsigned int components_count_expr_list(struct list *list) %} +%locations %error-verbose %union @@ -360,8 +361,19 @@ preproc_directive: PRE_LINE STRING { TRACE("Updating line information to file %s, line %u\n", debugstr_a($2), $1); hlsl_ctx.line_no = $1; - d3dcompiler_free(hlsl_ctx.source_file); - hlsl_ctx.source_file = $2; + if (strcmp($2, hlsl_ctx.source_file)) + { + const char **new_array; + + hlsl_ctx.source_file = $2; + new_array = d3dcompiler_realloc(hlsl_ctx.source_files, + sizeof(*hlsl_ctx.source_files) * hlsl_ctx.source_files_count + 1); + if (new_array) + { + hlsl_ctx.source_files = new_array; + hlsl_ctx.source_files[hlsl_ctx.source_files_count++] = $2; + } + } } any_identifier: VAR_IDENTIFIER @@ -978,11 +990,16 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino struct hlsl_scope *scope, *next_scope; struct hlsl_type *hlsl_type, *next_type; struct hlsl_ir_var *var, *next_var; + unsigned int i; hlsl_ctx.status = PARSE_SUCCESS; hlsl_ctx.messages.size = hlsl_ctx.messages.capacity = 0; - hlsl_ctx.line_no = 1; + hlsl_ctx.line_no = hlsl_ctx.column = 1; hlsl_ctx.source_file = d3dcompiler_strdup(""); + hlsl_ctx.source_files = d3dcompiler_alloc(sizeof(*hlsl_ctx.source_files)); + if (hlsl_ctx.source_files) + hlsl_ctx.source_files[0] = hlsl_ctx.source_file; + hlsl_ctx.source_files_count = 1; hlsl_ctx.cur_scope = NULL; hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; list_init(&hlsl_ctx.scopes); @@ -1020,7 +1037,10 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino d3dcompiler_free(hlsl_ctx.messages.string); } - d3dcompiler_free(hlsl_ctx.source_file); + for (i = 0; i < hlsl_ctx.source_files_count; ++i) + d3dcompiler_free((void *)hlsl_ctx.source_files[i]); + d3dcompiler_free(hlsl_ctx.source_files); + TRACE("Freeing functions IR.\n"); LIST_FOR_EACH_ENTRY(function, &hlsl_ctx.functions, struct hlsl_ir_function_decl, node.entry) free_function(function);

1 0

Matteo Bruni : d3dcompiler: Add hlsl_report_message function to standardize error messages.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 632703d8cfdaefc9dffeb124970e28d20471a535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632703d8cfdaefc9dffeb1249… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 12 16:01:32 2012 +0200 d3dcompiler: Add hlsl_report_message function to standardize error messages. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 9 +++++ dlls/d3dcompiler_43/hlsl.y | 55 +++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index ccac936..aa02eb9 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -840,7 +840,16 @@ struct hlsl_parse_ctx extern struct hlsl_parse_ctx hlsl_ctx DECLSPEC_HIDDEN; +enum hlsl_error_level +{ + HLSL_LEVEL_ERROR = 0, + HLSL_LEVEL_WARNING, + HLSL_LEVEL_NOTE, +}; + void hlsl_message(const char *fmt, ...) PRINTF_ATTR(1,2) DECLSPEC_HIDDEN; +void hlsl_report_message(const char *filename, DWORD line, DWORD column, + enum hlsl_error_level level, const char *fmt, ...) PRINTF_ATTR(5,6) DECLSPEC_HIDDEN; static inline struct hlsl_ir_deref *deref_from_node(const struct hlsl_ir_node *node) { diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 03aa4eb..240eaaf 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -41,10 +41,61 @@ void hlsl_message(const char *fmt, ...) va_end(args); } +static const char *hlsl_get_error_level_name(enum hlsl_error_level level) +{ + const char *names[] = + { + "error", + "warning", + "note", + }; + return names[level]; +} + +void hlsl_report_message(const char *filename, DWORD line, DWORD column, + enum hlsl_error_level level, const char *fmt, ...) +{ + va_list args; + char *string = NULL; + int rc, size = 0; + + while (1) + { + va_start(args, fmt); + rc = vsnprintf(string, size, fmt, args); + va_end(args); + + if (rc >= 0 && rc < size) + break; + + if (rc >= size) + size = rc + 1; + else + size = size ? size * 2 : 32; + + if (!string) + string = d3dcompiler_alloc(size); + else + string = d3dcompiler_realloc(string, size); + if (!string) + { + ERR("Error reallocating memory for a string.\n"); + return; + } + } + + hlsl_message("%s:%u:%u: %s: %s\n", filename, line, column, hlsl_get_error_level_name(level), string); + d3dcompiler_free(string); + + if (level == HLSL_LEVEL_ERROR) + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + else if (level == HLSL_LEVEL_WARNING) + set_parse_status(&hlsl_ctx.status, PARSE_WARN); +} + static void hlsl_error(const char *s) { - hlsl_message("Line %u: %s\n", hlsl_ctx.line_no, s); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(hlsl_ctx.source_file, hlsl_ctx.line_no, 1, HLSL_LEVEL_ERROR, "%s", s); } static void debug_dump_decl(struct hlsl_type *type, DWORD modifiers, const char *declname, unsigned int line_no)

1 0

Jacek Caban : mshtml: Use per-inner window task_magic for binding.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: bbaa307fdf9904aa90ff870079d508f0ebb1c564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbaa307fdf9904aa90ff87007… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 12 14:25:58 2012 +0200 mshtml: Use per-inner window task_magic for binding. --- dlls/mshtml/htmlwindow.c | 3 +++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/navigate.c | 9 ++++----- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0ced93d..491a453 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -235,6 +235,7 @@ static void release_inner_window(HTMLInnerWindow *This) TRACE("%p\n", This); + remove_target_tasks(This->task_magic); abort_window_bindings(This); release_script_hosts(This); @@ -2622,6 +2623,8 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, HTMLInnerWindo init_dispex(&window->dispex, (IUnknown*)&window->base.IHTMLWindow2_iface, &HTMLWindow_dispex); + window->task_magic = get_task_target_magic(); + *ret = window; return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f0dde6c..430b744 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -361,6 +361,8 @@ struct HTMLInnerWindow { DWORD global_prop_cnt; DWORD global_prop_size; + LONG task_magic; + nsChannelBSC *bscallback; struct list bindings; }; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 1fe4f9d..bfc8671 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1325,7 +1325,7 @@ static HRESULT async_stop_request(nsChannelBSC *This) IBindStatusCallback_AddRef(&This->bsc.IBindStatusCallback_iface); task->bsc = This; - push_task(&task->header, stop_request_proc, stop_request_task_destr, This->window->doc_obj->basedoc.task_magic); + push_task(&task->header, stop_request_proc, stop_request_task_destr, This->bsc.window->task_magic); return S_OK; } @@ -1679,7 +1679,7 @@ HRESULT async_start_doc_binding(HTMLOuterWindow *window, HTMLInnerWindow *pendin task->pending_window = pending_window; IHTMLWindow2_AddRef(&pending_window->base.IHTMLWindow2_iface); - push_task(&task->header, start_doc_binding_proc, start_doc_binding_task_destr, window->task_magic); + push_task(&task->header, start_doc_binding_proc, start_doc_binding_task_destr, pending_window->task_magic); return S_OK; } @@ -1687,6 +1687,8 @@ void abort_window_bindings(HTMLInnerWindow *window) { BSCallback *iter; + remove_target_tasks(window->task_magic); + while(!list_empty(&window->bindings)) { iter = LIST_ENTRY(window->bindings.next, BSCallback, entry); @@ -1694,9 +1696,6 @@ void abort_window_bindings(HTMLInnerWindow *window) IBindStatusCallback_AddRef(&iter->IBindStatusCallback_iface); - if(iter->window && iter->window->doc) - remove_target_tasks(iter->window->doc->basedoc.task_magic); - if(iter->binding) IBinding_Abort(iter->binding); else

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture2d_Map().
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 7e2999e70f90144cc9147823de917de3f2ddbf9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2999e70f90144cc9147823d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 12 13:44:23 2012 +0200 d3d10core: Implement d3d10_texture2d_Map(). --- dlls/d3d10core/texture.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 5908cd0..718d019 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -150,13 +150,32 @@ static UINT STDMETHODCALLTYPE d3d10_texture2d_GetEvictionPriority(ID3D10Texture2 /* ID3D10Texture2D methods */ -static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UINT sub_resource, +static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UINT sub_resource_idx, D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE2D *mapped_texture) { - FIXME("iface %p, sub_resource %u, map_type %u, map_flags %#x, mapped_texture %p stub!\n", - iface, sub_resource, map_type, map_flags, mapped_texture); + struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_resource *sub_resource; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, mapped_texture %p.\n", + iface, sub_resource_idx, map_type, map_flags, mapped_texture); + + if (map_type != D3D10_MAP_READ_WRITE) + FIXME("Ignoring map_type %#x.\n", map_type); + if (map_flags) + FIXME("Ignoring map_flags %#x.\n", map_flags); + + if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) + hr = E_INVALIDARG; + else if (SUCCEEDED(hr = wined3d_surface_map(wined3d_surface_from_resource(sub_resource), + &wined3d_map_desc, NULL, 0))) + { + mapped_texture->pData = wined3d_map_desc.data; + mapped_texture->RowPitch = wined3d_map_desc.row_pitch; + } + + return hr; } static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT sub_resource_idx)

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture2d_Unmap().
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 21a7b18311e6423ccccfcd8f3f17950000be1206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a7b18311e6423ccccfcd8f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 12 13:44:22 2012 +0200 d3d10core: Implement d3d10_texture2d_Unmap(). --- dlls/d3d10core/texture.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 1126e87..5908cd0 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -159,9 +159,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UIN return E_NOTIMPL; } -static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT sub_resource) +static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT sub_resource_idx) { - FIXME("iface %p, sub_resource %u stub!\n", iface, sub_resource); + struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); + struct wined3d_resource *sub_resource; + + TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); + + if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) + return; + + wined3d_surface_unmap(wined3d_surface_from_resource(sub_resource)); } static void STDMETHODCALLTYPE d3d10_texture2d_GetDesc(ID3D10Texture2D *iface, D3D10_TEXTURE2D_DESC *desc)

1 0

Henri Verbeet : d3d10core: Always create a wined3d texture for d3d10core textures.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 2b4c72b13b668d38929b1978ab4f6f0c224b4071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4c72b13b668d38929b1978a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 12 13:44:21 2012 +0200 d3d10core: Always create a wined3d texture for d3d10core textures. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 48 +++++++++++------------------------ dlls/d3d10core/texture.c | 36 ++++++++++++-------------- dlls/d3d10core/view.c | 2 +- dlls/dxgi/device.c | 7 +++-- dlls/wined3d/surface.c | 5 +++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 8 files changed, 45 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b4c72b13b668d38929b1…

1 0

Jacek Caban : mshtml: Create inner window early in binding process and use it to store current binding callback .
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 25c5082f90e181beb83258ed7d8542822220233b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c5082f90e181beb83258ed7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 12 14:25:43 2012 +0200 mshtml: Create inner window early in binding process and use it to store current binding callback. --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/htmlwindow.c | 114 ++++++++++++++++++++++++++---------------- dlls/mshtml/mshtml_private.h | 9 ++-- dlls/mshtml/navigate.c | 79 ++++++++++++----------------- dlls/mshtml/nsio.c | 7 ++- dlls/mshtml/persist.c | 10 ++-- 6 files changed, 120 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25c5082f90e181beb8325…

1 0