wine-commits September 2009

wine-commits@winehq.org

3 participants
866 discussions

Nikolay Sivov : comctl32/updown: Fix some test failures on Win95 ( comctl32 4.0).
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 484ef1dcbf7dd2f5bb4cd55080eec80596853200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484ef1dcbf7dd2f5bb4cd5508… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 29 01:56:37 2009 +0400 comctl32/updown: Fix some test failures on Win95 (comctl32 4.0). --- dlls/comctl32/tests/updown.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 8797b9f..253e959 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -393,7 +393,15 @@ static void test_updown_pos32(void) /* Set the position to 0 to 1000 */ SendMessage(updown, UDM_SETRANGE32, 0 , 1000 ); + low = high = -1; r = SendMessage(updown, UDM_GETRANGE32, (WPARAM) &low , (LPARAM) &high ); + if (low == -1) + { + win_skip("UDM_SETRANGE32/UDM_GETRANGE32 not available\n"); + DestroyWindow(updown); + return; + } + expect(0,low); expect(1000,high); @@ -402,6 +410,7 @@ static void test_updown_pos32(void) if (!r) { win_skip("UDM_SETPOS32 and UDM_GETPOS32 need 5.80\n"); + DestroyWindow(updown); return; } expect(50,r); @@ -548,6 +557,12 @@ static void test_updown_unicode(void) r = SendMessage(updown, UDM_SETUNICODEFORMAT, 1 , 0); expect(0,r); r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0); + if (!r) + { + win_skip("UDM_SETUNICODEFORMAT not available\n"); + DestroyWindow(updown); + return; + } expect(1,r); /* And now set it back to ANSI */

1 0

Nikolay Sivov : comctl32/monthcal: Control elements should be centered in client area, and left/ top aligned if they don't.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: aadadd04fe5efd93d2007e1fe2f0e01ec15e6c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aadadd04fe5efd93d2007e1fe… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 29 00:44:45 2009 +0400 comctl32/monthcal: Control elements should be centered in client area, and left/top aligned if they don't. --- dlls/comctl32/monthcal.c | 52 ++++++++++++++++++++++++++++++++------------- 1 files changed, 37 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 6f60587..e0d5fcd 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1763,7 +1763,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) SIZE size; TEXTMETRICW tm; HFONT currentFont; - int xdiv, left_offset; + INT xdiv, dx, dy; RECT rcClient; GetClientRect(infoPtr->hwndSelf, &rcClient); @@ -1781,22 +1781,21 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) xdiv = (infoPtr->dwStyle & MCS_WEEKNUMBERS) ? 8 : 7; - infoPtr->width_increment = size.cx * 2 + 4; + infoPtr->width_increment = size.cx * 2 + 4; infoPtr->height_increment = infoPtr->textHeight; - left_offset = (rcClient.right - rcClient.left) - (infoPtr->width_increment * xdiv); /* calculate title area */ - title->top = rcClient.top; - title->bottom = title->top + 3 * infoPtr->height_increment / 2; - title->left = left_offset; - title->right = rcClient.right; + title->top = 0; + title->bottom = 3 * infoPtr->height_increment / 2; + title->left = 0; + title->right = infoPtr->width_increment * xdiv; /* set the dimensions of the next and previous buttons and center */ /* the month text vertically */ prev->top = next->top = title->top + 4; prev->bottom = next->bottom = title->bottom - 4; prev->left = title->left + 4; - prev->right = prev->left + (title->bottom - title->top) ; + prev->right = prev->left + (title->bottom - title->top); next->right = title->right - 4; next->left = next->right - (title->bottom - title->top); @@ -1808,24 +1807,47 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) /* setup the dimensions of the rectangle we draw the names of the */ /* days of the week in */ - weeknumrect->left = left_offset; + weeknumrect->left = 0; + if(infoPtr->dwStyle & MCS_WEEKNUMBERS) - weeknumrect->right=prev->right; + weeknumrect->right = prev->right; else - weeknumrect->right=weeknumrect->left; + weeknumrect->right = weeknumrect->left; + wdays->left = days->left = weeknumrect->right; wdays->right = days->right = wdays->left + 7 * infoPtr->width_increment; - wdays->top = title->bottom ; + wdays->top = title->bottom; wdays->bottom = wdays->top + infoPtr->height_increment; - days->top = weeknumrect->top = wdays->bottom ; + days->top = weeknumrect->top = wdays->bottom; days->bottom = weeknumrect->bottom = days->top + 6 * infoPtr->height_increment; - todayrect->left = rcClient.left; - todayrect->right = rcClient.right; + todayrect->left = 0; + todayrect->right = title->right; todayrect->top = days->bottom; todayrect->bottom = days->bottom + infoPtr->height_increment; + /* offset all rectangles to center in client area */ + dx = (rcClient.right - title->right) / 2; + dy = (rcClient.bottom - todayrect->bottom) / 2; + + /* if calendar doesn't fit client area show it at left/top bounds */ + if (title->left + dx < 0) dx = 0; + if (title->top + dy < 0) dy = 0; + + if (dx != 0 || dy != 0) + { + OffsetRect(title, dx, dy); + OffsetRect(prev, dx, dy); + OffsetRect(next, dx, dy); + OffsetRect(titlemonth, dx, dy); + OffsetRect(titleyear, dx, dy); + OffsetRect(wdays, dx, dy); + OffsetRect(weeknumrect, dx, dy); + OffsetRect(days, dx, dy); + OffsetRect(todayrect, dx, dy); + } + TRACE("dx=%d dy=%d client[%s] title[%s] wdays[%s] days[%s] today[%s]\n", infoPtr->width_increment,infoPtr->height_increment, wine_dbgstr_rect(&rcClient),

1 0

Nikolay Sivov : comctl32/monthcal: Minimal rectangle should be zero based.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 74eca56acb8ac4b09d6a2b710e1cd2b655bce71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=74eca56acb8ac4b09d6a2b710… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 29 00:12:39 2009 +0400 comctl32/monthcal: Minimal rectangle should be zero based. --- dlls/comctl32/monthcal.c | 10 ++++++-- dlls/comctl32/tests/monthcal.c | 43 +++++++++++++++++++++++++++++---------- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 62c8dc8..6f60587 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -759,12 +759,16 @@ MONTHCAL_GetMinReqRect(const MONTHCAL_INFO *infoPtr, LPRECT lpRect) if(!lpRect) return FALSE; - lpRect->left = infoPtr->title.left; - lpRect->top = infoPtr->title.top; - lpRect->right = infoPtr->title.right; + lpRect->left = infoPtr->title.left; + lpRect->top = infoPtr->title.top; + lpRect->right = infoPtr->title.right; lpRect->bottom = infoPtr->todayrect.bottom; + AdjustWindowRect(lpRect, infoPtr->dwStyle, FALSE); + /* minimal rectangle is zero based */ + OffsetRect(lpRect, -lpRect->left, -lpRect->top); + TRACE("%s\n", wine_dbgstr_rect(lpRect)); return TRUE; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 880ff69..5c5a8f8 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -853,17 +853,28 @@ static void test_monthcal_unicode(void) static void test_monthcal_hittest(void) { + typedef struct hittest_test + { + UINT ht; + int todo; + } hittest_test_t; + + static const hittest_test_t title_hits[] = { + { MCHT_NOWHERE, 0 }, + { MCHT_TITLEBTNPREV, 0 }, + { MCHT_TITLEMONTH, 1 }, + { MCHT_TITLEYEAR, 1 }, + { MCHT_TITLEBTNNEXT, 0 }, + { MCHT_NOWHERE, 0 } + }; + MCHITTESTINFO mchit; - UINT res; + UINT res, old_res; SYSTEMTIME st; LONG x; UINT title_index; HWND hwnd; RECT r; - static const UINT title_hits[] = - { MCHT_NOWHERE, MCHT_TITLEBK, MCHT_TITLEBTNPREV, MCHT_TITLEBK, - MCHT_TITLEMONTH, MCHT_TITLEBK, MCHT_TITLEYEAR, MCHT_TITLEBK, - MCHT_TITLEBTNNEXT, MCHT_TITLEBK, MCHT_NOWHERE }; memset(&mchit, 0, sizeof(MCHITTESTINFO)); @@ -914,7 +925,7 @@ static void test_monthcal_hittest(void) expect(0, mchit.pt.x); expect(0, mchit.pt.y); expect(mchit.uHit, res); - todo_wine expect_hex(MCHT_TITLE, res); + expect_hex(MCHT_TITLE, res); /* bottom right of the control and should not be active */ mchit.pt.x = r.right; @@ -950,7 +961,7 @@ static void test_monthcal_hittest(void) expect(r.right / 14, mchit.pt.x); expect(r.bottom / 2, mchit.pt.y); expect(mchit.uHit, res); - todo_wine expect_hex(MCHT_CALENDARDATE, res); + expect_hex(MCHT_CALENDARDATE, res); /* in active area - date from prev month */ mchit.pt.x = r.right / 14; /* half of first day rect */ @@ -959,7 +970,7 @@ static void test_monthcal_hittest(void) expect(r.right / 14, mchit.pt.x); expect(6 * r.bottom / 19, mchit.pt.y); expect(mchit.uHit, res); - todo_wine expect_hex(MCHT_CALENDARDATEPREV, res); + expect_hex(MCHT_CALENDARDATEPREV, res); #if 0 /* (125, 115) is in active area - date from this month */ @@ -1040,8 +1051,10 @@ static void test_monthcal_hittest(void) /* The horizontal position of title bar elements depends on locale (y pos is constant), so we sample across a horizontal line and make sure we find all elements. */ + mchit.pt.x = 0; mchit.pt.y = (5/2) * r.bottom / 19; title_index = 0; + old_res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); for (x = 0; x < r.right; x++){ mchit.pt.x = x; @@ -1049,13 +1062,21 @@ static void test_monthcal_hittest(void) expect(x, mchit.pt.x); expect((5/2) * r.bottom / 19, mchit.pt.y); expect(mchit.uHit, res); - if (res != title_hits[title_index]){ + + if (res != MCHT_TITLEBK && res != old_res) { title_index++; + old_res = res; + if (sizeof(title_hits) / sizeof(title_hits[0]) <= title_index) break; - todo_wine - expect_hex(title_hits[title_index], res); + if (title_hits[title_index].todo) { + todo_wine + ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", + title_hits[title_index].ht, res, x); + } + else ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", + title_hits[title_index].ht, res, x); } }

1 0

Nikolay Sivov : comctl32/monthcal: Use a single calendar for hittesting tests, make point calculation at runtime.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 1f41db4c2fac11753fed12a2c88f3c5bd6c9ee3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f41db4c2fac11753fed12a2c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Sep 28 22:50:21 2009 +0400 comctl32/monthcal: Use a single calendar for hittesting tests, make point calculation at runtime. --- dlls/comctl32/tests/monthcal.c | 181 ++++++++++++++++++++++------------------ 1 files changed, 99 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f41db4c2fac11753fed1…

1 0

Nikolay Sivov : comctl32/monthcal: Months popup menu should be placed at current pointer position.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 30010f44d5684fa5f628c77bd5c688802e01a3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30010f44d5684fa5f628c77bd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Sep 28 22:13:56 2009 +0400 comctl32/monthcal: Months popup menu should be placed at current pointer position. --- dlls/comctl32/monthcal.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index e5f5b44..62c8dc8 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1453,8 +1453,8 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHNAME1+i, buf, countof(buf)); AppendMenuW(hMenu, MF_STRING|MF_ENABLED, i + 1, buf); } - menupoint.x = infoPtr->titlemonth.right; - menupoint.y = infoPtr->titlemonth.bottom; + menupoint.x = ht.pt.x; + menupoint.y = ht.pt.y; ClientToScreen(infoPtr->hwndSelf, &menupoint); i = TrackPopupMenu(hMenu,TPM_LEFTALIGN | TPM_NONOTIFY | TPM_RIGHTBUTTON | TPM_RETURNCMD, menupoint.x, menupoint.y, 0, infoPtr->hwndSelf, NULL); @@ -1464,6 +1464,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) infoPtr->curSel.wMonth = i; InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); } + return 0; } case MCHT_TITLEYEAR: {

1 0

Nikolay Sivov : comctl32/monthcal: Right button should trigger a popup menu on release.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: bce1cebdd4fca0857e689dbe33538047b1c613c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce1cebdd4fca0857e689dbe3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Sep 28 22:04:41 2009 +0400 comctl32/monthcal: Right button should trigger a popup menu on release. --- dlls/comctl32/monthcal.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 603e3e8..e5f5b44 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1336,7 +1336,7 @@ static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) } static LRESULT -MONTHCAL_RButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) +MONTHCAL_RButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) { static const WCHAR todayW[] = { 'G','o',' ','t','o',' ','T','o','d','a','y',':',0 }; HMENU hMenu; @@ -2043,8 +2043,8 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_KILLFOCUS: return MONTHCAL_KillFocus(infoPtr, (HWND)wParam); - case WM_RBUTTONDOWN: - return MONTHCAL_RButtonDown(infoPtr, lParam); + case WM_RBUTTONUP: + return MONTHCAL_RButtonUp(infoPtr, lParam); case WM_LBUTTONDOWN: return MONTHCAL_LButtonDown(infoPtr, lParam);

1 0

Henri Verbeet : wined3d: Explicitly pass gl_info to stateblock_savedstates_copy().
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 49f712beff20371533a69a52594a6e8e59f90aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f712beff20371533a69a525… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 29 11:09:07 2009 +0200 wined3d: Explicitly pass gl_info to stateblock_savedstates_copy(). --- dlls/wined3d/stateblock.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index eaa3262..bd868d7 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -71,12 +71,10 @@ fail: return E_OUTOFMEMORY; } -/** Copy all members of one stateblock to another */ -static void stateblock_savedstates_copy(IWineD3DStateBlock* iface, SAVEDSTATES *dest, const SAVEDSTATES *source) +/* Copy all members of one stateblock to another */ +static void stateblock_savedstates_copy(SAVEDSTATES *dest, const SAVEDSTATES *source, + const struct wined3d_gl_info *gl_info) { - IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)iface; - unsigned bsize = sizeof(BOOL); - /* Single values */ dest->primitive_type = source->primitive_type; dest->indices = source->indices; @@ -102,8 +100,10 @@ static void stateblock_savedstates_copy(IWineD3DStateBlock* iface, SAVEDSTATES * dest->vertexShaderConstantsI = source->vertexShaderConstantsI; /* Dynamically sized arrays */ - memcpy(dest->pixelShaderConstantsF, source->pixelShaderConstantsF, bsize * GL_LIMITS(pshader_constantsF)); - memcpy(dest->vertexShaderConstantsF, source->vertexShaderConstantsF, bsize * GL_LIMITS(vshader_constantsF)); + memcpy(dest->pixelShaderConstantsF, source->pixelShaderConstantsF, + sizeof(BOOL) * gl_info->max_pshader_constantsF); + memcpy(dest->vertexShaderConstantsF, source->vertexShaderConstantsF, + sizeof(BOOL) * gl_info->max_vshader_constantsF); } static inline void stateblock_set_bits(DWORD *map, UINT map_size) @@ -179,7 +179,7 @@ static void stateblock_copy(IWineD3DStateBlockImpl *dst, IWineD3DStateBlockImpl dst->blockType = src->blockType; /* Saved states */ - stateblock_savedstates_copy((IWineD3DStateBlock *)src, &dst->changed, &src->changed); + stateblock_savedstates_copy(&dst->changed, &src->changed, gl_info); /* Single items */ dst->gl_primitive_type = src->gl_primitive_type;

1 0

Henri Verbeet : wined3d: Pass IWineD3DStateBlockImpl pointers to stateblock_copy().
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 6d3e5a9cce5d57aea97963290c73e2cba511cc45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3e5a9cce5d57aea97963290… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 29 11:09:06 2009 +0200 wined3d: Pass IWineD3DStateBlockImpl pointers to stateblock_copy(). --- dlls/wined3d/stateblock.c | 101 ++++++++++++++++++++++----------------------- 1 files changed, 49 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 5692205..eaa3262 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -167,80 +167,77 @@ static void stateblock_savedstates_set(IWineD3DStateBlock *iface, SAVEDSTATES *s memset(states->vertexShaderConstantsF, value, bsize * GL_LIMITS(vshader_constantsF)); } -static void stateblock_copy(IWineD3DStateBlock *destination, IWineD3DStateBlock *source) +static void stateblock_copy(IWineD3DStateBlockImpl *dst, IWineD3DStateBlockImpl *src) { - int l; + const struct wined3d_gl_info *gl_info = &src->wineD3DDevice->adapter->gl_info; + unsigned int l; - IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)source; - IWineD3DStateBlockImpl *Dest = (IWineD3DStateBlockImpl *)destination; - - /* IUnknown fields */ - Dest->lpVtbl = This->lpVtbl; - Dest->ref = This->ref; - - /* IWineD3DStateBlock information */ - Dest->parent = This->parent; - Dest->wineD3DDevice = This->wineD3DDevice; - Dest->blockType = This->blockType; + dst->lpVtbl = src->lpVtbl; + dst->ref = src->ref; + dst->parent = src->parent; + dst->wineD3DDevice = src->wineD3DDevice; + dst->blockType = src->blockType; /* Saved states */ - stateblock_savedstates_copy(source, &Dest->changed, &This->changed); + stateblock_savedstates_copy((IWineD3DStateBlock *)src, &dst->changed, &src->changed); /* Single items */ - Dest->gl_primitive_type = This->gl_primitive_type; - Dest->vertexDecl = This->vertexDecl; - Dest->vertexShader = This->vertexShader; - Dest->streamIsUP = This->streamIsUP; - Dest->pIndexData = This->pIndexData; - Dest->IndexFmt = This->IndexFmt; - Dest->baseVertexIndex = This->baseVertexIndex; - /* Dest->lights = This->lights; */ - Dest->clip_status = This->clip_status; - Dest->viewport = This->viewport; - Dest->material = This->material; - Dest->pixelShader = This->pixelShader; - Dest->scissorRect = This->scissorRect; + dst->gl_primitive_type = src->gl_primitive_type; + dst->vertexDecl = src->vertexDecl; + dst->vertexShader = src->vertexShader; + dst->streamIsUP = src->streamIsUP; + dst->pIndexData = src->pIndexData; + dst->IndexFmt = src->IndexFmt; + dst->baseVertexIndex = src->baseVertexIndex; + dst->clip_status = src->clip_status; + dst->viewport = src->viewport; + dst->material = src->material; + dst->pixelShader = src->pixelShader; + dst->scissorRect = src->scissorRect; /* Lights */ - memset(Dest->activeLights, 0, sizeof(Dest->activeLights)); - for(l = 0; l < LIGHTMAP_SIZE; l++) { + memset(dst->activeLights, 0, sizeof(dst->activeLights)); + for (l = 0; l < LIGHTMAP_SIZE; ++l) + { struct list *e1, *e2; - LIST_FOR_EACH_SAFE(e1, e2, &Dest->lightMap[l]) { + LIST_FOR_EACH_SAFE(e1, e2, &dst->lightMap[l]) + { PLIGHTINFOEL *light = LIST_ENTRY(e1, PLIGHTINFOEL, entry); list_remove(&light->entry); HeapFree(GetProcessHeap(), 0, light); } - LIST_FOR_EACH(e1, &This->lightMap[l]) { + LIST_FOR_EACH(e1, &src->lightMap[l]) + { PLIGHTINFOEL *light = LIST_ENTRY(e1, PLIGHTINFOEL, entry), *light2; light2 = HeapAlloc(GetProcessHeap(), 0, sizeof(*light)); *light2 = *light; - list_add_tail(&Dest->lightMap[l], &light2->entry); - if(light2->glIndex != -1) Dest->activeLights[light2->glIndex] = light2; + list_add_tail(&dst->lightMap[l], &light2->entry); + if (light2->glIndex != -1) dst->activeLights[light2->glIndex] = light2; } } /* Fixed size arrays */ - 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)); + memcpy(dst->vertexShaderConstantB, src->vertexShaderConstantB, sizeof(dst->vertexShaderConstantB)); + memcpy(dst->vertexShaderConstantI, src->vertexShaderConstantI, sizeof(dst->vertexShaderConstantI)); + memcpy(dst->pixelShaderConstantB, src->pixelShaderConstantB, sizeof(dst->pixelShaderConstantB)); + memcpy(dst->pixelShaderConstantI, src->pixelShaderConstantI, sizeof(dst->pixelShaderConstantI)); + + memcpy(dst->streamStride, src->streamStride, sizeof(dst->streamStride)); + memcpy(dst->streamOffset, src->streamOffset, sizeof(dst->streamOffset)); + memcpy(dst->streamSource, src->streamSource, sizeof(dst->streamSource)); + memcpy(dst->streamFreq, src->streamFreq, sizeof(dst->streamFreq)); + memcpy(dst->streamFlags, src->streamFlags, sizeof(dst->streamFlags)); + memcpy(dst->transforms, src->transforms, sizeof(dst->transforms)); + memcpy(dst->clipplane, src->clipplane, sizeof(dst->clipplane)); + memcpy(dst->renderState, src->renderState, sizeof(dst->renderState)); + memcpy(dst->textures, src->textures, sizeof(dst->textures)); + memcpy(dst->textureState, src->textureState, sizeof(dst->textureState)); + memcpy(dst->samplerState, src->samplerState, sizeof(dst->samplerState)); /* Dynamically sized arrays */ - memcpy(Dest->vertexShaderConstantF, This->vertexShaderConstantF, sizeof(float) * GL_LIMITS(vshader_constantsF) * 4); - memcpy(Dest->pixelShaderConstantF, This->pixelShaderConstantF, sizeof(float) * GL_LIMITS(pshader_constantsF) * 4); + memcpy(dst->vertexShaderConstantF, src->vertexShaderConstantF, sizeof(float) * gl_info->max_vshader_constantsF * 4); + memcpy(dst->pixelShaderConstantF, src->pixelShaderConstantF, sizeof(float) * gl_info->max_pshader_constantsF * 4); } /********************************************************** @@ -1383,7 +1380,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (type == WINED3DSBT_INIT || type == WINED3DSBT_RECORDED) return WINED3D_OK; /* Otherwise, might as well set the whole state block to the appropriate values */ - if (device->stateBlock) stateblock_copy((IWineD3DStateBlock *)stateblock, (IWineD3DStateBlock *)device->stateBlock); + if (device->stateBlock) stateblock_copy(stateblock, device->stateBlock); else memset(stateblock->streamFreq, 1, sizeof(stateblock->streamFreq)); /* Reset the ref and type after kludging it. */

1 0

Henri Verbeet : wined3d: Clear the correct "activeLights" array in stateblock_copy().
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 4ed126f5dcbdf99ba03c58e85023b44e8762e405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed126f5dcbdf99ba03c58e85… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 29 11:09:05 2009 +0200 wined3d: Clear the correct "activeLights" array in stateblock_copy(). --- dlls/wined3d/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0cd3e43..5692205 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -202,7 +202,7 @@ static void stateblock_copy(IWineD3DStateBlock *destination, IWineD3DStateBlock Dest->scissorRect = This->scissorRect; /* Lights */ - memset(This->activeLights, 0, sizeof(This->activeLights)); + memset(Dest->activeLights, 0, sizeof(Dest->activeLights)); for(l = 0; l < LIGHTMAP_SIZE; l++) { struct list *e1, *e2; LIST_FOR_EACH_SAFE(e1, e2, &Dest->lightMap[l]) {

1 0

Henri Verbeet : wined3d: Add a separate function for state block initialization.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 664057ce6aac3ef22be1ce57d27acb8a7367bd0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=664057ce6aac3ef22be1ce57d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 29 11:09:04 2009 +0200 wined3d: Add a separate function for state block initialization. --- dlls/wined3d/device.c | 268 ++--------------------------------- dlls/wined3d/stateblock.c | 304 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 6 +- 3 files changed, 313 insertions(+), 265 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=664057ce6aac3ef22be1c…

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
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