wine-commits January 2009

wine-commits@winehq.org

3 participants
1348 discussions

Michael Stefaniuc : dnsapi/tests: Remove superfluous casts.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: b8f17bac2b9fb83d52826f227a32b346ee2d8b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f17bac2b9fb83d52826f227… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 1 23:26:59 2009 +0100 dnsapi/tests: Remove superfluous casts. The pointers to r1 and r2 are already PDNS_RECORDs. --- dlls/dnsapi/tests/record.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c index 8ce0f3d..4e97d85 100644 --- a/dlls/dnsapi/tests/record.c +++ b/dlls/dnsapi/tests/record.c @@ -37,25 +37,25 @@ static DNS_RECORDA r3 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 12 static void test_DnsRecordCompare( void ) { - ok( DnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r1 ) == TRUE, "failed unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r1 ) == TRUE, "failed unexpectedly\n" ); r2.pName = name2; - ok( DnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == TRUE, "failed unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" ); r2.Flags.S.CharSet = DnsCharSetUnicode; - ok( DnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == FALSE, "succeeded unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == FALSE, "succeeded unexpectedly\n" ); r2.Flags.S.CharSet = DnsCharSetAnsi; - ok( DnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == FALSE, "succeeded unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == FALSE, "succeeded unexpectedly\n" ); r1.Flags.S.CharSet = DnsCharSetAnsi; - ok( DnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == TRUE, "failed unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" ); r1.dwTtl = 0; - ok( DnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == TRUE, "failed unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" ); r2.Data.A.IpAddress = 0; - ok( DnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == FALSE, "succeeded unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == FALSE, "succeeded unexpectedly\n" ); } static void test_DnsRecordSetCompare( void )

1 0

Michael Stefaniuc : cabinet: Don't cast the return value of PF[CD]I_ALLOC; those are void pointers.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: e4db17f2689c60f9fde25dce98f93dcabe62a811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4db17f2689c60f9fde25dce9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 1 23:26:50 2009 +0100 cabinet: Don't cast the return value of PF[CD]I_ALLOC; those are void pointers. --- dlls/cabinet/fci.c | 10 +++++----- dlls/cabinet/fdi.c | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index ed413f8..81175dc 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -382,7 +382,7 @@ static BOOL fci_flush_data_block (HFCI hfci, int* err, /* inefficient, but it's harder to forget about freeing the buffer :-). */ /* Reserved areas are used seldom besides that... */ if (cbReserveCFData!=0) { - if(!(reserved = (char*)PFCI_ALLOC(hfci, cbReserveCFData))) { + if(!(reserved = PFCI_ALLOC(hfci, cbReserveCFData))) { fci_set_error( FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY, TRUE ); return FALSE; } @@ -852,7 +852,7 @@ static BOOL fci_flushfolder_copy_cffolder(HFCI hfci, int* err, UINT cbReserveCFF /* add optional reserved area */ if (cbReserveCFFolder!=0) { - if(!(reserved = (char*)PFCI_ALLOC(hfci, cbReserveCFFolder))) { + if(!(reserved = PFCI_ALLOC(hfci, cbReserveCFFolder))) { fci_set_error( FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY, TRUE ); return FALSE; } @@ -1419,7 +1419,7 @@ static BOOL fci_flush_folder( /* save size of file CFDATA2 - required for the folder's offset to data */ sizeFileCFDATA2old = p_fci_internal->sizeFileCFDATA2; - if(!(reserved = (char*)PFCI_ALLOC(hfci, cbReserveCFData+sizeof(CFDATA)))) { + if(!(reserved = PFCI_ALLOC(hfci, cbReserveCFData+sizeof(CFDATA)))) { fci_set_error( FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY, TRUE ); PFCI_CLOSE(hfci,handleCFDATA1new,&err,p_fci_internal->pv); /* TODO error handling of err */ @@ -1753,7 +1753,7 @@ static BOOL fci_flush_cabinet( /* add optional reserved area */ if (cbReserveCFHeader!=0) { - if(!(reserved = (char*)PFCI_ALLOC(hfci, cbReserveCFHeader))) { + if(!(reserved = PFCI_ALLOC(hfci, cbReserveCFHeader))) { fci_set_error( FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY, TRUE ); return FALSE; } @@ -2397,7 +2397,7 @@ BOOL __cdecl FCIAddFile( fci_set_error( FCIERR_NONE, ERROR_GEN_FAILURE, TRUE ); return FALSE; } - if(!(p_fci_internal->data_in = (char*)PFCI_ALLOC(hfci,CB_MAX_CHUNK))) { + if(!(p_fci_internal->data_in = PFCI_ALLOC(hfci,CB_MAX_CHUNK))) { fci_set_error( FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY, TRUE ); return FALSE; } diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 4923404..2248b9e 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -1054,7 +1054,7 @@ struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state) l[h] = j; /* set table size in stack */ /* allocate and link in new table */ - if (!(q = (struct Ziphuft *) PFDI_ALLOC(CAB(hfdi), (z + 1)*sizeof(struct Ziphuft)))) + if (!(q = PFDI_ALLOC(CAB(hfdi), (z + 1)*sizeof(struct Ziphuft)))) { if(h) fdi_Ziphuft_free(CAB(hfdi), ZIP(u)[0]); @@ -2180,8 +2180,8 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state if (cab->mii.folder_resv > 0) PFDI_SEEK(CAB(hfdi), cab->cabhf, cab->mii.folder_resv, SEEK_CUR); - - fol = (struct fdi_folder *) PFDI_ALLOC(CAB(hfdi), sizeof(struct fdi_folder)); + + fol = PFDI_ALLOC(CAB(hfdi), sizeof(struct fdi_folder)); if (!fol) { ERR("out of memory!\n"); return DECR_NOMEMORY; @@ -2202,8 +2202,8 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state for (i = 0; i < fdici.cFiles; i++) { if (PFDI_READ(CAB(hfdi), cab->cabhf, buf2, cffile_SIZEOF) != cffile_SIZEOF) return DECR_INPUT; - - file = (struct fdi_file *) PFDI_ALLOC(CAB(hfdi), sizeof(struct fdi_file)); + + file = PFDI_ALLOC(CAB(hfdi), sizeof(struct fdi_file)); if (!file) { ERR("out of memory!\n"); return DECR_NOMEMORY; @@ -2592,7 +2592,7 @@ BOOL __cdecl FDICopy( if (CAB(mii).folder_resv > 0) PFDI_SEEK(hfdi, cabhf, CAB(mii).folder_resv, SEEK_CUR); - fol = (struct fdi_folder *) PFDI_ALLOC(hfdi, sizeof(struct fdi_folder)); + fol = PFDI_ALLOC(hfdi, sizeof(struct fdi_folder)); if (!fol) { ERR("out of memory!\n"); PFDI_INT(hfdi)->perf->erfOper = FDIERROR_ALLOC_FAIL; @@ -2622,7 +2622,7 @@ BOOL __cdecl FDICopy( goto bail_and_fail; } - file = (struct fdi_file *) PFDI_ALLOC(hfdi, sizeof(struct fdi_file)); + file = PFDI_ALLOC(hfdi, sizeof(struct fdi_file)); if (!file) { ERR("out of memory!\n"); PFDI_INT(hfdi)->perf->erfOper = FDIERROR_ALLOC_FAIL;

1 0

Michael Stefaniuc : dplayx/tests: Fix typo.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 4008a35020a533fdd02a54246639afc62c10d7cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4008a35020a533fdd02a54246… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 1 14:31:02 2009 +0100 dplayx/tests: Fix typo. --- dlls/dplayx/tests/dplayx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 69f4cc0..00224bd 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6137,7 +6137,7 @@ START_TEST(dplayx) { if (!winetest_interactive) { - skip("Run in interacive mode to run dplayx tests.\n"); + skip("Run in interactive mode to run dplayx tests.\n"); return; }

1 0

Michael Stefaniuc : dplayx/tests: Do not explicitly cast LPVOID function arguments.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: f01b21634a52a029e9354b36db56e81e6ea60c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01b21634a52a029e9354b36d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 1 14:30:53 2009 +0100 dplayx/tests: Do not explicitly cast LPVOID function arguments. --- dlls/dplayx/tests/dplayx.c | 419 ++++++++++++++++++-------------------------- 1 files changed, 168 insertions(+), 251 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f01b21634a52a029e9354…

1 0

Allan Tong : wined3d: Add mapping for MOV instructions in shader_hw_map2gl.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: fdd512deebccb93b88c6eee4cdfca002d1278eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd512deebccb93b88c6eee4c… Author: Allan Tong <actong88(a)gmail.com> Date: Wed Dec 31 21:44:33 2008 -0500 wined3d: Add mapping for MOV instructions in shader_hw_map2gl. --- dlls/wined3d/arb_program_shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3e2155b..3a5493d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -924,6 +924,7 @@ static void shader_hw_map2gl(const SHADER_OPCODE_ARG *arg) case WINED3DSIO_MAD: instruction = "MAD"; break; case WINED3DSIO_MAX: instruction = "MAX"; break; case WINED3DSIO_MIN: instruction = "MIN"; break; + case WINED3DSIO_MOV: instruction = "MOV"; break; case WINED3DSIO_MUL: instruction = "MUL"; break; case WINED3DSIO_NOP: instruction = "NOP"; break; case WINED3DSIO_POW: instruction = "POW"; break;

1 0

Andrew Talbot : comdlg32: Unreachable code fix.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 0c587dc37336931a8bbadc3378d188ba40ed9c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c587dc37336931a8bbadc337… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 31 18:50:13 2008 +0000 comdlg32: Unreachable code fix. --- dlls/comdlg32/filedlg.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index e1eedd1..386a201 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2205,7 +2205,6 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) ret = EndDialog(hwnd, FALSE); COMDLG32_SetCommDlgExtendedError(FNERR_BUFFERTOOSMALL); } - goto ret; } break; }

1 0

Christian Costa : winmm: Check param in joyConfigChanged.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 6d8fdefb4a932b0047dae9bd17f27baff020adbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8fdefb4a932b0047dae9bd1… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Dec 31 17:29:17 2008 +0100 winmm: Check param in joyConfigChanged. --- dlls/winmm/joystick.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index d5d620b..0173926 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -126,6 +126,10 @@ static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi MMRESULT WINAPI joyConfigChanged(DWORD flags) { FIXME("(%x) - stub\n", flags); + + if (flags) + return JOYERR_PARMS; + return JOYERR_NOERROR; }

1 0

Henri Verbeet : wined3d: Convert clipplane to a bitmap in struct SAVEDSTATES.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 3b5c75d99175976b341336a028d75b5febf25869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5c75d99175976b341336a02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 31 16:57:11 2008 +0100 wined3d: Convert clipplane to a bitmap in struct SAVEDSTATES. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 38 +++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c0f0ff6..a0b6d1f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3038,7 +3038,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetClipPlane(IWineD3DDevice *iface, DWO return WINED3DERR_INVALIDCALL; } - This->updateStateBlock->changed.clipplane[Index] = TRUE; + This->updateStateBlock->changed.clipplane |= 1 << Index; if(This->updateStateBlock->clipplane[Index][0] == pPlane[0] && This->updateStateBlock->clipplane[Index][1] == pPlane[1] && diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c07da78..2923d50 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -93,7 +93,7 @@ static void stateblock_savedstates_copy(IWineD3DStateBlock* iface, SAVEDSTATES * memcpy(dest->renderState, source->renderState, bsize * (WINEHIGHEST_RENDER_STATE + 1)); memcpy(dest->textureState, source->textureState, bsize * MAX_TEXTURES * (WINED3D_HIGHEST_TEXTURE_STATE + 1)); memcpy(dest->samplerState, source->samplerState, bsize * MAX_COMBINED_SAMPLERS * (WINED3D_HIGHEST_SAMPLER_STATE + 1)); - memcpy(dest->clipplane, source->clipplane, bsize * MAX_CLIPPLANES); + dest->clipplane = source->clipplane; dest->pixelShaderConstantsB = source->pixelShaderConstantsB; dest->pixelShaderConstantsI = source->pixelShaderConstantsI; dest->vertexShaderConstantsB = source->vertexShaderConstantsB; @@ -130,7 +130,7 @@ void stateblock_savedstates_set( memset(states->renderState, value, bsize * (WINEHIGHEST_RENDER_STATE + 1)); memset(states->textureState, value, bsize * MAX_TEXTURES * (WINED3D_HIGHEST_TEXTURE_STATE + 1)); memset(states->samplerState, value, bsize * MAX_COMBINED_SAMPLERS * (WINED3D_HIGHEST_SAMPLER_STATE + 1)); - memset(states->clipplane, value, bsize * MAX_CLIPPLANES); + states->clipplane = value ? 0xffffffff : 0; states->pixelShaderConstantsB = value ? 0xffff : 0; states->pixelShaderConstantsI = value ? 0xffff : 0; states->vertexShaderConstantsB = value ? 0xffff : 0; @@ -372,7 +372,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)iface; IWineD3DStateBlockImpl *targetStateBlock = This->wineD3DDevice->stateBlock; unsigned int i, j; - WORD map; + DWORD map; TRACE("(%p) : Updating state block %p ------------------v\n", targetStateBlock, This); @@ -543,9 +543,12 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) } } - for (i = 0; i < GL_LIMITS(clipplanes); i++) { - if (This->changed.clipplane[i] - && memcmp(targetStateBlock->clipplane[i], This->clipplane[i], sizeof(*This->clipplane))) + map = This->changed.clipplane; + for (i = 0; map; map >>= 1, ++i) + { + if (!(map & 1)) continue; + + if (memcmp(targetStateBlock->clipplane[i], This->clipplane[i], sizeof(*This->clipplane))) { TRACE("Updating clipplane %u\n", i); memcpy(This->clipplane[i], targetStateBlock->clipplane[i], sizeof(*This->clipplane)); @@ -725,7 +728,7 @@ should really perform a delta so that only the changes get updated*/ UINT i; UINT j; - WORD map; + DWORD map; TRACE("(%p) : Applying state block %p ------------------v\n", This, pDevice); @@ -839,18 +842,19 @@ should really perform a delta so that only the changes get updated*/ } } - for (i = 0; i < GL_LIMITS(clipplanes); i++) { - if (This->changed.clipplane[i]) { - float clip[4]; - - clip[0] = This->clipplane[i][0]; - clip[1] = This->clipplane[i][1]; - clip[2] = This->clipplane[i][2]; - clip[3] = This->clipplane[i][3]; - IWineD3DDevice_SetClipPlane(pDevice, i, clip); - } - } + map = This->changed.clipplane; + for (i = 0; map; map >>= 1, ++i) + { + float clip[4]; + + if (!(map & 1)) continue; + clip[0] = This->clipplane[i][0]; + clip[1] = This->clipplane[i][1]; + clip[2] = This->clipplane[i][2]; + clip[3] = This->clipplane[i][3]; + IWineD3DDevice_SetClipPlane(pDevice, i, clip); + } } else if(This->blockType == WINED3DSBT_VERTEXSTATE) { IWineD3DDevice_SetVertexShader(pDevice, This->vertexShader); for (i = 0; i < GL_LIMITS(vshader_constantsF); i++) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 19ff8f8..010f097 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1765,7 +1765,7 @@ typedef struct SAVEDSTATES { BOOL renderState[WINEHIGHEST_RENDER_STATE + 1]; BOOL textureState[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; BOOL samplerState[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; - BOOL clipplane[MAX_CLIPPLANES]; + DWORD clipplane; /* WINED3DMAXUSERCLIPPLANES, 32 */ WORD pixelShaderConstantsB; /* MAX_CONST_B, 16 */ WORD pixelShaderConstantsI; /* MAX_CONST_I, 16 */ BOOL *pixelShaderConstantsF;

1 0

Henri Verbeet : wined3d: Convert streamSource and streamFreq to bitmaps in struct SAVEDSTATES.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 52a900d4e8a12c0e29662323c68334c1839b6e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a900d4e8a12c0e29662323c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 31 16:57:11 2008 +0100 wined3d: Convert streamSource and streamFreq to bitmaps in struct SAVEDSTATES. --- dlls/wined3d/device.c | 4 +- dlls/wined3d/stateblock.c | 56 +++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 40 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3a382da..c0f0ff6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2547,7 +2547,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetStreamSource(IWineD3DDevice *iface, oldSrc = This->updateStateBlock->streamSource[StreamNumber]; TRACE("(%p) : StreamNo: %u, OldStream (%p), NewStream (%p), OffsetInBytes %u, NewStride %u\n", This, StreamNumber, oldSrc, pStreamData, OffsetInBytes, Stride); - This->updateStateBlock->changed.streamSource[StreamNumber] = TRUE; + This->updateStateBlock->changed.streamSource |= 1 << StreamNumber; if(oldSrc == pStreamData && This->updateStateBlock->streamStride[StreamNumber] == Stride && @@ -2635,7 +2635,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetStreamSourceFreq(IWineD3DDevice *ifa TRACE("(%p) StreamNumber(%d), Divider(%d)\n", This, StreamNumber, Divider); This->updateStateBlock->streamFlags[StreamNumber] = Divider & (WINED3DSTREAMSOURCE_INSTANCEDATA | WINED3DSTREAMSOURCE_INDEXEDDATA ); - This->updateStateBlock->changed.streamFreq[StreamNumber] = TRUE; + This->updateStateBlock->changed.streamFreq |= 1 << StreamNumber; This->updateStateBlock->streamFreq[StreamNumber] = Divider & 0x7FFFFF; if(This->updateStateBlock->streamFreq[StreamNumber] != oldFreq || diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 42ef451..c07da78 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -86,8 +86,8 @@ static void stateblock_savedstates_copy(IWineD3DStateBlock* iface, SAVEDSTATES * dest->scissorRect = dest->scissorRect; /* Fixed size arrays */ - memcpy(dest->streamSource, source->streamSource, bsize * MAX_STREAMS); - memcpy(dest->streamFreq, source->streamFreq, bsize * MAX_STREAMS); + dest->streamSource = source->streamSource; + dest->streamFreq = source->streamFreq; memcpy(dest->textures, source->textures, bsize * MAX_COMBINED_SAMPLERS); memcpy(dest->transform, source->transform, bsize * (HIGHEST_TRANSFORMSTATE + 1)); memcpy(dest->renderState, source->renderState, bsize * (WINEHIGHEST_RENDER_STATE + 1)); @@ -123,8 +123,8 @@ void stateblock_savedstates_set( states->scissorRect = value; /* Fixed size arrays */ - memset(states->streamSource, value, bsize * MAX_STREAMS); - memset(states->streamFreq, value, bsize * MAX_STREAMS); + states->streamSource = value ? 0xffff : 0; + states->streamFreq = value ? 0xffff : 0; memset(states->textures, value, bsize * MAX_COMBINED_SAMPLERS); memset(states->transform, value, bsize * (HIGHEST_TRANSFORMSTATE + 1)); memset(states->renderState, value, bsize * (WINEHIGHEST_RENDER_STATE + 1)); @@ -372,6 +372,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)iface; IWineD3DStateBlockImpl *targetStateBlock = This->wineD3DDevice->stateBlock; unsigned int i, j; + WORD map; TRACE("(%p) : Updating state block %p ------------------v\n", targetStateBlock, This); @@ -510,10 +511,14 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) targetStateBlock->scissorRect = This->scissorRect; } - for (i = 0; i < MAX_STREAMS; i++) { - if (This->changed.streamSource[i] && - ((This->streamStride[i] != targetStateBlock->streamStride[i]) || - (This->streamSource[i] != targetStateBlock->streamSource[i]))) { + map = This->changed.streamSource; + for (i = 0; map; map >>= 1, ++i) + { + if (!(map & 1)) continue; + + if (This->streamStride[i] != targetStateBlock->streamStride[i] + || This->streamSource[i] != targetStateBlock->streamSource[i]) + { TRACE("Updating stream source %u to %p, stride to %u\n", i, targetStateBlock->streamSource[i], targetStateBlock->streamStride[i]); This->streamStride[i] = targetStateBlock->streamStride[i]; @@ -521,14 +526,20 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) if(This->streamSource[i]) IWineD3DVertexBuffer_Release(This->streamSource[i]); This->streamSource[i] = targetStateBlock->streamSource[i]; } + } + + map = This->changed.streamFreq; + for (i = 0; map; map >>= 1, ++i) + { + if (!(map & 1)) continue; - if (This->changed.streamFreq[i] && - (This->streamFreq[i] != targetStateBlock->streamFreq[i] - || This->streamFlags[i] != targetStateBlock->streamFlags[i])){ - TRACE("Updating stream frequency %u to %u flags to %#x\n", - i, targetStateBlock->streamFreq[i], targetStateBlock->streamFlags[i]); - This->streamFreq[i] = targetStateBlock->streamFreq[i]; - This->streamFlags[i] = targetStateBlock->streamFlags[i]; + if (This->streamFreq[i] != targetStateBlock->streamFreq[i] + || This->streamFlags[i] != targetStateBlock->streamFlags[i]) + { + TRACE("Updating stream frequency %u to %u flags to %#x\n", + i, targetStateBlock->streamFreq[i], targetStateBlock->streamFlags[i]); + This->streamFreq[i] = targetStateBlock->streamFreq[i]; + This->streamFlags[i] = targetStateBlock->streamFlags[i]; } } @@ -714,6 +725,7 @@ should really perform a delta so that only the changes get updated*/ UINT i; UINT j; + WORD map; TRACE("(%p) : Applying state block %p ------------------v\n", This, pDevice); @@ -806,12 +818,16 @@ should really perform a delta so that only the changes get updated*/ } /* TODO: Proper implementation using SetStreamSource offset (set to 0 for the moment)\n") */ - for (i=0; i<MAX_STREAMS; i++) { - if (This->changed.streamSource[i]) - IWineD3DDevice_SetStreamSource(pDevice, i, This->streamSource[i], 0, This->streamStride[i]); + map = This->changed.streamSource; + for (i = 0; map; map >>= 1, ++i) + { + if (map & 1) IWineD3DDevice_SetStreamSource(pDevice, i, This->streamSource[i], 0, This->streamStride[i]); + } - if (This->changed.streamFreq[i]) - IWineD3DDevice_SetStreamSourceFreq(pDevice, i, This->streamFreq[i] | This->streamFlags[i]); + map = This->changed.streamFreq; + for (i = 0; map; map >>= 1, ++i) + { + if (map & 1) IWineD3DDevice_SetStreamSourceFreq(pDevice, i, This->streamFreq[i] | This->streamFlags[i]); } for (j = 0 ; j < MAX_COMBINED_SAMPLERS; j++){ if (This->changed.textures[j]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 60df5bb..19ff8f8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1758,8 +1758,8 @@ extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl; /* Note: Very long winded but gl Lists are not flexible enough */ /* to resolve everything we need, so doing it manually for now */ typedef struct SAVEDSTATES { - BOOL streamSource[MAX_STREAMS]; - BOOL streamFreq[MAX_STREAMS]; + WORD streamSource; /* MAX_STREAMS, 16 */ + WORD streamFreq; /* MAX_STREAMS, 16 */ BOOL textures[MAX_COMBINED_SAMPLERS]; BOOL transform[HIGHEST_TRANSFORMSTATE + 1]; BOOL renderState[WINEHIGHEST_RENDER_STATE + 1];

1 0

Henri Verbeet : wined3d: Fix the value of HIGHEST_TRANSFORMSTATE.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 457037f4de18b873aeac0a8091a64bb29383bb58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=457037f4de18b873aeac0a809… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 31 16:57:10 2008 +0100 wined3d: Fix the value of HIGHEST_TRANSFORMSTATE. The highest transform state should be 511. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 64dd866..3a382da 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2726,7 +2726,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_MultiplyTransform(IWineD3DDevice *iface IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : For state %s\n", This, debug_d3dtstype(State)); - if (State < HIGHEST_TRANSFORMSTATE) + if (State <= HIGHEST_TRANSFORMSTATE) { mat = &This->updateStateBlock->transforms[State]; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 82931ea..60df5bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -531,9 +531,7 @@ extern int num_lock; #define MAX_STREAMS 16 /* Maximum possible streams - used for fixed size arrays See MaxStreams in MSDN under GetDeviceCaps */ - /* Maximum number of constants provided to the shaders */ -#define HIGHEST_TRANSFORMSTATE 512 - /* Highest value in WINED3DTRANSFORMSTATETYPE */ +#define HIGHEST_TRANSFORMSTATE WINED3DTS_WORLDMATRIX(255) /* Highest value in WINED3DTRANSFORMSTATETYPE */ /* Checking of API calls */ /* --------------------- */

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 January 2009