Alexandre Julliard : ntdll: Don'
t add an empty assembly when creating an activation context.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jul 26 06:36:40 CDT 2007
Module: wine
Branch: master
Commit: 82e1aac81d776c203c3e0509f9fb7c7e53921906
URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e1aac81d776c203c3e0509f9fb7c7e53921906
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jul 25 16:47:34 2007 +0200
ntdll: Don't add an empty assembly when creating an activation context.
---
dlls/ntdll/actctx.c | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
index 81e4eaa..1e2e101 100644
--- a/dlls/ntdll/actctx.c
+++ b/dlls/ntdll/actctx.c
@@ -1840,7 +1840,6 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr )
const ACTCTXW *pActCtx = ptr; /* FIXME: not the right structure */
ACTIVATION_CONTEXT *actctx;
UNICODE_STRING nameW;
- struct assembly *assembly;
ULONG lang = 0;
NTSTATUS status = STATUS_NO_MEMORY;
HANDLE file = 0;
@@ -1857,17 +1856,6 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr )
actctx->magic = ACTCTX_MAGIC;
actctx->ref_count = 1;
-
- if (!(assembly = add_assembly( actctx, APPLICATION_MANIFEST ))) goto error;
- if (!(assembly->id.name = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR) )))
- goto error;
- assembly->id.version.major = 1;
- assembly->id.version.minor = 0;
- assembly->id.version.build = 0;
- assembly->id.version.revision = 0;
- assembly->manifest.type = ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE;
- assembly->manifest.info = NULL;
-
actctx->config.type = ACTIVATION_CONTEXT_PATH_TYPE_NONE;
actctx->config.info = NULL;
actctx->appdir.type = ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE;
More information about the wine-cvs
mailing list