October 2009 - Wine-commits

Stefan Dösinger : wined3d: SetRenderTarget doesn' t change the viewport in d3d7.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 9e068a33b3366ea072ec141a564bce2a0034e1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e068a33b3366ea072ec141a5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 30 18:56:42 2009 +0200 wined3d: SetRenderTarget doesn't change the viewport in d3d7. --- dlls/ddraw/tests/d3d.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 3 +- 2 files changed, 106 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 2d7d8d0..11b6a66 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2973,6 +2973,109 @@ static void ComputeSphereVisibility(void) ok(result[0] == 0x2002f, "Expected 0x2002f, got %x\n", result[0]); } +static void SetRenderTargetTest(void) +{ + HRESULT hr; + IDirectDrawSurface7 *newrt, *oldrt; + D3DVIEWPORT7 vp; + DDSURFACEDESC2 ddsd; + DWORD stateblock; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE; + ddsd.dwWidth = 64; + ddsd.dwHeight = 64; + hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &newrt, NULL); + ok(hr == DD_OK, "IDirectDraw7_CreateSurface failed, hr=0x%08x\n", hr); + if(FAILED(hr)) + { + skip("Skipping SetRenderTarget test\n"); + return; + } + + memset(&vp, 0, sizeof(vp)); + vp.dwX = 10; + vp.dwY = 10; + vp.dwWidth = 246; + vp.dwHeight = 246; + vp.dvMinZ = 0.25; + vp.dvMaxZ = 0.75; + hr = IDirect3DDevice7_SetViewport(lpD3DDevice, &vp); + ok(hr == D3D_OK, "IDirect3DDevice7_SetViewport failed, hr=0x%08x\n", hr); + + hr = IDirect3DDevice7_GetRenderTarget(lpD3DDevice, &oldrt); + ok(hr == DD_OK, "IDirect3DDevice7_GetRenderTarget failed, hr=0x%08x\n", hr); + + hr = IDirect3DDevice7_SetRenderTarget(lpD3DDevice, newrt, 0); + ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderTarget failed, hr=0x%08x\n", hr); + memset(&vp, 0xff, sizeof(vp)); + hr = IDirect3DDevice7_GetViewport(lpD3DDevice, &vp); + ok(hr == D3D_OK, "IDirect3DDevice7_GetViewport failed, hr=0x%08x\n", hr); + ok(vp.dwX == 10, "vp.dwX is %u, expected 10\n", vp.dwX); + ok(vp.dwY == 10, "vp.dwY is %u, expected 10\n", vp.dwY); + ok(vp.dwWidth == 246, "vp.dwWidth is %u, expected 246\n", vp.dwWidth); + ok(vp.dwHeight == 246, "vp.dwHeight is %u, expected 246\n", vp.dwHeight); + ok(vp.dvMinZ == 0.25, "vp.dvMinZ is %f, expected 0.1\n", vp.dvMinZ); + ok(vp.dvMaxZ == 0.75, "vp.dvMaxZ is %f, expected 0.9\n", vp.dvMaxZ); + + memset(&vp, 0, sizeof(vp)); + vp.dwX = 0; + vp.dwY = 0; + vp.dwWidth = 64; + vp.dwHeight = 64; + vp.dvMinZ = 0.0; + vp.dvMaxZ = 1.0; + hr = IDirect3DDevice7_SetViewport(lpD3DDevice, &vp); + ok(hr == D3D_OK, "IDirect3DDevice7_SetViewport failed, hr=0x%08x\n", hr); + + hr = IDirect3DDevice7_BeginStateBlock(lpD3DDevice); + ok(hr == D3D_OK, "IDirect3DDevice7_BeginStateblock failed, hr=0x%08x\n", hr); + hr = IDirect3DDevice7_SetRenderTarget(lpD3DDevice, oldrt, 0); + ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderTarget failed, hr=0x%08x\n", hr); + + /* Check this twice, before and after ending the stateblock */ + memset(&vp, 0xff, sizeof(vp)); + hr = IDirect3DDevice7_GetViewport(lpD3DDevice, &vp); + ok(hr == D3D_OK, "IDirect3DDevice7_GetViewport failed, hr=0x%08x\n", hr); + ok(vp.dwX == 0, "vp.dwX is %u, expected 0\n", vp.dwX); + ok(vp.dwY == 0, "vp.dwY is %u, expected 0\n", vp.dwY); + ok(vp.dwWidth == 64, "vp.dwWidth is %u, expected 64\n", vp.dwWidth); + ok(vp.dwHeight == 64, "vp.dwHeight is %u, expected 64\n", vp.dwHeight); + ok(vp.dvMinZ == 0.0, "vp.dvMinZ is %f, expected 0.0\n", vp.dvMinZ); + ok(vp.dvMaxZ == 1.0, "vp.dvMaxZ is %f, expected 1.0\n", vp.dvMaxZ); + + hr = IDirect3DDevice7_EndStateBlock(lpD3DDevice, &stateblock); + ok(hr == D3D_OK, "IDirect3DDevice7_EndStateblock failed, hr=0x%08x\n", hr); + + memset(&vp, 0xff, sizeof(vp)); + hr = IDirect3DDevice7_GetViewport(lpD3DDevice, &vp); + ok(hr == D3D_OK, "IDirect3DDevice7_GetViewport failed, hr=0x%08x\n", hr); + ok(vp.dwX == 0, "vp.dwX is %u, expected 0\n", vp.dwX); + ok(vp.dwY == 0, "vp.dwY is %u, expected 0\n", vp.dwY); + ok(vp.dwWidth == 64, "vp.dwWidth is %u, expected 64\n", vp.dwWidth); + ok(vp.dwHeight == 64, "vp.dwHeight is %u, expected 64\n", vp.dwHeight); + ok(vp.dvMinZ == 0.0, "vp.dvMinZ is %f, expected 0.0\n", vp.dvMinZ); + ok(vp.dvMaxZ == 1.0, "vp.dvMaxZ is %f, expected 1.0\n", vp.dvMaxZ); + + hr = IDirect3DDevice7_DeleteStateBlock(lpD3DDevice, stateblock); + ok(hr == D3D_OK, "IDirect3DDevice7_DeleteStateblock failed, hr=0x%08x\n", hr); + + memset(&vp, 0, sizeof(vp)); + vp.dwX = 0; + vp.dwY = 0; + vp.dwWidth = 256; + vp.dwHeight = 256; + vp.dvMinZ = 0.0; + vp.dvMaxZ = 0.0; + hr = IDirect3DDevice7_SetViewport(lpD3DDevice, &vp); + ok(hr == D3D_OK, "IDirect3DDevice7_SetViewport failed, hr=0x%08x\n", hr); + + IDirectDrawSurface7_Release(oldrt); + IDirectDrawSurface7_Release(newrt); +} + START_TEST(d3d) { init_function_pointers(); @@ -2996,6 +3099,7 @@ START_TEST(d3d) VertexBufferDescTest(); D3D7_OldRenderStateTest(); DeviceLoadTest(); + SetRenderTargetTest(); ReleaseDirect3D(); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 06be54b..6cbf115 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6131,6 +6131,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, DWORD RenderTargetIndex, IWineD3DSurface *pRenderTarget) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WINED3DVIEWPORT viewport; + int dxVersion = ( (IWineD3DImpl *) This->wineD3D)->dxVersion; TRACE("(%p) : Setting rendertarget %d to %p\n", This, RenderTargetIndex, pRenderTarget); @@ -6163,7 +6164,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, This->render_targets[RenderTargetIndex] = pRenderTarget; /* Render target 0 is special */ - if(RenderTargetIndex == 0) { + if(RenderTargetIndex == 0 && dxVersion > 7) { /* Finally, reset the viewport as the MSDN states. */ viewport.Height = ((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Height; viewport.Width = ((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Width;

1 0

Paul Vriens : setupapi/tests: Don't crash on WinMe.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: da07b0d585a00632a41fca17b83b4a2318056736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da07b0d585a00632a41fca17b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 2 10:49:41 2009 +0200 setupapi/tests: Don't crash on WinMe. --- dlls/setupapi/tests/query.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 0b7883c..6e956a2 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -167,14 +167,15 @@ static void test_SetupGetInfInformation(void) broken(GetLastError() == ERROR_FILE_NOT_FOUND) || /* win98 */ broken(GetLastError() == ERROR_PATH_NOT_FOUND) || /* NT4 */ broken(GetLastError() == ERROR_INVALID_NAME) || /* win2k */ - broken(GetLastError() == ERROR_GENERAL_SYNTAX), /* another win2k */ + broken(GetLastError() == ERROR_GENERAL_SYNTAX), /* another win2k / winMe */ "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); ok(size == 0xdeadbeef, "Expected size to remain unchanged\n"); /* try an invalid inf filename */ - /* do not use NULL as absolute inf filename on win9x (crash) */ + /* do not use NULL as absolute inf filename on win9x/winMe (crash) */ if ((GetLastError() != ERROR_BAD_PATHNAME) && /* win95 */ - (GetLastError() != ERROR_FILE_NOT_FOUND)) /* win98 */ + (GetLastError() != ERROR_FILE_NOT_FOUND) && /* win98 */ + (GetLastError() != ERROR_GENERAL_SYNTAX)) /* winMe */ { size = 0xdeadbeef; SetLastError(0xbeefcafe);

1 0

Paul Vriens : secur32/tests: Skip some tests on WinMe to avoid a crash.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 7b3213fd65d8ffa9cdd0149f54d366762e84b2da URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3213fd65d8ffa9cdd0149f5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 2 11:09:31 2009 +0200 secur32/tests: Skip some tests on WinMe to avoid a crash. --- dlls/secur32/tests/schannel.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 167a0b4..82e27db 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -210,8 +210,15 @@ static void testAcquireSecurityContext(void) certs[1] = pCertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert)); - pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + SetLastError(0xdeadbeef); + ret = pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + /* WinMe would crash on some tests */ + win_skip("CryptAcquireContextW is not implemented\n"); + return; + } st = pAcquireCredentialsHandleA(NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);

1 0

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

02 Oct '09

Module: wine Branch: master Commit: d500c9b79527030e0fd000f462a65aea1b3afe6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d500c9b79527030e0fd000f46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 2 11:16:09 2009 +0200 wined3d: Add a separate function to initialize the saved states for WINED3DSBT_VERTEXSTATE. --- dlls/wined3d/stateblock.c | 42 +++++++++++++++++++++++++++++------------- 1 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 9cbc1b2..3e8889e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -136,6 +136,30 @@ static void stateblock_savedstates_set_pixel(SAVEDSTATES *states, const struct w memset(states->pixelShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_pshader_constantsF); } +static void stateblock_savedstates_set_vertex(SAVEDSTATES *states, const struct wined3d_gl_info *gl_info) +{ + DWORD texture_mask = 0; + WORD sampler_mask = 0; + unsigned int i; + + states->vertexShader = 1; + + for (i = 0; i < NUM_SAVEDVERTEXSTATES_R; ++i) + { + DWORD rs = SavedVertexStates_R[i]; + states->renderState[rs >> 5] |= 1 << (rs & 0x1f); + } + + for (i = 0; i < NUM_SAVEDVERTEXSTATES_T; ++i) texture_mask |= 1 << SavedVertexStates_T[i]; + for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = texture_mask; + for (i = 0; i < NUM_SAVEDVERTEXSTATES_S; ++i) sampler_mask |= 1 << SavedVertexStates_S[i]; + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = sampler_mask; + states->vertexShaderConstantsB = 0xffff; + states->vertexShaderConstantsI = 0xffff; + + 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) { @@ -1517,10 +1541,11 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { TRACE("VERTEXSTATE => Pretend all vertex shates have changed.\n"); + stateblock_savedstates_set_vertex(&stateblock->changed, gl_info); + /* Vertex Shader Constants. */ for (i = 0; i < gl_info->max_vshader_constantsF; ++i) { - stateblock->changed.vertexShaderConstantsF[i] = TRUE; stateblock->contained_vs_consts_f[i] = i; } stateblock->num_contained_vs_consts_f = gl_info->max_vshader_constantsF; @@ -1528,22 +1553,18 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * for (i = 0; i < MAX_CONST_B; ++i) { stateblock->contained_vs_consts_b[i] = i; - stateblock->changed.vertexShaderConstantsB |= (1 << i); } stateblock->num_contained_vs_consts_b = MAX_CONST_B; for (i = 0; i < MAX_CONST_I; ++i) { stateblock->contained_vs_consts_i[i] = i; - stateblock->changed.vertexShaderConstantsI |= (1 << i); } stateblock->num_contained_vs_consts_i = MAX_CONST_I; for (i = 0; i < NUM_SAVEDVERTEXSTATES_R; i++) { - DWORD rs = SavedVertexStates_R[i]; - stateblock->changed.renderState[rs >> 5] |= 1 << (rs & 0x1f); - stateblock->contained_render_states[i] = rs; + stateblock->contained_render_states[i] = SavedVertexStates_R[i]; } stateblock->num_contained_render_states = NUM_SAVEDVERTEXSTATES_R; @@ -1551,10 +1572,8 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { for (j = 0; j < NUM_SAVEDVERTEXSTATES_T; ++j) { - DWORD state = SavedVertexStates_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 = SavedVertexStates_T[j]; ++stateblock->num_contained_tss_states; } } @@ -1563,10 +1582,8 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { for (j = 0; j < NUM_SAVEDVERTEXSTATES_S; ++j) { - DWORD state = SavedVertexStates_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 = SavedVertexStates_S[j]; ++stateblock->num_contained_sampler_states; } } @@ -1587,7 +1604,6 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (stateblock->streamSource[i]) IWineD3DBuffer_AddRef(stateblock->streamSource[i]); } - stateblock->changed.vertexShader = TRUE; if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); stateblock->pIndexData = NULL;

1 0

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

02 Oct '09

Module: wine Branch: master Commit: 15d4eee58b264ac0fdc79e1dc8dab8f349f6bf30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d4eee58b264ac0fdc79e1dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 2 11:16:10 2009 +0200 wined3d: Use stateblock_init_contained_states() for WINED3DSBT_VERTEXSTATE stateblocks. --- dlls/wined3d/stateblock.c | 48 +------------------------------------------- 1 files changed, 2 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3e8889e..78cb4b3 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1455,7 +1455,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * WINED3DSTATEBLOCKTYPE type, IUnknown *parent) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - unsigned int i, j; + unsigned int i; HRESULT hr; stateblock->lpVtbl = &IWineD3DStateBlock_Vtbl; @@ -1542,51 +1542,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * TRACE("VERTEXSTATE => Pretend all vertex shates have changed.\n"); stateblock_savedstates_set_vertex(&stateblock->changed, gl_info); - - /* Vertex Shader Constants. */ - 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_B; ++i) - { - stateblock->contained_vs_consts_b[i] = i; - } - stateblock->num_contained_vs_consts_b = MAX_CONST_B; - - 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 < NUM_SAVEDVERTEXSTATES_R; i++) - { - stateblock->contained_render_states[i] = SavedVertexStates_R[i]; - } - stateblock->num_contained_render_states = NUM_SAVEDVERTEXSTATES_R; - - for (i = 0; i < MAX_TEXTURES; ++i) - { - for (j = 0; j < NUM_SAVEDVERTEXSTATES_T; ++j) - { - stateblock->contained_tss_states[stateblock->num_contained_tss_states].stage = i; - stateblock->contained_tss_states[stateblock->num_contained_tss_states].state = SavedVertexStates_T[j]; - ++stateblock->num_contained_tss_states; - } - } - - for (i = 0 ; i < MAX_COMBINED_SAMPLERS; ++i) - { - for (j = 0; j < NUM_SAVEDVERTEXSTATES_S; ++j) - { - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].stage = i; - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].state = SavedVertexStates_S[j]; - ++stateblock->num_contained_sampler_states; - } - } + stateblock_init_contained_states(stateblock); for (i = 0; i < LIGHTMAP_SIZE; ++i) {

1 0

Henri Verbeet : wined3d: Fix the values of NUM_SAVEDPIXELSTATES_T and NUM_SAVEDVERTEXSTATES_R.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: a84974e2ea8c027bc37df14bce9a38d5ab85cab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84974e2ea8c027bc37df14bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 2 11:16:11 2009 +0200 wined3d: Fix the values of NUM_SAVEDPIXELSTATES_T and NUM_SAVEDVERTEXSTATES_R. --- dlls/wined3d/wined3d_private.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f48d791..6bfafde 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -150,9 +150,9 @@ void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; /* Used for CreateStateBlock */ #define NUM_SAVEDPIXELSTATES_R 35 -#define NUM_SAVEDPIXELSTATES_T 18 +#define NUM_SAVEDPIXELSTATES_T 17 #define NUM_SAVEDPIXELSTATES_S 12 -#define NUM_SAVEDVERTEXSTATES_R 34 +#define NUM_SAVEDVERTEXSTATES_R 33 #define NUM_SAVEDVERTEXSTATES_T 2 #define NUM_SAVEDVERTEXSTATES_S 1

1 0

Henri Verbeet : wined3d: Move the pixel/vertex states arrays to stateblock. c.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 8b3f868774d6f00e66c7d1b9c2e2560358eaafd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3f868774d6f00e66c7d1b9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 2 11:16:12 2009 +0200 wined3d: Move the pixel/vertex states arrays to stateblock.c. --- dlls/wined3d/device.c | 118 ------------------------- dlls/wined3d/stateblock.c | 189 +++++++++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 15 --- 3 files changed, 156 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b3f868774d6f00e66c7d…

1 0

Henri Verbeet : wined3d: Use the actual array sizes to determine the number of the various pixel/ vertex states.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 048c9450d9e5595d8e7ac66e25ae9f66226b6b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=048c9450d9e5595d8e7ac66e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 2 11:16:13 2009 +0200 wined3d: Use the actual array sizes to determine the number of the various pixel/vertex states. --- dlls/wined3d/stateblock.c | 77 +++++++++++++++++++++++++------------------- 1 files changed, 44 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=048c9450d9e5595d8e7ac…

1 0

Damjan Jovanovic : sti.h: Add some missing defines.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 37e71168627ff6dd0d9ee74d705624bb6c282178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e71168627ff6dd0d9ee74d7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Oct 2 01:02:46 2009 +0200 sti.h: Add some missing defines. --- include/sti.h | 54 ++++++++++++++++++++++++++++++------------------------ 1 files changed, 30 insertions(+), 24 deletions(-) diff --git a/include/sti.h b/include/sti.h index 6b62436..204492d 100644 --- a/include/sti.h +++ b/include/sti.h @@ -134,36 +134,42 @@ DECLARE_INTERFACE_(IStillImageW, IUnknown) #define IStillImage_AddRef(p) (p)->lpVtbl->AddRef(p) #define IStillImage_Release(p) (p)->lpVtbl->Release(p) /*** IStillImage methods ***/ -#define IStillImage_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b) -#define IStillImage_GetDeviceList(p,a,b,c,d) (p)->lpVtbl->GetDeviceList(p,a,b,c,d) -#define IStillImage_GetDeviceInfo(p,a,b) (p)->lpVtbl->GetDeviceInfo(p,a,b) -#define IStillImage_CreateDevice(p,a,b,c,d) (p)->lpVtbl->CreateDevice(p,a,b,c,d) -#define IStillImage_GetDeviceValue(p,a,b,c,d,e) (p)->lpVtbl->GetDeviceValue(p,a,b,c,d,e) -#define IStillImage_SetDeviceValue(p,a,b,c,d,e) (p)->lpVtbl->SetDeviceValue(p,a,b,c,d,e) -#define IStillImage_GetSTILaunchInformation(p,a,b,c) (p)->lpVtbl->GetSTILaunchInformation(p,a,b,c) -#define IStillImage_RegisterLaunchApplication(p,a,b) (p)->lpVtbl->RegisterLaunchApplication(p,a,b) -#define IStillImage_UnregisterLaunchApplication(p,a) (p)->lpVtbl->UnregisterLaunchApplication(p,a) -#define IStillImage_EnableHwNotifications(p,a,b) (p)->lpVtbl->EnableHwNotifications(p,a,b) -#define IStillImage_GetHwNotificationState(p,a,b) (p)->lpVtbl->GetHwNotificationState(p,a,b) -#define IStillImage_RefreshDeviceBus(p,a) (p)->lpVtbl->RefreshDeviceBus(p,a) +#define IStillImage_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b) +#define IStillImage_GetDeviceList(p,a,b,c,d) (p)->lpVtbl->GetDeviceList(p,a,b,c,d) +#define IStillImage_GetDeviceInfo(p,a,b) (p)->lpVtbl->GetDeviceInfo(p,a,b) +#define IStillImage_CreateDevice(p,a,b,c,d) (p)->lpVtbl->CreateDevice(p,a,b,c,d) +#define IStillImage_GetDeviceValue(p,a,b,c,d,e) (p)->lpVtbl->GetDeviceValue(p,a,b,c,d,e) +#define IStillImage_SetDeviceValue(p,a,b,c,d,e) (p)->lpVtbl->SetDeviceValue(p,a,b,c,d,e) +#define IStillImage_GetSTILaunchInformation(p,a,b,c) (p)->lpVtbl->GetSTILaunchInformation(p,a,b,c) +#define IStillImage_RegisterLaunchApplication(p,a,b) (p)->lpVtbl->RegisterLaunchApplication(p,a,b) +#define IStillImage_UnregisterLaunchApplication(p,a) (p)->lpVtbl->UnregisterLaunchApplication(p,a) +#define IStillImage_EnableHwNotifications(p,a,b) (p)->lpVtbl->EnableHwNotifications(p,a,b) +#define IStillImage_GetHwNotificationState(p,a,b) (p)->lpVtbl->GetHwNotificationState(p,a,b) +#define IStillImage_RefreshDeviceBus(p,a) (p)->lpVtbl->RefreshDeviceBus(p,a) +#define IStillImage_LaunchApplicationForDevice(p,a,b,c) (p)->lpVtbl->LaunchApplicationForDevice(p,a,b,c) +#define IStillImage_SetupDeviceParameters(p,a) (p)->lpVtbl->SetupDeviceParameters(p,a) +#define IStillImage_WriteToErrorLog(p,a,b) (p)->lpVtbl->WriteToErrorLog(p,a,b) #else /*** IUnknown methods ***/ #define IStillImage_QueryInterface(p,a,b) (p)->QueryInterface(a,b) #define IStillImage_AddRef(p) (p)->AddRef() #define IStillImage_Release(p) (p)->Release() /*** IStillImage methods ***/ -#define IStillImage_Initialize(p,a,b) (p)->Initialize(a,b) -#define IStillImage_GetDeviceList(p,a,b,c,d) (p)->GetDeviceList(a,b,c,d) -#define IStillImage_GetDeviceInfo(p,a,b) (p)->GetDeviceInfo(a,b) -#define IStillImage_CreateDevice(p,a,b,c,d) (p)->CreateDevice(a,b,c,d) -#define IStillImage_GetDeviceValue(p,a,b,c,d,e) (p)->GetDeviceValue(a,b,c,d,e) -#define IStillImage_SetDeviceValue(p,a,b,c,d,e) (p)->SetDeviceValue(a,b,c,d,e) -#define IStillImage_GetSTILaunchInformation(p,a,b,c) (p)->GetSTILaunchInformation(a,b,c) -#define IStillImage_RegisterLaunchApplication(p,a,b) (p)->RegisterLaunchApplication(a,b) -#define IStillImage_UnregisterLaunchApplication(p,a) (p)->UnregisterLaunchApplication(a) -#define IStillImage_EnableHwNotifications(p,a,b) (p)->EnableHwNotifications(a,b) -#define IStillImage_GetHwNotificationState(p,a,b) (p)->GetHwNotificationState(a,b) -#define IStillImage_RefreshDeviceBus(p,a) (p)->RefreshDeviceBus(a) +#define IStillImage_Initialize(p,a,b) (p)->Initialize(a,b) +#define IStillImage_GetDeviceList(p,a,b,c,d) (p)->GetDeviceList(a,b,c,d) +#define IStillImage_GetDeviceInfo(p,a,b) (p)->GetDeviceInfo(a,b) +#define IStillImage_CreateDevice(p,a,b,c,d) (p)->CreateDevice(a,b,c,d) +#define IStillImage_GetDeviceValue(p,a,b,c,d,e) (p)->GetDeviceValue(a,b,c,d,e) +#define IStillImage_SetDeviceValue(p,a,b,c,d,e) (p)->SetDeviceValue(a,b,c,d,e) +#define IStillImage_GetSTILaunchInformation(p,a,b,c) (p)->GetSTILaunchInformation(a,b,c) +#define IStillImage_RegisterLaunchApplication(p,a,b) (p)->RegisterLaunchApplication(a,b) +#define IStillImage_UnregisterLaunchApplication(p,a) (p)->UnregisterLaunchApplication(a) +#define IStillImage_EnableHwNotifications(p,a,b) (p)->EnableHwNotifications(a,b) +#define IStillImage_GetHwNotificationState(p,a,b) (p)->GetHwNotificationState(a,b) +#define IStillImage_RefreshDeviceBus(p,a) (p)->RefreshDeviceBus(a) +#define IStillImage_LaunchApplicationForDevice(p,a,b,c) (p)->LaunchApplicationForDevice(a,b,c) +#define IStillImage_SetupDeviceParameters(p,a) (p)->SetupDeviceParameters(a) +#define IStillImage_WriteToErrorLog(p,a,b) (p)->WriteToErrorLog(a,b) #endif #ifdef __cplusplus

1 0

Matteo Bruni : wpp: Remove the assumption ppy_error calls exit().
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 026ca4cd00d49bdce5c84ff5165d8471c0a3993f URL: http://source.winehq.org/git/wine.git/?a=commit;h=026ca4cd00d49bdce5c84ff51… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Mon Sep 28 14:21:00 2009 +0200 wpp: Remove the assumption ppy_error calls exit(). --- libs/wpp/ppl.l | 17 ++++++++++++++++- libs/wpp/ppy.y | 33 +++++++++++++++++++++------------ libs/wpp/preproc.c | 7 +++++++ libs/wpp/wpp.c | 15 +++++++++------ libs/wpp/wpp_private.h | 4 +++- 5 files changed, 56 insertions(+), 20 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index e71bf6e..1c83547 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -639,7 +639,7 @@ includelogicentry_t *pp_includelogiclist = NULL; if(yy_current_state() == pp_inc) ppy_error("Expected include filename"); - if(yy_current_state() == pp_if) + else if(yy_current_state() == pp_if) { ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; @@ -808,7 +808,10 @@ static int make_number(int radix, YYSTYPE *val, const char *str, int len) ext[0] = len > 2 ? toupper(str[len-3]) : ' '; if(!strcmp(ext, "LUL")) + { ppy_error("Invalid constant suffix"); + return 0; + } else if(!strcmp(ext, "LLU") || !strcmp(ext, "ULL")) { is_ll++; @@ -1085,7 +1088,10 @@ static void expand_macro(macexpstackentry_t *mep) assert(ppp->expanding == 0); if((ppp->nargs >= 0 && nargs != ppp->nargs) || (ppp->nargs < 0 && nargs < -ppp->nargs)) + { ppy_error("Too %s macro arguments (%d)", nargs < abs(ppp->nargs) ? "few" : "many", nargs); + return; + } for(n = 0; n < nargs; n++) nnl += mep->nnls[n]; @@ -1323,7 +1329,10 @@ static bufferstackentry_t *pop_buffer(void) static void push_macro(pp_entry_t *ppp) { if(macexpstackidx >= MAXMACEXPSTACK) + { ppy_error("Too many nested macros"); + return; + } macexpstack[macexpstackidx] = pp_xmalloc(sizeof(macexpstack[0][0])); memset( macexpstack[macexpstackidx], 0, sizeof(macexpstack[0][0])); @@ -1472,13 +1481,19 @@ void pp_do_include(char *fname, int type) n = strlen(fname); if(n <= 2) + { ppy_error("Empty include filename"); + return; + } /* Undo the effect of the quotation */ fname[n-1] = '\0'; if((ppy_in = pp_open_include(fname+1, type ? pp_status.input : NULL, &newpath)) == NULL) + { ppy_error("Unable to open include file %s", fname+1); + return; + } fname[n-1] = *fname; /* Redo the quotes */ push_buffer(NULL, newpath, fname, 0); diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index fc94bb5..2098ca3 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -224,6 +224,9 @@ preprocessor case if_elsetrue: case if_elsefalse: ppy_error("#elif cannot follow #else"); + break; + case if_error: + break; default: pp_internal_error(__FILE__, __LINE__, "Invalid pp_if_state (%d) in #elif directive", s); } @@ -247,24 +250,29 @@ preprocessor case if_elsetrue: case if_elsefalse: ppy_error("#else clause already defined"); + break; + case if_error: + break; default: pp_internal_error(__FILE__, __LINE__, "Invalid pp_if_state (%d) in #else directive", s); } } | tENDIF tNL { - pp_pop_if(); - if(pp_incl_state.ifdepth == pp_get_if_depth() && pp_incl_state.state == 1) + if(pp_pop_if() != if_error) { - pp_incl_state.state = 2; - pp_incl_state.seen_junk = 0; + if(pp_incl_state.ifdepth == pp_get_if_depth() && pp_incl_state.state == 1) + { + pp_incl_state.state = 2; + pp_incl_state.seen_junk = 0; + } + else if(pp_incl_state.state != 1) + { + pp_incl_state.state = -1; + } + if(pp_status.debug) + fprintf(stderr, "tENDIF: %s:%d: include_state=%d, include_ppp='%s', include_ifdepth=%d\n", + pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ppp, pp_incl_state.ifdepth); } - else if(pp_incl_state.state != 1) - { - pp_incl_state.state = -1; - } - if(pp_status.debug) - fprintf(stderr, "tENDIF: %s:%d: include_state=%d, include_ppp='%s', include_ifdepth=%d\n", - pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ppp, pp_incl_state.ifdepth); } | tUNDEF tIDENT tNL { pp_del_define($2); free($2); } | tDEFINE opt_text tNL { pp_add_define($1, $2); } @@ -346,7 +354,8 @@ mtext : tLITERAL { $$ = new_mtext($1, 0, exp_text); } int mat = marg_index($2); if(mat < 0) ppy_error("Stringification identifier must be an argument parameter"); - $$ = new_mtext(NULL, mat, exp_stringize); + else + $$ = new_mtext(NULL, mat, exp_stringize); } | tIDENT { int mat = marg_index($1); diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index 63455ce..2ebec83 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -519,13 +519,18 @@ void pp_push_if(pp_if_state_t s) case if_ignore: pp_push_ignore_state(); break; + default: + pp_internal_error(__FILE__, __LINE__, "Invalid pp_if_state (%d)", (int)pp_if_state()); } } pp_if_state_t pp_pop_if(void) { if(if_stack_idx <= 0) + { ppy_error("#{endif,else,elif} without #{if,ifdef,ifndef} (#if-stack underflow)"); + return if_error; + } switch(pp_if_state()) { @@ -538,6 +543,8 @@ pp_if_state_t pp_pop_if(void) case if_ignore: pp_pop_ignore_state(); break; + default: + pp_internal_error(__FILE__, __LINE__, "Invalid pp_if_state (%d)", (int)pp_if_state()); } if(pp_flex_debug) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index d149591..a7597ec 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -144,6 +144,7 @@ int wpp_parse( const char *input, FILE *output ) int ret; pp_status.input = NULL; + pp_status.state = 0; pp_push_define_state(); add_cmdline_defines(); @@ -152,8 +153,8 @@ int wpp_parse( const char *input, FILE *output ) if (!input) ppy_in = stdin; else if (!(ppy_in = fopen(input, "rt"))) { - fprintf(stderr,"Could not open %s\n", input); - exit(2); + ppy_error("Could not open %s\n", input); + return 2; } pp_status.input = input; @@ -162,6 +163,8 @@ int wpp_parse( const char *input, FILE *output ) fprintf(ppy_out, "# 1 \"%s\" 1\n", input ? input : ""); ret = ppy_parse(); + /* If there were errors during processing, return an error code */ + if(!ret && pp_status.state) ret = pp_status.state; if (input) fclose(ppy_in); pp_pop_define_state(); @@ -184,14 +187,14 @@ int wpp_parse_temp( const char *input, const char *output_base, char **output_na if((fd = mkstemps( temp_name, 0 )) == -1) { - fprintf(stderr, "Could not generate a temp name from %s\n", temp_name); - exit(2); + ppy_error("Could not generate a temp name from %s\n", temp_name); + return 2; } if (!(output = fdopen(fd, "wt"))) { - fprintf(stderr,"Could not open fd %s for writing\n", temp_name); - exit(2); + ppy_error("Could not open fd %s for writing\n", temp_name); + return 2; } *output_name = temp_name; diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index 24ed6b8..b485d70 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -113,7 +113,8 @@ typedef enum { if_elif, if_elsefalse, if_elsetrue, - if_ignore + if_ignore, + if_error } pp_if_state_t; @@ -228,6 +229,7 @@ struct pp_status const char *input; /* current input file name */ int line_number; /* current line number */ int char_number; /* current char number in line */ + int state; /* current error state */ int pedantic; /* pedantic option */ int debug; /* debug messages flag */ };

1 0