November 2005 - Wine-Commits

wine/ dlls/dbghelp/dbghelp.spec dlls/dbghelp/m ...
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21540 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:07:51 Modified files: dlls/dbghelp : dbghelp.spec module.c include : dbghelp.h Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Implemented SymUnloadModule64. Patch: http://cvs.winehq.org/patch.py?id=21540 Old revision New revision Changes Path 1.14 1.15 +1 -1 wine/dlls/dbghelp/dbghelp.spec 1.14 1.15 +17 -0 wine/dlls/dbghelp/module.c 1.19 1.20 +1 -0 wine/include/dbghelp.h Index: wine/dlls/dbghelp/dbghelp.spec diff -u -p wine/dlls/dbghelp/dbghelp.spec:1.14 wine/dlls/dbghelp/dbghelp.spec:1.15 --- wine/dlls/dbghelp/dbghelp.spec:1.14 29 Nov 2005 11: 7:51 -0000 +++ wine/dlls/dbghelp/dbghelp.spec 29 Nov 2005 11: 7:51 -0000 @@ -86,7 +86,7 @@ @ stub SymSetSymWithAddr64 @ stub SymUnDName64 @ stdcall SymUnDName(ptr str long) -@ stub SymUnloadModule64 +@ stdcall SymUnloadModule64(long double) @ stdcall SymUnloadModule(long long) @ stdcall UnDecorateSymbolName(str str long long) @ stdcall UnmapDebugInformation(ptr) Index: wine/dlls/dbghelp/module.c diff -u -p wine/dlls/dbghelp/module.c:1.14 wine/dlls/dbghelp/module.c:1.15 --- wine/dlls/dbghelp/module.c:1.14 29 Nov 2005 11: 7:51 -0000 +++ wine/dlls/dbghelp/module.c 29 Nov 2005 11: 7:51 -0000 @@ -447,6 +447,23 @@ BOOL WINAPI SymUnloadModule(HANDLE hProc } /****************************************************************** + * SymUnloadModule64 (DBGHELP.@) + * + */ +BOOL WINAPI SymUnloadModule64(HANDLE hProcess, DWORD64 BaseOfDll) +{ + struct process* pcs; + struct module* module; + + pcs = process_find_by_handle(hProcess); + if (!pcs) return FALSE; + if (!validate_addr64(BaseOfDll)) return FALSE; + module = module_find_by_addr(pcs, (DWORD)BaseOfDll, DMT_UNKNOWN); + if (!module) return FALSE; + return module_remove(pcs, module); +} + +/****************************************************************** * SymEnumerateModules (DBGHELP.@) * */ Index: wine/include/dbghelp.h diff -u -p wine/include/dbghelp.h:1.19 wine/include/dbghelp.h:1.20 --- wine/include/dbghelp.h:1.19 29 Nov 2005 11: 7:51 -0000 +++ wine/include/dbghelp.h 29 Nov 2005 11: 7:51 -0000 @@ -617,6 +617,7 @@ DWORD WINAPI SymLoadModule(HANDLE, HAN DWORD64 WINAPI SymLoadModuleEx(HANDLE, HANDLE, PCSTR, PCSTR, DWORD64, DWORD, PMODLOAD_DATA, DWORD); BOOL WINAPI SymUnloadModule(HANDLE, DWORD); +BOOL WINAPI SymUnloadModule64(HANDLE, DWORD64); /************************* * Symbol Handling *

1 0

wine/dlls/advpack advpack.c tests/advpack.c
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21539 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:07:43 Modified files: dlls/advpack : advpack.c dlls/advpack/tests: advpack.c Log message: James Hawkins <truiken(a)gmail.com> Returned versions are always initialized to zero, even on failure. Function always returns S_OK, even on failure. Copy the file to the temp directory if the file exists but isn't found by GetFileVersionInfoSize. If bVersion is FALSE, return the language and code page identifiers of the file, not the system. Patch: http://cvs.winehq.org/patch.py?id=21539 Old revision New revision Changes Path 1.15 1.16 +68 -24 wine/dlls/advpack/advpack.c 1.10 1.11 +0 -1 wine/dlls/advpack/tests/advpack.c Index: wine/dlls/advpack/advpack.c diff -u -p wine/dlls/advpack/advpack.c:1.15 wine/dlls/advpack/advpack.c:1.16 --- wine/dlls/advpack/advpack.c:1.15 29 Nov 2005 11: 7:43 -0000 +++ wine/dlls/advpack/advpack.c 29 Nov 2005 11: 7:43 -0000 @@ -182,49 +182,93 @@ HRESULT WINAPI GetVersionFromFile( LPSTR return GetVersionFromFileEx(Filename, MajorVer, MinorVer, Version); } +/* data for GetVersionFromFileEx */ +typedef struct tagLANGANDCODEPAGE +{ + WORD wLanguage; + WORD wCodePage; +} LANGANDCODEPAGE; + /*********************************************************************** * GetVersionFromFileEx (ADVPACK.@) */ HRESULT WINAPI GetVersionFromFileEx( LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion ) { - DWORD hdl, retval; - LPVOID pVersionInfo; - BOOL boolret; VS_FIXEDFILEINFO *pFixedVersionInfo; - UINT uiLength; + LANGANDCODEPAGE *pLangAndCodePage; + DWORD dwHandle, dwInfoSize; + CHAR szWinDir[MAX_PATH]; + CHAR szFile[MAX_PATH]; + LPVOID pVersionInfo = NULL; + BOOL bFileCopied = FALSE; + UINT uValueLen; + TRACE("(%s, %p, %p, %d)\n", lpszFilename, pdwMSVer, pdwLSVer, bVersion); - if (bVersion) + *pdwLSVer = 0; + *pdwMSVer = 0; + + lstrcpynA(szFile, lpszFilename, MAX_PATH); + + dwInfoSize = GetFileVersionInfoSizeA(szFile, &dwHandle); + if (!dwInfoSize) { - retval = GetFileVersionInfoSizeA(lpszFilename, &hdl); - if (retval == 0 || hdl != 0) - return E_FAIL; + /* check that the file exists */ + if (GetFileAttributesA(szFile) == INVALID_FILE_ATTRIBUTES) + return S_OK; + + /* file exists, but won't be found by GetFileVersionInfoSize, + * so copy it to the temp dir where it will be found. + */ + GetWindowsDirectoryA(szWinDir, MAX_PATH); + GetTempFileNameA(szWinDir, NULL, 0, szFile); + CopyFileA(lpszFilename, szFile, FALSE); + bFileCopied = TRUE; + + dwInfoSize = GetFileVersionInfoSizeA(szFile, &dwHandle); + if (!dwInfoSize) + goto done; + } + + pVersionInfo = HeapAlloc(GetProcessHeap(), 0, dwInfoSize); + if (!pVersionInfo) + goto done; - pVersionInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, retval); - if (pVersionInfo == NULL) - return E_FAIL; - GetFileVersionInfoA( lpszFilename, 0, retval, pVersionInfo); + if (!GetFileVersionInfoA(szFile, dwHandle, dwInfoSize, pVersionInfo)) + goto done; - boolret = VerQueryValueA(pVersionInfo, "\\", - (LPVOID) &pFixedVersionInfo, &uiLength); + if (bVersion) + { + if (!VerQueryValueA(pVersionInfo, "\\", + (LPVOID *)&pFixedVersionInfo, &uValueLen)) + goto done; - HeapFree(GetProcessHeap(), 0, pVersionInfo); + if (!uValueLen) + goto done; - if (boolret) - { - *pdwMSVer = pFixedVersionInfo->dwFileVersionMS; - *pdwLSVer = pFixedVersionInfo->dwFileVersionLS; - } - else - return E_FAIL; + *pdwMSVer = pFixedVersionInfo->dwFileVersionMS; + *pdwLSVer = pFixedVersionInfo->dwFileVersionLS; } else { - *pdwMSVer = GetUserDefaultUILanguage(); - *pdwLSVer = GetACP(); + if (!VerQueryValueA(pVersionInfo, "\\VarFileInfo\\Translation", + (LPVOID *)&pLangAndCodePage, &uValueLen)) + goto done; + + if (!uValueLen) + goto done; + + *pdwMSVer = pLangAndCodePage->wLanguage; + *pdwLSVer = pLangAndCodePage->wCodePage; } +done: + HeapFree(GetProcessHeap(), 0, pVersionInfo); + + if (bFileCopied) + DeleteFileA(szFile); + return S_OK; } Index: wine/dlls/advpack/tests/advpack.c diff -u -p wine/dlls/advpack/tests/advpack.c:1.10 wine/dlls/advpack/tests/advpack.c:1.11 --- wine/dlls/advpack/tests/advpack.c:1.10 29 Nov 2005 11: 7:43 -0000 +++ wine/dlls/advpack/tests/advpack.c 29 Nov 2005 11: 7:43 -0000 @@ -60,7 +60,6 @@ static void version_test(void) major = minor = 0; hr = pGetVersionFromFile("advpack.dll", &major, &minor, TRUE); - todo_wine ok (hr == S_OK, "GetVersionFromFileEx(advpack.dll) failed, returned " "0x%08lx\n", hr); trace("advpack.dll version: %d.%d.%d.%d\n", HIWORD(major), LOWORD(major),

1 0

wine/dlls/wininet http.c
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21538 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:07:35 Modified files: dlls/wininet : http.c Log message: Robert Shearman <rob(a)codeweavers.com> Fix redirects from secure to non-secure and vice versa. Patch: http://cvs.winehq.org/patch.py?id=21538 Old revision New revision Changes Path 1.125 1.126 +21 -1 wine/dlls/wininet/http.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.125 wine/dlls/wininet/http.c:1.126 --- wine/dlls/wininet/http.c:1.125 29 Nov 2005 11: 7:35 -0000 +++ wine/dlls/wininet/http.c 29 Nov 2005 11: 7:35 -0000 @@ -1808,6 +1808,8 @@ static BOOL HTTP_HandleRedirect(LPWININE URL_COMPONENTSW urlComponents; WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; WCHAR password[1024], extra[1024]; + static const WCHAR szHttp[] = {'h','t','t','p',0}; + static const WCHAR szHttps[] = {'h','t','t','p','s',0}; extra[0] = 0; password[0] = 0; userName[0] = 0; @@ -1829,7 +1831,24 @@ static BOOL HTTP_HandleRedirect(LPWININE urlComponents.dwExtraInfoLength = 1024; if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) return FALSE; - + + if (urlComponents.lpszScheme && + !strncmpW(szHttp, urlComponents.lpszScheme, strlenW(szHttp)) && + (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)) + { + TRACE("redirect from secure page to non-secure page\n"); + /* FIXME: warn about from secure redirect to non-secure page */ + lpwhr->hdr.dwFlags &= ~INTERNET_FLAG_SECURE; + } + if (urlComponents.lpszScheme && + !strncmpW(szHttps, urlComponents.lpszScheme, strlenW(szHttps)) && + !(lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)) + { + TRACE("redirect from non-secure page to secure page\n"); + /* FIXME: notify about redirect to secure page */ + lpwhr->hdr.dwFlags |= INTERNET_FLAG_SECURE; + } + if (urlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) { if (lstrlenW(protocol)>4) /*https*/ @@ -1897,6 +1916,7 @@ static BOOL HTTP_HandleRedirect(LPWININE &(lpwhs->socketAddress), sizeof(struct sockaddr_in)); + NETCON_close(&lpwhr->netConnection); } HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath);

1 0

wine/dlls/oleaut32 typelib.c
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21537 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:07:24 Modified files: dlls/oleaut32 : typelib.c Log message: Robert Shearman <rob(a)codeweavers.com> Implement ITypeInfo_Bind for typelibs. Fix some places where a returned object was AddRef'd. Make the search through implemented types work on all types, not just interfaces. Patch: http://cvs.winehq.org/patch.py?id=21537 Old revision New revision Changes Path 1.177 1.178 +126 -10 wine/dlls/oleaut32/typelib.c Index: wine/dlls/oleaut32/typelib.c diff -u -p wine/dlls/oleaut32/typelib.c:1.177 wine/dlls/oleaut32/typelib.c:1.178 --- wine/dlls/oleaut32/typelib.c:1.177 29 Nov 2005 11: 7:24 -0000 +++ wine/dlls/oleaut32/typelib.c 29 Nov 2005 11: 7:24 -0000 @@ -4084,8 +4084,121 @@ static HRESULT WINAPI ITypeLibComp_fnBin DESCKIND * pDescKind, BINDPTR * pBindPtr) { - FIXME("(%s, %lx, 0x%x, %p, %p, %p): stub\n", debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); - return E_NOTIMPL; + ITypeLibImpl *This = impl_from_ITypeComp(iface); + ITypeInfoImpl *pTypeInfo; + + TRACE("(%s, 0x%lx, 0x%x, %p, %p, %p)\n", debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); + + *pDescKind = DESCKIND_NONE; + pBindPtr->lptcomp = NULL; + *ppTInfo = NULL; + + for (pTypeInfo = This->pTypeInfo; pTypeInfo; pTypeInfo = pTypeInfo->next) + { + TRACE("testing %s\n", debugstr_w(pTypeInfo->Name)); + + /* FIXME: check wFlags here? */ + /* FIXME: we should use a hash table to look this info up using lHash + * instead of an O(n) search */ + if ((pTypeInfo->TypeAttr.typekind == TKIND_ENUM) || + (pTypeInfo->TypeAttr.typekind == TKIND_MODULE)) + { + if (pTypeInfo->Name && !strcmpW(pTypeInfo->Name, szName)) + { + *pDescKind = DESCKIND_TYPECOMP; + pBindPtr->lptcomp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + ITypeComp_AddRef(pBindPtr->lptcomp); + TRACE("module or enum: %s\n", debugstr_w(szName)); + return S_OK; + } + } + + if ((pTypeInfo->TypeAttr.typekind == TKIND_MODULE) || + (pTypeInfo->TypeAttr.typekind == TKIND_ENUM)) + { + ITypeComp *pSubTypeComp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + HRESULT hr; + + hr = ITypeComp_Bind(pSubTypeComp, szName, lHash, wFlags, ppTInfo, pDescKind, pBindPtr); + if (SUCCEEDED(hr) && (*pDescKind != DESCKIND_NONE)) + { + TRACE("found in module or in enum: %s\n", debugstr_w(szName)); + return S_OK; + } + } + + if ((pTypeInfo->TypeAttr.typekind == TKIND_COCLASS) && + (pTypeInfo->TypeAttr.wTypeFlags & TYPEFLAG_FAPPOBJECT)) + { + ITypeComp *pSubTypeComp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + HRESULT hr; + ITypeInfo *subtypeinfo; + BINDPTR subbindptr; + DESCKIND subdesckind; + + hr = ITypeComp_Bind(pSubTypeComp, szName, lHash, wFlags, + &subtypeinfo, &subdesckind, &subbindptr); + if (SUCCEEDED(hr) && (subdesckind != DESCKIND_NONE)) + { + TYPEDESC tdesc_appobject = + { + { + 0 /* FIXME */ + }, + VT_USERDEFINED + }; + const VARDESC vardesc_appobject = + { + -2, /* memid */ + NULL, /* lpstrSchema */ + { + 0 /* oInst */ + }, + { + /* ELEMDESC */ + { + /* TYPEDESC */ + { + &tdesc_appobject + }, + VT_PTR + }, + }, + 0, /* wVarFlags */ + VAR_STATIC /* varkind */ + }; + + TRACE("found in implicit app object: %s\n", debugstr_w(szName)); + + /* cleanup things filled in by Bind call so we can put our + * application object data in there instead */ + switch (subdesckind) + { + case DESCKIND_FUNCDESC: + ITypeInfo_ReleaseFuncDesc(subtypeinfo, subbindptr.lpfuncdesc); + break; + case DESCKIND_VARDESC: + ITypeInfo_ReleaseVarDesc(subtypeinfo, subbindptr.lpvardesc); + break; + default: + break; + } + if (subtypeinfo) ITypeInfo_Release(subtypeinfo); + + hr = TLB_AllocAndInitVarDesc(&vardesc_appobject, &pBindPtr->lpvardesc); + if (FAILED(hr)) + return hr; + + *pDescKind = DESCKIND_IMPLICITAPPOBJ; + *ppTInfo = (ITypeInfo *)pTypeInfo; + ITypeInfo_AddRef(*ppTInfo); + return S_OK; + } + } + } + + TRACE("name not found %s\n", debugstr_w(szName)); + return S_OK; } static HRESULT WINAPI ITypeLibComp_fnBindType( @@ -6157,8 +6270,12 @@ static HRESULT WINAPI ITypeComp_fnBind( TRACE("(%s, %lx, 0x%x, %p, %p, %p)\n", debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); + *pDescKind = DESCKIND_NONE; + pBindPtr->lpfuncdesc = NULL; + *ppTInfo = NULL; + for(pFDesc = This->funclist; pFDesc; pFDesc = pFDesc->next) - if (pFDesc->funcdesc.invkind & wFlags) + if (!wFlags || (pFDesc->funcdesc.invkind & wFlags)) if (!strcmpW(pFDesc->Name, szName)) { break; } @@ -6166,8 +6283,10 @@ static HRESULT WINAPI ITypeComp_fnBind( if (pFDesc) { *pDescKind = DESCKIND_FUNCDESC; + /* FIXME: allocate memory and copy funcdesc */ pBindPtr->lpfuncdesc = &pFDesc->funcdesc; *ppTInfo = (ITypeInfo *)&This->lpVtbl; + ITypeInfo_AddRef(*ppTInfo); return S_OK; } else { if (!(wFlags & ~(INVOKE_PROPERTYGET))) @@ -6179,14 +6298,14 @@ static HRESULT WINAPI ITypeComp_fnBind( return hr; *pDescKind = DESCKIND_VARDESC; *ppTInfo = (ITypeInfo *)&This->lpVtbl; + ITypeInfo_AddRef(*ppTInfo); return S_OK; } } } } - /* not found, look for it in inherited interfaces */ - if (This->TypeAttr.cImplTypes && - (This->TypeAttr.typekind == TKIND_INTERFACE || This->TypeAttr.typekind == TKIND_DISPATCH)) { + /* FIXME: search each inherited interface, not just the first */ + if (This->TypeAttr.cImplTypes) { /* recursive search */ ITypeInfo *pTInfo; ITypeComp *pTComp; @@ -6205,10 +6324,7 @@ static HRESULT WINAPI ITypeComp_fnBind( } WARN("Could not search inherited interface!\n"); } - ERR("did not find member with name %s, flags 0x%x!\n", debugstr_w(szName), wFlags); - *pDescKind = DESCKIND_NONE; - pBindPtr->lpfuncdesc = NULL; - *ppTInfo = NULL; + WARN("did not find member with name %s, flags 0x%x!\n", debugstr_w(szName), wFlags); return DISP_E_MEMBERNOTFOUND; }

1 0

wine/include shellapi.h
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21536 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:07:06 Modified files: include : shellapi.h Log message: Peter Lemenkov <petro(a)mail.ru> Added some definitions. Patch: http://cvs.winehq.org/patch.py?id=21536 Old revision New revision Changes Path 1.34 1.35 +3 -0 wine/include/shellapi.h Index: wine/include/shellapi.h diff -u -p wine/include/shellapi.h:1.34 wine/include/shellapi.h:1.35 --- wine/include/shellapi.h:1.34 29 Nov 2005 11: 7: 6 -0000 +++ wine/include/shellapi.h 29 Nov 2005 11: 7: 6 -0000 @@ -60,6 +60,9 @@ BOOL WINAPI DragQueryPoint(HDROP hDrop, #define NIF_MESSAGE 0x00000001 #define NIF_ICON 0x00000002 #define NIF_TIP 0x00000004 +#define NIF_STATE 0x00000008 +#define NIF_INFO 0x00000010 +#define NIF_GUID 0x00000020 #define NIM_ADD 0x00000000 #define NIM_MODIFY 0x00000001

1 0

wine/dlls/winmm mci.c
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21535 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:07:01 Modified files: dlls/winmm : mci.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Fixed some bugs in MCI string parsing. Patch: http://cvs.winehq.org/patch.py?id=21535 Old revision New revision Changes Path 1.66 1.67 +2 -3 wine/dlls/winmm/mci.c Index: wine/dlls/winmm/mci.c diff -u -p wine/dlls/winmm/mci.c:1.66 wine/dlls/winmm/mci.c:1.67 --- wine/dlls/winmm/mci.c:1.66 29 Nov 2005 11: 7: 1 -0000 +++ wine/dlls/winmm/mci.c 29 Nov 2005 11: 7: 1 -0000 @@ -555,7 +555,7 @@ static DWORD MCI_UnmapMsgAtoW(UINT msg, /************************************************************************** * MCI_GetDevTypeFromFileName [internal] */ -static DWORD MCI_GetDevTypeFromFileName(LPCWSTR fileName, LPCWSTR buf, UINT len) +static DWORD MCI_GetDevTypeFromFileName(LPCWSTR fileName, LPWSTR buf, UINT len) { LPCWSTR tmp; HKEY hKey; @@ -1031,7 +1031,6 @@ static DWORD MCI_GetString(LPWSTR* str, if (ptr[-1] == '\\') TRACE("Ooops: un-escaped \"\n"); *ptr++ = '\0'; /* remove trailing " */ if (*ptr != ' ' && *ptr != '\0') return MCIERR_EXTRA_CHARACTERS; - *ptr++ = '\0'; } else { ptr = strchrW(ptr, ' '); @@ -1093,7 +1092,7 @@ static DWORD MCI_ParseOptArgs(LPDWORD da } if (strncmpiW(args, str, len) == 0 && - (args[len] == 0 || args[len] == ' ')) { + ((eid == MCI_STRING && len == 0) || args[len] == 0 || args[len] == ' ')) { /* store good values into data[] */ args += len; while (*args == ' ') args++;

1 0

wine/ dlls/dbghelp/dbghelp.c dlls/dbghelp/dbgh ...
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21534 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:06:52 Modified files: dlls/dbghelp : dbghelp.c dbghelp.spec dbghelp_private.h module.c include : dbghelp.h Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Implemented SymLoadModuleEx. Patch: http://cvs.winehq.org/patch.py?id=21534 Old revision New revision Changes Path 1.15 1.16 +15 -0 wine/dlls/dbghelp/dbghelp.c 1.13 1.14 +1 -1 wine/dlls/dbghelp/dbghelp.spec 1.18 1.19 +2 -1 wine/dlls/dbghelp/dbghelp_private.h 1.13 1.14 +17 -0 wine/dlls/dbghelp/module.c 1.18 1.19 +1 -1 wine/include/dbghelp.h Index: wine/dlls/dbghelp/dbghelp.c diff -u -p wine/dlls/dbghelp/dbghelp.c:1.15 wine/dlls/dbghelp/dbghelp.c:1.16 --- wine/dlls/dbghelp/dbghelp.c:1.15 29 Nov 2005 11: 6:52 -0000 +++ wine/dlls/dbghelp/dbghelp.c 29 Nov 2005 11: 6:52 -0000 @@ -100,6 +100,21 @@ struct process* process_find_by_handl } /****************************************************************** + * validate_addr64 (internal) + * + */ +BOOL validate_addr64(DWORD64 addr) +{ + if (addr >> 32) + { + FIXME("Unsupported address %s\n", wine_dbgstr_longlong(addr)); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return TRUE; +} + +/****************************************************************** * SymSetSearchPath (DBGHELP.@) * */ Index: wine/dlls/dbghelp/dbghelp.spec diff -u -p wine/dlls/dbghelp/dbghelp.spec:1.13 wine/dlls/dbghelp/dbghelp.spec:1.14 --- wine/dlls/dbghelp/dbghelp.spec:1.13 29 Nov 2005 11: 6:52 -0000 +++ wine/dlls/dbghelp/dbghelp.spec 29 Nov 2005 11: 6:52 -0000 @@ -72,7 +72,7 @@ @ stdcall SymInitialize(long str long) @ stdcall SymLoadModule64(long long str str double long) @ stdcall SymLoadModule(long long str str long long) -@ stub SymLoadModuleEx +@ stdcall SymLoadModuleEx(long long str str double long ptr long) @ stdcall SymMatchFileName(str str ptr ptr) @ stub SymMatchString @ stdcall SymRegisterCallback64(long ptr double) Index: wine/dlls/dbghelp/dbghelp_private.h diff -u -p wine/dlls/dbghelp/dbghelp_private.h:1.18 wine/dlls/dbghelp/dbghelp_private.h:1.19 --- wine/dlls/dbghelp/dbghelp_private.h:1.18 29 Nov 2005 11: 6:52 -0000 +++ wine/dlls/dbghelp/dbghelp_private.h 29 Nov 2005 11: 6:52 -0000 @@ -312,7 +312,8 @@ struct line_info /* dbghelp.c */ extern struct process* process_find_by_handle(HANDLE hProcess); extern HANDLE hMsvcrt; - +extern BOOL validate_addr64(DWORD64 addr); + /* elf_module.c */ typedef BOOL (*elf_enum_modules_cb)(const char*, unsigned long addr, void* user); extern BOOL elf_enum_modules(HANDLE hProc, elf_enum_modules_cb, void*); Index: wine/dlls/dbghelp/module.c diff -u -p wine/dlls/dbghelp/module.c:1.13 wine/dlls/dbghelp/module.c:1.14 --- wine/dlls/dbghelp/module.c:1.13 29 Nov 2005 11: 6:52 -0000 +++ wine/dlls/dbghelp/module.c 29 Nov 2005 11: 6:52 -0000 @@ -375,6 +375,23 @@ done: } /*********************************************************************** + * SymLoadModuleEx (DBGHELP.@) + */ +DWORD64 WINAPI SymLoadModuleEx(HANDLE hProcess, HANDLE hFile, PCSTR ImageName, + PCSTR ModuleName, DWORD64 BaseOfDll, DWORD DllSize, + PMODLOAD_DATA Data, DWORD Flags) +{ + if (Data || Flags) + { + FIXME("Unsupported parameters (%p, %lx) for %s\n", Data, Flags, ImageName); + if (Flags & 1) return TRUE; + } + if (!validate_addr64(BaseOfDll)) return FALSE; + return SymLoadModule(hProcess, hFile, (char*)ImageName, (char*)ModuleName, + (DWORD)BaseOfDll, DllSize); +} + +/*********************************************************************** * SymLoadModule64 (DBGHELP.@) */ DWORD WINAPI SymLoadModule64(HANDLE hProcess, HANDLE hFile, char* ImageName, Index: wine/include/dbghelp.h diff -u -p wine/include/dbghelp.h:1.18 wine/include/dbghelp.h:1.19 --- wine/include/dbghelp.h:1.18 29 Nov 2005 11: 6:52 -0000 +++ wine/include/dbghelp.h 29 Nov 2005 11: 6:52 -0000 @@ -614,7 +614,7 @@ BOOL WINAPI SymGetModuleInfo(HANDLE, BOOL WINAPI SymGetModuleInfoW(HANDLE, DWORD, PIMAGEHLP_MODULEW); DWORD WINAPI SymGetModuleBase(HANDLE, DWORD); DWORD WINAPI SymLoadModule(HANDLE, HANDLE, PSTR, PSTR, DWORD, DWORD); -DWORD64 WINAPI SymLoadModuleEx(HANDLE, HANDLE, PSTR, PSTR, DWORD64, DWORD, +DWORD64 WINAPI SymLoadModuleEx(HANDLE, HANDLE, PCSTR, PCSTR, DWORD64, DWORD, PMODLOAD_DATA, DWORD); BOOL WINAPI SymUnloadModule(HANDLE, DWORD);

1 0

wine/programs/winedbg debugger.h display.c sta ...
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21533 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:06:42 Modified files: programs/winedbg: debugger.h display.c stack.c symbol.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Replaced stack_get_frame with a pure symbol (and no longer stackframe) oriented API (stack_get_current_symbol). Reused the func name (stack_get_frame) for internal stack.c handling. Patch: http://cvs.winehq.org/patch.py?id=21533 Old revision New revision Changes Path 1.35 1.36 +1 -1 wine/programs/winedbg/debugger.h 1.8 1.9 +4 -4 wine/programs/winedbg/display.c 1.19 1.20 +15 -22 wine/programs/winedbg/stack.c 1.13 1.14 +9 -9 wine/programs/winedbg/symbol.c Index: wine/programs/winedbg/debugger.h diff -u -p wine/programs/winedbg/debugger.h:1.35 wine/programs/winedbg/debugger.h:1.36 --- wine/programs/winedbg/debugger.h:1.35 29 Nov 2005 11: 6:42 -0000 +++ wine/programs/winedbg/debugger.h 29 Nov 2005 11: 6:42 -0000 @@ -348,9 +348,9 @@ extern void source_nuke_path extern void stack_info(void); extern void stack_backtrace(DWORD threadID); extern BOOL stack_set_frame(int newframe); -extern BOOL stack_get_frame(SYMBOL_INFO* sym, IMAGEHLP_STACK_FRAME* ihsf); extern BOOL stack_get_current_frame(IMAGEHLP_STACK_FRAME* ihsf); extern unsigned stack_fetch_frames(void); +extern BOOL stack_get_current_symbol(SYMBOL_INFO* sym); /* symbol.c */ extern enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, struct dbg_lvalue* addr, BOOL bp_disp); Index: wine/programs/winedbg/display.c diff -u -p wine/programs/winedbg/display.c:1.8 wine/programs/winedbg/display.c:1.9 --- wine/programs/winedbg/display.c:1.8 29 Nov 2005 11: 6:42 -0000 +++ wine/programs/winedbg/display.c 29 Nov 2005 11: 6:42 -0000 @@ -87,7 +87,7 @@ int display_add(struct expr *exp, int co displaypoints[i].func->SizeOfStruct = sizeof(SYMBOL_INFO); displaypoints[i].func->MaxNameLen = sizeof(displaypoints[i].func_buffer) - sizeof(*displaypoints[i].func); - if (!stack_get_frame(displaypoints[i].func, NULL)) + if (!stack_get_current_symbol(displaypoints[i].func)) { expr_free(displaypoints[i].exp); displaypoints[i].exp = NULL; @@ -110,7 +110,7 @@ int display_info(void) memset(func, 0, sizeof(SYMBOL_INFO)); func->SizeOfStruct = sizeof(SYMBOL_INFO); func->MaxNameLen = sizeof(buffer) - sizeof(*func); - if (!stack_get_frame(func, NULL)) return FALSE; + if (!stack_get_current_symbol(func)) return FALSE; for (i = 0; i < ndisplays; i++) { @@ -174,7 +174,7 @@ int display_print(void) memset(func, 0, sizeof(SYMBOL_INFO)); func->SizeOfStruct = sizeof(SYMBOL_INFO); func->MaxNameLen = sizeof(buffer) - sizeof(*func); - if (!stack_get_frame(func, NULL)) return FALSE; + if (!stack_get_current_symbol(func)) return FALSE; for (i = 0; i < ndisplays; i++) { @@ -243,7 +243,7 @@ int display_enable(int displaynum, int e memset(func, 0, sizeof(SYMBOL_INFO)); func->SizeOfStruct = sizeof(SYMBOL_INFO); func->MaxNameLen = sizeof(buffer) - sizeof(*func); - if (!stack_get_frame(func, NULL)) return FALSE; + if (!stack_get_current_symbol(func)) return FALSE; --displaynum; if (displaynum >= ndisplays || displaynum < 0 || Index: wine/programs/winedbg/stack.c diff -u -p wine/programs/winedbg/stack.c:1.19 wine/programs/winedbg/stack.c:1.20 --- wine/programs/winedbg/stack.c:1.19 29 Nov 2005 11: 6:42 -0000 +++ wine/programs/winedbg/stack.c 29 Nov 2005 11: 6:42 -0000 @@ -82,7 +82,7 @@ static BOOL stack_set_frame_internal(int return TRUE; } -static BOOL stack_get_frame_internal(int nf, IMAGEHLP_STACK_FRAME* ihsf) +static BOOL stack_get_frame(int nf, IMAGEHLP_STACK_FRAME* ihsf) { ihsf->InstructionOffset = (unsigned long)memory_to_linear_addr(&dbg_curr_thread->frames[nf].addr_pc); ihsf->FrameOffset = (unsigned long)memory_to_linear_addr(&dbg_curr_thread->frames[nf].addr_frame); @@ -95,7 +95,7 @@ BOOL stack_get_current_frame(IMAGEHLP_ST * If we don't have a valid backtrace, then just return. */ if (dbg_curr_thread->frames == NULL) return FALSE; - return stack_get_frame_internal(dbg_curr_thread->curr_frame, ihsf); + return stack_get_frame(dbg_curr_thread->curr_frame, ihsf); } BOOL stack_set_frame(int newframe) @@ -108,27 +108,20 @@ BOOL stack_set_frame(int newframe) return TRUE; } -BOOL stack_get_frame(SYMBOL_INFO* symbol, IMAGEHLP_STACK_FRAME* ihsf) +/****************************************************************** + * stack_get_current_symbol + * + * Retrieves the symbol information for the current frame element + */ +BOOL stack_get_current_symbol(SYMBOL_INFO* symbol) { - DWORD64 disp; - /* - * If we don't have a valid backtrace, then just return. - */ - if (dbg_curr_thread->frames == NULL) return FALSE; - - /* - * If we don't know what the current function is, then we also have - * nothing to report here. - */ - if (!SymFromAddr(dbg_curr_process->handle, - (unsigned long)memory_to_linear_addr(&dbg_curr_thread->frames[dbg_curr_thread->curr_frame].addr_pc), - &disp, symbol)) - return FALSE; - if (ihsf && !stack_get_current_frame(ihsf)) return FALSE; + IMAGEHLP_STACK_FRAME ihsf; + DWORD64 disp; - return TRUE; + if (!stack_get_current_frame(&ihsf)) return FALSE; + return SymFromAddr(dbg_curr_process->handle, ihsf.InstructionOffset, + &disp, symbol); } - /****************************************************************** * stack_fetch_frames * @@ -214,7 +207,7 @@ static void stack_print_addr_and_args(in print_bare_address(&dbg_curr_thread->frames[nf].addr_pc); - stack_get_frame_internal(nf, &ihsf); + stack_get_frame(nf, &ihsf); /* grab module where symbol is. If we don't have a module, we cannot print more */ im.SizeOfStruct = sizeof(im); @@ -270,7 +263,7 @@ static unsigned backtrace(void) dbg_printf(")\n"); } /* reset context to current stack frame */ - stack_get_frame_internal(dbg_curr_thread->curr_frame, &ihsf); + stack_get_frame(dbg_curr_thread->curr_frame, &ihsf); SymSetContext(dbg_curr_process->handle, &ihsf, NULL); return nf; } Index: wine/programs/winedbg/symbol.c diff -u -p wine/programs/winedbg/symbol.c:1.13 wine/programs/winedbg/symbol.c:1.14 --- wine/programs/winedbg/symbol.c:1.13 29 Nov 2005 11: 6:42 -0000 +++ wine/programs/winedbg/symbol.c 29 Nov 2005 11: 6:42 -0000 @@ -595,17 +595,17 @@ static BOOL CALLBACK info_locals_cb(SYMB int symbol_info_locals(void) { IMAGEHLP_STACK_FRAME ihsf; - char buffer[sizeof(SYMBOL_INFO) + 256]; - SYMBOL_INFO* si = (SYMBOL_INFO*)buffer; + ADDRESS addr; + + stack_get_current_frame(&ihsf); + addr.Mode = AddrModeFlat; + addr.Offset = ihsf.InstructionOffset; + print_address(&addr, FALSE); + dbg_printf(": (%08lx)\n", (DWORD_PTR)ihsf.FrameOffset); + SymEnumSymbols(dbg_curr_process->handle, 0, NULL, info_locals_cb, (void*)(DWORD_PTR)ihsf.FrameOffset); - si->SizeOfStruct = sizeof(*si); - si->MaxNameLen = 256; - if (stack_get_frame(si, &ihsf)) - { - dbg_printf("%s:\n", si->Name); - SymEnumSymbols(dbg_curr_process->handle, 0, NULL, info_locals_cb, &ihsf); - } return TRUE; + } static BOOL CALLBACK symbols_info_cb(SYMBOL_INFO* sym, ULONG size, void* ctx)

1 0

wine/dlls/ole32 ole32res.rc
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21532 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:06:34 Modified files: dlls/ole32 : ole32res.rc Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Made the Drag&Drop cursors' rubber band visible on a white background. Patch: http://cvs.winehq.org/patch.py?id=21532 Old revision New revision Changes Path 1.7 1.8 +9 -9 wine/dlls/ole32/ole32res.rc Index: wine/dlls/ole32/ole32res.rc diff -u -p wine/dlls/ole32/ole32res.rc:1.7 wine/dlls/ole32/ole32res.rc:1.8 --- wine/dlls/ole32/ole32res.rc:1.7 29 Nov 2005 11: 6:34 -0000 +++ wine/dlls/ole32/ole32res.rc 29 Nov 2005 11: 6:34 -0000 @@ -69,15 +69,15 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 05 55 00 00 0A AA 80 00 04 01 00 00 08 00' - '80 00 04 01 00 00 08 00 80 00 05 55 00 00 0A EA' + '80 00 04 01 00 00 08 00 80 00 05 55 00 00 0A AA' '80 00 00 C0 00 00 01 80 00 00 01 80 00 00 03 00' '00 00 23 00 00 00 36 00 00 00 3E 00 00 00 3F C0' '00 00 3F 80 00 00 3F 00 00 00 3E 00 00 00 3C 00' '00 00 38 00 00 00 30 00 00 00 20 00 00 00 00 00' '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FA AA FF FF F5 55 7F FF FB FE FF FF F7 FF' - '7F FF FB FE FF FF F7 FF 7F FF FA AA FF FF F5 15' + 'FF FF F0 00 7F FF F0 00 7F FF F3 FE 7F FF F3 FE' + '7F FF F3 FE 7F FF F3 FE 7F FF F0 00 7F FF F0 00' '7F FF FE 1F FF FF FC 3F FF FF BC 3F FF FF 98 7F' 'FF FF 88 7F FF FF 80 FF FF FF 80 0F FF FF 80 1F' 'FF FF 80 3F FF FF 80 7F FF FF 80 FF FF FF 81 FF' @@ -95,15 +95,15 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 07 F0 00 00 07 70 00 00 07' '70 00 05 54 10 00 0A A7 70 00 04 07 70 00 08 07' - 'F0 00 04 00 00 00 08 00 80 00 05 55 00 00 0A EA' + 'F0 00 04 00 00 00 08 00 80 00 05 55 00 00 0A AA' '80 00 00 C0 00 00 01 80 00 00 01 80 00 00 03 00' '00 00 23 00 00 00 36 00 00 00 3E 00 00 00 3F C0' '00 00 3F 80 00 00 3F 00 00 00 3E 00 00 00 3C 00' '00 00 38 00 00 00 30 00 00 00 20 00 00 00 00 00' '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' 'FF FF FF F0 07 FF FF F0 07 FF FF F0 07 FF FF F0' - '07 FF FA A0 07 FF F5 50 07 FF FB F0 07 FF F7 F0' - '07 FF FB F0 07 FF F7 FF 7F FF FA AA FF FF F5 15' + '07 FF F0 00 07 FF F0 00 07 FF F3 F0 07 FF F3 F0' + '07 FF F3 F0 07 FF F3 FE 7F FF F0 00 7F FF F0 00' '7F FF FE 1F FF FF FC 3F FF FF BC 3F FF FF 98 7F' 'FF FF 88 7F FF FF 80 FF FF FF 80 0F FF FF 80 1F' 'FF FF 80 3F FF FF 80 7F FF FF 80 FF FF FF 81 FF' @@ -121,15 +121,15 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 07 F0 00 00 06 F0 00 00 06' 'F0 00 05 57 50 00 0A A7 90 00 04 07 10 00 08 07' - 'F0 00 04 00 00 00 08 00 80 00 05 55 00 00 0A EA' + 'F0 00 04 00 00 00 08 00 80 00 05 55 00 00 0A AA' '80 00 00 C0 00 00 01 80 00 00 01 80 00 00 03 00' '00 00 23 00 00 00 36 00 00 00 3E 00 00 00 3F C0' '00 00 3F 80 00 00 3F 00 00 00 3E 00 00 00 3C 00' '00 00 38 00 00 00 30 00 00 00 20 00 00 00 00 00' '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' 'FF FF FF F0 07 FF FF F0 07 FF FF F0 07 FF FF F0' - '07 FF FA A0 07 FF F5 50 07 FF FB F0 07 FF F7 F0' - '07 FF FB F0 07 FF F7 FF 7F FF FA AA FF FF F5 15' + '07 FF F0 00 07 FF F0 00 07 FF F3 F0 07 FF F3 F0' + '07 FF F3 F0 07 FF F3 FE 7F FF F0 00 7F FF F0 00' '7F FF FE 1F FF FF FC 3F FF FF BC 3F FF FF 98 7F' 'FF FF 88 7F FF FF 80 FF FF FF 80 0F FF FF 80 1F' 'FF FF 80 3F FF FF 80 7F FF FF 80 FF FF FF 81 FF'

1 0

wine/dlls/x11drv bitblt.c graphics.c
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21531 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:06:29 Modified files: dlls/x11drv : bitblt.c graphics.c Log message: Avoid including X11/Intrinsic.h. Patch: http://cvs.winehq.org/patch.py?id=21531 Old revision New revision Changes Path 1.12 1.13 +2 -3 wine/dlls/x11drv/bitblt.c 1.9 1.10 +2 -3 wine/dlls/x11drv/graphics.c Index: wine/dlls/x11drv/bitblt.c diff -u -p wine/dlls/x11drv/bitblt.c:1.12 wine/dlls/x11drv/bitblt.c:1.13 --- wine/dlls/x11drv/bitblt.c:1.12 29 Nov 2005 11: 6:29 -0000 +++ wine/dlls/x11drv/bitblt.c 29 Nov 2005 11: 6:29 -0000 @@ -24,7 +24,6 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -#include <X11/Intrinsic.h> #include "windef.h" #include "winbase.h" @@ -1331,8 +1330,8 @@ static BOOL BITBLT_InternalStretchBlt( X /* Xor is much better when we do not have full colormap. */ /* Using white^black ensures that we invert at least black */ /* and white. */ - Pixel xor_pix = (WhitePixel( gdi_display, DefaultScreen(gdi_display) ) ^ - BlackPixel( gdi_display, DefaultScreen(gdi_display) )); + unsigned long xor_pix = (WhitePixel( gdi_display, DefaultScreen(gdi_display) ) ^ + BlackPixel( gdi_display, DefaultScreen(gdi_display) )); XSetFunction( gdi_display, physDevDst->gc, GXxor ); XSetForeground( gdi_display, physDevDst->gc, xor_pix); XSetFillStyle( gdi_display, physDevDst->gc, FillSolid ); Index: wine/dlls/x11drv/graphics.c diff -u -p wine/dlls/x11drv/graphics.c:1.9 wine/dlls/x11drv/graphics.c:1.10 --- wine/dlls/x11drv/graphics.c:1.9 29 Nov 2005 11: 6:29 -0000 +++ wine/dlls/x11drv/graphics.c 29 Nov 2005 11: 6:29 -0000 @@ -34,7 +34,6 @@ #define PI M_PI #endif #include <string.h> -#include <X11/Intrinsic.h> #include "x11drv.h" #include "x11font.h" @@ -908,7 +907,7 @@ X11DRV_RoundRect( X11DRV_PDEVICE *physDe COLORREF X11DRV_SetPixel( X11DRV_PDEVICE *physDev, INT x, INT y, COLORREF color ) { - Pixel pixel; + unsigned long pixel; POINT pt; pt.x = x; @@ -1213,7 +1212,7 @@ X11DRV_PolyPolyline( X11DRV_PDEVICE *phy static void X11DRV_InternalFloodFill(XImage *image, X11DRV_PDEVICE *physDev, int x, int y, int xOrg, int yOrg, - Pixel pixel, WORD fillType ) + unsigned long pixel, WORD fillType ) { int left, right;

1 0