wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Aric Stewart : msctf: Implement ITfKeystrokeMgr::UnadviseKeyEventSink.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 161fa4bc3044c00b57a0f4db33716bda939855d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=161fa4bc3044c00b57a0f4db3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 8 08:51:07 2009 -0500 msctf: Implement ITfKeystrokeMgr::UnadviseKeyEventSink. --- dlls/msctf/tests/inputprocessor.c | 2 +- dlls/msctf/threadmgr.c | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 4ea2ec9..5ab645d 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -437,7 +437,7 @@ static void test_KeystrokeMgr(void) ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey inproperly succeeded\n"); hr = ITfKeystrokeMgr_UnadviseKeyEventSink(keymgr,tid); - todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnadviseKeyEventSink failed\n"); + ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnadviseKeyEventSink failed\n"); ITfKeystrokeMgr_Release(keymgr); ITfKeyEventSink_Release(sink); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index e8743ec..5ee08dd 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -546,8 +546,31 @@ static HRESULT WINAPI KeystrokeMgr_UnadviseKeyEventSink(ITfKeystrokeMgr *iface, TfClientId tid) { ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + CLSID textservice; + ITfKeyEventSink *check = NULL; + TRACE("(%p) %x\n",This,tid); + + if (!tid) + return E_INVALIDARG; + + textservice = get_textservice_clsid(tid); + if (IsEqualCLSID(&GUID_NULL,&textservice)) + return E_INVALIDARG; + + get_textservice_sink(tid, &IID_ITfKeyEventSink, (IUnknown**)&check); + + if (!check) + return CONNECT_E_NOCONNECTION; + + set_textservice_sink(tid, &IID_ITfKeyEventSink, NULL); + ITfKeyEventSink_Release(check); + + if (This->forgroundKeyEventSink == check) + { + ITfKeyEventSink_Release(This->forgroundKeyEventSink); + This->forgroundKeyEventSink = NULL; + } + return S_OK; } static HRESULT WINAPI KeystrokeMgr_GetForeground(ITfKeystrokeMgr *iface,

1 0

Aric Stewart : msctf: Implement ITfKeystrokeMgr::AdviseKeyEventSink.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: f20c4d69c95ad42fb299a648fcef3f333a90caad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20c4d69c95ad42fb299a648f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 8 08:50:59 2009 -0500 msctf: Implement ITfKeystrokeMgr::AdviseKeyEventSink. --- dlls/msctf/msctf.c | 46 +++++++++++++++++++++++++++++++++++++ dlls/msctf/msctf_internal.h | 4 +++ dlls/msctf/tests/inputprocessor.c | 6 ++++- dlls/msctf/threadmgr.c | 33 +++++++++++++++++++++++++- 4 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index c8dd486..55a8075 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -55,6 +55,7 @@ typedef struct { TF_LANGUAGEPROFILE LanguageProfile; ITfTextInputProcessor *pITfTextInputProcessor; ITfThreadMgr *pITfThreadMgr; + ITfKeyEventSink *pITfKeyEventSink; TfClientId tid; } ActivatedTextService; @@ -378,6 +379,7 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) actsvr->pITfTextInputProcessor = NULL; actsvr->LanguageProfile = *lp; actsvr->LanguageProfile.fActive = TRUE; + actsvr->pITfKeyEventSink = NULL; /* get TIP category */ if (SUCCEEDED(CategoryMgr_Constructor(NULL,(IUnknown**)&catmgr))) @@ -456,6 +458,50 @@ HRESULT deactivate_textservices(void) return S_OK; } +CLSID get_textservice_clsid(TfClientId tid) +{ + AtsEntry *ats; + + LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) + if (ats->ats->tid == tid) + return ats->ats->LanguageProfile.clsid; + return GUID_NULL; +} + +HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown **sink) +{ + AtsEntry *ats; + + if (!IsEqualCLSID(iid,&IID_ITfKeyEventSink)) + return E_NOINTERFACE; + + LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) + if (ats->ats->tid == tid) + { + *sink = (IUnknown*)ats->ats->pITfKeyEventSink; + return S_OK; + } + + return E_FAIL; +} + +HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink) +{ + AtsEntry *ats; + + if (!IsEqualCLSID(iid,&IID_ITfKeyEventSink)) + return E_NOINTERFACE; + + LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) + if (ats->ats->tid == tid) + { + ats->ats->pITfKeyEventSink = (ITfKeyEventSink*)sink; + return S_OK; + } + + return E_FAIL; +} + /************************************************************************* * MSCTF DllMain */ diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 433b79e..0df88de 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -47,5 +47,9 @@ extern BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *lp); extern HRESULT activate_textservices(ITfThreadMgr *tm); extern HRESULT deactivate_textservices(void); +extern CLSID get_textservice_clsid(TfClientId tid); +extern HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown** sink); +extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink); + extern const WCHAR szwSystemTIPKey[]; #endif /* __WINE_MSCTF_I_H */ diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 7ba9140..4ea2ec9 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -405,8 +405,12 @@ static void test_KeystrokeMgr(void) test_KEV_OnSetFocus = SINK_EXPECTED; hr = ITfKeystrokeMgr_AdviseKeyEventSink(keymgr,tid,sink,TRUE); - todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_AdviseKeyEventSink failed\n"); + ok(SUCCEEDED(hr),"ITfKeystrokeMgr_AdviseKeyEventSink failed\n"); todo_wine ok(test_KEV_OnSetFocus == SINK_FIRED, "KeyEventSink_OnSetFocus not fired as expected\n"); + hr = ITfKeystrokeMgr_AdviseKeyEventSink(keymgr,tid,sink,TRUE); + ok(hr == CONNECT_E_ADVISELIMIT,"Wrong return, expected CONNECT_E_ADVISELIMIT\n"); + hr = ITfKeystrokeMgr_AdviseKeyEventSink(keymgr,cid,sink,TRUE); + ok(hr == E_INVALIDARG,"Wrong return, expected E_INVALIDARG\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, 0, &CLSID_PreservedKey, &tfpk, NULL, 0); ok(hr==E_INVALIDARG,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 2afee39..e8743ec 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -78,6 +78,8 @@ typedef struct tagACLMulti { ITfDocumentMgr *focus; LONG activationCount; + ITfKeyEventSink *forgroundKeyEventSink; + struct list CurrentPreservedKeys; /* kept as separate lists to reduce unnecessary iterations */ @@ -509,8 +511,35 @@ static HRESULT WINAPI KeystrokeMgr_AdviseKeyEventSink(ITfKeystrokeMgr *iface, TfClientId tid, ITfKeyEventSink *pSink, BOOL fForeground) { ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + CLSID textservice; + ITfKeyEventSink *check = NULL; + + TRACE("(%p) %x %p %i\n",This,tid,pSink,fForeground); + + if (!tid || !pSink) + return E_INVALIDARG; + + textservice = get_textservice_clsid(tid); + if (IsEqualCLSID(&GUID_NULL,&textservice)) + return E_INVALIDARG; + + get_textservice_sink(tid, &IID_ITfKeyEventSink, (IUnknown**)&check); + if (check != NULL) + return CONNECT_E_ADVISELIMIT; + + if (FAILED(IUnknown_QueryInterface(pSink,&IID_ITfKeyEventSink,(LPVOID*) &check))) + return E_INVALIDARG; + + set_textservice_sink(tid, &IID_ITfKeyEventSink, (IUnknown*)check); + + if (fForeground) + { + if (This->forgroundKeyEventSink) + ITfKeyEventSink_Release(This->forgroundKeyEventSink); + ITfKeyEventSink_AddRef(check); + This->forgroundKeyEventSink = check; + } + return S_OK; } static HRESULT WINAPI KeystrokeMgr_UnadviseKeyEventSink(ITfKeystrokeMgr *iface,

1 0

Stefan Dösinger : wined3d: Standardize pshader_hw_texkill.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 601030cfa9ec3d035093fc0f11fb5b124405bc57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=601030cfa9ec3d035093fc0f1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:22:16 2009 +0200 wined3d: Standardize pshader_hw_texkill. Use shader_arb_get_dst_param instead of get_register_name to find the register name. Even though this adds support for modifiers(which aren't allowed by native), this shouldn't hurt. If an app passes in an incorrect shader it should be caught in the frontend. --- dlls/wined3d/arb_program_shader.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c77c664..56ee162 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1016,13 +1016,11 @@ static void pshader_hw_texkill(const struct wined3d_shader_instruction *ins) const struct wined3d_shader_dst_param *dst = &ins->dst[0]; SHADER_BUFFER *buffer = ins->ctx->buffer; char reg_dest[40]; - BOOL is_color; /* No swizzles are allowed in d3d's texkill. PS 1.x ignores the 4th component as documented, * but >= 2.0 honors it(undocumented, but tested by the d3d9 testsuit) */ - shader_arb_get_register_name(ins->ctx->shader, dst->reg.type, - dst->reg.idx, !!dst->reg.rel_addr, reg_dest, &is_color); + shader_arb_get_dst_param(ins, dst, reg_dest); if (ins->ctx->reg_maps->shader_version.major >= 2) { @@ -1032,8 +1030,7 @@ static void pshader_hw_texkill(const struct wined3d_shader_instruction *ins) /* ARB fp doesn't like swizzles on the parameter of the KIL instruction. To mask the 4th component, * copy the register into our general purpose TMP variable, overwrite .w and pass TMP to KIL */ - shader_addline(buffer, "MOV TMP, %s;\n", reg_dest); - shader_addline(buffer, "MOV TMP.w, one.w;\n"); + shader_addline(buffer, "SWZ TMP, %s, x, y, z, 1;\n", reg_dest); shader_addline(buffer, "KIL TMP;\n"); } }

1 0

Stefan Dösinger : wined3d: Tidy up shader_hw_rsq_rcp.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 5cfbfbc8b3e59994e745e40c0de8b0d095b5765a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cfbfbc8b3e59994e745e40c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 3 21:48:34 2009 +0200 wined3d: Tidy up shader_hw_rsq_rcp. --- dlls/wined3d/arb_program_shader.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ec4bea7..c77c664 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1553,12 +1553,11 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) } } -static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) +static void shader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; - const char *instruction; + const char *instruction, *sat; - char tmpLine[256]; char dst[50]; char src[50]; @@ -1571,22 +1570,20 @@ static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) break; } - strcpy(tmpLine, instruction); + if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) sat = "_SAT"; + else sat = ""; + shader_arb_get_dst_param(ins, &ins->dst[0], dst); /* Destination */ - strcat(tmpLine, " "); - strcat(tmpLine, dst); - strcat(tmpLine, ", "); shader_arb_get_src_param(ins, &ins->src[0], 0, src); - strcat(tmpLine, src); if (ins->src[0].swizzle == WINED3DSP_NOSWIZZLE) { /* Dx sdk says .x is used if no swizzle is given, but our test shows that * .w is used */ - strcat(tmpLine, ".w"); + strcat(src, ".w"); } - shader_addline(buffer, "%s;\n", tmpLine); + shader_addline(buffer, "%s%s %s, %s;\n", instruction, sat, dst, src); } static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) @@ -2224,10 +2221,10 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ NULL, /* WINED3DSIH_POW */ shader_hw_map2gl, - /* WINED3DSIH_RCP */ vshader_hw_rsq_rcp, + /* WINED3DSIH_RCP */ shader_hw_rsq_rcp, /* WINED3DSIH_REP */ NULL, /* WINED3DSIH_RET */ NULL, - /* WINED3DSIH_RSQ */ vshader_hw_rsq_rcp, + /* WINED3DSIH_RSQ */ shader_hw_rsq_rcp, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_hw_map2gl, /* WINED3DSIH_SGN */ NULL,

1 0

Stefan Dösinger : wined3d: Simplify shader_hw_map2gl.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: da47f685220cd238a5ada6afb996a9fa752f9dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=da47f685220cd238a5ada6afb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:20:59 2009 +0200 wined3d: Simplify shader_hw_map2gl. Most of the extra work done in the pixel shader code was not needed or redundant. This patch unifies the two paths. --- dlls/wined3d/arb_program_shader.c | 101 ++++++++---------------------------- 1 files changed, 23 insertions(+), 78 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 67987ba..ec4bea7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -915,8 +915,10 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; const char *instruction; - char arguments[256]; + char arguments[256], dst_str[50]; unsigned int i; + const struct wined3d_shader_dst_param *dst = &ins->dst[0]; + const char *modifier; switch (ins->handler_idx) { @@ -938,7 +940,6 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_MIN: instruction = "MIN"; break; case WINED3DSIH_MOV: instruction = "MOV"; break; case WINED3DSIH_MUL: instruction = "MUL"; break; - case WINED3DSIH_NOP: instruction = "NOP"; break; case WINED3DSIH_POW: instruction = "POW"; break; case WINED3DSIH_SGE: instruction = "SGE"; break; case WINED3DSIH_SLT: instruction = "SLT"; break; @@ -948,83 +949,27 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) break; } - if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) - { - /* Output token related */ - const struct wined3d_shader_dst_param *dst; - char output_rname[256]; - char output_wmask[20]; - char operands[4][100]; - BOOL saturate = FALSE; - BOOL centroid = FALSE; - BOOL partialprecision = FALSE; - const char *modifier; - BOOL is_color; - DWORD shift; - - if (!(ins->dst_count + ins->src_count)) - { - ERR("Opcode \"%#x\" has no parameters\n", ins->handler_idx); - return; - } - dst = &ins->dst[0]; - - /* Process modifiers */ - if (dst->modifiers) - { - DWORD mask = dst->modifiers; - - saturate = mask & WINED3DSPDM_SATURATE; - centroid = mask & WINED3DSPDM_MSAMPCENTROID; - partialprecision = mask & WINED3DSPDM_PARTIALPRECISION; - mask &= ~(WINED3DSPDM_MSAMPCENTROID | WINED3DSPDM_PARTIALPRECISION | WINED3DSPDM_SATURATE); - if (mask) - FIXME("Unrecognized modifier(%#x)\n", mask); - - if (centroid) - FIXME("Unhandled modifier(%#x)\n", mask); - } - shift = dst->shift; - modifier = (saturate && !shift) ? "_SAT" : ""; - - /* Generate input register names (with modifiers) */ - for (i = 0; i < ins->src_count; ++i) - { - shader_arb_get_src_param(ins, &ins->src[i], i, operands[i + 1]); - } + /* All instructions handled by this function have a destination parameter */ + if(dst->modifiers & WINED3DSPDM_SATURATE) modifier = "_SAT"; + else modifier = ""; - /* Handle output register */ - shader_arb_get_register_name(ins->ctx->shader, dst->reg.type, - dst->reg.idx, !!dst->reg.rel_addr, output_rname, &is_color); - strcpy(operands[0], output_rname); - shader_arb_get_write_mask(ins, dst, output_wmask); - strcat(operands[0], output_wmask); - - arguments[0] = '\0'; - strcat(arguments, operands[0]); - for (i = 0; i < ins->src_count; ++i) - { - strcat(arguments, ", "); - strcat(arguments, operands[i + 1]); - } - shader_addline(buffer, "%s%s %s;\n", instruction, modifier, arguments); - } else { - arguments[0] = '\0'; - if (ins->dst_count) - { - char operand[100]; - shader_arb_get_dst_param(ins, &ins->dst[0], operand); - strcat(arguments, " "); - strcat(arguments, operand); - for (i = 0; i < ins->src_count; ++i) - { - strcat(arguments, ", "); - shader_arb_get_src_param(ins, &ins->src[i], i, operand); - strcat(arguments, operand); - } - } - shader_addline(buffer, "%s%s;\n", instruction, arguments); + /* Note that shader_arb_add_dst_param() adds spaces. */ + arguments[0] = '\0'; + shader_arb_get_dst_param(ins, dst, dst_str); + for (i = 0; i < ins->src_count; ++i) + { + char operand[100]; + strcat(arguments, ", "); + shader_arb_get_src_param(ins, &ins->src[i], i, operand); + strcat(arguments, operand); } + shader_addline(buffer, "%s%s %s%s;\n", instruction, modifier, dst_str, arguments); +} + +static void shader_hw_nop(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + shader_addline(buffer, "NOP;\n"); } static void shader_hw_mov(const struct wined3d_shader_instruction *ins) @@ -2275,7 +2220,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_MOV */ shader_hw_mov, /* WINED3DSIH_MOVA */ shader_hw_mov, /* WINED3DSIH_MUL */ shader_hw_map2gl, - /* WINED3DSIH_NOP */ shader_hw_map2gl, + /* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ NULL, /* WINED3DSIH_POW */ shader_hw_map2gl,

1 0

Stefan Dösinger : wined3d: Get rid of the strcat in shader_arb_add_dst_param and make it shader_arb_get_dst_param .
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 7a1f9c84f19d9b6c928f44aefcedd71efe847ba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1f9c84f19d9b6c928f44aef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:18:34 2009 +0200 wined3d: Get rid of the strcat in shader_arb_add_dst_param and make it shader_arb_get_dst_param. --- dlls/wined3d/arb_program_shader.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 44ee5f8..67987ba 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -567,18 +567,16 @@ static void shader_arb_get_register_name(IWineD3DBaseShader *iface, WINED3DSHADE } } -static void shader_arb_add_dst_param(const struct wined3d_shader_instruction *ins, +static void shader_arb_get_dst_param(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_dst_param *wined3d_dst, char *str) { char register_name[255]; char write_mask[6]; BOOL is_color; - strcat(str, " "); - shader_arb_get_register_name(ins->ctx->shader, wined3d_dst->reg.type, wined3d_dst->reg.idx, !!wined3d_dst->reg.rel_addr, register_name, &is_color); - strcat(str, register_name); + strcpy(str, register_name); shader_arb_get_write_mask(ins, wined3d_dst, write_mask); strcat(str, write_mask); @@ -1011,15 +1009,15 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) } shader_addline(buffer, "%s%s %s;\n", instruction, modifier, arguments); } else { - /* Note that shader_arb_add_dst_param() adds spaces. */ - arguments[0] = '\0'; if (ins->dst_count) { - shader_arb_add_dst_param(ins, &ins->dst[0], arguments); + char operand[100]; + shader_arb_get_dst_param(ins, &ins->dst[0], operand); + strcat(arguments, " "); + strcat(arguments, operand); for (i = 0; i < ins->src_count; ++i) { - char operand[100]; strcat(arguments, ", "); shader_arb_get_src_param(ins, &ins->src[i], i, operand); strcat(arguments, operand); @@ -1616,6 +1614,7 @@ static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) const char *instruction; char tmpLine[256]; + char dst[50]; char src[50]; switch(ins->handler_idx) @@ -1628,7 +1627,9 @@ static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) } strcpy(tmpLine, instruction); - shader_arb_add_dst_param(ins, &ins->dst[0], tmpLine); /* Destination */ + shader_arb_get_dst_param(ins, &ins->dst[0], dst); /* Destination */ + strcat(tmpLine, " "); + strcat(tmpLine, dst); strcat(tmpLine, ", "); shader_arb_get_src_param(ins, &ins->src[0], 0, src); strcat(tmpLine, src);

1 0

Stefan Dösinger : wined3d: Merge shader_arb_add_src_param and pshader_gen_input_modifier_line.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 48c2b0d66960790fcd781c391f0a4abe915a8f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c2b0d66960790fcd781c391… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 17:42:16 2009 +0200 wined3d: Merge shader_arb_add_src_param and pshader_gen_input_modifier_line. Mostly based on the code of pshader_gen_input_modifier_line. The space-adding behavior of shader_arb_add_src_param was removed because the plurality of instruction handlers passes an uninitialized buffer in and expects a register name written to its start, and only map2gl and rcp_rsq use the space-adding stuff. I'll change rcp_rsq in a later patch anyway. I changed the name to shader_arb_get_src_param to reflect this behavior. --- dlls/wined3d/arb_program_shader.c | 103 ++++++++++++++++--------------------- 1 files changed, 44 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48c2b0d66960790fcd781…

1 0

Austin English : imm32/tests: Sign compare fix.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 49d08124a6b994d1d7fd785273029365577cabc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d08124a6b994d1d7fd78527… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 8 11:45:12 2009 -0500 imm32/tests: Sign compare fix. --- dlls/imm32/tests/imm32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7e7f752..1951242 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -90,7 +90,7 @@ static void msg_spy_flush_msgs(void) { } static CWPSTRUCT* msg_spy_find_msg(UINT message) { - int i; + UINT i; msg_spy_pump_msg_queue();

1 0

Austin English : msvcrt/tests: Sign compare fixes.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: b7b28159c97f8be9e45246cf7ea3f8731b771b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b28159c97f8be9e45246cf7… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 8 11:46:08 2009 -0500 msvcrt/tests: Sign compare fixes. --- dlls/msvcrt/tests/data.c | 2 +- dlls/msvcrt/tests/heap.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index 40ff46b..db29cd4 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -74,7 +74,7 @@ static void test_initvar( HMODULE hmsvcrt ) int* (*pp_winmajor)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__winmajor"); int* (*pp_winminor)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__winminor"); int* (*pp_osver)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__osver"); - int winver, winmajor, winminor, osver; + unsigned int winver, winmajor, winminor, osver; if( !( pp_winmajor && pp_winminor && pp_winver)) { win_skip("_winver variables are not available\n"); diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 6e6b544..7d3db23 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -103,7 +103,7 @@ static void test_aligned_realloc(unsigned int size1, unsigned int size2, unsigne mem1 = malloc(size1); if (mem1) { - int i; + unsigned int i; for (i = 0; i < size1; i++) ((char *)mem)[i] = i + 1; memcpy(mem1, mem, size1); @@ -138,7 +138,7 @@ static void test_aligned_realloc(unsigned int size1, unsigned int size2, unsigne ok(memcmp(mem2, mem1, min(size1, size2))==0, "_aligned_realloc(%p, %d, %d) has different data\n", mem, size2, alignment); if (memcmp(mem2, mem1, min(size1, size2)) && winetest_debug > 1) { - int i; + unsigned int i; for (i = 0; i < min(size1, size2); i++) { if (((char *)mem2)[i] != ((char *)mem1)[i]) @@ -175,7 +175,7 @@ static void test_aligned_offset_realloc(unsigned int size1, unsigned int size2, mem1 = malloc(size1); if (mem1) { - int i; + unsigned int i; for (i = 0; i < size1; i++) ((char *)mem)[i] = i + 1; memcpy(mem1, mem, size1); @@ -211,7 +211,7 @@ static void test_aligned_offset_realloc(unsigned int size1, unsigned int size2, ok(memcmp(mem2, mem1, min(size1, size2))==0, "_aligned_offset_realloc(%p, %d, %d, %d) has different data\n", mem, size2, alignment, offset); if (memcmp(mem2, mem1, min(size1, size2)) && winetest_debug > 1) { - int i; + unsigned int i; for (i = 0; i < min(size1, size2); i++) { if (((char *)mem2)[i] != ((char *)mem1)[i])

1 0

Austin English : hlink/tests: Sign compare fix.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 5f9e19b4fdd916d315d9fdcd39d56d44cabd582b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f9e19b4fdd916d315d9fdcd3… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 8 11:44:57 2009 -0500 hlink/tests: Sign compare fix. --- dlls/hlink/tests/hlink.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 5e07359..6981942 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -80,7 +80,7 @@ static const char *debugstr_guid(REFIID riid) static void test_HlinkIsShortcut(void) { - int i; + UINT i; HRESULT hres; static const WCHAR file0[] = {'f','i','l','e',0};

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009