April 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Use shader_sm1_read_opcode() in shader_trace_init( ).
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 15953b94b6b850b2860922f5e917ef5789b20b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15953b94b6b850b2860922f5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 09:37:14 2009 +0200 wined3d: Use shader_sm1_read_opcode() in shader_trace_init(). --- dlls/wined3d/baseshader.c | 198 +++++++++++++++++++++------------------------ 1 files changed, 94 insertions(+), 104 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index f7af267..3ea65e7 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1171,9 +1171,7 @@ static void shader_dump_ins_modifiers(const DWORD output) void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table) { const DWORD* pToken = pFunction; - const SHADER_OPCODE* curOpcode = NULL; DWORD shader_version; - DWORD opcode_token; DWORD i; TRACE("Parsing %p\n", pFunction); @@ -1190,6 +1188,9 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table while (WINED3DVS_END() != *pToken) { + struct wined3d_shader_instruction ins; + UINT param_size; + if (shader_is_comment(*pToken)) /* comment */ { DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; @@ -1198,128 +1199,117 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table pToken += comment_len; continue; } - opcode_token = *pToken++; - curOpcode = shader_get_opcode(opcode_table, shader_version, opcode_token); - if (!curOpcode) + shader_sm1_read_opcode(&pToken, &ins, &param_size, opcode_table, shader_version); + if (ins.handler_idx == WINED3DSIH_TABLE_SIZE) { - int tokens_read; - FIXME("Unrecognized opcode: token=0x%08x\n", opcode_token); - tokens_read = shader_skip_unrecognized(pToken, shader_version); - pToken += tokens_read; + TRACE("Skipping unrecognized instruction.\n"); + pToken += param_size; + continue; + } + + if (ins.handler_idx == WINED3DSIH_DCL) + { + DWORD usage = *pToken; + DWORD param = *(pToken + 1); + + shader_dump_decl_usage(usage, param, shader_version); + shader_dump_ins_modifiers(param); + TRACE(" "); + shader_dump_param(param, 0, 0, shader_version); + pToken += 2; + } + else if (ins.handler_idx == WINED3DSIH_DEF) + { + unsigned int offset = shader_get_float_offset(*pToken); + + TRACE("def c%u = %f, %f, %f, %f", offset, + *(const float *)(pToken + 1), + *(const float *)(pToken + 2), + *(const float *)(pToken + 3), + *(const float *)(pToken + 4)); + pToken += 5; + } + else if (ins.handler_idx == WINED3DSIH_DEFI) + { + TRACE("defi i%u = %d, %d, %d, %d", *pToken & WINED3DSP_REGNUM_MASK, + *(pToken + 1), + *(pToken + 2), + *(pToken + 3), + *(pToken + 4)); + pToken += 5; + } + else if (ins.handler_idx == WINED3DSIH_DEFB) + { + TRACE("defb b%u = %s", *pToken & WINED3DSP_REGNUM_MASK, + *(pToken + 1)? "true": "false"); + pToken += 2; } else { - if (curOpcode->opcode == WINED3DSIO_DCL) - { - DWORD usage = *pToken; - DWORD param = *(pToken + 1); + DWORD param, addr_token = 0; + int tokens_read; - shader_dump_decl_usage(usage, param, shader_version); - shader_dump_ins_modifiers(param); - TRACE(" "); - shader_dump_param(param, 0, 0, shader_version); - pToken += 2; - } - else if (curOpcode->opcode == WINED3DSIO_DEF) - { - unsigned int offset = shader_get_float_offset(*pToken); - - TRACE("def c%u = %f, %f, %f, %f", offset, - *(const float *)(pToken + 1), - *(const float *)(pToken + 2), - *(const float *)(pToken + 3), - *(const float *)(pToken + 4)); - pToken += 5; - } - else if (curOpcode->opcode == WINED3DSIO_DEFI) - { - TRACE("defi i%u = %d, %d, %d, %d", *pToken & WINED3DSP_REGNUM_MASK, - *(pToken + 1), - *(pToken + 2), - *(pToken + 3), - *(pToken + 4)); - pToken += 5; - } - else if (curOpcode->opcode == WINED3DSIO_DEFB) + /* Print out predication source token first - it follows + * the destination token. */ + if (ins.predicate) { - TRACE("defb b%u = %s", *pToken & WINED3DSP_REGNUM_MASK, - *(pToken + 1)? "true": "false"); - pToken += 2; + TRACE("("); + shader_dump_param(*(pToken + 2), 0, 1, shader_version); + TRACE(") "); } - else - { - DWORD param, addr_token = 0; - int tokens_read; - /* Print out predication source token first - it follows - * the destination token. */ - if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) - { - TRACE("("); - shader_dump_param(*(pToken + 2), 0, 1, shader_version); - TRACE(") "); - } - if (opcode_token & WINED3DSI_COISSUE) - { - /* PixWin marks instructions with the coissue flag with a '+' */ - TRACE("+"); - } - - TRACE("%s", shader_opcode_names[curOpcode->handler_idx]); + /* PixWin marks instructions with the coissue flag with a '+' */ + if (ins.coissue) TRACE("+"); - if (curOpcode->opcode == WINED3DSIO_IFC - || curOpcode->opcode == WINED3DSIO_BREAKC) - { - DWORD op = (opcode_token & WINED3D_OPCODESPECIFICCONTROL_MASK) >> WINED3D_OPCODESPECIFICCONTROL_SHIFT; + TRACE("%s", shader_opcode_names[ins.handler_idx]); - switch (op) - { - case COMPARISON_GT: TRACE("_gt"); break; - case COMPARISON_EQ: TRACE("_eq"); break; - case COMPARISON_GE: TRACE("_ge"); break; - case COMPARISON_LT: TRACE("_lt"); break; - case COMPARISON_NE: TRACE("_ne"); break; - case COMPARISON_LE: TRACE("_le"); break; - default: TRACE("_(%u)", op); - } - } - else if (curOpcode->opcode == WINED3DSIO_TEX - && shader_version >= WINED3DPS_VERSION(2,0) - && (opcode_token & (WINED3DSI_TEXLD_PROJECT << WINED3D_OPCODESPECIFICCONTROL_SHIFT))) + if (ins.handler_idx == WINED3DSIH_IFC + || ins.handler_idx == WINED3DSIH_BREAKC) + { + switch (ins.flags) { - TRACE("p"); + case COMPARISON_GT: TRACE("_gt"); break; + case COMPARISON_EQ: TRACE("_eq"); break; + case COMPARISON_GE: TRACE("_ge"); break; + case COMPARISON_LT: TRACE("_lt"); break; + case COMPARISON_NE: TRACE("_ne"); break; + case COMPARISON_LE: TRACE("_le"); break; + default: TRACE("_(%u)", ins.flags); } + } + else if (ins.handler_idx == WINED3DSIH_TEX + && shader_version >= WINED3DPS_VERSION(2,0) + && (ins.flags & WINED3DSI_TEXLD_PROJECT)) + { + TRACE("p"); + } - /* Destination token */ - if (curOpcode->dst_token) - { - tokens_read = shader_get_param(pToken, shader_version, &param, &addr_token); - pToken += tokens_read; + /* Destination token */ + if (ins.dst_count) + { + tokens_read = shader_get_param(pToken, shader_version, &param, &addr_token); + pToken += tokens_read; - shader_dump_ins_modifiers(param); - TRACE(" "); - shader_dump_param(param, addr_token, 0, shader_version); - } + shader_dump_ins_modifiers(param); + TRACE(" "); + shader_dump_param(param, addr_token, 0, shader_version); + } - /* Predication token - already printed out, just skip it */ - if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) - { - pToken++; - } + /* Predication token - already printed out, just skip it */ + if (ins.predicate) ++pToken; - /* Other source tokens */ - for (i = curOpcode->dst_token; i < curOpcode->num_params; ++i) - { - tokens_read = shader_get_param(pToken, shader_version, &param, &addr_token); - pToken += tokens_read; + /* Other source tokens */ + for (i = ins.dst_count; i < (ins.dst_count + ins.src_count); ++i) + { + tokens_read = shader_get_param(pToken, shader_version, &param, &addr_token); + pToken += tokens_read; - TRACE((i == 0)? " " : ", "); - shader_dump_param(param, addr_token, 1, shader_version); - } + TRACE((i == 0)? " " : ", "); + shader_dump_param(param, addr_token, 1, shader_version); } - TRACE("\n"); } + TRACE("\n"); } }

1 0

Christian Costa : mciqtz32: Add support for MCI_GETDEVCAPS.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 42e9acdffb3ae4c884221ae468b361c3966aea61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e9acdffb3ae4c884221ae46… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Apr 26 23:06:51 2009 +0200 mciqtz32: Add support for MCI_GETDEVCAPS. --- dlls/mciqtz32/mciqtz.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 0435a11..2dd072f 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -338,6 +338,72 @@ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa } /*************************************************************************** + * MCIQTZ_mciGetDevCaps [internal] + */ +static DWORD MCIQTZ_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + if (!(dwFlags & MCI_STATUS_ITEM)) { + WARN("No capability item specified\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + + switch (lpParms->dwItem) { + case MCI_GETDEVCAPS_CAN_RECORD: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + TRACE("MCI_GETDEVCAPS_CAN_RECORD = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_HAS_AUDIO: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + TRACE("MCI_GETDEVCAPS_HAS_AUDIO = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_HAS_VIDEO: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + TRACE("MCI_GETDEVCAPS_HAS_VIDEO = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_DEVICE_TYPE: + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_DEVTYPE_DIGITAL_VIDEO, MCI_DEVTYPE_DIGITAL_VIDEO); + TRACE("MCI_GETDEVCAPS_DEVICE_TYPE = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_USES_FILES: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + TRACE("MCI_GETDEVCAPS_USES_FILES = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_COMPOUND_DEVICE: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + TRACE("MCI_GETDEVCAPS_COMPOUND_DEVICE = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_CAN_EJECT: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + TRACE("MCI_GETDEVCAPS_EJECT = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_CAN_PLAY: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + TRACE("MCI_GETDEVCAPS_CAN_PLAY = %08x\n", lpParms->dwReturn); + break; + case MCI_GETDEVCAPS_CAN_SAVE: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + TRACE("MCI_GETDEVCAPS_CAN_SAVE = %08x\n", lpParms->dwReturn); + break; + default: + ERR("Unknown capability %08x\n", lpParms->dwItem); + return MCIERR_UNRECOGNIZED_COMMAND; + } + + return MCI_RESOURCE_RETURNED; +} + +/*************************************************************************** * MCIQTZ_mciStatus [internal] */ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpParms) @@ -451,12 +517,12 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); case MCI_STOP: return MCIQTZ_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); + case MCI_GETDEVCAPS: return MCIQTZ_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS) dwParam2); case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); case MCI_RECORD: case MCI_SET: case MCI_PAUSE: case MCI_RESUME: - case MCI_GETDEVCAPS: case MCI_INFO: case MCI_PUT: case MCI_WINDOW:

1 0

Christian Costa : mciqtz32: Add support for MCI_WHERE.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 240ddb27c4961c8ab3cbf09a617669382b2ef9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=240ddb27c4961c8ab3cbf09a6… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Apr 26 23:07:02 2009 +0200 mciqtz32: Add support for MCI_WHERE. --- dlls/mciqtz32/mciqtz.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 85 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 2dd072f..659cbc4 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -481,6 +481,90 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS return 0; } +/*************************************************************************** + * MCIQTZ_mciWhere [internal] + */ +static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + IVideoWindow* pVideoWindow; + HRESULT hr; + HWND hWnd; + RECT rc; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + /* Find if there is a video stream and get the display window */ + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IVideoWindow, (LPVOID*)&pVideoWindow); + if (FAILED(hr)) { + ERR("Cannot get IVideoWindow interface (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + hr = IVideoWindow_get_Owner(pVideoWindow, (OAHWND*)&hWnd); + IVideoWindow_Release(pVideoWindow); + if (FAILED(hr)) { + TRACE("No video stream, returning no window error\n"); + return MCIERR_NO_WINDOW; + } + + if (dwFlags & MCI_DGV_WHERE_SOURCE) { + if (dwFlags & MCI_DGV_WHERE_MAX) + FIXME("MCI_DGV_WHERE_SOURCE_MAX not supported yet\n"); + else + FIXME("MCI_DGV_WHERE_SOURCE not supported yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + if (dwFlags & MCI_DGV_WHERE_DESTINATION) { + if (dwFlags & MCI_DGV_WHERE_MAX) { + GetClientRect(hWnd, &rc); + TRACE("MCI_DGV_WHERE_DESTINATION_MAX %s\n", wine_dbgstr_rect(&rc)); + } else { + FIXME("MCI_DGV_WHERE_DESTINATION not supported yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + } + if (dwFlags & MCI_DGV_WHERE_FRAME) { + if (dwFlags & MCI_DGV_WHERE_MAX) + FIXME("MCI_DGV_WHERE_FRAME_MAX not supported yet\n"); + else + FIXME("MCI_DGV_WHERE_FRAME not supported yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + if (dwFlags & MCI_DGV_WHERE_VIDEO) { + if (dwFlags & MCI_DGV_WHERE_MAX) + FIXME("MCI_DGV_WHERE_VIDEO_MAX not supported yet\n"); + else + FIXME("MCI_DGV_WHERE_VIDEO not supported yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + if (dwFlags & MCI_DGV_WHERE_WINDOW) { + if (dwFlags & MCI_DGV_WHERE_MAX) { + GetWindowRect(GetDesktopWindow(), &rc); + TRACE("MCI_DGV_WHERE_WINDOW_MAX %s\n", wine_dbgstr_rect(&rc)); + } else { + GetWindowRect(hWnd, &rc); + TRACE("MCI_DGV_WHERE_WINDOW %s\n", wine_dbgstr_rect(&rc)); + } + } + + /* In MCI, RECT structure is used differently: rc.right = width & rc.bottom = height + * So convert the normal RECT into a MCI RECT before returning */ + lpParms->rc.left = rc.left; + lpParms->rc.top = rc.right; + lpParms->rc.right = rc.right - rc.left; + lpParms->rc.bottom = rc.bottom - rc.top; + + return 0; +} + /*======================================================================* * MCI QTZ entry points * *======================================================================*/ @@ -519,6 +603,7 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_STOP: return MCIQTZ_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_GETDEVCAPS: return MCIQTZ_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS) dwParam2); case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); + case MCI_WHERE: return MCIQTZ_mciWhere (dwDevID, dwParam1, (LPMCI_DGV_RECT_PARMS) dwParam2); case MCI_RECORD: case MCI_SET: case MCI_PAUSE: @@ -532,7 +617,6 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_REALIZE: case MCI_UNFREEZE: case MCI_UPDATE: - case MCI_WHERE: case MCI_STEP: case MCI_COPY: case MCI_CUT:

1 0

Henri Verbeet : wined3d: Add a function to read a source parameter from SM1-3 bytecode.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 4e97e430d95950098dba3b34bb9c318c4068b09e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e97e430d95950098dba3b34b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 09:37:14 2009 +0200 wined3d: Add a function to read a source parameter from SM1-3 bytecode. --- dlls/wined3d/baseshader.c | 51 +++++++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 3ea65e7..e52b91c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -180,6 +180,17 @@ static int shader_skip_unrecognized(const DWORD *ptr, DWORD shader_version) return tokens_read; } +static void shader_parse_src_param(DWORD param, const struct wined3d_shader_src_param *rel_addr, + struct wined3d_shader_src_param *src) +{ + src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) + | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); + src->register_idx = param & WINED3DSP_REGNUM_MASK; + src->swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; + src->modifiers = (param & WINED3DSP_SRCMOD_MASK) >> WINED3DSP_SRCMOD_SHIFT; + src->rel_addr = rel_addr; +} + static void shader_sm1_read_opcode(const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, const SHADER_OPCODE *opcode_table, DWORD shader_version) { @@ -205,6 +216,23 @@ static void shader_sm1_read_opcode(const DWORD **ptr, struct wined3d_shader_inst *param_size = shader_skip_opcode(opcode_info, opcode_token, shader_version); } +static void shader_sm1_read_src_param(const DWORD **ptr, struct wined3d_shader_src_param *src_param, + struct wined3d_shader_src_param *src_rel_addr, DWORD shader_version) +{ + DWORD token, addr_token; + + *ptr += shader_get_param(*ptr, shader_version, &token, &addr_token); + if (token & WINED3DSHADER_ADDRMODE_RELATIVE) + { + shader_parse_src_param(addr_token, NULL, src_rel_addr); + shader_parse_src_param(token, src_rel_addr, src_param); + } + else + { + shader_parse_src_param(token, NULL, src_param); + } +} + static const char *shader_opcode_names[] = { /* WINED3DSIH_ABS */ "abs", @@ -423,17 +451,6 @@ static void shader_parse_dst_param(DWORD param, const struct wined3d_shader_src_ dst->rel_addr = rel_addr; } -static void shader_parse_src_param(DWORD param, const struct wined3d_shader_src_param *rel_addr, - struct wined3d_shader_src_param *src) -{ - src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) - | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); - src->register_idx = param & WINED3DSP_REGNUM_MASK; - src->swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; - src->modifiers = (param & WINED3DSP_SRCMOD_MASK) >> WINED3DSP_SRCMOD_SHIFT; - src->rel_addr = rel_addr; -} - /* Note that this does not count the loop register * as an address register. */ @@ -1120,17 +1137,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, /* Other source tokens */ for (i = 0; i < ins.src_count; ++i) { - DWORD param, addr_param; - pToken += shader_get_param(pToken, shader_version, &param, &addr_param); - if (param & WINED3DSHADER_ADDRMODE_RELATIVE) - { - shader_parse_src_param(addr_param, NULL, &src_rel_addr[i]); - shader_parse_src_param(param, &src_rel_addr[i], &src_param[i]); - } - else - { - shader_parse_src_param(param, NULL, &src_param[i]); - } + shader_sm1_read_src_param(&pToken, &src_param[i], &src_rel_addr[i], shader_version); } /* Call appropriate function for output target */

1 0

Jeff Latimer : include: Define IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT and code for IN6_IS_ADDR_LOOPBACK .
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 7ded3afe93f7af048cca3b5103e06668ad69dee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ded3afe93f7af048cca3b510… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sat Apr 25 22:59:30 2009 +1000 include: Define IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT and code for IN6_IS_ADDR_LOOPBACK. --- include/ws2ipdef.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index ff2b201..bc30f96 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -247,9 +247,25 @@ struct WS(ip_msfilter) { #ifndef USE_WS_PREFIX #define INET_ADDRSTRLEN 22 #define INET6_ADDRSTRLEN 65 +#define IN6ADDR_ANY_INIT { 0 } +#define IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } #else #define WS_INET_ADDRSTRLEN 22 #define WS_INET6_ADDRSTRLEN 65 +#define WS_IN6ADDR_ANY_INIT { 0 } +#define WS_IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } #endif /* USE_WS_PREFIX */ +static inline BOOL WS(IN6_IS_ADDR_LOOPBACK) ( const IN6_ADDR *a ) +{ + return (BOOL)((a->s6_words[0] == 0) && + (a->s6_words[1] == 0) && + (a->s6_words[2] == 0) && + (a->s6_words[3] == 0) && + (a->s6_words[4] == 0) && + (a->s6_words[5] == 0) && + (a->s6_words[6] == 0) && + (a->s6_words[7] == 0x0100)); +} + #endif /* __WS2IPDEF__ */

1 0

Stefan Dösinger : d3d: Limit d3d8 and d3d9 vshader constants to 256.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 9f1731edb6b20be5bbad527148c9a8f588e28b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1731edb6b20be5bbad52714… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 25 15:02:42 2009 +0200 d3d: Limit d3d8 and d3d9 vshader constants to 256. DX10 cards support 512(ATI) or 1024(Nvidia) vertex shader constants in GL. The dx9 DXCapsViewer shows that dx10 windows drivers only claim 256 constants on Windows, so we can and should do the same. --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 13 +++++++++++++ dlls/d3d8/directx.c | 1 + dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/directx.c | 2 ++ dlls/d3d9/vertexshader.c | 12 ++++++++++++ dlls/wined3d/vertexshader.c | 17 +++++++++++++---- 7 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index c9afe17..c38d8cc 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -601,6 +601,8 @@ struct IDirect3DVertexShader8Impl { IWineD3DVertexShader *wineD3DVertexShader; }; +#define D3D8_MAX_VERTEX_SHADER_CONSTANTF 256 + /* ------------------------ */ /* IDirect3DPixelShaderImpl */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a33bdbc..f5ab8b3 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -359,6 +359,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDeviceCaps(LPDIRECT3DDEVICE8 iface if(pCaps->VertexShaderVersion > D3DVS_VERSION(1,1)){ pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); } + pCaps->MaxVertexShaderConst = min(D3D8_MAX_VERTEX_SHADER_CONSTANTF, pCaps->MaxVertexShaderConst); TRACE("Returning %p %p\n", This, pCaps); return hrc; @@ -1998,6 +1999,12 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShaderConstant(LPDIRECT3DDEV HRESULT hr; TRACE("(%p) : Relay\n", This); + if(Register + ConstantCount > D3D8_MAX_VERTEX_SHADER_CONSTANTF) { + WARN("Trying to access %u constants, but d3d8 only supports %u\n", + Register + ConstantCount, D3D8_MAX_VERTEX_SHADER_CONSTANTF); + return D3DERR_INVALIDCALL; + } + EnterCriticalSection(&d3d8_cs); hr = IWineD3DDevice_SetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, ConstantCount); LeaveCriticalSection(&d3d8_cs); @@ -2009,6 +2016,12 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderConstant(LPDIRECT3DDEV HRESULT hr; TRACE("(%p) : Relay\n", This); + if(Register + ConstantCount > D3D8_MAX_VERTEX_SHADER_CONSTANTF) { + WARN("Trying to access %u constants, but d3d8 only supports %u\n", + Register + ConstantCount, D3D8_MAX_VERTEX_SHADER_CONSTANTF); + return D3DERR_INVALIDCALL; + } + EnterCriticalSection(&d3d8_cs); hr = IWineD3DDevice_GetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, ConstantCount); LeaveCriticalSection(&d3d8_cs); diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 64fc360..d39d3d6 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -265,6 +265,7 @@ static HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps(LPDIRECT3D8 iface, UINT Ada if(pCaps->VertexShaderVersion > D3DVS_VERSION(1,1)){ pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); } + pCaps->MaxVertexShaderConst = min(D3D8_MAX_VERTEX_SHADER_CONSTANTF, pCaps->MaxVertexShaderConst); TRACE("(%p) returning %p\n", This, pCaps); return hrc; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 25b6ae2..7e43974 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -497,6 +497,8 @@ typedef struct IDirect3DVertexShader9Impl { LPDIRECT3DDEVICE9EX parentDevice; } IDirect3DVertexShader9Impl; +#define D3D9_MAX_VERTEX_SHADER_CONSTANTF 256 + /* --------------------- */ /* IDirect3DPixelShader9 */ /* --------------------- */ diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 229368a..e9547a7 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -311,6 +311,8 @@ void filter_caps(D3DCAPS9* pCaps) D3DPTEXTURECAPS_PROJECTED | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2| D3DPTEXTURECAPS_NOPROJECTEDBUMPENV; + + pCaps->MaxVertexShaderConst = min(D3D9_MAX_VERTEX_SHADER_CONSTANTF, pCaps->MaxVertexShaderConst); } static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9EX iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9* pCaps) { diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index 6478b68..fd2837d 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -192,6 +192,12 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantF(LPDIRECT3DDEVICE9EX HRESULT hr; TRACE("(%p) : Relay\n", This); + if(Register + Vector4fCount > D3D9_MAX_VERTEX_SHADER_CONSTANTF) { + WARN("Trying to access %u constants, but d3d9 only supports %u\n", + Register + Vector4fCount, D3D9_MAX_VERTEX_SHADER_CONSTANTF); + return D3DERR_INVALIDCALL; + } + EnterCriticalSection(&d3d9_cs); hr = IWineD3DDevice_SetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); LeaveCriticalSection(&d3d9_cs); @@ -202,6 +208,12 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantF(LPDIRECT3DDEVICE9EX IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; + if(Register + Vector4fCount > D3D9_MAX_VERTEX_SHADER_CONSTANTF) { + WARN("Trying to access %u constants, but d3d9 only supports %u\n", + Register + Vector4fCount, D3D9_MAX_VERTEX_SHADER_CONSTANTF); + return D3DERR_INVALIDCALL; + } + TRACE("(%p) : Relay\n", This); EnterCriticalSection(&d3d9_cs); hr = IWineD3DDevice_GetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index fab0dca..7f1dd92 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -115,9 +115,6 @@ static void vshader_set_limits( This->baseShader.limits.attributes = 16; This->baseShader.limits.packed_input = 0; - /* Must match D3DCAPS9.MaxVertexShaderConst: at least 256 for vs_2_0 */ - This->baseShader.limits.constant_float = GL_LIMITS(vshader_constantsF); - switch (This->baseShader.reg_maps.shader_version) { case WINED3DVS_VERSION(1,0): @@ -129,8 +126,12 @@ static void vshader_set_limits( This->baseShader.limits.packed_output = 0; This->baseShader.limits.sampler = 0; This->baseShader.limits.label = 0; + /* TODO: vs_1_1 has a minimum of 96 constants. What happens if a vs_1_1 shader is used + * on a vs_3_0 capable card that has 256 constants? + */ + This->baseShader.limits.constant_float = min(256, GL_LIMITS(vshader_constantsF)); break; - + case WINED3DVS_VERSION(2,0): case WINED3DVS_VERSION(2,1): This->baseShader.limits.temporary = 12; @@ -140,6 +141,7 @@ static void vshader_set_limits( This->baseShader.limits.packed_output = 0; This->baseShader.limits.sampler = 0; This->baseShader.limits.label = 16; + This->baseShader.limits.constant_float = min(256, GL_LIMITS(vshader_constantsF)); break; case WINED3DVS_VERSION(3,0): @@ -150,6 +152,12 @@ static void vshader_set_limits( This->baseShader.limits.packed_output = 12; This->baseShader.limits.sampler = 4; This->baseShader.limits.label = 16; /* FIXME: 2048 */ + /* DX10 cards on Windows advertise a d3d9 constant limit of 256 even though they are capable + * of supporting much more(GL drivers advertise 1024). d3d9.dll and d3d8.dll clamp the + * wined3d-advertised maximum. Clamp the constant limit for <= 3.0 shaders to 256.s + * use constant buffers + */ + This->baseShader.limits.constant_float = min(256, GL_LIMITS(vshader_constantsF)); break; default: This->baseShader.limits.temporary = 12; @@ -159,6 +167,7 @@ static void vshader_set_limits( This->baseShader.limits.packed_output = 0; This->baseShader.limits.sampler = 0; This->baseShader.limits.label = 16; + This->baseShader.limits.constant_float = min(256, GL_LIMITS(vshader_constantsF)); FIXME("Unrecognized vertex shader version %#x\n", This->baseShader.reg_maps.shader_version); }

1 0

Stefan Dösinger : wined3d: Support the full amount of constants in GLSL.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 7ab6c22f5ab280da71413171ab574735f1c6a5c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab6c22f5ab280da71413171a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 22 21:39:14 2009 +0200 wined3d: Support the full amount of constants in GLSL. This patch advertises all GL reported float uniforms to the D3D app to reach the 256 constants required by Shader Model 3.0 on dx9 cards. If the shader does not use indirect addressing, all 256 constants are declared. The compiler can then figure out which constants are actually used. This makes shaders work that use high constant indices, but don't use all 256 constants. --- dlls/wined3d/baseshader.c | 17 +++++++++-- dlls/wined3d/glsl_shader.c | 64 ++++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 61 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ab6c22f5ab280da71413…

1 0

Massimo Del Fedele : riched20: Fix placement of crlf on font table streamout.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 6f173277281476b4872127bfaf2f679d8f10ae96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f173277281476b4872127bfa… Author: Massimo Del Fedele <max(a)veneto.com> Date: Sat Apr 25 19:56:11 2009 +0200 riched20: Fix placement of crlf on font table streamout. --- dlls/riched20/writer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index b6c3ed6..6cadbd4 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -295,10 +295,10 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, } if (!ME_StreamOutRTFText(pStream, table[i].szFaceName, -1)) return FALSE; - if (!ME_StreamOutPrint(pStream, ";}\r\n")) + if (!ME_StreamOutPrint(pStream, ";}")) return FALSE; } - if (!ME_StreamOutPrint(pStream, "}")) + if (!ME_StreamOutPrint(pStream, "}\r\n")) return FALSE; /* Output colors table if not empty */

1 0

Massimo Del Fedele : richedit20: Test for fonttbl streamout.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 078989d4639a399e226ce6047f84cbb3f3fba8d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=078989d4639a399e226ce6047… Author: Massimo Del Fedele <max(a)veneto.com> Date: Sat Apr 25 21:22:24 2009 +0200 richedit20: Test for fonttbl streamout. --- dlls/riched20/tests/editor.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1b9e244..bbad748 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3383,6 +3383,61 @@ static void test_EM_STREAMOUT(void) DestroyWindow(hwndRichEdit); } +static void test_EM_STREAMOUT_FONTTBL(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + EDITSTREAM es; + char buf[1024] = {0}; + char * p; + char * fontTbl; + int brackCount; + + const char * TestItem = "TestSomeText"; + + /* fills in the richedit control with some text */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem); + + /* streams out the text in rtf format */ + p = buf; + es.dwCookie = (DWORD_PTR)&p; + es.dwError = 0; + es.pfnCallback = test_WM_SETTEXT_esCallback; + memset(buf, 0, sizeof(buf)); + SendMessage(hwndRichEdit, EM_STREAMOUT, + (WPARAM)(SF_RTF), (LPARAM)&es); + + /* scans for \fonttbl, error if not found */ + fontTbl = strstr(buf, "\\fonttbl"); + ok(fontTbl != NULL, "missing \\fonttbl section\n"); + if(fontTbl) + { + /* scans for terminating closing bracket */ + brackCount = 1; + while(*fontTbl && brackCount) + { + if(*fontTbl == '{') + brackCount++; + else if(*fontTbl == '}') + brackCount--; + fontTbl++; + } + /* checks wether closing bracket is ok */ + ok(brackCount == 0, "missing closing bracket in \\fonttbl block\n"); + if(!brackCount) + { + /* char before closing fonttbl block should be a closed bracket */ + fontTbl -= 2; + ok(*fontTbl == '}', "spurious character '%02x' before \\fonttbl closing bracket\n", *fontTbl); + + /* char after fonttbl block should be a crlf */ + fontTbl += 2; + ok(*fontTbl == 0x0d && *(fontTbl+1) == 0x0a, "missing crlf after \\fonttbl block\n"); + } + } + DestroyWindow(hwndRichEdit); +} + + static void test_EM_SETTEXTEX(void) { HWND hwndRichEdit, parent; @@ -6631,6 +6686,7 @@ START_TEST( editor ) test_WM_PASTE(); test_EM_STREAMIN(); test_EM_STREAMOUT(); + test_EM_STREAMOUT_FONTTBL(); test_EM_StreamIn_Undo(); test_EM_FORMATRANGE(); test_unicode_conversions();

1 0

Paul TBBle Hampson : wininet/tests: Test for handling of blank headers in HttpAddRequestHeaders.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 01a83cde55d1b0c9d80d341a7cc15e8db2fcfecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a83cde55d1b0c9d80d341a7… Author: Paul TBBle Hampson <Paul.Hampson(a)Pobox.com> Date: Sat Apr 25 02:25:01 2009 +1000 wininet/tests: Test for handling of blank headers in HttpAddRequestHeaders. --- dlls/wininet/tests/http.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bb701b0..79b5683 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1274,6 +1274,17 @@ static void HttpHeaders_test(void) strcpy(buffer,"Warning"); ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index)==0,"Third Header Should Not Exist\n"); + /* Ensure that blank headers are ignored and don't cause a failure */ + todo_wine{ + ok(HttpAddRequestHeaders(hRequest,"\r\nBlankTest:value\r\n\r\n",-1, HTTP_ADDREQ_FLAG_ADD_IF_NEW), "Failed to add header with blank entries in list\n"); + + index = 0; + len = sizeof(buffer); + strcpy(buffer,"BlankTest"); + ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index),"Unable to query header\n"); + ok(index == 1, "Index was not incremented\n"); + ok(strcmp(buffer,"value")==0, "incorrect string was returned(%s)\n",buffer); + } ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); done:

1 0