January 2006 - Wine-Commits

Juan Lang : wincrypt: Fix typo.
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: 69ab205a37b0850ad462236055149719b411b45c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=69ab205a37b0850ad462236… Author: Juan Lang <juan(a)codeweavers.com> Date: Tue Jan 31 12:22:01 2006 +0100 wincrypt: Fix typo. --- include/wincrypt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index bf2b467..dc3a44d 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2275,7 +2275,7 @@ static const WCHAR CERT_PHYSICAL_STORE_A #define CERT_X500_NAME_STR 3 #define CERT_NAME_STR_SEMICOLON_FLAG 0x40000000 #define CERT_NAME_STR_NO_PLUS_FLAG 0x20000000 -#define CERT_STR_NO_QUOTING_FLAG 0x10000000 +#define CERT_NAME_STR_NO_QUOTING_FLAG 0x10000000 #define CERT_NAME_STR_CRLF_FLAG 0x08000000 #define CERT_NAME_STR_COMMA_FLAG 0x04000000 #define CERT_NAME_STR_REVERSE_FLAG 0x02000000

1 0

Maarten Lankhorst : comctl32: Restore listview font on CDRF_NEWFONT.
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: 15ca9ce672a41384f61d7c174deaeb3b8cd3352c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15ca9ce672a41384f61d7c1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jan 31 12:21:51 2006 +0100 comctl32: Restore listview font on CDRF_NEWFONT. --- dlls/comctl32/listview.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index db61690..f51b34d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3677,6 +3677,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_I NMLVCUSTOMDRAW nmlvcd; HIMAGELIST himl; LVITEMW lvItem; + HFONT hOldFont; TRACE("(hdc=%p, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, wine_dbgstr_point(&pos)); @@ -3699,7 +3700,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_I /* now check if we need to update the focus rectangle */ lprcFocus = infoPtr->bFocus && (lvItem.state & LVIS_FOCUSED) ? &infoPtr->rcFocus : 0; - + if (!lprcFocus) lvItem.state &= ~LVIS_FOCUSED; LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, &rcState, &rcIcon, &rcLabel); OffsetRect(&rcBox, pos.x, pos.y); @@ -3713,6 +3714,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_I /* fill in the custom draw structure */ customdraw_fill(&nmlvcd, infoPtr, hdc, &rcBox, &lvItem); + hOldFont = GetCurrentObject(hdc, OBJ_FONT); if (nSubItem > 0) cdmode = infoPtr->cditemmode; if (cdmode & CDRF_NOTIFYITEMDRAW) cdsubitemmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd); @@ -3790,6 +3792,8 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_I postpaint: if (cdsubitemmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); + if (cdsubitemmode & CDRF_NEWFONT) + SelectObject(hdc, hOldFont); return TRUE; }

1 0

Robert Shearman : oleaut: Dump the pointer for VT_ARRAY/VT_VECTOR typed variants.
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: 61708da1c87067ab314da9994d70e5d231dba7bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=61708da1c87067ab314da99… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 12:21:27 2006 +0100 oleaut: Dump the pointer for VT_ARRAY/VT_VECTOR typed variants. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 2dbbd34..b6693fc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1224,7 +1224,7 @@ void dump_Variant(const VARIANT * pvar) } else if (V_ISARRAY(pvar) || V_ISVECTOR(pvar)) { - TRACE(",FIXME"); + TRACE(",%p", V_ARRAY(pvar)); } else switch (V_TYPE(pvar)) {

1 0

Robert Shearman : rpcrt4: Only attempt to marshal an object if it is non-NULL.
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: 4197140738bb13baae270efa0ad3add90188765f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4197140738bb13baae270ef… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 12:21:13 2006 +0100 rpcrt4: Only attempt to marshal an object if it is non-NULL. --- dlls/rpcrt4/ndr_ole.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 48f5b72..4bdeefe 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -257,9 +257,13 @@ unsigned char * WINAPI NdrInterfacePoint if (pStubMsg->Buffer + sizeof(DWORD) < (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { stream = RpcStream_Create(pStubMsg, TRUE); if (stream) { - hr = COM_MarshalInterface(stream, riid, (LPUNKNOWN)pMemory, - pStubMsg->dwDestContext, pStubMsg->pvDestContext, - MSHLFLAGS_NORMAL); + if (pMemory) + hr = COM_MarshalInterface(stream, riid, (LPUNKNOWN)pMemory, + pStubMsg->dwDestContext, pStubMsg->pvDestContext, + MSHLFLAGS_NORMAL); + else + hr = S_OK; + IStream_Release(stream); if (FAILED(hr)) RpcRaiseException(hr);

1 0

Robert Shearman : rpcrt4: Handle the RPC_FC_PROC_BYVAL flag correctly in stubless
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: 7f15d9bc4fac5f1366bca91a1704c74a061d3aaa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f15d9bc4fac5f1366bca91… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 12:21:20 2006 +0100 rpcrt4: Handle the RPC_FC_PROC_BYVAL flag correctly in stubless proxies and stubs. --- dlls/rpcrt4/ndr_stubless.c | 51 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index b083d2a..7c10621 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -780,11 +780,21 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST { case PROXY_CALCSIZE: if (pParam->param_attributes & RPC_FC_PROC_PF_IN) - call_buffer_sizer(&stubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (pParam->param_attributes & RPC_FC_PROC_PF_BYVAL) + call_buffer_sizer(&stubMsg, pArg, pTypeFormat); + else + call_buffer_sizer(&stubMsg, *(unsigned char **)pArg, pTypeFormat); + } break; case PROXY_MARSHAL: if (pParam->param_attributes & RPC_FC_PROC_PF_IN) - call_marshaller(&stubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (pParam->param_attributes & RPC_FC_PROC_PF_BYVAL) + call_marshaller(&stubMsg, pArg, pTypeFormat); + else + call_marshaller(&stubMsg, *(unsigned char **)pArg, pTypeFormat); + } break; case PROXY_UNMARSHAL: if (pParam->param_attributes & RPC_FC_PROC_PF_OUT) @@ -792,6 +802,8 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST unsigned char *pRetVal = (unsigned char *)&RetVal; if (pParam->param_attributes & RPC_FC_PROC_PF_RETURN) call_unmarshaller(&stubMsg, &pRetVal, pTypeFormat, 0); + else if (pParam->param_attributes & RPC_FC_PROC_PF_BYVAL) + call_unmarshaller(&stubMsg, &pArg, pTypeFormat, 0); else call_unmarshaller(&stubMsg, (unsigned char **)pArg, pTypeFormat, 0); } @@ -1192,6 +1204,11 @@ long WINAPI NdrStubCall2( pServerInfo->ThunkTable[pRpcMsg->ProcNum](&stubMsg); /* FIXME: RetVal is stored as the last argument - retrieve it */ } + else if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) + { + SERVER_ROUTINE *vtbl = *(SERVER_ROUTINE **)((CStdStubBuffer *)pThis)->pvServerObject; + RetVal = call_server_func(vtbl[pRpcMsg->ProcNum], args, stack_size); + } else RetVal = call_server_func(pServerInfo->DispatchTable[pRpcMsg->ProcNum], args, stack_size); @@ -1311,16 +1328,26 @@ long WINAPI NdrStubCall2( call_marshaller(&stubMsg, (unsigned char *)&RetVal, pTypeFormat); else if (pParam->param_attributes & RPC_FC_PROC_PF_OUT) { - /* we have to dereference the pointer again for complex types */ - call_marshaller(&stubMsg, *(unsigned char **)pArg, pTypeFormat); - stubMsg.pfnFree(*(void **)pArg); + if (pParam->param_attributes & RPC_FC_PROC_PF_BYVAL) + call_marshaller(&stubMsg, pArg, pTypeFormat); + else + { + call_marshaller(&stubMsg, *(unsigned char **)pArg, pTypeFormat); + stubMsg.pfnFree(*(void **)pArg); + } } - /* FIXME: call call_freer here */ + /* FIXME: call call_freer here for IN types */ break; case STUBLESS_UNMARSHAL: if (pParam->param_attributes & RPC_FC_PROC_PF_IN) - call_unmarshaller(&stubMsg, (unsigned char **)pArg, pTypeFormat, 0); - else if (pParam->param_attributes & RPC_FC_PROC_PF_OUT) + { + if (pParam->param_attributes & RPC_FC_PROC_PF_BYVAL) + call_unmarshaller(&stubMsg, &pArg, pTypeFormat, 0); + else + call_unmarshaller(&stubMsg, (unsigned char **)pArg, pTypeFormat, 0); + } + else if ((pParam->param_attributes & RPC_FC_PROC_PF_OUT) && + !(pParam->param_attributes & RPC_FC_PROC_PF_BYVAL)) { *(void **)pArg = NdrAllocate(&stubMsg, sizeof(void *)); **(void ***)pArg = 0; @@ -1330,8 +1357,12 @@ long WINAPI NdrStubCall2( if (pParam->param_attributes & RPC_FC_PROC_PF_RETURN) call_buffer_sizer(&stubMsg, (unsigned char *)&RetVal, pTypeFormat); else if (pParam->param_attributes & RPC_FC_PROC_PF_OUT) - /* we have to dereference the pointer again for complex types */ - call_buffer_sizer(&stubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (pParam->param_attributes & RPC_FC_PROC_PF_BYVAL) + call_buffer_sizer(&stubMsg, pArg, pTypeFormat); + else + call_buffer_sizer(&stubMsg, *(unsigned char **)pArg, pTypeFormat); + } break; default: RpcRaiseException(RPC_S_INTERNAL_ERROR);

1 0

Michael Jung : unixfs: Only resolve the 'dosdevices' based symbol links in
by Alexandre Julliard Jan. 31, 2006

Jan. 31, 2006

Module: wine Branch: refs/heads/master Commit: 48ca838873d3b5be1ac977a91405b1468f8c6287 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=48ca838873d3b5be1ac977a… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Tue Jan 31 12:20:58 2006 +0100 unixfs: Only resolve the 'dosdevices' based symbol links in UNIXFS_get_unix_path, but leave all others alone. --- dlls/shell32/shfldr_unixfs.c | 88 +++++++++++------------------------------- 1 files changed, 24 insertions(+), 64 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 417c55e..4279965 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -129,6 +129,7 @@ #include <stdarg.h> #include <limits.h> #include <dirent.h> +#include <stdlib.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -403,8 +404,8 @@ static BOOL UNIXFS_is_dos_device(const s /****************************************************************************** * UNIXFS_get_unix_path [Internal] * - * Convert an absolute dos path to an absolute canonicalized unix path. - * Evaluate "/.", "/.." and symbolic links. + * Convert an absolute dos path to an absolute unix path. + * Evaluate "/.", "/.." and the symbolic links in $WINEPREFIX/dosdevices. * * PARAMS * pszDosPath [I] An absolute dos path @@ -417,18 +418,32 @@ static BOOL UNIXFS_is_dos_device(const s static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) { char *pPathTail, *pElement, *pCanonicalTail, szPath[FILENAME_MAX], *pszUnixPath; - struct stat fileStat; + WCHAR wszDrive[] = { '?', ':', '\\', 0 }; + int cDriveSymlinkLen; TRACE("(pszDosPath=%s, pszCanonicalPath=%p)\n", debugstr_w(pszDosPath), pszCanonicalPath); if (!pszDosPath || pszDosPath[1] != ':') return FALSE; + /* Get the canonicalized unix path corresponding to the drive letter. */ + wszDrive[0] = pszDosPath[0]; + pszUnixPath = wine_get_unix_file_name(wszDrive); + if (!pszUnixPath) return FALSE; + cDriveSymlinkLen = strlen(pszUnixPath); + pElement = canonicalize_file_name(pszUnixPath); + HeapFree(GetProcessHeap(), 0, pszUnixPath); + if (!pElement) return FALSE; + strcpy(szPath, pElement); + strcat(szPath, "/"); + free(pElement); + + /* Append the part relative to the drive symbolic link target. */ pszUnixPath = wine_get_unix_file_name(pszDosPath); - if (!pszUnixPath) return FALSE; - strcpy(szPath, pszUnixPath); + if (!pszUnixPath) return FALSE; + strcat(szPath, pszUnixPath + cDriveSymlinkLen); HeapFree(GetProcessHeap(), 0, pszUnixPath); - + /* pCanonicalTail always points to the end of the canonical path constructed * thus far. pPathTail points to the still to be processed part of the input * path. pElement points to the path element currently investigated. @@ -439,7 +454,6 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR do { char cTemp; - int cLinks = 0; pElement = pPathTail; pPathTail = strchr(pPathTail+1, '/'); @@ -452,69 +466,15 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR /* Skip "/." path elements */ if (!strcmp("/.", pElement)) { *pPathTail = cTemp; - continue; - } - - /* Remove last element in canonical path for "/.." elements, then skip. */ - if (!strcmp("/..", pElement)) { + } else if (!strcmp("/..", pElement)) { + /* Remove last element in canonical path for "/.." elements, then skip. */ char *pTemp = strrchr(pszCanonicalPath, '/'); if (pTemp) pCanonicalTail = pTemp; *pCanonicalTail = '\0'; *pPathTail = cTemp; - continue; - } - - /* lstat returns zero on success. */ - if (lstat(szPath, &fileStat)) - return FALSE; - - if (S_ISLNK(fileStat.st_mode)) { - char szSymlink[FILENAME_MAX]; - int cLinkLen, cTailLen; - - /* Avoid infinite loop for recursive links. */ - if (++cLinks > 64) - return FALSE; - - cLinkLen = readlink(szPath, szSymlink, FILENAME_MAX); - if (cLinkLen < 0) - return FALSE; - - *pPathTail = cTemp; - cTailLen = strlen(pPathTail); - - if (szSymlink[0] == '/') { - /* Absolute link. Copy to szPath, concat remaining path and start all over. */ - if (cLinkLen + cTailLen + 1 > FILENAME_MAX) - return FALSE; - - /* Avoid double slashes. */ - if (szSymlink[cLinkLen-1] == '/' && pPathTail[0] == '/') { - szSymlink[cLinkLen-1] = '\0'; - cLinkLen--; - } - - memcpy(szSymlink + cLinkLen, pPathTail, cTailLen + 1); - memcpy(szPath, szSymlink, cLinkLen + cTailLen + 1); - *pszCanonicalPath = '\0'; - pCanonicalTail = pszCanonicalPath; - pPathTail = szPath; - } else { - /* Relative link. Expand into szPath and continue. */ - char szTemp[FILENAME_MAX]; - int cTailLen = strlen(pPathTail); - - if (pElement - szPath + 1 + cLinkLen + cTailLen + 1 > FILENAME_MAX) - return FALSE; - - memcpy(szTemp, pPathTail, cTailLen + 1); - memcpy(pElement + 1, szSymlink, cLinkLen); - memcpy(pElement + 1 + cLinkLen, szTemp, cTailLen + 1); - pPathTail = pElement; - } } else { - /* Regular directory or file. Copy to canonical path */ + /* Directory or file. Copy to canonical path */ if (pCanonicalTail - pszCanonicalPath + pPathTail - pElement + 1 > FILENAME_MAX) return FALSE;

1 0

Dmitry Timoshkov : gdi: Add support for creating extended pens.
by Alexandre Julliard Jan. 30, 2006

Jan. 30, 2006

Module: wine Branch: refs/heads/master Commit: eb893bdea3df8ee40c690ca6f1744f90364ac318 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb893bdea3df8ee40c690ca… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 30 18:17:07 2006 +0100 gdi: Add support for creating extended pens. --- dlls/gdi/enhmfdrv/objects.c | 15 ++ dlls/gdi/gdiobj.c | 5 + dlls/gdi/mfdrv/objects.c | 15 ++ dlls/gdi/pen.c | 149 +++++++++++++++++------ dlls/gdi/tests/gdiobj.c | 281 +++++++++++++++++++++++++++++++++++-------- dlls/wineps/pen.c | 15 ++ dlls/x11drv/pen.c | 15 ++ include/gdi.h | 3 8 files changed, 403 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=eb893bdea3df8ee40c6…

1 0

Jan Zerebecki : d3d8: CreateDevice should use the root of the current window.
by Alexandre Julliard Jan. 30, 2006

Jan. 30, 2006

Module: wine Branch: refs/heads/master Commit: c1c3cc2a070906cee20d7aa75eab1857ff3bc830 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c1c3cc2a070906cee20d7aa… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Mon Jan 30 18:16:33 2006 +0100 d3d8: CreateDevice should use the root of the current window. --- dlls/d3d8/directx.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index a324855..1c5ce59 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -713,8 +713,12 @@ HRESULT WINAPI IDirect3D8Impl_CreateDe if (!whichHWND) { whichHWND = hFocusWindow; } + whichHWND = GetAncestor(whichHWND, GA_ROOT); + if ( !( object->win = (Window)GetPropA(whichHWND, "__wine_x11_whole_window") ) ) { + ERR("Can't get drawable (window), HWND:%p doesn't have the property __wine_x11_whole_window\n", whichHWND); + return D3DERR_NOTAVAILABLE; + } object->win_handle = whichHWND; - object->win = (Window)GetPropA( whichHWND, "__wine_x11_whole_window" ); hDc = GetDC(whichHWND); object->display = get_display(hDc);

1 0

Marcus Meissner : iphlpapi: Allocate space enough to handle all the possible ipv4 addresses.
by Alexandre Julliard Jan. 30, 2006

Jan. 30, 2006

Module: wine Branch: refs/heads/master Commit: b970b2203725f52eeb1cf0374a482a931d275d84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b970b2203725f52eeb1cf03… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Jan 30 18:16:22 2006 +0100 iphlpapi: Allocate space enough to handle all the possible ipv4 addresses. --- dlls/iphlpapi/iphlpapi_main.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 1759c1e..063e9f7 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -654,9 +654,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER * precisely enough space. */ size = sizeof(IP_ADAPTER_INFO) * numNonLoopbackInterfaces; - if (numIPAddresses > numNonLoopbackInterfaces) - size += (numIPAddresses - numNonLoopbackInterfaces) * - sizeof(IP_ADDR_STRING); + size += numIPAddresses * sizeof(IP_ADDR_STRING); if (!pAdapterInfo || *pOutBufLen < size) { *pOutBufLen = size; ret = ERROR_BUFFER_OVERFLOW; @@ -670,9 +668,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER table = getNonLoopbackInterfaceIndexTable(); if (table) { size = sizeof(IP_ADAPTER_INFO) * table->numIndexes; - if (ipAddrTable->dwNumEntries > numNonLoopbackInterfaces) - size += (ipAddrTable->dwNumEntries - numNonLoopbackInterfaces) * - sizeof(IP_ADDR_STRING); + size += ipAddrTable->dwNumEntries * sizeof(IP_ADDR_STRING); if (*pOutBufLen < size) { *pOutBufLen = size; ret = ERROR_INSUFFICIENT_BUFFER;

1 0

Maarten Lankhorst : riched20: Make CreateTextServices use ITextHost.
by Alexandre Julliard Jan. 30, 2006

Jan. 30, 2006

Module: wine Branch: refs/heads/master Commit: 7b6f85474ec56018f76a4aac2b993f01c157dbee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b6f85474ec56018f76a4aa… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jan 30 18:16:05 2006 +0100 riched20: Make CreateTextServices use ITextHost. --- dlls/riched20/editor.c | 8 ++++---- include/textserv.h | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 01a55c1..135fe8e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -228,7 +228,8 @@ #include "winreg.h" #define NO_SHLWAPI_STREAM #include "shlwapi.h" - +#include "imm.h" +#include "textserv.h" #include "rtf.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); @@ -2199,12 +2200,11 @@ void ME_RegisterEditorClass(HINSTANCE hI bResult = RegisterClassA(&wcA); assert(bResult); } + /****************************************************************** * CreateTextServices (RICHED20.4) - * - * FIXME should be ITextHost instead of void* */ -HRESULT WINAPI CreateTextServices(IUnknown *punkOuter, void *pITextHost, +HRESULT WINAPI CreateTextServices(IUnknown *punkOuter, ITextHost *pITextHost, IUnknown **ppUnk) { FIXME("stub\n"); diff --git a/include/textserv.h b/include/textserv.h index eb3b8b4..ffd9581 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -30,8 +30,6 @@ DEFINE_GUID(IID_ITextHost2, 0xc5bdd8d0 /***************************************************************************** * ITextServices interface */ -typedef struct ITextServices ITextServices; - #define INTERFACE ITextServices DECLARE_INTERFACE_(ITextServices,IUnknown) { @@ -217,8 +215,6 @@ enum TXTVIEW { #define TXTBIT_CLIENTRECTCHANGE 0x100000 #define TXTBIT_USECURRENTBKG 0x200000 -typedef struct ITextHost ITextHost; - /***************************************************************************** * ITextHost interface */

1 0