wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Alexander Kochetkov : oleaut32/tests: Checking null terminator in return value of SysReAllocStringLen.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: b6da072551cf6eb88d1500df5127802face30a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6da072551cf6eb88d1500df5… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Wed Oct 14 11:27:10 2009 +0400 oleaut32/tests: Checking null terminator in return value of SysReAllocStringLen. --- dlls/oleaut32/tests/vartype.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index b7528c4..b50a673 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5397,6 +5397,37 @@ static void test_SysReAllocStringLen(void) SysFreeString(str); } + + /* Windows always returns null terminated strings */ + str = SysAllocStringLen(szTest, 4); + ok (str != NULL, "Expected non-NULL\n"); + if (str) + { + const int CHUNK_SIZE = 64; + const int STRING_SIZE = 24; + int changed; + changed = SysReAllocStringLen(&str, NULL, CHUNK_SIZE); + ok (changed == 1, "Expected 1, got %d\n", changed); + ok (str != NULL, "Expected non-NULL\n"); + if (str) + { + BSTR oldstr = str; + + /* Filling string */ + memset (str, 0xAB, CHUNK_SIZE * sizeof (OLECHAR)); + /* Checking null terminator */ + changed = SysReAllocStringLen(&str, NULL, STRING_SIZE); + ok (changed == 1, "Expected 1, got %d\n", changed); + ok (str != NULL, "Expected non-NULL\n"); + if (str) + { + ok (str == oldstr, "Expected reuse of the old string memory\n"); + todo_wine ok (str[STRING_SIZE] == 0, + "Expected null terminator, got 0x%04X\n", str[STRING_SIZE]); + SysFreeString(str); + } + } + } } static void test_BstrCopy(void)

1 0

Charles Davis : ntdll: Implement CDROM_RawRead() on Mac OS.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 6368dbbd5939bf71b04f3c441dd3af8cd027b7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6368dbbd5939bf71b04f3c441… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Tue Oct 13 12:58:59 2009 -0600 ntdll: Implement CDROM_RawRead() on Mac OS. --- dlls/ntdll/cdrom.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 149 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 8e334df..c0389f9 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1449,6 +1449,155 @@ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DW FIXME("NIY: %d\n", raw->TrackMode); return STATUS_INVALID_PARAMETER; } +#elif defined(__APPLE__) + switch (raw->TrackMode) + { + case YellowMode2: + { + /* Mac OS, on the other hand, DOES read only one part of the sector + * at a time. Therefore, we have to read each part of the sector, in + * order, to get the whole raw sector in. + * This means that we have to read each sector one at a time, as on + * Linux. + */ + dk_cd_read_t cdrd; + UInt64 lba = raw->DiskOffset.QuadPart >> 11; + PBYTE bp; + int i; + + for (i = 0, bp = buffer; i < raw->SectorCount; + i++, lba++, bp += kCDSectorSizeWhole) + { + cdrd.offset = lba * kCDSectorSizeWhole; + cdrd.sectorType = kCDSectorTypeMode2; + + /* First, the sync area */ + cdrd.sectorArea = kCDSectorAreaSync; + cdrd.buffer = bp; + cdrd.bufferLength = 12; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i; + return CDROM_GetStatusCode(io); + } + + /* Then the header */ + cdrd.offset += 12; + cdrd.sectorArea = kCDSectorAreaHeader; + cdrd.buffer = (PBYTE)cdrd.buffer + 12; + cdrd.bufferLength = 4; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 12; + return CDROM_GetStatusCode(io); + } + + /* And finally the sector proper */ + cdrd.offset += 4; + cdrd.sectorArea = kCDSectorAreaUser; + cdrd.buffer = (PBYTE)cdrd.buffer + 4; + cdrd.bufferLength = kCDSectorSizeMode2; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 16; + return CDROM_GetStatusCode(io); + } + } + + break; + } + + case XAForm2: + { + /* Same here */ + dk_cd_read_t cdrd; + UInt64 lba = raw->DiskOffset.QuadPart >> 11; + PBYTE bp; + int i; + + for (i = 0, bp = buffer; i < raw->SectorCount; + i++, lba++, bp += kCDSectorSizeWhole) + { + cdrd.offset = lba * kCDSectorSizeWhole; + cdrd.sectorType = kCDSectorTypeMode2Form2; + + /* First, the sync area */ + cdrd.sectorArea = kCDSectorAreaSync; + cdrd.buffer = bp; + cdrd.bufferLength = 12; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i; + return CDROM_GetStatusCode(io); + } + + /* Then the header */ + cdrd.offset += 12; + cdrd.sectorArea = kCDSectorAreaHeader; + cdrd.buffer = (PBYTE)cdrd.buffer + 12; + cdrd.bufferLength = 4; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 12; + return CDROM_GetStatusCode(io); + } + + /* And the sub-header */ + cdrd.offset += 4; + cdrd.sectorArea = kCDSectorAreaSubHeader; + cdrd.buffer = (PBYTE)cdrd.buffer + 4; + cdrd.bufferLength = 8; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 16; + return CDROM_GetStatusCode(io); + } + + /* And finally the sector proper */ + cdrd.offset += 8; + cdrd.sectorArea = kCDSectorAreaUser; + cdrd.buffer = (PBYTE)cdrd.buffer + 8; + cdrd.bufferLength = kCDSectorSizeMode2; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 24; + return CDROM_GetStatusCode(io); + } + } + + break; + } + + case CDDA: + { + /* With CDDA, the whole raw sector is considered user data, so there's + * no need to read one at a time. + */ + dk_cd_read_t cdrd; + + cdrd.offset = (raw->DiskOffset.QuadPart >> 11) * kCDSectorSizeCDDA; + cdrd.sectorArea = kCDSectorAreaUser; + cdrd.sectorType = kCDSectorTypeCDDA; + cdrd.buffer = buffer; + cdrd.bufferLength = len < raw->SectorCount*kCDSectorSizeCDDA ? len : + raw->SectorCount*kCDSectorSizeCDDA; + + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) return CDROM_GetStatusCode(io); + break; + } + + default: + FIXME("NIY: %d\n", raw->TrackMode); + return STATUS_INVALID_PARAMETER; + } #else switch (raw->TrackMode) {

1 0

Jörg Höhle : winmm: MCI notification is controlled by keyword only.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: d48d923df302274bf457a7ebe61aab3fd90dc4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d48d923df302274bf457a7ebe… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Oct 13 08:00:03 2009 +0200 winmm: MCI notification is controlled by keyword only. --- dlls/winmm/mci.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 216fb2a..32204a0 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1433,12 +1433,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, goto errCleanUp; } - /* set up call back */ - if (hwndCallback != 0) { - dwFlags |= MCI_NOTIFY; - data[0] = (DWORD)hwndCallback; - } - /* set return information */ switch (retType = MCI_GetReturnType(lpCmd)) { case 0: offset = 1; break; @@ -1454,6 +1448,11 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, if ((dwRet = MCI_ParseOptArgs(data, offset, lpCmd, args, &dwFlags))) goto errCleanUp; + /* set up call back */ + if (dwFlags & MCI_NOTIFY) { + data[0] = (DWORD)hwndCallback; + } + /* FIXME: the command should get it's own notification window set up and * ask for device closing while processing the notification mechanism */

1 0

Henri Verbeet : wined3d: Merge some bitfields in struct SAVEDSTATES.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: bac64865206a23eaa9aeb40b4a095beb917ae5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac64865206a23eaa9aeb40b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:19 2009 +0200 wined3d: Merge some bitfields in struct SAVEDSTATES. --- dlls/wined3d/wined3d_private.h | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 69467e0..c9097cf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2079,7 +2079,6 @@ typedef struct SAVEDSTATES { DWORD renderState[(WINEHIGHEST_RENDER_STATE >> 5) + 1]; DWORD textureState[MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */ WORD samplerState[MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */ - DWORD textures; /* MAX_COMBINED_SAMPLERS, 20 */ DWORD clipplane; /* WINED3DMAXUSERCLIPPLANES, 32 */ WORD pixelShaderConstantsB; /* MAX_CONST_B, 16 */ WORD pixelShaderConstantsI; /* MAX_CONST_I, 16 */ @@ -2087,15 +2086,16 @@ typedef struct SAVEDSTATES { WORD vertexShaderConstantsB; /* MAX_CONST_B, 16 */ WORD vertexShaderConstantsI; /* MAX_CONST_I, 16 */ BOOL *vertexShaderConstantsF; - WORD primitive_type : 1; - WORD indices : 1; - WORD material : 1; - WORD viewport : 1; - WORD vertexDecl : 1; - WORD pixelShader : 1; - WORD vertexShader : 1; - WORD scissorRect : 1; - WORD padding : 1; + DWORD textures : 20; /* MAX_COMBINED_SAMPLERS, 20 */ + DWORD primitive_type : 1; + DWORD indices : 1; + DWORD material : 1; + DWORD viewport : 1; + DWORD vertexDecl : 1; + DWORD pixelShader : 1; + DWORD vertexShader : 1; + DWORD scissorRect : 1; + DWORD padding : 4; } SAVEDSTATES; struct StageState {

1 0

Henri Verbeet : wined3d: Simplify IWineD3DStateBlockImpl_Capture().
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 1f029a30dbae7d40818d0d81bc84d15c93578c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f029a30dbae7d40818d0d81b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:18 2009 +0200 wined3d: Simplify IWineD3DStateBlockImpl_Capture(). Consistently use the stateblock's contained states to determine what to capture. --- dlls/wined3d/stateblock.c | 556 +++++++++++++++++++-------------------------- 1 files changed, 230 insertions(+), 326 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f029a30dbae7d40818d0…

1 0

Henri Verbeet : wined3d: Remove the useless "changed" and "enabledChanged" fields from struct wined3d_light_info.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: a24d14796a47eea5a199fdf316a619d723d230d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24d14796a47eea5a199fdf31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:17 2009 +0200 wined3d: Remove the useless "changed" and "enabledChanged" fields from struct wined3d_light_info. --- dlls/wined3d/device.c | 2 - dlls/wined3d/stateblock.c | 52 ++++++++++++++------------------------- dlls/wined3d/wined3d_private.h | 2 - 3 files changed, 19 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a94c4bb..33c15ec 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2485,7 +2485,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLight(IWineD3DDevice *iface, DWORD I list_add_head(&This->updateStateBlock->lightMap[Hi], &object->entry); object->glIndex = -1; object->OriginalIndex = Index; - object->changed = TRUE; } /* Initialize the object */ @@ -2636,7 +2635,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D } } - lightInfo->enabledChanged = TRUE; if(!Enable) { if(lightInfo->glIndex != -1) { if(!This->isRecordingState) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 74a9f3a..862eb66 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -447,8 +447,6 @@ static void stateblock_init_lights(IWineD3DStateBlockImpl *stateblock, struct li struct wined3d_light_info *dst_light = HeapAlloc(GetProcessHeap(), 0, sizeof(*dst_light)); *dst_light = *src_light; - dst_light->changed = TRUE; - dst_light->enabledChanged = TRUE; list_add_tail(&stateblock->lightMap[i], &dst_light->entry); } } @@ -561,42 +559,34 @@ static void record_lights(IWineD3DStateBlockImpl *This, const IWineD3DStateBlock LIST_FOR_EACH(e, &This->lightMap[i]) { BOOL updated = FALSE; struct wined3d_light_info *src = LIST_ENTRY(e, struct wined3d_light_info, entry), *realLight; - if (!src->changed && !src->enabledChanged) continue; /* Look up the light in the destination */ LIST_FOR_EACH(f, &targetStateBlock->lightMap[i]) { realLight = LIST_ENTRY(f, struct wined3d_light_info, entry); - if(realLight->OriginalIndex == src->OriginalIndex) { - if(src->changed) { - src->OriginalParms = realLight->OriginalParms; + if (realLight->OriginalIndex == src->OriginalIndex) + { + src->OriginalParms = realLight->OriginalParms; + + if (realLight->glIndex == -1 && src->glIndex != -1) + { + /* Light disabled */ + This->activeLights[src->glIndex] = NULL; } - if(src->enabledChanged) { - /* Need to double check because enabledChanged does not catch enabled -> disabled -> enabled - * or disabled -> enabled -> disabled changes - */ - if(realLight->glIndex == -1 && src->glIndex != -1) { - /* Light disabled */ - This->activeLights[src->glIndex] = NULL; - } else if(realLight->glIndex != -1 && src->glIndex == -1){ - /* Light enabled */ - This->activeLights[realLight->glIndex] = src; - } - src->glIndex = realLight->glIndex; + else if (realLight->glIndex != -1 && src->glIndex == -1) + { + /* Light enabled */ + This->activeLights[realLight->glIndex] = src; } + src->glIndex = realLight->glIndex; updated = TRUE; break; } } - if(updated) { - /* Found a light, all done, proceed with next hash entry */ - continue; - } else if(src->changed) { - /* Otherwise assign defaul params */ - src->OriginalParms = WINED3D_default_light; - } else { - /* Not enabled by default */ - src->glIndex = -1; + if (!updated) + { + ERR("Light %u in stateblock %p does not exist in device stateblock %p.\n", + src->OriginalIndex, This, targetStateBlock); } } } @@ -987,12 +977,8 @@ static void apply_lights(IWineD3DDevice *pDevice, const IWineD3DStateBlockImpl * { const struct wined3d_light_info *light = LIST_ENTRY(e, struct wined3d_light_info, entry); - if(light->changed) { - IWineD3DDevice_SetLight(pDevice, light->OriginalIndex, &light->OriginalParms); - } - if(light->enabledChanged) { - IWineD3DDevice_SetLightEnable(pDevice, light->OriginalIndex, light->glIndex != -1); - } + IWineD3DDevice_SetLight(pDevice, light->OriginalIndex, &light->OriginalParms); + IWineD3DDevice_SetLightEnable(pDevice, light->OriginalIndex, light->glIndex != -1); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4077d81..69467e0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1208,8 +1208,6 @@ struct wined3d_light_info WINED3DLIGHT OriginalParms; /* Note D3D8LIGHT == D3D9LIGHT */ DWORD OriginalIndex; LONG glIndex; - BOOL changed; - BOOL enabledChanged; BOOL enabled; /* Converted parms to speed up swapping lights */

1 0

Henri Verbeet : wined3d: Rename PLIGHTINFOEL to something less awful.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 3bc9d1894d56bb3a320731a1a566e07c7ebfeb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc9d1894d56bb3a320731a1a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:16 2009 +0200 wined3d: Rename PLIGHTINFOEL to something less awful. --- dlls/wined3d/device.c | 43 +++++++++++++++++++++++---------------- dlls/wined3d/state.c | 5 +-- dlls/wined3d/stateblock.c | 20 ++++++++++-------- dlls/wined3d/wined3d_private.h | 6 ++-- 4 files changed, 41 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bc9d1894d56bb3a32073…

1 0

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

14 Oct '09

Module: wine Branch: master Commit: 580cd8c5bb6c23ce6eac541fe93001d43584fc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=580cd8c5bb6c23ce6eac541fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:15 2009 +0200 wined3d: Get rid of stateblock_copy_values(). Use IWineD3DStateBlockImpl_Capture() for the initial stateblock capture instead. --- dlls/wined3d/stateblock.c | 195 +++++++++------------------------------------ 1 files changed, 37 insertions(+), 158 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6e6dac7..64ae8bb 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -322,70 +322,6 @@ static void stateblock_savedstates_set_vertex(SAVEDSTATES *states, const struct memset(states->vertexShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_vshader_constantsF); } -static void stateblock_copy_values(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src, - const struct wined3d_gl_info *gl_info) -{ - unsigned int l; - - /* Single items */ - 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(dst->activeLights, 0, sizeof(dst->activeLights)); - for (l = 0; l < LIGHTMAP_SIZE; ++l) - { - struct list *e1, *e2; - 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, &src->lightMap[l]) - { - PLIGHTINFOEL *light = LIST_ENTRY(e1, PLIGHTINFOEL, entry), *light2; - light2 = HeapAlloc(GetProcessHeap(), 0, sizeof(*light)); - *light2 = *light; - list_add_tail(&dst->lightMap[l], &light2->entry); - if (light2->glIndex != -1) dst->activeLights[light2->glIndex] = light2; - } - } - - /* Fixed size arrays */ - 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(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); -} - void stateblock_init_contained_states(IWineD3DStateBlockImpl *stateblock) { const struct wined3d_gl_info *gl_info = &stateblock->wineD3DDevice->adapter->gl_info; @@ -498,6 +434,26 @@ void stateblock_init_contained_states(IWineD3DStateBlockImpl *stateblock) } } +static void stateblock_init_lights(IWineD3DStateBlockImpl *stateblock, struct list *light_map) +{ + unsigned int i; + + for (i = 0; i < LIGHTMAP_SIZE; ++i) + { + const PLIGHTINFOEL *src_light; + + LIST_FOR_EACH_ENTRY(src_light, &light_map[i], PLIGHTINFOEL, entry) + { + PLIGHTINFOEL *dst_light = HeapAlloc(GetProcessHeap(), 0, sizeof(*dst_light)); + + *dst_light = *src_light; + dst_light->changed = TRUE; + dst_light->enabledChanged = TRUE; + list_add_tail(&stateblock->lightMap[i], &dst_light->entry); + } + } +} + /********************************************************** * IWineD3DStateBlockImpl IUnknown parts follows **********************************************************/ @@ -1658,108 +1614,31 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * * state block. */ if (type == WINED3DSBT_INIT || type == WINED3DSBT_RECORDED) return WINED3D_OK; - stateblock_copy_values(stateblock, device->stateBlock, gl_info); - TRACE("Updating changed flags appropriate for type %#x.\n", type); - if (type == WINED3DSBT_ALL) + switch (type) { - TRACE("ALL => Pretend everything has changed.\n"); - - stateblock_savedstates_set_all(&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) - { - struct list *e; - LIST_FOR_EACH(e, &stateblock->lightMap[i]) - { - PLIGHTINFOEL *light = LIST_ENTRY(e, PLIGHTINFOEL, entry); - light->changed = TRUE; - light->enabledChanged = TRUE; - } - } - - for (i = 0; i < MAX_STREAMS; ++i) - { - if (stateblock->streamSource[i]) IWineD3DBuffer_AddRef(stateblock->streamSource[i]); - } - - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - if (stateblock->textures[i]) IWineD3DBaseTexture_AddRef(stateblock->textures[i]); - } - - if (stateblock->vertexDecl) IWineD3DVertexDeclaration_AddRef(stateblock->vertexDecl); - if (stateblock->pIndexData) IWineD3DBuffer_AddRef(stateblock->pIndexData); - if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); - if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader); - } - else if (type == WINED3DSBT_PIXELSTATE) - { - TRACE("PIXELSTATE => Pretend all pixel states have changed.\n"); - - stateblock_savedstates_set_pixel(&stateblock->changed, gl_info); - stateblock_init_contained_states(stateblock); - - if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader); + case WINED3DSBT_ALL: + stateblock_init_lights(stateblock, device->stateBlock->lightMap); + stateblock_savedstates_set_all(&stateblock->changed, gl_info); + break; - /* Pixel state blocks do not contain vertex buffers. Set them to NULL - * to avoid wrong refcounting on them. This makes releasing the buffer - * easier. */ - for (i = 0; i < MAX_STREAMS; ++i) - { - stateblock->streamSource[i] = NULL; - } + case WINED3DSBT_PIXELSTATE: + stateblock_savedstates_set_pixel(&stateblock->changed, gl_info); + break; - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - stateblock->textures[i] = NULL; - } + case WINED3DSBT_VERTEXSTATE: + stateblock_init_lights(stateblock, device->stateBlock->lightMap); + stateblock_savedstates_set_vertex(&stateblock->changed, gl_info); + break; - stateblock->vertexDecl = NULL; - stateblock->pIndexData = NULL; - stateblock->vertexShader = NULL; + default: + FIXME("Unrecognized state block type %#x.\n", type); + break; } - else if (type == WINED3DSBT_VERTEXSTATE) - { - TRACE("VERTEXSTATE => Pretend all vertex shates have changed.\n"); - stateblock_savedstates_set_vertex(&stateblock->changed, gl_info); - stateblock_init_contained_states(stateblock); - - for (i = 0; i < LIGHTMAP_SIZE; ++i) - { - struct list *e; - LIST_FOR_EACH(e, &stateblock->lightMap[i]) - { - PLIGHTINFOEL *light = LIST_ENTRY(e, PLIGHTINFOEL, entry); - light->changed = TRUE; - light->enabledChanged = TRUE; - } - } - - for (i = 0; i < MAX_STREAMS; ++i) - { - if (stateblock->streamSource[i]) IWineD3DBuffer_AddRef(stateblock->streamSource[i]); - } - - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - stateblock->textures[i] = NULL; - } - - if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); - - if (stateblock->vertexDecl) IWineD3DVertexDeclaration_AddRef(stateblock->vertexDecl); - stateblock->pIndexData = NULL; - stateblock->pixelShader = NULL; - } - else - { - FIXME("Unrecognized state block type %#x.\n", type); - } + stateblock_init_contained_states(stateblock); + IWineD3DStateBlockImpl_Capture((IWineD3DStateBlock *)stateblock); return WINED3D_OK; }

1 0

Nikolay Sivov : comctl32/monthcal: Reduce update rectangle after updating current selection.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 2cc98ef94abd6ece5fd02d0b915aa14dd7269ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc98ef94abd6ece5fd02d0b9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 13 23:35:19 2009 +0400 comctl32/monthcal: Reduce update rectangle after updating current selection. --- dlls/comctl32/monthcal.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ed0f6fe..ee7dc4e 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -174,7 +174,7 @@ static inline void MONTHCAL_NotifySelect(const MONTHCAL_INFO *infoPtr) /* january is 1, december is 12 */ int MONTHCAL_MonthLength(int month, int year) { - const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0}; + const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; /* Wrap around, this eases handling. Getting length only we shouldn't care about year change here cause January and December have the same day quantity */ @@ -813,7 +813,8 @@ static void MONTHCAL_PaintWeeknumbers(MONTHCAL_INFO *infoPtr, HDC hdc, const PAI WARN("Unknown LOCALE_IFIRSTWEEKOFYEAR value %d, defaulting to 0\n", weeknum); mindays = 0; } - if (infoPtr->curSel.wMonth < 2) + + if (infoPtr->curSel.wMonth == 1) { /* calculate all those exceptions for january */ st.wDay = st.wMonth = 1; @@ -1366,6 +1367,8 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) static LRESULT MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) { + SYSTEMTIME prev = infoPtr->curSel; + TRACE("%p\n", curSel); if(!curSel) return FALSE; if(infoPtr->dwStyle & MCS_MULTISELECT) return FALSE; @@ -1379,10 +1382,23 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) infoPtr->minSel = *curSel; infoPtr->maxSel = *curSel; - infoPtr->curSel = *curSel; + /* if selection is still in current month, reduce rectangle */ + prev.wDay = curSel->wDay; + if (MONTHCAL_IsDateEqual(&prev, curSel)) + { + RECT r_prev, r_new; - /* FIXME: it's possible to reduce rectangle here */ - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + /* note that infoPtr->curSel isn't updated yet */ + MONTHCAL_CalcPosFromDay(infoPtr, &infoPtr->curSel, &r_prev); + MONTHCAL_CalcPosFromDay(infoPtr, curSel, &r_new); + + InvalidateRect(infoPtr->hwndSelf, &r_prev, FALSE); + InvalidateRect(infoPtr->hwndSelf, &r_new, FALSE); + } + else + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + + infoPtr->curSel = *curSel; return TRUE; }

1 0

Nikolay Sivov : comctl32/monthcal: Fix painting selected day, remove unneeded operations.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: ca579f7c6101474c6166a451f52baf03a3d158b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca579f7c6101474c6166a451f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 13 22:06:48 2009 +0400 comctl32/monthcal: Fix painting selected day, remove unneeded operations. --- dlls/comctl32/monthcal.c | 30 +++++++++--------------------- 1 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 67a0363..ed0f6fe 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -650,10 +650,11 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM static const WCHAR fmtW[] = { '%','d',0 }; WCHAR buf[10]; RECT r, r_temp; - static BOOL haveBoldFont, haveSelectedDay = FALSE; + static BOOL bold_selected; + BOOL selected_day = FALSE; HBRUSH hbr; COLORREF oldCol = 0; - COLORREF oldBk = 0; + COLORREF oldBk = 0; /* No need to check styles: when selection is not valid, it is set to zero. * 1<day<31, so everything is OK. @@ -664,7 +665,6 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM if ((MONTHCAL_CompareDate(st, &infoPtr->minSel) >= 0) && (MONTHCAL_CompareDate(st, &infoPtr->maxSel) <= 0)) { - RECT r2; TRACE("%d %d %d\n", st->wDay, infoPtr->minSel.wDay, infoPtr->maxSel.wDay); TRACE("%s\n", wine_dbgstr_rect(&r)); @@ -673,34 +673,23 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM hbr = GetSysColorBrush(COLOR_HIGHLIGHT); FillRect(hdc, &r, hbr); - /* FIXME: this may need to be changed now b/c of the other - drawing changes 11/3/99 CMM */ - r2.left = r.left - 0.25 * infoPtr->textWidth; - r2.top = r.top; - r2.right = r.left + 0.5 * infoPtr->textWidth; - r2.bottom = r.bottom; - if(haveSelectedDay) FillRect(hdc, &r2, hbr); - haveSelectedDay = TRUE; - } else { - haveSelectedDay = FALSE; + selected_day = TRUE; } - /* need to add some code for multiple selections */ - - if((bold) &&(!haveBoldFont)) { + if(bold && !bold_selected) { SelectObject(hdc, infoPtr->hBoldFont); - haveBoldFont = TRUE; + bold_selected = TRUE; } - if((!bold) &&(haveBoldFont)) { + if(!bold && bold_selected) { SelectObject(hdc, infoPtr->hFont); - haveBoldFont = FALSE; + bold_selected = FALSE; } SetBkMode(hdc,TRANSPARENT); wsprintfW(buf, fmtW, st->wDay); DrawTextW(hdc, buf, -1, &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE ); - if(haveSelectedDay) { + if(selected_day) { SetTextColor(hdc, oldCol); SetBkColor(hdc, oldBk); } @@ -1374,7 +1363,6 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) return TRUE; } -/* FIXME: if the specified date is not visible, make it visible */ static LRESULT MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009