November 2007 - Wine-commits

James Hawkins : msi: Set the file to NULL when running the directory search .
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: bee95916f74b1c6bc6c99cd0f8343a3bfea22e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee95916f74b1c6bc6c99cd0f… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 13 00:57:01 2007 -0600 msi: Set the file to NULL when running the directory search. --- dlls/msi/appsearch.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 14d0ab9..d1f1d7a 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -769,6 +769,9 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU TRACE("%s\n", debugstr_w(sig->Name)); + msi_free(sig->File); + sig->File = NULL; + *appValue = NULL; row = MSI_QueryGetRecord( package->db, query, sig->Name );

1 0

James Hawkins : msi: Fix the condition for checking a drive.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 474fca1eec2fc60d049361ec5d19417284ee208e URL: http://source.winehq.org/git/wine.git/?a=commit;h=474fca1eec2fc60d049361ec5… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 13 00:57:49 2007 -0600 msi: Fix the condition for checking a drive. --- dlls/msi/appsearch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index d1f1d7a..5baaa76 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -730,7 +730,7 @@ static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, rc = ERROR_SUCCESS; *appValue = NULL; for (i = 0; rc == ERROR_SUCCESS && !*appValue && i < 26; i++) - if (drives & (1 << drives)) + if (drives & (1 << i)) { pathWithDrive[0] = 'A' + i; if (GetDriveTypeW(pathWithDrive) == DRIVE_FIXED)

1 0

Francois Gouget : wined3d: Add trailing '\n's to two shader_addline() calls .
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 41643327ee810e1024ab33c72b2fce86bf47568f URL: http://source.winehq.org/git/wine.git/?a=commit;h=41643327ee810e1024ab33c72… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 13 09:28:16 2007 +0100 wined3d: Add trailing '\n's to two shader_addline() calls. --- dlls/wined3d/vertexshader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 4e2a7c5..286565a 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -399,8 +399,8 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader( * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. */ - shader_addline(&buffer, "ADD TMP_OUT.x, TMP_OUT.x, posFixup.z;"); - shader_addline(&buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, posFixup.w;"); + shader_addline(&buffer, "ADD TMP_OUT.x, TMP_OUT.x, posFixup.z;\n"); + shader_addline(&buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, posFixup.w;\n"); /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent

1 0

Francois Gouget : ntoskrnl: Remove trailing spaces in Wine traces.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 4b1ba7bf1771a519dd742c8b9d73358977ffd751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1ba7bf1771a519dd742c8b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 13 09:28:53 2007 +0100 ntoskrnl: Remove trailing spaces in Wine traces. --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2aac409..10ac0a1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -252,7 +252,7 @@ NTSTATUS wine_ntoskrnl_main_loop( HANDLE stop_event ) */ PMDL WINAPI IoAllocateMdl( PVOID VirtualAddress, ULONG Length, BOOLEAN SecondaryBuffer, BOOLEAN ChargeQuota, PIRP Irp ) { - FIXME( "stub: %p, %u, %i, %i, %p \n", VirtualAddress, Length, SecondaryBuffer, ChargeQuota, Irp ); + FIXME( "stub: %p, %u, %i, %i, %p\n", VirtualAddress, Length, SecondaryBuffer, ChargeQuota, Irp ); return NULL; } @@ -262,7 +262,7 @@ PMDL WINAPI IoAllocateMdl( PVOID VirtualAddress, ULONG Length, BOOLEAN Secondary */ PIO_WORKITEM WINAPI IoAllocateWorkItem( PDEVICE_OBJECT DeviceObject ) { - FIXME( "stub: %p \n", DeviceObject ); + FIXME( "stub: %p\n", DeviceObject ); return NULL; }

1 0

James Hawkins : msi: Test the Uninstall registry entries.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: c68825569d362ba395536547b481f47d2a6f44c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68825569d362ba395536547b… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 13 00:48:18 2007 -0600 msi: Test the Uninstall registry entries. --- dlls/msi/tests/install.c | 498 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 496 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c68825569d362ba395536…

1 0

James Hawkins : msi: Delete the uninstall key when the product is removed.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: f6b27673b0aa851214fa21733bccec87604ee314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b27673b0aa851214fa21733… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 13 00:47:21 2007 -0600 msi: Delete the uninstall key when the product is removed. --- dlls/msi/action.c | 1 + dlls/msi/msipriv.h | 1 + dlls/msi/registry.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ec2bbea..3066308 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4039,6 +4039,7 @@ static UINT msi_unpublish_product(MSIPACKAGE *package) MSIREG_DeleteUserProductKey(package->ProductCode); MSIREG_DeleteUserDataProductKey(package->ProductCode); MSIREG_DeleteUserFeaturesKey(package->ProductCode); + MSIREG_DeleteUninstallKey(package->ProductCode); done: msi_free(remove); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 8c416b8..4c7565b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -729,6 +729,7 @@ extern BOOL squash_guid(LPCWSTR in, LPWSTR out); extern BOOL encode_base85_guid(GUID *,LPWSTR); extern BOOL decode_base85_guid(LPCWSTR,GUID*); extern UINT MSIREG_OpenUninstallKey(LPCWSTR szProduct, HKEY* key, BOOL create); +extern UINT MSIREG_DeleteUninstallKey(LPCWSTR szProduct); extern UINT MSIREG_OpenUserProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); extern UINT MSIREG_OpenFeatures(HKEY* key); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 9a88aea..beaecae 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -504,6 +504,16 @@ UINT MSIREG_OpenUninstallKey(LPCWSTR szProduct, HKEY* key, BOOL create) return rc; } +UINT MSIREG_DeleteUninstallKey(LPCWSTR szProduct) +{ + WCHAR keypath[0x200]; + TRACE("%s\n",debugstr_w(szProduct)); + + sprintfW(keypath,szUninstall_fmt,szProduct); + + return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); +} + UINT MSIREG_OpenUserProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create) { UINT rc;

1 0

Lei Zhang : shell32: Don't crash if $HOME is not set.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 4dda7c6371f04d6aaf8c7d37e58139a2acaee567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dda7c6371f04d6aaf8c7d37e… Author: Lei Zhang <thestig(a)google.com> Date: Mon Nov 12 13:30:24 2007 -0800 shell32: Don't crash if $HOME is not set. --- dlls/shell32/shellpath.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 9e832c1..5be77d7 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2065,8 +2065,6 @@ static void _SHCreateSymbolicLinks(void) } } - HeapFree(GetProcessHeap(), 0, pszPersonal); - /* Create symbolic links for 'My Pictures', 'My Video' and 'My Music'. */ for (i=0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { /* Create the current 'My Whatever' folder and get it's unix path. */ @@ -2094,7 +2092,12 @@ static void _SHCreateSymbolicLinks(void) } /* Last but not least, the Desktop folder */ - strcpy(szDesktopTarget, pszHome); + if (pszHome) + strcpy(szDesktopTarget, pszHome); + else + strcpy(szDesktopTarget, pszPersonal); + HeapFree(GetProcessHeap(), 0, pszPersonal); + if (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) {

1 0

Rob Shearman : rpcrt4: Implement RpcCancelThread for the ncacn_ip_tcp protocol sequence.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: a51486c657c4c2c4df9b94446822c234c34510cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a51486c657c4c2c4df9b94446… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 12 20:10:19 2007 +0000 rpcrt4: Implement RpcCancelThread for the ncacn_ip_tcp protocol sequence. --- dlls/rpcrt4/rpc_binding.h | 8 ++++ dlls/rpcrt4/rpc_message.c | 8 ++++ dlls/rpcrt4/rpc_transport.c | 86 ++++++++++++++++++++++++++++++++++++++++--- dlls/rpcrt4/rpcrt4_main.c | 82 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 176 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a51486c657c4c2c4df9b9…

1 0

David Adam : d3dx8: Implement D3DXMatrixAffine Transformation.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 6840049f2f2b74537ce152196249075c4cdd1ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6840049f2f2b74537ce152196… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Mon Nov 12 11:27:13 2007 +0100 d3dx8: Implement D3DXMatrixAffine Transformation. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx8/tests/math.c | 17 ++++++++++++++++- include/d3dx8math.h | 1 + 4 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 82c9586..7578597 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -34,7 +34,7 @@ @ stdcall D3DXMatrixRotationQuaternion(ptr ptr) @ stdcall D3DXMatrixRotationYawPitchRoll(ptr long long long) @ stub D3DXMatrixTransformation -@ stub D3DXMatrixAffineTransformation +@ stdcall D3DXMatrixAffineTransformation(ptr long ptr ptr ptr) @ stdcall D3DXMatrixLookAtRH(ptr ptr ptr ptr) @ stdcall D3DXMatrixLookAtLH(ptr ptr ptr ptr) @ stdcall D3DXMatrixPerspectiveRH(ptr long long long long) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 7f96583..15276fa 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -34,6 +34,44 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx8); /*_________________D3DXMatrix____________________*/ +D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, float scaling, D3DXVECTOR3 *rotationcenter, D3DXQUATERNION *rotation, D3DXVECTOR3 *translation) +{ + D3DXMATRIX m1, m2, m3, m4, m5, p1, p2, p3; + + D3DXMatrixScaling(&m1, scaling, scaling, scaling); + if ( !rotationcenter ) + { + D3DXMatrixIdentity(&m2); + D3DXMatrixIdentity(&m4); + } + else + { + D3DXMatrixTranslation(&m2, -rotationcenter->x, -rotationcenter->y, -rotationcenter->z); + D3DXMatrixTranslation(&m4, rotationcenter->x, rotationcenter->y, rotationcenter->z); + } + if ( !rotation ) + { + D3DXMatrixIdentity(&m3); + } + else + { + D3DXMatrixRotationQuaternion(&m3, rotation); + } + if ( !translation ) + { + D3DXMatrixIdentity(&m5); + } + else + { + D3DXMatrixTranslation(&m5, translation->x, translation->y, translation->z); + } + D3DXMatrixMultiply(&p1, &m1, &m2); + D3DXMatrixMultiply(&p2, &p1, &m3); + D3DXMatrixMultiply(&p3, &p2, &m4); + D3DXMatrixMultiply(pout, &p3, &m5); + return pout; +} + FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm) { D3DXVECTOR4 minor, v1, v2, v3; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 65a0e5a..9e862ab 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -21,7 +21,7 @@ #include "wine/test.h" -#define admitted_error 0.00001f +#define admitted_error 0.0001f #define expect_color(expectedcolor,gotcolor) ok((fabs(expectedcolor.r-gotcolor.r)<admitted_error)&&(fabs(expectedcolor.g-gotcolor.g)<admitted_error)&&(fabs(expectedcolor.b-gotcolor.b)<admitted_error)&&(fabs(expectedcolor.a-gotcolor.a)<admitted_error),"Expected Color= (%f, %f, %f, %f)\n , Got Color= (%f, %f, %f, %f)\n", expectedcolor.r, expectedcolor.g, expectedcolor.b, expectedcolor.a, gotcolor.r, gotcolor.g, gotcolor.b, gotcolor.a); @@ -177,6 +177,21 @@ static void D3DXMatrixTest(void) angle = D3DX_PI/3.0f; +/*____________D3DXMatrixAffineTransformation______*/ + expectedmat.m[0][0] = -459.239990f; expectedmat.m[0][1] = -576.719971f; expectedmat.m[0][2] = -263.440002f; expectedmat.m[0][3] = 0.0f; + expectedmat.m[1][0] = 519.760010f; expectedmat.m[1][1] = -352.440002f; expectedmat.m[1][2] = -277.679993f; expectedmat.m[1][3] = 0.0f; + expectedmat.m[2][0] = 363.119995f; expectedmat.m[2][1] = -121.040001f; expectedmat.m[2][2] = -117.479996f; expectedmat.m[2][3] = 0.0f; + expectedmat.m[3][0] = -1239.0f; expectedmat.m[3][1] = 667.0f; expectedmat.m[3][2] = 567.0f; expectedmat.m[3][3] = 1.0f; + D3DXMatrixAffineTransformation(&gotmat,3.56f,&at,&q,&axis); + expect_mat(expectedmat,gotmat); +/* Test the NULL case */ + expectedmat.m[0][0] = -459.239990f; expectedmat.m[0][1] = -576.719971f; expectedmat.m[0][2] = -263.440002f; expectedmat.m[0][3] = 0.0f; + expectedmat.m[1][0] = 519.760010f; expectedmat.m[1][1] = -352.440002f; expectedmat.m[1][2] = -277.679993f; expectedmat.m[1][3] = 0.0f; + expectedmat.m[2][0] = 363.119995f; expectedmat.m[2][1] = -121.040001f; expectedmat.m[2][2] = -117.479996f; expectedmat.m[2][3] = 0.0f; + expectedmat.m[3][0] = 1.0f; expectedmat.m[3][1] = -3.0f; expectedmat.m[3][2] = 7.0f; expectedmat.m[3][3] = 1.0f; + D3DXMatrixAffineTransformation(&gotmat,3.56f,NULL,&q,&axis); + expect_mat(expectedmat,gotmat); + /*____________D3DXMatrixfDeterminant_____________*/ expectedfloat = -147888.0f; gotfloat = D3DXMatrixfDeterminant(&mat); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 9916490..da0c8f3 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -259,6 +259,7 @@ typedef struct D3DXCOLOR FLOAT r, g, b, a; } D3DXCOLOR, *LPD3DXCOLOR; +D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, float scaling, D3DXVECTOR3 *rotationcenter, D3DXQUATERNION *rotation, D3DXVECTOR3 *translation); FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm); D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, CONST D3DXMATRIX *pm); D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup);

1 0

Rob Shearman : ole32: Wait forever on the ready_event in the local server tests.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 56a624b0fe55096c38aca3d6fb4b758f4666eebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a624b0fe55096c38aca3d6f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 12 20:15:29 2007 +0000 ole32: Wait forever on the ready_event in the local server tests. --- dlls/ole32/tests/marshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 56c213e..ae82e37 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2555,7 +2555,7 @@ static void test_local_server(void) ok(process != NULL, "couldn't start local server process, error was %d\n", GetLastError()); ready_event = CreateEvent(NULL, FALSE, FALSE, "Wine COM Test Ready Event"); - WaitForSingleObject(ready_event, 1000); + WaitForSingleObject(ready_event, INFINITE); CloseHandle(ready_event); hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_LOCAL_SERVER, &IID_IClassFactory, (void **)&cf);

1 0