October 2009 - Wine-Commits

Owen Rudge : mapi32: Pass several extended MAPI functions through to provider.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: 2d1a7173a4c6077894722a6ee9b535b38fd0afb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1a7173a4c6077894722a6ee… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Oct 26 13:28:01 2009 -0500 mapi32: Pass several extended MAPI functions through to provider. --- dlls/mapi32/imalloc.c | 4 ++++ dlls/mapi32/mapi32_main.c | 16 +++++++++++++++- dlls/mapi32/util.c | 42 +++++++++++++++++++++++++++++++++++++++++- dlls/mapi32/util.h | 15 ++++++++++++++- 4 files changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index a913eee..351c38b 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -32,6 +32,7 @@ #include "objbase.h" #include "shlwapi.h" #include "mapiutil.h" +#include "util.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); @@ -63,6 +64,9 @@ LPMALLOC WINAPI MAPIGetDefaultMalloc(void) { TRACE("()\n"); + if (mapiFunctions.MAPIGetDefaultMalloc) + return mapiFunctions.MAPIGetDefaultMalloc(); + IMalloc_AddRef((LPMALLOC)&MAPI_IMalloc); return (LPMALLOC)&MAPI_IMalloc; } diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index 28c2f14..906c22e 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -89,7 +89,15 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - return MAPI_ObjectCount == 0 ? S_OK : S_FALSE; + HRESULT ret = S_OK; + + if (mapiFunctions.DllCanUnloadNow) + { + ret = mapiFunctions.DllCanUnloadNow(); + TRACE("(): provider returns %d\n", ret); + } + + return MAPI_ObjectCount == 0 ? ret : S_FALSE; } /*********************************************************************** @@ -167,6 +175,9 @@ HRESULT WINAPI MAPILogonEx(ULONG_PTR uiparam, LPWSTR profile, HRESULT WINAPI MAPIOpenLocalFormContainer(LPVOID *ppfcnt) { + if (mapiFunctions.MAPIOpenLocalFormContainer) + return mapiFunctions.MAPIOpenLocalFormContainer(ppfcnt); + FIXME("(%p) Stub\n", ppfcnt); return E_FAIL; } @@ -189,6 +200,9 @@ VOID WINAPI MAPIUninitialize(void) HRESULT WINAPI MAPIAdminProfiles(ULONG ulFlags, LPPROFADMIN *lppProfAdmin) { + if (mapiFunctions.MAPIAdminProfiles) + return mapiFunctions.MAPIAdminProfiles(ulFlags, lppProfAdmin); + FIXME("(%u, %p): stub\n", ulFlags, lppProfAdmin); *lppProfAdmin = NULL; return E_FAIL; diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index fdb8497..71a5e1a 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -68,6 +68,9 @@ MAPI_FUNCTIONS mapiFunctions; */ SCODE WINAPI ScInitMapiUtil(ULONG ulReserved) { + if (mapiFunctions.ScInitMapiUtil) + return mapiFunctions.ScInitMapiUtil(ulReserved); + FIXME("(0x%08x)stub!\n", ulReserved); if (ulReserved) return MAPI_E_INVALID_PARAMETER; @@ -91,7 +94,10 @@ SCODE WINAPI ScInitMapiUtil(ULONG ulReserved) */ VOID WINAPI DeinitMapiUtil(void) { - FIXME("()stub!\n"); + if (mapiFunctions.DeinitMapiUtil) + mapiFunctions.DeinitMapiUtil(); + else + FIXME("()stub!\n"); } typedef LPVOID *LPMAPIALLOCBUFFER; @@ -124,6 +130,9 @@ SCODE WINAPI MAPIAllocateBuffer(ULONG cbSize, LPVOID *lppBuffer) TRACE("(%d,%p)\n", cbSize, lppBuffer); + if (mapiFunctions.MAPIAllocateBuffer) + return mapiFunctions.MAPIAllocateBuffer(cbSize, lppBuffer); + if (!lppBuffer) return E_INVALIDARG; @@ -164,6 +173,9 @@ SCODE WINAPI MAPIAllocateMore(ULONG cbSize, LPVOID lpOrig, LPVOID *lppBuffer) TRACE("(%d,%p,%p)\n", cbSize, lpOrig, lppBuffer); + if (mapiFunctions.MAPIAllocateMore) + return mapiFunctions.MAPIAllocateMore(cbSize, lpOrig, lppBuffer); + if (!lppBuffer || !lpBuff || !--lpBuff) return E_INVALIDARG; @@ -200,6 +212,9 @@ ULONG WINAPI MAPIFreeBuffer(LPVOID lpBuffer) TRACE("(%p)\n", lpBuffer); + if (mapiFunctions.MAPIFreeBuffer) + return mapiFunctions.MAPIFreeBuffer(lpBuffer); + if (lpBuff && --lpBuff) { while (lpBuff) @@ -239,6 +254,9 @@ HRESULT WINAPI WrapProgress(PVOID unk1, PVOID unk2, PVOID unk3, PVOID unk4, PVOI */ HRESULT WINAPI HrThisThreadAdviseSink(LPMAPIADVISESINK lpSink, LPMAPIADVISESINK* lppNewSink) { + if (mapiFunctions.HrThisThreadAdviseSink) + return mapiFunctions.HrThisThreadAdviseSink(lpSink, lppNewSink); + FIXME("(%p,%p)semi-stub\n", lpSink, lppNewSink); if (!lpSink || !lppNewSink) @@ -695,6 +713,9 @@ HRESULT WINAPI OpenStreamOnFile(LPALLOCATEBUFFER lpAlloc, LPFREEBUFFER lpFree, TRACE("(%p,%p,0x%08x,%s,%s,%p)\n", lpAlloc, lpFree, ulFlags, debugstr_a((LPSTR)lpszPath), debugstr_a((LPSTR)lpszPrefix), lppStream); + if (mapiFunctions.OpenStreamOnFile) + return mapiFunctions.OpenStreamOnFile(lpAlloc, lpFree, ulFlags, lpszPath, lpszPrefix, lppStream); + if (lppStream) *lppStream = NULL; @@ -857,6 +878,9 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path TRACE("%s %s %p %u %d\n", component, qualifier, dll_path, dll_path_length, install); + if (mapiFunctions.FGetComponentPath) + return mapiFunctions.FGetComponentPath(component, qualifier, dll_path, dll_path_length, install); + dll_path[0] = 0; hmsi = LoadLibraryA("msi.dll"); @@ -903,6 +927,9 @@ HRESULT WINAPI HrQueryAllRows(LPMAPITABLE lpTable, LPSPropTagArray lpPropTags, LPSRestriction lpRestriction, LPSSortOrderSet lpSortOrderSet, LONG crowsMax, LPSRowSet *lppRows) { + if (mapiFunctions.HrQueryAllRows) + return mapiFunctions.HrQueryAllRows(lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); + FIXME("(%p, %p, %p, %p, %d, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); *lppRows = NULL; return MAPI_E_CALL_FAILED; @@ -1057,7 +1084,20 @@ void load_mapi_providers(void) mapiFunctions.MAPILogonEx = (void*) GetProcAddress(mapi_ex_provider, "MAPILogonEx"); mapiFunctions.MAPIUninitialize = (void*) GetProcAddress(mapi_ex_provider, "MAPIUninitialize"); + mapiFunctions.DeinitMapiUtil = (void*) GetProcAddress(mapi_ex_provider, "DeinitMapiUtil(a)0"); + mapiFunctions.DllCanUnloadNow = (void*) GetProcAddress(mapi_ex_provider, "DllCanUnloadNow"); mapiFunctions.DllGetClassObject = (void*) GetProcAddress(mapi_ex_provider, "DllGetClassObject"); + mapiFunctions.FGetComponentPath = (void*) GetProcAddress(mapi_ex_provider, "FGetComponentPath"); + mapiFunctions.HrThisThreadAdviseSink = (void*) GetProcAddress(mapi_ex_provider, "HrThisThreadAdviseSink(a)8"); + mapiFunctions.HrQueryAllRows = (void*) GetProcAddress(mapi_ex_provider, "HrQueryAllRows(a)24"); + mapiFunctions.MAPIAdminProfiles = (void*) GetProcAddress(mapi_ex_provider, "MAPIAdminProfiles"); + mapiFunctions.MAPIAllocateBuffer = (void*) GetProcAddress(mapi_ex_provider, "MAPIAllocateBuffer"); + mapiFunctions.MAPIAllocateMore = (void*) GetProcAddress(mapi_ex_provider, "MAPIAllocateMore"); + mapiFunctions.MAPIFreeBuffer = (void*) GetProcAddress(mapi_ex_provider, "MAPIFreeBuffer"); + mapiFunctions.MAPIGetDefaultMalloc = (void*) GetProcAddress(mapi_ex_provider, "MAPIGetDefaultMalloc(a)0"); + mapiFunctions.MAPIOpenLocalFormContainer = (void *) GetProcAddress(mapi_ex_provider, "MAPIOpenLocalFormContainer"); + mapiFunctions.OpenStreamOnFile = (void*) GetProcAddress(mapi_ex_provider, "OpenStreamOnFile(a)24"); + mapiFunctions.ScInitMapiUtil = (void*) GetProcAddress(mapi_ex_provider, "ScInitMapiUtil(a)4"); } cleanUp: diff --git a/dlls/mapi32/util.h b/dlls/mapi32/util.h index 9899053..fd813ca 100644 --- a/dlls/mapi32/util.h +++ b/dlls/mapi32/util.h @@ -44,7 +44,20 @@ typedef struct MAPI_FUNCTIONS { LPMAPISENDDOCUMENTS MAPISendDocuments; LPMAPIUNINITIALIZE MAPIUninitialize; - HRESULT (WINAPI *DllGetClassObject)(REFCLSID, REFIID, LPVOID *); + VOID (WINAPI *DeinitMapiUtil) (void); + HRESULT (WINAPI *DllCanUnloadNow) (void); + HRESULT (WINAPI *DllGetClassObject) (REFCLSID, REFIID, LPVOID *); + BOOL (WINAPI *FGetComponentPath) (LPCSTR, LPCSTR, LPSTR, DWORD, BOOL); + HRESULT (WINAPI *MAPIAdminProfiles) (ULONG, LPPROFADMIN *); + SCODE (WINAPI *MAPIAllocateBuffer) (ULONG, LPVOID *); + SCODE (WINAPI *MAPIAllocateMore) (ULONG, LPVOID, LPVOID *); + ULONG (WINAPI *MAPIFreeBuffer) (LPVOID); + LPMALLOC (WINAPI *MAPIGetDefaultMalloc) (void); + HRESULT (WINAPI *MAPIOpenLocalFormContainer) (LPVOID *); + HRESULT (WINAPI *HrThisThreadAdviseSink) (LPMAPIADVISESINK, LPMAPIADVISESINK*); + HRESULT (WINAPI *HrQueryAllRows) (LPMAPITABLE, LPSPropTagArray, LPSRestriction, LPSSortOrderSet, LONG, LPSRowSet *); + HRESULT (WINAPI *OpenStreamOnFile) (LPALLOCATEBUFFER, LPFREEBUFFER, ULONG, LPWSTR, LPWSTR, LPSTREAM *); + SCODE (WINAPI *ScInitMapiUtil) (ULONG ulReserved); } MAPI_FUNCTIONS; extern MAPI_FUNCTIONS mapiFunctions;

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.32
by Jeremy Newman Oct. 27, 2009

Oct. 27, 2009

Module: website Branch: master Commit: 60856c4a7540216878ca2a3b6fdc52183d02b62d URL: http://source.winehq.org/git/website.git/?a=commit;h=60856c4a7540216878ca2a… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Oct 26 08:36:24 2009 +0100 Polish translation for release 1.1.32 --- news/pl/2009102301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2009102301.xml b/news/pl/2009102301.xml new file mode 100644 index 0000000..d5eaad2 --- /dev/null +++ b/news/pl/2009102301.xml @@ -0,0 +1,17 @@ +<news> +<date>Październik 23, 2009</date> +<title>Wydano Wine 1.1.32</title> +<body> +<p> Wydanie rozwojowe Wine 1.1.32 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.1.32">Co nowego</a> w tym wydaniu: +<ul> + <li>Wiele poprawek crypto, szczególnie na 64-bitach.</li> + <li>Ulepszono dostęp do DVD na Mac OS.</li> + <li>Kilka ulepszeń w powszechnych kontrolkach (ang. common controls).</li> + <li>Rozmaite ulepszenia we wsparciu HTML.</li> + <li>Więcej optymalizacji DIB.</li> + <li>Rozmaite poprawki błędów.</li> +</ul></p> +<p><p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.32.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

Alexander Nicolaysen Sørnes : screenshot : Show Wine version
by Alexander Nicolaysen Sørnes Oct. 26, 2009

Oct. 26, 2009

Module: appdb Branch: master Commit: c74053c75af34f2627bba6cd0fa2a3e9e31c1524 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c74053c75af34f2627bba6cd… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Mon Oct 26 17:36:43 2009 +0100 screenshot: Show Wine version --- screenshots.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/screenshots.php b/screenshots.php index 920c50e..d8ae285 100644 --- a/screenshots.php +++ b/screenshots.php @@ -102,7 +102,8 @@ if($hResult && query_num_rows($hResult)) echo "<td>\n"; echo $img; echo "<div align=center>". substr($oRow->description,0,20). "\n"; - + echo '<br />Wine version: '; + echo $oScreenshot->sTestedVersion ? $oScreenshot->sTestedVersion : 'N/A'; //show admin delete link if($_SESSION['current']->isLoggedIn() && (

1 0

Alexander Nicolaysen Sørnes : util: Don' t require default value in make_bugzilla_version_list()
by Alexander Nicolaysen Sørnes Oct. 26, 2009

Oct. 26, 2009

Module: appdb Branch: master Commit: cfad26fc5afcdaadfa459f8d4a4b4db94f853040 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=cfad26fc5afcdaadfa459f8d… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Mon Oct 26 17:08:36 2009 +0100 util: Don't require default value in make_bugzilla_version_list() --- include/util.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/util.php b/include/util.php index a8bce6c..7eba466 100644 --- a/include/util.php +++ b/include/util.php @@ -207,7 +207,7 @@ function get_bugzilla_version_ids() // this is the name to use to retrieve the selection on the form postback // $sSelectedValue - the currently selected entry // returns a string that contains the version list output -function make_bugzilla_version_list($sVarname, $sSelectedValue) +function make_bugzilla_version_list($sVarname, $sSelectedValue = '') { $sStr = "";

1 0

Alexander Nicolaysen Sørnes : screenshot : Add ability to specify Wine version
by Alexander Nicolaysen Sørnes Oct. 26, 2009

Oct. 26, 2009

Module: appdb Branch: master Commit: 73d682044bad60b85734c7e6ee47dc3503d8daf8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=73d682044bad60b85734c7e6… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Mon Oct 26 17:25:22 2009 +0100 screenshot: Add ability to specify Wine version --- include/screenshot.php | 8 +++++--- screenshots.php | 2 ++ tables/appdb_tables.sql | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index a48b375..886682a 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -21,6 +21,7 @@ class screenshot var $iVersionId; var $hFile; var $sDescription; + var $sTestedVersion; var $oScreenshotImage; var $oThumbnailImage; @@ -54,6 +55,7 @@ class screenshot { $this->iScreenshotId = $oRow->id; $this->sDescription = $oRow->description; + $this->sTestedVersion = $oRow->testedVersion; $this->iAppId = $oRow->appId; $this->iVersionId = $oRow->versionId; $this->sUrl = $oRow->url; @@ -71,10 +73,10 @@ class screenshot function create() { $hResult = query_parameters("INSERT INTO appData - (versionId, type, description, state, submitTime, submitterId) - VALUES('?', '?', '?', '?', ?, '?')", + (versionId, type, description, testedVersion, state, submitTime, submitterId) + VALUES('?', '?', '?', '?', '?', ?, '?')", $this->iVersionId, "screenshot", - $this->sDescription, + $this->sDescription, $this->sTestedVersion, $this->mustBeQueued() ? 'queued' : 'accepted', "NOW()", $_SESSION['current']->iUserId); diff --git a/screenshots.php b/screenshots.php index fdb1d0b..920c50e 100644 --- a/screenshots.php +++ b/screenshots.php @@ -40,6 +40,7 @@ if($aClean['sCmd']) $oScreenshot = new Screenshot(); $oScreenshot->iVersionId = $aClean['iVersionId']; $oScreenshot->sDescription = $aClean['sScreenshotDesc']; + $oScreenshot->sTestedVersion = $aClean['sTestedVersion']; $oScreenshot->hFile = $_FILES['sImageFile']; $oScreenshot->create(); $oScreenshot->free(); @@ -149,6 +150,7 @@ if($aClean['iVersionId'] && $_SESSION['current']->isLoggedIn()) echo '<tr><td class=color1>Image</td><td class=color0><input name="sImageFile" type="file" size="24"></td></tr>',"\n"; echo '<tr><td class="color1">Description</td><td class="color0"><input type="text" name="sScreenshotDesc" maxlength="20" size="24"></td></tr>',"\n"; + echo '<tr><td class="color1">Wine version</td><td class="color0">'.make_bugzilla_version_list('sTestedVersion').'</td></tr>',"\n"; echo '<tr><td colspan=2 align=center class=color3><input type="submit" value="Send File"></td></tr>',"\n"; echo '</table>',"\n"; diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index 701fb62..f41c5fd 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -140,6 +140,7 @@ create table appData ( submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', state enum('accepted','queued','rejected') NOT NULL default 'accepted', + testedVersion text NOT NULL KEY id (id), KEY versionId (versionId) );

1 0

Huw Davies : msdaps: Implement CreateAccessor Proxy and Stub.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 18323f0ba5d80f59b5ca294fde73f2a43ba33166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18323f0ba5d80f59b5ca294fd… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 13:40:40 2009 +0000 msdaps: Implement CreateAccessor Proxy and Stub. --- dlls/msdaps/usrmarshal.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index b900a7f..01dcfc6 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -510,8 +510,11 @@ HRESULT CALLBACK IAccessor_CreateAccessor_Proxy(IAccessor* This, DBACCESSORFLAGS const DBBINDING rgBindings[], DBLENGTH cbRowSize, HACCESSOR *phAccessor, DBBINDSTATUS rgStatus[]) { + HRESULT hr; + IErrorInfo *error; DBCOUNTITEM i; - FIXME("(%p)->(%08x, %d, %p, %d, %p, %p): stub\n", This, dwAccessorFlags, cBindings, rgBindings, + + TRACE("(%p)->(%08x, %d, %p, %d, %p, %p)\n", This, dwAccessorFlags, cBindings, rgBindings, cbRowSize, phAccessor, rgStatus); for(i = 0; i < cBindings; i++) @@ -521,16 +524,33 @@ HRESULT CALLBACK IAccessor_CreateAccessor_Proxy(IAccessor* This, DBACCESSORFLAGS rgBindings[i].dwPart, rgBindings[i].dwMemOwner, rgBindings[i].cbMaxLen, rgBindings[i].wType); } - return E_NOTIMPL; + hr = IAccessor_RemoteCreateAccessor_Proxy(This, dwAccessorFlags, cBindings, (DBBINDING *)rgBindings, + cbRowSize, phAccessor, rgStatus, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + + TRACE("returning %08x accessor %lx\n", hr, *phAccessor); + return hr; } HRESULT __RPC_STUB IAccessor_CreateAccessor_Stub(IAccessor* This, DBACCESSORFLAGS dwAccessorFlags, DBCOUNTITEM cBindings, DBBINDING *rgBindings, DBLENGTH cbRowSize, HACCESSOR *phAccessor, DBBINDSTATUS *rgStatus, IErrorInfo **ppErrorInfoRem) { - FIXME("(%p)->(%08x, %d, %p, %d, %p, %p, %p): stub\n", This, dwAccessorFlags, cBindings, rgBindings, + HRESULT hr; + + TRACE("(%p)->(%08x, %d, %p, %d, %p, %p, %p)\n", This, dwAccessorFlags, cBindings, rgBindings, cbRowSize, phAccessor, rgStatus, ppErrorInfoRem); - return E_NOTIMPL; + + *ppErrorInfoRem = NULL; + hr = IAccessor_CreateAccessor(This, dwAccessorFlags, cBindings, rgBindings, + cbRowSize, phAccessor, rgStatus); + if(FAILED(hr)) GetErrorInfo(0, ppErrorInfoRem); + + return hr; } HRESULT CALLBACK IAccessor_GetBindings_Proxy(IAccessor* This, HACCESSOR hAccessor, DBACCESSORFLAGS *pdwAccessorFlags,

1 0

Huw Davies : include: Add access.idl.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: adedd8191ee822f8725e9f3acc7a3b9cbaaa7103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adedd8191ee822f8725e9f3ac… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 13:32:55 2009 +0000 include: Add access.idl. --- dlls/msdaps/usrmarshal.c | 67 +++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/access.idl | 79 ++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + tools/make_makefiles | 1 + 5 files changed, 149 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 94a5ec5..b900a7f 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -492,3 +492,70 @@ HRESULT __RPC_STUB ICreateRow_CreateRow_Stub(ICreateRow* This, IUnknown *pUnkOut if(ppSession) *ppSession = impl_session.pSession; return hr; } + +HRESULT CALLBACK IAccessor_AddRefAccessor_Proxy(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *pcRefCount) +{ + FIXME("(%p)->(%08lx, %p): stub\n", This, hAccessor, pcRefCount); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IAccessor_AddRefAccessor_Stub(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *pcRefCount, + IErrorInfo **ppErrorInfoRem) +{ + FIXME("(%p)->(%08lx, %p, %p): stub\n", This, hAccessor, pcRefCount, ppErrorInfoRem); + return E_NOTIMPL; +} + +HRESULT CALLBACK IAccessor_CreateAccessor_Proxy(IAccessor* This, DBACCESSORFLAGS dwAccessorFlags, DBCOUNTITEM cBindings, + const DBBINDING rgBindings[], DBLENGTH cbRowSize, HACCESSOR *phAccessor, + DBBINDSTATUS rgStatus[]) +{ + DBCOUNTITEM i; + FIXME("(%p)->(%08x, %d, %p, %d, %p, %p): stub\n", This, dwAccessorFlags, cBindings, rgBindings, + cbRowSize, phAccessor, rgStatus); + + for(i = 0; i < cBindings; i++) + { + TRACE("%d: ord %d val off %d len off %d stat off %d part %04x mem_owner %d max_len %d type %04x\n", + i, rgBindings[i].iOrdinal, rgBindings[i].obValue, rgBindings[i].obLength, rgBindings[i].obStatus, + rgBindings[i].dwPart, rgBindings[i].dwMemOwner, rgBindings[i].cbMaxLen, rgBindings[i].wType); + } + + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IAccessor_CreateAccessor_Stub(IAccessor* This, DBACCESSORFLAGS dwAccessorFlags, DBCOUNTITEM cBindings, + DBBINDING *rgBindings, DBLENGTH cbRowSize, HACCESSOR *phAccessor, + DBBINDSTATUS *rgStatus, IErrorInfo **ppErrorInfoRem) +{ + FIXME("(%p)->(%08x, %d, %p, %d, %p, %p, %p): stub\n", This, dwAccessorFlags, cBindings, rgBindings, + cbRowSize, phAccessor, rgStatus, ppErrorInfoRem); + return E_NOTIMPL; +} + +HRESULT CALLBACK IAccessor_GetBindings_Proxy(IAccessor* This, HACCESSOR hAccessor, DBACCESSORFLAGS *pdwAccessorFlags, + DBCOUNTITEM *pcBindings, DBBINDING **prgBindings) +{ + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IAccessor_GetBindings_Stub(IAccessor* This, HACCESSOR hAccessor, DBACCESSORFLAGS *pdwAccessorFlags, + DBCOUNTITEM *pcBindings, DBBINDING **prgBindings, IErrorInfo **ppErrorInfoRem) +{ + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +HRESULT CALLBACK IAccessor_ReleaseAccessor_Proxy(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *pcRefCount) +{ + FIXME("(%p)->(%lx, %p): stub\n", This, hAccessor, pcRefCount); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IAccessor_ReleaseAccessor_Stub(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *pcRefCount, + IErrorInfo **ppErrorInfoRem) +{ + FIXME("(%p)->(%lx, %p, %p): stub\n", This, hAccessor, pcRefCount, ppErrorInfoRem); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 6ea2210..f5b2dfd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -96,6 +96,7 @@ SRCDIR_INCLUDES = \ $(IDL_TLB_SRCS) \ $(PUBLIC_IDL_H_SRCS) \ accctrl.h \ + access.idl \ aclapi.h \ aclui.h \ adshlp.h \ diff --git a/include/access.idl b/include/access.idl new file mode 100644 index 0000000..f3515af --- /dev/null +++ b/include/access.idl @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733a8c-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IAccessor : IUnknown +{ + + typedef DWORD DBACCESSORFLAGS; + + typedef DWORD DBBINDSTATUS; + + [local] + HRESULT AddRefAccessor([in] HACCESSOR hAccessor, + [in, out, unique, annotation("__out_opt")] DBREFCOUNT *pcRefCount); + + [call_as(AddRefAccessor)] + HRESULT RemoteAddRefAccessor([in] HACCESSOR hAccessor, + [in, out, unique, annotation("__out_opt")] DBREFCOUNT *pcRefCount, + [out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT CreateAccessor([in] DBACCESSORFLAGS dwAccessorFlags, + [in] DBCOUNTITEM cBindings, + [in, size_is(cBindings), annotation("__in_ecount(cBindings)")] const DBBINDING rgBindings[], + [in] DBLENGTH cbRowSize, + [out, annotation("__out")] HACCESSOR *phAccessor, + [out, size_is(cBindings), annotation("__out_ecount_opt(cBindings)")] DBBINDSTATUS rgStatus[]); + + [call_as(CreateAccessor)] + HRESULT RemoteCreateAccessor([in] DBACCESSORFLAGS dwAccessorFlags, + [in] DBCOUNTITEM cBindings, + [in, unique, size_is(cBindings)] DBBINDING *rgBindings, + [in] DBLENGTH cbRowSize, + [out] HACCESSOR *phAccessor, + [in, out, unique, size_is(cBindings)] DBBINDSTATUS *rgStatus, + [out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT GetBindings([in] HACCESSOR hAccessor, + [out, annotation("__out")] DBACCESSORFLAGS *pdwAccessorFlags, + [in, out, annotation("__out_opt")] DBCOUNTITEM *pcBindings, + [out, size_is(,*pcBindings), annotation("__deref_out_ecount_opt(*pcBindings)")] DBBINDING **prgBindings); + + [call_as(GetBindings)] + HRESULT RemoteGetBindings([in] HACCESSOR hAccessor, + [out] DBACCESSORFLAGS *pdwAccessorFlags, + [in, out] DBCOUNTITEM *pcBindings, + [out, size_is(,*pcBindings)] DBBINDING **prgBindings, + [out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT ReleaseAccessor([in] HACCESSOR hAccessor, + [in, out, unique, annotation("__out_opt")] DBREFCOUNT *pcRefCount); + + [call_as(ReleaseAccessor)] + HRESULT RemoteReleaseAccessor([in] HACCESSOR hAccessor, + [in, out, unique] DBREFCOUNT *pcRefCount, + [out] IErrorInfo **ppErrorInfoRem); + +}; diff --git a/include/oledb.idl b/include/oledb.idl index 030f049..a488c47 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -39,6 +39,7 @@ typedef LONG DB_LPARAMS; #include "dbs.idl" +#include "access.idl" #include "dbccmd.idl" #include "dbcses.idl" #include "dbprop.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index 3883333..5e724ff 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -109,6 +109,7 @@ my %exported_wine_headers = ( ); my %private_idl_headers = ( + "access.idl" => 1, "axcore.idl" => 1, "axextend.idl" => 1, "binres.idl" => 1,

1 0

Huw Davies : msdaps: Implement ReleaseAccessor Proxy and Stub.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: d1472e2af21618070005b46c904fee835da4a169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1472e2af21618070005b46c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 13:48:09 2009 +0000 msdaps: Implement ReleaseAccessor Proxy and Stub. --- dlls/msdaps/usrmarshal.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 01dcfc6..ae812ad 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -569,13 +569,34 @@ HRESULT __RPC_STUB IAccessor_GetBindings_Stub(IAccessor* This, HACCESSOR hAccess HRESULT CALLBACK IAccessor_ReleaseAccessor_Proxy(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *pcRefCount) { - FIXME("(%p)->(%lx, %p): stub\n", This, hAccessor, pcRefCount); - return E_NOTIMPL; + HRESULT hr; + IErrorInfo *error; + DBREFCOUNT ref; + + TRACE("(%p)->(%lx, %p)\n", This, hAccessor, pcRefCount); + + hr = IAccessor_RemoteReleaseAccessor_Proxy(This, hAccessor, &ref, &error); + + if(pcRefCount) *pcRefCount = ref; + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + return hr; } HRESULT __RPC_STUB IAccessor_ReleaseAccessor_Stub(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *pcRefCount, IErrorInfo **ppErrorInfoRem) { - FIXME("(%p)->(%lx, %p, %p): stub\n", This, hAccessor, pcRefCount, ppErrorInfoRem); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%lx, %p, %p)\n", This, hAccessor, pcRefCount, ppErrorInfoRem); + + *ppErrorInfoRem = NULL; + + hr = IAccessor_ReleaseAccessor(This, hAccessor, pcRefCount); + + if(FAILED(hr)) GetErrorInfo(0, ppErrorInfoRem); + return hr; }

1 0

Huw Davies : include: Flesh out dbs.idl a bit.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 44967f0609a9b731ca831e095dc8328b4b901929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44967f0609a9b731ca831e095… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 13:29:41 2009 +0000 include: Flesh out dbs.idl a bit. --- include/dbs.idl | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 5 ++ 2 files changed, 139 insertions(+), 0 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index e39ee97..dd12628 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -151,6 +151,18 @@ enum DBTYPEENUM DBTYPE_RESERVED = 0x8000 }; +enum DBTYPEENUM15 +{ + DBTYPE_HCHAPTER = 136 +}; + +enum DBTYPEENUM20 +{ + DBTYPE_FILETIME = 64, + DBTYPE_PROPVARIANT = 138, + DBTYPE_VARNUMERIC = 139 +}; + typedef DWORD DBSTATUS; enum DBSTATUSENUM @@ -170,3 +182,125 @@ enum DBSTATUSENUM DBSTATUS_E_BADSTATUS = 12, DBSTATUS_S_DEFAULT = 13 }; + +typedef struct tagDBCOLUMNACCESS +{ + void *pData; + DBID columnid; + DBLENGTH cbDataLen; + DBSTATUS dwStatus; + DBLENGTH cbMaxLen; + DB_DWRESERVE dwReserved; + DBTYPE wType; + BYTE bPrecision; + BYTE bScale; +} DBCOLUMNACCESS; + +typedef DWORD DBROWSTATUS; + +enum DBROWSTATUSENUM +{ + DBROWSTATUS_S_OK = 0, + /* FIXME */ + DBROWSTATUS_E_FAIL = 19, + +}; + +typedef DWORD DBPART; + +enum DBPARTENUM +{ + DBPART_INVALID = 0, + DBPART_VALUE = 1, + DBPART_LENGTH = 2, + DBPART_STATUS = 4, +}; + +typedef DWORD DBPARAMIO; + +enum DBPARAMIOENUM +{ + DBPARAMIO_NOTPARAM = 0, + DBPARAMIO_INPUT = 1, + DBPARAMIO_OUTPUT = 2, +}; + +typedef DWORD DBMEMOWNER; + +enum DBMEMOWNERENUM +{ + DBMEMOWNER_CLIENTOWNED = 0, + DBMEMOWNER_PROVIDEROWNED = 1, +}; + +typedef struct tagDBOBJECT +{ + DWORD dwFlags; + IID iid; +} DBOBJECT; + +typedef struct tagDBBINDEXT +{ + [size_is((ULONG)ulExtension)] BYTE *pExtension; + DBCOUNTITEM ulExtension; +} DBBINDEXT; + +typedef struct tagDBBINDING +{ + DBORDINAL iOrdinal; + DBBYTEOFFSET obValue; + DBBYTEOFFSET obLength; + DBBYTEOFFSET obStatus; + ITypeInfo *pTypeInfo; + DBOBJECT *pObject; + DBBINDEXT *pBindExt; + DBPART dwPart; + DBMEMOWNER dwMemOwner; + DBPARAMIO eParamIO; + DBLENGTH cbMaxLen; + DWORD dwFlags; + DBTYPE wType; + BYTE bPrecision; + BYTE bScale; +} DBBINDING; + +typedef ULONG_PTR HACCESSOR; + +cpp_quote("#define DB_INVALID_HACCESSOR 0x00") + +typedef ULONG_PTR HROW; + +cpp_quote("#define DB_NULL_HROW 0x00") + +typedef ULONG_PTR HWATCHREGION; + +cpp_quote("#define DBWATCHREGION_NULL NULL") + +typedef ULONG_PTR HCHAPTER; + +cpp_quote("#define DB_NULL_HCHAPTER 0x00") + +typedef struct tagDBPARAMS +{ + void *pData; + DB_UPARAMS cParamSets; + HACCESSOR hAccessor; +} DBPARAMS; + +typedef struct tagRMTPACK +{ + ISequentialStream *pISeqStream; + ULONG cbData; + ULONG cBSTR; + [size_is(cBSTR)] BSTR *rgBSTR; + ULONG cVARIANT; + [size_is(cVARIANT)] VARIANT *rgVARIANT; + ULONG cIDISPATCH; + [size_is(cIDISPATCH)] IDispatch **rgIDISPATCH; + ULONG cIUNKNOWN; + [size_is(cIUNKNOWN)] IUnknown **rgIUNKNOWN; + ULONG cPROPVARIANT; + [size_is(cPROPVARIANT)] PROPVARIANT *rgPROPVARIANT; + ULONG cArray; + [size_is(cArray)] VARIANT *rgArray; +} RMTPACK; diff --git a/include/oledb.idl b/include/oledb.idl index 5c66912..030f049 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -31,6 +31,11 @@ import "urlmon.idl"; typedef ULONG DBBYTEOFFSET; typedef ULONG DBCOUNTITEM; typedef ULONG DBLENGTH; +typedef ULONG DBORDINAL; +typedef DWORD DB_DWRESERVE; +typedef ULONG DBREFCOUNT; +typedef ULONG DB_UPARAMS; +typedef LONG DB_LPARAMS; #include "dbs.idl"

1 0

Huw Davies : include: Remove comments around annotation attributes.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 752b617746d33ad3161d3fd716c2d74b0ba3083c URL: http://source.winehq.org/git/wine.git/?a=commit;h=752b617746d33ad3161d3fd71… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 12:16:08 2009 +0000 include: Remove comments around annotation attributes. --- include/crtrow.idl | 2 +- include/dbdsad.idl | 2 +- include/dbprop.idl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/crtrow.idl b/include/crtrow.idl index da26a72..98c0bce 100644 --- a/include/crtrow.idl +++ b/include/crtrow.idl @@ -32,7 +32,7 @@ interface ICreateRow : IUnknown [in, unique] IAuthenticate *pAuthenticate, [in, out, unique] DBIMPLICITSESSION *pImplSession, [in, out, unique] DBBINDURLSTATUS *pdwBindStatus, - [out, /*annotation("__deref_opt_out_opt")*/] LPOLESTR *ppwszNewURL, + [out, annotation("__deref_opt_out_opt")] LPOLESTR *ppwszNewURL, [out, iid_is(riid)] IUnknown **ppUnk); [call_as(CreateRow)] diff --git a/include/dbdsad.idl b/include/dbdsad.idl index 1fb8c9f..ad2695e 100644 --- a/include/dbdsad.idl +++ b/include/dbdsad.idl @@ -51,7 +51,7 @@ interface IDBDataSourceAdmin : IUnknown [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], [in, out] ULONG *pcPropertyInfoSets, [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets, - [out, /*annotation("__deref_out_z_opt")*/] OLECHAR **ppDescBuffer); + [out, annotation("__deref_out_z_opt")] OLECHAR **ppDescBuffer); [call_as(GetCreationProperties)] HRESULT RemoteGetCreationProperties([in] ULONG cPropertyIDSets, diff --git a/include/dbprop.idl b/include/dbprop.idl index 77ceab0..782191a 100644 --- a/include/dbprop.idl +++ b/include/dbprop.idl @@ -40,7 +40,7 @@ interface IDBProperties : IUnknown { [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], [in, out] ULONG *pcPropertyInfoSets, [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets, - [out, /*annotation("__deref_out_z_opt")*/] OLECHAR **ppDescBuffer); + [out, annotation("__deref_out_z_opt")] OLECHAR **ppDescBuffer); [call_as(GetPropertyInfo)] HRESULT RemoteGetPropertyInfo( [in] ULONG cPropertyIDSets,

1 0