September 2011 - Wine-commits

Andrew Talbot : comdlg32: Add a break statement to mark a semantic separation.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 1e59ecf25433fbdb9edaa2cec1728d5dcfb4e28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e59ecf25433fbdb9edaa2cec… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 24 16:28:28 2011 +0100 comdlg32: Add a break statement to mark a semantic separation. --- dlls/comdlg32/itemdlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index bc309c9..9e90276 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -647,6 +647,7 @@ static void customctrl_resize(FileDialogImpl *This, customctrl *ctrl) GetWindowRect(ctrl->hwnd, &rc); SetWindowPos(ctrl->wrapper_hwnd, NULL, 0, 0, rc.right-rc.left, rc.bottom-rc.top, SWP_NOZORDER|SWP_NOMOVE|SWP_NOZORDER); + break; case IDLG_CCTRL_RADIOBUTTONLIST: case IDLG_CCTRL_EDITBOX: case IDLG_CCTRL_SEPARATOR:

1 0

Andrew Talbot : d3d10: Mark a fall-through in a switch statement.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: f9b424e919cc2e1ff96f6bd8b556dbf0ff210167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b424e919cc2e1ff96f6bd8b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 24 16:28:32 2011 +0100 d3d10: Mark a fall-through in a switch statement. --- dlls/d3d10/d3d10_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 9076b0a..af792d4 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -84,6 +84,7 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver case D3D10_DRIVER_TYPE_NULL: FIXME("NULL device not implemented, falling back to refrast\n"); + /* fall through, for now */ case D3D10_DRIVER_TYPE_REFERENCE: { HMODULE refrast = LoadLibraryA("d3d10ref.dll");

1 0

Andrew Talbot : d3dcompiler_43: Mark fall-throughs in switch statement.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 5c7ba2c330deb395a0aaa9c510809d70450d2dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7ba2c330deb395a0aaa9c51… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 24 16:28:35 2011 +0100 d3dcompiler_43: Mark fall-throughs in switch statement. --- dlls/d3dcompiler_43/asmparser.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/asmparser.c b/dlls/d3dcompiler_43/asmparser.c index ee4ba18..4d71237 100644 --- a/dlls/d3dcompiler_43/asmparser.c +++ b/dlls/d3dcompiler_43/asmparser.c @@ -1327,12 +1327,19 @@ static void gen_oldvs_output(struct bwriter_shader *shader) { static void gen_oldps_input(struct bwriter_shader *shader, DWORD texcoords) { switch(texcoords) { case 8: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 7, 0, FALSE, T7_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); + /* fall through */ case 7: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 6, 0, FALSE, T6_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); + /* fall through */ case 6: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 5, 0, FALSE, T5_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); + /* fall through */ case 5: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 4, 0, FALSE, T4_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); + /* fall through */ case 4: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 3, 0, FALSE, T3_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); + /* fall through */ case 3: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 2, 0, FALSE, T2_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); + /* fall through */ case 2: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 1, 0, FALSE, T1_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); + /* fall through */ case 1: record_declaration(shader, BWRITERDECLUSAGE_TEXCOORD, 0, 0, FALSE, T0_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE); }; record_declaration(shader, BWRITERDECLUSAGE_COLOR, 0, 0, FALSE, C0_VARYING, BWRITERSP_WRITEMASK_ALL, TRUE);

1 0

Andrew Talbot : ddeml.dll16: Move break outside of if statement.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 150a3308b9f397f20b496789e6d453b106292266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=150a3308b9f397f20b496789e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 24 16:28:39 2011 +0100 ddeml.dll16: Move break outside of if statement. --- dlls/ddeml.dll16/ddeml.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ddeml.dll16/ddeml.c b/dlls/ddeml.dll16/ddeml.c index 90362ca..94c947b 100644 --- a/dlls/ddeml.dll16/ddeml.c +++ b/dlls/ddeml.dll16/ddeml.c @@ -113,7 +113,6 @@ static HDDEDATA CALLBACK WDML_InvokeCallback16(DWORD pfn16, UINT uType, UINT uFm map3216_conv_context(&cc16, (const CONVCONTEXT*)dwData1); d1 = MapLS(&cc16); } - else break; default: d1 = dwData1;

1 0

André Hentschel : d3d9/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 3c9aa222896c070c72a77b58378f96d5e92c55a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9aa222896c070c72a77b583… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 25 20:30:36 2011 +0200 d3d9/tests: Don't test function directly when reporting GetLastError(). --- dlls/d3d9/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 482f5d4..bf15792 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2858,6 +2858,7 @@ static void test_reset_fullscreen(void) WNDCLASSEX wc = {0}; IDirect3DDevice9 *device = NULL; IDirect3D9 *d3d = NULL; + ATOM atom; static const struct message messages[] = { {WM_ACTIVATEAPP, FOCUS_WINDOW}, @@ -2872,7 +2873,8 @@ static void test_reset_fullscreen(void) wc.lpfnWndProc = test_proc; wc.lpszClassName = "test_reset_fullscreen"; - ok(RegisterClassEx(&wc), "Failed to register a new window class. GetLastError:%d\n", GetLastError()); + atom = RegisterClassEx(&wc); + ok(atom, "Failed to register a new window class. GetLastError:%d\n", GetLastError()); device_window = focus_window = CreateWindowEx(0, wc.lpszClassName, "Test Reset Fullscreen", 0, 0, 0, screen_width, screen_height, NULL, NULL, NULL, NULL); ok(device_window != NULL, "Failed to create a window. GetLastError:%d\n", GetLastError());

1 0

Alexandre Julliard : winex11: Avoid recomputing the DC format when it hasn' t changed.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: f3f315ed6153692e87b8f9efae402589ee5204c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3f315ed6153692e87b8f9efa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 15:25:35 2011 +0200 winex11: Avoid recomputing the DC format when it hasn't changed. --- dlls/winex11.drv/xrender.c | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index c8322ce..65e56c2 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -104,7 +104,7 @@ static const WineXRenderFormatTemplate wxr_formats_template[WXR_NB_FORMATS] = /* WXR_FORMAT_B8G8R8X8 */ { 32, 0, 0, 8, 0xff, 16, 0xff, 24, 0xff }, }; -static enum wxr_format default_format; +static enum wxr_format default_format = WXR_INVALID_FORMAT; static XRenderPictFormat *pict_formats[WXR_NB_FORMATS + 1 /* invalid format */]; typedef struct @@ -487,7 +487,7 @@ static enum wxr_format get_xrender_format_from_color_shifts(int depth, ColorShif } /* This should not happen because when we reach 'shifts' must have been set and we only allows shifts which are backed by X */ - ERR("No XRender format found!\n"); + ERR("No XRender format found for %u %08x/%08x/%08x\n", depth, redMask, greenMask, blueMask); return WXR_INVALID_FORMAT; } @@ -639,14 +639,6 @@ static void free_xrender_picture( struct xrender_physdev *dev ) } wine_tsx11_unlock(); } - dev->pict_format = NULL; -} - -static void update_xrender_drawable( struct xrender_physdev *dev ) -{ - free_xrender_picture( dev ); - dev->format = get_xrender_format_from_color_shifts( dev->x11dev->depth, dev->x11dev->color_shifts ); - dev->pict_format = pict_formats[dev->format]; } /* return a mask picture used to force alpha to 0 */ @@ -1127,7 +1119,7 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) return 0; } -static BOOL create_xrender_dc( PHYSDEV *pdev ) +static BOOL create_xrender_dc( PHYSDEV *pdev, enum wxr_format format ) { X11DRV_PDEVICE *x11dev = get_x11drv_dev( *pdev ); struct xrender_physdev *physdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physdev) ); @@ -1135,8 +1127,8 @@ static BOOL create_xrender_dc( PHYSDEV *pdev ) if (!physdev) return FALSE; physdev->x11dev = x11dev; physdev->cache_index = -1; - physdev->format = get_xrender_format_from_color_shifts( x11dev->depth, x11dev->color_shifts ); - physdev->pict_format = pict_formats[physdev->format]; + physdev->format = format; + physdev->pict_format = pict_formats[format]; push_dc_driver( pdev, &physdev->dev, &xrender_funcs ); return TRUE; } @@ -1176,7 +1168,7 @@ static void set_color_info( XRenderPictFormat *format, BITMAPINFO *info ) static BOOL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW* initData ) { - return create_xrender_dc( pdev ); + return create_xrender_dc( pdev, default_format ); } /********************************************************************** @@ -1191,7 +1183,7 @@ static BOOL xrenderdrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) } /* otherwise we have been called by x11drv */ - return create_xrender_dc( pdev ); + return create_xrender_dc( pdev, WXR_FORMAT_MONO ); } /********************************************************************** @@ -1226,7 +1218,7 @@ static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID if (*(const enum x11drv_escape_codes *)in_data == X11DRV_SET_DRAWABLE) { BOOL ret = dev->funcs->pExtEscape( dev, escape, in_count, in_data, out_count, out_data ); - if (ret) update_xrender_drawable( physdev ); + if (ret) free_xrender_picture( physdev ); /* pict format doesn't change, only drawable */ return ret; } } @@ -1285,7 +1277,13 @@ static HBITMAP xrenderdrv_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) dev = GET_NEXT_PHYSDEV( dev, pSelectBitmap ); ret = dev->funcs->pSelectBitmap( dev, hbitmap ); - if (ret) update_xrender_drawable( physdev ); + if (ret) + { + free_xrender_picture( physdev ); + physdev->format = get_xrender_format_from_color_shifts( physdev->x11dev->depth, + physdev->x11dev->color_shifts ); + physdev->pict_format = pict_formats[physdev->format]; + } return ret; }

1 0

Alexandre Julliard : winex11: Remove redundant pixmap prefix in X_PHYSBITMAP field names.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 46f1d2a48af04eefc700dcb7b262601fa271ed9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f1d2a48af04eefc700dcb7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 15:29:28 2011 +0200 winex11: Remove redundant pixmap prefix in X_PHYSBITMAP field names. --- dlls/winex11.drv/bitblt.c | 8 ++++---- dlls/winex11.drv/bitmap.c | 14 +++++++------- dlls/winex11.drv/brush.c | 4 ++-- dlls/winex11.drv/dib.c | 22 +++++++++++----------- dlls/winex11.drv/opengl.c | 2 +- dlls/winex11.drv/x11drv.h | 4 ++-- dlls/winex11.drv/xrender.c | 15 +++++++-------- 7 files changed, 34 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46f1d2a48af04eefc700d…

1 0

Alexandre Julliard : winex11: Pre-compute the color shifts for the supported XRender formats.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: f5307025fc0cb82da8fa4cbbd843b09b5edbf414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5307025fc0cb82da8fa4cbbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 16:56:55 2011 +0200 winex11: Pre-compute the color shifts for the supported XRender formats. --- dlls/winex11.drv/x11drv.h | 4 ++-- dlls/winex11.drv/xrender.c | 37 ++++++++++++++++++++++++------------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3a381cf..98b1ab1 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -108,8 +108,8 @@ typedef struct { typedef struct { - ChannelShift physicalRed, physicalBlue, physicalGreen; - ChannelShift logicalRed, logicalBlue, logicalGreen; + ChannelShift physicalRed, physicalGreen, physicalBlue; + ChannelShift logicalRed, logicalGreen, logicalBlue; } ColorShifts; /* X physical bitmap */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 2dee204..a51543b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -104,6 +104,23 @@ static const WineXRenderFormatTemplate wxr_formats_template[WXR_NB_FORMATS] = /* WXR_FORMAT_B8G8R8X8 */ { 32, 0, 0, 8, 0xff, 16, 0xff, 24, 0xff }, }; +static const ColorShifts wxr_color_shifts[WXR_NB_FORMATS] = +{ + /* format phys red phys green phys blue log red log green log blue */ +/* WXR_FORMAT_MONO */ { { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 } }, +/* WXR_FORMAT_GRAY */ { { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 } }, +/* WXR_FORMAT_X1R5G5B5 */ { {10,5,31}, { 5,5,31}, { 0,5,31}, {10,5,31}, { 5,5,31}, { 0,5,31} }, +/* WXR_FORMAT_X1B5G5R5 */ { { 0,5,31}, { 5,5,31}, {10,5,31}, { 0,5,31}, { 5,5,31}, {10,5,31} }, +/* WXR_FORMAT_R5G6B5 */ { {11,5,31}, { 5,6,63}, { 0,5,31}, {11,5,31}, { 5,6,63}, { 0,5,31} }, +/* WXR_FORMAT_B5G6R5 */ { { 0,5,31}, { 5,6,63}, {11,5,31}, { 0,5,31}, { 5,6,63}, {11,5,31} }, +/* WXR_FORMAT_R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, +/* WXR_FORMAT_B8G8R8 */ { { 0,8,255}, { 8,8,255}, {16,8,255}, { 0,8,255}, { 8,8,255}, {16,8,255} }, +/* WXR_FORMAT_A8R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, +/* WXR_FORMAT_B8G8R8A8 */ { { 8,8,255}, {16,8,255}, {24,8,255}, { 8,8,255}, {16,8,255}, {24,8,255} }, +/* WXR_FORMAT_X8R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, +/* WXR_FORMAT_B8G8R8X8 */ { { 8,8,255}, {16,8,255}, {24,8,255}, { 8,8,255}, {16,8,255}, {24,8,255} }, +}; + static enum wxr_format default_format = WXR_INVALID_FORMAT; static XRenderPictFormat *pict_formats[WXR_NB_FORMATS + 1 /* invalid format */]; @@ -1230,8 +1247,7 @@ static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID */ static BOOL xrenderdrv_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) { - XRenderPictFormat *pict_format = NULL; - ColorShifts shifts; + enum wxr_format format = WXR_INVALID_FORMAT; BITMAP bitmap; if (!GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return FALSE; @@ -1240,20 +1256,15 @@ static BOOL xrenderdrv_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) { switch (bitmap.bmBitsPixel) { - case 16: pict_format = pict_formats[WXR_FORMAT_R5G6B5]; break; - case 24: pict_format = pict_formats[WXR_FORMAT_R8G8B8]; break; - case 32: pict_format = pict_formats[WXR_FORMAT_A8R8G8B8]; break; + case 16: format = WXR_FORMAT_R5G6B5; break; + case 24: format = WXR_FORMAT_R8G8B8; break; + case 32: format = WXR_FORMAT_A8R8G8B8; break; } } - if (pict_format) - { - X11DRV_PALETTE_ComputeColorShifts( &shifts, - pict_format->direct.redMask << pict_format->direct.red, - pict_format->direct.greenMask << pict_format->direct.green, - pict_format->direct.blueMask << pict_format->direct.blue ); - return X11DRV_create_phys_bitmap( hbitmap, &bitmap, pict_format->depth, TRUE, &shifts ); - } + if (pict_formats[format]) + return X11DRV_create_phys_bitmap( hbitmap, &bitmap, pict_formats[format]->depth, + TRUE, &wxr_color_shifts[format] ); dev = GET_NEXT_PHYSDEV( dev, pCreateBitmap ); return dev->funcs->pCreateBitmap( dev, hbitmap );

1 0

Matteo Bruni : wined3d: When creating a new shader, check shader type and version.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 2a146448f40686ff75f808557b15e95ff646601a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a146448f40686ff75f808557… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 23 17:03:19 2011 +0200 wined3d: When creating a new shader, check shader type and version. --- dlls/d3d10core/shader.c | 6 +++--- dlls/d3d8/shader.c | 4 ++-- dlls/d3d9/shader.c | 4 ++-- dlls/wined3d/shader.c | 41 ++++++++++++++++++++++++++++------------- include/wine/wined3d.h | 6 +++--- 5 files changed, 38 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a146448f40686ff75f80…

1 0

Matteo Bruni : d3d10core: Fixup HRESULT in a bunch of error cases.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: d9c9b5c365daac4ad33d77da89eb7f10be03914e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c9b5c365daac4ad33d77da8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 23 17:03:20 2011 +0200 d3d10core: Fixup HRESULT in a bunch of error cases. --- dlls/d3d10core/shader.c | 7 +++++-- dlls/d3d10core/utils.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 357cda3..82ddadc 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -57,7 +57,7 @@ static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, st memset(shader_info->output_signature, 0, sizeof(*shader_info->output_signature)); hr = parse_dxbc(dxbc, dxbc_length, shdr_handler, shader_info); - if (!shader_info->shader_code) hr = E_FAIL; + if (!shader_info->shader_code) hr = E_INVALIDARG; if (FAILED(hr)) { @@ -267,6 +267,7 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 { WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); shader_free_signature(&shader->output_signature); + hr = E_INVALIDARG; return hr; } @@ -411,8 +412,9 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct &shader->output_signature, shader, &d3d10_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader, 4); if (FAILED(hr)) { - WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); + WARN("Failed to create wined3d geometry shader, hr %#x.\n", hr); shader_free_signature(&shader->output_signature); + hr = E_INVALIDARG; return hr; } @@ -553,6 +555,7 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ { WARN("Failed to create wined3d pixel shader, hr %#x.\n", hr); shader_free_signature(&shader->output_signature); + hr = E_INVALIDARG; return hr; } diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index 97c0347..813cae6 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -374,7 +374,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, if (tag != TAG_DXBC) { WARN("Wrong tag.\n"); - return E_FAIL; + return E_INVALIDARG; } /* checksum? */

1 0