October 2006 - Wine-Commits

Ivan Gyurdiev : wined3d: Add D3DFVF codes to the WINED3D namespace.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: 875a1eb02dfc324ac290e32c97247709f4ba57e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875a1eb02dfc324ac290e32c9… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 31 03:16:08 2006 -0500 wined3d: Add D3DFVF codes to the WINED3D namespace. --- dlls/wined3d/device.c | 26 +++++++++++++------------- dlls/wined3d/drawprim.c | 34 +++++++++++++++++----------------- dlls/wined3d/utils.c | 18 +++++++++--------- include/wine/wined3d_types.h | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=875a1eb02dfc324ac290e…

1 0

Ivan Gyurdiev : wined3d: Add D3DCLEAR codes to the WINED3D namespace.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: b1df1d8320b26017b6af9faaf8ec46ccb0459d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1df1d8320b26017b6af9faaf… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 31 03:17:43 2006 -0500 wined3d: Add D3DCLEAR codes to the WINED3D namespace. --- dlls/wined3d/device.c | 18 +++++++++--------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 4 ++-- include/wine/wined3d_types.h | 5 +++++ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 650c739..b6e56c1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2133,7 +2133,7 @@ #endif TRACE("(%p) All defaults now set up, leaving Init3D with %p\n", This, This); /* Clear the screen */ - IWineD3DDevice_Clear((IWineD3DDevice *) This, 0, NULL, D3DCLEAR_STENCIL|D3DCLEAR_ZBUFFER|D3DCLEAR_TARGET, 0x00, 1.0, 0); + IWineD3DDevice_Clear((IWineD3DDevice *) This, 0, NULL, WINED3DCLEAR_STENCIL|WINED3DCLEAR_ZBUFFER|WINED3DCLEAR_TARGET, 0x00, 1.0, 0); This->d3d_initialized = TRUE; return WINED3D_OK; @@ -6028,8 +6028,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - /* TODO: From MSDN This method fails if you specify the D3DCLEAR_ZBUFFER or D3DCLEAR_STENCIL flags when the - render target does not have an attached depth buffer. Similarly, if you specify the D3DCLEAR_STENCIL flag + /* TODO: From MSDN This method fails if you specify the WINED3DCLEAR_ZBUFFER or WINED3DCLEAR_STENCIL flags when the + render target does not have an attached depth buffer. Similarly, if you specify the WINED3DCLEAR_STENCIL flag when the depth-buffer format does not contain stencil buffer information, this method fails. */ GLbitfield glMask = 0; GLboolean old_ztest; @@ -6054,7 +6054,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl } /* Only set the values up once, as they are not changing */ - if (Flags & D3DCLEAR_STENCIL) { + if (Flags & WINED3DCLEAR_STENCIL) { glGetIntegerv(GL_STENCIL_CLEAR_VALUE, &old_stencil_clear_value); glClearStencil(Stencil); checkGLcall("glClearStencil"); @@ -6062,7 +6062,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl glStencilMask(0xFFFFFFFF); } - if (Flags & D3DCLEAR_ZBUFFER) { + if (Flags & WINED3DCLEAR_ZBUFFER) { glGetBooleanv(GL_DEPTH_WRITEMASK, &old_ztest); glDepthMask(GL_TRUE); glGetFloatv(GL_DEPTH_CLEAR_VALUE, &old_z_clear_value); @@ -6071,7 +6071,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl glMask = glMask | GL_DEPTH_BUFFER_BIT; } - if (Flags & D3DCLEAR_TARGET) { + if (Flags & WINED3DCLEAR_TARGET) { TRACE("Clearing screen with glClear to color %x\n", Color); glGetFloatv(GL_COLOR_CLEAR_VALUE, old_color_clear_value); glClearColor(D3DCOLOR_R(Color), @@ -6115,15 +6115,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl } /* Restore the old values (why..?) */ - if (Flags & D3DCLEAR_STENCIL) { + if (Flags & WINED3DCLEAR_STENCIL) { glClearStencil(old_stencil_clear_value); glStencilMask(This->stateBlock->renderState[WINED3DRS_STENCILWRITEMASK]); } - if (Flags & D3DCLEAR_ZBUFFER) { + if (Flags & WINED3DCLEAR_ZBUFFER) { glDepthMask(old_ztest); glClearDepth(old_z_clear_value); } - if (Flags & D3DCLEAR_TARGET) { + if (Flags & WINED3DCLEAR_TARGET) { glClearColor(old_color_clear_value[0], old_color_clear_value[1], old_color_clear_value[2], diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 365d047..d0f44cf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2721,7 +2721,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOv IWineD3DDevice_Clear( (IWineD3DDevice *) myDevice, 1 /* Number of rectangles */, &rect, - D3DCLEAR_TARGET, + WINED3DCLEAR_TARGET, color, 0.0 /* Z */, 0 /* Stencil */); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 287153d..1ff01a2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -364,12 +364,12 @@ #endif TRACE("Clearing\n"); - IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, D3DCLEAR_STENCIL|D3DCLEAR_ZBUFFER|D3DCLEAR_TARGET, 0x00, 1.0, 0); + IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, WINED3DCLEAR_STENCIL|WINED3DCLEAR_ZBUFFER|WINED3DCLEAR_TARGET, 0x00, 1.0, 0); } else { TRACE("Clearing z/stencil buffer\n"); - IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, D3DCLEAR_STENCIL|D3DCLEAR_ZBUFFER, 0x00, 1.0, 0); + IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, WINED3DCLEAR_STENCIL|WINED3DCLEAR_ZBUFFER, 0x00, 1.0, 0); } if(!(((IWineD3DSurfaceImpl *) This->frontBuffer)->Flags & SFLAG_GLDIRTY) || diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 3715d2a..1787859 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1523,4 +1523,9 @@ #define WINED3DFVF_TEXCOORDSIZE2(CoordIn #define WINED3DFVF_TEXCOORDSIZE3(CoordIndex) (WINED3DFVF_TEXTUREFORMAT3 << (CoordIndex*2 + 16)) #define WINED3DFVF_TEXCOORDSIZE4(CoordIndex) (WINED3DFVF_TEXTUREFORMAT4 << (CoordIndex*2 + 16)) +/* Clear flags */ +#define WINED3DCLEAR_TARGET 0x00000001 +#define WINED3DCLEAR_ZBUFFER 0x00000002 +#define WINED3DCLEAR_STENCIL 0x00000004 + #endif

1 0

Ivan Gyurdiev : wined3d: Add D3DTSS_TCI codes to the WINED3D namespace.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: de108f65e1f4e2afc0fc8eb5458f70cb2f2126ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=de108f65e1f4e2afc0fc8eb54… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Oct 31 03:16:44 2006 -0500 wined3d: Add D3DTSS_TCI codes to the WINED3D namespace. --- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/texture.c | 2 +- include/wine/wined3d_types.h | 6 ++++++ 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 688d5d9..6250975 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -232,7 +232,7 @@ static void WINAPI IWineD3DCubeTextureIm /* Apply non-power2 mappings and texture offsets so long as the texture coords aren't projected or generated */ if(This->pow2scalingFactor != 1.0f) { - if((textureStates[WINED3DTSS_TEXCOORDINDEX] & 0xFFFF0000) == D3DTSS_TCI_PASSTHRU && + if((textureStates[WINED3DTSS_TEXCOORDINDEX] & 0xFFFF0000) == WINED3DTSS_TCI_PASSTHRU && (~textureStates[WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED)) { glMatrixMode(GL_TEXTURE); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a1aaff6..650c739 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5530,7 +5530,7 @@ #endif /* FIXME: From MSDN: The WINED3DTSS_TCI_* flags are mutually exclusive. If you include one flag, you can still specify an index value, which the system uses to determine the texture wrapping mode. - eg. SetTextureStageState( 0, WINED3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION | 1 ); + eg. SetTextureStageState( 0, WINED3DTSS_TEXCOORDINDEX, WINED3DTSS_TCI_CAMERASPACEPOSITION | 1 ); means use the vertex position (camera-space) as the input texture coordinates for this texture stage, and the wrap mode set in the WINED3DRS_WRAP1 render state. We do not (yet) support the WINED3DRENDERSTATE_WRAPx values, nor tie them up @@ -5540,7 +5540,7 @@ #endif * Be careful the value of the mask 0xF0000 come from d3d8types.h infos */ switch (Value & 0xFFFF0000) { - case D3DTSS_TCI_PASSTHRU: + case WINED3DTSS_TCI_PASSTHRU: /*Use the specified texture coordinates contained within the vertex format. This value resolves to zero.*/ glDisable(GL_TEXTURE_GEN_S); glDisable(GL_TEXTURE_GEN_T); @@ -5549,7 +5549,7 @@ #endif checkGLcall("glDisable(GL_TEXTURE_GEN_S,T,R,Q)"); break; - case D3DTSS_TCI_CAMERASPACEPOSITION: + case WINED3DTSS_TCI_CAMERASPACEPOSITION: /* CameraSpacePosition means use the vertex position, transformed to camera space, as the input texture coordinates for this stage's texture transformation. This equates roughly to EYE_LINEAR */ @@ -5585,7 +5585,7 @@ #endif } break; - case D3DTSS_TCI_CAMERASPACENORMAL: + case WINED3DTSS_TCI_CAMERASPACENORMAL: { if (GL_SUPPORT(NV_TEXGEN_REFLECTION)) { float s_plane[] = { 1.0, 0.0, 0.0, 0.0 }; @@ -5619,7 +5619,7 @@ #endif } break; - case D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR: + case WINED3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR: { if (GL_SUPPORT(NV_TEXGEN_REFLECTION)) { float s_plane[] = { 1.0, 0.0, 0.0, 0.0 }; @@ -5669,7 +5669,7 @@ #endif /* Unhandled */ case WINED3DTSS_TEXTURETRANSFORMFLAGS : - set_texture_matrix((float *)&This->stateBlock->transforms[WINED3DTS_TEXTURE0 + Stage].u.m[0][0], Value, (This->stateBlock->textureState[Stage][WINED3DTSS_TEXCOORDINDEX] & 0xFFFF0000) != D3DTSS_TCI_PASSTHRU); + set_texture_matrix((float *)&This->stateBlock->transforms[WINED3DTS_TEXTURE0 + Stage].u.m[0][0], Value, (This->stateBlock->textureState[Stage][WINED3DTSS_TEXCOORDINDEX] & 0xFFFF0000) != WINED3DTSS_TCI_PASSTHRU); break; case WINED3DTSS_BUMPENVMAT00 : diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9217ad9..a1ce721 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -215,7 +215,7 @@ static void WINAPI IWineD3DTextureImpl_A /** non-power2 fixups using texture matrix **/ if(This->pow2scalingFactorX != 1.0f || This->pow2scalingFactorY != 1.0f) { /* Apply non-power2 mappings and texture offsets so long as the texture coords aren't projected or generated */ - if(((textureStates[WINED3DTSS_TEXCOORDINDEX] & 0xFFFF0000) == D3DTSS_TCI_PASSTHRU) && + if(((textureStates[WINED3DTSS_TEXCOORDINDEX] & 0xFFFF0000) == WINED3DTSS_TCI_PASSTHRU) && (~textureStates[WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED)) { glMatrixMode(GL_TEXTURE); memset(matrix, 0 , sizeof(matrix)); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index d1b15df..3715d2a 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -653,6 +653,12 @@ typedef enum _WINED3DTEXTURESTAGESTATETY WINED3DTSS_FORCE_DWORD = 0x7fffffff } WINED3DTEXTURESTAGESTATETYPE; +#define WINED3DTSS_TCI_PASSTHRU 0x00000 +#define WINED3DTSS_TCI_CAMERASPACENORMAL 0x10000 +#define WINED3DTSS_TCI_CAMERASPACEPOSITION 0x20000 +#define WINED3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR 0x30000 +#define WINED3DTSS_TCI_SPHEREMAP 0x40000 + #define WINED3D_HIGHEST_TEXTURE_STATE WINED3DTSS_CONSTANT typedef enum _WINED3DTEXTURETRANSFORMFLAGS {

1 0

Paul Vriens : secur32: Make sure crashing tests are not run.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: dd6c4c680049ba03be7fa18e1312b4823747a451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd6c4c680049ba03be7fa18e1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Oct 31 09:28:31 2006 +0100 secur32: Make sure crashing tests are not run. --- dlls/secur32/tests/schannel.c | 44 +++++++++++++++++++++++++--------------- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 23e2a0a..ca870f4 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -140,10 +140,14 @@ static void testAcquireSecurityContext(v NULL); ok(st == SEC_E_SECPKG_NOT_FOUND, "Expected SEC_E_SECPKG_NOT_FOUND, got %08x\n", st); - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, 0, NULL, NULL, NULL, - NULL, NULL, NULL); - ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n", - st); + if (0) + { + /* Crashes on Win2K */ + st = pAcquireCredentialsHandleA(NULL, unisp_name_a, 0, NULL, NULL, NULL, + NULL, NULL, NULL); + ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n", + st); + } st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_BOTH, NULL, NULL, NULL, NULL, NULL, NULL); ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n", @@ -152,10 +156,12 @@ static void testAcquireSecurityContext(v NULL, NULL, NULL, NULL, NULL, NULL); ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n", st); - /* Crashes - st = pAcquireCredentialsHandleA(NULL, UNISP_NAME_A, SECPKG_CRED_OUTBOUND, - NULL, NULL, NULL, NULL, NULL, NULL); - */ + if (0) + { + /* Crashes */ + st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + NULL, NULL, NULL, NULL, NULL, NULL); + } st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, NULL); ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); @@ -191,11 +197,13 @@ static void testAcquireSecurityContext(v ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n", st); - /* Crashes with bad paCred pointer - schanCred.cCreds = 1; - st = pAcquireCredentialsHandleA(NULL, UNISP_NAME_A, SECPKG_CRED_OUTBOUND, - NULL, &schanCred, NULL, NULL, NULL, NULL); - */ + if (0) + { + /* Crashes with bad paCred pointer */ + schanCred.cCreds = 1; + st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + NULL, &schanCred, NULL, NULL, NULL, NULL); + } /* Bogus cert in SCHANNEL_CRED. Windows fails with * SEC_E_UNKNOWN_CREDENTIALS, but I'll accept SEC_E_NO_CREDENTIALS too. @@ -251,10 +259,12 @@ static void testAcquireSecurityContext(v { PCCERT_CONTEXT tmp; - /* Crashes - st = pAcquireCredentialsHandleA(NULL, UNISP_NAME_A, SECPKG_CRED_INBOUND, - NULL, &schanCred, NULL, NULL, NULL, NULL); - */ + if (0) + { + /* Crashes */ + st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, + NULL, &schanCred, NULL, NULL, NULL, NULL); + } /* Good cert with private key, bogus version */ schanCred.dwVersion = SCH_CRED_V1; st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,

1 0

Alexandre Julliard : kernel32: Fixed behavior of FindFirstFile for DOS devices.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: 98a3912e9f88c93637fadf532586b57e3f1a6009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a3912e9f88c93637fadf532… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 12:05:19 2006 +0100 kernel32: Fixed behavior of FindFirstFile for DOS devices. --- dlls/kernel32/file.c | 71 +++++++++++++++++++++++++++------- dlls/kernel32/tests/file.c | 93 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 134 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98a3912e9f88c93637fad…

1 0

Mike McCormack : msi: Add a test showing a join doesn't need a WHERE clause .
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: d65e80c85ed131b3899ecf2ba11aad738131de2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65e80c85ed131b3899ecf2ba… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 31 18:21:37 2006 +0900 msi: Add a test showing a join doesn't need a WHERE clause. --- dlls/msi/tests/db.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 85d5dba..c991ccd 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2226,6 +2226,26 @@ static void test_join(void) MsiViewClose(hview); MsiCloseHandle(hview); + /* try a join without a WHERE condition */ + query = "SELECT `Component`.`ComponentId`, `FeatureComponents`.`Feature_` " + "FROM `Component`, `FeatureComponents` "; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); + + r = MsiViewExecute(hview, 0); + ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); + + i = 0; + while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) + { + i++; + MsiCloseHandle(hrec); + } + ok( i == 24, "Expected 24 rows, got %d\n", i ); + + MsiViewClose(hview); + MsiCloseHandle(hview); + query = "SELECT DISTINCT Component, ComponentId FROM FeatureComponents, Component " "WHERE FeatureComponents.Component_=Component.Component " "AND (Feature_='nasalis') ORDER BY Feature_";

1 0

Mike McCormack : msi: Use a simpler algorithm for joins.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: c6124db905bb07af99b8f7e0c6dfde7d61376e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6124db905bb07af99b8f7e0c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 31 16:16:51 2006 +0900 msi: Use a simpler algorithm for joins. --- dlls/msi/join.c | 182 +++++++-------------------------------------------- dlls/msi/query.h | 3 +- dlls/msi/sql.y | 28 ++++----- dlls/msi/tests/db.c | 116 +++++++------------------------- 4 files changed, 62 insertions(+), 267 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6124db905bb07af99b8f…

1 0

Mike McCormack : msi: Mark components with missing or outdated files as incomplete.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: ddf0b593bb30beb2289dc1f49fc0cc88a67004fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf0b593bb30beb2289dc1f49… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 31 14:32:48 2006 +0900 msi: Mark components with missing or outdated files as incomplete. --- dlls/msi/action.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7cfd74d..c349a94 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2005,10 +2005,19 @@ static UINT ACTION_CostFinalize(MSIPACKA TRACE("file %s resolves to %s\n", debugstr_w(file->File), debugstr_w(file->TargetPath)); + /* don't check files of components that aren't installed */ + if (comp->Installed == INSTALLSTATE_UNKNOWN || + comp->Installed == INSTALLSTATE_ABSENT) + { + file->state = msifs_missing; /* assume files are missing */ + continue; + } + if (GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES) { file->state = msifs_missing; comp->Cost += file->FileSize; + comp->Installed = INSTALLSTATE_INCOMPLETE; continue; } @@ -2022,6 +2031,7 @@ static UINT ACTION_CostFinalize(MSIPACKA { file->state = msifs_overwrite; comp->Cost += file->FileSize; + comp->Installed = INSTALLSTATE_INCOMPLETE; } else file->state = msifs_present;

1 0

Mike McCormack : msi: Fix a trace.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: 9e21dd57aeeec30268e99674bf1524d60639ffd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e21dd57aeeec30268e99674b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 31 14:33:20 2006 +0900 msi: Fix a trace. --- dlls/msi/alter.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 24a11ab..58a6099 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -141,9 +141,9 @@ static const MSIVIEWOPS alter_ops = UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, int hold ) { - MSIALTERVIEW *av = NULL; + MSIALTERVIEW *av; - TRACE("%p\n", av ); + TRACE("%p\n", view ); av = msi_alloc_zero( sizeof *av ); if( !av )

1 0

Mike McCormack : msi: Fix the ALTER and FREE keywords in the tokenizer.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: 57443e01129a041b3adf2bc02d1089ff6d3c58f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57443e01129a041b3adf2bc02… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 31 14:33:05 2006 +0900 msi: Fix the ALTER and FREE keywords in the tokenizer. --- dlls/msi/tests/db.c | 4 ++-- dlls/msi/tokenize.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 134c12a..a445361 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2754,7 +2754,6 @@ static void test_alter(void) cond = MsiDatabaseIsTablePersistent(hdb, "T"); ok( cond == MSICONDITION_FALSE, "wrong return condition\n"); - todo_wine { query = "ALTER TABLE `T` HOLD"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to hold table %d\n", r); @@ -2766,8 +2765,8 @@ static void test_alter(void) query = "ALTER TABLE `T` FREE"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to free table\n"); - } + todo_wine { query = "ALTER TABLE `T` FREE"; r = run_query(hdb, 0, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "failed to free table\n"); @@ -2775,6 +2774,7 @@ static void test_alter(void) query = "ALTER TABLE `T` HOLD"; r = run_query(hdb, 0, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "failed to hold table %d\n", r); + } MsiCloseHandle( hdb ); diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 6cd1dae..4866665 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -40,8 +40,8 @@ #define MAX_TOKEN_LEN 11 static const WCHAR ABORT_W[] = { 'A','B','O','R','T',0 }; static const WCHAR AFTER_W[] = { 'A','F','T','E','R',0 }; -static const WCHAR ALTER_W[] = { 'A','L','T','E','R',0 }; static const WCHAR ALL_W[] = { 'A','L','L',0 }; +static const WCHAR ALTER_W[] = { 'A','L','T','E','R',0 }; static const WCHAR AND_W[] = { 'A','N','D',0 }; static const WCHAR AS_W[] = { 'A','S',0 }; static const WCHAR ASC_W[] = { 'A','S','C',0 }; @@ -154,8 +154,8 @@ static const WCHAR WHERE_W[] = { 'W','H' static const Keyword aKeywordTable[] = { { ABORT_W, TK_ABORT }, { AFTER_W, TK_AFTER }, - { ALTER_W, TK_ALTER }, { ALL_W, TK_ALL }, + { ALTER_W, TK_ALTER }, { AND_W, TK_AND }, { AS_W, TK_AS }, { ASC_W, TK_ASC }, @@ -192,6 +192,7 @@ static const Keyword aKeywordTable[] = { { FAIL_W, TK_FAIL }, { FOR_W, TK_FOR }, { FOREIGN_W, TK_FOREIGN }, + { FREE_W, TK_FREE }, { FROM_W, TK_FROM }, { FULL_W, TK_JOIN_KW }, { GLOB_W, TK_GLOB },

1 0