September 2010 - Wine-Commits

Hwang YunSong : inetcpl.cpl: Update Korean resource.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: 976aaabc8ef7bfe240b920b592d4705583212625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=976aaabc8ef7bfe240b920b59… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Sep 28 16:35:07 2010 +0900 inetcpl.cpl: Update Korean resource. --- dlls/inetcpl.cpl/cpl_Ko.rc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Ko.rc b/dlls/inetcpl.cpl/cpl_Ko.rc index f6aa9ae..ffcceb0 100644 --- a/dlls/inetcpl.cpl/cpl_Ko.rc +++ b/dlls/inetcpl.cpl/cpl_Ko.rc @@ -31,3 +31,18 @@ BEGIN IDS_CPL_NAME "인터넷 설정" IDS_CPL_INFO "Wine 인터넷 브라우저와 관련 설정 처리" END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "내용" +BEGIN + + GROUPBOX " 인증서 ", IDC_STATIC, 4, 4, 312, 50 + LTEXT " 인증서는 당신의 개인 식별과 인증기관과 게시자 식별에 사용됩니다.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "인증서...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "발행자... ", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

1 0

Huw Davies : ole32: Call the draw_continue function.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: 250b55c41d70aab736453cfb36e714b3e5a28194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=250b55c41d70aab736453cfb3… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 28 10:48:23 2010 +0100 ole32: Call the draw_continue function. --- dlls/ole32/datacache.c | 2 ++ dlls/ole32/tests/ole2.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 2f26363..db4cc0c 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1633,6 +1633,8 @@ static HRESULT WINAPI DataCache_Draw( if (cache_entry->stgmedium.tymed == TYMED_NULL) continue; + if (pfnContinue && !pfnContinue(dwContinue)) return E_ABORT; + switch (cache_entry->data_cf) { case CF_METAFILEPICT: diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 080c2f2..48584a1 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -897,6 +897,12 @@ static BOOL STDMETHODCALLTYPE draw_continue(ULONG_PTR param) return TRUE; } +static BOOL STDMETHODCALLTYPE draw_continue_false(ULONG_PTR param) +{ + CHECK_EXPECTED_METHOD("draw_continue_false"); + return FALSE; +} + static HRESULT WINAPI AdviseSink_QueryInterface(IAdviseSink *iface, REFIID riid, void **ppv) { if (IsEqualIID(riid, &IID_IAdviseSink) || IsEqualIID(riid, &IID_IUnknown)) @@ -1117,6 +1123,7 @@ static void test_data_cache(void) { "AdviseSink_OnViewChange", 0 }, { "AdviseSink_OnViewChange", 0 }, { "draw_continue", 1 }, + { "draw_continue_false", 1 }, { "DataObject_DAdvise", 0 }, { "DataObject_DAdvise", 0 }, { "DataObject_DUnadvise", 0 }, @@ -1268,6 +1275,16 @@ static void test_data_cache(void) hr = IViewObject_Draw(pViewObject, DVASPECT_CONTENT, -1, NULL, NULL, NULL, hdcMem, &rcBounds, NULL, draw_continue, 0xdeadbeef); ok(hr == OLE_E_BLANK, "IViewObject_Draw with uncached aspect should have returned OLE_E_BLANK instead of 0x%08x\n", hr); + /* a NULL draw_continue fn ptr */ + hr = IViewObject_Draw(pViewObject, DVASPECT_ICON, -1, NULL, NULL, NULL, hdcMem, &rcBounds, NULL, NULL, 0xdeadbeef); + ok_ole_success(hr, "IViewObject_Draw"); + + /* draw_continue that returns FALSE to abort drawing */ + hr = IViewObject_Draw(pViewObject, DVASPECT_ICON, -1, NULL, NULL, NULL, hdcMem, &rcBounds, NULL, draw_continue_false, 0xdeadbeef); + ok(hr == E_ABORT || + broken(hr == S_OK), /* win9x may skip the callbacks */ + "IViewObject_Draw with draw_continue_false returns 0x%08x\n", hr); + DeleteDC(hdcMem); hr = IOleCacheControl_OnRun(pOleCacheControl, &DataObject);

1 0

Adam Martinson : msxml3/tests: Prevent a double-free in test_get_ownerDocument().
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: c515d384ef5d33a70f93c0cc5e40aab8391060c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c515d384ef5d33a70f93c0cc5… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Sep 27 13:54:39 2010 -0500 msxml3/tests: Prevent a double-free in test_get_ownerDocument(). --- dlls/msxml3/tests/domdoc.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 205716a..eb057c4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5755,14 +5755,10 @@ static void test_get_ownerDocument(void) VariantClear(&var); /* set to XPath and check that new instances use it */ - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("XPath"); - hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), var); + hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), _variantbstr_("XPath")); ok( hr == S_OK, "got 0x%08x\n", hr); - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("xmlns:wi=\'www.winehq.org\'"); - hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), var); + hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_("xmlns:wi=\'www.winehq.org\'")); todo_wine ok( hr == S_OK, "got 0x%08x\n", hr); hr = IXMLDOMDocument2_get_firstChild(doc, &node); @@ -5771,7 +5767,6 @@ static void test_get_ownerDocument(void) hr = IXMLDOMNode_get_ownerDocument(node, &doc1); ok( hr == S_OK, "got 0x%08x\n", hr); - VariantClear(&var); hr = IXMLDOMDocument_QueryInterface(doc1, &IID_IXMLDOMDocument2, (void**)&doc_owner); ok( hr == S_OK, "got 0x%08x\n", hr); ok( doc_owner != doc, "got %p, doc %p\n", doc_owner, doc);

1 0

Frédéric Delanoy : ipconfig: Update French translation.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: d65e1f2d33efda59e5b303de9e939583d15999df URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65e1f2d33efda59e5b303de9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 27 22:56:47 2010 +0200 ipconfig: Update French translation. --- programs/ipconfig/Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Fr.rc b/programs/ipconfig/Fr.rc index f1cd12c..4986176 100644 --- a/programs/ipconfig/Fr.rc +++ b/programs/ipconfig/Fr.rc @@ -46,4 +46,5 @@ STRINGTABLE STRING_DHCP_ENABLED, "DHCP activé" STRING_YES, "Oui" STRING_NO, "Non" + STRING_DEFAULT_GATEWAY, "Passerelle par défaut" }

1 0

Huw Davies : ole32/tests: Mark the draw_continue callbacks as optional. Win9x can skip calls under low-load conditions.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: 6c7dd939cfb130a67ca5e4a2d852fe250e15b39e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7dd939cfb130a67ca5e4a2d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 28 10:39:54 2010 +0100 ole32/tests: Mark the draw_continue callbacks as optional. Win9x can skip calls under low-load conditions. --- dlls/ole32/tests/ole2.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 8d23df5..080c2f2 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1116,7 +1116,7 @@ static void test_data_cache(void) { { "AdviseSink_OnViewChange", 0 }, { "AdviseSink_OnViewChange", 0 }, - { "draw_continue", 0 }, + { "draw_continue", 1 }, { "DataObject_DAdvise", 0 }, { "DataObject_DAdvise", 0 }, { "DataObject_DUnadvise", 0 }, @@ -1126,9 +1126,9 @@ static void test_data_cache(void) static const struct expected_method methods_cacheload[] = { { "AdviseSink_OnViewChange", 0 }, - { "draw_continue", 0 }, - { "draw_continue", 0 }, - { "draw_continue", 0 }, + { "draw_continue", 1 }, + { "draw_continue", 1 }, + { "draw_continue", 1 }, { "DataObject_GetData", 0 }, { "DataObject_GetData", 0 }, { "DataObject_GetData", 0 },

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to use_ps().
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: a7ded9a67d55116350b5ff3eb3827e8d7e9b93b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ded9a67d55116350b5ff3eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 28 12:00:24 2010 +0200 wined3d: Pass a wined3d_state structure to use_ps(). --- dlls/wined3d/arb_program_shader.c | 62 +++++++++++++++++++--------------- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/device.c | 7 ++-- dlls/wined3d/drawprim.c | 25 +++++++------ dlls/wined3d/nvidia_texture_shader.c | 9 +++-- dlls/wined3d/state.c | 54 ++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 4 +- 7 files changed, 90 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7ded9a67d55116350b5f…

1 0

Misha Koshelev : d3dx9_36: Implement D3DXCreateCylinder.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: 09af2a2bf9cd781fd8f5b4405bc64dc00ddb3d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=09af2a2bf9cd781fd8f5b4405… Author: Misha Koshelev <misha680(a)gmail.com> Date: Mon Sep 27 15:19:22 2010 -0500 d3dx9_36: Implement D3DXCreateCylinder. --- dlls/d3dx9_36/mesh.c | 217 ++++++++++++++++++++++++++++++++++++++++---- dlls/d3dx9_36/tests/mesh.c | 24 +++--- 2 files changed, 210 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09af2a2bf9cd781fd8f5b…

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to use_vs().
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: 9224751a13dae4efbc809f4319c0de264712abcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9224751a13dae4efbc809f431… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 28 12:00:23 2010 +0200 wined3d: Pass a wined3d_state structure to use_vs(). --- dlls/wined3d/arb_program_shader.c | 34 ++++++----- dlls/wined3d/ati_fragment_shader.c | 5 +- dlls/wined3d/buffer.c | 5 +- dlls/wined3d/device.c | 9 ++- dlls/wined3d/drawprim.c | 25 ++++---- dlls/wined3d/glsl_shader.c | 5 +- dlls/wined3d/shader.c | 15 +++-- dlls/wined3d/state.c | 118 +++++++++++++++++++----------------- dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d_private.h | 5 +- 10 files changed, 121 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9224751a13dae4efbc809…

1 0

Henri Verbeet : wined3d: Remove IWineD3DStateBlock::InitStartupStateBlock() from the public wined3d interface.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: d6d345fa8aee8f394e20ea2f9bbcd3645b999992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d345fa8aee8f394e20ea2f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 28 12:00:21 2010 +0200 wined3d: Remove IWineD3DStateBlock::InitStartupStateBlock() from the public wined3d interface. --- dlls/wined3d/device.c | 7 ++----- dlls/wined3d/stateblock.c | 8 ++------ dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 2 -- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 89ddb85..0967bd8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1888,7 +1888,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, /* Set up some starting GL setup */ /* Setup all the devices defaults */ - IWineD3DStateBlock_InitStartupStateBlock((IWineD3DStateBlock *)This->stateBlock); + stateblock_init_default_state(This->stateBlock); context = context_acquire(This, swapchain->front_buffer); @@ -6469,10 +6469,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface, This->updateStateBlock = This->stateBlock; IWineD3DStateBlock_AddRef((IWineD3DStateBlock *)This->updateStateBlock); - hr = IWineD3DStateBlock_InitStartupStateBlock((IWineD3DStateBlock *) This->stateBlock); - if(FAILED(hr)) { - ERR("Resetting the stateblock failed with error 0x%08x\n", hr); - } + stateblock_init_default_state(This->stateBlock); if(wined3d_settings.offscreen_rendering_mode == ORM_FBO) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f8eb931..5b58de9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1078,9 +1078,8 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Apply(IWineD3DStateBlock *iface) return WINED3D_OK; } -static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStateBlock *iface) +void stateblock_init_default_state(IWineD3DStateBlockImpl *stateblock) { - IWineD3DStateBlockImpl *stateblock = (IWineD3DStateBlockImpl *)iface; IWineD3DDeviceImpl *device = stateblock->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_state *state = &stateblock->state; @@ -1097,7 +1096,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DState IWineD3DSurface *backbuffer; HRESULT hr; - TRACE("iface %p.\n", iface); + TRACE("stateblock %p.\n", stateblock); stateblock->blockType = WINED3DSBT_INIT; @@ -1328,8 +1327,6 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DState } TRACE("Done.\n"); - - return WINED3D_OK; } /********************************************************** @@ -1345,7 +1342,6 @@ static const IWineD3DStateBlockVtbl IWineD3DStateBlock_Vtbl = /* IWineD3DStateBlock */ IWineD3DStateBlockImpl_Capture, IWineD3DStateBlockImpl_Apply, - IWineD3DStateBlockImpl_InitStartupStateBlock }; HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl *device, WINED3DSTATEBLOCKTYPE type) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 61cd60d..663a9d4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2429,6 +2429,7 @@ struct IWineD3DStateBlockImpl HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl *device, WINED3DSTATEBLOCKTYPE type) DECLSPEC_HIDDEN; void stateblock_init_contained_states(IWineD3DStateBlockImpl *object) DECLSPEC_HIDDEN; +void stateblock_init_default_state(IWineD3DStateBlockImpl *stateblock) DECLSPEC_HIDDEN; static inline void stateblock_apply_state(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index fcc6a89..548a08a 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2647,8 +2647,6 @@ interface IWineD3DStateBlock : IUnknown ); HRESULT Apply( ); - HRESULT InitStartupStateBlock( - ); } [

1 0

Henri Verbeet : wined3d: Simply refuse to create shaders if they' re disabled.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: e59fdb83a672b6efcede100d24d658f151b5b53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59fdb83a672b6efcede100d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 28 12:00:22 2010 +0200 wined3d: Simply refuse to create shaders if they're disabled. The functionality is a bit questionable in the first place, but there is some use in the part that limits the maximum reported shader versions. --- dlls/wined3d/device.c | 15 ++++++++++----- dlls/wined3d/wined3d_private.h | 7 +++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0967bd8..c1ce5f8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -408,8 +408,7 @@ static void device_trace_strided_stream_info(const struct wined3d_stream_info *s void device_update_stream_info(IWineD3DDeviceImpl *device, const struct wined3d_gl_info *gl_info) { struct wined3d_stream_info *stream_info = &device->strided_streams; - IWineD3DStateBlockImpl *stateblock = device->stateBlock; - BOOL vs = stateblock->state.vertex_shader && device->vs_selected_mode != SHADER_NONE; + const struct wined3d_state *state = &device->stateBlock->state; BOOL fixup = FALSE; if (device->up_strided) @@ -422,12 +421,12 @@ void device_update_stream_info(IWineD3DDeviceImpl *device, const struct wined3d_ else { TRACE("============================= Vertex Declaration =============================\n"); - device_stream_info_from_declaration(device, vs, stream_info, &fixup); + device_stream_info_from_declaration(device, !!state->vertex_shader, stream_info, &fixup); } - if (vs && !stream_info->position_transformed) + if (state->vertex_shader && !stream_info->position_transformed) { - if (stateblock->state.vertex_declaration->half_float_conv_needed && !fixup) + if (state->vertex_declaration->half_float_conv_needed && !fixup) { TRACE("Using drawStridedSlow with vertex shaders for FLOAT16 conversion.\n"); device->useDrawStridedSlow = TRUE; @@ -1515,6 +1514,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac IWineD3DVertexShaderImpl *object; HRESULT hr; + if (This->vs_selected_mode == SHADER_NONE) + return WINED3DERR_INVALIDCALL; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1575,6 +1577,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePixelShader(IWineD3DDevice *iface IWineD3DPixelShaderImpl *object; HRESULT hr; + if (This->ps_selected_mode == SHADER_NONE) + return WINED3DERR_INVALIDCALL; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 663a9d4..036d6f4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3023,14 +3023,13 @@ static inline BOOL use_vs(IWineD3DStateBlockImpl *stateblock) * IWineD3DDeviceImpl_FindTexUnitMap(). This is safe because * stateblock->vertexShader implies a vertex declaration instead of ddraw * style strided data. */ - return (stateblock->state.vertex_shader - && !stateblock->state.vertex_declaration->position_transformed - && stateblock->device->vs_selected_mode != SHADER_NONE); + return stateblock->state.vertex_shader + && !stateblock->state.vertex_declaration->position_transformed; } static inline BOOL use_ps(IWineD3DStateBlockImpl *stateblock) { - return (stateblock->state.pixel_shader && stateblock->device->ps_selected_mode != SHADER_NONE); + return !!stateblock->state.pixel_shader; } /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */

1 0