March 2016 - Wine-Commits - list.winehq.org

Thomas Faber : user32: Handle BITMAPCOREINFO when loading icons.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 6ad5cfbebd2e891e0dc88238a6bc3524d12614ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad5cfbebd2e891e0dc88238a… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Mar 27 15:41:33 2016 +0200 user32: Handle BITMAPCOREINFO when loading icons. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 50 ++++++++++++++++++++++++++++-------------- dlls/user32/tests/cursoricon.c | 1 - 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7d8d620..4f62635 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -676,10 +676,19 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, return FALSE; entry = &filedir->idEntries[n]; info = (const BITMAPINFOHEADER *)((const char *)dir + entry->dwDIBOffset); - if ((const char *)(info + 1) - (const char *)dir > size) return FALSE; + if (info->biSize != sizeof(BITMAPCOREHEADER)) + { + if ((const char *)(info + 1) - (const char *)dir > size) return FALSE; + *bits = info->biBitCount; + } + else + { + const BITMAPCOREHEADER *coreinfo = (const BITMAPCOREHEADER *)((const char *)dir + entry->dwDIBOffset); + if ((const char *)(coreinfo + 1) - (const char *)dir > size) return FALSE; + *bits = coreinfo->bcBitCount; + } *width = entry->bWidth; *height = entry->bHeight; - *bits = info->biBitCount; return TRUE; } @@ -805,6 +814,9 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE BOOL do_stretch; HICON hObj = 0; HDC hdc = 0; + LONG bmi_width, bmi_height; + WORD bpp; + DWORD compr; /* Check bitmap header */ @@ -828,9 +840,10 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE } size = bitmap_info_size( bmi, DIB_RGB_COLORS ); - color_size = get_dib_image_size( bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight / 2, - bmi->bmiHeader.biBitCount ); - mask_size = get_dib_image_size( bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight / 2, 1 ); + DIB_GetBitmapInfo(&bmi->bmiHeader, &bmi_width, &bmi_height, &bpp, &compr); + color_size = get_dib_image_size( bmi_width, bmi_height / 2, + bpp ); + mask_size = get_dib_image_size( bmi_width, bmi_height / 2, 1 ); if (size > maxsize || color_size > maxsize - size) { WARN( "truncated file %u < %u+%u+%u\n", maxsize, size, color_size, mask_size ); @@ -845,11 +858,11 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE } else { - if (!width) width = bmi->bmiHeader.biWidth; - if (!height) height = bmi->bmiHeader.biHeight/2; + if (!width) width = bmi_width; + if (!height) height = bmi_height/2; } - do_stretch = (bmi->bmiHeader.biHeight/2 != height) || - (bmi->bmiHeader.biWidth != width); + do_stretch = (bmi_height/2 != height) || + (bmi_width != width); /* Scale the hotspot */ if (bIcon) @@ -859,8 +872,8 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE } else if (do_stretch) { - hotspot.x = (hotspot.x * width) / bmi->bmiHeader.biWidth; - hotspot.y = (hotspot.y * height) / (bmi->bmiHeader.biHeight / 2); + hotspot.x = (hotspot.x * width) / bmi_width; + hotspot.y = (hotspot.y * height) / (bmi_height / 2); } if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); @@ -871,7 +884,11 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE if (!(hdc = CreateCompatibleDC( 0 ))) goto done; memcpy( bmi_copy, bmi, size ); - bmi_copy->bmiHeader.biHeight /= 2; + if (bmi_copy->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) + bmi_copy->bmiHeader.biHeight /= 2; + else + ((BITMAPCOREINFO *)bmi_copy)->bmciHeader.bcHeight /= 2; + bmi_height /= 2; color_bits = (const char*)bmi + size; mask_bits = (const char*)color_bits + color_size; @@ -885,7 +902,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE /* copy color data into second half of mask bitmap */ SelectObject( hdc, mask ); StretchDIBits( hdc, 0, height, width, height, - 0, 0, bmi_copy->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight, + 0, 0, bmi_width, bmi_height, color_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } else @@ -899,18 +916,18 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE } SelectObject( hdc, color ); StretchDIBits( hdc, 0, 0, width, height, - 0, 0, bmi_copy->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight, + 0, 0, bmi_width, bmi_height, color_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); if (bmi_has_alpha( bmi_copy, color_bits )) alpha = create_alpha_bitmap( color, bmi_copy, color_bits ); /* convert info to monochrome to copy the mask */ - bmi_copy->bmiHeader.biBitCount = 1; if (bmi_copy->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) { RGBQUAD *rgb = bmi_copy->bmiColors; + bmi_copy->bmiHeader.biBitCount = 1; bmi_copy->bmiHeader.biClrUsed = bmi_copy->bmiHeader.biClrImportant = 2; rgb[0].rgbBlue = rgb[0].rgbGreen = rgb[0].rgbRed = 0x00; rgb[1].rgbBlue = rgb[1].rgbGreen = rgb[1].rgbRed = 0xff; @@ -920,6 +937,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE { RGBTRIPLE *rgb = (RGBTRIPLE *)(((BITMAPCOREHEADER *)bmi_copy) + 1); + ((BITMAPCOREINFO *)bmi_copy)->bmciHeader.bcBitCount = 1; rgb[0].rgbtBlue = rgb[0].rgbtGreen = rgb[0].rgbtRed = 0x00; rgb[1].rgbtBlue = rgb[1].rgbtGreen = rgb[1].rgbtRed = 0xff; } @@ -929,7 +947,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE { SelectObject( hdc, mask ); StretchDIBits( hdc, 0, 0, width, height, - 0, 0, bmi_copy->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight, + 0, 0, bmi_width, bmi_height, mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } ret = TRUE; diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index dc8d227..232a02e 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2567,7 +2567,6 @@ static void test_monochrome_icon(void) CloseHandle(handle); handle = LoadImageA(NULL, "icon.ico", IMAGE_ICON, 0, 0, LR_LOADFROMFILE); -todo_wine_if(use_core_info) ok(handle != NULL, "LoadImage() failed with %u.\n", GetLastError()); if (handle == NULL) {

1 0

Nikolay Sivov : msxml3/mxwriter: Flush internal buffer as soon as it' s filled.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 737d90c21c8de535642dc6969c16662cb9c48202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=737d90c21c8de535642dc6969… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 17:23:02 2016 +0300 msxml3/mxwriter: Flush internal buffer as soon as it's filled. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 226 +++++++++++++++++++++++-------------------------- 1 file changed, 108 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=737d90c21c8de535642dc…

1 0

Matteo Bruni : d3d9/tests: Add a test for color varyings clamping.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 05f57dae24c201bf3ed98a76a5aa79cd704f65ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f57dae24c201bf3ed98a76a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Mar 27 23:14:17 2016 +0200 d3d9/tests: Add a test for color varyings clamping. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 225 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05f57dae24c201bf3ed98…

1 0

Matteo Bruni : wined3d: Clamp diffuse and specular color in GLSL vertex ffp replacement for core profile.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 5e7a015b52fc3b1d635e4b5975a1ecaddfa8ec32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7a015b52fc3b1d635e4b597… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 25 22:50:24 2016 +0100 wined3d: Clamp diffuse and specular color in GLSL vertex ffp replacement for core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 717b9f8..9e6a631 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6180,6 +6180,11 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr shader_addline(buffer, "gl_FrontColor = ffp_varying_diffuse;\n"); shader_addline(buffer, "gl_FrontSecondaryColor = ffp_varying_specular;\n"); } + else + { + shader_addline(buffer, "ffp_varying_diffuse = clamp(ffp_varying_diffuse, 0.0, 1.0);\n"); + shader_addline(buffer, "ffp_varying_specular = clamp(ffp_varying_specular, 0.0, 1.0);\n"); + } for (i = 0; i < MAX_TEXTURES; ++i) {

1 0

Józef Kucia : wined3d: Recognize SM5 store_uav_typed opcode.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 3c5ca08a2f63131c7ca0b28ac643d8c37ed59add URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5ca08a2f63131c7ca0b28ac… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 19:53:39 2016 +0100 wined3d: Recognize SM5 store_uav_typed opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8ef944d..298107a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5334,6 +5334,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_SINCOS */ shader_hw_sincos, /* WINED3DSIH_SLT */ shader_hw_map2gl, /* WINED3DSIH_SQRT */ NULL, + /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_hw_map2gl, /* WINED3DSIH_TEX */ pshader_hw_tex, /* WINED3DSIH_TEXBEM */ pshader_hw_texbem, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 716650a..53a9191 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8220,6 +8220,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SINCOS */ shader_glsl_sincos, /* WINED3DSIH_SLT */ shader_glsl_compare, /* WINED3DSIH_SQRT */ shader_glsl_map2gl, + /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5aded18..7120a7f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -162,6 +162,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_SINCOS */ "sincos", /* WINED3DSIH_SLT */ "slt", /* WINED3DSIH_SQRT */ "sqrt", + /* WINED3DSIH_STORE_UAV_TYPED */ "store_uav_typed", /* WINED3DSIH_SUB */ "sub", /* WINED3DSIH_TEX */ "texld", /* WINED3DSIH_TEXBEM */ "texbem", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index cb3f18e..51110f8 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -190,6 +190,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, + WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -401,6 +402,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", ""}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", ""}, + {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "", "Uif"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d2970c4..229f6fd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -616,6 +616,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_SINCOS, WINED3DSIH_SLT, WINED3DSIH_SQRT, + WINED3DSIH_STORE_UAV_TYPED, WINED3DSIH_SUB, WINED3DSIH_TEX, WINED3DSIH_TEXBEM,

1 0

Józef Kucia : wined3d: Recognize SM 4.1 ld2dms opcode.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 463980431f4ddb9616261be94afd1b31bc4af8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=463980431f4ddb9616261be94… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 19:53:35 2016 +0100 wined3d: Recognize SM 4.1 ld2dms opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 99c21db..23219db 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5285,6 +5285,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LD */ NULL, + /* WINED3DSIH_LD2DMS */ NULL, /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LIT */ shader_hw_map2gl, /* WINED3DSIH_LOG */ shader_hw_scalar_op, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e6ef82a..79eec10 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8171,6 +8171,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, + /* WINED3DSIH_LD2DMS */ NULL, /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOG */ shader_glsl_scalar_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index db30868..f45fbb8 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -113,6 +113,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LD */ "ld", + /* WINED3DSIH_LD2DMS */ "ld2dms", /* WINED3DSIH_LD_STRUCTURED */ "ld_structured", /* WINED3DSIH_LIT */ "lit", /* WINED3DSIH_LOG */ "log", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 86c5b1b..6e1fe5d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -135,6 +135,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_ISHL = 0x29, WINED3D_SM4_OP_ITOF = 0x2b, WINED3D_SM4_OP_LD = 0x2d, + WINED3D_SM4_OP_LD2DMS = 0x2e, WINED3D_SM4_OP_LOG = 0x2f, WINED3D_SM4_OP_LOOP = 0x30, WINED3D_SM4_OP_LT = 0x31, @@ -341,6 +342,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_ISHL, WINED3DSIH_ISHL, "I", "II"}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "F", "I"}, {WINED3D_SM4_OP_LD, WINED3DSIH_LD, "U", "IR"}, + {WINED3D_SM4_OP_LD2DMS, WINED3DSIH_LD2DMS, "U", "IRI"}, {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, "F", "F"}, {WINED3D_SM4_OP_LOOP, WINED3DSIH_LOOP, "", ""}, {WINED3D_SM4_OP_LT, WINED3DSIH_LT, "U", "FF"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 242268d..bc301b7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -565,6 +565,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ITOF, WINED3DSIH_LABEL, WINED3DSIH_LD, + WINED3DSIH_LD2DMS, WINED3DSIH_LD_STRUCTURED, WINED3DSIH_LIT, WINED3DSIH_LOG,

1 0

Józef Kucia : d3dx9: Avoid '\n' in middle of TRACE() message.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: eb7fc363f8dec30dd40b4d7146310600571edc42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7fc363f8dec30dd40b4d714… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 14:26:26 2016 +0100 d3dx9: Avoid '\n' in middle of TRACE() message. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/volume.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 5a006ef..7dc61cf 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -240,14 +240,16 @@ HRESULT WINAPI D3DXLoadVolumeFromFileInMemory(IDirect3DVolume9 *dst_volume, D3DBOX box; D3DXIMAGE_INFO image_info; - TRACE("dst_volume %p, dst_palette %p, dst_box %p, src_data %p, src_data_size %u, src_box %p,\n", - dst_volume, dst_palette, dst_box, src_data, src_data_size, src_box); - TRACE("filter %#x, color_key %#x, src_info %p.\n", filter, color_key, src_info); + TRACE("dst_volume %p, dst_palette %p, dst_box %p, src_data %p, src_data_size %u, src_box %p, " + "filter %#x, color_key 0x%08x, src_info %p.\n", + dst_volume, dst_palette, dst_box, src_data, src_data_size, src_box, + filter, color_key, src_info); - if (!dst_volume || !src_data) return D3DERR_INVALIDCALL; + if (!dst_volume || !src_data) + return D3DERR_INVALIDCALL; - hr = D3DXGetImageInfoFromFileInMemory(src_data, src_data_size, &image_info); - if (FAILED(hr)) return hr; + if (FAILED(hr = D3DXGetImageInfoFromFileInMemory(src_data, src_data_size, &image_info))) + return hr; if (src_box) {

1 0

Nikolay Sivov : msxml3/mxwriter: Handle allocation failure in get_output() .
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 67efaac30f228aa924bff1642d9b32d83ecd734d URL: http://source.winehq.org/git/wine.git/?a=commit;h=67efaac30f228aa924bff1642… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 17:23:01 2016 +0300 msxml3/mxwriter: Handle allocation failure in get_output(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index d6f23e2..23a8fd1 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -944,7 +944,14 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) if (!dest) return E_POINTER; - if (!This->dest) + if (This->dest) + { + /* we only support IStream output so far */ + V_VT(dest) = VT_UNKNOWN; + V_UNKNOWN(dest) = (IUnknown*)This->dest; + IStream_AddRef(This->dest); + } + else { encoded_buffer *buff; char *dest_ptr; @@ -956,6 +963,8 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) V_VT(dest) = VT_BSTR; V_BSTR(dest) = SysAllocStringLen(NULL, This->buffer.utf16_total / sizeof(WCHAR)); + if (!V_BSTR(dest)) + return E_OUTOFMEMORY; dest_ptr = (char*)V_BSTR(dest); buff = &This->buffer.utf16; @@ -971,15 +980,8 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) memcpy(dest_ptr, buff->data, buff->written); dest_ptr += buff->written; } - - return S_OK; } - /* we only support IStream output so far */ - V_VT(dest) = VT_UNKNOWN; - V_UNKNOWN(dest) = (IUnknown*)This->dest; - IStream_AddRef(This->dest); - return S_OK; }

1 0

Nikolay Sivov : msxml3/mxwriter: No need to use contiguous allocation in case of BSTR output.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 8147f9001d03258deb9929dd838b98fdff03ad94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8147f9001d03258deb9929dd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 17:23:00 2016 +0300 msxml3/mxwriter: No need to use contiguous allocation in case of BSTR output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 114 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 106 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index cc6c0b5..d6f23e2 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -34,6 +34,7 @@ #include "msxml6.h" #include "wine/debug.h" +#include "wine/list.h" #include "msxml_private.h" @@ -121,6 +122,7 @@ typedef enum typedef struct { + struct list entry; char *data; unsigned int allocated; unsigned int written; @@ -131,6 +133,8 @@ typedef struct encoded_buffer utf16; encoded_buffer encoded; UINT code_page; + UINT utf16_total; /* total number of bytes written since last buffer reinitialization */ + struct list blocks; /* only used when output was not set, for BSTR case */ } output_buffer; typedef struct @@ -304,14 +308,25 @@ static HRESULT init_output_buffer(xml_encoding encoding, output_buffer *buffer) } else memset(&buffer->encoded, 0, sizeof(buffer->encoded)); + list_init(&buffer->blocks); + buffer->utf16_total = 0; return S_OK; } static void free_output_buffer(output_buffer *buffer) { + encoded_buffer *cur, *cur2; + free_encoded_buffer(&buffer->encoded); free_encoded_buffer(&buffer->utf16); + + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &buffer->blocks, encoded_buffer, entry) + { + list_remove(&cur->entry); + free_encoded_buffer(cur); + heap_free(cur); + } } static void grow_buffer(encoded_buffer *buffer, int length) @@ -331,6 +346,58 @@ static HRESULT write_output_buffer_mode(mxwriter *writer, output_mode mode, cons int length; char *ptr; + /* When writer has no output set we have to accumulate everything to return it later in a form of BSTR. + To achieve that: + + - fill a buffer already allocated as part of output buffer; + - when current buffer is full, allocate another one and switch to it; buffers themselves never grow, + but are linked together, with head pointing to first allocated buffer after initial one got filled; + - later during get_output() contents are concatenated by copying one after another to destination BSTR buffer, + that's returned to the client. */ + if (!writer->dest && (mode & (OutputBuffer_Native | OutputBuffer_Both))) + { + encoded_buffer *buff; + + /* select last used block */ + if (list_empty(&buffer->blocks)) + buff = &buffer->utf16; + else + buff = LIST_ENTRY(list_tail(&buffer->blocks), encoded_buffer, entry); + + length = (len == -1 ? strlenW(data) : len) * sizeof(WCHAR); + + while (length) + { + unsigned int avail = buff->allocated - buff->written; + unsigned int written = min(avail, length); + + if (avail) + { + memcpy(buff->data + buff->written, data, written); + buff->written += written; + buffer->utf16_total += written; + length -= written; + } + + /* alloc new block if needed and retry */ + if (length) + { + encoded_buffer *next = heap_alloc(sizeof(*next)); + HRESULT hr; + + if (FAILED(hr = init_encoded_buffer(next))) { + heap_free(next); + return hr; + } + + list_add_tail(&buffer->blocks, &next->entry); + buff = next; + } + } + + return S_OK; + } + if (mode & (OutputBuffer_Encoded | OutputBuffer_Both)) { if (buffer->code_page != ~0) { @@ -378,13 +445,25 @@ static HRESULT write_output_buffer_quoted(mxwriter *writer, const WCHAR *data, i } /* frees buffer data, reallocates with a default lengths */ -static void close_output_buffer(mxwriter *This) +static void close_output_buffer(mxwriter *writer) { - heap_free(This->buffer.utf16.data); - heap_free(This->buffer.encoded.data); - init_encoded_buffer(&This->buffer.utf16); - init_encoded_buffer(&This->buffer.encoded); - get_code_page(This->xml_enc, &This->buffer.code_page); + encoded_buffer *cur, *cur2; + + heap_free(writer->buffer.utf16.data); + heap_free(writer->buffer.encoded.data); + + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &writer->buffer.blocks, encoded_buffer, entry) + { + list_remove(&cur->entry); + free_encoded_buffer(cur); + heap_free(cur); + } + + init_encoded_buffer(&writer->buffer.utf16); + init_encoded_buffer(&writer->buffer.encoded); + get_code_page(writer->xml_enc, &writer->buffer.code_page); + writer->buffer.utf16_total = 0; + list_init(&writer->buffer.blocks); } /* Escapes special characters like: @@ -867,12 +946,31 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) if (!This->dest) { - HRESULT hr = flush_output_buffer(This); + encoded_buffer *buff; + char *dest_ptr; + HRESULT hr; + + hr = flush_output_buffer(This); if (FAILED(hr)) return hr; V_VT(dest) = VT_BSTR; - V_BSTR(dest) = SysAllocString((WCHAR*)This->buffer.utf16.data); + V_BSTR(dest) = SysAllocStringLen(NULL, This->buffer.utf16_total / sizeof(WCHAR)); + + dest_ptr = (char*)V_BSTR(dest); + buff = &This->buffer.utf16; + + if (buff->written) + { + memcpy(dest_ptr, buff->data, buff->written); + dest_ptr += buff->written; + } + + LIST_FOR_EACH_ENTRY(buff, &This->buffer.blocks, encoded_buffer, entry) + { + memcpy(dest_ptr, buff->data, buff->written); + dest_ptr += buff->written; + } return S_OK; }

1 0

Nikolay Sivov : include: Added IDXGISurface1 definition.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 912cd6c4b6aa7c03d578d08e074d8475abb7fb7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=912cd6c4b6aa7c03d578d08e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 11:40:11 2016 +0300 include: Added IDXGISurface1 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/dxgi.idl b/include/dxgi.idl index cc98970..c7ba584 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -227,6 +227,22 @@ interface IDXGISurface : IDXGIDeviceSubObject [ object, local, + uuid(4ae63092-6327-4c1b-80ae-bfe12ea32b86) +] +interface IDXGISurface1 : IDXGISurface +{ + HRESULT GetDC( + [in] BOOL discard, + [out] HDC *hdc + ); + HRESULT ReleaseDC( + [in] RECT *dirty_rect + ); +} + +[ + object, + local, uuid(ae02eedb-c735-4690-8d52-5a8dc20213aa) ] interface IDXGIOutput : IDXGIObject

1 0