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

Mikołaj Zalewski : comctl32: toolbar: Test and fix invalid indexes passed in TB_ISBUTTON*.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: 31be5005c633dee1476a77d93aa27e9c3f628c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31be5005c633dee1476a77d93… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jul 19 12:48:46 2007 +0200 comctl32: toolbar: Test and fix invalid indexes passed in TB_ISBUTTON*. --- dlls/comctl32/tests/toolbar.c | 9 +++++++++ dlls/comctl32/toolbar.c | 12 ++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index f5476d3..b46ef0d 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -147,6 +147,15 @@ static void basic_test(void) ok(SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1000, 0), "A1 pressed\n"); ok(!SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1007, 0), "B2 not pressed\n"); ok(SendMessage(hToolbar, TB_ISBUTTONCHECKED, 1008, 0), "B3 pressed\n"); + + /* tests with invalid index */ + compare(SendMessage(hToolbar, TB_ISBUTTONCHECKED, 0xdeadbeef, 0), -1L, "%ld"); + compare(SendMessage(hToolbar, TB_ISBUTTONPRESSED, 0xdeadbeef, 0), -1L, "%ld"); + compare(SendMessage(hToolbar, TB_ISBUTTONENABLED, 0xdeadbeef, 0), -1L, "%ld"); + compare(SendMessage(hToolbar, TB_ISBUTTONINDETERMINATE, 0xdeadbeef, 0), -1L, "%ld"); + compare(SendMessage(hToolbar, TB_ISBUTTONHIGHLIGHTED, 0xdeadbeef, 0), -1L, "%ld"); + compare(SendMessage(hToolbar, TB_ISBUTTONHIDDEN, 0xdeadbeef, 0), -1L, "%ld"); + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index da6ceab..275d3d5 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3840,7 +3840,7 @@ TOOLBAR_IsButtonChecked (HWND hwnd, WPARAM wParam, LPARAM lParam) nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE); if (nIndex == -1) - return FALSE; + return -1; return (infoPtr->buttons[nIndex].fsState & TBSTATE_CHECKED); } @@ -3854,7 +3854,7 @@ TOOLBAR_IsButtonEnabled (HWND hwnd, WPARAM wParam, LPARAM lParam) nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE); if (nIndex == -1) - return FALSE; + return -1; return (infoPtr->buttons[nIndex].fsState & TBSTATE_ENABLED); } @@ -3868,7 +3868,7 @@ TOOLBAR_IsButtonHidden (HWND hwnd, WPARAM wParam, LPARAM lParam) nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE); if (nIndex == -1) - return TRUE; + return -1; return (infoPtr->buttons[nIndex].fsState & TBSTATE_HIDDEN); } @@ -3882,7 +3882,7 @@ TOOLBAR_IsButtonHighlighted (HWND hwnd, WPARAM wParam, LPARAM lParam) nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE); if (nIndex == -1) - return FALSE; + return -1; return (infoPtr->buttons[nIndex].fsState & TBSTATE_MARKED); } @@ -3896,7 +3896,7 @@ TOOLBAR_IsButtonIndeterminate (HWND hwnd, WPARAM wParam, LPARAM lParam) nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE); if (nIndex == -1) - return FALSE; + return -1; return (infoPtr->buttons[nIndex].fsState & TBSTATE_INDETERMINATE); } @@ -3910,7 +3910,7 @@ TOOLBAR_IsButtonPressed (HWND hwnd, WPARAM wParam, LPARAM lParam) nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE); if (nIndex == -1) - return FALSE; + return -1; return (infoPtr->buttons[nIndex].fsState & TBSTATE_PRESSED); }

1 0

Mikołaj Zalewski : comctl32: tooltips: Remove broken support for non-NULL-terminated strings in TOOLTIPS_GetDispInfo [AW].
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: f53e31418006ad899716007b41fbcb9ad409a24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53e31418006ad899716007b4… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jul 19 16:13:45 2007 +0200 comctl32: tooltips: Remove broken support for non-NULL-terminated strings in TOOLTIPS_GetDispInfo[AW]. --- dlls/comctl32/comctl32.h | 1 + dlls/comctl32/comctl32undoc.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 21 ++++++--------------- 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index e7a3598..5917a9b 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -148,6 +148,7 @@ VOID COMCTL32_RefreshSysColors(void); void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark, BOOL bHorizontal); void COMCTL32_EnsureBitmapSize(HBITMAP *pBitmap, int cxMinWidth, int cyMinHeight, COLORREF crBackground); INT Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen); +INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen); BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc); BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc); diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index d17436f..6f434a6 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -922,6 +922,47 @@ INT Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen) return len; } +/************************************************************************** + * Str_GetPtrAtoW [internal] + * + * Converts a multibyte string into a unicode string + * + * PARAMS + * lpSrc [I] Pointer to the multibyte source string + * lpDest [O] Pointer to caller supplied storage for the unicode string + * nMaxLen [I] Size, in characters, of the destination buffer + * + * RETURNS + * Length, in characters, of the converted string. + */ + +INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) +{ + INT len; + + TRACE("(%s %p %d)\n", debugstr_a(lpSrc), lpDest, nMaxLen); + + if (!lpDest && lpSrc) + return MultiByteToWideChar(CP_ACP, 0, lpSrc, -1, 0, 0); + + if (nMaxLen == 0) + return 0; + + if (lpSrc == NULL) { + lpDest[0] = '\0'; + return 0; + } + + len = MultiByteToWideChar(CP_ACP, 0, lpSrc, -1, 0, 0); + if (len >= nMaxLen) + len = nMaxLen - 1; + + MultiByteToWideChar(CP_ACP, 0, lpSrc, -1, lpDest, len); + lpDest[len] = '\0'; + + return len; +} + /************************************************************************** * Str_SetPtrAtoW [internal] diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 4e11c5c..9dd1970 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -336,17 +336,11 @@ static void TOOLTIPS_GetDispInfoA(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO infoPtr->szTipText[0] = '\0'; } else if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKA) { - INT max_len = (ttnmdi.lpszText == &ttnmdi.szText[0]) ? - sizeof(ttnmdi.szText)/sizeof(ttnmdi.szText[0]) : -1; - MultiByteToWideChar(CP_ACP, 0, ttnmdi.lpszText, max_len, - infoPtr->szTipText, INFOTIPSIZE); + Str_GetPtrAtoW(ttnmdi.lpszText, infoPtr->szTipText, INFOTIPSIZE); if (ttnmdi.uFlags & TTF_DI_SETITEM) { - INT len = MultiByteToWideChar(CP_ACP, 0, ttnmdi.lpszText, - max_len, NULL, 0); toolPtr->hinst = 0; - toolPtr->lpszText = Alloc (len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, ttnmdi.lpszText, -1, - toolPtr->lpszText, len); + toolPtr->lpszText = NULL; + Str_SetPtrW(&toolPtr->lpszText, infoPtr->szTipText); } } else { @@ -385,14 +379,11 @@ static void TOOLTIPS_GetDispInfoW(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO infoPtr->szTipText[0] = '\0'; } else if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKW) { - INT max_len = (ttnmdi.lpszText == &ttnmdi.szText[0]) ? - sizeof(ttnmdi.szText)/sizeof(ttnmdi.szText[0]) : INFOTIPSIZE-1; - lstrcpynW(infoPtr->szTipText, ttnmdi.lpszText, max_len); + Str_GetPtrW(ttnmdi.lpszText, infoPtr->szTipText, INFOTIPSIZE); if (ttnmdi.uFlags & TTF_DI_SETITEM) { - INT len = max(strlenW(ttnmdi.lpszText), max_len); toolPtr->hinst = 0; - toolPtr->lpszText = Alloc ((len+1) * sizeof(WCHAR)); - memcpy(toolPtr->lpszText, ttnmdi.lpszText, (len+1) * sizeof(WCHAR)); + toolPtr->lpszText = NULL; + Str_SetPtrW(&toolPtr->lpszText, infoPtr->szTipText); } } else {

1 0

Dmitry Timoshkov : winuser.h: Add RealChildWindowFromPoint declaration.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: 648f7b1d9ffa442433983eacb365e9544bff940d URL: http://source.winehq.org/git/wine.git/?a=commit;h=648f7b1d9ffa442433983eacb… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jul 19 21:34:53 2007 +0900 winuser.h: Add RealChildWindowFromPoint declaration. --- include/winuser.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 38f6add..1c650bc 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4813,6 +4813,7 @@ UINT WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); BOOL WINAPI PtInRect(const RECT*,POINT); +HWND WINAPI RealChildWindowFromPoint(HWND,POINT); UINT WINAPI RealGetWindowClassA(HWND,LPSTR,UINT); UINT WINAPI RealGetWindowClassW(HWND,LPWSTR,UINT); #define RealGetWindowClass WINELIB_NAME_AW(RealGetWindowClass)

1 0

Alexandre Julliard : ntdll: Don' t fail to load manifests that contain unknown elements or attributes.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: a24f9cc101ff9d3c983e45953018c383df9b1fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24f9cc101ff9d3c983e45953… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 20 11:18:41 2007 +0200 ntdll: Don't fail to load manifests that contain unknown elements or attributes. Print FIXMEs for errors that really cause the loading to fail. --- dlls/ntdll/actctx.c | 117 ++++++++++++++++++++++++--------------------------- 1 files changed, 55 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a24f9cc101ff9d3c983e4…

1 0

Alexandre Julliard : ntdll: Add support for abbreviated empty elements in manifests.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: 1207d9b5937f7c8fb67d9e4b4843f13c74bea85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1207d9b5937f7c8fb67d9e4b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 20 11:19:17 2007 +0200 ntdll: Add support for abbreviated empty elements in manifests. --- dlls/ntdll/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 823bbcb..08383e3 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -569,7 +569,7 @@ static BOOL next_xml_elem(xmlbuf_t* xmlbuf, xmlstr_t* elem) } xmlbuf->ptr = ptr; - while (ptr < xmlbuf->end && !isxmlspace(*ptr) && *ptr != '>') + while (ptr < xmlbuf->end && !isxmlspace(*ptr) && *ptr != '>' && (*ptr != '/' || ptr == xmlbuf->ptr)) ptr++; elem->ptr = xmlbuf->ptr;

1 0

Alexandre Julliard : ntdll: Added manifest lookup in global winsxs directory ( based on a patch by Jacek Caban).
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: 214fb6e84e1609b6e61c072719cda4124b667eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=214fb6e84e1609b6e61c07271… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 18:09:35 2007 +0200 ntdll: Added manifest lookup in global winsxs directory (based on a patch by Jacek Caban). --- dlls/ntdll/actctx.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index df2a66f..b819dc1 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1535,6 +1535,146 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, return status; } +static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) +{ + static const WCHAR lookup_fmtW[] = + {'%','s','_','%','s','_','%','s','_','%','u','.','%','u','.','*','.','*','_', + '*', /* FIXME */ + '.','m','a','n','i','f','e','s','t',0}; + + WCHAR *lookup, *ret = NULL; + UNICODE_STRING lookup_us; + IO_STATUS_BLOCK io; + unsigned int data_pos = 0, data_len; + char buffer[8192]; + + if (!(lookup = RtlAllocateHeap( GetProcessHeap(), 0, + (strlenW(ai->arch) + strlenW(ai->name) + + strlenW(ai->public_key) + 20) * sizeof(WCHAR) + + sizeof(lookup_fmtW) ))) + return NULL; + + sprintfW( lookup, lookup_fmtW, ai->arch, ai->name, ai->public_key, ai->version.major, ai->version.minor); + RtlInitUnicodeString( &lookup_us, lookup ); + + NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), + FileBothDirectoryInformation, FALSE, &lookup_us, TRUE ); + if (io.u.Status == STATUS_SUCCESS) + { + FILE_BOTH_DIR_INFORMATION *dir_info; + WCHAR *tmp; + ULONG build, revision; + + data_len = io.Information; + + for (;;) + { + if (data_pos >= data_len) + { + NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), + FileBothDirectoryInformation, FALSE, &lookup_us, FALSE ); + if (io.u.Status != STATUS_SUCCESS) break; + data_len = io.Information; + data_pos = 0; + } + dir_info = (FILE_BOTH_DIR_INFORMATION*)(buffer + data_pos); + + if (dir_info->NextEntryOffset) data_pos += dir_info->NextEntryOffset; + else data_pos = data_len; + + tmp = (WCHAR *)dir_info->FileName + (strchrW(lookup, '*') - lookup); + build = atoiW(tmp); + if (build < ai->version.build) continue; + tmp = strchrW(tmp, '.') + 1; + revision = atoiW(tmp); + if (build == ai->version.build && revision < ai->version.revision) + continue; + ai->version.build = build; + ai->version.revision = revision; + if ((ret = RtlAllocateHeap( GetProcessHeap(), 0, dir_info->FileNameLength + sizeof(WCHAR) ))) + { + memcpy( ret, dir_info->FileName, dir_info->FileNameLength ); + ret[dir_info->FileNameLength/sizeof(WCHAR)] = 0; + } + break; + } + } + RtlFreeHeap( GetProcessHeap(), 0, lookup ); + return ret; +} + +static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identity* ai) +{ + struct assembly_identity sxs_ai; + UNICODE_STRING path_us; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + WCHAR *path, *file = NULL; + HANDLE handle; + + static const WCHAR manifest_dirW[] = + {'\\','w','i','n','s','x','s','\\','m','a','n','i','f','e','s','t','s',0}; + + if (!ai->arch || !ai->name || !ai->public_key) return STATUS_NO_SUCH_FILE; + + if (!(path = RtlAllocateHeap( GetProcessHeap(), 0, windows_dir.Length + sizeof(manifest_dirW) ))) + return STATUS_NO_MEMORY; + + memcpy( path, windows_dir.Buffer, windows_dir.Length ); + memcpy( path + windows_dir.Length/sizeof(WCHAR), manifest_dirW, sizeof(manifest_dirW) ); + + if (!RtlDosPathNameToNtPathName_U( path, &path_us, NULL, NULL )) + { + RtlFreeHeap( GetProcessHeap(), 0, path ); + return STATUS_NO_SUCH_FILE; + } + RtlFreeHeap( GetProcessHeap(), 0, path ); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &path_us; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (!NtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT )) + { + sxs_ai = *ai; + file = lookup_manifest_file( handle, &sxs_ai ); + NtClose( handle ); + } + if (!file) + { + RtlFreeUnicodeString( &path_us ); + return STATUS_NO_SUCH_FILE; + } + + /* append file name to directory path */ + if (!(path = RtlReAllocateHeap( GetProcessHeap(), 0, path_us.Buffer, + path_us.Length + (strlenW(file) + 2) * sizeof(WCHAR) ))) + { + RtlFreeHeap( GetProcessHeap(), 0, file ); + RtlFreeUnicodeString( &path_us ); + return STATUS_NO_MEMORY; + } + + path[path_us.Length/sizeof(WCHAR)] = '\\'; + strcpyW( path + path_us.Length/sizeof(WCHAR) + 1, file ); + RtlFreeHeap( GetProcessHeap(), 0, file ); + RtlInitUnicodeString( &path_us, path ); + + if (!open_nt_file( &handle, &path_us )) + { + io.u.Status = get_manifest_in_manifest_file(acl, &sxs_ai, path_us.Buffer, handle); + NtClose( handle ); + } + else io.u.Status = STATUS_NO_SUCH_FILE; + + RtlFreeUnicodeString( &path_us ); + return io.u.Status; +} + static NTSTATUS lookup_assembly(struct actctx_loader* acl, struct assembly_identity* ai) { @@ -1545,6 +1685,8 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, UNICODE_STRING nameW; HANDLE file; + if ((status = lookup_winsxs(acl, ai)) != STATUS_NO_SUCH_FILE) return status; + /* FIXME: add support for language specific lookup */ nameW.Buffer = NULL;

1 0

Alexandre Julliard : ntdll: Skip xml comments in manifests.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: 272af8fa1eca695182384d8903b532c4a0f6b6f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272af8fa1eca695182384d890… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 18:10:45 2007 +0200 ntdll: Skip xml comments in manifests. --- dlls/ntdll/actctx.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index b819dc1..26bdf31 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -541,14 +541,31 @@ static BOOL next_xml_elem(xmlbuf_t* xmlbuf, xmlstr_t* elem) { const char* ptr; - ptr = memchr(xmlbuf->ptr, '<', xmlbuf->end - xmlbuf->ptr); - if (!ptr) + for (;;) { - xmlbuf->ptr = xmlbuf->end; - return FALSE; + ptr = memchr(xmlbuf->ptr, '<', xmlbuf->end - xmlbuf->ptr); + if (!ptr) + { + xmlbuf->ptr = xmlbuf->end; + return FALSE; + } + ptr++; + if (ptr + 3 < xmlbuf->end && !strncmp( ptr, "!--", 3 )) /* skip comment */ + { + for (ptr += 3; ptr + 3 <= xmlbuf->end; ptr++) + if (ptr[0] == '-' && ptr[1] == '-' && ptr[2] == '>') break; + + if (ptr + 3 > xmlbuf->end) + { + xmlbuf->ptr = xmlbuf->end; + return FALSE; + } + xmlbuf->ptr = ptr + 3; + } + else break; } - xmlbuf->ptr = ++ptr; + xmlbuf->ptr = ptr; while (ptr < xmlbuf->end && !isxmlspace(*ptr) && *ptr != '>') ptr++;

1 0

Alexandre Julliard : ntdll: Cope with missing assemblyIdentity elements in manifests.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: b2b6fc1288525f290129ed8bfddd886fe090e3cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b6fc1288525f290129ed8bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 18:13:27 2007 +0200 ntdll: Cope with missing assemblyIdentity elements in manifests. --- dlls/ntdll/actctx.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 26bdf31..eb4214a 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1174,7 +1174,6 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, { xmlstr_t attr_name, attr_value, elem; BOOL end = FALSE, error, version = FALSE, xmlns = FALSE, ret = TRUE; - struct assembly_identity ai; TRACE("(%p)\n", xmlbuf); @@ -1224,28 +1223,24 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, else if (assembly->type == ASSEMBLY_MANIFEST && assembly->no_inherit) return FALSE; - if (!xmlstr_cmp(&elem, ASSEMBLYIDENTITY_ELEM)) + if (xmlstr_cmp(&elem, ASSEMBLYIDENTITY_ELEM)) { - WARN("expected assemblyIdentity element, got %s\n", debugstr_xmlstr(&elem)); - return FALSE; - } - - if (!parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai)) return FALSE; + if (!parse_assembly_identity_elem(xmlbuf, acl->actctx, &assembly->id)) return FALSE; + ret = next_xml_elem(xmlbuf, &elem); - if (expected_ai) - { - /* FIXME: more tests */ - if (assembly->type == ASSEMBLY_MANIFEST && - memcmp(&ai.version, &expected_ai->version, sizeof(ai.version))) + if (expected_ai) { - WARN("wrong version\n"); - return FALSE; + /* FIXME: more tests */ + if (assembly->type == ASSEMBLY_MANIFEST && + memcmp(&assembly->id.version, &expected_ai->version, sizeof(assembly->id.version))) + { + FIXME("wrong version\n"); + return FALSE; + } } } - assembly->id = ai; - - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (ret) { if (xmlstr_cmp(&elem, ELEM_END(ASSEMBLY_ELEM))) { @@ -1281,6 +1276,7 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, WARN("wrong element %s\n", debugstr_xmlstr(&elem)); ret = FALSE; } + if (ret) ret = next_xml_elem(xmlbuf, &elem); } return ret;

1 0

Alexandre Julliard : ntdll: Add support for optional flag in dependencies.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: 84a318265d71d587c50c8168d2950e92e9516acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a318265d71d587c50c8168d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 18:14:23 2007 +0200 ntdll: Add support for optional flag in dependencies. --- dlls/ntdll/actctx.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index eb4214a..6b5d6b2 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -94,6 +94,7 @@ struct assembly_identity WCHAR *language; struct version version; enum assembly_id_type type; + BOOL optional; }; struct entity @@ -213,6 +214,7 @@ struct actctx_loader #define NAME_ATTR "name" #define NEWVERSION_ATTR "newVersion" #define OLDVERSION_ATTR "oldVersion" +#define OPTIONAL_ATTR "optional" #define PROCESSORARCHITECTURE_ATTR "processorArchitecture" #define PUBLICKEYTOKEN_ATTR "publicKeyToken" #define TLBID_ATTR "tlbid" @@ -690,7 +692,6 @@ static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* a TRACE("\n"); - memset(ai, 0, sizeof(*ai)); while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) { if (xmlstr_cmp(&attr_name, NAME_ATTR)) @@ -1008,8 +1009,7 @@ static BOOL parse_clr_surrogate_elem(xmlbuf_t* xmlbuf, struct assembly* assembly return parse_expect_elem(xmlbuf, ELEM_END(CLRSURROGATE_ELEM)) && parse_end_element(xmlbuf); } -static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf, - struct actctx_loader* acl) +static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, BOOL optional) { struct assembly_identity ai; xmlstr_t elem; @@ -1019,6 +1019,9 @@ static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf, if (!parse_expect_no_attr(xmlbuf, &end) || end) return end; + memset(&ai, 0, sizeof(ai)); + ai.optional = optional; + if (!parse_expect_elem(xmlbuf, ASSEMBLYIDENTITY_ELEM) || !parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai)) return FALSE; @@ -1049,12 +1052,23 @@ static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf, static BOOL parse_dependency_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl) { - xmlstr_t elem; - BOOL end = FALSE, ret = TRUE; + xmlstr_t attr_name, attr_value, elem; + BOOL end = FALSE, ret = TRUE, error, optional = FALSE; TRACE("\n"); - if (!parse_expect_no_attr(xmlbuf, &end) || end) return end; + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, OPTIONAL_ATTR)) + { + optional = xmlstr_cmp( &attr_value, "yes" ); + TRACE("optional=%s\n", debugstr_xmlstr(&attr_value)); + } + else + { + WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value)); + } + } while (ret && (ret = next_xml_elem(xmlbuf, &elem))) { @@ -1065,7 +1079,7 @@ static BOOL parse_dependency_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl) } else if (xmlstr_cmp(&elem, DEPENDENTASSEMBLY_ELEM)) { - ret = parse_dependent_assembly_elem(xmlbuf, acl); + ret = parse_dependent_assembly_elem(xmlbuf, acl, optional); } else { @@ -1760,9 +1774,12 @@ static NTSTATUS parse_depend_manifests(struct actctx_loader* acl) { if (lookup_assembly(acl, &acl->dependencies[i]) != STATUS_SUCCESS) { - FIXME( "Could not find assembly %s\n", debugstr_w(acl->dependencies[i].name) ); - status = STATUS_SXS_CANT_GEN_ACTCTX; - break; + if (!acl->dependencies[i].optional) + { + FIXME( "Could not find dependent assembly %s\n", debugstr_w(acl->dependencies[i].name) ); + status = STATUS_SXS_CANT_GEN_ACTCTX; + break; + } } } /* FIXME should now iterate through all refs */

1 0

Alexandre Julliard : ntdll: Abstract the entity array type as we need it for assemblies too.
by Alexandre Julliard 20 Jul '07

20 Jul '07

Module: wine Branch: master Commit: b96df32560208c824786a8789ed51c80c931ea38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96df32560208c824786a8789… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 18:00:33 2007 +0200 ntdll: Abstract the entity array type as we need it for assemblies too. --- dlls/ntdll/actctx.c | 86 ++++++++++++++++++++++++++++---------------------- 1 files changed, 48 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 5abb374..3ba5494 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -122,13 +122,18 @@ struct entity } u; }; +struct entity_array +{ + struct entity *base; + unsigned int num; + unsigned int allocated; +}; + struct dll_redirect { WCHAR *name; WCHAR *hash; - struct entity *entities; - unsigned int num_entities; - unsigned int allocated_entities; + struct entity_array entities; }; enum assembly_type @@ -302,56 +307,62 @@ static void free_assembly_identity(struct assembly_identity *ai) RtlFreeHeap( GetProcessHeap(), 0, ai->language ); } -static struct entity* add_entity(struct dll_redirect* dll, DWORD kind) +static struct entity* add_entity(struct entity_array *array, DWORD kind) { struct entity* entity; - if (dll->num_entities == dll->allocated_entities) + if (array->num == array->allocated) { void *ptr; unsigned int new_count; - if (dll->entities) + if (array->base) { - new_count = dll->allocated_entities * 2; + new_count = array->allocated * 2; ptr = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, - dll->entities, new_count * sizeof(*dll->entities) ); + array->base, new_count * sizeof(*array->base) ); } else { new_count = 4; - ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(*dll->entities) ); + ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(*array->base) ); } if (!ptr) return NULL; - dll->entities = ptr; - dll->allocated_entities = new_count; + array->base = ptr; + array->allocated = new_count; } - entity = &dll->entities[dll->num_entities++]; + entity = &array->base[array->num++]; entity->kind = kind; return entity; } -static void free_entity(struct entity* entity) +static void free_entity_array(struct entity_array *array) { - switch (entity->kind) + unsigned int i; + for (i = 0; i < array->num; i++) { - case ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION: - RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.clsid); - break; - case ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION: - RtlFreeHeap(GetProcessHeap(), 0, entity->u.proxy.iid); - RtlFreeHeap(GetProcessHeap(), 0, entity->u.proxy.name); - break; - case ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION: - RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.tlbid); - RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.version); - RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.helpdir); - break; - case ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION: - RtlFreeHeap(GetProcessHeap(), 0, entity->u.class.name); - break; - default: - FIXME("Unknown entity kind %d\n", entity->kind); + struct entity *entity = &array->base[i]; + switch (entity->kind) + { + case ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION: + RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.clsid); + break; + case ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION: + RtlFreeHeap(GetProcessHeap(), 0, entity->u.proxy.iid); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.proxy.name); + break; + case ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION: + RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.tlbid); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.version); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.helpdir); + break; + case ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION: + RtlFreeHeap(GetProcessHeap(), 0, entity->u.class.name); + break; + default: + FIXME("Unknown entity kind %d\n", entity->kind); + } } + RtlFreeHeap( GetProcessHeap(), 0, array->base ); } static BOOL add_dependent_assembly_id(struct actctx_loader* acl, @@ -413,7 +424,7 @@ static void actctx_release( ACTIVATION_CONTEXT *actctx ) { if (interlocked_xchg_add( &actctx->ref_count, -1 ) == 1) { - unsigned int i, j, k; + unsigned int i, j; for (i = 0; i < actctx->num_assemblies; i++) { @@ -421,8 +432,7 @@ static void actctx_release( ACTIVATION_CONTEXT *actctx ) for (j = 0; j < assembly->num_dlls; j++) { struct dll_redirect *dll = &assembly->dlls[j]; - for (k = 0; k < dll->num_entities; k++) free_entity(&dll->entities[k]); - RtlFreeHeap( GetProcessHeap(), 0, dll->entities ); + free_entity_array( &dll->entities ); RtlFreeHeap( GetProcessHeap(), 0, dll->name ); RtlFreeHeap( GetProcessHeap(), 0, dll->hash ); } @@ -669,7 +679,7 @@ static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) BOOL end = FALSE, error; struct entity* entity; - entity = add_entity(dll, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION); + entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION); while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) { @@ -695,7 +705,7 @@ static BOOL parse_cominterface_proxy_stub_elem(xmlbuf_t* xmlbuf, struct dll_redi BOOL end = FALSE, error; struct entity* entity; - entity = add_entity(dll, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION); + entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION); while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) { @@ -725,7 +735,7 @@ static BOOL parse_typelib_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) BOOL end = FALSE, error; struct entity* entity; - entity = add_entity(dll, ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION); + entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION); while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) { @@ -759,7 +769,7 @@ static BOOL parse_window_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) BOOL end = FALSE, ret = TRUE; struct entity* entity; - entity = add_entity(dll, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION); + entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION); if (!parse_expect_no_attr(xmlbuf, &end)) return FALSE; if (end) return FALSE;

1 0