wine-commits September 2009

wine-commits@winehq.org

3 participants
866 discussions

Nikolay Sivov : comctl32/monthcal: Store full date info for selection at creation time.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: d66dcb4ff8f1332c102d97178d36ada54db52576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66dcb4ff8f1332c102d97178… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 01:20:33 2009 +0400 comctl32/monthcal: Store full date info for selection at creation time. --- dlls/comctl32/monthcal.c | 32 +++++++++++++++----------------- dlls/comctl32/tests/monthcal.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index b23a990..0d4c96b 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1872,25 +1872,23 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->firstDayHighWord = FALSE; MONTHCAL_SetFirstDayOfWeek(infoPtr, -1); infoPtr->currentMonth = infoPtr->todaysDate.wMonth; - infoPtr->currentYear = infoPtr->todaysDate.wYear; + infoPtr->currentYear = infoPtr->todaysDate.wYear; infoPtr->minDate = infoPtr->todaysDate; infoPtr->maxDate = infoPtr->todaysDate; - infoPtr->maxDate.wYear=2050; - infoPtr->minDate.wYear=1950; - infoPtr->maxSelCount = 7; - infoPtr->monthRange = 3; - infoPtr->monthdayState = Alloc - (infoPtr->monthRange * sizeof(MONTHDAYSTATE)); - infoPtr->titlebk = comctl32_color.clrActiveCaption; - infoPtr->titletxt = comctl32_color.clrWindow; - infoPtr->monthbk = comctl32_color.clrWindow; - infoPtr->trailingtxt = comctl32_color.clrGrayText; - infoPtr->bk = comctl32_color.clrWindow; - infoPtr->txt = comctl32_color.clrWindowText; - - /* set the current day for highlighing */ - infoPtr->minSel.wDay = infoPtr->todaysDate.wDay; - infoPtr->maxSel.wDay = infoPtr->todaysDate.wDay; + infoPtr->maxDate.wYear = 2050; + infoPtr->minDate.wYear = 1950; + infoPtr->maxSelCount = 7; + infoPtr->monthRange = 3; + infoPtr->monthdayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE)); + infoPtr->titlebk = comctl32_color.clrActiveCaption; + infoPtr->titletxt = comctl32_color.clrWindow; + infoPtr->monthbk = comctl32_color.clrWindow; + infoPtr->trailingtxt = comctl32_color.clrGrayText; + infoPtr->bk = comctl32_color.clrWindow; + infoPtr->txt = comctl32_color.clrWindowText; + + infoPtr->minSel = infoPtr->todaysDate; + infoPtr->maxSel = infoPtr->todaysDate; /* call MONTHCAL_UpdateSize to set all of the dimensions */ /* of the control */ diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 32b4d14..8cd3494 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1237,6 +1237,41 @@ static void test_monthcal_destroy(void) ok_sequence(sequences, MONTHCAL_SEQ_INDEX, destroy_monthcal_multi_sel_style_seq, "Destroy monthcal (multi sel style)", FALSE); } +static void test_monthcal_getselrange(void) +{ + HWND hwnd; + SYSTEMTIME st, range[2]; + BOOL ret; + + hwnd = create_monthcal_control(MCS_MULTISELECT); + + /* just after creation selection should start and end today */ + ret = SendMessage(hwnd, MCM_GETTODAY, 0, (LPARAM)&st); + expect(TRUE, ret); + + ret = SendMessage(hwnd, MCM_GETSELRANGE, 0, (LPARAM)range); + expect(TRUE, ret); + expect(st.wYear, range[0].wYear); + expect(st.wMonth, range[0].wMonth); + expect(st.wDay, range[0].wDay); + expect(st.wDayOfWeek, range[0].wDayOfWeek); + expect(st.wHour, range[0].wHour); + expect(st.wMinute, range[0].wMinute); + expect(st.wSecond, range[0].wSecond); + expect(st.wMilliseconds, range[0].wMilliseconds); + + expect(st.wYear, range[1].wYear); + expect(st.wMonth, range[1].wMonth); + expect(st.wDay, range[1].wDay); + expect(st.wDayOfWeek, range[1].wDayOfWeek); + expect(st.wHour, range[1].wHour); + expect(st.wMinute, range[1].wMinute); + expect(st.wSecond, range[1].wSecond); + expect(st.wMilliseconds, range[1].wMilliseconds); + + DestroyWindow(hwnd); +} + START_TEST(monthcal) { HMODULE hComctl32; @@ -1273,6 +1308,7 @@ START_TEST(monthcal) test_monthcal_todaylink(); test_monthcal_size(); test_monthcal_maxselday(); + test_monthcal_getselrange(); flush_sequences(sequences, NUM_MSG_SEQUENCES); DestroyWindow(parent_wnd);

1 0

Nikolay Sivov : comctl32/monthcal: Make tests not depend on each other.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 0617baf2c3e3b53e9a47a55c899a2199b282e430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0617baf2c3e3b53e9a47a55c8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 00:51:04 2009 +0400 comctl32/monthcal: Make tests not depend on each other. --- dlls/comctl32/tests/monthcal.c | 189 +++++++++++++++++++++++++++++----------- 1 files changed, 138 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0617baf2c3e3b53e9a47a…

1 0

Nikolay Sivov : comctl32/monthcal: Copy SYSTEMTIME with a simple assignment .
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: b0d3db5b291a6ea7b54dc03f36f9cbbbe34cde53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0d3db5b291a6ea7b54dc03f3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Sep 25 23:41:08 2009 +0400 comctl32/monthcal: Copy SYSTEMTIME with a simple assignment. --- dlls/comctl32/comctl32.h | 12 --------- dlls/comctl32/datetime.c | 34 +++++++++++++------------- dlls/comctl32/monthcal.c | 60 +++++++++++++++++++++++----------------------- 3 files changed, 47 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0d3db5b291a6ea7b54dc…

1 0

Paul Vriens : gdiplus/tests: Fix some test failures on older gdiplus versions.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: a126f0caf24865f565d0341ad010694c09a11859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a126f0caf24865f565d0341ad… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Sep 28 12:03:31 2009 +0200 gdiplus/tests: Fix some test failures on older gdiplus versions. --- dlls/gdiplus/tests/image.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index e973186..cd761bd 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -828,10 +828,14 @@ static void test_getsetpixel(void) expect(InvalidParameter, stat); stat = GdipBitmapGetPixel(bitmap, 1, -1, &color); - expect(InvalidParameter, stat); + ok(stat == InvalidParameter || + broken(stat == Ok), /* Older gdiplus */ + "Expected InvalidParameter, got %.8x\n", stat); stat = GdipBitmapSetPixel(bitmap, 1, -1, 0); - expect(InvalidParameter, stat); + ok(stat == InvalidParameter || + broken(stat == Ok), /* Older gdiplus */ + "Expected InvalidParameter, got %.8x\n", stat); stat = GdipBitmapGetPixel(bitmap, 2, 1, &color); expect(InvalidParameter, stat);

1 0

Henri Verbeet : wined3d: Just use the actual array size as argument to memcpy() in stateblock_copy( ).
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: f9786d7eda7e375c89a932e25c6e1c1ee435ca59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9786d7eda7e375c89a932e25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 28 10:05:03 2009 +0200 wined3d: Just use the actual array size as argument to memcpy() in stateblock_copy(). --- dlls/wined3d/stateblock.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d626bf9..5ccc2f4 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -222,22 +222,22 @@ void stateblock_copy( } /* Fixed size arrays */ - memcpy(Dest->vertexShaderConstantB, This->vertexShaderConstantB, sizeof(BOOL) * MAX_CONST_B); - memcpy(Dest->vertexShaderConstantI, This->vertexShaderConstantI, sizeof(INT) * MAX_CONST_I * 4); - memcpy(Dest->pixelShaderConstantB, This->pixelShaderConstantB, sizeof(BOOL) * MAX_CONST_B); - memcpy(Dest->pixelShaderConstantI, This->pixelShaderConstantI, sizeof(INT) * MAX_CONST_I * 4); - - memcpy(Dest->streamStride, This->streamStride, sizeof(UINT) * MAX_STREAMS); - memcpy(Dest->streamOffset, This->streamOffset, sizeof(UINT) * MAX_STREAMS); - memcpy(Dest->streamSource, This->streamSource, sizeof(IWineD3DBuffer *) * MAX_STREAMS); - memcpy(Dest->streamFreq, This->streamFreq, sizeof(UINT) * MAX_STREAMS); - memcpy(Dest->streamFlags, This->streamFlags, sizeof(UINT) * MAX_STREAMS); - memcpy(Dest->transforms, This->transforms, sizeof(WINED3DMATRIX) * (HIGHEST_TRANSFORMSTATE + 1)); - memcpy(Dest->clipplane, This->clipplane, sizeof(double) * MAX_CLIPPLANES * 4); - memcpy(Dest->renderState, This->renderState, sizeof(DWORD) * (WINEHIGHEST_RENDER_STATE + 1)); - memcpy(Dest->textures, This->textures, sizeof(IWineD3DBaseTexture*) * MAX_COMBINED_SAMPLERS); - memcpy(Dest->textureState, This->textureState, sizeof(DWORD) * MAX_TEXTURES * (WINED3D_HIGHEST_TEXTURE_STATE + 1)); - memcpy(Dest->samplerState, This->samplerState, sizeof(DWORD) * MAX_COMBINED_SAMPLERS * (WINED3D_HIGHEST_SAMPLER_STATE + 1)); + memcpy(Dest->vertexShaderConstantB, This->vertexShaderConstantB, sizeof(Dest->vertexShaderConstantB)); + memcpy(Dest->vertexShaderConstantI, This->vertexShaderConstantI, sizeof(Dest->vertexShaderConstantI)); + memcpy(Dest->pixelShaderConstantB, This->pixelShaderConstantB, sizeof(Dest->pixelShaderConstantB)); + memcpy(Dest->pixelShaderConstantI, This->pixelShaderConstantI, sizeof(Dest->pixelShaderConstantI)); + + memcpy(Dest->streamStride, This->streamStride, sizeof(Dest->streamStride)); + memcpy(Dest->streamOffset, This->streamOffset, sizeof(Dest->streamOffset)); + memcpy(Dest->streamSource, This->streamSource, sizeof(Dest->streamSource)); + memcpy(Dest->streamFreq, This->streamFreq, sizeof(Dest->streamFreq)); + memcpy(Dest->streamFlags, This->streamFlags, sizeof(Dest->streamFlags)); + memcpy(Dest->transforms, This->transforms, sizeof(Dest->transforms)); + memcpy(Dest->clipplane, This->clipplane, sizeof(Dest->clipplane)); + memcpy(Dest->renderState, This->renderState, sizeof(Dest->renderState)); + memcpy(Dest->textures, This->textures, sizeof(Dest->textures)); + memcpy(Dest->textureState, This->textureState, sizeof(Dest->textureState)); + memcpy(Dest->samplerState, This->samplerState, sizeof(Dest->samplerState)); /* Dynamically sized arrays */ memcpy(Dest->vertexShaderConstantF, This->vertexShaderConstantF, sizeof(float) * GL_LIMITS(vshader_constantsF) * 4);

1 0

Henri Verbeet : wined3d: Cleanup IWineD3DDeviceImpl_SetTexture() a bit.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 26db0be136a2e1a84da6213c20ffb7c9189615bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=26db0be136a2e1a84da6213c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 28 10:05:02 2009 +0200 wined3d: Cleanup IWineD3DDeviceImpl_SetTexture() a bit. --- dlls/wined3d/device.c | 133 +++++++++++++++++++++++++----------------------- 1 files changed, 69 insertions(+), 64 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 11d55a2..56c046e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4429,108 +4429,113 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetTextureStageState(IWineD3DDevice *if /***** * Get / Set Texture *****/ -static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD Stage, IWineD3DBaseTexture* pTexture) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, + DWORD stage, IWineD3DBaseTexture *texture) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DBaseTexture *oldTexture; + IWineD3DBaseTexture *prev; - TRACE("(%p) : Stage %#x, Texture %p\n", This, Stage, pTexture); + TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); - if (Stage >= WINED3DVERTEXTEXTURESAMPLER0 && Stage <= WINED3DVERTEXTEXTURESAMPLER3) { - Stage -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); - } + if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) + stage -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); - if (Stage >= sizeof(This->stateBlock->textures)/sizeof(This->stateBlock->textures[0])) { - ERR("Current stage overflows textures array (stage %d)\n", Stage); - return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */ + /* Windows accepts overflowing this array... we do not. */ + if (stage >= sizeof(This->stateBlock->textures) / sizeof(*This->stateBlock->textures)) + { + WARN("Ignoring invalid stage %u.\n", stage); + return WINED3D_OK; } - oldTexture = This->updateStateBlock->textures[Stage]; - /* SetTexture isn't allowed on textures in WINED3DPOOL_SCRATCH */ - if (pTexture && ((IWineD3DTextureImpl*)pTexture)->resource.pool == WINED3DPOOL_SCRATCH) + if (texture && ((IWineD3DTextureImpl *)texture)->resource.pool == WINED3DPOOL_SCRATCH) { - WARN("(%p) Attempt to set scratch texture rejected\n", pTexture); + WARN("Rejecting attempt to set scratch texture.\n"); return WINED3DERR_INVALIDCALL; } - TRACE("GL_LIMITS %d\n",GL_LIMITS(sampler_stages)); - TRACE("(%p) : oldtexture(%p)\n", This,oldTexture); - - This->updateStateBlock->changed.textures |= 1 << Stage; - TRACE("(%p) : setting new texture to %p\n", This, pTexture); - This->updateStateBlock->textures[Stage] = pTexture; + This->updateStateBlock->changed.textures |= 1 << stage; - /* Handle recording of state blocks */ - if (This->isRecordingState) { - TRACE("Recording... not performing anything\n"); - - if (pTexture) IWineD3DBaseTexture_AddRef(pTexture); - if (oldTexture) IWineD3DBaseTexture_Release(oldTexture); + prev = This->updateStateBlock->textures[stage]; + TRACE("Previous texture %p.\n", prev); + if (texture == prev) + { + TRACE("App is setting the same texture again, nothing to do.\n"); return WINED3D_OK; } - if(oldTexture == pTexture) { - TRACE("App is setting the same texture again, nothing to do\n"); + TRACE("Setting new texture to %p.\n", texture); + This->updateStateBlock->textures[stage] = texture; + + if (This->isRecordingState) + { + TRACE("Recording... not performing anything\n"); + + if (texture) IWineD3DBaseTexture_AddRef(texture); + if (prev) IWineD3DBaseTexture_Release(prev); + return WINED3D_OK; } - /** NOTE: MSDN says that setTexture increases the reference count, - * and that the application must set the texture back to null (or have a leaky application), - * This means we should pass the refcount up to the parent - *******************************/ - if (NULL != This->updateStateBlock->textures[Stage]) { - IWineD3DBaseTextureImpl *new = (IWineD3DBaseTextureImpl *) This->updateStateBlock->textures[Stage]; - ULONG bindCount = InterlockedIncrement(&new->baseTexture.bindCount); - UINT dimensions = IWineD3DBaseTexture_GetTextureDimensions(pTexture); + if (texture) + { + IWineD3DBaseTextureImpl *t = (IWineD3DBaseTextureImpl *)texture; + LONG bind_count = InterlockedIncrement(&t->baseTexture.bindCount); + UINT dimensions = IWineD3DBaseTexture_GetTextureDimensions(texture); - IWineD3DBaseTexture_AddRef(This->updateStateBlock->textures[Stage]); + IWineD3DBaseTexture_AddRef(texture); - if (!oldTexture || dimensions != IWineD3DBaseTexture_GetTextureDimensions(oldTexture)) + if (!prev || dimensions != IWineD3DBaseTexture_GetTextureDimensions(prev)) { IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADER); } - if(oldTexture == NULL && Stage < MAX_TEXTURES) { - /* The source arguments for color and alpha ops have different meanings when a NULL texture is bound, - * so the COLOROP and ALPHAOP have to be dirtified. - */ - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(Stage, WINED3DTSS_COLOROP)); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(Stage, WINED3DTSS_ALPHAOP)); - } - if(bindCount == 1) { - new->baseTexture.sampler = Stage; + if (!prev && stage < MAX_TEXTURES) + { + /* The source arguments for color and alpha ops have different + * meanings when a NULL texture is bound, so the COLOROP and + * ALPHAOP have to be dirtified. */ + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(stage, WINED3DTSS_COLOROP)); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(stage, WINED3DTSS_ALPHAOP)); } - /* More than one assignment? Doesn't matter, we only need one gl texture unit to use for uploading */ + if (bind_count == 1) t->baseTexture.sampler = stage; } - if (NULL != oldTexture) { - IWineD3DBaseTextureImpl *old = (IWineD3DBaseTextureImpl *) oldTexture; - LONG bindCount = InterlockedDecrement(&old->baseTexture.bindCount); + if (prev) + { + IWineD3DBaseTextureImpl *t = (IWineD3DBaseTextureImpl *)prev; + LONG bind_count = InterlockedDecrement(&t->baseTexture.bindCount); + + IWineD3DBaseTexture_Release(prev); - IWineD3DBaseTexture_Release(oldTexture); - if(pTexture == NULL && Stage < MAX_TEXTURES) { - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(Stage, WINED3DTSS_COLOROP)); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(Stage, WINED3DTSS_ALPHAOP)); + if (!texture && stage < MAX_TEXTURES) + { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(stage, WINED3DTSS_COLOROP)); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(stage, WINED3DTSS_ALPHAOP)); } - if(bindCount && old->baseTexture.sampler == Stage) { - int i; - /* Have to do a search for the other sampler(s) where the texture is bound to - * Shouldn't happen as long as apps bind a texture only to one stage - */ - TRACE("Searcing for other sampler / stage id where the texture is bound to\n"); - for(i = 0; i < MAX_COMBINED_SAMPLERS; i++) { - if(This->updateStateBlock->textures[i] == oldTexture) { - old->baseTexture.sampler = i; + if (bind_count && t->baseTexture.sampler == stage) + { + unsigned int i; + + /* Search for other stages the texture is bound to. Shouldn't + * happen if applications bind textures to a single stage only. */ + TRACE("Searching for other stages the texture is bound to.\n"); + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + if (This->updateStateBlock->textures[i] == prev) + { + TRACE("Texture is also bound to stage %u.\n", i); + t->baseTexture.sampler = i; break; } } } } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(Stage)); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(stage)); return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Remove some redundant code in IWineD3DVertexDeclarationImpl_Release().
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: f6bf2190137f529fcb40e0c0cd67d8aab7fb4d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bf2190137f529fcb40e0c0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 28 10:05:01 2009 +0200 wined3d: Remove some redundant code in IWineD3DVertexDeclarationImpl_Release(). The situation the code tests for should never happen because either the stateblock will still have a reference to the vertex declaration, or the stateblock itself will be released. --- dlls/wined3d/vertexdeclaration.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 18ea03a..6d617ed 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -68,13 +68,8 @@ static ULONG WINAPI IWineD3DVertexDeclarationImpl_Release(IWineD3DVertexDeclarat ULONG ref; TRACE("(%p) : Releasing from %d\n", This, This->ref); ref = InterlockedDecrement(&This->ref); - if (ref == 0) { - if (This->wineD3DDevice->stateBlock && iface == This->wineD3DDevice->stateBlock->vertexDecl) - { - /* See comment in PixelShader::Release */ - IWineD3DDeviceImpl_MarkStateDirty(This->wineD3DDevice, STATE_VDECL); - } - + if (!ref) + { HeapFree(GetProcessHeap(), 0, This->elements); This->parent_ops->wined3d_object_destroyed(This->parent); HeapFree(GetProcessHeap(), 0, This);

1 0

Henri Verbeet : wined3d: Keep vertex declaration references in the stateblock.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: dca3c6e7c6d3f7fabcf6f6794f6f07f1aa2f894d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca3c6e7c6d3f7fabcf6f6794… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 28 10:05:00 2009 +0200 wined3d: Keep vertex declaration references in the stateblock. --- dlls/wined3d/device.c | 3 +++ dlls/wined3d/stateblock.c | 12 +++++++++++- dlls/wined3d/vertexdeclaration.c | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 42d78ac..11d55a2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3328,6 +3328,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexDeclaration(IWineD3DDevice* if TRACE("(%p) : pDecl=%p\n", This, pDecl); + if (pDecl) IWineD3DVertexDeclaration_AddRef(pDecl); + if (oldDecl) IWineD3DVertexDeclaration_Release(oldDecl); + This->updateStateBlock->vertexDecl = pDecl; This->updateStateBlock->changed.vertexDecl = TRUE; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0e097aa..d626bf9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -279,6 +279,8 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { if (!refCount) { int counter; + if (This->vertexDecl) IWineD3DVertexDeclaration_Release(This->vertexDecl); + for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) { if (This->textures[counter]) IWineD3DBaseTexture_Release(This->textures[counter]); @@ -511,6 +513,8 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) if(This->changed.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; } @@ -624,7 +628,6 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) record_lights(This, targetStateBlock); } else if(This->blockType == WINED3DSBT_ALL) { - This->vertexDecl = targetStateBlock->vertexDecl; memcpy(This->vertexShaderConstantB, targetStateBlock->vertexShaderConstantB, sizeof(This->vertexShaderConstantI)); memcpy(This->vertexShaderConstantI, targetStateBlock->vertexShaderConstantI, sizeof(This->vertexShaderConstantF)); memcpy(This->vertexShaderConstantF, targetStateBlock->vertexShaderConstantF, sizeof(float) * GL_LIMITS(vshader_constantsF) * 4); @@ -648,6 +651,13 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) memcpy(This->samplerState, targetStateBlock->samplerState, sizeof(This->samplerState)); This->scissorRect = targetStateBlock->scissorRect; + if (This->vertexDecl != targetStateBlock->vertexDecl) + { + if (targetStateBlock->vertexDecl) IWineD3DVertexDeclaration_AddRef(targetStateBlock->vertexDecl); + if (This->vertexDecl) IWineD3DVertexDeclaration_Release(This->vertexDecl); + This->vertexDecl = targetStateBlock->vertexDecl; + } + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) { if (targetStateBlock->textures[i] != This->textures[i]) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index db595be..18ea03a 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -69,7 +69,8 @@ static ULONG WINAPI IWineD3DVertexDeclarationImpl_Release(IWineD3DVertexDeclarat TRACE("(%p) : Releasing from %d\n", This, This->ref); ref = InterlockedDecrement(&This->ref); if (ref == 0) { - if(iface == This->wineD3DDevice->stateBlock->vertexDecl) { + if (This->wineD3DDevice->stateBlock && iface == This->wineD3DDevice->stateBlock->vertexDecl) + { /* See comment in PixelShader::Release */ IWineD3DDeviceImpl_MarkStateDirty(This->wineD3DDevice, STATE_VDECL); }

1 0

Henri Verbeet : wined3d: Properly keep texture references in the stateblock .
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 709aedf5f9bdfd0cdeab3d2189f6382680356922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=709aedf5f9bdfd0cdeab3d218… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 28 10:04:59 2009 +0200 wined3d: Properly keep texture references in the stateblock. --- dlls/wined3d/device.c | 4 ++++ dlls/wined3d/stateblock.c | 29 ++++++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 70656b7..42d78ac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4460,6 +4460,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD /* Handle recording of state blocks */ if (This->isRecordingState) { TRACE("Recording... not performing anything\n"); + + if (pTexture) IWineD3DBaseTexture_AddRef(pTexture); + if (oldTexture) IWineD3DBaseTexture_Release(oldTexture); + return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index feb9808..0e097aa 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -5,6 +5,7 @@ * Copyright 2004 Jason Edmeades * Copyright 2005 Oliver Stieber * Copyright 2007 Stefan Dösinger for CodeWeavers + * Copyright 2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -278,17 +279,9 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { if (!refCount) { int counter; - /* type 0 represents the primary stateblock, so free all the resources */ - if (This->blockType == WINED3DSBT_INIT) { - /* NOTE: according to MSDN: The application is responsible for making sure the texture references are cleared down */ - for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) { - if (This->textures[counter]) { - /* release our 'internal' hold on the texture */ - if(0 != IWineD3DBaseTexture_Release(This->textures[counter])) { - TRACE("Texture still referenced by stateblock, applications has leaked Stage = %u Texture = %p\n", counter, This->textures[counter]); - } - } - } + for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) + { + if (This->textures[counter]) IWineD3DBaseTexture_Release(This->textures[counter]); } for (counter = 0; counter < MAX_STREAMS; counter++) { @@ -605,13 +598,14 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) } /* Samplers */ - /* TODO: move over to using memcpy */ map = This->changed.textures; for (i = 0; map; map >>= 1, ++i) { if (!(map & 1)) continue; TRACE("Updating texture %u to %p (was %p)\n", i, targetStateBlock->textures[i], This->textures[i]); + if (targetStateBlock->textures[i]) IWineD3DBaseTexture_AddRef(targetStateBlock->textures[i]); + if (This->textures[i]) IWineD3DBaseTexture_Release(This->textures[i]); This->textures[i] = targetStateBlock->textures[i]; } @@ -650,11 +644,20 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) memcpy(This->pixelShaderConstantI, targetStateBlock->pixelShaderConstantI, sizeof(This->pixelShaderConstantF)); memcpy(This->pixelShaderConstantF, targetStateBlock->pixelShaderConstantF, sizeof(float) * GL_LIMITS(pshader_constantsF) * 4); memcpy(This->renderState, targetStateBlock->renderState, sizeof(This->renderState)); - memcpy(This->textures, targetStateBlock->textures, sizeof(This->textures)); memcpy(This->textureState, targetStateBlock->textureState, sizeof(This->textureState)); memcpy(This->samplerState, targetStateBlock->samplerState, sizeof(This->samplerState)); This->scissorRect = targetStateBlock->scissorRect; + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + if (targetStateBlock->textures[i] != This->textures[i]) + { + if (targetStateBlock->textures[i]) IWineD3DBaseTexture_AddRef(targetStateBlock->textures[i]); + if (This->textures[i]) IWineD3DBaseTexture_Release(This->textures[i]); + This->textures[i] = targetStateBlock->textures[i]; + } + } + if(targetStateBlock->pIndexData != This->pIndexData || targetStateBlock->IndexFmt != This->IndexFmt) { if (targetStateBlock->pIndexData) IWineD3DBuffer_AddRef(targetStateBlock->pIndexData);

1 0

Jacek Caban : mshtml: Added IHTMLDocument3::attachEvent implementation.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 73aec9bd001e513389fafbfe441c92748107c486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73aec9bd001e513389fafbfe4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 27 20:59:52 2009 +0200 mshtml: Added IHTMLDocument3::attachEvent implementation. --- dlls/mshtml/htmldoc3.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 4b249e6..f4f923f 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -31,6 +31,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -173,8 +174,10 @@ static HRESULT WINAPI HTMLDocument3_attachEvent(IHTMLDocument3 *iface, BSTR even IDispatch* pDisp, VARIANT_BOOL *pfResult) { HTMLDocument *This = HTMLDOC3_THIS(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); + + return attach_event(&This->doc_node->node.event_target, This, event, pDisp, pfResult); } static HRESULT WINAPI HTMLDocument3_detachEvent(IHTMLDocument3 *iface, BSTR event,

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
87
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 September 2009