February 2006 - Wine-Commits

H. Verbeet : wined3d: Update refcounts when storing references in IWineD3DStateBlockImpl_Capture.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: c6515ab3072cc0b527bd0cbca970c3c59b64f397 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c6515ab3072cc0b527bd0cb… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 6 11:32:13 2006 +0100 wined3d: Update refcounts when storing references in IWineD3DStateBlockImpl_Capture. Move TRACEs to the top of their code blocks. --- dlls/wined3d/stateblock.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c1e3e94..1ef2a52 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -148,8 +148,16 @@ HRESULT WINAPI IWineD3DStateBlockImpl_Ca /* Recorded => Only update 'changed' values */ if (This->vertexShader != targetStateBlock->vertexShader) { + TRACE("Updating vertex shader from %p to %p\n", This->vertexShader, targetStateBlock->vertexShader); + + if (targetStateBlock->vertexShader) { + IWineD3DVertexShader_AddRef(targetStateBlock->vertexShader); + } + if (This->vertexShader) { + IWineD3DVertexShader_Release(This->vertexShader); + } + This->vertexShader = targetStateBlock->vertexShader; - TRACE("Updating vertex shader to %p\n", targetStateBlock->vertexShader); } /* Vertex Shader Constants */ @@ -204,8 +212,16 @@ HRESULT WINAPI IWineD3DStateBlockImpl_Ca /* Recorded => Only update 'changed' values */ if (This->pixelShader != targetStateBlock->pixelShader) { + TRACE("Updating pixel shader from %p to %p\n", This->pixelShader, targetStateBlock->pixelShader); + + if (targetStateBlock->pixelShader) { + IWineD3DPixelShader_AddRef(targetStateBlock->pixelShader); + } + if (This->pixelShader) { + IWineD3DPixelShader_Release(This->pixelShader); + } + This->pixelShader = targetStateBlock->pixelShader; - TRACE("Updating pixrl shader to %p\n", targetStateBlock->pixelShader); } /* Pixel Shader Constants */ @@ -244,6 +260,15 @@ HRESULT WINAPI IWineD3DStateBlockImpl_Ca } if(This->set.vertexDecl && This->vertexDecl != targetStateBlock->vertexDecl){ + TRACE("Updating vertex declaration from %p to %p\n", This->vertexDecl, targetStateBlock->vertexDecl); + + if (targetStateBlock->vertexDecl) { + IWineD3DVertexDeclaration_AddRef(targetStateBlock->vertexDecl); + } + if (This->vertexDecl) { + IWineD3DVertexDeclaration_Release(This->vertexDecl); + } + This->vertexDecl = targetStateBlock->vertexDecl; }

1 0

H. Verbeet : wined3d: Release the correct vertexdeclaration in
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: b9193cc93ffedfac241a61ab7a350b8feb30179d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b9193cc93ffedfac241a61a… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 6 11:31:57 2006 +0100 wined3d: Release the correct vertexdeclaration in IWineD3DDeviceImpl_SetVertexDeclaration. --- dlls/wined3d/device.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6277ff5..6b1d3cf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3773,6 +3773,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetSci HRESULT WINAPI IWineD3DDeviceImpl_SetVertexDeclaration(IWineD3DDevice* iface, IWineD3DVertexDeclaration* pDecl) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + IWineD3DVertexDeclaration *oldDecl = This->updateStateBlock->vertexDecl; TRACE("(%p) : pDecl=%p\n", This, pDecl); @@ -3787,8 +3788,8 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer if (NULL != pDecl) { IWineD3DVertexDeclaration_AddRef(pDecl); } - if (NULL != This->updateStateBlock->vertexDecl) { - IWineD3DVertexDeclaration_Release(This->updateStateBlock->vertexDecl); + if (NULL != oldDecl) { + IWineD3DVertexDeclaration_Release(oldDecl); } return D3D_OK; }

1 0

H. Verbeet : wined3d: Also update reference counts when we're recording a stateblock.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: fe7f2bad15481677edcfdaae7778932d64113525 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fe7f2bad15481677edcfdaa… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 6 11:31:17 2006 +0100 wined3d: Also update reference counts when we're recording a stateblock. --- dlls/wined3d/device.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ffd7617..6277ff5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3782,7 +3782,6 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer if (This->isRecordingState) { TRACE("Recording... not performing anything\n"); - return D3D_OK; } if (NULL != pDecl) { @@ -3814,7 +3813,6 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer if (This->isRecordingState) { TRACE("Recording... not performing anything\n"); - return D3D_OK; } if (NULL != pShader) { @@ -3991,7 +3989,6 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetPix /* Handle recording of state blocks */ if (This->isRecordingState) { TRACE("Recording... not performing anything\n"); - return D3D_OK; } if (NULL != pShader) {

1 0

H. Verbeet : wined3d: Fix SetContainer.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: e43cfb1a688f529bc75f040987f48892bbd03cc8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e43cfb1a688f529bc75f040… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 6 11:30:48 2006 +0100 wined3d: Fix SetContainer. Add/Release references to the container. Change the type of the container from IUnknown to IWineD3DBase. --- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/surface.c | 13 ++++++++++++- dlls/wined3d/volume.c | 19 +++++++++++++++---- dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d_interface.h | 4 ++-- 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 775066c..ffd7617 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -725,7 +725,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Creat /** Create and initialise the surface resource **/ D3DCREATERESOURCEOBJECTINSTANCE(object,Surface,D3DRTYPE_SURFACE, Size) - object->container = (IUnknown*) This; + IWineD3DSurface_SetContainer((IWineD3DSurface *)object, (IWineD3DBase *)This); object->currentDesc.Width = Width; object->currentDesc.Height = Height; @@ -888,7 +888,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Creat return hr; } - IWineD3DSurface_SetContainer(object->surfaces[i], (IUnknown *)object); + IWineD3DSurface_SetContainer(object->surfaces[i], (IWineD3DBase *)object); TRACE("Created surface level %d @ %p\n", i, object->surfaces[i]); /* calculate the next mipmap level */ tmpW = max(1, tmpW >> 1); @@ -958,7 +958,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create (IWineD3DVolume **)&object->volumes[i], pSharedHandle); /* Set it's container to this object */ - IWineD3DVolume_SetContainer(object->volumes[i], (IUnknown *)object); + IWineD3DVolume_SetContainer(object->volumes[i], (IWineD3DBase *)object); /* calcualte the next mipmap level */ tmpW = max(1, tmpW >> 1); @@ -1076,7 +1076,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create *ppCubeTexture = NULL; return hr; } - IWineD3DSurface_SetContainer(object->surfaces[j][i], (IUnknown *)object); + IWineD3DSurface_SetContainer(object->surfaces[j][i], (IWineD3DBase *)object); TRACE("Created surface level %d @ %p,\n", i, object->surfaces[j][i]); } tmpW = max(1, tmpW >> 1); @@ -1402,7 +1402,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create &object->frontBuffer, NULL /* pShared (always null)*/); if (object->frontBuffer != NULL) - IWineD3DSurface_SetContainer(object->frontBuffer, (IUnknown *)object); + IWineD3DSurface_SetContainer(object->frontBuffer, (IWineD3DBase *)object); TRACE("calling rendertarget CB\n"); hr = D3DCB_CreateRenderTarget((IUnknown *) This->parent, object->presentParms.BackBufferWidth, @@ -1414,7 +1414,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create &object->backBuffer, NULL /* pShared (always null)*/); if (object->backBuffer != NULL) - IWineD3DSurface_SetContainer(object->backBuffer, (IUnknown *)object); + IWineD3DSurface_SetContainer(object->backBuffer, (IWineD3DBase *)object); /* Under directX swapchains share the depth stencil, so only create one depth-stencil */ if (pPresentationParameters->EnableAutoDepthStencil) { @@ -1430,7 +1430,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create &This->depthStencilBuffer, NULL /* pShared (always null)*/ ); if (This->depthStencilBuffer != NULL) - IWineD3DSurface_SetContainer(This->depthStencilBuffer, (IUnknown *)iface); + IWineD3DSurface_SetContainer(This->depthStencilBuffer, (IWineD3DBase *)iface); } /** TODO: A check on width, height and multisample types diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 793f4e1..81079ae 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1334,10 +1334,21 @@ extern HRESULT WINAPI IWineD3DSurfaceImp return D3D_OK; } -HRESULT WINAPI IWineD3DSurfaceImpl_SetContainer(IWineD3DSurface *iface, IUnknown *container) { +HRESULT WINAPI IWineD3DSurfaceImpl_SetContainer(IWineD3DSurface *iface, IWineD3DBase *container) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + + TRACE("This %p, container %p\n", This, container); + + if (container) { + IWineD3DBase_AddRef(container); + } + if (This->container) { + IWineD3DBase_Release(This->container); + } + TRACE("Setting container to %p from %p\n", container, This->container); This->container = container; + return D3D_OK; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 1aec42d..826cef5 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -233,11 +233,22 @@ HRESULT WINAPI IWineD3DVolumeImpl_AddDir return D3D_OK; } -HRESULT WINAPI IWineD3DVolumeImpl_SetContainer(IWineD3DVolume *iface, IUnknown* container){ - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; +HRESULT WINAPI IWineD3DVolumeImpl_SetContainer(IWineD3DVolume *iface, IWineD3DBase* container) { + IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - This->container = container; - return D3D_OK; + TRACE("This %p, container %p\n", This, container); + + if (container) { + IWineD3DBase_AddRef(container); + } + if (This->container) { + IWineD3DBase_Release(This->container); + } + + TRACE("Setting container to %p from %p\n", container, This->container); + This->container = container; + + return D3D_OK; } HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, GLenum gl_level) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fbc3f0b..9ba687c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -747,7 +747,7 @@ typedef struct IWineD3DVolumeImpl /* WineD3DVolume Information */ D3DVOLUME_DESC currentDesc; - IUnknown *container; + IWineD3DBase *container; UINT bytesPerPixel; BOOL lockable; @@ -799,7 +799,7 @@ struct IWineD3DSurfaceImpl IWineD3DResourceClass resource; /* IWineD3DSurface fields */ - IUnknown *container; + IWineD3DBase *container; WINED3DSURFACET_DESC currentDesc; UINT textureName; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index c0a0e2d..dac1d3a 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1054,7 +1054,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; STDMETHOD(LoadTexture)(THIS) PURE; STDMETHOD(SaveSnapshot)(THIS_ const char *filename) PURE; - STDMETHOD(SetContainer)(THIS_ IUnknown *container) PURE; + STDMETHOD(SetContainer)(THIS_ IWineD3DBase *container) PURE; STDMETHOD(SetPBufferState)(THIS_ BOOL inPBuffer, BOOL inTexture) PURE; STDMETHOD_(void,SetGlTextureDesc)(THIS_ UINT textureName, int target) PURE; STDMETHOD_(void,GetGlDesc)(THIS_ glDescriptor **glDescription) PURE; @@ -1128,7 +1128,7 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD STDMETHOD(AddDirtyBox)(THIS_ CONST D3DBOX* pDirtyBox) PURE; STDMETHOD(CleanDirtyBox)(THIS) PURE; STDMETHOD(LoadTexture)(THIS_ UINT gl_level) PURE; - STDMETHOD(SetContainer)(THIS_ IUnknown *container) PURE; + STDMETHOD(SetContainer)(THIS_ IWineD3DBase *container) PURE; }; #undef INTERFACE

1 0

H. Verbeet : wined3d: Downgrade a FIXME to a TRACE.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: bcfa7dcf7dc547cbc25c73ed95f45605b5e3cc80 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bcfa7dcf7dc547cbc25c73e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 6 11:30:27 2006 +0100 wined3d: Downgrade a FIXME to a TRACE. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index eded7f9..1328967 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1779,7 +1779,7 @@ UINT numberOfvertices, UINT numberOfIndi GLint errPos; IWineD3DVertexDeclarationImpl *vertexDeclaration; - FIXME("Using vertex shader\n"); + TRACE("Using vertex shader\n"); /* Bind the vertex program */ GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->prgId));

1 0

Eric Pouech : winedbg: Added support for function parameters passed in registers.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: 2ce5eca6a5b5c6522e396e3b3f566dc523b29856 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2ce5eca6a5b5c6522e396e3… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 6 11:27:32 2006 +0100 winedbg: Added support for function parameters passed in registers. Added correct stabs parsing for function parameters in registers. Added a couple of helper functions to make code smaller and more readable. --- dlls/dbghelp/stabs.c | 113 ++++++++++++++++++++++++------------------- dlls/dbghelp/symbol.c | 21 ++++++-- programs/winedbg/debugger.h | 1 programs/winedbg/memory.c | 24 +++++++++ programs/winedbg/stack.c | 46 ++++++++++++------ programs/winedbg/symbol.c | 52 +++++++------------- 6 files changed, 153 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2ce5eca6a5b5c6522e3…

1 0

Eric Pouech : kernel: Fixed regression in atom handling.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: dccd41a88aa2984a231f8195f023faff37ab5f8e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dccd41a88aa2984a231f819… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 6 11:26:57 2006 +0100 kernel: Fixed regression in atom handling. Added proper tests (local & global functions). --- dlls/kernel/atom.c | 5 ++++- dlls/kernel/tests/atom.c | 33 +++++++++++++++++++++++++++++++++ dlls/ntdll/tests/atom.c | 9 +++++++++ 3 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/atom.c b/dlls/kernel/atom.c index 510eb61..7eb59f5 100644 --- a/dlls/kernel/atom.c +++ b/dlls/kernel/atom.c @@ -485,12 +485,15 @@ UINT WINAPI GlobalGetAtomNameW( ATOM ato { length = min( abi->NameLength / sizeof(WCHAR), count); memcpy( buffer, abi->Name, length * sizeof(WCHAR) ); + /* yes, the string will not be null terminated if the passed buffer + * is one WCHAR too small (and it's not an error) + */ if (length < abi->NameLength / sizeof(WCHAR)) { SetLastError( ERROR_MORE_DATA ); length = count; } - else buffer[length] = '\0'; + else if (length < count) buffer[length] = '\0'; } return length; } diff --git a/dlls/kernel/tests/atom.c b/dlls/kernel/tests/atom.c index 45288ac..416a29e 100644 --- a/dlls/kernel/tests/atom.c +++ b/dlls/kernel/tests/atom.c @@ -220,6 +220,21 @@ static void test_get_atom_name(void) } } + memset( buf, '.', sizeof(buf) ); + len = GlobalGetAtomNameA( atom, buf, 6 ); + ok( len == 0, "bad length %d\n", len ); + ok( !memcmp( buf, "fooba\0....", 10 ), "bad buffer contents\n"); + if (unicode_OS) + { + static const WCHAR resW[] = {'f','o','o','b','a','r','.','.','.','.'}; + for (len = 0; len < 10; len++) bufW[len] = '.'; + SetLastError(0xdeadbeef); + len = GlobalGetAtomNameW( atom, bufW, 6 ); + ok( len && GetLastError() == 0xdeadbeef, "GlobalGetAtomNameW failed\n" ); + ok( len == lstrlenW(foobarW), "bad length %d\n", len ); + ok( !memcmp( bufW, resW, 10*sizeof(WCHAR) ), "bad buffer contents\n" ); + } + /* test string limits & overflow */ do_initA(in, "abcdefghij", 255); atom = GlobalAddAtomA(in); @@ -428,6 +443,24 @@ static void test_local_get_atom_name(voi ok( !memcmp( bufW, resultW, 10*sizeof(WCHAR) ), "bad buffer contents\n" ); } + /* Get the name of the atom we added above */ + memset( buf, '.', sizeof(buf) ); + len = GetAtomNameA( atom, buf, 6 ); + ok( len == 5, "bad length %d\n", len ); + ok( !memcmp( buf, "fooba\0....", 10 ), "bad buffer contents\n" ); + + /* Repeat, unicode-style */ + if (unicode_OS) + { + WCHAR resW[] = {'f','o','o','b','a','\0','.','.','.','.'}; + for (i = 0; i < 10; i++) bufW[i] = '.'; + SetLastError( 0xdeadbeef ); + len = GetAtomNameW( atom, bufW, 6 ); + ok( len && GetLastError() == 0xdeadbeef, "GlobalGetAtomNameW failed\n" ); + ok( len == 5, "bad length %d\n", len ); + ok( !memcmp( bufW, resW, 10*sizeof(WCHAR) ), "bad buffer contents\n" ); + } + /* Check error code returns */ memset(buf, '.', 10); ok( !GetAtomNameA( atom, buf, 0 ), "succeeded\n" ); diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index a48e2cf..c0a8e2d 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -207,6 +207,15 @@ static void test_NtAtom(void) ok(!Name[3], "wrong string termination\n"); ok(Name[4] == 0x55AA, "buffer overwrite\n"); + Len = lstrlenW(testAtom2) * sizeof(WCHAR); + memset(Name, '.', sizeof(Name)); + res = pRtlQueryAtomInAtomTable( AtomTable, Atom2, NULL, NULL, Name, &Len ); + ok(!res, "query atom %lx\n", res); + ok(Len == (lstrlenW(testAtom2) - 1) * sizeof(WCHAR), "wrong length %lu\n", Len); + ok(!memcmp(testAtom2, Name, (lstrlenW(testAtom2) - 1) * sizeof(WCHAR)), "wrong atom name\n"); + ok(Name[lstrlenW(testAtom2) - 1] == '\0', "wrong char\n"); + ok(Name[lstrlenW(testAtom2)] == ('.' << 8) + '.', "wrong char\n"); + res = pRtlLookupAtomInAtomTable(AtomTable, testAtom2, &testAtom); ok(!res, "We can't find our pinned atom!! retval: %lx\n", res); ok(testAtom == Atom2, "We found wrong atom!!!\n");

1 0

Kevin Koltzau : riched20: Don't use EM_STREAMIN for paste.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: 2d0ad0944c0c8efbd836e3efafff01c331cf9283 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d0ad0944c0c8efbd836e3e… Author: Kevin Koltzau <kevin(a)plop.org> Date: Mon Feb 6 11:26:34 2006 +0100 riched20: Don't use EM_STREAMIN for paste. --- dlls/riched20/editor.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3274a41..6f43cb4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1639,8 +1639,8 @@ LRESULT WINAPI RichEditANSIWndProc(HWND gds.nLength = 0; es.dwCookie = (DWORD)&gds; es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode; - SendMessageW(hWnd, EM_STREAMIN, dwFormat|SFF_SELECTION, (LPARAM)&es); - + ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es); + CloseClipboard(); return 0; }

1 0

Vitaliy Margolen : commdlg: Add font sizes 6 and 7 to font select dialog.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: 78ecf1815641025dae94f226accc32cf0abd4209 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78ecf1815641025dae94f22… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon Feb 6 11:26:22 2006 +0100 commdlg: Add font sizes 6 and 7 to font select dialog. --- dlls/commdlg/fontdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c index b6ad99c..b85bcae 100644 --- a/dlls/commdlg/fontdlg.c +++ b/dlls/commdlg/fontdlg.c @@ -428,7 +428,7 @@ static int AddFontSizeToCombo3(HWND hwnd */ static int SetFontSizesToCombo3(HWND hwnd, LPCHOOSEFONTW lpcf) { - static const BYTE sizes[]={8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; + static const BYTE sizes[]={6,7,8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; int i; for (i = 0; i < sizeof(sizes)/sizeof(sizes[0]); i++)

1 0

Henning Gerhardt : winecfg: Update German resource.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: 08d55dbd62af8bcb0aa685a9be1ea764242047b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=08d55dbd62af8bcb0aa685a… Author: Henning Gerhardt <henning.gerhardt(a)web.de> Date: Mon Feb 6 11:26:01 2006 +0100 winecfg: Update German resource. --- programs/winecfg/De.rc | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 44d65fa..74c725c 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -2,7 +2,7 @@ * WineCfg resources * German Language Support * - * Copyright 2005 Henning Gerhardt + * Copyright 2005, 2006 Henning Gerhardt * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -201,3 +201,15 @@ BEGIN IDS_THEMEFILE_SELECT "Motiv-Datei ausw�hlen" IDS_AUDIO_MISSING "Zur Zeit ist kein Audio Treiber in der Registry eingetragen.\n\nEin bevorzugter Treiber wurde f�r Sie ausgew�hlt.\nSie k�nnen diesen Treiber nutzen oder einen anderen ausw�hlen, sofern dieser vorhanden ist.\n\nSie m�ssen auf Anwenden klicken, damit die �nderung �bernommen wird." END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DLL_WARNING "Das �ndern der Ladereihenfolge dieser Bibltiothek wird nicht empfohlen.\nSind Sie sich sicher, dass Sie dies m�chten?" + IDS_DLL_WARNING_CAPTION "Achtung: Systembibliothek" + IDS_DLL_NATIVE "Native (Windows)" + IDS_DLL_BUILTIN "Builtin (Wine)" + IDS_DLL_NATIVE_BUILTIN "Native, Builtin" + IDS_DLL_BUILTIN_NATIVE "Builtin, Native" + IDS_DLL_DISABLED "ausgeschalten" +END +

1 0