March 2007 - Wine-Commits - list.winehq.org

Alexandre Julliard : Makefile: More portable invocation of ctags/etags.
by Alexandre Julliard March 28, 2007

March 28, 2007

Module: wine Branch: master Commit: 7b289821b11fd3204a616e7af1e0ef778bf8a6d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b289821b11fd3204a616e7af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 27 21:45:54 2007 +0200 Makefile: More portable invocation of ctags/etags. --- Makefile.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7b3f8e0..923a33e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -132,10 +132,12 @@ $(TESTSUBDIRS:%=%/__crosstest__): tools include # Misc rules TAGS etags: - (test -d .git && git-ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | etags - + $(RM) TAGS + (test -d .git && git-ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | xargs etags -a tags ctags: - (test -d .git && git-ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | ctags - + $(RM) tags + (test -d .git && git-ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | xargs ctags -a manpages htmlpages sgmlpages: dummy @cd documentation && $(MAKE) $@

1 0

Alexandre Julliard : server: Add support for queuing a user APC upon async I/O completion.
by Alexandre Julliard March 28, 2007

March 28, 2007

Module: wine Branch: master Commit: c16eb8efd942bfbb0bb7f3da4c740a2e483cce28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c16eb8efd942bfbb0bb7f3da4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 27 16:42:27 2007 +0200 server: Add support for queuing a user APC upon async I/O completion. --- dlls/ntdll/directory.c | 11 +++-------- dlls/ntdll/file.c | 12 ++++++++---- include/wine/server_protocol.h | 4 +++- server/async.c | 10 ++++++++++ server/protocol.def | 2 ++ server/trace.c | 4 ++-- 6 files changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index e60dad7..697fd1a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2164,8 +2164,6 @@ done: struct read_changes_info { HANDLE FileHandle; - PIO_APC_ROUTINE ApcRoutine; - PVOID ApcContext; PVOID Buffer; ULONG BufferSize; }; @@ -2177,7 +2175,7 @@ static void WINAPI read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, ULONG st NTSTATUS ret = STATUS_SUCCESS; int len, action, i; - TRACE("%p %p %p %08x\n", info, info->ApcContext, iosb, status); + TRACE("%p %p %08x\n", info, iosb, status); /* * FIXME: race me! @@ -2266,9 +2264,6 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, if (CompletionFilter == 0 || (CompletionFilter & ~FILE_NOTIFY_ALL)) return STATUS_INVALID_PARAMETER; - if (ApcRoutine) - FIXME("parameters ignored %p %p\n", ApcRoutine, ApcContext ); - info = RtlAllocateHeap( GetProcessHeap(), 0, sizeof *info ); if (!info) return STATUS_NO_MEMORY; @@ -2276,8 +2271,6 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, info->FileHandle = FileHandle; info->Buffer = Buffer; info->BufferSize = BufferSize; - info->ApcRoutine = ApcRoutine; - info->ApcContext = ApcContext; SERVER_START_REQ( read_directory_changes ) { @@ -2288,6 +2281,8 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, req->async.callback = read_changes_apc; req->async.iosb = IoStatusBlock; req->async.arg = info; + req->async.apc = ApcRoutine; + req->async.apc_arg = ApcContext; req->async.event = Event; status = wine_server_call( req ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 6873e0e..89de3b3 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -922,7 +922,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc { HANDLE internal_event = 0; - if(!event) + if(!event && !apc) { io->u.Status = NtCreateEvent(&internal_event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); if (io->u.Status != STATUS_SUCCESS) return io->u.Status; @@ -933,12 +933,14 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc req->async.callback = pipe_completion_wait; req->async.iosb = io; req->async.arg = NULL; + req->async.apc = apc; + req->async.apc_arg = apc_context; req->async.event = event ? event : internal_event; io->u.Status = wine_server_call(req); } SERVER_END_REQ; - if (!event && io->u.Status == STATUS_PENDING) + if (internal_event && io->u.Status == STATUS_PENDING) { while (NtWaitForSingleObject(internal_event, TRUE, NULL) == STATUS_USER_APC) /*nothing*/ ; } @@ -951,7 +953,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc HANDLE internal_event = 0; FILE_PIPE_WAIT_FOR_BUFFER *buff = in_buffer; - if(!event) + if(!event && !apc) { io->u.Status = NtCreateEvent(&internal_event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); if (io->u.Status != STATUS_SUCCESS) return io->u.Status; @@ -964,13 +966,15 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc req->async.callback = pipe_completion_wait; req->async.iosb = io; req->async.arg = NULL; + req->async.apc = apc; + req->async.apc_arg = apc_context; req->async.event = event ? event : internal_event; wine_server_add_data( req, buff->Name, buff->NameLength ); io->u.Status = wine_server_call( req ); } SERVER_END_REQ; - if (!event && io->u.Status == STATUS_PENDING) + if (internal_event && io->u.Status == STATUS_PENDING) { while (NtWaitForSingleObject(internal_event, TRUE, NULL) == STATUS_USER_APC) /*nothing*/ ; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1e21566..a254128 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -162,6 +162,8 @@ typedef struct void *callback; void *iosb; void *arg; + void *apc; + void *apc_arg; obj_handle_t event; } async_data_t; @@ -4660,6 +4662,6 @@ union generic_reply struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; }; -#define SERVER_PROTOCOL_VERSION 288 +#define SERVER_PROTOCOL_VERSION 289 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/async.c b/server/async.c index aa4db4e..440cb2e 100644 --- a/server/async.c +++ b/server/async.c @@ -150,6 +150,16 @@ void async_set_result( struct object *obj, unsigned int status ) } else { + if (async->data.apc) + { + apc_call_t data; + data.type = APC_USER; + data.user.func = async->data.apc; + data.user.args[0] = (unsigned long)async->data.apc_arg; + data.user.args[1] = (unsigned long)async->data.iosb; + data.user.args[2] = 0; + thread_queue_apc( async->thread, NULL, &data ); + } if (async->event) set_event( async->event ); } } diff --git a/server/protocol.def b/server/protocol.def index 5105fd6..ef20235 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -178,6 +178,8 @@ typedef struct void *callback; /* client-side callback to call upon end of async */ void *iosb; /* I/O status block in client addr space */ void *arg; /* opaque user data to pass to callback */ + void *apc; /* user apc to call */ + void *apc_arg; /* argument for user apc */ obj_handle_t event; /* event to signal when done */ } async_data_t; diff --git a/server/trace.c b/server/trace.c index a332821..898998b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -246,8 +246,8 @@ static void dump_apc_result( const apc_result_t *result ) static void dump_async_data( const async_data_t *data ) { - fprintf( stderr, "{callback=%p,iosb=%p,arg=%p,event=%p}", - data->callback, data->iosb, data->arg, data->event ); + fprintf( stderr, "{callback=%p,iosb=%p,arg=%p,apc=%p,apc_arg=%p,event=%p}", + data->callback, data->iosb, data->arg, data->apc, data->apc_arg, data->event ); } static void dump_luid( const luid_t *luid )

1 0

appdb/include testData.php
by WineHQ March 28, 2007

March 28, 2007

ChangeSet ID: 31014 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/27 19:09:12 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix display of latest testData to exclude queued entries Patch: http://cvs.winehq.org/patch.py?id=31014 Old revision New revision Changes Path 1.34 1.35 +4 -1 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.34 appdb/include/testData.php:1.35 --- appdb/include/testData.php:1.34 28 Mar 2007 0: 9:12 -0000 +++ appdb/include/testData.php 28 Mar 2007 0: 9:12 -0000 @@ -468,7 +468,10 @@ class testData{ /* retrieve the latest test result for a given version id */ function get_test_for_versionid($iVersionId) { - $sQuery = "SELECT testingId from testResults where versionId = '?' + $sQuery = "SELECT testingId FROM testResults WHERE + versionId = '?' + AND + queued = 'false' ORDER BY testedDate DESC limit 1"; $hResult = query_parameters($sQuery, $iVersionId); if(!$hResult)

1 0

James Hawkins : setupapi: Add missing SetupCopyOEMInf flags.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: da85c0905d26ddc31a8deb7b426b41e75fac2b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da85c0905d26ddc31a8deb7b4… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 26 18:34:22 2007 -0500 setupapi: Add missing SetupCopyOEMInf flags. --- include/setupapi.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/setupapi.h b/include/setupapi.h index 8c7aaf5..b7a6b43 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -415,6 +415,11 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PFILEPATHS) #define SP_COPY_NOPRUNE 0x00100000 #define SP_COPY_OEM_F6_INF 0x00200000 +#define SPOST_NONE 0 +#define SPOST_PATH 1 +#define SPOST_URL 2 +#define SPOST_MAX 3 + #define FLG_ADDREG_DELREG_BIT 0x00008000 #define FLG_ADDREG_BINVALUETYPE 0x00000001 #define FLG_ADDREG_NOCLOBBER 0x00000002

1 0

James Hawkins : setupapi: Add several tests for SetupCopyOEMInf, with fixes so the tests don't crash.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 9eaea34e041671fa63095a825c32978d1a9780d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eaea34e041671fa63095a825… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 26 18:35:16 2007 -0500 setupapi: Add several tests for SetupCopyOEMInf, with fixes so the tests don't crash. --- dlls/setupapi/misc.c | 18 ++- dlls/setupapi/tests/Makefile.in | 1 + dlls/setupapi/tests/misc.c | 262 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 276 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9eaea34e041671fa63095…

1 0

Jacek Caban : wine.inf: Code clean up.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 7ae09da9f33b3525ed126d0f323182acc571e2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae09da9f33b3525ed126d0f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 19:40:40 2007 +0200 wine.inf: Code clean up. --- tools/wine.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index ec9c602..9b061ef 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -318,7 +318,6 @@ HKLM,Software\Microsoft\Rpc\SecurityService,68,2,"netlogon.dll" HKLM,Software\Microsoft\Rpc\SecurityService,9,2,"secur32.dll" HKLM,System\CurrentControlSet\Control\Session Manager,,,"" HKLM,System\CurrentControlSet\Control\VMM32Files,,,"" -HKLM,System\CurrentControlSet\Services\VxD\MSTCP,,,"" HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" HKLM,HARDWARE\DEVICEMAP\PARALLEL PORTS,,,"" HKLM,HARDWARE\DEVICEMAP\SERIALCOMM,,,"" @@ -2590,6 +2589,7 @@ HKLM,"%Services%\Spooler","ImagePath",,"spoolsv.exe" HKLM,"%Services%\Spooler","ObjectName",,"LocalSystem" HKLM,"%Services%\Spooler","Start",0x10001,2 HKLM,"%Services%\Spooler","Type",0x10001,0x110 +HKLM,"%Services%\VxD\MSTCP",,,"" [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.0"

1 0

Rob Shearman : ole32: Register the ProgID for the class and file monikers.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 8b50eb355696baf263c0d29743ca417f26843cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b50eb355696baf263c0d2974… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:26:17 2007 +0100 ole32: Register the ProgID for the class and file monikers. --- dlls/ole32/regsvr.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c index b127c0d..fdb45c8 100644 --- a/dlls/ole32/regsvr.c +++ b/dlls/ole32/regsvr.c @@ -491,7 +491,8 @@ static struct regsvr_coclass const coclass_list[] = { "FileMoniker", NULL, "ole32.dll", - "Both" + "Both", + "file" }, { &CLSID_ItemMoniker, "ItemMoniker", @@ -547,7 +548,8 @@ static struct regsvr_coclass const coclass_list[] = { "ClassMoniker", NULL, "ole32.dll", - "Both" + "Both", + "CLSID" }, { &CLSID_PSFactoryBuffer, "PSFactoryBuffer",

1 0

Rob Shearman : ole32: Add documentation for CoGetClassObject and GetClassFile.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 8e0145242b6f6b3a625f60d62ebf343a79b0c420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e0145242b6f6b3a625f60d62… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:24:27 2007 +0100 ole32: Add documentation for CoGetClassObject and GetClassFile. --- dlls/ole32/compobj.c | 36 +++++++++++++++++++++++++++++++----- 1 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4639831..4ef0ff5 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1840,10 +1840,28 @@ static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID rii /*********************************************************************** * CoGetClassObject [OLE32.@] * - * FIXME. If request allows of several options and there is a failure - * with one (other than not being registered) do we try the - * others or return failure? (E.g. inprocess is registered but - * the DLL is not found but the server version works) + * Creates an object of the specified class. + * + * PARAMS + * rclsid [I] Class ID to create an instance of. + * dwClsContext [I] Flags to restrict the location of the created instance. + * pServerInfo [I] Optional. Details for connecting to a remote server. + * iid [I] The ID of the interface of the instance to return. + * ppv [O] On returns, contains a pointer to the specified interface of the object. + * + * RETURNS + * Success: S_OK + * Failure: HRESULT code. + * + * NOTES + * The dwClsContext parameter can be one or more of the following: + *| CLSCTX_INPROC_SERVER - Use an in-process server, such as from a DLL. + *| CLSCTX_INPROC_HANDLER - Use an in-process object which handles certain functions for an object running in another process. + *| CLSCTX_LOCAL_SERVER - Connect to an object running in another process. + *| CLSCTX_REMOTE_SERVER - Connect to an object running on another machine. + * + * SEE ALSO + * CoCreateInstance() */ HRESULT WINAPI CoGetClassObject( REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, @@ -1985,7 +2003,15 @@ HRESULT WINAPI CoResumeClassObjects(void) /*********************************************************************** * GetClassFile (OLE32.@) * - * This function supplies the CLSID associated with the given filename. + * Retrieves the class ID associated with the given filename. + * + * PARAMS + * filePathName [I] Filename to retrieve the class ID for. + * pclsid [O] Address that receives the class ID for the file. + * + * RETURNS + * Success: S_OK. + * Failure: Any HRESULT code. */ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) {

1 0

Rob Shearman : ole32: Handle NULL sub-objects correctly in the STGMEDIUM user marshaling functions so that no further data in marshaled or unmarshaled .
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 1b8537bebdf1231eaadb43a1de7c250cb381d2fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8537bebdf1231eaadb43a1d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:20:52 2007 +0100 ole32: Handle NULL sub-objects correctly in the STGMEDIUM user marshaling functions so that no further data in marshaled or unmarshaled. --- dlls/ole32/usrmarshal.c | 91 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 73 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 550b201..1651cd7 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1470,7 +1470,8 @@ ULONG __RPC_USER STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, STGMEDIUM break; case TYMED_HGLOBAL: TRACE("TYMED_HGLOBAL\n"); - size = HGLOBAL_UserSize(pFlags, size, &pStgMedium->u.hGlobal); + if (pStgMedium->u.hGlobal) + size = HGLOBAL_UserSize(pFlags, size, &pStgMedium->u.hGlobal); break; case TYMED_FILE: TRACE("TYMED_FILE\n"); @@ -1482,21 +1483,35 @@ ULONG __RPC_USER STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, STGMEDIUM } break; case TYMED_ISTREAM: - FIXME("TYMED_ISTREAM\n"); + TRACE("TYMED_ISTREAM\n"); + if (pStgMedium->u.pstm) + { + FIXME("not implemented for IStream %p\n", pStgMedium->u.pstm); + } break; case TYMED_ISTORAGE: - FIXME("TYMED_ISTORAGE\n"); + TRACE("TYMED_ISTORAGE\n"); + if (pStgMedium->u.pstg) + { + FIXME("not implemented for IStorage %p\n", pStgMedium->u.pstg); + } break; case TYMED_GDI: - FIXME("TYMED_GDI\n"); + TRACE("TYMED_GDI\n"); + if (pStgMedium->u.hBitmap) + { + FIXME("not implemented for GDI object %p\n", pStgMedium->u.hBitmap); + } break; case TYMED_MFPICT: TRACE("TYMED_MFPICT\n"); - size = HMETAFILEPICT_UserSize(pFlags, size, &pStgMedium->u.hMetaFilePict); + if (pStgMedium->u.hMetaFilePict) + size = HMETAFILEPICT_UserSize(pFlags, size, &pStgMedium->u.hMetaFilePict); break; case TYMED_ENHMF: TRACE("TYMED_ENHMF\n"); - size = HENHMETAFILE_UserSize(pFlags, size, &pStgMedium->u.hEnhMetaFile); + if (pStgMedium->u.hEnhMetaFile) + size = HENHMETAFILE_UserSize(pFlags, size, &pStgMedium->u.hEnhMetaFile); break; default: RaiseException(DV_E_TYMED, 0, 0, NULL); @@ -1550,7 +1565,8 @@ unsigned char * __RPC_USER STGMEDIUM_UserMarshal(ULONG *pFlags, unsigned char *p break; case TYMED_HGLOBAL: TRACE("TYMED_HGLOBAL\n"); - pBuffer = HGLOBAL_UserMarshal(pFlags, pBuffer, &pStgMedium->u.hGlobal); + if (pStgMedium->u.hGlobal) + pBuffer = HGLOBAL_UserMarshal(pFlags, pBuffer, &pStgMedium->u.hGlobal); break; case TYMED_FILE: TRACE("TYMED_FILE\n"); @@ -1573,21 +1589,35 @@ unsigned char * __RPC_USER STGMEDIUM_UserMarshal(ULONG *pFlags, unsigned char *p } break; case TYMED_ISTREAM: - FIXME("TYMED_ISTREAM\n"); + TRACE("TYMED_ISTREAM\n"); + if (pStgMedium->u.pstm) + { + FIXME("not implemented for IStream %p\n", pStgMedium->u.pstm); + } break; case TYMED_ISTORAGE: - FIXME("TYMED_ISTORAGE\n"); + TRACE("TYMED_ISTORAGE\n"); + if (pStgMedium->u.pstg) + { + FIXME("not implemented for IStorage %p\n", pStgMedium->u.pstg); + } break; case TYMED_GDI: - FIXME("TYMED_GDI\n"); + TRACE("TYMED_GDI\n"); + if (pStgMedium->u.hBitmap) + { + FIXME("not implemented for GDI object %p\n", pStgMedium->u.hBitmap); + } break; case TYMED_MFPICT: TRACE("TYMED_MFPICT\n"); - pBuffer = HMETAFILEPICT_UserMarshal(pFlags, pBuffer, &pStgMedium->u.hMetaFilePict); + if (pStgMedium->u.hMetaFilePict) + pBuffer = HMETAFILEPICT_UserMarshal(pFlags, pBuffer, &pStgMedium->u.hMetaFilePict); break; case TYMED_ENHMF: TRACE("TYMED_ENHMF\n"); - pBuffer = HENHMETAFILE_UserMarshal(pFlags, pBuffer, &pStgMedium->u.hEnhMetaFile); + if (pStgMedium->u.hEnhMetaFile) + pBuffer = HENHMETAFILE_UserMarshal(pFlags, pBuffer, &pStgMedium->u.hEnhMetaFile); break; default: RaiseException(DV_E_TYMED, 0, 0, NULL); @@ -1644,7 +1674,8 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char break; case TYMED_HGLOBAL: TRACE("TYMED_HGLOBAL\n"); - pBuffer = HGLOBAL_UserUnmarshal(pFlags, pBuffer, &pStgMedium->u.hGlobal); + if (content) + pBuffer = HGLOBAL_UserUnmarshal(pFlags, pBuffer, &pStgMedium->u.hGlobal); break; case TYMED_FILE: TRACE("TYMED_FILE\n"); @@ -1686,21 +1717,45 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char pStgMedium->u.lpszFileName = NULL; break; case TYMED_ISTREAM: - FIXME("TYMED_ISTREAM\n"); + TRACE("TYMED_ISTREAM\n"); + if (content) + { + FIXME("not implemented for IStream\n"); + } + else + pStgMedium->u.pstm = NULL; break; case TYMED_ISTORAGE: - FIXME("TYMED_ISTORAGE\n"); + TRACE("TYMED_ISTORAGE\n"); + if (content) + { + FIXME("not implemented for IStorage\n"); + } + else + pStgMedium->u.pstg = NULL; break; case TYMED_GDI: - FIXME("TYMED_GDI\n"); + TRACE("TYMED_GDI\n"); + if (content) + { + FIXME("not implemented for GDI object\n"); + } + else + pStgMedium->u.hBitmap = NULL; break; case TYMED_MFPICT: TRACE("TYMED_MFPICT\n"); - pBuffer = HMETAFILEPICT_UserUnmarshal(pFlags, pBuffer, &pStgMedium->u.hMetaFilePict); + if (content) + pBuffer = HMETAFILEPICT_UserUnmarshal(pFlags, pBuffer, &pStgMedium->u.hMetaFilePict); + else + pStgMedium->u.hMetaFilePict = NULL; break; case TYMED_ENHMF: TRACE("TYMED_ENHMF\n"); - pBuffer = HENHMETAFILE_UserUnmarshal(pFlags, pBuffer, &pStgMedium->u.hEnhMetaFile); + if (content) + pBuffer = HENHMETAFILE_UserUnmarshal(pFlags, pBuffer, &pStgMedium->u.hEnhMetaFile); + else + pStgMedium->u.hEnhMetaFile = NULL; break; default: RaiseException(DV_E_TYMED, 0, 0, NULL);

1 0

Rob Shearman : ole32: Move GetClassFile to moniker. c and move OleRun to ole2.c.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 2514c0141e574197ab2df3b87c3c732d84401b1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2514c0141e574197ab2df3b87… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:25:21 2007 +0100 ole32: Move GetClassFile to moniker.c and move OleRun to ole2.c. --- dlls/ole32/compobj.c | 102 ------------------------ dlls/ole32/moniker.c | 216 +++++++++++++++++++++++++++++++++---------------- dlls/ole32/ole2.c | 28 +++++++ 3 files changed, 173 insertions(+), 173 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2514c0141e574197ab2df…

1 0