January 2006 - Wine-Commits

Phil Krylov : riched20: Fixed calculation of left indent and first indent paragraph
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: 194eeaab7dad79c51be1d62aff69feff9b487e34 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=194eeaab7dad79c51be1d62… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Mon Jan 9 17:12:51 2006 +0100 riched20: Fixed calculation of left indent and first indent paragraph properties. --- dlls/riched20/editor.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7723865..a4c7618 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -420,20 +420,15 @@ static void ME_RTFParAttrHook(RTF_Info * break; case rtfFirstIndent: ME_GetSelectionParaFormat(info->editor, &fmt); - fmt.dwMask = PFM_STARTINDENT; - fmt.dxStartIndent = info->rtfParam + fmt.dxOffset; + fmt.dwMask = PFM_STARTINDENT | PFM_OFFSET; + fmt.dxStartIndent += info->rtfParam + fmt.dxOffset; + fmt.dxOffset = -info->rtfParam; break; case rtfLeftIndent: - { - int first, left; ME_GetSelectionParaFormat(info->editor, &fmt); - first = fmt.dxStartIndent; - left = info->rtfParam; - fmt.dwMask = PFM_STARTINDENT|PFM_OFFSET; - fmt.dxStartIndent = first + left; - fmt.dxOffset = -first; + fmt.dwMask = PFM_STARTINDENT; + fmt.dxStartIndent = -fmt.dxOffset + info->rtfParam; break; - } case rtfRightIndent: fmt.dwMask = PFM_RIGHTINDENT; fmt.dxRightIndent = info->rtfParam;

1 0

Phil Krylov : riched20: Simplified logic in ME_StrRelPos().
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: 74aa295f55b335b4b89cc8739a1dcf229bcce05c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=74aa295f55b335b4b89cc87… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Mon Jan 9 17:12:34 2006 +0100 riched20: Simplified logic in ME_StrRelPos(). --- dlls/riched20/string.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 6abd22a..c9057bf 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -155,29 +155,22 @@ int ME_StrVLen(ME_String *s) { return s->nLen; } -/* FIXME we use widechars, not multibytes, inside, no need for complex logic anymore */ int ME_StrRelPos(ME_String *s, int nVChar, int *pRelChars) { + int nRelChars = *pRelChars; + TRACE("%s,%d,&%d\n", debugstr_w(s->szData), nVChar, *pRelChars); assert(*pRelChars); - if (!*pRelChars) return nVChar; - - if (*pRelChars>0) - { - while(nVChar<s->nLen && *pRelChars>0) - { - nVChar++; - (*pRelChars)--; - } + if (!nRelChars) return nVChar; - } - - while(nVChar>0 && *pRelChars<0) - { - nVChar--; - (*pRelChars)++; - } + + if (nRelChars>0) + nRelChars = min(*pRelChars, s->nLen - nVChar); + else + nRelChars = max(*pRelChars, -nVChar); + nVChar += nRelChars; + *pRelChars -= nRelChars; return nVChar; }

1 0

Aric Stewart : msvcrt: Add a regression test for _fullpath.
by Alexandre Julliard Jan. 6, 2006

Jan. 6, 2006

Module: wine Branch: refs/heads/master Commit: 3022ade359fbf35efbeacf120fc0e53eafee84bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3022ade359fbf35efbeacf1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 6 21:46:09 2006 +0100 msvcrt: Add a regression test for _fullpath. --- dlls/msvcrt/tests/.gitignore | 1 + dlls/msvcrt/tests/Makefile.in | 1 + dlls/msvcrt/tests/dir.c | 58 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 0 deletions(-) create mode 100644 dlls/msvcrt/tests/dir.c diff --git a/dlls/msvcrt/tests/.gitignore b/dlls/msvcrt/tests/.gitignore index 0aa07c9..2980711 100644 --- a/dlls/msvcrt/tests/.gitignore +++ b/dlls/msvcrt/tests/.gitignore @@ -1,5 +1,6 @@ Makefile cpp.ok +dir.ok environ.ok file.ok headers.ok diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in index 2681d61..9569f1e 100644 --- a/dlls/msvcrt/tests/Makefile.in +++ b/dlls/msvcrt/tests/Makefile.in @@ -9,6 +9,7 @@ EXTRAINCL = -I$(TOPSRCDIR)/include/msvcr CTESTS = \ cpp.c \ + dir.c \ environ.c \ file.c \ headers.c \ diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c new file mode 100644 index 0000000..5e12f84 --- /dev/null +++ b/dlls/msvcrt/tests/dir.c @@ -0,0 +1,58 @@ +/* + * Unit test suite for dir functions + * + * Copyright 2006 CodeWeavers, Aric Stewart + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "wine/test.h" +#include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> +#include <fcntl.h> +#include <sys/stat.h> +#include <io.h> +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <process.h> +#include <errno.h> + +void test_fullpath() +{ + char full[MAX_PATH]; + char *freeme; + + SetCurrentDirectory("C:\\Windows\\System\\"); + + ok(_fullpath(full,"test", MAX_PATH)>0,"_fullpath failed\n"); + ok(strcmp(full,"C:\\Windows\\System\\test")==0,"Invalid Path\n"); + ok(_fullpath(full,"\\test", MAX_PATH)>0,"_fullpath failed\n"); + ok(strcmp(full,"C:\\test")==0,"Invalid Path\n"); + ok(_fullpath(full,"..\\test", MAX_PATH)>0,"_fullpath failed\n"); + ok(strcmp(full,"C:\\Windows\\test")==0,"Invalid Path\n"); + ok(_fullpath(full,"..\\test", 10)==NULL,"_fullpath failed to generate error\n"); + + freeme = _fullpath(NULL,"test", 0); + ok(freeme!=NULL,"No path returned\n"); + ok(strcmp(freeme,"C:\\Windows\\System\\test")==0,"Invalid Path\n"); + free(freeme); +} + +START_TEST(dir) +{ + test_fullpath(); +}

1 0

Aric Stewart : msvcrt: Reworked _fullpath.
by Alexandre Julliard Jan. 6, 2006

Jan. 6, 2006

Module: wine Branch: refs/heads/master Commit: e09a6c8080d511fd0c4d60462da9c7b3a61245d7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e09a6c8080d511fd0c4d604… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 6 21:45:26 2006 +0100 msvcrt: Reworked _fullpath. Investigation with native msvcrt revealed that it is a wrapper for GetFullPathName and the current implementation was crashing with older mozilla installs if the path passed in was uninitialized. --- dlls/msvcrt/dir.c | 315 ++++++----------------------------------------------- 1 files changed, 38 insertions(+), 277 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index a47a273..fa757ac 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -738,113 +738,6 @@ void _wsplitpath(const MSVCRT_wchar_t *i if (ext) strcpyW( ext, end ); } -/* INTERNAL: Helper for _fullpath. Modified PD code from 'snippets'. */ -static void wmsvcrt_fln_fix(MSVCRT_wchar_t *path) -{ - int dir_flag = 0, root_flag = 0; - MSVCRT_wchar_t *r, *p, *q, *s; - MSVCRT_wchar_t szbsdot[] = { '\\', '.', 0 }; - - /* Skip drive */ - if (NULL == (r = strrchrW(path, ':'))) - r = path; - else - ++r; - - /* Ignore leading slashes */ - while ('\\' == *r) - if ('\\' == r[1]) - strcpyW(r, &r[1]); - else - { - root_flag = 1; - ++r; - } - - p = r; /* Change "\\" to "\" */ - while (NULL != (p = strchrW(p, '\\'))) - if ('\\' == p[1]) - strcpyW(p, &p[1]); - else - ++p; - - while ('.' == *r) /* Scrunch leading ".\" */ - { - if ('.' == r[1]) - { - /* Ignore leading ".." */ - for (p = (r += 2); *p && (*p != '\\'); ++p) - ; - } - else - { - for (p = r + 1 ;*p && (*p != '\\'); ++p) - ; - } - strcpyW(r, p + ((*p) ? 1 : 0)); - } - - while ('\\' == path[strlenW(path)-1]) /* Strip last '\\' */ - { - dir_flag = 1; - path[strlenW(path)-1] = '\0'; - } - - s = r; - - /* Look for "\." in path */ - - while (NULL != (p = strstrW(s, szbsdot))) - { - if ('.' == p[2]) - { - /* Execute this section if ".." found */ - q = p - 1; - while (q > r) /* Backup one level */ - { - if (*q == '\\') - break; - --q; - } - if (q > r) - { - strcpyW(q, p + 3); - s = q; - } - else if ('.' != *q) - { - strcpyW(q + ((*q == '\\') ? 1 : 0), - p + 3 + ((*(p + 3)) ? 1 : 0)); - s = q; - } - else s = ++p; - } - else - { - /* Execute this section if "." found */ - q = p + 2; - for ( ;*q && (*q != '\\'); ++q) - ; - strcpyW (p, q); - } - } - - if (root_flag) /* Embedded ".." could have bubbled up to root */ - { - for (p = r; *p && ('.' == *p || '\\' == *p); ++p) - ; - if (r != p) - strcpyW(r, p); - } - - if (dir_flag) - { - MSVCRT_wchar_t szbs[] = { '\\', 0 }; - - strcatW(path, szbs); - } -} - /********************************************************************* * _wfullpath (MSVCRT.@) * @@ -852,17 +745,23 @@ static void wmsvcrt_fln_fix(MSVCRT_wchar */ MSVCRT_wchar_t *_wfullpath(MSVCRT_wchar_t * absPath, const MSVCRT_wchar_t* relPath, MSVCRT_size_t size) { - MSVCRT_wchar_t drive[5],dir[MAX_PATH],file[MAX_PATH],ext[MAX_PATH]; - MSVCRT_wchar_t res[MAX_PATH]; - size_t len; - MSVCRT_wchar_t szbs[] = { '\\', 0 }; - - - res[0] = '\0'; + DWORD rc; + WCHAR* buffer; + WCHAR* lastpart; + BOOL alloced = FALSE; if (!relPath || !*relPath) return _wgetcwd(absPath, size); + if (absPath == NULL) + { + buffer = MSVCRT_malloc(MAX_PATH * sizeof(WCHAR)); + size = MAX_PATH; + alloced = TRUE; + } + else + buffer = absPath; + if (size < 4) { *MSVCRT__errno() = MSVCRT_ERANGE; @@ -871,140 +770,16 @@ MSVCRT_wchar_t *_wfullpath(MSVCRT_wchar_ TRACE(":resolving relative path '%s'\n",debugstr_w(relPath)); - _wsplitpath(relPath, drive, dir, file, ext); + rc = GetFullPathNameW(relPath,size,buffer,&lastpart); - /* Get Directory and drive into 'res' */ - if (!dir[0] || (dir[0] != '/' && dir[0] != '\\')) - { - /* Relative or no directory given */ - _wgetdcwd(drive[0] ? toupper(drive[0]) - 'A' + 1 : 0, res, MAX_PATH); - strcatW(res,szbs); - if (dir[0]) - strcatW(res,dir); - if (drive[0]) - res[0] = drive[0]; /* If given a drive, preserve the letter case */ - } + if (rc > 0 && rc <= size ) + return buffer; else { - strcpyW(res,drive); - strcatW(res,dir); + if (alloced) + MSVCRT_free(buffer); + return NULL; } - - strcatW(res,szbs); - strcatW(res, file); - strcatW(res, ext); - wmsvcrt_fln_fix(res); - - len = strlenW(res); - if (len >= MAX_PATH || len >= (size_t)size) - return NULL; /* FIXME: errno? */ - - if (!absPath) - return _wcsdup(res); - strcpyW(absPath,res); - return absPath; -} - -/* INTERNAL: Helper for _fullpath. Modified PD code from 'snippets'. */ -static void msvcrt_fln_fix(char *path) -{ - int dir_flag = 0, root_flag = 0; - char *r, *p, *q, *s; - - /* Skip drive */ - if (NULL == (r = strrchr(path, ':'))) - r = path; - else - ++r; - - /* Ignore leading slashes */ - while ('\\' == *r) - if ('\\' == r[1]) - strcpy(r, &r[1]); - else - { - root_flag = 1; - ++r; - } - - p = r; /* Change "\\" to "\" */ - while (NULL != (p = strchr(p, '\\'))) - if ('\\' == p[1]) - strcpy(p, &p[1]); - else - ++p; - - while ('.' == *r) /* Scrunch leading ".\" */ - { - if ('.' == r[1]) - { - /* Ignore leading ".." */ - for (p = (r += 2); *p && (*p != '\\'); ++p) - ; - } - else - { - for (p = r + 1 ;*p && (*p != '\\'); ++p) - ; - } - strcpy(r, p + ((*p) ? 1 : 0)); - } - - while ('\\' == path[strlen(path)-1]) /* Strip last '\\' */ - { - dir_flag = 1; - path[strlen(path)-1] = '\0'; - } - - s = r; - - /* Look for "\." in path */ - - while (NULL != (p = strstr(s, "\\."))) - { - if ('.' == p[2]) - { - /* Execute this section if ".." found */ - q = p - 1; - while (q > r) /* Backup one level */ - { - if (*q == '\\') - break; - --q; - } - if (q > r) - { - strcpy(q, p + 3); - s = q; - } - else if ('.' != *q) - { - strcpy(q + ((*q == '\\') ? 1 : 0), - p + 3 + ((*(p + 3)) ? 1 : 0)); - s = q; - } - else s = ++p; - } - else - { - /* Execute this section if "." found */ - q = p + 2; - for ( ;*q && (*q != '\\'); ++q) - ; - strcpy (p, q); - } - } - - if (root_flag) /* Embedded ".." could have bubbled up to root */ - { - for (p = r; *p && ('.' == *p || '\\' == *p); ++p) - ; - if (r != p) - strcpy(r, p); - } - - if (dir_flag) - strcat(path, "\\"); } /********************************************************************* @@ -1024,15 +799,23 @@ static void msvcrt_fln_fix(char *path) */ char *_fullpath(char * absPath, const char* relPath, unsigned int size) { - char drive[5],dir[MAX_PATH],file[MAX_PATH],ext[MAX_PATH]; - char res[MAX_PATH]; - size_t len; - - res[0] = '\0'; + DWORD rc; + char* lastpart; + char* buffer; + BOOL alloced = FALSE; if (!relPath || !*relPath) return _getcwd(absPath, size); + if (absPath == NULL) + { + buffer = MSVCRT_malloc(MAX_PATH); + size = MAX_PATH; + alloced = TRUE; + } + else + buffer = absPath; + if (size < 4) { *MSVCRT__errno() = MSVCRT_ERANGE; @@ -1041,38 +824,16 @@ char *_fullpath(char * absPath, const ch TRACE(":resolving relative path '%s'\n",relPath); - _splitpath(relPath, drive, dir, file, ext); + rc = GetFullPathNameA(relPath,size,buffer,&lastpart); - /* Get Directory and drive into 'res' */ - if (!dir[0] || (dir[0] != '/' && dir[0] != '\\')) - { - /* Relative or no directory given */ - _getdcwd(drive[0] ? toupper(drive[0]) - 'A' + 1 : 0, res, MAX_PATH); - strcat(res,"\\"); - if (dir[0]) - strcat(res,dir); - if (drive[0]) - res[0] = drive[0]; /* If given a drive, preserve the letter case */ - } + if (rc > 0 && rc <= size) + return buffer; else { - strcpy(res,drive); - strcat(res,dir); + if (alloced) + MSVCRT_free(buffer); + return NULL; } - - strcat(res,"\\"); - strcat(res, file); - strcat(res, ext); - msvcrt_fln_fix(res); - - len = strlen(res); - if (len >= MAX_PATH || len >= (size_t)size) - return NULL; /* FIXME: errno? */ - - if (!absPath) - return _strdup(res); - strcpy(absPath,res); - return absPath; } /*********************************************************************

1 0

Alexandre Julliard : ole: Remove a no longer needed smbfs hack.
by Alexandre Julliard Jan. 6, 2006

Jan. 6, 2006

Module: wine Branch: refs/heads/master Commit: 0f81ac350647c0122b6c7c17ac1adbee70415793 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0f81ac350647c0122b6c7c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 21:19:05 2006 +0100 ole: Remove a no longer needed smbfs hack. --- dlls/ole32/stg_bigblockfile.c | 55 +++++++++++------------------------------ 1 files changed, 15 insertions(+), 40 deletions(-) diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index 57123c9..13536f5 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -422,49 +422,24 @@ void BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE if (This->fileBased) { - char buf[10]; - DWORD w; + LARGE_INTEGER newpos; - /* - * close file-mapping object, must be done before call to SetEndFile - */ - if( This->hfilemap ) - CloseHandle(This->hfilemap); - This->hfilemap = 0; - - /* - * BEGIN HACK - * This fixes a bug when saving through smbfs. - * smbmount a Windows shared directory, save a structured storage file - * to that dir: crash. - * - * The problem is that the SetFilePointer-SetEndOfFile combo below - * doesn't always succeed. The file is not grown. It seems like the - * operation is cached. By doing the WriteFile, the file is actually - * grown on disk. - * This hack is only needed when saving to smbfs. - */ - memset(buf, '0', 10); - SetFilePointer(This->hfile, newSize.u.LowPart, NULL, FILE_BEGIN); - WriteFile(This->hfile, buf, 10, &w, NULL); - /* - * END HACK - */ + newpos.QuadPart = newSize.QuadPart; + if (SetFilePointerEx(This->hfile, newpos, NULL, FILE_BEGIN)) + { + if( This->hfilemap ) CloseHandle(This->hfilemap); - /* - * set the new end of file - */ - SetFilePointer(This->hfile, newSize.u.LowPart, NULL, FILE_BEGIN); - SetEndOfFile(This->hfile); + SetEndOfFile(This->hfile); - /* - * re-create the file mapping object - */ - This->hfilemap = CreateFileMappingA(This->hfile, - NULL, - This->flProtect, - 0, 0, - NULL); + /* + * re-create the file mapping object + */ + This->hfilemap = CreateFileMappingA(This->hfile, + NULL, + This->flProtect, + 0, 0, + NULL); + } } else {

1 0

Raimonds Praude : user32: Limit text in the edit field of a combo box.
by Alexandre Julliard Jan. 6, 2006

Jan. 6, 2006

Module: wine Branch: refs/heads/master Commit: 860d682c2b624aaa41dcc8544883caa326a26a31 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=860d682c2b624aaa41dcc85… Author: Raimonds Praude <raimonds.praude(a)sets.lv> Date: Fri Jan 6 21:16:52 2006 +0100 user32: Limit text in the edit field of a combo box. --- dlls/user/combo.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user/combo.c b/dlls/user/combo.c index 3deb754..89d356b 100644 --- a/dlls/user/combo.c +++ b/dlls/user/combo.c @@ -2299,6 +2299,9 @@ static LRESULT ComboWndProc_common( HWND return (lphc->wState & CBF_EUI) ? TRUE : FALSE; case CB_GETCOMBOBOXINFO: return COMBO_GetComboBoxInfo(lphc, (COMBOBOXINFO *)lParam); + case CB_LIMITTEXT: + if( lphc->wState & CBF_EDIT ) + return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); default: if (message >= WM_USER) WARN("unknown msg WM_USER+%04x wp=%04x lp=%08lx\n",

1 0

Marcus Meissner : gdi: Filter GETSCALINGFACTOR and SETABORTDOC proc in metafile
by Alexandre Julliard Jan. 6, 2006

Jan. 6, 2006

Module: wine Branch: refs/heads/master Commit: b49a1de1796283cad431b5653d8eca3cf44dbd1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b49a1de1796283cad431b56… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jan 6 21:16:37 2006 +0100 gdi: Filter GETSCALINGFACTOR and SETABORTDOC proc in metafile Escapes. --- dlls/gdi/metafile.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/metafile.c b/dlls/gdi/metafile.c index 2af4df5..55c8296 100644 --- a/dlls/gdi/metafile.c +++ b/dlls/gdi/metafile.c @@ -863,6 +863,13 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, break; case META_ESCAPE: + switch (mr->rdParm[0]) { + case GETSCALINGFACTOR: /* get function ... would just NULL dereference */ + return FALSE; + case SETABORTPROC: + FIXME("Filtering Escape(SETABORTPROC), possible virus?\n"); + return FALSE; + } Escape(hdc, mr->rdParm[0], mr->rdParm[1], (LPCSTR)&mr->rdParm[2], NULL); break;

1 0

Robert Shearman : ole: Remove the no longer used _copy_arg function.
by Alexandre Julliard Jan. 6, 2006

Jan. 6, 2006

Module: wine Branch: refs/heads/master Commit: d2bdbd4ea55165a7300a2473d24818d9f773b743 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d2bdbd4ea55165a7300a247… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jan 6 21:16:21 2006 +0100 ole: Remove the no longer used _copy_arg function. --- dlls/oleaut32/typelib.c | 159 ----------------------------------------------- 1 files changed, 0 insertions(+), 159 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 26faf85..9fb1cda 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4939,165 +4939,6 @@ _invoke(FARPROC func,CALLCONV callconv, extern int _argsize(DWORD vt); -/**************************************************************************** - * Helper functions for Dispcall / Invoke, which copies one variant - * with target type onto the argument stack. - */ -static HRESULT -_copy_arg( ITypeInfo2 *tinfo, TYPEDESC *tdesc, - DWORD *argpos, VARIANT *arg, VARTYPE vt -) { - UINT arglen = _argsize(vt)*sizeof(DWORD); - VARIANT va; - - if ((vt==VT_PTR) && tdesc && (tdesc->u.lptdesc->vt == VT_VARIANT)) { - memcpy(argpos,&arg,sizeof(void*)); - return S_OK; - } - - if (V_VT(arg) == vt) { - memcpy(argpos, &V_I4(arg), arglen); - return S_OK; - } - - if (V_ISARRAY(arg) && (vt == VT_SAFEARRAY)) { - memcpy(argpos, &V_ARRAY(arg), sizeof(SAFEARRAY*)); - return S_OK; - } - - if (vt == VT_VARIANT) { - memcpy(argpos, arg, arglen); - return S_OK; - } - /* Deref BYREF vars if there is need */ - if(V_ISBYREF(arg) && ((V_VT(arg) & ~VT_BYREF)==vt)) { - memcpy(argpos,(void*)V_I4(arg), arglen); - return S_OK; - } - if (vt==VT_UNKNOWN && V_VT(arg)==VT_DISPATCH) { - /* in this context, if the type lib specifies IUnknown*, giving an - IDispatch* is correct; so, don't invoke VariantChangeType */ - memcpy(argpos,&V_I4(arg), arglen); - return S_OK; - } - if ((vt == VT_PTR) && tdesc) - return _copy_arg(tinfo, tdesc->u.lptdesc, argpos, arg, tdesc->u.lptdesc->vt); - - if ((vt == VT_USERDEFINED) && tdesc && tinfo) { - ITypeInfo *tinfo2 = NULL; - TYPEATTR *tattr = NULL; - HRESULT hres; - - hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->u.hreftype,&tinfo2); - if (hres) { - FIXME("Could not get typeinfo of hreftype %lx for VT_USERDEFINED, " - "while coercing from vt 0x%x. Copying 4 byte.\n", - tdesc->u.hreftype,V_VT(arg)); - memcpy(argpos, &V_I4(arg), 4); - return S_OK; - } - hres = ITypeInfo_GetTypeAttr(tinfo2,&tattr); - if( hres ) - { - ERR("GetTypeAttr failed\n"); - ITypeInfo_Release(tinfo2); - return hres; - } - switch (tattr->typekind) { - case TKIND_ENUM: - switch ( V_VT( arg ) ) { - case VT_I2: - *argpos = V_I2(arg); - hres = S_OK; - break; - case VT_I4: - memcpy(argpos, &V_I4(arg), 4); - hres = S_OK; - break; - case VT_BYREF|VT_I4: - memcpy(argpos, V_I4REF(arg), 4); - hres = S_OK; - break; - default: - FIXME("vt 0x%x -> TKIND_ENUM unhandled.\n",V_VT(arg)); - hres = E_FAIL; - break; - } - break; - - case TKIND_ALIAS: - tdesc = &(tattr->tdescAlias); - hres = _copy_arg((ITypeInfo2*)tinfo2, tdesc, argpos, arg, tdesc->vt); - break; - - case TKIND_INTERFACE: - if (V_VT(arg) == VT_DISPATCH) { - IDispatch *disp; - if (IsEqualIID(&IID_IDispatch,&(tattr->guid))) { - memcpy(argpos, &V_DISPATCH(arg), 4); - hres = S_OK; - break; - } - hres=IUnknown_QueryInterface(V_DISPATCH(arg), - &IID_IDispatch,(LPVOID*)&disp); - if (SUCCEEDED(hres)) { - memcpy(argpos,&disp,4); - IUnknown_Release(V_DISPATCH(arg)); - hres = S_OK; - break; - } - FIXME("Failed to query IDispatch interface from %s while " - "converting to VT_DISPATCH!\n",debugstr_guid(&(tattr->guid))); - hres = E_FAIL; - break; - } - if (V_VT(arg) == VT_UNKNOWN) { - memcpy(argpos, &V_UNKNOWN(arg), 4); - hres = S_OK; - break; - } - FIXME("vt 0x%x -> TKIND_INTERFACE(%s) unhandled\n", - V_VT(arg),debugstr_guid(&(tattr->guid))); - hres = E_FAIL; - break; - - case TKIND_DISPATCH: - if (V_VT(arg) == VT_DISPATCH) { - memcpy(argpos, &V_DISPATCH(arg), 4); - hres = S_OK; - } - else { - hres = E_FAIL; - FIXME("TKIND_DISPATCH unhandled for target vt 0x%x.\n",V_VT(arg)); - } - break; - case TKIND_RECORD: - FIXME("TKIND_RECORD unhandled.\n"); - hres = E_FAIL; - break; - default: - FIXME("TKIND %d unhandled.\n",tattr->typekind); - hres = E_FAIL; - break; - } - ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); - ITypeInfo_Release(tinfo2); - return hres; - } - - VariantInit(&va); - if (VariantChangeType(&va,arg,0,vt)==S_OK) { - memcpy(argpos,&V_I4(&va), arglen); - FIXME("Should not use VariantChangeType here." - " (conversion from 0x%x -> 0x%x) %08lx\n", - V_VT(arg), vt, *argpos - ); - return S_OK; - } - ERR("Set arg to disparg type 0x%x vs 0x%x\n",V_VT(arg),vt); - return E_FAIL; -} - static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) { HRESULT hr = S_OK;

1 0

Robert Shearman : ole: ITypeInfo::Invoke rewrite.
by Alexandre Julliard Jan. 6, 2006

Jan. 6, 2006

Module: wine Branch: refs/heads/master Commit: 8cf5373f60aca5345a0c55df2711a9f0b73b8133 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8cf5373f60aca5345a0c55d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jan 6 21:15:48 2006 +0100 ole: ITypeInfo::Invoke rewrite. Re-implement ITypeInfo::Invoke on top of DispCallFunc and VariantChangeType instead of _invoke and _copy_arg. --- dlls/oleaut32/typelib.c | 208 ++++++++++++++++++++++++----------------------- 1 files changed, 107 insertions(+), 101 deletions(-)

1 0

Robert Shearman : ole: Remove stub from TRACEs of functions that aren't stubs.
by Alexandre Julliard Jan. 6, 2006

Jan. 6, 2006

Module: wine Branch: refs/heads/master Commit: 95312fcb636e9f10cd2a50290ea254ae6f84d2e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=95312fcb636e9f10cd2a502… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jan 6 21:08:09 2006 +0100 ole: Remove "stub" from TRACEs of functions that aren't stubs. --- dlls/ole32/antimoniker.c | 2 +- dlls/ole32/compositemoniker.c | 2 +- dlls/ole32/ole2.c | 2 +- dlls/ole32/storage32.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index bcd59e1..3c25a75 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -133,7 +133,7 @@ AntiMonikerImpl_Release(IMoniker* iface) static HRESULT WINAPI AntiMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID) { - TRACE("(%p,%p),stub!\n",iface,pClassID); + TRACE("(%p,%p)\n",iface,pClassID); if (pClassID==NULL) return E_POINTER; diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index c6510ab..99dd27b 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -170,7 +170,7 @@ CompositeMonikerImpl_Release(IMoniker* i static HRESULT WINAPI CompositeMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID) { - TRACE("(%p,%p),stub!\n",iface,pClassID); + TRACE("(%p,%p)\n",iface,pClassID); if (pClassID==NULL) return E_POINTER; diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index fd55930..d16a7ce 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -929,7 +929,7 @@ HRESULT WINAPI OleSetContainedObject( IRunnableObject* runnable = NULL; HRESULT hres; - TRACE("(%p,%x), stub!\n", pUnknown, fContained); + TRACE("(%p,%x)\n", pUnknown, fContained); hres = IUnknown_QueryInterface(pUnknown, &IID_IRunnableObject, diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index cde6526..8512667 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5737,7 +5737,7 @@ HRESULT WINAPI StgCreatePropSetStg(IStor { HRESULT hr; - TRACE("(%p, 0x%lx, %p): stub\n", pstg, reserved, ppPropSetStg); + TRACE("(%p, 0x%lx, %p)\n", pstg, reserved, ppPropSetStg); if (reserved) hr = STG_E_INVALIDPARAMETER; else

1 0