November 2006 - Wine-commits

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 07 Nov '06

07 Nov '06

1 0

Francois Gouget : include: Some DirectX headers are supposed to define COM_NO_WINDOWS_H.
by Alexandre Julliard 07 Nov '06

07 Nov '06

Module: wine Branch: master Commit: 6688acce7dbb00ceea4e755fe0f4a771a5520c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6688acce7dbb00ceea4e755fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 7 00:45:16 2006 +0100 include: Some DirectX headers are supposed to define COM_NO_WINDOWS_H. --- include/d3d.h | 2 ++ include/d3d8.h | 1 + include/d3d9.h | 1 + include/ddraw.h | 1 + include/dinput.h | 1 + include/dmplugin.h | 1 + include/dmusicc.h | 1 + include/dmusicf.h | 1 + include/dmusici.h | 1 + 9 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index a897227..76237d7 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -20,6 +20,8 @@ #ifndef __WINE_D3D_H #define __WINE_D3D_H #include <stdlib.h> + +#define COM_NO_WINDOWS_H #include <objbase.h> #include <d3dtypes.h> /* must precede d3dcaps.h */ #include <d3dcaps.h> diff --git a/include/d3d8.h b/include/d3d8.h index 75d1810..8b7ea53 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -23,6 +23,7 @@ #ifndef DIRECT3D_VERSION #define DIRECT3D_VERSION 0x0800 #endif +#define COM_NO_WINDOWS_H #include <objbase.h> #include <d3d8types.h> diff --git a/include/d3d9.h b/include/d3d9.h index 2cc9012..2575dbe 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -24,6 +24,7 @@ #ifndef DIRECT3D_VERSION #define DIRECT3D_VERSION 0x0900 #endif +#define COM_NO_WINDOWS_H #include <objbase.h> #include <d3d9types.h> diff --git a/include/ddraw.h b/include/ddraw.h index b8a28ce..f92d479 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -19,6 +19,7 @@ #ifndef __WINE_DDRAW_H #define __WINE_DDRAW_H +#define COM_NO_WINDOWS_H #include <objbase.h> #ifdef __cplusplus diff --git a/include/dinput.h b/include/dinput.h index f6e766b..e8c5658 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -19,6 +19,7 @@ #ifndef __WINE_DINPUT_H #define __WINE_DINPUT_H +#define COM_NO_WINDOWS_H #include <objbase.h> #ifndef DIRECTINPUT_VERSION diff --git a/include/dmplugin.h b/include/dmplugin.h index 76b06c8..28a38f5 100644 --- a/include/dmplugin.h +++ b/include/dmplugin.h @@ -25,6 +25,7 @@ #ifndef __WINESRC__ #include <windows.h> #endif /* __WINESRC__ */ +#define COM_NO_WINDOWS_H #include <objbase.h> #include <mmsystem.h> #include <dmusici.h> diff --git a/include/dmusicc.h b/include/dmusicc.h index 87d9e76..369774b 100644 --- a/include/dmusicc.h +++ b/include/dmusicc.h @@ -24,6 +24,7 @@ #ifndef __WINESRC__ #include <windows.h> #endif /* __WINESRC__ */ +#define COM_NO_WINDOWS_H #include <objbase.h> #include <mmsystem.h> diff --git a/include/dmusicf.h b/include/dmusicf.h index a568b04..8c12a28 100644 --- a/include/dmusicf.h +++ b/include/dmusicf.h @@ -25,6 +25,7 @@ #ifndef __WINESRC__ #include <windows.h> #endif /* __WINESRC__ */ +#define COM_NO_WINDOWS_H #include <objbase.h> #include <mmsystem.h> #include <pshpack8.h> diff --git a/include/dmusici.h b/include/dmusici.h index 5403877..42ba6dd 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -27,6 +27,7 @@ #else #include <oleauto.h> /* VARIANT */ #endif /* __WINESRC__ */ +#define COM_NO_WINDOWS_H #include <objbase.h> #include <mmsystem.h> #include <dmusicc.h>

1 0

Francois Gouget : oleau32: The PSDK's ELEMDESC's union is nameless, always. So use the U(x) macro.
by Alexandre Julliard 07 Nov '06

07 Nov '06

Module: wine Branch: master Commit: ff64e096059f74412638b72f6bcbd8d77cd02e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff64e096059f74412638b72f6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 7 00:43:24 2006 +0100 oleau32: The PSDK's ELEMDESC's union is nameless, always. So use the U(x) macro. --- dlls/oleaut32/tests/typelib.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 75aaca9..44b53d6 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -20,8 +20,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <wine/test.h> #include <stdarg.h> @@ -365,10 +363,10 @@ static void test_CreateDispTypeInfo(void ok(pFuncDesc->wFuncFlags == 0, "oVft %d\n", pFuncDesc->wFuncFlags); ok(pFuncDesc->elemdescFunc.tdesc.vt == VT_HRESULT, "ret vt %x\n", pFuncDesc->elemdescFunc.tdesc.vt); ok(pFuncDesc->lprgelemdescParam[0].tdesc.vt == VT_I4, "parm 0 vt %x\n", pFuncDesc->lprgelemdescParam[0].tdesc.vt); - ok(pFuncDesc->lprgelemdescParam[0].u.paramdesc.wParamFlags == PARAMFLAG_NONE, "parm 0 flags %x\n", pFuncDesc->lprgelemdescParam[0].u.paramdesc.wParamFlags); + ok(U(pFuncDesc->lprgelemdescParam[0]).paramdesc.wParamFlags == PARAMFLAG_NONE, "parm 0 flags %x\n", U(pFuncDesc->lprgelemdescParam[0]).paramdesc.wParamFlags); ok(pFuncDesc->lprgelemdescParam[1].tdesc.vt == VT_BSTR, "parm 1 vt %x\n", pFuncDesc->lprgelemdescParam[1].tdesc.vt); - ok(pFuncDesc->lprgelemdescParam[1].u.paramdesc.wParamFlags == PARAMFLAG_NONE, "parm 1 flags %x\n", pFuncDesc->lprgelemdescParam[1].u.paramdesc.wParamFlags); + ok(U(pFuncDesc->lprgelemdescParam[1]).paramdesc.wParamFlags == PARAMFLAG_NONE, "parm 1 flags %x\n", U(pFuncDesc->lprgelemdescParam[1]).paramdesc.wParamFlags); ITypeInfo_ReleaseFuncDesc(pTI2, pFuncDesc); hr = ITypeInfo_GetFuncDesc(pTI2, 1, &pFuncDesc); @@ -392,7 +390,7 @@ static void test_CreateDispTypeInfo(void ok(pFuncDesc->wFuncFlags == 0, "oVft %d\n", pFuncDesc->wFuncFlags); ok(pFuncDesc->elemdescFunc.tdesc.vt == VT_HRESULT, "ret vt %x\n", pFuncDesc->elemdescFunc.tdesc.vt); ok(pFuncDesc->lprgelemdescParam[0].tdesc.vt == VT_I4, "parm 0 vt %x\n", pFuncDesc->lprgelemdescParam[0].tdesc.vt); - ok(pFuncDesc->lprgelemdescParam[0].u.paramdesc.wParamFlags == PARAMFLAG_NONE, "parm 0 flags %x\n", pFuncDesc->lprgelemdescParam[0].u.paramdesc.wParamFlags); + ok(U(pFuncDesc->lprgelemdescParam[0]).paramdesc.wParamFlags == PARAMFLAG_NONE, "parm 0 flags %x\n", U(pFuncDesc->lprgelemdescParam[0]).paramdesc.wParamFlags); ITypeInfo_ReleaseFuncDesc(pTI2, pFuncDesc); hr = ITypeInfo_GetFuncDesc(pTI2, 3, &pFuncDesc);

1 0

Francois Gouget : comctl32: Add missing '\n' to ok() call.
by Alexandre Julliard 07 Nov '06

07 Nov '06

Module: wine Branch: master Commit: 88f3cb2a7da7734dd18073660c73294f023642e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f3cb2a7da7734dd18073660… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 7 00:42:27 2006 +0100 comctl32: Add missing '\n' to ok() call. --- dlls/comctl32/tests/toolbar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index daa8d5b..92e662b 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -845,10 +845,10 @@ void test_sizes() /* delete button doesn't change the buttons size */ SendMessageA(hToolbar, TB_DELETEBUTTON, 2, 0); SendMessageA(hToolbar, TB_DELETEBUTTON, 1, 0); - ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(163, 39), "Unexpected button size"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(163, 39), "Unexpected button size\n"); /* TB_INSERTBUTTONS will */ SendMessageA(hToolbar, TB_INSERTBUTTON, 1, (LPARAM)&buttons2[0]); - ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(23, 22), "Unexpected button size"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(23, 22), "Unexpected button size\n"); rebuild_toolbar(&hToolbar); SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]);

1 0

Francois Gouget : dplayx: Fix spelling of the DPLAYX_AcquireSemaphore() macro.
by Alexandre Julliard 07 Nov '06

07 Nov '06

Module: wine Branch: master Commit: 4b57bd599bf1637f7bfbf98f49099092c482a80b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b57bd599bf1637f7bfbf98f4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 7 00:39:41 2006 +0100 dplayx: Fix spelling of the DPLAYX_AcquireSemaphore() macro. --- dlls/dplayx/dplayx_global.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index d58271d..9963361 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -60,7 +60,7 @@ static HANDLE hDplayxSharedMem; static LPVOID lpSharedStaticData = NULL; -#define DPLAYX_AquireSemaphore() TRACE( "Waiting for DPLAYX semaphore\n" ); \ +#define DPLAYX_AcquireSemaphore() TRACE( "Waiting for DPLAYX semaphore\n" ); \ WaitForSingleObject( hDplayxSema, INFINITE );\ TRACE( "Through wait\n" ) @@ -242,7 +242,7 @@ BOOL DPLAYX_ConstructData(void) else if ( GetLastError() == ERROR_ALREADY_EXISTS ) { TRACE( "Found semaphore handle %p\n", hDplayxSema ); - DPLAYX_AquireSemaphore(); + DPLAYX_AcquireSemaphore(); } else { @@ -401,7 +401,7 @@ void DPLAYX_InitializeLobbyDataEntry( LP ZeroMemory( lpData, sizeof( *lpData ) ); } -/* NOTE: This must be called with the semaphore aquired. +/* NOTE: This must be called with the semaphore acquired. * TRUE/FALSE with a pointer to it's data returned. Pointer data is * is only valid if TRUE is returned. */ @@ -442,7 +442,7 @@ BOOL DPLAYX_CreateLobbyApplication( DWOR return FALSE; } - DPLAYX_AquireSemaphore(); + DPLAYX_AcquireSemaphore(); /* Find an empty space in the list and insert the data */ for( i=0; i < numSupportedLobbies; i++ ) @@ -477,7 +477,7 @@ BOOL DPLAYX_DestroyLobbyApplication( DWO { UINT i; - DPLAYX_AquireSemaphore(); + DPLAYX_AcquireSemaphore(); /* Find an empty space in the list and insert the data */ for( i=0; i < numSupportedLobbies; i++ ) @@ -510,7 +510,7 @@ BOOL DPLAYX_SetLobbyHandles( DWORD dwApp return FALSE; } - DPLAYX_AquireSemaphore(); + DPLAYX_AcquireSemaphore(); if( !DPLAYX_IsAppIdLobbied( dwAppID, &lpLData ) ) { @@ -534,7 +534,7 @@ BOOL DPLAYX_GetThisLobbyHandles( LPHANDL { LPDPLAYX_LOBBYDATA lpLData; - DPLAYX_AquireSemaphore(); + DPLAYX_AcquireSemaphore(); if( !DPLAYX_IsAppIdLobbied( 0, &lpLData ) ) { @@ -608,7 +608,7 @@ ( DWORD dwAppID, DWORD dwRequiredDataSize = 0; HANDLE hInformOnSettingRead; - DPLAYX_AquireSemaphore(); + DPLAYX_AcquireSemaphore(); if ( ! DPLAYX_IsAppIdLobbied( dwAppID, &lpDplData ) ) { @@ -732,7 +732,7 @@ ( DWORD dwAppID, DWORD dwRequiredDataSize = 0; HANDLE hInformOnSettingRead; - DPLAYX_AquireSemaphore(); + DPLAYX_AcquireSemaphore(); if ( ! DPLAYX_IsAppIdLobbied( dwAppID, &lpDplData ) ) { @@ -872,7 +872,7 @@ ( DWORD dwFlags, return DPERR_INVALIDPARAMS; } - DPLAYX_AquireSemaphore(); + DPLAYX_AcquireSemaphore(); if ( ! DPLAYX_IsAppIdLobbied( dwAppID, &lpDplData ) ) { @@ -934,7 +934,7 @@ ( DWORD dwFlags, return DPERR_INVALIDPARAMS; } - DPLAYX_AquireSemaphore(); + DPLAYX_AcquireSemaphore(); if ( ! DPLAYX_IsAppIdLobbied( dwAppID, &lpDplData ) ) { @@ -1145,7 +1145,7 @@ BOOL DPLAYX_WaitForConnectionSettings( B { LPDPLAYX_LOBBYDATA lpLobbyData; - DPLAYX_AquireSemaphore(); + DPLAYX_AcquireSemaphore(); if( !DPLAYX_IsAppIdLobbied( 0, &lpLobbyData ) ) { @@ -1165,7 +1165,7 @@ BOOL DPLAYX_AnyLobbiesWaitingForConnSett UINT i; BOOL bFound = FALSE; - DPLAYX_AquireSemaphore(); + DPLAYX_AcquireSemaphore(); for( i=0; i < numSupportedLobbies; i++ ) { @@ -1187,7 +1187,7 @@ BOOL DPLAYX_SetLobbyMsgThreadId( DWORD d { LPDPLAYX_LOBBYDATA lpLobbyData; - DPLAYX_AquireSemaphore(); + DPLAYX_AcquireSemaphore(); if( !DPLAYX_IsAppIdLobbied( dwAppId, &lpLobbyData ) ) {

1 0

Francois Gouget : dmstyle: Fix spelling of the DMUS_PRIVATE_STYLE_MOTIF. dwRhythm field.
by Alexandre Julliard 07 Nov '06

07 Nov '06

Module: wine Branch: master Commit: 580290fdb88f0a6b3671d64636bc25b571b6d235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=580290fdb88f0a6b3671d6463… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 7 00:38:49 2006 +0100 dmstyle: Fix spelling of the DMUS_PRIVATE_STYLE_MOTIF.dwRhythm field. --- dlls/dmstyle/dmstyle_private.h | 2 +- dlls/dmstyle/style.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 7930f80..240db7e 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -76,7 +76,7 @@ typedef struct _DMUS_PRIVATE_STYLE_PARTR typedef struct _DMUS_PRIVATE_STYLE_MOTIF { struct list entry; /* for listing elements */ - DWORD dwRythm; + DWORD dwRhythm; DMUS_IO_PATTERN pattern; DMUS_OBJECTDESC desc; /** optional for motifs */ diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 0aaaa8c..f6d2958 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -741,9 +741,9 @@ static HRESULT IDirectMusicStyle8Impl_IP break; } case DMUS_FOURCC_RHYTHM_CHUNK: { - TRACE_(dmfile)(": Rythm chunk\n"); - IStream_Read (pStm, &pNewMotif->dwRythm, sizeof(DWORD), NULL); - TRACE_(dmfile)(" - dwRythm: %u\n", pNewMotif->dwRythm); + TRACE_(dmfile)(": Rhythm chunk\n"); + IStream_Read (pStm, &pNewMotif->dwRhythm, sizeof(DWORD), NULL); + TRACE_(dmfile)(" - dwRhythm: %u\n", pNewMotif->dwRhythm); /** TODO understand why some Chunks have size > 4 */ liMove.QuadPart = Chunk.dwSize - sizeof(DWORD); IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);

1 0

Francois Gouget : taskmgr: Fix spelling of the SYSTEM_PERFORMANCE_INFORMATION. MmTotalCommittedPages field.
by Alexandre Julliard 07 Nov '06

07 Nov '06

Module: wine Branch: master Commit: db05fe33a28eb057c0e6acfb5383649d6ae6f995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db05fe33a28eb057c0e6acfb5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 7 00:38:24 2006 +0100 taskmgr: Fix spelling of the SYSTEM_PERFORMANCE_INFORMATION.MmTotalCommittedPages field. --- programs/taskmgr/perfdata.c | 2 +- programs/taskmgr/perfdata.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 6a88fa3..85001b3 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -678,7 +678,7 @@ ULONG PerfDataGetCommitChargeTotalK(void EnterCriticalSection(&PerfDataCriticalSection); - Total = SystemPerfInfo.MmTotalCommitedPages; + Total = SystemPerfInfo.MmTotalCommittedPages; PageSize = SystemBasicInfo.uPageSize; LeaveCriticalSection(&PerfDataCriticalSection); diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index 3e803d4..1011461 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -183,7 +183,7 @@ typedef struct _SYSTEM_PERFORMANCE_INFOR ULONG IoWriteOperationCount; ULONG IoOtherOperationCount; ULONG MmAvailablePages; - ULONG MmTotalCommitedPages; + ULONG MmTotalCommittedPages; ULONG MmTotalCommitLimit; ULONG MmPeakLimit; ULONG PageFaults;

1 0

Mike McCormack : msi: By default, install components locally.
by Alexandre Julliard 07 Nov '06

07 Nov '06

Module: wine Branch: master Commit: 9efb7b71ba6b8afb3a145e8c055fa8a8b733596f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9efb7b71ba6b8afb3a145e8c0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 7 17:55:43 2006 +0900 msi: By default, install components locally. --- dlls/msi/action.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c878636..ae4400c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1853,6 +1853,12 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa LIST_FOR_EACH_ENTRY( component, &package->components, MSICOMPONENT, entry ) { + if (component->Action == INSTALLSTATE_DEFAULT) + { + TRACE("%s was default, setting to local\n", debugstr_w(component->Component)); + msi_component_set_state( component, INSTALLSTATE_LOCAL ); + } + TRACE("Result: Component %s (Installed %i, Action %i, Request %i)\n", debugstr_w(component->Component), component->Installed, component->Action, component->ActionRequest);

1 0

Mike McCormack : msi: Fix WHERE IS (NOT) NULL queries.
by Alexandre Julliard 07 Nov '06

07 Nov '06

Module: wine Branch: master Commit: 50e5caeb6c4d13548ac07eea469714147ed7288e URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e5caeb6c4d13548ac07eea4… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 7 15:07:16 2006 +0900 msi: Fix WHERE IS (NOT) NULL queries. --- dlls/msi/query.h | 1 + dlls/msi/sql.y | 18 ++++++++++++++++-- dlls/msi/tests/db.c | 6 ++++++ dlls/msi/where.c | 35 +++++++++++++++++++++++++++++++---- 4 files changed, 54 insertions(+), 6 deletions(-) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 360f4b5..86773ad 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -54,6 +54,7 @@ #define EXPR_STRCMP 7 #define EXPR_WILDCARD 9 #define EXPR_COL_NUMBER_STRING 10 #define EXPR_COL_NUMBER32 11 +#define EXPR_UNARY 12 struct sql_str { LPCWSTR data; diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index c005611..17cb957 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -59,6 +59,7 @@ static column_info *parser_alloc_column( static BOOL SQL_MarkPrimaryKeys( column_info *cols, column_info *keys); static struct expr * EXPR_complex( void *info, struct expr *l, UINT op, struct expr *r ); +static struct expr * EXPR_unary( void *info, struct expr *l, UINT op ); static struct expr * EXPR_column( void *info, column_info *column ); static struct expr * EXPR_ival( void *info, int val ); static struct expr * EXPR_sval( void *info, struct sql_str * ); @@ -513,13 +514,13 @@ expr: } | column_val TK_IS TK_NULL { - $$ = EXPR_complex( info, $1, OP_ISNULL, NULL ); + $$ = EXPR_unary( info, $1, OP_ISNULL ); if( !$$ ) YYABORT; } | column_val TK_IS TK_NOT TK_NULL { - $$ = EXPR_complex( info, $1, OP_NOTNULL, NULL ); + $$ = EXPR_unary( info, $1, OP_NOTNULL ); if( !$$ ) YYABORT; } @@ -762,6 +763,19 @@ static struct expr * EXPR_complex( void return e; } +static struct expr * EXPR_unary( void *info, struct expr *l, UINT op ) +{ + struct expr *e = parser_alloc( info, sizeof *e ); + if( e ) + { + e->type = EXPR_UNARY; + e->u.expr.left = l; + e->u.expr.op = op; + e->u.expr.right = NULL; + } + return e; +} + static struct expr * EXPR_column( void *info, column_info *column ) { struct expr *e = parser_alloc( info, sizeof *e ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 1bca0d3..7360238 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1354,6 +1354,12 @@ static void test_where(void) MsiCloseHandle( rec ); + rec = 0; + query = "SELECT * FROM `Media` WHERE `DiskPrompt` IS NULL"; + r = do_query(hdb, query, &rec); + ok( r == ERROR_SUCCESS, "query failed: %d\n", r ); + MsiCloseHandle( rec ); + MsiCloseHandle( hdb ); DeleteFile(msifile); } diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 6fd2f88..a30ebcb 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -99,7 +99,7 @@ static UINT WHERE_set_row( struct tagMSI return wv->table->ops->set_row( wv->table, row, rec, mask ); } -static INT INT_evaluate( INT lval, UINT op, INT rval ) +static INT INT_evaluate_binary( INT lval, UINT op, INT rval ) { switch( op ) { @@ -119,6 +119,16 @@ static INT INT_evaluate( INT lval, UINT return ( lval >= rval ); case OP_NE: return ( lval != rval ); + default: + ERR("Unknown operator %d\n", op ); + } + return 0; +} + +static INT INT_evaluate_unary( INT lval, UINT op ) +{ + switch( op ) + { case OP_ISNULL: return ( !lval ); case OP_NOTNULL: @@ -211,7 +221,14 @@ static UINT WHERE_evaluate( MSIDATABASE r = WHERE_evaluate( db, table, row, cond->u.expr.right, &rval, record ); if( r != ERROR_SUCCESS ) return r; - *val = INT_evaluate( lval, cond->u.expr.op, rval ); + *val = INT_evaluate_binary( lval, cond->u.expr.op, rval ); + return ERROR_SUCCESS; + + case EXPR_UNARY: + r = table->ops->fetch_int( table, row, cond->u.expr.left->u.col_number, &tval ); + if( r != ERROR_SUCCESS ) + return r; + *val = INT_evaluate_unary( tval, cond->u.expr.op ); return ERROR_SUCCESS; case EXPR_STRCMP: @@ -224,7 +241,7 @@ static UINT WHERE_evaluate( MSIDATABASE default: ERR("Invalid expression type\n"); break; - } + } return ERROR_SUCCESS; @@ -497,6 +514,16 @@ static UINT WHERE_VerifyCondition( MSIDA } break; + case EXPR_UNARY: + if ( cond->u.expr.left->type != EXPR_COLUMN ) + { + *valid = FALSE; + return ERROR_INVALID_PARAMETER; + } + r = WHERE_VerifyCondition( db, table, cond->u.expr.left, valid ); + if( r != ERROR_SUCCESS ) + return r; + break; case EXPR_IVAL: *valid = 1; cond->type = EXPR_UVAL; @@ -512,7 +539,7 @@ static UINT WHERE_VerifyCondition( MSIDA ERR("Invalid expression type\n"); *valid = 0; break; - } + } return ERROR_SUCCESS; }

1 0

Mike McCormack : msi: Fix regression tests failing on Windows.
by Alexandre Julliard 07 Nov '06

07 Nov '06

Module: wine Branch: master Commit: 2b943bfddc0c28eadc4fce3232648fed1340f9d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b943bfddc0c28eadc4fce323… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 7 15:06:09 2006 +0900 msi: Fix regression tests failing on Windows. --- dlls/msi/tests/db.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 9d03f46..1bca0d3 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2395,13 +2395,13 @@ static void test_join(void) size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); - if( !lstrcmp( buf, join_res_fifth[i].two )) + if( lstrcmp( buf, join_res_fifth[i].two )) data_correct = FALSE; i++; MsiCloseHandle(hrec); } - todo_wine ok( data_correct, "data returned in the wrong order\n"); + ok( data_correct, "data returned in the wrong order\n"); ok( i == 1, "Expected 1 rows, got %d\n", i ); ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); @@ -2551,25 +2551,25 @@ static void test_join(void) size = MAX_PATH; r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); - if( !lstrcmp( buf, join_res_eighth[i].one )) + if( lstrcmp( buf, join_res_eighth[i].one )) data_correct = FALSE; size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); - if( !lstrcmp( buf, join_res_eighth[i].two )) + if( lstrcmp( buf, join_res_eighth[i].two )) data_correct = FALSE; size = MAX_PATH; r = MsiRecordGetString( hrec, 3, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); - if( !lstrcmp( buf, join_res_eighth[i].three )) + if( lstrcmp( buf, join_res_eighth[i].three )) data_correct = FALSE; size = MAX_PATH; r = MsiRecordGetString( hrec, 4, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); - if( !lstrcmp( buf, join_res_eighth[i].four )) + if( lstrcmp( buf, join_res_eighth[i].four )) data_correct = FALSE; i++;

1 0