April 2009 - Wine-Commits - list.winehq.org

Vincent Povirk : gdiplus: Add blend information to linear gradient brushes.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: b05cf906d1efa98f09e10a0a3f13aff06a8fe468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05cf906d1efa98f09e10a0a3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 28 18:03:41 2009 -0500 gdiplus: Add blend information to linear gradient brushes. --- dlls/gdiplus/brush.c | 54 ++++++++++++++++++++++++++++++++++++--- dlls/gdiplus/gdiplus_private.h | 3 ++ 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index e22d5aa..9df52ad 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -108,14 +108,38 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) break; } - case BrushTypeLinearGradient: - *clone = GdipAlloc(sizeof(GpLineGradient)); - if(!*clone) return OutOfMemory; + case BrushTypeLinearGradient:{ + GpLineGradient *dest, *src; + INT count; + + dest = GdipAlloc(sizeof(GpLineGradient)); + if(!dest) return OutOfMemory; + + src = (GpLineGradient*)brush; + + memcpy(dest, src, sizeof(GpLineGradient)); + + dest->brush.gdibrush = CreateSolidBrush(dest->brush.lb.lbColor); + + count = dest->blendcount; + dest->blendfac = GdipAlloc(count * sizeof(REAL)); + dest->blendpos = GdipAlloc(count * sizeof(REAL)); + + if (!dest->blendfac || !dest->blendpos) + { + GdipFree(dest->blendfac); + GdipFree(dest->blendpos); + DeleteObject(dest->brush.gdibrush); + GdipFree(dest); + return OutOfMemory; + } - memcpy(*clone, brush, sizeof(GpLineGradient)); + memcpy(dest->blendfac, src->blendfac, count * sizeof(REAL)); + memcpy(dest->blendpos, src->blendpos, count * sizeof(REAL)); - (*clone)->gdibrush = CreateSolidBrush((*clone)->lb.lbColor); + *clone = &dest->brush; break; + } case BrushTypeTextureFill: *clone = GdipAlloc(sizeof(GpTexture)); if(!*clone) return OutOfMemory; @@ -226,6 +250,23 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, (*line)->wrap = wrap; (*line)->gamma = FALSE; + (*line)->blendcount = 1; + (*line)->blendfac = GdipAlloc(sizeof(REAL)); + (*line)->blendpos = GdipAlloc(sizeof(REAL)); + + if (!(*line)->blendfac || !(*line)->blendpos) + { + GdipFree((*line)->blendfac); + GdipFree((*line)->blendpos); + DeleteObject((*line)->brush.gdibrush); + GdipFree(*line); + *line = NULL; + return OutOfMemory; + } + + (*line)->blendfac[0] = 1.0f; + (*line)->blendpos[0] = 1.0f; + return Ok; } @@ -765,7 +806,10 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) GdipFree(((GpPathGradient*) brush)->blendpos); break; case BrushTypeSolidColor: + break; case BrushTypeLinearGradient: + GdipFree(((GpLineGradient*)brush)->blendfac); + GdipFree(((GpLineGradient*)brush)->blendpos); break; case BrushTypeTextureFill: GdipDeleteMatrix(((GpTexture*)brush)->transform); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index a8c49d3..e038baf 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -145,6 +145,9 @@ struct GpLineGradient{ ARGB endcolor; GpWrapMode wrap; BOOL gamma; + REAL* blendfac; /* blend factors */ + REAL* blendpos; /* blend positions */ + INT blendcount; }; struct GpTexture{

1 0

Konstantin Kondratyuk : fonts: Add Kazakhstan's symbols into tahomabd.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: 7521f7bee4bbaa11f63ee16021f00b492ba06c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7521f7bee4bbaa11f63ee1602… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Tue Apr 28 22:08:33 2009 +0400 fonts: Add Kazakhstan's symbols into tahomabd. --- fonts/tahomabd.sfd | 633 +++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/tahomabd.ttf | Bin 76624 -> 80408 bytes 2 files changed, 628 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7521f7bee4bbaa11f63ee…

1 0

Vincent Povirk : gdiplus: Stub GdipGetLineBlendCount.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: 3d37b0a7fa4e8b1c0ce9b61bc4b52fbf79fa7bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d37b0a7fa4e8b1c0ce9b61bc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 28 17:01:38 2009 -0500 gdiplus: Stub GdipGetLineBlendCount. --- dlls/gdiplus/brush.c | 12 ++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index f0c9b20..f2054ad 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1084,6 +1084,18 @@ GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient *brush, return Ok; } +GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient *brush, INT *count) +{ + static int calls; + + TRACE("(%p, %p)\n", brush, count); + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient *line, BOOL usegamma) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2d5bc78..1955f3f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -301,7 +301,7 @@ @ stdcall GdipGetImageWidth(ptr ptr) @ stdcall GdipGetInterpolationMode(ptr ptr) @ stub GdipGetLineBlend -@ stub GdipGetLineBlendCount +@ stdcall GdipGetLineBlendCount(ptr ptr) @ stdcall GdipGetLineColors(ptr ptr) @ stdcall GdipGetLineGammaCorrection(ptr ptr) @ stub GdipGetLinePresetBlend

1 0

Vincent Povirk : gdiplus: Implement GdipSetLineBlend.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: 1f4940ae44105c029a75d25533c497c2c594c95d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4940ae44105c029a75d2553… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 28 18:25:59 2009 -0500 gdiplus: Implement GdipSetLineBlend. --- dlls/gdiplus/brush.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 9df52ad..eb0df03 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1115,15 +1115,35 @@ GpStatus WINGDIPAPI GdipScaleTextureTransform(GpTexture* brush, } GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient *brush, - GDIPCONST REAL *blend, GDIPCONST REAL* positions, INT count) + GDIPCONST REAL *factors, GDIPCONST REAL* positions, INT count) { - static int calls; + REAL *new_blendfac, *new_blendpos; - if(!brush || !blend || !positions || count <= 0) + TRACE("(%p, %p, %p, %i)\n", brush, factors, positions, count); + + if(!brush || !factors || !positions || count <= 0 || + (count >= 2 && (positions[0] != 0.0f || positions[count-1] != 1.0f))) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + new_blendfac = GdipAlloc(count * sizeof(REAL)); + new_blendpos = GdipAlloc(count * sizeof(REAL)); + + if (!new_blendfac || !new_blendpos) + { + GdipFree(new_blendfac); + GdipFree(new_blendpos); + return OutOfMemory; + } + + memcpy(new_blendfac, factors, count * sizeof(REAL)); + memcpy(new_blendpos, positions, count * sizeof(REAL)); + + GdipFree(brush->blendfac); + GdipFree(brush->blendpos); + + brush->blendcount = count; + brush->blendfac = new_blendfac; + brush->blendpos = new_blendpos; return Ok; }

1 0

Vincent Povirk : gdiplus: Stub GdipGetLineBlend.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: 1de792290bdf10f571826b16eaf16e83e016d274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1de792290bdf10f571826b16e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 28 17:28:22 2009 -0500 gdiplus: Stub GdipGetLineBlend. --- dlls/gdiplus/brush.c | 13 +++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index f2054ad..e22d5aa 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1084,6 +1084,19 @@ GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient *brush, return Ok; } +GpStatus WINGDIPAPI GdipGetLineBlend(GpLineGradient *brush, REAL *factors, + REAL *positions, INT count) +{ + static int calls; + + TRACE("(%p, %p, %p, %i)\n", brush, factors, positions, count); + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient *brush, INT *count) { static int calls; diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1955f3f..a9d4c9d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -300,7 +300,7 @@ @ stdcall GdipGetImageVerticalResolution(ptr ptr) @ stdcall GdipGetImageWidth(ptr ptr) @ stdcall GdipGetInterpolationMode(ptr ptr) -@ stub GdipGetLineBlend +@ stdcall GdipGetLineBlend(ptr ptr ptr long) @ stdcall GdipGetLineBlendCount(ptr ptr) @ stdcall GdipGetLineColors(ptr ptr) @ stdcall GdipGetLineGammaCorrection(ptr ptr)

1 0

Christian Costa : mciqtz32: Add support for MCI_SET.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: 51ad286d3708102c92ab046545f1d565ab9d5a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ad286d3708102c92ab04654… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Apr 28 23:18:29 2009 +0200 mciqtz32: Add support for MCI_SET. --- dlls/mciqtz32/mciqtz.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/mciqtz32/mciqtz_private.h | 1 + 2 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 659cbc4..8371227 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -404,6 +404,44 @@ static DWORD MCIQTZ_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_P } /*************************************************************************** + * MCIQTZ_mciSet [internal] + */ +static DWORD MCIQTZ_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + if (dwFlags & MCI_SET_TIME_FORMAT) { + switch (lpParms->dwTimeFormat) { + case MCI_FORMAT_MILLISECONDS: + TRACE("MCI_SET_TIME_FORMAT = MCI_FORMAT_MILLISECONDS\n"); + wma->time_format = MCI_FORMAT_MILLISECONDS; + break; + case MCI_FORMAT_FRAMES: + TRACE("MCI_SET_TIME_FORMAT = MCI_FORMAT_FRAMES\n"); + wma->time_format = MCI_FORMAT_FRAMES; + break; + default: + WARN("Bad time format %u\n", lpParms->dwTimeFormat); + return MCIERR_BAD_TIME_FORMAT; + } + } + + if (dwFlags & ~MCI_SET_TIME_FORMAT) + FIXME("Flags not supported yet %08lX\n", dwFlags & ~MCI_SET_TIME_FORMAT); + + return 0; +} + +/*************************************************************************** * MCIQTZ_mciStatus [internal] */ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpParms) @@ -602,10 +640,10 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); case MCI_STOP: return MCIQTZ_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_GETDEVCAPS: return MCIQTZ_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS) dwParam2); + case MCI_SET: return MCIQTZ_mciSet (dwDevID, dwParam1, (LPMCI_DGV_SET_PARMS) dwParam2); case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); case MCI_WHERE: return MCIQTZ_mciWhere (dwDevID, dwParam1, (LPMCI_DGV_RECT_PARMS) dwParam2); case MCI_RECORD: - case MCI_SET: case MCI_PAUSE: case MCI_RESUME: case MCI_INFO: diff --git a/dlls/mciqtz32/mciqtz_private.h b/dlls/mciqtz32/mciqtz_private.h index 23945a4..dcfcad0 100644 --- a/dlls/mciqtz32/mciqtz_private.h +++ b/dlls/mciqtz32/mciqtz_private.h @@ -31,6 +31,7 @@ typedef struct { IGraphBuilder* pgraph; IMediaControl* pmctrl; BOOL started; + DWORD time_format; } WINE_MCIQTZ; #endif /* __WINE_PRIVATE_MCIQTZ_H */

1 0

Hib Eris : msi: Fix LONGCHAR column data type.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 0a81fbfa391c84c5ce22bbb11e96c972822b8812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a81fbfa391c84c5ce22bbb11… Author: Hib Eris <Hib(a)hiberis.nl> Date: Sat Apr 25 21:38:06 2009 +0200 msi: Fix LONGCHAR column data type. --- dlls/msi/sql.y | 2 +- dlls/msi/tests/db.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 7bf8ce6..8f241b1 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -359,7 +359,7 @@ data_type: } | TK_LONGCHAR { - $$ = 2; + $$ = MSITYPE_STRING | 0x400; } | TK_SHORT { diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 16a7ba6..41f65f1 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1148,7 +1148,7 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 4, "I2"), "wrong record type\n"); ok( check_record( rec, 5, "I2"), "wrong record type\n"); ok( check_record( rec, 6, "I4"), "wrong record type\n"); - todo_wine ok( check_record( rec, 7, "S0"), "wrong record type\n"); + ok( check_record( rec, 7, "S0"), "wrong record type\n"); MsiCloseHandle( rec ); @@ -1159,7 +1159,7 @@ static void test_viewgetcolumninfo(void) ok( 0x1502 == get_columns_table_type(hdb, "Properties", 4 ), "_columns table wrong\n"); ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n"); ok( 0x1104 == get_columns_table_type(hdb, "Properties", 6 ), "_columns table wrong\n"); - todo_wine ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 7 ), "_columns table wrong\n"); + ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 7 ), "_columns table wrong\n"); /* now try the names */ rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES );

1 0

Huw Davies : oleaut32: Don't ask for a name if it's not required.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 08a9bf7db837b6091f6d255ca661a266985f539b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a9bf7db837b6091f6d255ca… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 28 12:41:01 2009 +0100 oleaut32: Don't ask for a name if it's not required. --- dlls/oleaut32/tmarshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 5e863b4..9d24174 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -213,7 +213,7 @@ _marshal_interface(marshal_state *buf, REFIID riid, LPUNKNOWN pUnk) { goto fail; } - hres = IStream_Stat(pStm,&ststg,0); + hres = IStream_Stat(pStm,&ststg,STATFLAG_NONAME); if (hres) { ERR("Stream stat failed\n"); goto fail;

1 0

Huw Davies : ole32: Don't ask for a name if it's not required.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 2e11733f452f2f36ef1eca2f2d4d890ee84169af URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e11733f452f2f36ef1eca2f2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 28 12:38:29 2009 +0100 ole32: Don't ask for a name if it's not required. --- dlls/ole32/memlockbytes.c | 2 +- dlls/ole32/rpc.c | 2 +- dlls/ole32/storage32.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c index 16763cb..57acf37 100644 --- a/dlls/ole32/memlockbytes.c +++ b/dlls/ole32/memlockbytes.c @@ -160,7 +160,7 @@ HRESULT WINAPI GetHGlobalFromILockBytes(ILockBytes* plkbyt, HGLOBAL* phglobal) return S_OK; } /* It is not our lockbytes implementation, so use a more generic way */ - hres = ILockBytes_Stat(plkbyt,&stbuf,0); + hres = ILockBytes_Stat(plkbyt,&stbuf,STATFLAG_NONAME); if (hres != S_OK) { ERR("Cannot ILockBytes_Stat, %x\n",hres); return hres; diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 1325063..9a34465 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1904,7 +1904,7 @@ static DWORD WINAPI local_server_thread(LPVOID param) TRACE("marshalling IClassFactory to client\n"); - hres = IStream_Stat(pStm,&ststg,0); + hres = IStream_Stat(pStm,&ststg,STATFLAG_NONAME); if (hres) return hres; seekto.u.LowPart = 0; diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 90328f0..748eac8 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -6310,7 +6310,7 @@ HRESULT WINAPI ReadClassStg(IStorage *pstg,CLSID *pclsid){ /* * read a STATSTG structure (contains the clsid) from the storage */ - hRes=IStorage_Stat(pstg,&pstatstg,STATFLAG_DEFAULT); + hRes=IStorage_Stat(pstg,&pstatstg,STATFLAG_NONAME); if(SUCCEEDED(hRes)) *pclsid=pstatstg.clsid;

1 0

Hib Eris : msi/tests: Test type for LONGCHAR columns.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 508028ae039b27d9f0b069b746b70996cd3d4c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=508028ae039b27d9f0b069b74… Author: Hib Eris <Hib(a)hiberis.nl> Date: Sat Apr 25 21:37:30 2009 +0200 msi/tests: Test type for LONGCHAR columns. --- dlls/msi/tests/db.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 0d9e3e3..16a7ba6 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1133,7 +1133,8 @@ static void test_viewgetcolumninfo(void) " `Intvalue` INT, " " `Integervalue` INTEGER, " " `Shortvalue` SHORT, " - " `Longvalue` LONG " + " `Longvalue` LONG, " + " `Longcharvalue` LONGCHAR " " PRIMARY KEY `Property`)" ); ok( r == ERROR_SUCCESS , "Failed to create table\n" ); @@ -1147,6 +1148,7 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 4, "I2"), "wrong record type\n"); ok( check_record( rec, 5, "I2"), "wrong record type\n"); ok( check_record( rec, 6, "I4"), "wrong record type\n"); + todo_wine ok( check_record( rec, 7, "S0"), "wrong record type\n"); MsiCloseHandle( rec ); @@ -1157,6 +1159,7 @@ static void test_viewgetcolumninfo(void) ok( 0x1502 == get_columns_table_type(hdb, "Properties", 4 ), "_columns table wrong\n"); ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n"); ok( 0x1104 == get_columns_table_type(hdb, "Properties", 6 ), "_columns table wrong\n"); + todo_wine ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 7 ), "_columns table wrong\n"); /* now try the names */ rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES ); @@ -1168,6 +1171,7 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 4, "Integervalue"), "wrong record type\n"); ok( check_record( rec, 5, "Shortvalue"), "wrong record type\n"); ok( check_record( rec, 6, "Longvalue"), "wrong record type\n"); + ok( check_record( rec, 7, "Longcharvalue"), "wrong record type\n"); MsiCloseHandle( rec );

1 0