wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Henri Verbeet : wined3d: Avoid some unneeded depthstencil copies.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 8be020776b51e08172cce0c43689f884dc0dde7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be020776b51e08172cce0c43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 17 10:19:52 2009 +0200 wined3d: Avoid some unneeded depthstencil copies. --- dlls/wined3d/drawprim.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c92659f..acbfbf9 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -574,10 +574,16 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT numberOfVertice if (This->stencilBufferTarget) { /* Note that this depends on the ActivateContext call above to set - * This->render_offscreen properly */ + * This->render_offscreen properly. We don't currently take the + * Z-compare function into account, but we could skip loading the + * depthstencil for D3DCMP_NEVER and D3DCMP_ALWAYS as well. Also note + * that we never copy the stencil data.*/ DWORD location = This->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; - surface_load_ds_location(This->stencilBufferTarget, location); - surface_modify_ds_location(This->stencilBufferTarget, location); + if (This->stateBlock->renderState[WINED3DRS_ZWRITEENABLE] + || This->stateBlock->renderState[WINED3DRS_ZENABLE]) + surface_load_ds_location(This->stencilBufferTarget, location); + if (This->stateBlock->renderState[WINED3DRS_ZWRITEENABLE]) + surface_modify_ds_location(This->stencilBufferTarget, location); } /* Ok, we will be updating the screen from here onwards so grab the lock */

1 0

Henri Verbeet : wined3d: Only initialize unused components of varyings that are read.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 2c009e4d874722c1a7b50b1c0ecf7a7eaa3e9002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c009e4d874722c1a7b50b1c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 17 10:19:51 2009 +0200 wined3d: Only initialize unused components of varyings that are read. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 846044f..e065296 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3423,7 +3423,8 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in * input varyings are assigned above, if the optimizer works properly. */ for(i = 0; i < in_count + 2; i++) { - if(set[i] != WINED3DSP_WRITEMASK_ALL) { + if (set[i] && set[i] != WINED3DSP_WRITEMASK_ALL) + { unsigned int size = 0; memset(reg_mask, 0, sizeof(reg_mask)); if(!(set[i] & WINED3DSP_WRITEMASK_0)) {

1 0

Henri Verbeet : wined3d: Fall back to backbuffer offscreen rendering if FBOs are unavailable.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: fccb3d82fd5b05f0ece48e2c0547ca3357c12a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fccb3d82fd5b05f0ece48e2c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 17 10:17:09 2009 +0200 wined3d: Fall back to backbuffer offscreen rendering if FBOs are unavailable. Backbuffer appears to be a better choice than PBuffer at the moment, since PBuffer appears to be somewhat broken. --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 05443fc..3354f7b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1031,8 +1031,8 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { /* We can only use ORM_FBO when the hardware supports it. */ if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && !gl_info->supported[EXT_FRAMEBUFFER_OBJECT]) { - WARN_(d3d_caps)("GL_EXT_framebuffer_object not supported, falling back to PBuffer offscreen rendering mode.\n"); - wined3d_settings.offscreen_rendering_mode = ORM_PBUFFER; + WARN_(d3d_caps)("GL_EXT_framebuffer_object not supported, falling back to backbuffer offscreen rendering mode.\n"); + wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; } /* MRTs are currently only supported when FBOs are used. */

1 0

Henri Verbeet : wined3d: Fix a typo.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: dad6c311ec2c033815d549f0d1cf005e27661027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad6c311ec2c033815d549f0d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 17 10:19:49 2009 +0200 wined3d: Fix a typo. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6ab0443..eedc257 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2508,7 +2508,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } default: - ERR("Unsupported conversation type %d\n", convert); + ERR("Unsupported conversion type %#x.\n", convert); } return WINED3D_OK; }

1 0

Aric Stewart : msctf: Implement ITfCompartmentMgr::EnumCompartments.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 6b2f56a0a77ce466cbd8b210d50d5d560009e0ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2f56a0a77ce466cbd8b210d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 17 17:01:37 2009 +0900 msctf: Implement ITfCompartmentMgr::EnumCompartments. --- dlls/msctf/compartmentmgr.c | 157 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 155 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 2e6c798..5342568 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -59,6 +59,15 @@ typedef struct tagCompartmentMgr { struct list values; } CompartmentMgr; +typedef struct tagCompartmentEnumGuid { + const IEnumGUIDVtbl *Vtbl; + LONG refCount; + + struct list *values; + struct list *cursor; +} CompartmentEnumGuid; + +static HRESULT CompartmentEnumGuid_Constructor(struct list* values, IEnumGUID **ppOut); HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *iface) { @@ -166,8 +175,10 @@ static HRESULT WINAPI CompartmentMgr_EnumCompartments(ITfCompartmentMgr *iface, IEnumGUID **ppEnum) { CompartmentMgr *This = (CompartmentMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %p\n",This,ppEnum); + if (!ppEnum) + return E_INVALIDARG; + return CompartmentEnumGuid_Constructor(&This->values, ppEnum); } static const ITfCompartmentMgrVtbl CompartmentMgr_CompartmentMgrVtbl = @@ -214,3 +225,145 @@ HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown ** return hr; } } + +/************************************************** + * IEnumGUID implementaion for ITfCompartmentMgr::EnumCompartments + **************************************************/ +static void CompartmentEnumGuid_Destructor(CompartmentEnumGuid *This) +{ + TRACE("destroying %p\n", This); + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI CompartmentEnumGuid_QueryInterface(IEnumGUID *iface, REFIID iid, LPVOID *ppvOut) +{ + CompartmentEnumGuid *This = (CompartmentEnumGuid *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IEnumGUID)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI CompartmentEnumGuid_AddRef(IEnumGUID *iface) +{ + CompartmentEnumGuid *This = (CompartmentEnumGuid*)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI CompartmentEnumGuid_Release(IEnumGUID *iface) +{ + CompartmentEnumGuid *This = (CompartmentEnumGuid *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + CompartmentEnumGuid_Destructor(This); + return ret; +} + +/***************************************************** + * IEnumGuid functions + *****************************************************/ +static HRESULT WINAPI CompartmentEnumGuid_Next( LPENUMGUID iface, + ULONG celt, GUID *rgelt, ULONG *pceltFetched) +{ + CompartmentEnumGuid *This = (CompartmentEnumGuid *)iface; + ULONG fetched = 0; + + TRACE("(%p)\n",This); + + if (rgelt == NULL) return E_POINTER; + + while (fetched < celt && This->cursor) + { + CompartmentValue* value = LIST_ENTRY(This->cursor,CompartmentValue,entry); + if (!value) + break; + + This->cursor = list_next(This->values,This->cursor); + *rgelt = value->guid; + + ++fetched; + ++rgelt; + } + + if (pceltFetched) *pceltFetched = fetched; + return fetched == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI CompartmentEnumGuid_Skip( LPENUMGUID iface, ULONG celt) +{ + CompartmentEnumGuid *This = (CompartmentEnumGuid *)iface; + TRACE("(%p)\n",This); + + This->cursor = list_next(This->values,This->cursor); + return S_OK; +} + +static HRESULT WINAPI CompartmentEnumGuid_Reset( LPENUMGUID iface) +{ + CompartmentEnumGuid *This = (CompartmentEnumGuid *)iface; + TRACE("(%p)\n",This); + This->cursor = list_head(This->values); + return S_OK; +} + +static HRESULT WINAPI CompartmentEnumGuid_Clone( LPENUMGUID iface, + IEnumGUID **ppenum) +{ + CompartmentEnumGuid *This = (CompartmentEnumGuid *)iface; + HRESULT res; + + TRACE("(%p)\n",This); + + if (ppenum == NULL) return E_POINTER; + + res = CompartmentEnumGuid_Constructor(This->values, ppenum); + if (SUCCEEDED(res)) + { + CompartmentEnumGuid *new_This = (CompartmentEnumGuid *)*ppenum; + new_This->cursor = This->cursor; + } + return res; +} + +static const IEnumGUIDVtbl IEnumGUID_Vtbl ={ + CompartmentEnumGuid_QueryInterface, + CompartmentEnumGuid_AddRef, + CompartmentEnumGuid_Release, + + CompartmentEnumGuid_Next, + CompartmentEnumGuid_Skip, + CompartmentEnumGuid_Reset, + CompartmentEnumGuid_Clone +}; + +static HRESULT CompartmentEnumGuid_Constructor(struct list *values, IEnumGUID **ppOut) +{ + CompartmentEnumGuid *This; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(CompartmentEnumGuid)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->Vtbl= &IEnumGUID_Vtbl; + This->refCount = 1; + + This->values = values; + This->cursor = list_head(values); + + TRACE("returning %p\n", This); + *ppOut = (IEnumGUID*)This; + return S_OK; +}

1 0

Aric Stewart : msctf: Implement ITfCompartmentMgr::ClearCompartment.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 979c9296566a29305f0e4d1d78eb72b54ef91147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=979c9296566a29305f0e4d1d7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 17 17:01:16 2009 +0900 msctf: Implement ITfCompartmentMgr::ClearCompartment. --- dlls/msctf/compartmentmgr.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index ecbe3b1..2e6c798 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -33,6 +33,7 @@ #include "winerror.h" #include "objbase.h" #include "oleauto.h" +#include "olectl.h" #include "wine/unicode.h" #include "wine/list.h" @@ -140,9 +141,25 @@ static HRESULT WINAPI CompartmentMgr_GetCompartment(ITfCompartmentMgr *iface, static HRESULT WINAPI CompartmentMgr_ClearCompartment(ITfCompartmentMgr *iface, TfClientId tid, REFGUID rguid) { + struct list *cursor; CompartmentMgr *This = (CompartmentMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %i %s\n",This,tid,debugstr_guid(rguid)); + + LIST_FOR_EACH(cursor, &This->values) + { + CompartmentValue* value = LIST_ENTRY(cursor,CompartmentValue,entry); + if (IsEqualGUID(rguid,&value->guid)) + { + if (value->owner && tid != value->owner) + return E_UNEXPECTED; + list_remove(cursor); + ITfCompartment_Release(value->compartment); + HeapFree(GetProcessHeap(),0,value); + return S_OK; + } + } + + return CONNECT_E_NOCONNECTION; } static HRESULT WINAPI CompartmentMgr_EnumCompartments(ITfCompartmentMgr *iface,

1 0

Aric Stewart : msctf: Contexts have a default DocumentMgr of the one that creates them.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: ca9ca58c20a5ab0297b4f0db18ac02c5639be8b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9ca58c20a5ab0297b4f0db1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 17 17:00:03 2009 +0900 msctf: Contexts have a default DocumentMgr of the one that creates them. --- dlls/msctf/context.c | 3 ++- dlls/msctf/documentmgr.c | 2 +- dlls/msctf/msctf_internal.h | 2 +- dlls/msctf/tests/inputprocessor.c | 10 ++++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 5eaffcf..e5cf602 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -709,7 +709,7 @@ static const ITfInsertAtSelectionVtbl Context_InsertAtSelectionVtbl = InsertAtSelection_InsertEmbeddedAtSelection, }; -HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **ppOut, TfEditCookie *pecTextStore) +HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore) { Context *This; EditCookie *cookie; @@ -733,6 +733,7 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **pp This->refCount = 1; This->tidOwner = tidOwner; This->connected = FALSE; + This->manager = mgr; CompartmentMgr_Constructor((IUnknown*)This, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 09cadb6..c7aa820 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -123,7 +123,7 @@ static HRESULT WINAPI DocumentMgr_CreateContext(ITfDocumentMgr *iface, { DocumentMgr *This = (DocumentMgr *)iface; TRACE("(%p) 0x%x 0x%x %p %p %p\n",This,tidOwner,dwFlags,punk,ppic,pecTextStore); - return Context_Constructor(tidOwner, punk, ppic, pecTextStore); + return Context_Constructor(tidOwner, punk, iface, ppic, pecTextStore); } static HRESULT WINAPI DocumentMgr_Push(ITfDocumentMgr *iface, ITfContext *pic) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 3b959be..d2b1a2e 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -33,7 +33,7 @@ extern ITfCompartmentMgr *globalCompartmentMgr; extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr **ppOut); -extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **ppOut, TfEditCookie *pecTextStore); +extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore); extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut); diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 90d6989..67d53c6 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1146,6 +1146,11 @@ static void test_startSession(void) hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, NULL, &cxt3, &editCookie); ok(SUCCEEDED(hr),"CreateContext Failed\n"); + hr = ITfContext_GetDocumentMgr(cxt,&dmtest); + ok(hr == S_OK, "ITfContext_GetDocumentMgr failed with %x\n",hr); + ok(dmtest == g_dm, "Wrong documentmgr\n"); + ITfDocumentMgr_Release(dmtest); + cnt = check_context_refcount(cxt); test_OnPushContext = SINK_EXPECTED; test_ACP_AdviseSink = SINK_EXPECTED; @@ -1215,6 +1220,11 @@ static void test_startSession(void) ok(check_context_refcount(cxt2) < cnt, "Ref count did not decrease\n"); ok(test_OnPopContext == SINK_FIRED, "OnPopContext sink not fired\n"); + dmtest = (void *)0xfeedface; + hr = ITfContext_GetDocumentMgr(cxt2,&dmtest); + ok(hr == S_FALSE, "ITfContext_GetDocumentMgr wrong rc %x\n",hr); + ok(dmtest == NULL,"returned documentmgr should be null\n"); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n");

1 0

Aric Stewart : msctf: Implement ITfThreadMgr::IsThreadFocus.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 2e52edf38d19034796c1040f3b5a07f972cb051b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e52edf38d19034796c1040f3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 17 16:59:35 2009 +0900 msctf: Implement ITfThreadMgr::IsThreadFocus. --- dlls/msctf/threadmgr.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 6d31198..b109107 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -365,9 +365,12 @@ ITfDocumentMgr *pdimNew, ITfDocumentMgr **ppdimPrev) static HRESULT WINAPI ThreadMgr_IsThreadFocus( ITfThreadMgr* iface, BOOL *pfThreadFocus) { + HWND focus; ThreadMgr *This = (ThreadMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %p\n",This,pfThreadFocus); + focus = GetFocus(); + *pfThreadFocus = (focus == NULL); + return S_OK; } static HRESULT WINAPI ThreadMgr_GetFunctionProvider( ITfThreadMgr* iface, REFCLSID clsid,

1 0

Rein Klazes : comdlg32/tests: Fix file dialog resize failures on NT4 and with tiny desktops.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 8526eee4721d08599b94cee1e8d0e5d9ebe54680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8526eee4721d08599b94cee1e… Author: Rein Klazes <wijn(a)online.nl> Date: Wed Jun 17 08:18:04 2009 +0200 comdlg32/tests: Fix file dialog resize failures on NT4 and with tiny desktops. --- dlls/comdlg32/tests/filedlg.c | 10 +++++++--- dlls/comdlg32/tests/rsrc.rc | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 8b8d6e7..6280c89 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -309,8 +309,12 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L /* test style */ style = GetWindowLong( parent, GWL_STYLE); if( resize_testcases[index].flags & OFN_ENABLESIZING) - ok( style & WS_SIZEBOX, - "testid %d: dialog should have a WS_SIZEBOX style.\n", index); + if( !(style & WS_SIZEBOX)) { + win_skip( "OFN_ENABLESIZING flag not supported.\n"); + PostMessage( parent, WM_COMMAND, IDCANCEL, 0); + } else + ok( style & WS_SIZEBOX, + "testid %d: dialog should have a WS_SIZEBOX style.\n", index); else ok( !(style & WS_SIZEBOX), "testid %d: dialog should not have a WS_SIZEBOX style.\n", index); @@ -383,7 +387,7 @@ static void test_resize(void) ofn.nMaxFile = 1042; ofn.lpfnHook = (LPOFNHOOKPROC) resize_template_hook; ofn.hInstance = GetModuleHandle(NULL); - ofn.lpTemplateName = "template1"; + ofn.lpTemplateName = "template_sz"; for( i = 0; resize_testcases[i].flags != 0xffffffff; i++) { ofn.lCustData = i; ofn.Flags = resize_testcases[i].flags | diff --git a/dlls/comdlg32/tests/rsrc.rc b/dlls/comdlg32/tests/rsrc.rc index 51415fd..9600d85 100644 --- a/dlls/comdlg32/tests/rsrc.rc +++ b/dlls/comdlg32/tests/rsrc.rc @@ -32,3 +32,19 @@ FONT 8, "MS Shell Dlg" LTEXT "",-1,28,16,204,31 EDITTEXT 56,65,2,200,12,ES_AUTOHSCROLL } + +/* Used by the resize file dialog tests. + * Keep this template small or get failures + * resizing on small desk tops. + * This will work with 640x480 pixels + */ +TEMPLATE_SZ DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 300, 40 +STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS +FONT 8, "MS Shell Dlg" +{ + LTEXT "Path:",-1,28,4,36,8 + LTEXT "Text1",-1,4,16,20,40 + LTEXT "Text2",-1,232,20,65,8 + LTEXT "",-1,28,16,204,31 + EDITTEXT 56,65,2,200,12,ES_AUTOHSCROLL +}

1 0

Andrew Talbot : crypt32: Constify some variables.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 85f9460a587ad316791c720aea902b0588296ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f9460a587ad316791c720ae… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jun 16 21:14:05 2009 +0100 crypt32: Constify some variables. --- dlls/crypt32/object.c | 6 +++--- dlls/crypt32/str.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index e880f08..f505b7d 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -1080,7 +1080,7 @@ static BOOL WINAPI CRYPT_FormatBasicConstraints2(DWORD dwCertEncodingType, return ret; } -static BOOL CRYPT_FormatHexStringWithPrefix(CRYPT_DATA_BLOB *blob, int id, +static BOOL CRYPT_FormatHexStringWithPrefix(const CRYPT_DATA_BLOB *blob, int id, LPWSTR str, DWORD *pcbStr) { WCHAR buf[MAX_STRING_RESOURCE_LEN]; @@ -1114,13 +1114,13 @@ static BOOL CRYPT_FormatHexStringWithPrefix(CRYPT_DATA_BLOB *blob, int id, return ret; } -static BOOL CRYPT_FormatKeyId(CRYPT_DATA_BLOB *keyId, LPWSTR str, +static BOOL CRYPT_FormatKeyId(const CRYPT_DATA_BLOB *keyId, LPWSTR str, DWORD *pcbStr) { return CRYPT_FormatHexStringWithPrefix(keyId, IDS_KEY_ID, str, pcbStr); } -static BOOL CRYPT_FormatCertSerialNumber(CRYPT_DATA_BLOB *serialNum, LPWSTR str, +static BOOL CRYPT_FormatCertSerialNumber(const CRYPT_DATA_BLOB *serialNum, LPWSTR str, DWORD *pcbStr) { return CRYPT_FormatHexStringWithPrefix(serialNum, IDS_CERT_SERIAL_NUMBER, diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index d3bca2b..c0b7677 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -341,7 +341,7 @@ static DWORD CRYPT_AddPrefixW(LPCWSTR prefix, LPWSTR psz, DWORD csz) static const WCHAR indent[] = { ' ',' ',' ',' ',' ',0 }; DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, - PCERT_NAME_BLOB pName, DWORD dwStrType, LPWSTR psz, DWORD csz) + const CERT_NAME_BLOB *pName, DWORD dwStrType, LPWSTR psz, DWORD csz) { static const DWORD unsupportedFlags = CERT_NAME_STR_NO_QUOTING_FLAG | CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG;

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