July 2006 - Wine-Commits - list.winehq.org

Robert Shearman : oleaut32: Add validation for parameters in IPictureDisp:: Invoke.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 25aff05e4a0b2147a2b10088d186082aca51aace URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=25aff05e4a0b2147a2b1008… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 28 01:22:02 2006 +0100 oleaut32: Add validation for parameters in IPictureDisp::Invoke. Add some tests for IPictureDisp::Invoke. --- dlls/oleaut32/olepicture.c | 37 +++++++++++++++++++++ dlls/oleaut32/tests/olepicture.c | 66 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index a72919e..b2d9cf0 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2048,6 +2048,43 @@ static HRESULT WINAPI OLEPictureImpl_Inv UINT* puArgErr) { OLEPictureImpl *This = impl_from_IDispatch(iface); + + /* validate parameters */ + + if (!IsEqualIID(riid, &IID_NULL)) + { + ERR("riid was %s instead of IID_NULL\n", debugstr_guid(riid)); + return DISP_E_UNKNOWNNAME; + } + + if (!pDispParams) + { + ERR("null pDispParams not allowed\n"); + return DISP_E_PARAMNOTOPTIONAL; + } + + if (wFlags & DISPATCH_PROPERTYGET) + { + if (!pVarResult) + { + ERR("null pVarResult not allowed when DISPATCH_PROPERTYGET specified\n"); + return DISP_E_PARAMNOTOPTIONAL; + } + } + else if (wFlags & DISPATCH_PROPERTYPUT) + { + if (pDispParams->cArgs != 1) + { + ERR("param count for DISPATCH_PROPERTYPUT was %d instead of 1\n", pDispParams->cArgs); + return DISP_E_BADPARAMCOUNT; + } + } + else + { + ERR("one of DISPATCH_PROPERTYGET or DISPATCH_PROPERTYPUT must be specified\n"); + return DISP_E_MEMBERNOTFOUND; + } + if (dispIdMember == DISPID_PICT_TYPE) { TRACE("DISPID_PICT_TYPE\n"); diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index ada567a..b4a5697 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -44,6 +44,8 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pOleLoadPicture)(LPSTREAM,LONG,BOOL,REFIID,LPVOID*); +#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08lx\n", hr) + /* 1x1 pixel gif */ static const unsigned char gifimage[35] = { 0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x00,0xff,0xff,0xff, @@ -285,6 +287,68 @@ static void test_empty_image_2(void) { IPicture_Release (pic); } +static void test_Invoke(void) +{ + IPictureDisp *picdisp; + HRESULT hr; + VARIANTARG vararg; + DISPPARAMS dispparams; + VARIANT varresult; + IStream *stream; + HGLOBAL hglob; + void *data; + + hglob = GlobalAlloc (0, sizeof(gifimage)); + data = GlobalLock(hglob); + memcpy(data, gifimage, sizeof(gifimage)); + GlobalUnlock(hglob); + + hr = CreateStreamOnHGlobal (hglob, FALSE, &stream); + ok_ole_success(hr, "CreateStreamOnHGlobal"); + + hr = pOleLoadPicture(stream, sizeof(gifimage), TRUE, &IID_IPictureDisp, (void **)&picdisp); + IStream_Release(stream); + ok_ole_success(hr, "OleLoadPicture"); + + V_VT(&vararg) = VT_BOOL; + V_BOOL(&vararg) = VARIANT_FALSE; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.cArgs = 1; + dispparams.rgvarg = &vararg; + hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_HPAL, &IID_IPictureDisp, 0, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_UNKNOWNNAME, "IPictureDisp_Invoke should have returned DISP_E_UNKNOWNNAME instead of 0x%08lx\n", hr); + hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_HPAL, &IID_IUnknown, 0, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_UNKNOWNNAME, "IPictureDisp_Invoke should have returned DISP_E_UNKNOWNNAME instead of 0x%08lx\n", hr); + + dispparams.cArgs = 0; + dispparams.rgvarg = NULL; + hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_HPAL, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_BADPARAMCOUNT, "IPictureDisp_Invoke should have returned DISP_E_BADPARAMCOUNT instead of 0x%08lx\n", hr); + + hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_HPAL, &IID_NULL, 0, DISPATCH_PROPERTYPUT, NULL, NULL, NULL, NULL); + ok(hr == DISP_E_PARAMNOTOPTIONAL, "IPictureDisp_Invoke should have returned DISP_E_PARAMNOTOPTIONAL instead of 0x%08lx\n", hr); + + hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_HPAL, &IID_NULL, 0, DISPATCH_PROPERTYGET, NULL, NULL, NULL, NULL); + ok(hr == DISP_E_PARAMNOTOPTIONAL, "IPictureDisp_Invoke should have returned DISP_E_PARAMNOTOPTIONAL instead of 0x%08lx\n", hr); + + hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_HPAL, &IID_NULL, 0, DISPATCH_PROPERTYGET, NULL, &varresult, NULL, NULL); + ok(hr == DISP_E_PARAMNOTOPTIONAL, "IPictureDisp_Invoke should have returned DISP_E_PARAMNOTOPTIONAL instead of 0x%08lx\n", hr); + + hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_HPAL, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &varresult, NULL, NULL); + ok_ole_success(hr, "IPictureDisp_Invoke"); + + hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_HPAL, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &varresult, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "IPictureDisp_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr); + + hr = IPictureDisp_Invoke(picdisp, 0xdeadbeef, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &varresult, NULL, NULL); + todo_wine { + ok(hr == DISP_E_MEMBERNOTFOUND, "IPictureDisp_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr); + } + + IPictureDisp_Release(picdisp); +} + START_TEST(olepicture) { hOleaut32 = LoadLibraryA("oleaut32.dll"); @@ -302,6 +366,8 @@ START_TEST(olepicture) */ test_empty_image(); test_empty_image_2(); + + test_Invoke(); }

1 0

Robert Shearman : oleaut32: Fix the return code for an invalid dispid in IFontDisp::Invoke.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 18732f85f91a2913e1af22b55f970056215d3a46 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18732f85f91a2913e1af22b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 28 01:21:28 2006 +0100 oleaut32: Fix the return code for an invalid dispid in IFontDisp::Invoke. --- dlls/oleaut32/olefont.c | 12 +++++++----- dlls/oleaut32/tests/olefont.c | 6 ++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 07bfa34..880e740 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1402,6 +1402,10 @@ static HRESULT WINAPI OLEFontImpl_Invoke OLEFontImpl *this = impl_from_IDispatch(iface); HRESULT hr; + TRACE("%p->(%ld,%s,0x%lx,0x%x,%p,%p,%p,%p)\n", this, dispIdMember, + debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, + puArgErr); + /* validate parameters */ if (!IsEqualIID(riid, &IID_NULL)) @@ -1600,12 +1604,10 @@ static HRESULT WINAPI OLEFontImpl_Invoke return hr; } break; + default: + ERR("member not found for dispid 0x%lx\n", dispIdMember); + return DISP_E_MEMBERNOTFOUND; } - FIXME("%p->(%ld,%s,%lx,%x,%p,%p,%p,%p), unhandled dispid/flag!\n", - this,dispIdMember,debugstr_guid(riid),lcid, - wFlags,pDispParams,pVarResult,pExepInfo,puArgErr - ); - return S_OK; } /************************************************************************ diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 9aea60d..e98e84c 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -459,6 +459,12 @@ static void test_Invoke(void) hr = IFontDisp_Invoke(fontdisp, DISPID_FONT_BOLD, &IID_NULL, 0, DISPATCH_PROPERTYGET, NULL, &varresult, NULL, NULL); ok_ole_success(hr, "IFontDisp_Invoke"); + hr = IFontDisp_Invoke(fontdisp, DISPID_FONT_BOLD, &IID_NULL, 0, DISPATCH_METHOD, NULL, &varresult, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "IFontDisp_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr); + + hr = IFontDisp_Invoke(fontdisp, 0xdeadbeef, &IID_NULL, 0, DISPATCH_PROPERTYGET, NULL, &varresult, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "IFontDisp_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr); + IFontDisp_Release(fontdisp); }

1 0

Robert Shearman : oleaut32: Add a successful test for IFontDisp::Invoke.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: fd48f795ff3ad9c4fa7cef6e9980454b297b5289 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fd48f795ff3ad9c4fa7cef6… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 28 01:20:52 2006 +0100 oleaut32: Add a successful test for IFontDisp::Invoke. --- dlls/oleaut32/tests/olefont.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 423cb4d..9aea60d 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -431,12 +431,13 @@ static void test_Invoke(void) HRESULT hr; VARIANTARG vararg; DISPPARAMS dispparams; + VARIANT varresult; hr = pOleCreateFontIndirect(NULL, &IID_IFontDisp, (void **)&fontdisp); - ok_ole_success(hr, "OleCreateFontIndirect\n"); + ok_ole_success(hr, "OleCreateFontIndirect"); V_VT(&vararg) = VT_BOOL; - V_BOOL(&vararg) = FALSE; + V_BOOL(&vararg) = VARIANT_FALSE; dispparams.cNamedArgs = 0; dispparams.rgdispidNamedArgs = NULL; dispparams.cArgs = 1; @@ -455,6 +456,9 @@ static void test_Invoke(void) hr = IFontDisp_Invoke(fontdisp, DISPID_FONT_BOLD, &IID_NULL, 0, DISPATCH_PROPERTYGET, NULL, NULL, NULL, NULL); ok(hr == DISP_E_PARAMNOTOPTIONAL, "IFontDisp_Invoke should have returned DISP_E_PARAMNOTOPTIONAL instead of 0x%08lx\n", hr); + hr = IFontDisp_Invoke(fontdisp, DISPID_FONT_BOLD, &IID_NULL, 0, DISPATCH_PROPERTYGET, NULL, &varresult, NULL, NULL); + ok_ole_success(hr, "IFontDisp_Invoke"); + IFontDisp_Release(fontdisp); }

1 0

Robert Shearman : oleaut32: Handle the Weight property in IFontDisp::Invoke .
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: c2afb5cbfb0893697a4c910fe4c5d21a089245e9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c2afb5cbfb0893697a4c910… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 28 01:20:17 2006 +0100 oleaut32: Handle the Weight property in IFontDisp::Invoke. --- dlls/oleaut32/olefont.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 87848c6..07bfa34 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1562,6 +1562,25 @@ static HRESULT WINAPI OLEFontImpl_Invoke return hr; } break; + case DISPID_FONT_WEIGHT: + if (wFlags & DISPATCH_PROPERTYGET) { + V_VT(pVarResult) = VT_I2; + return OLEFontImpl_get_Weight((IFont *)this, &V_I2(pVarResult)); + } else { + VARIANTARG vararg; + HRESULT hr; + + VariantInit(&vararg); + hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_I2); + if (FAILED(hr)) + return hr; + + hr = IFont_put_Weight((IFont *)this, V_I2(&vararg)); + + VariantClear(&vararg); + return hr; + } + break; case DISPID_FONT_CHARSET: if (wFlags & DISPATCH_PROPERTYGET) { V_VT(pVarResult) = VT_I2;

1 0

Juan Lang : secur32: Improve schannel's AcquireCredentialsHandle, with tests.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 866969ed2ba3afd1f7db35da2964892b898f9c4e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=866969ed2ba3afd1f7db35d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Jul 27 23:39:56 2006 -0700 secur32: Improve schannel's AcquireCredentialsHandle, with tests. --- dlls/secur32/Makefile.in | 1 dlls/secur32/schannel.c | 118 +++++++++++++-- dlls/secur32/tests/Makefile.in | 5 - dlls/secur32/tests/schannel.c | 318 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 422 insertions(+), 20 deletions(-) create mode 100644 dlls/secur32/tests/schannel.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=866969ed2ba3afd1f7d…

1 0

Juan Lang : sspi.h: Add missing define.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: e53ac1df9400064ec6c333da49dbb2081178feb0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e53ac1df9400064ec6c333d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Jul 27 23:40:42 2006 -0700 sspi.h: Add missing define. --- include/sspi.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/sspi.h b/include/sspi.h index 1644718..74050b5 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -231,6 +231,8 @@ typedef SECURITY_STATUS (SEC_ENTRY *FREE SECURITY_STATUS SEC_ENTRY FreeCredentialsHandle(PCredHandle phCredential); +#define FreeCredentialHandle FreeCredentialsHandle + typedef SECURITY_STATUS (SEC_ENTRY *FREE_CREDENTIALS_HANDLE_FN)(PCredHandle); SECURITY_STATUS SEC_ENTRY InitializeSecurityContextA(

1 0

James Hawkins : msi: Add tests for MsiDatabaseImport.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 05bd17b8b7e27b555c4c6c21158da659aef08ca9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=05bd17b8b7e27b555c4c6c2… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 27 18:42:53 2006 -0700 msi: Add tests for MsiDatabaseImport. --- dlls/msi/tests/db.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 132 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index baf5635..4bf8871 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1044,6 +1044,137 @@ static void test_where(void) DeleteFile(msifile); } +static CHAR CURR_DIR[MAX_PATH]; + +static const CHAR test_data[] = "FirstPrimaryColumn\tSecondPrimaryColumn\tShortInt\tShortIntNullable\tLongInt\tLongIntNullable\tString\tLocalizableString\tLocalizableStringNullable\n" + "s255\ti2\ti2\tI2\ti4\tI4\tS255\tS0\ts0\n" + "TestTable\tFirstPrimaryColumn\n" + "stringage\t5\t2\t\t2147483640\t-2147483640\tanother string\tlocalizable\tduh\n"; + +static void write_file(const CHAR *filename, const char *data, int data_size) +{ + DWORD size; + + HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + WriteFile(hf, data, data_size, &size, NULL); + CloseHandle(hf); +} + +static UINT add_table_to_db(MSIHANDLE hdb, LPCSTR table_data) +{ + UINT r; + + write_file("temp_file", table_data, (lstrlen(table_data) - 1) * sizeof(char)); + r = MsiDatabaseImportA(hdb, CURR_DIR, "temp_file"); + DeleteFileA("temp_file"); + + return r; +} + +static void test_msiimport(void) +{ + MSIHANDLE hdb, view, rec; + LPSTR query; + UINT r, count; + signed int i; + + GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + + r = MsiOpenDatabaseA(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_table_to_db(hdb, test_data); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + } + + query = "SELECT * FROM `TestTable`"; + r = MsiDatabaseOpenView(hdb, query, &view); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + } + + r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); + count = MsiRecordGetFieldCount(rec); + todo_wine + { + ok(count == 9, "Expected 9, got %d\n", count); + ok(check_record(rec, 1, "FirstPrimaryColumn"), "Expected FirstPrimaryColumn\n"); + ok(check_record(rec, 2, "SecondPrimaryColumn"), "Expected SecondPrimaryColumn\n"); + ok(check_record(rec, 3, "ShortInt"), "Expected ShortInt\n"); + ok(check_record(rec, 4, "ShortIntNullable"), "Expected ShortIntNullalble\n"); + ok(check_record(rec, 5, "LongInt"), "Expected LongInt\n"); + ok(check_record(rec, 6, "LongIntNullable"), "Expected LongIntNullalble\n"); + ok(check_record(rec, 7, "String"), "Expected String\n"); + ok(check_record(rec, 8, "LocalizableString"), "Expected LocalizableString\n"); + ok(check_record(rec, 9, "LocalizableStringNullable"), "Expected LocalizableStringNullable\n"); + } + + r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); + count = MsiRecordGetFieldCount(rec); + todo_wine + { + ok(count == 9, "Expected 9, got %d\n", count); + ok(check_record(rec, 1, "s255"), "Expected s255\n"); + ok(check_record(rec, 2, "i2"), "Expected i2\n"); + ok(check_record(rec, 3, "i2"), "Expected i2\n"); + ok(check_record(rec, 4, "I2"), "Expected I2\n"); + ok(check_record(rec, 5, "i4"), "Expected i4\n"); + ok(check_record(rec, 6, "I4"), "Expected I4\n"); + ok(check_record(rec, 7, "S255"), "Expected S255\n"); + ok(check_record(rec, 8, "S0"), "Expected S0\n"); + ok(check_record(rec, 9, "s0"), "Expected s0\n"); + } + + query = "SELECT * FROM `TestTable`"; + r = do_query(hdb, query, &rec); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + } + + todo_wine + { + ok(check_record(rec, 1, "stringage"), "Expected 'stringage'\n"); + ok(check_record(rec, 7, "another string"), "Expected 'another string'\n"); + ok(check_record(rec, 8, "localizable"), "Expected 'localizable'\n"); + ok(check_record(rec, 9, "duh"), "Expected 'duh'\n"); + } + + i = MsiRecordGetInteger(rec, 2); + todo_wine + { + ok(i == 5, "Expected 5, got %d\n", i); + } + + i = MsiRecordGetInteger(rec, 3); + todo_wine + { + ok(i == 2, "Expected 2, got %d\n", i); + } + + i = MsiRecordGetInteger(rec, 4); + ok(i == 0x80000000, "Expected 0x80000000, got %d\n", i); + + i = MsiRecordGetInteger(rec, 5); + todo_wine + { + ok(i == 2147483640, "Expected 2147483640, got %d\n", i); + } + + i = MsiRecordGetInteger(rec, 6); + todo_wine + { + ok(i == -2147483640, "Expected -2147483640, got %d\n", i); + } + + DeleteFileA(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -1057,4 +1188,5 @@ START_TEST(db) test_longstrings(); test_streamtable(); test_where(); + test_msiimport(); }

1 0

Jacek Caban : mshtml.idl: Fix SAFEARRAY argument declaration.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 8298444f6b30e12b5e3aece38cddc48b0cdd2c29 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8298444f6b30e12b5e3aece… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 27 20:49:57 2006 +0200 mshtml.idl: Fix SAFEARRAY argument declaration. --- include/mshtml.idl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 215652f..ce304c2 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -4637,10 +4637,10 @@ interface IHTMLDocument2 : IHTMLDocument HRESULT nameProp([retval, out] BSTR *p); [vararg, id(DISPID_IHTMLDOCUMENT2_WRITE)] - HRESULT write([in] SAFEARRAY *psarray); + HRESULT write([in] SAFEARRAY(VARIANT) psarray); [vararg, id(DISPID_IHTMLDOCUMENT2_WRITELN)] - HRESULT writeln([in] SAFEARRAY *psarray); + HRESULT writeln([in] SAFEARRAY(VARIANT) psarray); [id(DISPID_IHTMLDOCUMENT2_OPEN)] HRESULT open(

1 0

Jacek Caban : widl: Reorder segments to match midl.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 37cf4a526064021ad60d08c15efab2f83e22b637 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=37cf4a526064021ad60d08c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 27 20:43:56 2006 +0200 widl: Reorder segments to match midl. --- tools/widl/write_msft.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index f5c1e2e..bc28345 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2451,9 +2451,9 @@ static int save_all_changes(msft_typelib filepos += ctl2_finalize_segment(typelib, filepos, MSFT_SEG_TYPEINFO); filepos += ctl2_finalize_segment(typelib, filepos, MSFT_SEG_GUIDHASH); filepos += ctl2_finalize_segment(typelib, filepos, MSFT_SEG_GUID); + filepos += ctl2_finalize_segment(typelib, filepos, MSFT_SEG_REFERENCES); filepos += ctl2_finalize_segment(typelib, filepos, MSFT_SEG_IMPORTINFO); filepos += ctl2_finalize_segment(typelib, filepos, MSFT_SEG_IMPORTFILES); - filepos += ctl2_finalize_segment(typelib, filepos, MSFT_SEG_REFERENCES); filepos += ctl2_finalize_segment(typelib, filepos, MSFT_SEG_NAMEHASH); filepos += ctl2_finalize_segment(typelib, filepos, MSFT_SEG_NAME); filepos += ctl2_finalize_segment(typelib, filepos, MSFT_SEG_STRING); @@ -2474,9 +2474,9 @@ static int save_all_changes(msft_typelib if (!ctl2_write_segment(typelib, fd, MSFT_SEG_TYPEINFO )) return retval; if (!ctl2_write_segment(typelib, fd, MSFT_SEG_GUIDHASH )) return retval; if (!ctl2_write_segment(typelib, fd, MSFT_SEG_GUID )) return retval; + if (!ctl2_write_segment(typelib, fd, MSFT_SEG_REFERENCES )) return retval; if (!ctl2_write_segment(typelib, fd, MSFT_SEG_IMPORTINFO )) return retval; if (!ctl2_write_segment(typelib, fd, MSFT_SEG_IMPORTFILES )) return retval; - if (!ctl2_write_segment(typelib, fd, MSFT_SEG_REFERENCES )) return retval; if (!ctl2_write_segment(typelib, fd, MSFT_SEG_NAMEHASH )) return retval; if (!ctl2_write_segment(typelib, fd, MSFT_SEG_NAME )) return retval; if (!ctl2_write_segment(typelib, fd, MSFT_SEG_STRING )) return retval;

1 0

Jacek Caban : widl: Use cval in ATTR_ID.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: c9a08007eb576cb695472e542147f7c1564800dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c9a08007eb576cb695472e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 27 20:43:03 2006 +0200 widl: Use cval in ATTR_ID. --- tools/widl/write_msft.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 67733b0..f5c1e2e 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1324,7 +1324,7 @@ static HRESULT add_func_desc(msft_typein funcflags |= 0x40; /* FUNCFLAG_FHIDDEN */ break; case ATTR_ID: - id = expr->u.lval; + id = expr->cval; break; case ATTR_OUT: break; @@ -1577,7 +1577,7 @@ static HRESULT add_var_desc(msft_typeinf varflags |= 0x40; /* VARFLAG_FHIDDEN */ break; case ATTR_ID: - id = expr->u.lval; + id = expr->cval; break; case ATTR_READONLY: varflags |= 0x01; /* VARFLAG_FREADONLY */

1 0