October 2009 - Wine-commits

Nikolay Sivov : comctl32/datetime: Separate tests from each other.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: aae85b4d68bb28d02b2581527653464552c5052b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aae85b4d68bb28d02b2581527… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 02:35:16 2009 +0400 comctl32/datetime: Separate tests from each other. --- dlls/comctl32/tests/datetime.c | 327 ++++++++++++++++++++-------------------- 1 files changed, 167 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aae85b4d68bb28d02b258…

1 0

Nikolay Sivov : comctl32/datetime: Some DTM_SETSYSTEMTIME tests.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 99ded940e142d0f688500eb782697655fe4f244b URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ded940e142d0f688500eb78… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 03:00:26 2009 +0400 comctl32/datetime: Some DTM_SETSYSTEMTIME tests. --- dlls/comctl32/tests/datetime.c | 88 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 87 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 986fc8e..26d7ea1 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -524,7 +524,7 @@ static void test_dtm_set_range_swap_min_max(void) static void test_dtm_set_and_get_system_time(void) { LRESULT r; - SYSTEMTIME st, getSt; + SYSTEMTIME st, getSt, ref; HWND hWnd, hWndDateTime_test_gdt_none; hWndDateTime_test_gdt_none = create_datetime_control(0, 0); @@ -579,6 +579,92 @@ static void test_dtm_set_and_get_system_time(void) expect_unsuccess(0, r); ok_sequence(sequences, DATETIME_SEQ_INDEX, test_dtm_set_and_get_system_time_seq, "test_dtm_set_and_get_system_time", FALSE); + + /* set to some valid value */ + GetSystemTime(&ref); + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&ref); + expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + + /* year invalid */ + st = ref; + st.wYear = 0; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + todo_wine expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* month invalid */ + st = ref; + st.wMonth = 13; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* day invalid */ + st = ref; + st.wDay = 32; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* day of week isn't validated */ + st = ref; + st.wDayOfWeek = 10; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + todo_wine expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* hour invalid */ + st = ref; + st.wHour = 25; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* minute invalid */ + st = ref; + st.wMinute = 60; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* sec invalid */ + st = ref; + st.wSecond = 60; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* msec invalid */ + st = ref; + st.wMilliseconds = 1000; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + + /* day of week should be calculated automatically, + actual day of week for this date is 4 */ + fill_systime_struct(&st, 2009, 10, 1, 1, 0, 0, 10, 200); + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + /* 01.10.2009 is Thursday */ + todo_wine expect(4, (LRESULT)getSt.wDayOfWeek); + st.wDayOfWeek = 4; + todo_wine expect_systime(&st, &getSt); + DestroyWindow(hWnd); }

1 0

Nikolay Sivov : comctl32/datetime: Always store a recalculated day of week instead of a value passed in ( DTM_SETSYSTEMTIME).
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 9557376138f3b2508d4b523314182d7dafd4fa85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9557376138f3b2508d4b52331… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 03:11:00 2009 +0400 comctl32/datetime: Always store a recalculated day of week instead of a value passed in (DTM_SETSYSTEMTIME). --- dlls/comctl32/comctl32.h | 1 + dlls/comctl32/datetime.c | 11 ++++++++--- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/tests/datetime.c | 6 +++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index fd07110..e0d1970 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -231,6 +231,7 @@ extern void UPDOWN_Unregister(void); int MONTHCAL_MonthLength(int month, int year); +int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year); extern void THEMING_Initialize(void); extern void THEMING_Uninitialize(void); diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 224519a..8f7f5dd 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -88,6 +88,7 @@ typedef struct /* in monthcal.c */ extern int MONTHCAL_MonthLength(int month, int year); +extern int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year); /* this list of defines is closely related to `allowedformatchars' defined * in datetime.c; the high nibble indicates the `base type' of the format @@ -164,17 +165,21 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy if (flag == GDT_VALID) { if (systime->wYear < 1601 || systime->wYear > 30827 || systime->wMonth < 1 || systime->wMonth > 12 || - systime->wDayOfWeek > 6 || systime->wDay < 1 || systime->wDay > 31 || systime->wHour > 23 || systime->wMinute > 59 || systime->wSecond > 59 || systime->wMilliseconds > 999 ) - return 0; + return FALSE; infoPtr->dateValid = TRUE; infoPtr->date = *systime; + /* always store a valid day of week */ + infoPtr->date.wDayOfWeek = + MONTHCAL_CalculateDayOfWeek(infoPtr->date.wDay, infoPtr->date.wMonth, + infoPtr->date.wYear); + SendMessageW (infoPtr->hMonthCal, MCM_SETCURSEL, 0, (LPARAM)(&infoPtr->date)); SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, BST_CHECKED, 0); } else if ((infoPtr->dwStyle & DTS_SHOWNONE) && (flag == GDT_NONE)) { @@ -182,7 +187,7 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, BST_UNCHECKED, 0); } else - return 0; + return FALSE; InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return TRUE; diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index fcfc7eb..71e477e 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -199,7 +199,7 @@ static void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to) /* returns the day in the week(0 == sunday, 6 == saturday) */ /* day(1 == 1st, 2 == 2nd... etc), year is the year value */ -static int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year) +int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year) { year-=(month < 3); diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 26d7ea1..c449e45 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -616,7 +616,7 @@ static void test_dtm_set_and_get_system_time(void) st = ref; st.wDayOfWeek = 10; r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); - todo_wine expect(1, r); + expect(1, r); r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); expect(GDT_VALID, r); expect_systime(&ref, &getSt); @@ -661,9 +661,9 @@ static void test_dtm_set_and_get_system_time(void) r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); expect(GDT_VALID, r); /* 01.10.2009 is Thursday */ - todo_wine expect(4, (LRESULT)getSt.wDayOfWeek); + expect(4, (LRESULT)getSt.wDayOfWeek); st.wDayOfWeek = 4; - todo_wine expect_systime(&st, &getSt); + expect_systime(&st, &getSt); DestroyWindow(hWnd); }

1 0

Henri Verbeet : wined3d: Get rid of stateblock_savedstates_copy().
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 75fe879c768a775d7d64b49e42a0166fcf1e44a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fe879c768a775d7d64b49e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 1 11:36:06 2009 +0200 wined3d: Get rid of stateblock_savedstates_copy(). This is redundant because we call stateblock_savedstates_set() further down. --- dlls/wined3d/stateblock.c | 38 -------------------------------------- 1 files changed, 0 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4034f1a..3c6863e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -71,41 +71,6 @@ fail: return E_OUTOFMEMORY; } -/* 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) -{ - /* Single values */ - dest->primitive_type = source->primitive_type; - dest->indices = source->indices; - dest->material = source->material; - dest->viewport = source->viewport; - dest->vertexDecl = source->vertexDecl; - dest->pixelShader = source->pixelShader; - dest->vertexShader = source->vertexShader; - dest->scissorRect = dest->scissorRect; - - /* Fixed size arrays */ - dest->streamSource = source->streamSource; - dest->streamFreq = source->streamFreq; - dest->textures = source->textures; - memcpy(dest->transform, source->transform, sizeof(source->transform)); - memcpy(dest->renderState, source->renderState, sizeof(source->renderState)); - memcpy(dest->textureState, source->textureState, sizeof(source->textureState)); - memcpy(dest->samplerState, source->samplerState, sizeof(source->samplerState)); - dest->clipplane = source->clipplane; - dest->pixelShaderConstantsB = source->pixelShaderConstantsB; - dest->pixelShaderConstantsI = source->pixelShaderConstantsI; - dest->vertexShaderConstantsB = source->vertexShaderConstantsB; - dest->vertexShaderConstantsI = source->vertexShaderConstantsI; - - /* Dynamically sized arrays */ - 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) { DWORD mask = (1 << (map_size & 0x1f)) - 1; @@ -1484,9 +1449,6 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * /* Otherwise, might as well set the whole state block to the appropriate values */ if (device->stateBlock) { - /* Saved states */ - stateblock_savedstates_copy(&stateblock->changed, &device->stateBlock->changed, gl_info); - /* Saved values */ stateblock_copy_values(stateblock, device->stateBlock, gl_info); }

1 0

Henri Verbeet : wined3d: Simplify stateblock_savedstates_set().
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: c5029f83ecb635a2c342e8b8ab43b7084eb9bf55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5029f83ecb635a2c342e8b8a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 1 11:36:07 2009 +0200 wined3d: Simplify stateblock_savedstates_set(). We only need to handle the case where "value" is TRUE, since the stateblock data will be filled with zeroes by default. --- dlls/wined3d/stateblock.c | 72 +++++++++++++++++---------------------------- 1 files changed, 27 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3c6863e..f37e452 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -79,54 +79,37 @@ static inline void stateblock_set_bits(DWORD *map, UINT map_size) } /* Set all members of a stateblock savedstate to the given value */ -static void stateblock_savedstates_set(SAVEDSTATES *states, BOOL value, const struct wined3d_gl_info *gl_info) +static void stateblock_savedstates_set(SAVEDSTATES *states, const struct wined3d_gl_info *gl_info) { + unsigned int i; + /* Single values */ - states->primitive_type = value; - states->indices = value; - states->material = value; - states->viewport = value; - states->vertexDecl = value; - states->pixelShader = value; - states->vertexShader = value; - states->scissorRect = value; + states->primitive_type = 1; + states->indices = 1; + states->material = 1; + states->viewport = 1; + states->vertexDecl = 1; + states->pixelShader = 1; + states->vertexShader = 1; + states->scissorRect = 1; /* Fixed size arrays */ - if (value) - { - int i; - states->streamSource = 0xffff; - states->streamFreq = 0xffff; - states->textures = 0xfffff; - stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1); - stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); - for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3fff; - states->clipplane = 0xffffffff; - states->pixelShaderConstantsB = 0xffff; - states->pixelShaderConstantsI = 0xffff; - states->vertexShaderConstantsB = 0xffff; - states->vertexShaderConstantsI = 0xffff; - } - else - { - states->streamSource = 0; - states->streamFreq = 0; - states->textures = 0; - memset(states->transform, 0, sizeof(states->transform)); - memset(states->renderState, 0, sizeof(states->renderState)); - memset(states->textureState, 0, sizeof(states->textureState)); - memset(states->samplerState, 0, sizeof(states->samplerState)); - states->clipplane = 0; - states->pixelShaderConstantsB = 0; - states->pixelShaderConstantsI = 0; - states->vertexShaderConstantsB = 0; - states->vertexShaderConstantsI = 0; - } + states->streamSource = 0xffff; + states->streamFreq = 0xffff; + states->textures = 0xfffff; + stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1); + stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); + for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3fff; + states->clipplane = 0xffffffff; + states->pixelShaderConstantsB = 0xffff; + states->pixelShaderConstantsI = 0xffff; + states->vertexShaderConstantsB = 0xffff; + states->vertexShaderConstantsI = 0xffff; /* Dynamically sized arrays */ - memset(states->pixelShaderConstantsF, value, sizeof(BOOL) * gl_info->max_pshader_constantsF); - memset(states->vertexShaderConstantsF, value, sizeof(BOOL) * gl_info->max_vshader_constantsF); + memset(states->pixelShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_pshader_constantsF); + memset(states->vertexShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_vshader_constantsF); } static void stateblock_copy_values(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src, @@ -1462,7 +1445,8 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (type == WINED3DSBT_ALL) { TRACE("ALL => Pretend everything has changed.\n"); - stateblock_savedstates_set(&stateblock->changed, TRUE, gl_info); + + stateblock_savedstates_set(&stateblock->changed, gl_info); /* Lights are not part of the changed / set structure. */ for (i = 0; i < LIGHTMAP_SIZE; ++i) @@ -1557,7 +1541,6 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * else if (type == WINED3DSBT_PIXELSTATE) { TRACE("PIXELSTATE => Pretend all pixel states have changed.\n"); - stateblock_savedstates_set(&stateblock->changed, FALSE, gl_info); /* Pixel Shader Constants. */ for (i = 0; i < gl_info->max_pshader_constantsF; ++i) @@ -1629,7 +1612,6 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * else if (type == WINED3DSBT_VERTEXSTATE) { TRACE("VERTEXSTATE => Pretend all vertex shates have changed.\n"); - stateblock_savedstates_set(&stateblock->changed, FALSE, gl_info); /* Vertex Shader Constants. */ for (i = 0; i < gl_info->max_vshader_constantsF; ++i)

1 0

Henri Verbeet : wined3d: Use stateblock_init_contained_states() for WINED3DSBT_ALL stateblocks.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 841afe485e3655f1fec64fde3c1101f65e53caa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=841afe485e3655f1fec64fde3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 1 11:36:08 2009 +0200 wined3d: Use stateblock_init_contained_states() for WINED3DSBT_ALL stateblocks. --- dlls/wined3d/stateblock.c | 70 +-------------------------------------------- 1 files changed, 1 insertions(+), 69 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f37e452..0df179a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1447,6 +1447,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * TRACE("ALL => Pretend everything has changed.\n"); stateblock_savedstates_set(&stateblock->changed, gl_info); + stateblock_init_contained_states(stateblock); /* Lights are not part of the changed / set structure. */ for (i = 0; i < LIGHTMAP_SIZE; ++i) @@ -1460,75 +1461,6 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * } } - for (i = 1; i <= WINEHIGHEST_RENDER_STATE; ++i) - { - stateblock->contained_render_states[i - 1] = i; - } - stateblock->num_contained_render_states = WINEHIGHEST_RENDER_STATE; - - /* TODO: Filter unused transforms between TEXTURE8 and WORLD0? */ - for (i = 1; i <= HIGHEST_TRANSFORMSTATE; ++i) - { - stateblock->contained_transform_states[i - 1] = i; - } - stateblock->num_contained_transform_states = HIGHEST_TRANSFORMSTATE; - - for (i = 0; i < gl_info->max_vshader_constantsF; ++i) - { - stateblock->contained_vs_consts_f[i] = i; - } - stateblock->num_contained_vs_consts_f = gl_info->max_vshader_constantsF; - - for (i = 0; i < MAX_CONST_I; ++i) - { - stateblock->contained_vs_consts_i[i] = i; - } - stateblock->num_contained_vs_consts_i = MAX_CONST_I; - - for (i = 0; i < MAX_CONST_B; ++i) - { - stateblock->contained_vs_consts_b[i] = i; - } - stateblock->num_contained_vs_consts_b = MAX_CONST_B; - - for (i = 0; i < gl_info->max_pshader_constantsF; ++i) - { - stateblock->contained_ps_consts_f[i] = i; - } - stateblock->num_contained_ps_consts_f = gl_info->max_pshader_constantsF; - - for (i = 0; i < MAX_CONST_I; ++i) - { - stateblock->contained_ps_consts_i[i] = i; - } - stateblock->num_contained_ps_consts_i = MAX_CONST_I; - - for (i = 0; i < MAX_CONST_B; ++i) - { - stateblock->contained_ps_consts_b[i] = i; - } - stateblock->num_contained_ps_consts_b = MAX_CONST_B; - - for (i = 0; i < MAX_TEXTURES; ++i) - { - for (j = 0; j <= WINED3D_HIGHEST_TEXTURE_STATE; ++j) - { - stateblock->contained_tss_states[stateblock->num_contained_tss_states].stage = i; - stateblock->contained_tss_states[stateblock->num_contained_tss_states].state = j; - ++stateblock->num_contained_tss_states; - } - } - - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - for (j = 1; j <= WINED3D_HIGHEST_SAMPLER_STATE; ++j) - { - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].stage = i; - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].state = j; - ++stateblock->num_contained_sampler_states; - } - } - for (i = 0; i < MAX_STREAMS; ++i) { if (stateblock->streamSource[i]) IWineD3DBuffer_AddRef(stateblock->streamSource[i]);

1 0

Henri Verbeet : wined3d: Add a separate function to initialize the saved states for WINED3DSBT_PIXELSTATE .
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 5a01619d3171008092eb4158a3298a71345d8ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a01619d3171008092eb4158a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 1 11:36:09 2009 +0200 wined3d: Add a separate function to initialize the saved states for WINED3DSBT_PIXELSTATE. --- dlls/wined3d/stateblock.c | 46 ++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0df179a..c1a7184 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -79,7 +79,7 @@ static inline void stateblock_set_bits(DWORD *map, UINT map_size) } /* Set all members of a stateblock savedstate to the given value */ -static void stateblock_savedstates_set(SAVEDSTATES *states, const struct wined3d_gl_info *gl_info) +static void stateblock_savedstates_set_all(SAVEDSTATES *states, const struct wined3d_gl_info *gl_info) { unsigned int i; @@ -112,6 +112,30 @@ static void stateblock_savedstates_set(SAVEDSTATES *states, const struct wined3d memset(states->vertexShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_vshader_constantsF); } +static void stateblock_savedstates_set_pixel(SAVEDSTATES *states, const struct wined3d_gl_info *gl_info) +{ + DWORD texture_mask = 0; + WORD sampler_mask = 0; + unsigned int i; + + states->pixelShader = 1; + + for (i = 0; i < NUM_SAVEDPIXELSTATES_R; ++i) + { + DWORD rs = SavedPixelStates_R[i]; + states->renderState[rs >> 5] |= 1 << (rs & 0x1f); + } + + for (i = 0; i < NUM_SAVEDPIXELSTATES_T; ++i) texture_mask |= 1 << SavedPixelStates_T[i]; + for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = texture_mask; + for (i = 0; i < NUM_SAVEDPIXELSTATES_S; ++i) sampler_mask |= 1 << SavedPixelStates_S[i]; + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = sampler_mask; + states->pixelShaderConstantsB = 0xffff; + states->pixelShaderConstantsI = 0xffff; + + memset(states->pixelShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_pshader_constantsF); +} + static void stateblock_copy_values(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src, const struct wined3d_gl_info *gl_info) { @@ -1446,7 +1470,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { TRACE("ALL => Pretend everything has changed.\n"); - stateblock_savedstates_set(&stateblock->changed, gl_info); + stateblock_savedstates_set_all(&stateblock->changed, gl_info); stateblock_init_contained_states(stateblock); /* Lights are not part of the changed / set structure. */ @@ -1474,33 +1498,30 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { TRACE("PIXELSTATE => Pretend all pixel states have changed.\n"); + stateblock_savedstates_set_pixel(&stateblock->changed, gl_info); + /* Pixel Shader Constants. */ for (i = 0; i < gl_info->max_pshader_constantsF; ++i) { stateblock->contained_ps_consts_f[i] = i; - stateblock->changed.pixelShaderConstantsF[i] = TRUE; } stateblock->num_contained_ps_consts_f = gl_info->max_pshader_constantsF; for (i = 0; i < MAX_CONST_B; ++i) { stateblock->contained_ps_consts_b[i] = i; - stateblock->changed.pixelShaderConstantsB |= (1 << i); } stateblock->num_contained_ps_consts_b = MAX_CONST_B; for (i = 0; i < MAX_CONST_I; ++i) { stateblock->contained_ps_consts_i[i] = i; - stateblock->changed.pixelShaderConstantsI |= (1 << i); } stateblock->num_contained_ps_consts_i = MAX_CONST_I; for (i = 0; i < NUM_SAVEDPIXELSTATES_R; i++) { - DWORD rs = SavedPixelStates_R[i]; - stateblock->changed.renderState[rs >> 5] |= 1 << (rs & 0x1f); - stateblock->contained_render_states[i] = rs; + stateblock->contained_render_states[i] = SavedPixelStates_R[i]; } stateblock->num_contained_render_states = NUM_SAVEDPIXELSTATES_R; @@ -1508,10 +1529,8 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { for (j = 0; j < NUM_SAVEDPIXELSTATES_T; ++j) { - DWORD state = SavedPixelStates_T[j]; - stateblock->changed.textureState[i] |= 1 << state; stateblock->contained_tss_states[stateblock->num_contained_tss_states].stage = i; - stateblock->contained_tss_states[stateblock->num_contained_tss_states].state = state; + stateblock->contained_tss_states[stateblock->num_contained_tss_states].state = SavedPixelStates_T[j]; ++stateblock->num_contained_tss_states; } } @@ -1520,15 +1539,12 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { for (j = 0; j < NUM_SAVEDPIXELSTATES_S; ++j) { - DWORD state = SavedPixelStates_S[j]; - stateblock->changed.samplerState[i] |= 1 << state; stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].stage = i; - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].state = state; + stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].state = SavedPixelStates_S[j]; stateblock->num_contained_sampler_states++; } } - stateblock->changed.pixelShader = TRUE; if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader); /* Pixel state blocks do not contain vertex buffers. Set them to NULL

1 0

Alexandre Julliard : gdi32: Fall back to StretchBlt if the driver doesn' t export PatBlt or BitBlt.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: ab15d132906997ff7a9557a92b7dc9858c0f5340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab15d132906997ff7a9557a92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 30 20:55:26 2009 +0200 gdi32: Fall back to StretchBlt if the driver doesn't export PatBlt or BitBlt. --- dlls/gdi32/bitblt.c | 19 +++++++++++++++---- dlls/gdi32/mfdrv/bitblt.c | 12 ------------ dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 3 --- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 46c7f6f..f638a73 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -47,12 +47,18 @@ BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, if (!dc) return FALSE; + TRACE("%p %d,%d %dx%d %06x\n", hdc, left, top, width, height, rop ); + if (dc->funcs->pPatBlt) { - TRACE("%p %d,%d %dx%d %06x\n", hdc, left, top, width, height, rop ); update_dc( dc ); bRet = dc->funcs->pPatBlt( dc->physDev, left, top, width, height, rop ); } + else if (dc->funcs->pStretchBlt) + { + update_dc( dc ); + bRet = dc->funcs->pStretchBlt( dc->physDev, left, top, width, height, NULL, 0, 0, 0, 0, rop ); + } release_dc_ptr( dc ); return bRet; } @@ -72,14 +78,19 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, if (!(dcDst = get_dc_ptr( hdcDst ))) return FALSE; - if (dcDst->funcs->pBitBlt) + if (dcDst->funcs->pBitBlt || dcDst->funcs->pStretchBlt) { update_dc( dcDst ); dcSrc = get_dc_ptr( hdcSrc ); if (dcSrc) update_dc( dcSrc ); - ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, - dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, rop ); + if (dcDst->funcs->pBitBlt) + ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, + dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, rop ); + else + ret = dcDst->funcs->pStretchBlt( dcDst->physDev, xDst, yDst, width, height, + dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, + width, height, rop ); release_dc_ptr( dcDst ); if (dcSrc) release_dc_ptr( dcSrc ); diff --git a/dlls/gdi32/mfdrv/bitblt.c b/dlls/gdi32/mfdrv/bitblt.c index 85d4b16..c09148f 100644 --- a/dlls/gdi32/mfdrv/bitblt.c +++ b/dlls/gdi32/mfdrv/bitblt.c @@ -36,18 +36,6 @@ BOOL CDECL MFDRV_PatBlt( PHYSDEV dev, INT left, INT top, INT width, INT height, /*********************************************************************** - * MFDRV_BitBlt - */ -BOOL CDECL MFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, INT height, - PHYSDEV devSrc, INT xSrc, INT ySrc, DWORD rop ) -{ - return MFDRV_StretchBlt(devDst, xDst, yDst, width, height, devSrc, - xSrc, ySrc, width, height, rop); -} - - - -/*********************************************************************** * MFDRV_StretchBlt * this function contains TWO ways for processing StretchBlt in metafiles, * decide between rdFunction values META_STRETCHBLT or META_DIBSTRETCHBLT diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index b6cf549..59c973a 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -38,7 +38,7 @@ static const DC_FUNCTIONS MFDRV_Funcs = MFDRV_Arc, /* pArc */ NULL, /* pArcTo */ MFDRV_BeginPath, /* pBeginPath */ - MFDRV_BitBlt, /* pBitBlt */ + NULL, /* pBitBlt */ NULL, /* pChoosePixelFormat */ MFDRV_Chord, /* pChord */ MFDRV_CloseFigure, /* pCloseFigure */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index bdef966..b15864c 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -64,9 +64,6 @@ extern BOOL CDECL MFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, - INT height, PHYSDEV devSrc, INT xSrc, INT ySrc, - DWORD rop ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Move X11DRV_ClientSideDIBCopy to avoid forward declarations.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 7bc4b074fcc9bab63758004692a7fe3deddf6d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc4b074fcc9bab6375800469… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 30 20:35:28 2009 +0200 winex11: Move X11DRV_ClientSideDIBCopy to avoid forward declarations. Change the name to reflect that it's a purely internal function. --- dlls/winex11.drv/bitblt.c | 246 ++++++++++++++++++++++----------------------- 1 files changed, 122 insertions(+), 124 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 119ac5b..250bf98 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1231,6 +1231,127 @@ static BOOL BITBLT_GetVisRectangles( X11DRV_PDEVICE *physDevDst, INT xDst, INT y /*********************************************************************** + * client_side_dib_copy + */ +static BOOL client_side_dib_copy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, + X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, + INT width, INT height ) +{ + DIBSECTION srcDib, dstDib; + BYTE *srcPtr, *dstPtr; + INT srcRowOffset, dstRowOffset; + INT bytesPerPixel; + INT bytesToCopy; + INT y; + static RECT unusedRect; + + if (GetObjectW(physDevSrc->bitmap->hbitmap, sizeof(srcDib), &srcDib) != sizeof(srcDib)) + return FALSE; + if (GetObjectW(physDevDst->bitmap->hbitmap, sizeof(dstDib), &dstDib) != sizeof(dstDib)) + return FALSE; + + /* check for oversized values, just like X11DRV_DIB_CopyDIBSection() */ + if (xSrc > srcDib.dsBm.bmWidth || ySrc > srcDib.dsBm.bmHeight) + return FALSE; + if (xSrc + width > srcDib.dsBm.bmWidth) + width = srcDib.dsBm.bmWidth - xSrc; + if (ySrc + height > srcDib.dsBm.bmHeight) + height = srcDib.dsBm.bmHeight - ySrc; + + if (GetRgnBox(physDevDst->region, &unusedRect) == COMPLEXREGION) + { + /* for simple regions, the clipping was already done by BITBLT_GetVisRectangles */ + FIXME("potential optimization: client-side complex region clipping\n"); + return FALSE; + } + if (dstDib.dsBm.bmBitsPixel <= 8) + { + FIXME("potential optimization: client-side color-index mode DIB copy\n"); + return FALSE; + } + if (!(srcDib.dsBmih.biCompression == BI_BITFIELDS && + dstDib.dsBmih.biCompression == BI_BITFIELDS && + !memcmp(srcDib.dsBitfields, dstDib.dsBitfields, 3*sizeof(DWORD))) + && !(srcDib.dsBmih.biCompression == BI_RGB && + dstDib.dsBmih.biCompression == BI_RGB)) + { + FIXME("potential optimization: client-side compressed DIB copy\n"); + return FALSE; + } + if (srcDib.dsBm.bmBitsPixel != dstDib.dsBm.bmBitsPixel) + { + FIXME("potential optimization: pixel format conversion\n"); + return FALSE; + } + if (srcDib.dsBmih.biWidth < 0 || dstDib.dsBmih.biWidth < 0) + { + FIXME("negative widths not yet implemented\n"); + return FALSE; + } + + switch (dstDib.dsBm.bmBitsPixel) + { + case 15: + case 16: + bytesPerPixel = 2; + break; + case 24: + bytesPerPixel = 3; + break; + case 32: + bytesPerPixel = 4; + break; + default: + FIXME("don't know how to work with a depth of %d\n", physDevSrc->depth); + return FALSE; + } + + bytesToCopy = width * bytesPerPixel; + + if (srcDib.dsBmih.biHeight < 0) + { + srcPtr = &physDevSrc->bitmap->base[ySrc*srcDib.dsBm.bmWidthBytes + xSrc*bytesPerPixel]; + srcRowOffset = srcDib.dsBm.bmWidthBytes; + } + else + { + srcPtr = &physDevSrc->bitmap->base[(srcDib.dsBm.bmHeight-ySrc-1)*srcDib.dsBm.bmWidthBytes + + xSrc*bytesPerPixel]; + srcRowOffset = -srcDib.dsBm.bmWidthBytes; + } + if (dstDib.dsBmih.biHeight < 0) + { + dstPtr = &physDevDst->bitmap->base[yDst*dstDib.dsBm.bmWidthBytes + xDst*bytesPerPixel]; + dstRowOffset = dstDib.dsBm.bmWidthBytes; + } + else + { + dstPtr = &physDevDst->bitmap->base[(dstDib.dsBm.bmHeight-yDst-1)*dstDib.dsBm.bmWidthBytes + + xDst*bytesPerPixel]; + dstRowOffset = -dstDib.dsBm.bmWidthBytes; + } + + /* Handle overlapping regions on the same DIB */ + if (physDevSrc == physDevDst && ySrc < yDst) + { + srcPtr += srcRowOffset * (height - 1); + srcRowOffset = -srcRowOffset; + dstPtr += dstRowOffset * (height - 1); + dstRowOffset = -dstRowOffset; + } + + for (y = yDst; y < yDst + height; ++y) + { + memmove(dstPtr, srcPtr, bytesToCopy); + srcPtr += srcRowOffset; + dstPtr += dstRowOffset; + } + + return TRUE; +} + + +/*********************************************************************** * BITBLT_InternalStretchBlt * * Implementation of PatBlt(), BitBlt() and StretchBlt(). @@ -1520,127 +1641,6 @@ BOOL CDECL X11DRV_PatBlt( X11DRV_PDEVICE *physDev, INT left, INT top, INT width, /*********************************************************************** - * X11DRV_ClientSideDIBCopy - */ -static BOOL X11DRV_ClientSideDIBCopy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, - X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT width, INT height ) -{ - DIBSECTION srcDib, dstDib; - BYTE *srcPtr, *dstPtr; - INT srcRowOffset, dstRowOffset; - INT bytesPerPixel; - INT bytesToCopy; - INT y; - static RECT unusedRect; - - if (GetObjectW(physDevSrc->bitmap->hbitmap, sizeof(srcDib), &srcDib) != sizeof(srcDib)) - return FALSE; - if (GetObjectW(physDevDst->bitmap->hbitmap, sizeof(dstDib), &dstDib) != sizeof(dstDib)) - return FALSE; - - /* check for oversized values, just like X11DRV_DIB_CopyDIBSection() */ - if (xSrc > srcDib.dsBm.bmWidth || ySrc > srcDib.dsBm.bmHeight) - return FALSE; - if (xSrc + width > srcDib.dsBm.bmWidth) - width = srcDib.dsBm.bmWidth - xSrc; - if (ySrc + height > srcDib.dsBm.bmHeight) - height = srcDib.dsBm.bmHeight - ySrc; - - if (GetRgnBox(physDevDst->region, &unusedRect) == COMPLEXREGION) - { - /* for simple regions, the clipping was already done by BITBLT_GetVisRectangles */ - FIXME("potential optimization: client-side complex region clipping\n"); - return FALSE; - } - if (dstDib.dsBm.bmBitsPixel <= 8) - { - FIXME("potential optimization: client-side color-index mode DIB copy\n"); - return FALSE; - } - if (!(srcDib.dsBmih.biCompression == BI_BITFIELDS && - dstDib.dsBmih.biCompression == BI_BITFIELDS && - !memcmp(srcDib.dsBitfields, dstDib.dsBitfields, 3*sizeof(DWORD))) - && !(srcDib.dsBmih.biCompression == BI_RGB && - dstDib.dsBmih.biCompression == BI_RGB)) - { - FIXME("potential optimization: client-side compressed DIB copy\n"); - return FALSE; - } - if (srcDib.dsBm.bmBitsPixel != dstDib.dsBm.bmBitsPixel) - { - FIXME("potential optimization: pixel format conversion\n"); - return FALSE; - } - if (srcDib.dsBmih.biWidth < 0 || dstDib.dsBmih.biWidth < 0) - { - FIXME("negative widths not yet implemented\n"); - return FALSE; - } - - switch (dstDib.dsBm.bmBitsPixel) - { - case 15: - case 16: - bytesPerPixel = 2; - break; - case 24: - bytesPerPixel = 3; - break; - case 32: - bytesPerPixel = 4; - break; - default: - FIXME("don't know how to work with a depth of %d\n", physDevSrc->depth); - return FALSE; - } - - bytesToCopy = width * bytesPerPixel; - - if (srcDib.dsBmih.biHeight < 0) - { - srcPtr = &physDevSrc->bitmap->base[ySrc*srcDib.dsBm.bmWidthBytes + xSrc*bytesPerPixel]; - srcRowOffset = srcDib.dsBm.bmWidthBytes; - } - else - { - srcPtr = &physDevSrc->bitmap->base[(srcDib.dsBm.bmHeight-ySrc-1)*srcDib.dsBm.bmWidthBytes - + xSrc*bytesPerPixel]; - srcRowOffset = -srcDib.dsBm.bmWidthBytes; - } - if (dstDib.dsBmih.biHeight < 0) - { - dstPtr = &physDevDst->bitmap->base[yDst*dstDib.dsBm.bmWidthBytes + xDst*bytesPerPixel]; - dstRowOffset = dstDib.dsBm.bmWidthBytes; - } - else - { - dstPtr = &physDevDst->bitmap->base[(dstDib.dsBm.bmHeight-yDst-1)*dstDib.dsBm.bmWidthBytes - + xDst*bytesPerPixel]; - dstRowOffset = -dstDib.dsBm.bmWidthBytes; - } - - /* Handle overlapping regions on the same DIB */ - if (physDevSrc == physDevDst && ySrc < yDst) - { - srcPtr += srcRowOffset * (height - 1); - srcRowOffset = -srcRowOffset; - dstPtr += dstRowOffset * (height - 1); - dstRowOffset = -dstRowOffset; - } - - for (y = yDst; y < yDst + height; ++y) - { - memmove(dstPtr, srcPtr, bytesToCopy); - srcPtr += srcRowOffset; - dstPtr += dstRowOffset; - } - - return TRUE; -} - - -/*********************************************************************** * X11DRV_BitBlt */ BOOL CDECL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, @@ -1705,9 +1705,7 @@ BOOL CDECL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, height = visRectDst.bottom - visRectDst.top; if (sDst == DIB_Status_AppMod) { - result = X11DRV_ClientSideDIBCopy( physDevSrc, xSrc, ySrc, - physDevDst, xDst, yDst, - width, height ); + result = client_side_dib_copy( physDevSrc, xSrc, ySrc, physDevDst, xDst, yDst, width, height ); if (result) goto END; /* fall back to X server copying */

1 0

Alexandre Julliard : winex11: Move the DIB locking and the client-side optimizations into BITBLT_InternalStretchBlt .
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 77b9b8a307711bd1f6da30f7d2d5e04faa3f5092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b9b8a307711bd1f6da30f7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 30 20:39:51 2009 +0200 winex11: Move the DIB locking and the client-side optimizations into BITBLT_InternalStretchBlt. This way they also apply to the non-stretching StretchBlt case. --- dlls/winex11.drv/bitblt.c | 161 ++++++++++++++------------------------------- 1 files changed, 49 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77b9b8a307711bd1f6da3…

1 0