wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Paul Chitescu : shell32: Add missing Romanian translation for IDS_SHLEXEC_NOASSOC.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: b647b56984f22837ddfe127814f8aca15779ceca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b647b56984f22837ddfe12781… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Jun 24 11:55:37 2009 +0300 shell32: Add missing Romanian translation for IDS_SHLEXEC_NOASSOC. --- dlls/shell32/shell32_Ro.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Ro.rc b/dlls/shell32/shell32_Ro.rc index 48a9259..cdec0a6 100644 --- a/dlls/shell32/shell32_Ro.rc +++ b/dlls/shell32/shell32_Ro.rc @@ -284,6 +284,8 @@ STRINGTABLE IDS_CPANEL_TITLE "Panoul de control al Wine" IDS_CPANEL_NAME "Nume" IDS_CPANEL_DESCRIPTION "Descriere" + + IDS_SHLEXEC_NOASSOC "Nici un program Windows nu este configurat să deschidă fișiere de acest tip." } STRINGTABLE

1 0

Henri Verbeet : wined3d: Allow the existence of other shader types in get_loop_control_const().
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: f98c6e3cff7a6ef06295b19b8e35bb6aa57e7312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f98c6e3cff7a6ef06295b19b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 24 10:54:19 2009 +0200 wined3d: Allow the existence of other shader types in get_loop_control_const(). --- dlls/wined3d/arb_program_shader.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index df2fa52..b30d3cc 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4362,7 +4362,6 @@ static inline BOOL get_bool_const(const struct wined3d_shader_instruction *ins, static void get_loop_control_const(const struct wined3d_shader_instruction *ins, IWineD3DBaseShaderImpl *This, UINT idx, struct loop_control *loop_control) { - BOOL vshader = shader_is_vshader_version(This->baseShader.reg_maps.shader_version.type); struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; /* Integer constants can either be a local constant, or they can be stored in the shader @@ -4389,23 +4388,26 @@ static void get_loop_control_const(const struct wined3d_shader_instruction *ins, loop_control->step = 0; return; } - else + + switch (This->baseShader.reg_maps.shader_version.type) { - if(vshader) - { + case WINED3D_SHADER_TYPE_VERTEX: /* Count and aL start value are unsigned */ loop_control->count = priv->cur_vs_args->loop_ctrl[idx][0]; loop_control->start = priv->cur_vs_args->loop_ctrl[idx][1]; /* Step is signed. */ loop_control->step = ((char)priv->cur_vs_args->loop_ctrl[idx][2]); - } - else - { + break; + + case WINED3D_SHADER_TYPE_PIXEL: loop_control->count = priv->cur_ps_args->loop_ctrl[idx][0]; loop_control->start = priv->cur_ps_args->loop_ctrl[idx][1]; loop_control->step = ((char)priv->cur_ps_args->loop_ctrl[idx][2]); - } - return; + break; + + default: + FIXME("Unhandled shader type %#x.\n", This->baseShader.reg_maps.shader_version.type); + break; } }

1 0

Henri Verbeet : wined3d: Eliminate a redundant local variable in get_loop_control_const().
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 943ed4e1e969f40a31dc39e4cb9dc3232e22efb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=943ed4e1e969f40a31dc39e4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 24 10:54:18 2009 +0200 wined3d: Eliminate a redundant local variable in get_loop_control_const(). --- dlls/wined3d/arb_program_shader.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a420abf..df2fa52 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4363,15 +4363,14 @@ static void get_loop_control_const(const struct wined3d_shader_instruction *ins, IWineD3DBaseShaderImpl *This, UINT idx, struct loop_control *loop_control) { BOOL vshader = shader_is_vshader_version(This->baseShader.reg_maps.shader_version.type); - WORD flag = (1 << idx); - const local_constant *constant; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; /* Integer constants can either be a local constant, or they can be stored in the shader - * type specific compile args - */ - if(This->baseShader.reg_maps.local_int_consts & flag) + * type specific compile args. */ + if (This->baseShader.reg_maps.local_int_consts & (1 << idx)) { + const local_constant *constant; + LIST_FOR_EACH_ENTRY(constant, &This->baseShader.constantsI, local_constant, entry) { if (constant->idx == idx)

1 0

Henri Verbeet : wined3d: Avoid a redundant copy.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: aec6d319fa805f5b789ea05e7eac1efa124bbc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec6d319fa805f5b789ea05e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 24 10:54:17 2009 +0200 wined3d: Avoid a redundant copy. --- dlls/wined3d/arb_program_shader.c | 37 +++++++++++++++++-------------------- 1 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a948069..a420abf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4359,7 +4359,8 @@ static inline BOOL get_bool_const(const struct wined3d_shader_instruction *ins, } } -static inline void get_int_const(const struct wined3d_shader_instruction *ins, IWineD3DBaseShaderImpl *This, DWORD idx, int *ret) +static void get_loop_control_const(const struct wined3d_shader_instruction *ins, + IWineD3DBaseShaderImpl *This, UINT idx, struct loop_control *loop_control) { BOOL vshader = shader_is_vshader_version(This->baseShader.reg_maps.shader_version.type); WORD flag = (1 << idx); @@ -4375,18 +4376,18 @@ static inline void get_int_const(const struct wined3d_shader_instruction *ins, I { if (constant->idx == idx) { - ret[0] = constant->value[0]; - ret[1] = constant->value[1]; - /* Step / stride is signed */ - ret[2] = (int) constant->value[2]; + loop_control->count = constant->value[0]; + loop_control->start = constant->value[1]; + /* Step is signed. */ + loop_control->step = (int)constant->value[2]; return; } } /* If this happens the flag was set incorrectly */ ERR("Local constant not found\n"); - ret[0] = 0; - ret[1] = 0; - ret[2] = 0; + loop_control->count = 0; + loop_control->start = 0; + loop_control->step = 0; return; } else @@ -4394,16 +4395,16 @@ static inline void get_int_const(const struct wined3d_shader_instruction *ins, I if(vshader) { /* Count and aL start value are unsigned */ - ret[0] = priv->cur_vs_args->loop_ctrl[idx][0]; - ret[1] = priv->cur_vs_args->loop_ctrl[idx][1]; - /* The step/stride is signed */ - ret[2] = ((char) priv->cur_vs_args->loop_ctrl[idx][2]); + loop_control->count = priv->cur_vs_args->loop_ctrl[idx][0]; + loop_control->start = priv->cur_vs_args->loop_ctrl[idx][1]; + /* Step is signed. */ + loop_control->step = ((char)priv->cur_vs_args->loop_ctrl[idx][2]); } else { - ret[0] = priv->cur_ps_args->loop_ctrl[idx][0]; - ret[1] = priv->cur_ps_args->loop_ctrl[idx][1]; - ret[2] = ((char) priv->cur_ps_args->loop_ctrl[idx][2]); + loop_control->count = priv->cur_ps_args->loop_ctrl[idx][0]; + loop_control->start = priv->cur_ps_args->loop_ctrl[idx][1]; + loop_control->step = ((char)priv->cur_ps_args->loop_ctrl[idx][2]); } return; } @@ -4524,14 +4525,10 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio if(!priv->recording) { - int control_values[3]; - get_int_const(ins, This, ins->src[0].reg.idx, control_values); list_init(&priv->record); priv->recording = TRUE; control_frame->outer_loop = TRUE; - control_frame->loop_control.count = control_values[0]; - control_frame->loop_control.start = control_values[1]; - control_frame->loop_control.step = control_values[2]; + get_loop_control_const(ins, This, ins->src[0].reg.idx, &control_frame->loop_control); return; /* Instruction is handled */ } /* Record this loop in the outer loop's recording */

1 0

Henri Verbeet : wined3d: Use a proper structure for "loop_control".
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: fd8ebebe56550d610e4d44a8886b0f652f2ce7aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8ebebe56550d610e4d44a88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 24 10:54:16 2009 +0200 wined3d: Use a proper structure for "loop_control". --- dlls/wined3d/arb_program_shader.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0d4002b..a948069 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -85,6 +85,14 @@ static inline BOOL use_nv_clip(const WineD3D_GL_Info *gl_info) #define ARB_SHADER_PRIVCONST_POS ARB_SHADER_PRIVCONST_BASE + 0 /* ARB_program_shader private data */ + +struct loop_control +{ + unsigned int count; + unsigned int start; + int step; +}; + struct control_frame { struct list entry; @@ -102,7 +110,7 @@ struct control_frame unsigned int loop_no; unsigned int ifc_no; }; - DWORD loop_control[3]; + struct loop_control loop_control; BOOL had_else; }; @@ -4521,9 +4529,9 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio list_init(&priv->record); priv->recording = TRUE; control_frame->outer_loop = TRUE; - control_frame->loop_control[0] = control_values[0]; - control_frame->loop_control[1] = control_values[1]; - control_frame->loop_control[2] = control_values[2]; + control_frame->loop_control.count = control_values[0]; + control_frame->loop_control.start = control_values[1]; + control_frame->loop_control.step = control_values[2]; return; /* Instruction is handled */ } /* Record this loop in the outer loop's recording */ @@ -4559,17 +4567,17 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio if(ins->handler_idx == WINED3DSIH_ENDLOOP) { - shader_addline(buffer, "#unrolling loop: %d iterations, aL=%d, inc %d\n", - control_frame->loop_control[0], control_frame->loop_control[1], - control_frame->loop_control[2]); - aL = control_frame->loop_control[1]; + shader_addline(buffer, "#unrolling loop: %u iterations, aL=%u, inc %d\n", + control_frame->loop_control.count, control_frame->loop_control.start, + control_frame->loop_control.step); + aL = control_frame->loop_control.start; } else { - shader_addline(buffer, "#unrolling rep: %d iterations\n", control_frame->loop_control[0]); + shader_addline(buffer, "#unrolling rep: %u iterations\n", control_frame->loop_control.count); } - for(iteration = 0; iteration < control_frame->loop_control[0]; iteration++) + for (iteration = 0; iteration < control_frame->loop_control.count; ++iteration) { struct recorded_instruction *rec_ins; if(ins->handler_idx == WINED3DSIH_ENDLOOP) @@ -4589,7 +4597,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio if(ins->handler_idx == WINED3DSIH_ENDLOOP) { - aL += control_frame->loop_control[2]; + aL += control_frame->loop_control.step; } } shader_addline(buffer, "#end loop/rep\n");

1 0

Henri Verbeet : wined3d: Add some missing GL locking documentation to arb_program_shader.c.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 4caf43ddb767658f66b6528f9ae1ee2d7c6b4eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4caf43ddb767658f66b6528f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 24 10:54:15 2009 +0200 wined3d: Add some missing GL locking documentation to arb_program_shader.c. --- dlls/wined3d/arb_program_shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7094824..0d4002b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -354,6 +354,7 @@ static void shader_arb_load_np2fixup_constants( /* not implemented */ } +/* GL locking is done by the caller. */ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) { IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; @@ -417,6 +418,7 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) checkGLcall("Load ps int consts\n"); } +/* GL locking is done by the caller. */ static inline void shader_arb_vs_local_constants(IWineD3DDeviceImpl* deviceImpl) { IWineD3DStateBlockImpl* stateBlock;

1 0

Aric Stewart : msctf/tests: Verify to make sure OnPopContext happens before context is removed from stack .
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: a307c6fdc294d5e7c8775e0cbd193443b1537c1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a307c6fdc294d5e7c8775e0cb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 24 17:30:18 2009 +0900 msctf/tests: Verify to make sure OnPopContext happens before context is removed from stack. --- dlls/msctf/tests/inputprocessor.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index b9f2469..4d94d3c 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -461,6 +461,20 @@ ITfContext *pic) static HRESULT WINAPI ThreadMgrEventSink_OnPopContext(ITfThreadMgrEventSink *iface, ITfContext *pic) { + HRESULT hr; + ITfDocumentMgr *docmgr; + ITfContext *test; + + hr = ITfContext_GetDocumentMgr(pic,&docmgr); + ok(SUCCEEDED(hr),"GetDocumenMgr failed\n"); + ITfDocumentMgr_Release(docmgr); + test = (ITfContext*)0xdeadbeef; + hr = ITfDocumentMgr_GetTop(docmgr,&test); + ok(SUCCEEDED(hr),"GetTop failed\n"); + ok(test == pic, "Wrong context is on top\n"); + if (test) + ITfContext_Release(test); + ok(test_OnPopContext == SINK_EXPECTED, "Unexpected OnPopContext sink\n"); test_OnPopContext = SINK_FIRED; return S_OK;

1 0

Aric Stewart : msctf: Context initialization happens before OnPushContext sink.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: e73b17d018318d0e257ceb8409c4f0e0209a6a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73b17d018318d0e257ceb840… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 24 17:29:51 2009 +0900 msctf: Context initialization happens before OnPushContext sink. --- dlls/msctf/documentmgr.c | 2 +- dlls/msctf/tests/inputprocessor.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index c7aa820..f5ea71f 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -145,8 +145,8 @@ static HRESULT WINAPI DocumentMgr_Push(ITfDocumentMgr *iface, ITfContext *pic) This->contextStack[1] = This->contextStack[0]; This->contextStack[0] = check; - ITfThreadMgrEventSink_OnPushContext(This->ThreadMgrSink,check); Context_Initialize(check, iface); + ITfThreadMgrEventSink_OnPushContext(This->ThreadMgrSink,check); return S_OK; } diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 61389cf..b9f2469 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -439,6 +439,20 @@ ITfDocumentMgr *pdimFocus, ITfDocumentMgr *pdimPrevFocus) static HRESULT WINAPI ThreadMgrEventSink_OnPushContext(ITfThreadMgrEventSink *iface, ITfContext *pic) { + HRESULT hr; + ITfDocumentMgr *docmgr; + ITfContext *test; + + hr = ITfContext_GetDocumentMgr(pic,&docmgr); + ok(SUCCEEDED(hr),"GetDocumenMgr failed\n"); + test = (ITfContext*)0xdeadbeef; + ITfDocumentMgr_Release(docmgr); + hr = ITfDocumentMgr_GetTop(docmgr,&test); + ok(SUCCEEDED(hr),"GetTop failed\n"); + ok(test == pic, "Wrong context is on top\n"); + if (test) + ITfContext_Release(test); + ok(test_OnPushContext == SINK_EXPECTED, "Unexpected OnPushContext sink\n"); test_OnPushContext = SINK_FIRED; return S_OK;

1 0

Aric Stewart : msctf: ITfContext:: GetDocumentMgr should AddRef the DocumentMgr.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 2dd5a3bea2fbcc049132708cc4859126ab2a03cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd5a3bea2fbcc049132708cc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 24 17:29:05 2009 +0900 msctf: ITfContext::GetDocumentMgr should AddRef the DocumentMgr. --- dlls/msctf/context.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index e11a0e8..5be06d3 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -532,6 +532,9 @@ static HRESULT WINAPI Context_GetDocumentMgr (ITfContext *iface, *ppDm = This->manager; if (!This->manager) return S_FALSE; + + ITfDocumentMgr_AddRef(This->manager); + return S_OK; }

1 0

Aric Stewart : msctf: Implement ITfContext::GetStatus.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 190357b14ba498cb4504410069cd4bd0bfec1955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=190357b14ba498cb450441006… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 24 17:28:31 2009 +0900 msctf: Implement ITfContext::GetStatus. --- dlls/msctf/context.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index e5cf602..e11a0e8 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -466,8 +466,25 @@ static HRESULT WINAPI Context_GetStatus (ITfContext *iface, TF_STATUS *pdcs) { Context *This = (Context *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %p\n",This,pdcs); + + if (!This->connected) + return TF_E_DISCONNECTED; + + if (!pdcs) + return E_INVALIDARG; + + if (!This->pITextStoreACP) + { + FIXME("Context does not have a ITextStoreACP\n"); + return E_NOTIMPL; + } + + ITextStoreACP_GetStatus(This->pITextStoreACP, &This->documentStatus); + + *pdcs = This->documentStatus; + + return S_OK; } static HRESULT WINAPI Context_GetProperty (ITfContext *iface,

1 0

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 June 2009