October 2010 - Wine-Commits

Rico Schüller : d3dcompiler: Implement D3DGetInputAndOutputSignatureBlob().
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 4467901e310267399a476206cf0bc43fef2ec70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4467901e310267399a476206c… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 3 15:12:12 2010 +0200 d3dcompiler: Implement D3DGetInputAndOutputSignatureBlob(). --- dlls/d3dcompiler_43/blob.c | 8 ++++++++ dlls/d3dcompiler_43/d3dcompiler_43.spec | 2 +- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 7 +++++++ include/d3dcompiler.h | 1 + 4 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index b7b4724..ca13f4b 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -133,6 +133,10 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) if (tag == TAG_OSGN) add = TRUE; break; + case D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB: + if (tag == TAG_ISGN || tag == TAG_OSGN) add = TRUE; + break; + default: FIXME("Unhandled D3D_BLOB_PART %s.\n", debug_d3dcompiler_d3d_blob_part(part)); break; @@ -203,6 +207,10 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P if (count != 1) count = 0; break; + case D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB: + if (count != 2) count = 0; + break; + default: FIXME("Unhandled D3D_BLOB_PART %s.\n", debug_d3dcompiler_d3d_blob_part(part)); break; diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index 8f7b6db..e605e29 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -8,7 +8,7 @@ @ stub D3DDisassemble @ stdcall D3DGetBlobPart(ptr long long long ptr) @ stub D3DGetDebugInfo -@ stub D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) @ stdcall D3DGetInputSignatureBlob(ptr long ptr) @ stdcall D3DGetOutputSignatureBlob(ptr long ptr) @ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index bc4cac0..d199244 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -102,3 +102,10 @@ HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3 return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_OUTPUT_SIGNATURE_BLOB, 0, blob); } + +HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + + return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, blob); +} diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 08c3d01..9079920 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -64,6 +64,7 @@ typedef enum D3D_BLOB_PART HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); +HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob);

1 0

Rico Schüller : d3dcompiler: Implement D3DGetOutputSignatureBlob().
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 164dcc79738b60061a6565521f0b6eb797ec99fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=164dcc79738b60061a6565521… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 3 15:12:06 2010 +0200 d3dcompiler: Implement D3DGetOutputSignatureBlob(). --- dlls/d3dcompiler_43/blob.c | 5 +++++ dlls/d3dcompiler_43/d3dcompiler_43.spec | 2 +- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 7 +++++++ dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + include/d3dcompiler.h | 1 + 5 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index d674090..b7b4724 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -129,6 +129,10 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) if (tag == TAG_ISGN) add = TRUE; break; + case D3D_BLOB_OUTPUT_SIGNATURE_BLOB: + if (tag == TAG_OSGN) add = TRUE; + break; + default: FIXME("Unhandled D3D_BLOB_PART %s.\n", debug_d3dcompiler_d3d_blob_part(part)); break; @@ -195,6 +199,7 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P switch(part) { case D3D_BLOB_INPUT_SIGNATURE_BLOB: + case D3D_BLOB_OUTPUT_SIGNATURE_BLOB: if (count != 1) count = 0; break; diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index 41f1049..8f7b6db 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -10,7 +10,7 @@ @ stub D3DGetDebugInfo @ stub D3DGetInputAndOutputSignatureBlob @ stdcall D3DGetInputSignatureBlob(ptr long ptr) -@ stub D3DGetOutputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) @ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) @ stub D3DReflect @ stub D3DReturnFailure1 diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index 88af168..bc4cac0 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -95,3 +95,10 @@ HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3D return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, blob); } + +HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + + return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_OUTPUT_SIGNATURE_BLOB, 0, blob); +} diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index eb7674f..41c4f5a 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -582,6 +582,7 @@ void SlDeleteShader(struct bwriter_shader *shader); ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') +#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') struct dxbc_section { diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 0dfe9ff..08c3d01 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -63,6 +63,7 @@ typedef enum D3D_BLOB_PART HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); +HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob);

1 0

Rico Schüller : d3dcompiler: Implement D3DGetInputSignatureBlob().
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 5946201d19b0c589f16874a4ab5b384a5d42eccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5946201d19b0c589f16874a4a… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 3 15:12:00 2010 +0200 d3dcompiler: Implement D3DGetInputSignatureBlob(). --- dlls/d3dcompiler_43/blob.c | 67 +++++++++++++++++++++++++++++ dlls/d3dcompiler_43/d3dcompiler_43.spec | 2 +- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 7 +++ dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + include/d3dcompiler.h | 1 + 5 files changed, 77 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index b22a3c6..d674090 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -119,10 +119,31 @@ HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) return S_OK; } +static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) +{ + BOOL add = FALSE; + + switch(part) + { + case D3D_BLOB_INPUT_SIGNATURE_BLOB: + if (tag == TAG_ISGN) add = TRUE; + break; + + default: + FIXME("Unhandled D3D_BLOB_PART %s.\n", debug_d3dcompiler_d3d_blob_part(part)); + break; + } + + TRACE("%s tag %s\n", add ? "Add" : "Skip", debugstr_an((const char *)&tag, 4)); + + return add; +} + HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) { struct dxbc src_dxbc, dst_dxbc; HRESULT hr; + unsigned int i, count; if (!data || !data_size || flags || !blob) { @@ -144,6 +165,52 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P return hr; } + hr = dxbc_init(&dst_dxbc, 0); + if (FAILED(hr)) + { + dxbc_destroy(&src_dxbc); + WARN("Failed to init dxbc\n"); + return hr; + } + + for (i = 0; i < src_dxbc.count; ++i) + { + struct dxbc_section *section = &src_dxbc.sections[i]; + + if (check_blob_part(section->tag, part)) + { + hr = dxbc_add_section(&dst_dxbc, section->tag, section->data, section->data_size); + if (FAILED(hr)) + { + dxbc_destroy(&src_dxbc); + dxbc_destroy(&dst_dxbc); + WARN("Failed to add section to dxbc\n"); + return hr; + } + } + } + + count = dst_dxbc.count; + + switch(part) + { + case D3D_BLOB_INPUT_SIGNATURE_BLOB: + if (count != 1) count = 0; + break; + + default: + FIXME("Unhandled D3D_BLOB_PART %s.\n", debug_d3dcompiler_d3d_blob_part(part)); + break; + } + + if (count == 0) + { + dxbc_destroy(&src_dxbc); + dxbc_destroy(&dst_dxbc); + WARN("Nothing to write into the blob (count = 0)\n"); + return E_FAIL; + } + hr = dxbc_write_blob(&dst_dxbc, blob); if (FAILED(hr)) { diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index a54ddfb..41f1049 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -9,7 +9,7 @@ @ stdcall D3DGetBlobPart(ptr long long long ptr) @ stub D3DGetDebugInfo @ stub D3DGetInputAndOutputSignatureBlob -@ stub D3DGetInputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) @ stub D3DGetOutputSignatureBlob @ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) @ stub D3DReflect diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index 5943842..88af168 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -88,3 +88,10 @@ HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART return d3dcompiler_get_blob_part(data, data_size, part, flags, blob); } + +HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + + return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, blob); +} diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5787ab2..eb7674f 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -581,6 +581,7 @@ void SlDeleteShader(struct bwriter_shader *shader); ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') +#define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') struct dxbc_section { diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 6e039b5..0dfe9ff 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -62,6 +62,7 @@ typedef enum D3D_BLOB_PART } D3D_BLOB_PART; HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); +HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob);

1 0

Alexandre Julliard : server: Valid rects are in parent coordinates.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: fcd685977d706254163d3dd55b3584e42cc67912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd685977d706254163d3dd55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 14:43:29 2010 +0200 server: Valid rects are in parent coordinates. --- server/protocol.def | 2 +- server/window.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/protocol.def b/server/protocol.def index 21cae9c..321a933 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2336,7 +2336,7 @@ enum message_type user_handle_t previous; /* previous window in Z order */ rectangle_t window; /* window rectangle (in parent coords) */ rectangle_t client; /* client rectangle (in parent coords) */ - VARARG(valid,rectangles); /* valid rectangles from WM_NCCALCSIZE (in client coords) */ + VARARG(valid,rectangles); /* valid rectangles from WM_NCCALCSIZE (in parent coords) */ @REPLY unsigned int new_style; /* new window style */ unsigned int new_ex_style; /* new window extended style */ diff --git a/server/window.c b/server/window.c index c8c075f..503f37e 100644 --- a/server/window.c +++ b/server/window.c @@ -2137,10 +2137,10 @@ DECL_HANDLER(set_window_pos) { rectangle_t valid_rects[2]; memcpy( valid_rects, (const rectangle_t *)get_req_data() + 1, 2 * sizeof(rectangle_t) ); - if (win->ex_style & WS_EX_LAYOUTRTL) + if (win->parent && win->parent->ex_style & WS_EX_LAYOUTRTL) { - mirror_rect( &win->client_rect, &valid_rects[0] ); - mirror_rect( &win->client_rect, &valid_rects[1] ); + mirror_rect( &win->parent->client_rect, &valid_rects[0] ); + mirror_rect( &win->parent->client_rect, &valid_rects[1] ); } set_window_pos( win, previous, flags, &window_rect, &client_rect, &visible_rect, valid_rects ); }

1 0

Henri Verbeet : wined3d: Recognize the SM4 and opcode.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 1330f844f89b0b6a6c5dd98719788c94ee5fdb8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1330f844f89b0b6a6c5dd9871… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 7 12:17:57 2010 +0200 wined3d: Recognize the SM4 and opcode. --- 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(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index dec7a10..52b055b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4933,6 +4933,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL { /* WINED3DSIH_ABS */ shader_hw_map2gl, /* WINED3DSIH_ADD */ shader_hw_map2gl, + /* WINED3DSIH_AND */ NULL, /* WINED3DSIH_BEM */ pshader_hw_bem, /* WINED3DSIH_BREAK */ shader_hw_break, /* WINED3DSIH_BREAKC */ shader_hw_breakc, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b71a17e..fb6e2cb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4991,6 +4991,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB { /* WINED3DSIH_ABS */ shader_glsl_map2gl, /* WINED3DSIH_ADD */ shader_glsl_arith, + /* WINED3DSIH_AND */ NULL, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 323f010..ebb7d5c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -37,6 +37,7 @@ static const char * const shader_opcode_names[] = { /* WINED3DSIH_ABS */ "abs", /* WINED3DSIH_ADD */ "add", + /* WINED3DSIH_AND */ "and", /* WINED3DSIH_BEM */ "bem", /* WINED3DSIH_BREAK */ "break", /* WINED3DSIH_BREAKC */ "breakc", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 3ba10bf..fc2ba62 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -49,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); enum wined3d_sm4_opcode { WINED3D_SM4_OP_ADD = 0x00, + WINED3D_SM4_OP_AND = 0x01, WINED3D_SM4_OP_BREAK = 0x02, WINED3D_SM4_OP_BREAKC = 0x03, WINED3D_SM4_OP_CUT = 0x09, @@ -113,6 +114,7 @@ struct sysval_map static const struct wined3d_sm4_opcode_info opcode_table[] = { {WINED3D_SM4_OP_ADD, WINED3DSIH_ADD, 1, 2}, + {WINED3D_SM4_OP_AND, WINED3DSIH_AND, 1, 2}, {WINED3D_SM4_OP_BREAK, WINED3DSIH_BREAK, 0, 0}, {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, 0, 1}, {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, 0, 0}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dc5d144..47d8b8b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -404,6 +404,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER { WINED3DSIH_ABS, WINED3DSIH_ADD, + WINED3DSIH_AND, WINED3DSIH_BEM, WINED3DSIH_BREAK, WINED3DSIH_BREAKC,

1 0

Henri Verbeet : wined3d: Recognize the SM4 frc opcode.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 2eb5df30399c14d1201393b940700c8570805088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eb5df30399c14d1201393b94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 7 12:17:58 2010 +0200 wined3d: Recognize the SM4 frc opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index fc2ba62..c267c12 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -59,6 +59,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_ENDIF = 0x15, WINED3D_SM4_OP_ENDLOOP = 0x16, WINED3D_SM4_OP_EXP = 0x19, + WINED3D_SM4_OP_FRC = 0x1a, WINED3D_SM4_OP_IADD = 0x1e, WINED3D_SM4_OP_IF = 0x1f, WINED3D_SM4_OP_IGE = 0x21, @@ -124,6 +125,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_ENDIF, WINED3DSIH_ENDIF, 0, 0}, {WINED3D_SM4_OP_ENDLOOP,WINED3DSIH_ENDLOOP, 0, 0}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, + {WINED3D_SM4_OP_FRC, WINED3DSIH_FRC, 1, 1}, {WINED3D_SM4_OP_IADD, WINED3DSIH_IADD, 1, 2}, {WINED3D_SM4_OP_IF, WINED3DSIH_IF, 0, 1}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, 1, 2},

1 0

Henri Verbeet : wined3d: Recognize the SM4 mad opcode.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: f78542c34c5eccc78fdcef7ba6dcfee9e69e6fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78542c34c5eccc78fdcef7ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 7 12:17:59 2010 +0200 wined3d: Recognize the SM4 mad opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c267c12..77af90c 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -66,6 +66,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_LOG = 0x2f, WINED3D_SM4_OP_LOOP = 0x30, WINED3D_SM4_OP_LT = 0x31, + WINED3D_SM4_OP_MAD = 0x32, WINED3D_SM4_OP_MIN = 0x33, WINED3D_SM4_OP_MAX = 0x34, WINED3D_SM4_OP_MOV = 0x36, @@ -132,6 +133,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, 1, 1}, {WINED3D_SM4_OP_LOOP, WINED3DSIH_LOOP, 0, 0}, {WINED3D_SM4_OP_LT, WINED3DSIH_LT, 1, 2}, + {WINED3D_SM4_OP_MAD, WINED3DSIH_MAD, 1, 3}, {WINED3D_SM4_OP_MIN, WINED3DSIH_MIN, 1, 2}, {WINED3D_SM4_OP_MAX, WINED3DSIH_MAX, 1, 2}, {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1},

1 0

Henri Verbeet : wined3d: Recognize the SM4 movc opcode.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 512e6cec2c892ab34179f7720ed2092d47034e1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=512e6cec2c892ab34179f7720… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 7 12:18:00 2010 +0200 wined3d: Recognize the SM4 movc opcode. --- 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(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 52b055b..7c10407 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4983,6 +4983,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_MIN */ shader_hw_map2gl, /* WINED3DSIH_MOV */ shader_hw_mov, /* WINED3DSIH_MOVA */ shader_hw_mov, + /* WINED3DSIH_MOVC */ NULL, /* WINED3DSIH_MUL */ shader_hw_map2gl, /* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NRM */ shader_hw_nrm, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fb6e2cb..d24260d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5041,6 +5041,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_MIN */ shader_glsl_map2gl, /* WINED3DSIH_MOV */ shader_glsl_mov, /* WINED3DSIH_MOVA */ shader_glsl_mov, + /* WINED3DSIH_MOVC */ NULL, /* WINED3DSIH_MUL */ shader_glsl_arith, /* WINED3DSIH_NOP */ NULL, /* WINED3DSIH_NRM */ shader_glsl_nrm, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ebb7d5c..854c4ad 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -87,6 +87,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_MIN */ "min", /* WINED3DSIH_MOV */ "mov", /* WINED3DSIH_MOVA */ "mova", + /* WINED3DSIH_MOVC */ "movc", /* WINED3DSIH_MUL */ "mul", /* WINED3DSIH_NOP */ "nop", /* WINED3DSIH_NRM */ "nrm", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 77af90c..0b9d6fd 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -70,6 +70,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_MIN = 0x33, WINED3D_SM4_OP_MAX = 0x34, WINED3D_SM4_OP_MOV = 0x36, + WINED3D_SM4_OP_MOVC = 0x37, WINED3D_SM4_OP_MUL = 0x38, WINED3D_SM4_OP_RET = 0x3e, WINED3D_SM4_OP_RSQ = 0x44, @@ -137,6 +138,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MIN, WINED3DSIH_MIN, 1, 2}, {WINED3D_SM4_OP_MAX, WINED3DSIH_MAX, 1, 2}, {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, + {WINED3D_SM4_OP_MOVC, WINED3DSIH_MOVC, 1, 3}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, 0, 0}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, 1, 1}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 47d8b8b..36b7337 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -454,6 +454,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_MIN, WINED3DSIH_MOV, WINED3DSIH_MOVA, + WINED3DSIH_MOVC, WINED3DSIH_MUL, WINED3DSIH_NOP, WINED3DSIH_NRM,

1 0

Alexandre Julliard : winex11: Mirror the client rectangle if necessary for update_window_zorder.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: d39d2da06534abca9be3464675858a24137603ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d39d2da06534abca9be346467… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 14:26:21 2010 +0200 winex11: Mirror the client rectangle if necessary for update_window_zorder. --- dlls/winex11.drv/event.c | 3 +++ dlls/winex11.drv/mouse.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a1e0d7f..9fbb002 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -744,6 +744,9 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) if (event->window != root_window) { + if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) + mirror_rect( &data->client_rect, &rect ); + SERVER_START_REQ( update_window_zorder ) { req->window = wine_server_user_handle( hwnd ); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index b725823..4103a80 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -238,13 +238,18 @@ static void update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned /* ignore event if a button is pressed, since the mouse is then grabbed too */ !(state & (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask|Button6Mask|Button7Mask))) { + RECT rect; + SetRect( &rect, x, y, x + 1, y + 1 ); + if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) + mirror_rect( &data->client_rect, &rect ); + SERVER_START_REQ( update_window_zorder ) { req->window = wine_server_user_handle( hwnd ); - req->rect.left = x; - req->rect.top = y; - req->rect.right = x + 1; - req->rect.bottom = y + 1; + req->rect.left = rect.left; + req->rect.top = rect.top; + req->rect.right = rect.right; + req->rect.bottom = rect.bottom; wine_server_call( req ); } SERVER_END_REQ;

1 0

Aric Stewart : usp10: When checking font for shaping the font needs at least 1 of the features but does not need all .
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 0c5d0f80bc739bfd14415f9d64570db06da0455b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c5d0f80bc739bfd14415f9d6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 7 06:46:09 2010 -0500 usp10: When checking font for shaping the font needs at least 1 of the features but does not need all. --- dlls/usp10/shape.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index a2cbd2a..f1864fa 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1348,13 +1348,15 @@ HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANA if (!psc->GSUB_Table) psc->GSUB_Table = load_gsub_table(hdc); + /* we need to have at least one of the required features */ i = 0; while (ShapingData[psa->eScript].requiredFeatures[i]) { feature = load_GSUB_feature(hdc, psa, psc, ShapingData[psa->eScript].requiredFeatures[i]); - if (!feature) - return USP_E_SCRIPT_NOT_IN_FONT; + if (feature) + return S_OK; i++; } - return S_OK; + + return USP_E_SCRIPT_NOT_IN_FONT; }

1 0