July 2007 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Find the shader constant limit at adapter init time.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 30724a6ec2526abd937546be9d7c9c650ee41e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=30724a6ec2526abd937546be9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 16 19:59:41 2007 +0200 wined3d: Find the shader constant limit at adapter init time. --- dlls/wined3d/directx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dfe27a9..86eb0cc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2471,10 +2471,6 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, object->shader_backend = &none_shader_backend; } - /* This function should *not* be modifying GL caps - * TODO: move the functionality where it belongs */ - select_shader_max_constants(object->ps_selected_mode, object->vs_selected_mode, &GLINFO_LOCATION); - /* set the state of the device to valid */ object->state = WINED3D_OK; @@ -2522,6 +2518,7 @@ ULONG WINAPI D3DCB_DefaultDestroyVolume(IWineD3DVolume *pVolume) { BOOL InitAdapters(void) { HDC device_context; BOOL ret; + int ps_selected_mode, vs_selected_mode; /* No need to hold any lock. The calling library makes sure only one thread calls * wined3d simultaneously @@ -2559,6 +2556,9 @@ BOOL InitAdapters(void) { } Adapters[0].driver = "Display"; Adapters[0].description = "Direct3D HAL"; + + select_shader_mode(&Adapters[0].gl_info, WINED3DDEVTYPE_HAL, &ps_selected_mode, &vs_selected_mode); + select_shader_max_constants(ps_selected_mode, vs_selected_mode, &Adapters[0].gl_info); } numAdapters = 1; TRACE("%d adapters successfully initialized\n", numAdapters);

1 0

Stefan Dösinger : wined3d: Allocate render target management members in Init3D.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: b9379fc3892b85ab2e39e64a5cf9ee6f8c679453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9379fc3892b85ab2e39e64a5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 16 19:49:34 2007 +0200 wined3d: Allocate render target management members in Init3D. --- dlls/wined3d/device.c | 16 ++++++++++++---- dlls/wined3d/directx.c | 4 ---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 43c65b6..07d5a79 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -192,10 +192,6 @@ static ULONG WINAPI IWineD3DDeviceImpl_Release(IWineD3DDevice *iface) { GL_EXTCALL(glDeleteFramebuffersEXT(1, &This->dst_fbo)); } - HeapFree(GetProcessHeap(), 0, This->render_targets); - HeapFree(GetProcessHeap(), 0, This->fbo_color_attachments); - HeapFree(GetProcessHeap(), 0, This->draw_buffers); - if (This->glsl_program_lookup) hash_table_destroy(This->glsl_program_lookup); /* TODO: Clean up all the surfaces and textures! */ @@ -1809,6 +1805,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR if (WINED3D_OK != hr) return hr; + This->render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DSurface *) * GL_LIMITS(buffers)); + This->fbo_color_attachments = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DSurface *) * GL_LIMITS(buffers)); + This->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLenum) * GL_LIMITS(buffers)); + /* Initialize the texture unit mapping to a 1:1 mapping */ for (state = 0; state < MAX_COMBINED_SAMPLERS; ++state) { if (state < GL_LIMITS(fragment_samplers)) { @@ -2010,6 +2010,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D } } + HeapFree(GetProcessHeap(), 0, This->render_targets); + HeapFree(GetProcessHeap(), 0, This->fbo_color_attachments); + HeapFree(GetProcessHeap(), 0, This->draw_buffers); + This->render_targets = NULL; + This->fbo_color_attachments = NULL; + This->draw_buffers = NULL; + + This->d3d_initialized = FALSE; return WINED3D_OK; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ebb07bf..dfe27a9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2475,10 +2475,6 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, * TODO: move the functionality where it belongs */ select_shader_max_constants(object->ps_selected_mode, object->vs_selected_mode, &GLINFO_LOCATION); - object->render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DSurface *) * GL_LIMITS(buffers)); - object->fbo_color_attachments = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DSurface *) * GL_LIMITS(buffers)); - object->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLenum) * GL_LIMITS(buffers)); - /* set the state of the device to valid */ object->state = WINED3D_OK;

1 0

Alexandre Julliard : ntdll: Support single quotes around XML attribute values.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 6f457ac63b8d5324d413126d2453cbf18b942b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f457ac63b8d5324d413126d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 26 11:07:01 2007 +0200 ntdll: Support single quotes around XML attribute values. --- dlls/ntdll/actctx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 98ffd38..912d823 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -653,12 +653,12 @@ static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value, xmlbuf->ptr = ptr; ptr++; - if (ptr == xmlbuf->end || *ptr != '\"') return FALSE; + if (ptr == xmlbuf->end || (*ptr != '"' && *ptr != '\'')) return FALSE; value->ptr = ++ptr; if (ptr == xmlbuf->end) return FALSE; - ptr = memchr(ptr, '\"', xmlbuf->end - ptr); + ptr = memchr(ptr, ptr[-1], xmlbuf->end - ptr); if (!ptr) { xmlbuf->ptr = xmlbuf->end;

1 0

Stefan Dösinger : wined3d: Attempt to clean up fbos only if a gl surface is destroyed.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 327aa543a432cd92d31850c4705e33402f369942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=327aa543a432cd92d31850c47… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 18 23:13:58 2007 +0200 wined3d: Attempt to clean up fbos only if a gl surface is destroyed. --- dlls/wined3d/device.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0bdb753..43c65b6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6443,19 +6443,21 @@ static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IW case WINED3DRTYPE_SURFACE: { unsigned int i; - /* Cleanup any FBO attachments */ - for (i = 0; i < GL_LIMITS(buffers); ++i) { - if (This->fbo_color_attachments[i] == (IWineD3DSurface *)resource) { + /* Cleanup any FBO attachments if d3d is enabled */ + if(This->d3d_initialized) { + for (i = 0; i < GL_LIMITS(buffers); ++i) { + if (This->fbo_color_attachments[i] == (IWineD3DSurface *)resource) { + bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); + set_render_target_fbo(iface, i, NULL); + This->fbo_color_attachments[i] = NULL; + } + } + if (This->fbo_depth_attachment == (IWineD3DSurface *)resource) { bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); - set_render_target_fbo(iface, i, NULL); - This->fbo_color_attachments[i] = NULL; + set_depth_stencil_fbo(iface, NULL); + This->fbo_depth_attachment = NULL; } } - if (This->fbo_depth_attachment == (IWineD3DSurface *)resource) { - bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); - set_depth_stencil_fbo(iface, NULL); - This->fbo_depth_attachment = NULL; - } break; }

1 0

Eric Pouech : ntdll: Implemented RtlFindActivationContextSectionString.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 6792a9a92ea3b0e9a77d9a594b327c25855e1fce URL: http://source.winehq.org/git/wine.git/?a=commit;h=6792a9a92ea3b0e9a77d9a594… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Jul 25 20:37:36 2007 +0200 ntdll: Implemented RtlFindActivationContextSectionString. --- dlls/kernel32/actctx.c | 41 +++----------- dlls/ntdll/actctx.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 4 files changed, 151 insertions(+), 33 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index 2d1e11c..33aa10e 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -234,39 +234,16 @@ BOOL WINAPI FindActCtxSectionStringW(DWORD dwFlags, const GUID* lpExtGuid, ULONG ulId, LPCWSTR lpSearchStr, PACTCTX_SECTION_KEYED_DATA pInfo) { - FIXME("%08x %s %u %s %p\n", dwFlags, debugstr_guid(lpExtGuid), - ulId, debugstr_w(lpSearchStr), pInfo); - - if (lpExtGuid) - { - FIXME("expected lpExtGuid == NULL\n"); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if (dwFlags & ~FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX) - { - FIXME("unknown dwFlags %08x\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if (!pInfo || pInfo->cbSize < sizeof (ACTCTX_SECTION_KEYED_DATA)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - pInfo->ulDataFormatVersion = 1; - pInfo->lpData = NULL; - pInfo->lpSectionGlobalData = NULL; - pInfo->ulSectionGlobalDataLength = 0; - pInfo->lpSectionBase = NULL; - pInfo->ulSectionTotalLength = 0; - pInfo->hActCtx = ACTCTX_FAKE_HANDLE; - pInfo->ulAssemblyRosterIndex = 0; + UNICODE_STRING us; + NTSTATUS status; - return TRUE; + RtlInitUnicodeString(&us, lpSearchStr); + if ((status = RtlFindActivationContextSectionString(dwFlags, lpExtGuid, ulId, &us, pInfo))) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + return TRUE; } /*********************************************************************** diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 14336c0..98ffd38 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1972,6 +1972,102 @@ static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags ) return status; } +static NTSTATUS fill_keyed_data(PACTCTX_SECTION_KEYED_DATA data, PVOID v1, PVOID v2, unsigned int i) +{ + data->ulDataFormatVersion = 1; + data->lpData = v1; + data->ulLength = 20; /* FIXME */ + data->lpSectionGlobalData = NULL; /* FIXME */ + data->ulSectionGlobalDataLength = 0; /* FIXME */ + data->lpSectionBase = v2; + data->ulSectionTotalLength = 0; /* FIXME */ + data->hActCtx = NULL; + if (data->cbSize >= offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) + data->ulAssemblyRosterIndex = i + 1; + + return STATUS_SUCCESS; +} + +static NTSTATUS find_dll_redirection(ACTIVATION_CONTEXT* actctx, const UNICODE_STRING *section_name, + PACTCTX_SECTION_KEYED_DATA data) +{ + unsigned int i, j, snlen = section_name->Length / sizeof(WCHAR); + + for (i = 0; i < actctx->num_assemblies; i++) + { + struct assembly *assembly = &actctx->assemblies[i]; + for (j = 0; j < assembly->num_dlls; j++) + { + struct dll_redirect *dll = &assembly->dlls[j]; + if (!strncmpiW(section_name->Buffer, dll->name, snlen) && !dll->name[snlen]) + return fill_keyed_data(data, dll, assembly, i); + } + } + return STATUS_SXS_KEY_NOT_FOUND; +} + +static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRING *section_name, + PACTCTX_SECTION_KEYED_DATA data) +{ + unsigned int i, j, k, snlen = section_name->Length / sizeof(WCHAR); + + for (i = 0; i < actctx->num_assemblies; i++) + { + struct assembly *assembly = &actctx->assemblies[i]; + for (j = 0; j < assembly->num_dlls; j++) + { + struct dll_redirect *dll = &assembly->dlls[j]; + for (k = 0; k < dll->entities.num; k++) + { + struct entity *entity = &dll->entities.base[k]; + if (entity->kind == ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION) + { + if (!strncmpiW(section_name->Buffer, entity->u.class.name, snlen) && !entity->u.class.name[snlen]) + return fill_keyed_data(data, entity, dll, i); + } + } + } + } + return STATUS_SXS_KEY_NOT_FOUND; +} + +static NTSTATUS find_string(ACTIVATION_CONTEXT* actctx, ULONG section_kind, + const UNICODE_STRING *section_name, + DWORD flags, PACTCTX_SECTION_KEYED_DATA data) +{ + NTSTATUS status; + + switch (section_kind) + { + case ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION: + status = find_dll_redirection(actctx, section_name, data); + break; + case ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION: + status = find_window_class(actctx, section_name, data); + break; + case ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION: + case ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION: + case ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION: + case ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION: + case ACTIVATION_CONTEXT_SECTION_GLOBAL_OBJECT_RENAME_TABLE: + case ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES: + FIXME("Unsupported yet section_kind %x\n", section_kind); + return STATUS_SXS_SECTION_NOT_FOUND; + default: + WARN("Unknown section_kind %x\n", section_kind); + return STATUS_SXS_SECTION_NOT_FOUND; + } + + if (status != STATUS_SUCCESS) return status; + + if (flags & FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX) + { + actctx_addref(actctx); + data->hActCtx = actctx; + } + return STATUS_SUCCESS; +} + /* initialize the activation context for the current process */ void actctx_init(void) { @@ -2434,3 +2530,47 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle } return STATUS_SUCCESS; } + +/*********************************************************************** + * RtlFindActivationContextSectionString (NTDLL.@) + * + * Find information about a string in an activation context. + * FIXME: function signature/prototype may be wrong + */ +NTSTATUS WINAPI RtlFindActivationContextSectionString( ULONG flags, const GUID *guid, ULONG section_kind, + const UNICODE_STRING *section_name, PVOID ptr ) +{ + PACTCTX_SECTION_KEYED_DATA data = ptr; + NTSTATUS status = STATUS_SXS_KEY_NOT_FOUND; + + TRACE("%08x %s %u %s %p\n", flags, debugstr_guid(guid), section_kind, + debugstr_us(section_name), data); + + if (guid) + { + FIXME("expected guid == NULL\n"); + return STATUS_INVALID_PARAMETER; + } + if (flags & ~FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX) + { + FIXME("unknown flags %08x\n", flags); + return STATUS_INVALID_PARAMETER; + } + if (!data || data->cbSize < offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) || + !section_name || !section_name->Buffer) + { + WARN("invalid parameter\n"); + return STATUS_INVALID_PARAMETER; + } + + if (NtCurrentTeb()->ActivationContextStack.ActiveFrame) + { + ACTIVATION_CONTEXT *actctx = check_actctx(NtCurrentTeb()->ActivationContextStack.ActiveFrame->ActivationContext); + if (actctx) status = find_string( actctx, section_kind, section_name, flags, data ); + } + + if (status != STATUS_SUCCESS) + status = find_string( process_actctx, section_kind, section_name, flags, data ); + + return status; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6f05412..d12123a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -574,7 +574,7 @@ @ stdcall RtlFillMemoryUlong(ptr long long) @ stub RtlFinalReleaseOutOfProcessMemoryStream @ stub RtlFindActivationContextSectionGuid -@ stub RtlFindActivationContextSectionString +@ stdcall RtlFindActivationContextSectionString(long ptr long ptr ptr) @ stdcall RtlFindCharInUnicodeString(long ptr ptr ptr) @ stdcall RtlFindClearBits(ptr long long) @ stdcall RtlFindClearBitsAndSet(ptr long long) diff --git a/include/winternl.h b/include/winternl.h index 8ad8329..d1764cd 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2081,6 +2081,7 @@ LONGLONG WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT); LONGLONG WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT); LONGLONG WINAPI RtlExtendedLargeIntegerDivide(LONGLONG,INT,INT *); +NTSTATUS WINAPI RtlFindActivationContextSectionString(ULONG,const GUID*,ULONG,const UNICODE_STRING*,PVOID); NTSTATUS WINAPI RtlFindCharInUnicodeString(int,const UNICODE_STRING*,const UNICODE_STRING*,USHORT*); ULONG WINAPI RtlFindClearBits(PCRTL_BITMAP,ULONG,ULONG); ULONG WINAPI RtlFindClearBitsAndSet(PRTL_BITMAP,ULONG,ULONG);

1 0

Jacek Caban : kernel32: Added FindActCtxSectionStringA implementation.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: dcbbd30064f87d88132b14eb0acd465d09ad45e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcbbd30064f87d88132b14eb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 25 20:37:49 2007 +0200 kernel32: Added FindActCtxSectionStringA implementation. --- dlls/kernel32/actctx.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index 33aa10e..4591d8b 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -219,10 +219,27 @@ BOOL WINAPI FindActCtxSectionStringA(DWORD dwFlags, const GUID* lpExtGuid, ULONG ulId, LPCSTR lpSearchStr, PACTCTX_SECTION_KEYED_DATA pInfo) { - FIXME("%08x %s %u %s %p\n", dwFlags, debugstr_guid(lpExtGuid), - ulId, debugstr_a(lpSearchStr), pInfo); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LPWSTR search_str; + DWORD len; + BOOL ret; + + TRACE("%08x %s %u %s %p\n", dwFlags, debugstr_guid(lpExtGuid), + ulId, debugstr_a(lpSearchStr), pInfo); + + if (!lpSearchStr) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + len = MultiByteToWideChar(CP_ACP, 0, lpSearchStr, -1, NULL, 0); + search_str = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpSearchStr, -1, search_str, len); + + ret = FindActCtxSectionStringW(dwFlags, lpExtGuid, ulId, search_str, pInfo); + + HeapFree(GetProcessHeap(), 0, search_str); + return ret; } /***********************************************************************

1 0

Alexandre Julliard : ntdll: Use activation contexts information to load dlls ( based on a patch by Jacek Caban).
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 76bd190a72902d6efab2c85f8aa0d775d02c68da URL: http://source.winehq.org/git/wine.git/?a=commit;h=76bd190a72902d6efab2c85f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 25 21:33:46 2007 +0200 ntdll: Use activation contexts information to load dlls (based on a patch by Jacek Caban). --- dlls/ntdll/loader.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 700b673..5ed7df9 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1578,6 +1578,70 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, /*********************************************************************** + * find_actctx_dll + * + * Find the full path (if any) of the dll from the activation context. + */ +static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) +{ + static const WCHAR winsxsW[] = {'\\','w','i','n','s','x','s','\\'}; + + ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *info; + ACTCTX_SECTION_KEYED_DATA data; + UNICODE_STRING nameW; + NTSTATUS status; + SIZE_T needed, size = 1024; + WCHAR *p; + + RtlInitUnicodeString( &nameW, libname ); + data.cbSize = sizeof(data); + status = RtlFindActivationContextSectionString( FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, + ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, + &nameW, &data ); + if (status != STATUS_SUCCESS) return status; + + for (;;) + { + if (!(info = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + { + status = STATUS_NO_MEMORY; + goto done; + } + status = RtlQueryInformationActivationContext( 0, data.hActCtx, &data.ulAssemblyRosterIndex, + AssemblyDetailedInformationInActivationContext, + info, size, &needed ); + if (status == STATUS_SUCCESS) break; + if (status != STATUS_BUFFER_TOO_SMALL) goto done; + RtlFreeHeap( GetProcessHeap(), 0, info ); + size = needed; + /* restart with larger buffer */ + } + + needed = (windows_dir.Length + sizeof(winsxsW) + info->ulAssemblyDirectoryNameLength + + nameW.Length + 2*sizeof(WCHAR)); + + if (!(*fullname = p = RtlAllocateHeap( GetProcessHeap(), 0, needed ))) + { + status = STATUS_NO_MEMORY; + goto done; + } + memcpy( p, windows_dir.Buffer, windows_dir.Length ); + p += windows_dir.Length / sizeof(WCHAR); + memcpy( p, winsxsW, sizeof(winsxsW) ); + p += sizeof(winsxsW) / sizeof(WCHAR); + memcpy( p, info->lpAssemblyDirectoryName, info->ulAssemblyDirectoryNameLength ); + p += info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); + *p++ = '\\'; + strcpyW( p, libname ); + TRACE ("found %s for %s\n", debugstr_w(*fullname), debugstr_w(libname) ); +done: + RtlFreeHeap( GetProcessHeap(), 0, info ); + RtlReleaseActivationContext( data.hActCtx ); + return status; +} + + +/*********************************************************************** * find_dll_file * * Find the file (or already loaded module) for a given dll name. @@ -1608,7 +1672,22 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (!contains_path( libname )) { + NTSTATUS status; + WCHAR *fullname; + if ((*pwm = find_basename_module( libname )) != NULL) goto found; + + status = find_actctx_dll( libname, &fullname ); + if (status == STATUS_SUCCESS) + { + RtlFreeHeap( GetProcessHeap(), 0, dllname ); + libname = dllname = fullname; + } + else if (status != STATUS_SXS_KEY_NOT_FOUND) + { + RtlFreeHeap( GetProcessHeap(), 0, dllname ); + return status; + } } if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH)

1 0

Alexandre Julliard : ntdll: Activate the module' s activation context while resolving imports and attaching.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: e06eaa49ae04444981a92d2aebf590a9d2a1455f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06eaa49ae04444981a92d2ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 26 11:06:17 2007 +0200 ntdll: Activate the module's activation context while resolving imports and attaching. --- dlls/ntdll/loader.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5ed7df9..44647da 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -621,10 +621,12 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) WINE_MODREF *prev; DWORD size; NTSTATUS status; + ULONG_PTR cookie; if (!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) return STATUS_SUCCESS; /* already done */ wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; - create_module_activation_context( &wm->ldr ); + if (!create_module_activation_context( &wm->ldr )) + RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); if (!(imports = RtlImageDirectoryEntryToData( wm->ldr.BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) @@ -651,6 +653,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) status = STATUS_DLL_NOT_FOUND; } current_modref = prev; + if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); return status; } @@ -927,6 +930,7 @@ static BOOL MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved ) static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) { NTSTATUS status = STATUS_SUCCESS; + ULONG_PTR cookie; int i; if (process_detaching) return status; @@ -940,6 +944,7 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) /* Tag current MODREF to prevent recursive loop */ wm->ldr.Flags |= LDR_LOAD_IN_PROGRESS; + if (wm->ldr.ActivationContext) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); /* Recursively attach all DLLs this one depends on */ for ( i = 0; i < wm->nDeps; i++ ) @@ -971,6 +976,7 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) InsertTailList(&NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList, &wm->ldr.InInitializationOrderModuleList); + if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); /* Remove recursion flag */ wm->ldr.Flags &= ~LDR_LOAD_IN_PROGRESS;

1 0

Eric Pouech : ntdll: Implemented FileInformationInAssemblyOfAssemblyInActivationContext option in RtlQueryInformationActivationContext .
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: e590499c7a1b5fc5128d6c12be9f75dbd595a0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e590499c7a1b5fc5128d6c12b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Jul 25 19:04:36 2007 +0200 ntdll: Implemented FileInformationInAssemblyOfAssemblyInActivationContext option in RtlQueryInformationActivationContext. --- dlls/ntdll/actctx.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 7eda748..14336c0 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2387,6 +2387,47 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle break; case FileInformationInAssemblyOfAssemblyInActivationContext: + { + const ACTIVATION_CONTEXT_QUERY_INDEX *acqi = subinst; + ASSEMBLY_FILE_DETAILED_INFORMATION *afdi = buffer; + struct assembly *assembly; + struct dll_redirect *dll; + SIZE_T len, dll_len = 0; + LPWSTR ptr; + + if (!(actctx = check_actctx(handle))) return STATUS_INVALID_PARAMETER; + if (!acqi) return STATUS_INVALID_PARAMETER; + + if (acqi->ulAssemblyIndex >= actctx->num_assemblies) + return STATUS_INVALID_PARAMETER; + assembly = &actctx->assemblies[acqi->ulAssemblyIndex]; + + if (acqi->ulFileIndexInAssembly >= assembly->num_dlls) + return STATUS_INVALID_PARAMETER; + dll = &assembly->dlls[acqi->ulFileIndexInAssembly]; + + if (dll->name) dll_len = strlenW(dll->name) + 1; + len = sizeof(*afdi) + dll_len * sizeof(WCHAR); + + if (!buffer || bufsize < len) + { + if (retlen) *retlen = len; + return STATUS_BUFFER_TOO_SMALL; + } + if (retlen) *retlen = 0; /* yes that's what native does !! */ + afdi->ulFlags = ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION; + afdi->ulFilenameLength = dll_len ? (dll_len - 1) * sizeof(WCHAR) : 0; + afdi->ulPathLength = 0; /* FIXME */ + ptr = (LPWSTR)(afdi + 1); + if (dll_len) + { + afdi->lpFileName = ptr; + memcpy( ptr, dll->name, dll_len * sizeof(WCHAR) ); + } else afdi->lpFileName = NULL; + afdi->lpFilePath = NULL; /* FIXME */ + } + break; + default: FIXME( "class %u not implemented\n", class ); return STATUS_NOT_IMPLEMENTED;

1 0

Eric Pouech : ntdll: Implemented AssemblyDetailedInformationInActivationContext option in RtlQueryInformationActivationContext .
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 35eb9223c2838efc2bd65a1a4b252fe3f0735610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35eb9223c2838efc2bd65a1a4… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Jul 25 21:41:10 2007 +0200 ntdll: Implemented AssemblyDetailedInformationInActivationContext option in RtlQueryInformationActivationContext. --- dlls/ntdll/actctx.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 119 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index fadcf73..7eda748 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -227,6 +227,7 @@ struct actctx_loader #define MANIFESTV3_NAMESPACE "urn:schemas-microsoft-com:asm.v3" static const WCHAR dotManifestW[] = {'.','m','a','n','i','f','e','s','t',0}; +static const WCHAR version_formatW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; static ACTIVATION_CONTEXT system_actctx = { ACTCTX_MAGIC, 1 }; static ACTIVATION_CONTEXT *process_actctx = &system_actctx; @@ -490,7 +491,6 @@ static WCHAR *build_assembly_dir(struct assembly_identity* ai) static const WCHAR undW[] = {'_',0}; static const WCHAR noneW[] = {'n','o','n','e',0}; static const WCHAR mskeyW[] = {'d','e','a','d','b','e','e','f',0}; - static const WCHAR versionW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; const WCHAR *key = ai->public_key ? ai->public_key : noneW; const WCHAR *lang = ai->language ? ai->language : noneW; @@ -506,7 +506,7 @@ static WCHAR *build_assembly_dir(struct assembly_identity* ai) strcatW( ret, undW ); strcatW( ret, key ); strcatW( ret, undW ); - sprintfW( ret + strlenW(ret), versionW, + sprintfW( ret + strlenW(ret), version_formatW, ai->version.major, ai->version.minor, ai->version.build, ai->version.revision ); strcatW( ret, undW ); strcatW( ret, lang ); @@ -515,6 +515,54 @@ static WCHAR *build_assembly_dir(struct assembly_identity* ai) return ret; } +static inline void append_string( WCHAR *buffer, const WCHAR *prefix, const WCHAR *str ) +{ + WCHAR *p = buffer; + + if (!str) return; + strcatW( buffer, prefix ); + p += strlenW(p); + *p++ = '"'; + strcpyW( p, str ); + p += strlenW(p); + *p++ = '"'; + *p = 0; +} + +static WCHAR *build_assembly_id( const struct assembly_identity *ai ) +{ + static const WCHAR archW[] = + {',','p','r','o','c','e','s','s','o','r','A','r','c','h','i','t','e','c','t','u','r','e','=',0}; + static const WCHAR public_keyW[] = + {',','p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','"',0}; + static const WCHAR typeW[] = + {',','t','y','p','e','=','"','w','i','n','3','2','"',0}; + static const WCHAR versionW[] = + {',','v','e','r','s','i','o','n','=',0}; + + WCHAR version[64], *ret; + SIZE_T size = 0; + + sprintfW( version, version_formatW, + ai->version.major, ai->version.minor, ai->version.build, ai->version.revision ); + if (ai->name) size += strlenW(ai->name) * sizeof(WCHAR); + if (ai->arch) size += strlenW(archW) + strlenW(ai->arch) + 2; + if (ai->public_key) size += strlenW(public_keyW) + strlenW(ai->public_key) + 2; + if (ai->type == TYPE_WIN32) size += strlenW(typeW); + size += strlenW(versionW) + strlenW(version) + 2; + + if (!(ret = RtlAllocateHeap( GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR) ))) + return NULL; + + if (ai->name) strcpyW( ret, ai->name ); + else *ret = 0; + append_string( ret, archW, ai->arch ); + append_string( ret, public_keyW, ai->public_key ); + if (ai->type == TYPE_WIN32) strcatW( ret, typeW ); + append_string( ret, versionW, version ); + return ret; +} + static ACTIVATION_CONTEXT *check_actctx( HANDLE h ) { ACTIVATION_CONTEXT *actctx = h; @@ -2269,6 +2317,75 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle break; case AssemblyDetailedInformationInActivationContext: + { + ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *afdi = buffer; + struct assembly *assembly; + WCHAR *assembly_id; + DWORD index; + SIZE_T len, id_len = 0, ad_len = 0, path_len = 0; + LPWSTR ptr; + + if (!(actctx = check_actctx(handle))) return STATUS_INVALID_PARAMETER; + if (!subinst) return STATUS_INVALID_PARAMETER; + + index = *(DWORD*)subinst; + if (!index || index > actctx->num_assemblies) return STATUS_INVALID_PARAMETER; + + assembly = &actctx->assemblies[index - 1]; + + if (!(assembly_id = build_assembly_id( &assembly->id ))) return STATUS_NO_MEMORY; + id_len = strlenW(assembly_id) + 1; + if (assembly->directory) ad_len = strlenW(assembly->directory) + 1; + + if (assembly->manifest.info && assembly->type == ASSEMBLY_MANIFEST) + path_len = strlenW(assembly->manifest.info) + 1; + + len = sizeof(*afdi) + (id_len + ad_len + path_len) * sizeof(WCHAR); + + if (retlen) *retlen = len; + if (!buffer || bufsize < len) + { + RtlFreeHeap( GetProcessHeap(), 0, assembly_id ); + return STATUS_BUFFER_TOO_SMALL; + } + + /* FIXME: this is a big HACK */ + afdi->ulFlags = (index > 1) ? 16 : ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION; + afdi->ulEncodedAssemblyIdentityLength = (id_len - 1) * sizeof(WCHAR); + afdi->ulManifestPathType = assembly->manifest.type; + afdi->ulManifestPathLength = assembly->manifest.info ? (path_len - 1) * sizeof(WCHAR) : 0; + /* FIXME afdi->liManifestLastWriteTime = 0; */ + afdi->ulPolicyPathType = ACTIVATION_CONTEXT_PATH_TYPE_NONE; /* FIXME */ + afdi->ulPolicyPathLength = 0; + /* FIXME afdi->liPolicyLastWriteTime = 0; */ + afdi->ulMetadataSatelliteRosterIndex = 0; /* FIXME */ + afdi->ulManifestVersionMajor = 1; + afdi->ulManifestVersionMinor = 0; + afdi->ulPolicyVersionMajor = 0; /* FIXME */ + afdi->ulPolicyVersionMinor = 0; /* FIXME */ + afdi->ulAssemblyDirectoryNameLength = ad_len ? (ad_len - 1) * sizeof(WCHAR) : 0; + ptr = (LPWSTR)(afdi + 1); + afdi->lpAssemblyEncodedAssemblyIdentity = ptr; + memcpy( ptr, assembly_id, id_len * sizeof(WCHAR) ); + ptr += id_len; + if (path_len) + { + afdi->lpAssemblyManifestPath = ptr; + memcpy(ptr, assembly->manifest.info, path_len * sizeof(WCHAR)); + ptr += path_len; + } else afdi->lpAssemblyManifestPath = NULL; + afdi->lpAssemblyPolicyPath = NULL; /* FIXME */ + if (ad_len) + { + afdi->lpAssemblyDirectoryName = ptr; + memcpy(ptr, assembly->directory, ad_len * sizeof(WCHAR)); + ptr += ad_len; + } + else afdi->lpAssemblyDirectoryName = NULL; + RtlFreeHeap( GetProcessHeap(), 0, assembly_id ); + } + break; + case FileInformationInAssemblyOfAssemblyInActivationContext: default: FIXME( "class %u not implemented\n", class );

1 0