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

James Hawkins : msi: Test the column types of MSI packages.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: 75c866ed58c5fcab66dc826249bb6f096bcb8608 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=75c866ed58c5fcab66dc826… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 26 14:53:09 2006 -0700 msi: Test the column types of MSI packages. --- dlls/msi/tests/install.c | 69 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 8792629..609fafa 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -126,7 +126,7 @@ static const CHAR install_exec_seq_dat[] "WriteRegistryValues\t\t5000"; static const CHAR media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" - "i2\ti2\tL64\tS255\tS32\tS72\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" "Media\tDiskId\n" "1\t3\t\t\tDISK1\t\n" "2\t5\t\tmsitest.cab\tDISK2\t\n"; @@ -316,6 +316,17 @@ static int fci_delete(char *pszFile, int return 0; } +static BOOL check_record(MSIHANDLE rec, UINT field, LPSTR val) +{ + CHAR buffer[0x20]; + UINT r; + DWORD sz; + + sz = sizeof buffer; + r = MsiRecordGetString(rec, field, buffer, &sz); + return (r == ERROR_SUCCESS ) && !strcmp(val, buffer); +} + static BOOL get_temp_file(char *pszTempName, int cbTempName, void *pv) { LPSTR tempname; @@ -679,6 +690,61 @@ static void test_MsiSetComponentState(vo CoUninitialize(); } +static void test_packagecoltypes(void) +{ + MSIHANDLE hdb, view, rec; + char path[MAX_PATH]; + LPSTR query; + UINT r, count; + + CoInitialize(NULL); + + lstrcpy(path, CURR_DIR); + lstrcat(path, "\\"); + lstrcat(path, msifile); + + r = MsiOpenDatabase(path, MSIDBOPEN_READONLY, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + query = "SELECT * FROM `Media`"; + r = MsiDatabaseOpenView( hdb, query, &view ); + todo_wine + { + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + } + + r = MsiViewGetColumnInfo( view, MSICOLINFO_NAMES, &rec ); + count = MsiRecordGetFieldCount( rec ); + todo_wine + { + ok(r == ERROR_SUCCESS, "MsiViewGetColumnInfo failed\n"); + ok(count == 6, "Expected 6, got %d\n", count); + ok(check_record(rec, 1, "DiskId"), "wrong column label\n"); + ok(check_record(rec, 2, "LastSequence"), "wrong column label\n"); + ok(check_record(rec, 3, "DiskPrompt"), "wrong column label\n"); + ok(check_record(rec, 4, "Cabinet"), "wrong column label\n"); + ok(check_record(rec, 5, "VolumeLabel"), "wrong column label\n"); + ok(check_record(rec, 6, "Source"), "wrong column label\n"); + } + + r = MsiViewGetColumnInfo( view, MSICOLINFO_TYPES, &rec ); + count = MsiRecordGetFieldCount( rec ); + todo_wine + { + ok(r == ERROR_SUCCESS, "MsiViewGetColumnInfo failed\n"); + ok(count == 6, "Expected 6, got %d\n", count); + ok(check_record(rec, 1, "i2"), "wrong column label\n"); + ok(check_record(rec, 2, "i4"), "wrong column label\n"); + ok(check_record(rec, 3, "L64"), "wrong column label\n"); + ok(check_record(rec, 4, "S255"), "wrong column label\n"); + ok(check_record(rec, 5, "S32"), "wrong column label\n"); + ok(check_record(rec, 6, "S72"), "wrong column label\n"); + } + + MsiCloseHandle(hdb); + DeleteFile(msifile); +} + START_TEST(install) { if (!init_function_pointers()) @@ -689,6 +755,7 @@ START_TEST(install) test_MsiInstallProduct(); test_MsiSetComponentState(); + test_packagecoltypes(); delete_test_files(); }

1 0

Mike McCormack : msi: Use msi_alloc/free, not HeapAlloc/Free.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: f3dae17cbbac0cfd4d088a0778387808bfdfec72 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f3dae17cbbac0cfd4d088a0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jul 27 11:05:45 2006 +0900 msi: Use msi_alloc/free, not HeapAlloc/Free. --- dlls/msi/appsearch.c | 3 +-- dlls/msi/msi.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 2e317c1..b47ecec 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -912,8 +912,7 @@ static UINT ACTION_AppSearchDr(MSIPACKAG msi_free(path); if (parent) { - path = HeapAlloc(GetProcessHeap(), 0, strlenW(parent) + - strlenW(expanded) + 1); + path = msi_alloc(strlenW(parent) + strlenW(expanded) + 1); if (!path) goto end; strcpyW(path, parent); diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 5ef72bd..8c9139d 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -531,7 +531,7 @@ UINT WINAPI MSI_GetProductInfo(LPCWSTR s r = msi_strcpy_to_awstring( val, szValue, pcchValueBuf ); - HeapFree(GetProcessHeap(), 0, val); + msi_free(val); return r; }

1 0

James Hawkins : msi: Test the states of a component with a compressed file.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: 59a706bc2b60dcd74d528405194228d41383ed59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=59a706bc2b60dcd74d52840… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 26 14:53:02 2006 -0700 msi: Test the states of a component with a compressed file. --- dlls/msi/tests/package.c | 153 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 147 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=59a706bc2b60dcd74d5…

1 0

Roderick Colenbrander : dinput8: Better DirectInput8Create warning.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: 727ed6eae66795f12b8bd2e188fab7180a025b7c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=727ed6eae66795f12b8bd2e… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Jul 26 21:42:16 2006 +0200 dinput8: Better DirectInput8Create warning. --- dlls/dinput8/dinput8_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index 95aa919..f06e2a4 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -66,7 +66,7 @@ HRESULT WINAPI DirectInput8Create(HINSTA hr = CoCreateInstance( &CLSID_DirectInput8, punkOuter, CLSCTX_INPROC_SERVER, riid, ppDI); if(FAILED(hr)) { - ERR("CoCreateInstance failed with hr = %ld\n", hr); + ERR("CoCreateInstance failed with hr = %ld; Try running wineprefixcreate to fix it.\n", hr); return DIERR_INVALIDPARAM; }

1 0

Robert Shearman : oleaut32: Add validation of some more parameters in IFontDisp::Invoke.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: bbdcccd3b75eef9ee13f8ce7e4fe296d4808d416 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bbdcccd3b75eef9ee13f8ce… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jul 26 15:02:04 2006 +0100 oleaut32: Add validation of some more parameters in IFontDisp::Invoke. --- dlls/oleaut32/olefont.c | 35 +++++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/olefont.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 01dd14e..af18428 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1402,6 +1402,41 @@ static HRESULT WINAPI OLEFontImpl_Invoke OLEFontImpl *this = impl_from_IDispatch(iface); HRESULT hr; + /* validate parameters */ + + if (!IsEqualIID(riid, &IID_NULL)) + { + ERR("riid was %s instead of IID_NULL\n", debugstr_guid(riid)); + return DISP_E_UNKNOWNINTERFACE; + } + + 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) + { + ERR("null pDispParams not allowed when DISPATCH_PROPERTYPUT specified\n"); + return DISP_E_PARAMNOTOPTIONAL; + } + if (pDispParams->cArgs != 1) + { + ERR("param count for DISPATCH_PROPERTYPUT was %ld 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; + } + switch (dispIdMember) { case DISPID_FONT_NAME: if (wFlags & DISPATCH_PROPERTYGET) { diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 1640f79..423cb4d 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -425,6 +425,39 @@ void test_GetIDsOfNames(void) DISPID_FONT_NAME, 0, S_OK,1); } +static void test_Invoke(void) +{ + IFontDisp *fontdisp; + HRESULT hr; + VARIANTARG vararg; + DISPPARAMS dispparams; + + hr = pOleCreateFontIndirect(NULL, &IID_IFontDisp, (void **)&fontdisp); + ok_ole_success(hr, "OleCreateFontIndirect\n"); + + V_VT(&vararg) = VT_BOOL; + V_BOOL(&vararg) = FALSE; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.cArgs = 1; + dispparams.rgvarg = &vararg; + hr = IFontDisp_Invoke(fontdisp, DISPID_FONT_BOLD, &IID_IFontDisp, 0, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_UNKNOWNINTERFACE, "IFontDisp_Invoke should have returned DISP_E_UNKNOWNINTERFACE instead of 0x%08lx\n", hr); + + dispparams.cArgs = 0; + dispparams.rgvarg = NULL; + hr = IFontDisp_Invoke(fontdisp, DISPID_FONT_BOLD, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_BADPARAMCOUNT, "IFontDisp_Invoke should have returned DISP_E_BADPARAMCOUNT instead of 0x%08lx\n", hr); + + hr = IFontDisp_Invoke(fontdisp, DISPID_FONT_BOLD, &IID_NULL, 0, DISPATCH_PROPERTYPUT, 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, NULL, NULL, NULL); + ok(hr == DISP_E_PARAMNOTOPTIONAL, "IFontDisp_Invoke should have returned DISP_E_PARAMNOTOPTIONAL instead of 0x%08lx\n", hr); + + IFontDisp_Release(fontdisp); +} + START_TEST(olefont) { hOleaut32 = LoadLibraryA("oleaut32.dll"); @@ -447,4 +480,5 @@ START_TEST(olefont) test_font_events_disp(); test_GetIDsOfNames(); + test_Invoke(); }

1 0

Jacek Caban : shlwapi: Change '/'->'\' only for file protocol in UrlCanonicalize.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: fddd703b38675e9e8bffd21f8c5a48ca76e35fc3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fddd703b38675e9e8bffd21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 26 20:55:56 2006 +0200 shlwapi: Change '/'->'\' only for file protocol in UrlCanonicalize. --- dlls/shlwapi/tests/path.c | 2 ++ dlls/shlwapi/url.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 1124b2a..abb13ce 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -75,6 +75,8 @@ const TEST_URL_CANONICALIZE TEST_CANONIC {"file:///c://tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\\\tests\\foo bar"}, {"file:///c:\\tests\\foo bar", 0, S_OK, "file:///c:/tests/foo bar"}, {"file:///c:\\tests\\foo bar", URL_DONT_SIMPLIFY, S_OK, "file:///c:/tests/foo bar"}, + {"http://www.winehq.org/site/about", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org/site/about"}, + {"file_://www.winehq.org/site/about", URL_FILE_USE_PATHURL, S_OK, "file_://www.winehq.org/site/about"}, }; typedef struct _TEST_URL_ESCAPE { diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 4710e75..47334f6 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -330,7 +330,9 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR LPWSTR lpszUrlCpy, wk1, wk2, mp, mp2, root; INT nByteLen, state; DWORD nLen, nWkLen; - WCHAR slash = dwFlags & URL_FILE_USE_PATHURL ? '\\' : '/'; + WCHAR slash = '/'; + + static const WCHAR wszFile[] = {'f','i','l','e',':'}; TRACE("(%s %p %p 0x%08lx)\n", debugstr_w(pszUrl), pszCanonicalized, pcchCanonicalized, dwFlags); @@ -341,6 +343,10 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR nByteLen = (lstrlenW(pszUrl) + 1) * sizeof(WCHAR); /* length in bytes */ lpszUrlCpy = HeapAlloc(GetProcessHeap(), 0, nByteLen); + if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile) + && !memcmp(wszFile, pszUrl, sizeof(wszFile))) + slash = '\\'; + /* * state = * 0 initial 1,3

1 0

James Hawkins : msi: Fix a typo.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: 5842af1b951d5deb552130ea27da95e8f816a44e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5842af1b951d5deb552130e… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 26 14:52:56 2006 -0700 msi: Fix a typo. --- dlls/msi/table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 810cbb8..39dfc4e 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -477,7 +477,7 @@ static MSITABLE *read_table_from_storage goto err; /* transpose all the data */ - TRACE("Transposing data from %d columns\n", t->row_count ); + TRACE("Transposing data from %d rows\n", t->row_count ); for( i=0; i<t->row_count; i++ ) { t->data[i] = msi_alloc( row_size );

1 0

Jacek Caban : mshtml: Fix handling res URLs with full path and number resource ID.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: ae154d44e9b2a8aa55b57a6db102a306f9b9ab6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae154d44e9b2a8aa55b57a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 26 20:55:35 2006 +0200 mshtml: Fix handling res URLs with full path and number resource ID. --- dlls/mshtml/protocol.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 6717500..05b4388 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -588,7 +588,7 @@ static HRESULT WINAPI ResProtocol_Start( } url_dll = url + sizeof(wszRes)/sizeof(wszRes[0]); - if(!(url_file = strchrW(url_dll, '/'))) { + if(!(url_file = strrchrW(url_dll, '/'))) { WARN("wrong url: %s\n", debugstr_w(url)); IInternetProtocolSink_ReportResult(pOIProtSink, MK_E_SYNTAX, 0, NULL); mshtml_free(url); @@ -605,10 +605,18 @@ static HRESULT WINAPI ResProtocol_Start( src = FindResourceW(hdll, url_file, (LPCWSTR)RT_HTML); if(!src) { - WARN("Could not find resource\n"); - IInternetProtocolSink_ReportResult(pOIProtSink, HRESULT_FROM_WIN32(GetLastError()), 0, NULL); - mshtml_free(url); - return HRESULT_FROM_WIN32(GetLastError()); + LPWSTR endpoint = NULL; + DWORD file_id = strtolW(url_file, &endpoint, 10); + if(endpoint == url_file+strlenW(url_file)) + src = FindResourceW(hdll, (LPCWSTR)file_id, (LPCWSTR)RT_HTML); + + if(!src) { + WARN("Could not find resource\n"); + IInternetProtocolSink_ReportResult(pOIProtSink, + HRESULT_FROM_WIN32(GetLastError()), 0, NULL); + mshtml_free(url); + return HRESULT_FROM_WIN32(GetLastError()); + } } if(This->data) {

1 0

Robert Shearman : ole32: Add more self-registration entries for classes and interfaces.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: 67ed752e6905e3ae0c3717d5983ac29af2feb53f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=67ed752e6905e3ae0c3717d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jul 26 15:01:51 2006 +0100 ole32: Add more self-registration entries for classes and interfaces. --- dlls/ole32/regsvr.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c index 9a613a6..1b141ca 100644 --- a/dlls/ole32/regsvr.c +++ b/dlls/ole32/regsvr.c @@ -400,13 +400,25 @@ static LONG recursive_delete_key(HKEY ke /*********************************************************************** * coclass list */ +static GUID const CLSID_StdOleLink = { + 0x00000300, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; + static GUID const CLSID_PointerMoniker = { 0x00000306, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; static GUID const CLSID_PackagerMoniker = { 0x00000308, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; +extern GUID const CLSID_Picture_Metafile; +extern GUID const CLSID_Picture_Dib; + static struct regsvr_coclass const coclass_list[] = { + { &CLSID_StdOleLink, + "StdOleLink", + NULL, + "ole32.dll", + NULL + }, { &CLSID_FileMoniker, "FileMoniker", NULL, @@ -449,6 +461,18 @@ static struct regsvr_coclass const cocla "ole32.dll", "Both" }, + { &CLSID_Picture_Metafile, + "Picture (Metafile)", + NULL, + "ole32.dll", + NULL + }, + { &CLSID_Picture_Dib, + "Picture (Device Independent Bitmap)", + NULL, + "ole32.dll", + NULL + }, { &CLSID_ClassMoniker, "ClassMoniker", NULL, @@ -483,21 +507,54 @@ static const struct regsvr_interface int STD_INTERFACE_ENTRY(IClassFactory), LCL_INTERFACE_ENTRY(IMalloc), LCL_INTERFACE_ENTRY(IMarshal), + STD_INTERFACE_ENTRY(ILockBytes), STD_INTERFACE_ENTRY(IStorage), + STD_INTERFACE_ENTRY(IStream), + STD_INTERFACE_ENTRY(IEnumSTATSTG), + STD_INTERFACE_ENTRY(IBindCtx), + STD_INTERFACE_ENTRY(IMoniker), + STD_INTERFACE_ENTRY(IRunningObjectTable), + STD_INTERFACE_ENTRY(IRootStorage), LCL_INTERFACE_ENTRY(IMessageFilter), LCL_INTERFACE_ENTRY(IStdMarshalInfo), LCL_INTERFACE_ENTRY(IExternalConnection), LCL_INTERFACE_ENTRY(IMallocSpy), LCL_INTERFACE_ENTRY(IMultiQI), - STD_INTERFACE_ENTRY(IStream), + STD_INTERFACE_ENTRY(IEnumUnknown), + STD_INTERFACE_ENTRY(IEnumString), + STD_INTERFACE_ENTRY(IEnumMoniker), + STD_INTERFACE_ENTRY(IEnumFORMATETC), + STD_INTERFACE_ENTRY(IEnumOLEVERB), + STD_INTERFACE_ENTRY(IEnumSTATDATA), + STD_INTERFACE_ENTRY(IPersistStream), STD_INTERFACE_ENTRY(IPersistStorage), + STD_INTERFACE_ENTRY(IPersistFile), + STD_INTERFACE_ENTRY(IPersist), + STD_INTERFACE_ENTRY(IViewObject), STD_INTERFACE_ENTRY(IDataObject), STD_INTERFACE_ENTRY(IAdviseSink), LCL_INTERFACE_ENTRY(IDataAdviseHolder), LCL_INTERFACE_ENTRY(IOleAdviseHolder), STD_INTERFACE_ENTRY(IOleObject), + STD_INTERFACE_ENTRY(IOleInPlaceObject), + STD_INTERFACE_ENTRY(IOleWindow), + STD_INTERFACE_ENTRY(IOleInPlaceUIWindow), + STD_INTERFACE_ENTRY(IOleInPlaceFrame), + STD_INTERFACE_ENTRY(IOleInPlaceActiveObject), STD_INTERFACE_ENTRY(IOleClientSite), + STD_INTERFACE_ENTRY(IOleInPlaceSite), + STD_INTERFACE_ENTRY(IParseDisplayName), + STD_INTERFACE_ENTRY(IOleContainer), + STD_INTERFACE_ENTRY(IOleItemContainer), + STD_INTERFACE_ENTRY(IOleLink), + STD_INTERFACE_ENTRY(IOleCache), LCL_INTERFACE_ENTRY(IDropSource), + STD_INTERFACE_ENTRY(IDropTarget), + STD_INTERFACE_ENTRY(IAdviseSink2), + STD_INTERFACE_ENTRY(IRunnableObject), + STD_INTERFACE_ENTRY(IViewObject2), + STD_INTERFACE_ENTRY(IOleCache2), + STD_INTERFACE_ENTRY(IOleCacheControl), STD_INTERFACE_ENTRY(IRemUnknown), LCL_INTERFACE_ENTRY(IClientSecurity), LCL_INTERFACE_ENTRY(IServerSecurity),

1 0

Huw Davies : wine.inf: Add inifile entries.
by Alexandre Julliard July 27, 2006

July 27, 2006

Module: wine Branch: refs/heads/master Commit: 2a96095aa3c4ad11dac7de56932476d2919ae300 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a96095aa3c4ad11dac7de5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 26 13:59:48 2006 +0100 wine.inf: Add inifile entries. --- tools/wine.inf | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 316c25a..f894c39 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -89,6 +89,7 @@ HKCR,.htm,,,"htmlfile" HKCR,.htm,"Content Type",,"text/html" HKCR,.html,,,"htmlfile" HKCR,.html,"Content Type",,"text/html" +HKCR,.ini,,,"inifile" HKCR,.jfif,"Content Type",,"image/jpeg" HKCR,.lnk,,,"lnkfile" HKCR,.msi,,,"Msi.Package" @@ -104,6 +105,8 @@ HKCR,folder\shell\open\ddeexec,,,"[ViewF HKCR,folder\shell\open\ddeexec,"NoActivateHandler",,"" HKCR,folder\shell\open\ddeexec\application,,,"Folders" HKCR,htmlfile\shell\open\command,,,"winebrowser" +HKCR,inifile\shell\open\command,,,"%11%\notepad.exe %1" +HKCR,inifile\shell\print\command,,,"%11%\notepad.exe /p %1" HKCR,lnkfile,"NeverShowExt",,"" HKCR,lnkfile,"IsShortcut",,"yes" HKCR,lnkfile\CLSID,,,"{00021401-0000-0000-C000-000000000046}"

1 0