December 2007 - Wine-commits

Jonathan Ernst : wineboot: New French translation.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: da32b2450894507495d4998d236183d7c2b1d2ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=da32b2450894507495d4998d2… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Dec 3 17:55:55 2007 +0100 wineboot: New French translation. --- programs/wineboot/wineboot.rc | 1 + programs/wineboot/wineboot_Fr.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.rc b/programs/wineboot/wineboot.rc index 1180ea3..9623c45 100644 --- a/programs/wineboot/wineboot.rc +++ b/programs/wineboot/wineboot.rc @@ -28,5 +28,6 @@ #include "resource.h" #include "wineboot_En.rc" +#include "wineboot_Fr.rc" #include "wineboot_Ko.rc" #include "wineboot_Sv.rc" diff --git a/programs/wineboot/wineboot_Fr.rc b/programs/wineboot/wineboot_Fr.rc new file mode 100644 index 0000000..cae61f6 --- /dev/null +++ b/programs/wineboot/wineboot_Fr.rc @@ -0,0 +1,35 @@ +/* + * WineBoot resources + * + * Copyright 2007 Jonathan Ernst + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Attente du programme" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Annuler",IDCANCEL,129,49,50,15 + PUSHBUTTON "Arrêter le programme",IDOK,51,49,71,15 + LTEXT "Une simulation de déconnexion ou d'extinction est en cours, mais ce programme ne répond pas.", + IDC_STATIC,7,7,172,19 + LTEXT "Si vous arrêtez le programme, vous pouvez perdre toutes les données non enregistrées.", + IDC_STATIC,7,28,172,15 +END

1 0

Kirill K. Smirnov : winhelp: Use HEAP_ZERO_MEMORY instead of setting individual fields to zero.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: a9491cf0cd67bd4e5f13930e19cf86286eee1794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9491cf0cd67bd4e5f13930e1… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Dec 3 21:28:16 2007 +0400 winhelp: Use HEAP_ZERO_MEMORY instead of setting individual fields to zero. --- programs/winhelp/hlpfile.c | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index f9a6cc1..7eeec1b 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -284,31 +284,15 @@ HLPFILE *HLPFILE_ReadHlpFile(LPCSTR lpszPath) } } - hlpfile = HeapAlloc(GetProcessHeap(), 0, sizeof(HLPFILE) + lstrlen(lpszPath) + 1); + hlpfile = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(HLPFILE) + lstrlen(lpszPath) + 1); if (!hlpfile) return 0; hlpfile->lpszPath = (char*)hlpfile + sizeof(HLPFILE); - hlpfile->lpszTitle = NULL; - hlpfile->lpszCopyright = NULL; - hlpfile->first_page = NULL; - hlpfile->first_macro = NULL; - hlpfile->Context = NULL; - hlpfile->wMapLen = 0; - hlpfile->Map = NULL; hlpfile->contents_start = 0xFFFFFFFF; - hlpfile->prev = NULL; hlpfile->next = first_hlpfile; hlpfile->wRefCount = 1; - hlpfile->numBmps = 0; - hlpfile->bmps = NULL; - - hlpfile->numFonts = 0; - hlpfile->fonts = NULL; - - hlpfile->numWindows = 0; - hlpfile->windows = NULL; - strcpy(hlpfile->lpszPath, lpszPath); first_hlpfile = hlpfile;

1 0

Andrew Talbot : comdlg32: Remove unnecessary casts.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: 750a56016dcd4d09f64381659df618b7830652f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=750a56016dcd4d09f64381659… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 3 22:40:42 2007 +0000 comdlg32: Remove unnecessary casts. --- dlls/comdlg32/colordlg.c | 2 +- dlls/comdlg32/filedlg31.c | 6 +++--- dlls/comdlg32/filedlgbrowser.c | 5 ++--- dlls/comdlg32/printdlg.c | 12 ++++++------ 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index a1cd5f6..aa56ebf 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -1346,7 +1346,7 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol ) lpcc->lpCustColors = lpChCol->lpCustColors; lpcc->Flags = lpChCol->Flags; lpcc->lCustData = lpChCol->lCustData; - lpcc->lpfnHook = (LPCCHOOKPROC) lpChCol->lpfnHook; + lpcc->lpfnHook = lpChCol->lpfnHook; if ((lpcc->Flags & CC_ENABLETEMPLATE) && (lpChCol->lpTemplateName)) { if (HIWORD(lpChCol->lpTemplateName)) { INT len = MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, NULL, 0); diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 0f697ed..d2e3163 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -531,7 +531,7 @@ static LRESULT FD31_Validate( const FD31_DATA *lfs, LPCWSTR path, UINT control, FD31_UpdateFileTitle(lfs); if (lfs->hook) { - lRet = (BOOL)FD31_CallWindowProc(lfs, lfs->fileokstring, + lRet = FD31_CallWindowProc(lfs, lfs->fileokstring, 0, lfs->lParam ); if (lRet) { @@ -543,7 +543,7 @@ static LRESULT FD31_Validate( const FD31_DATA *lfs, LPCWSTR path, UINT control, { if (ofnW->lpstrFile) { - LPWSTR str = (LPWSTR)ofnW->lpstrFile; + LPWSTR str = ofnW->lpstrFile; LPWSTR ptr = strrchrW(str, '\\'); str[lstrlenW(str) + 1] = '\0'; *ptr = 0; @@ -919,7 +919,7 @@ LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) if (ofn->Flags & OFN_HIDEREADONLY) ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE); if (lfs->hook) - return (BOOL) FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam); + return FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam); return TRUE; } diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 55ef65b..b9c4d2c 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -375,8 +375,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, return hRes; } /* create an absolute pidl */ - pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent, - (LPCITEMIDLIST)pidl); + pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent, pidl); } else if(wFlags & SBSP_PARENT) { @@ -388,7 +387,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, else /* SBSP_ABSOLUTE is 0x0000 */ { /* An absolute pidl (relative from the desktop) */ - pidlTmp = COMDLG32_PIDL_ILClone((LPCITEMIDLIST)pidl); + pidlTmp = COMDLG32_PIDL_ILClone(pidl); psfTmp = GetShellFolderFromPidl(pidlTmp); } diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 39ac750..e04e145 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3069,12 +3069,12 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) scalx = rcClient.right / (double)pda->curdlg.ptPaperSize.x; scaly = rcClient.bottom / (double)pda->curdlg.ptPaperSize.y; rcMargin = rcClient; - - rcMargin.left += (LONG)pda->curdlg.rtMargin.left * scalx; - rcMargin.top += (LONG)pda->curdlg.rtMargin.top * scalx; - rcMargin.right -= (LONG)pda->curdlg.rtMargin.right * scaly; - rcMargin.bottom -= (LONG)pda->curdlg.rtMargin.bottom * scaly; - + + rcMargin.left += pda->curdlg.rtMargin.left * scalx; + rcMargin.top += pda->curdlg.rtMargin.top * scalx; + rcMargin.right -= pda->curdlg.rtMargin.right * scaly; + rcMargin.bottom -= pda->curdlg.rtMargin.bottom * scaly; + /* if the space is too small then we make sure to not draw anything */ rcMargin.left = min(rcMargin.left, rcMargin.right); rcMargin.top = min(rcMargin.top, rcMargin.bottom);

1 0

Andrew Talbot : crypt32: Remove unnecessary casts.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: a06caa0e666ac453329af6b274402e18464092df URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06caa0e666ac453329af6b27… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 3 22:40:57 2007 +0000 crypt32: Remove unnecessary casts. --- dlls/crypt32/decode.c | 2 +- dlls/crypt32/serialize.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 3697c8a..be7e40f 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -715,7 +715,7 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, else array->rgItems = (BYTE *)array + sizeof(struct GenericArray); - nextData = (BYTE *)array->rgItems + + nextData = array->rgItems + array->cItems * arrayDesc->itemSize; for (i = 0, ptr = pbEncoded + 1 + lenBytes; ret && i < cItems && ptr - pbEncoded - 1 - lenBytes < diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 281ac3f..5017c3f 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -734,7 +734,7 @@ static BOOL CRYPT_SavePKCSToFile(HCERTSTORE store, { ret = CRYPT_SavePKCSToMem(store, dwMsgAndCertEncodingType, &blob); if (ret) - ret = WriteFile((HANDLE)handle, blob.pbData, blob.cbData, + ret = WriteFile(handle, blob.pbData, blob.cbData, &blob.cbData, NULL); } else @@ -750,7 +750,7 @@ static BOOL CRYPT_SavePKCSToFile(HCERTSTORE store, static BOOL CRYPT_SaveSerializedToFile(HCERTSTORE store, DWORD dwMsgAndCertEncodingType, void *handle) { - return CRYPT_WriteSerializedStoreToFile((HANDLE)handle, store); + return CRYPT_WriteSerializedStoreToFile(handle, store); } struct MemWrittenTracker @@ -847,7 +847,7 @@ BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType, switch (dwSaveTo) { case CERT_STORE_SAVE_TO_FILE: - handle = (HANDLE)pvSaveToPara; + handle = pvSaveToPara; saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ? CRYPT_SaveSerializedToFile : CRYPT_SavePKCSToFile; break;

1 0

Stefan Dösinger : wined3d: Add a method for querying the gl drawable size of rendertarget.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: 9bc6200ecef40fe65d38fda2c7d0f4b8f4c71767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bc6200ecef40fe65d38fda2c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 30 20:22:33 2007 +0100 wined3d: Add a method for querying the gl drawable size of rendertarget. --- dlls/wined3d/device.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/surface.c | 32 +++++++++++++++++++++++++++++++- dlls/wined3d/swapchain.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 8 ++++++++ 4 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ea3d130..6d40cae 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7362,3 +7362,29 @@ void IWineD3DDeviceImpl_MarkStateDirty(IWineD3DDeviceImpl *This, DWORD state) { context->isStateDirty[idx] |= (1 << shift); } } + +void get_drawable_size_pbuffer(IWineD3DSurfaceImpl *This, UINT *width, UINT *height) { + IWineD3DDeviceImpl *dev = This->resource.wineD3DDevice; + /* The drawable size of a pbuffer render target is the current pbuffer size + */ + *width = dev->pbufferWidth; + *height = dev->pbufferHeight; +} + +void get_drawable_size_fbo(IWineD3DSurfaceImpl *This, UINT *width, UINT *height) { + /* The drawable size of a fbo target is the opengl texture size, which is the power of two size + */ + *width = This->pow2Width; + *height = This->pow2Height; +} + +void get_drawable_size_backbuffer(IWineD3DSurfaceImpl *This, UINT *width, UINT *height) { + IWineD3DDeviceImpl *dev = This->resource.wineD3DDevice; + /* The drawable size of a backbuffer / aux buffer offscreen target is the size of the + * current context's drawable, which is the size of the back buffer of the swapchain + * the active context belongs to. The back buffer of the swapchain is stored as the + * surface the context belongs to. + */ + *width = ((IWineD3DSurfaceImpl *) dev->activeContext->surface)->currentDesc.Width; + *height = ((IWineD3DSurfaceImpl *) dev->activeContext->surface)->currentDesc.Height; +} diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0ff1bc7..6d45164 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3480,6 +3480,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { This->glRect.bottom = This->pow2Height; } + if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { + switch(wined3d_settings.offscreen_rendering_mode) { + case ORM_FBO: This->get_drawable_size = get_drawable_size_fbo; break; + case ORM_PBUFFER: This->get_drawable_size = get_drawable_size_pbuffer; break; + case ORM_BACKBUFFER: This->get_drawable_size = get_drawable_size_backbuffer; break; + } + } + This->Flags |= SFLAG_INSYSMEM; return WINED3D_OK; @@ -3877,6 +3885,28 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D return WINED3D_OK; } +HRESULT WINAPI IWineD3DSurfaceImpl_SetContainer(IWineD3DSurface *iface, IWineD3DBase *container) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + IWineD3DSwapChain *swapchain = NULL; + + /* Update the drawable size method */ + if(container) { + IWineD3DBase_QueryInterface(container, &IID_IWineD3DSwapChain, (void **) &swapchain); + } + if(swapchain) { + This->get_drawable_size = get_drawable_size_swapchain; + IWineD3DSwapChain_Release(swapchain); + } else if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { + switch(wined3d_settings.offscreen_rendering_mode) { + case ORM_FBO: This->get_drawable_size = get_drawable_size_fbo; break; + case ORM_PBUFFER: This->get_drawable_size = get_drawable_size_pbuffer; break; + case ORM_BACKBUFFER: This->get_drawable_size = get_drawable_size_backbuffer; break; + } + } + + return IWineD3DBaseSurfaceImpl_SetContainer(iface, container); +} + const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = { /* IUnknown */ @@ -3924,7 +3954,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_LoadTexture, IWineD3DSurfaceImpl_BindTexture, IWineD3DSurfaceImpl_SaveSnapshot, - IWineD3DBaseSurfaceImpl_SetContainer, + IWineD3DSurfaceImpl_SetContainer, IWineD3DSurfaceImpl_SetGlTextureDesc, IWineD3DSurfaceImpl_GetGlDesc, IWineD3DSurfaceImpl_GetData, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2eaa812..d27e707 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -585,3 +585,11 @@ WineD3DContext *IWineD3DSwapChainImpl_CreateContextForThread(IWineD3DSwapChain * TRACE("Returning context %p\n", ctx); return ctx; } + +void get_drawable_size_swapchain(IWineD3DSurfaceImpl *This, UINT *width, UINT *height) { + /* The drawable size of an onscreen drawable is the surface size. + * (Actually: The window size, but the surface is created in window size) + */ + *width = This->currentDesc.Width; + *height = This->currentDesc.Height; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b87fa0..c0e1265 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1087,6 +1087,9 @@ struct IWineD3DSurfaceImpl UINT pow2Width; UINT pow2Height; + /* A method to retrieve the drawable size. Not in the Vtable to make it changeable */ + void (*get_drawable_size)(IWineD3DSurfaceImpl *This, UINT *width, UINT *height); + /* Oversized texture */ RECT glRect; @@ -1162,6 +1165,11 @@ void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface); const void *WINAPI IWineD3DSurfaceImpl_GetData(IWineD3DSurface *iface); +void get_drawable_size_swapchain(IWineD3DSurfaceImpl *This, UINT *width, UINT *height); +void get_drawable_size_backbuffer(IWineD3DSurfaceImpl *This, UINT *width, UINT *height); +void get_drawable_size_pbuffer(IWineD3DSurfaceImpl *This, UINT *width, UINT *height); +void get_drawable_size_fbo(IWineD3DSurfaceImpl *This, UINT *width, UINT *height); + /* Surface flags: */ #define SFLAG_OVERSIZE 0x00000001 /* Surface is bigger than gl size, blts only */ #define SFLAG_CONVERTED 0x00000002 /* Converted for color keying or Palettized */

1 0

Rob Shearman : rpcrt4: Flesh out more of the IRpcChannelBuffer vtable to make the test_delegating_Invoke test succeed on Windows .
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: f191f59ee49be45aab8b41d8092b3e990c1df31f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f191f59ee49be45aab8b41d80… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 3 16:08:28 2007 +0000 rpcrt4: Flesh out more of the IRpcChannelBuffer vtable to make the test_delegating_Invoke test succeed on Windows. --- dlls/rpcrt4/tests/cstub.c | 67 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 57 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index ef0c156..6a38397 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -836,7 +836,25 @@ static ITypeLibVtbl delegating_invoke_test_obj_vtbl = NULL }; -static HRESULT WINAPI delegating_invoke_test_get_buffer(IRpcChannelBuffer *pchan, +static HRESULT WINAPI delegating_invoke_chan_query_interface(IRpcChannelBuffer *pchan, + REFIID iid, + void **ppv) +{ + ok(0, "call to QueryInterface not expected\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI delegating_invoke_chan_add_ref(IRpcChannelBuffer *pchan) +{ + return 2; +} + +static ULONG WINAPI delegating_invoke_chan_release(IRpcChannelBuffer *pchan) +{ + return 1; +} + +static HRESULT WINAPI delegating_invoke_chan_get_buffer(IRpcChannelBuffer *pchan, RPCOLEMESSAGE *msg, REFIID iid) { @@ -844,16 +862,46 @@ static HRESULT WINAPI delegating_invoke_test_get_buffer(IRpcChannelBuffer *pchan return S_OK; } +static HRESULT WINAPI delegating_invoke_chan_send_receive(IRpcChannelBuffer *pchan, + RPCOLEMESSAGE *pMessage, + ULONG *pStatus) +{ + ok(0, "call to SendReceive not expected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI delegating_invoke_chan_free_buffer(IRpcChannelBuffer *pchan, + RPCOLEMESSAGE *pMessage) +{ + ok(0, "call to FreeBuffer not expected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI delegating_invoke_chan_get_dest_ctx(IRpcChannelBuffer *pchan, + DWORD *pdwDestContext, + void **ppvDestContext) +{ + *pdwDestContext = MSHCTX_LOCAL; + *ppvDestContext = NULL; + return S_OK; +} + +static HRESULT WINAPI delegating_invoke_chan_is_connected(IRpcChannelBuffer *pchan) +{ + ok(0, "call to IsConnected not expected\n"); + return E_NOTIMPL; +} + static IRpcChannelBufferVtbl delegating_invoke_test_rpc_chan_vtbl = { - NULL, - NULL, - NULL, - delegating_invoke_test_get_buffer, - NULL, - NULL, - NULL, - NULL + delegating_invoke_chan_query_interface, + delegating_invoke_chan_add_ref, + delegating_invoke_chan_release, + delegating_invoke_chan_get_buffer, + delegating_invoke_chan_send_receive, + delegating_invoke_chan_free_buffer, + delegating_invoke_chan_get_dest_ctx, + delegating_invoke_chan_is_connected }; static void test_delegating_Invoke(IPSFactoryBuffer *ppsf) @@ -869,7 +917,6 @@ static void test_delegating_Invoke(IPSFactoryBuffer *ppsf) memset(&msg, 0, sizeof(msg)); msg.dataRepresentation = NDR_LOCAL_DATA_REPRESENTATION; msg.iMethod = 3; - /* FIXME: Figure out why this fails on Windows */ r = IRpcStubBuffer_Invoke(pstub, &msg, pchan); ok(r == S_OK, "ret %08x\n", r); if(r == S_OK)

1 0

Rob Shearman : rpcrt4: Call IRpcChannelBuffer_GetDestCtx in NdrStubInitialize, just like we do in NdrProxyInitialize.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: 341208bf1baad187599bb6a3bb7a7bfb19a6945c URL: http://source.winehq.org/git/wine.git/?a=commit;h=341208bf1baad187599bb6a3b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 3 16:08:31 2007 +0000 rpcrt4: Call IRpcChannelBuffer_GetDestCtx in NdrStubInitialize, just like we do in NdrProxyInitialize. --- dlls/rpcrt4/cstub.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 0ae85ae..52c11d9 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -558,6 +558,9 @@ void WINAPI NdrStubInitialize(PRPC_MESSAGE pRpcMsg, TRACE("(%p,%p,%p,%p)\n", pRpcMsg, pStubMsg, pStubDescriptor, pRpcChannelBuffer); NdrServerInitializeNew(pRpcMsg, pStubMsg, pStubDescriptor); pStubMsg->pRpcChannelBuffer = pRpcChannelBuffer; + IRpcChannelBuffer_GetDestCtx(pStubMsg->pRpcChannelBuffer, + &pStubMsg->dwDestContext, + &pStubMsg->pvDestContext); } /***********************************************************************

1 0

Rob Shearman : rpcrt4: Put the delegating stub thunks in an executable memory page, rather than on the heap.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: 6dcc3fe62ebcfba7625eb954e9107d6b36e76c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dcc3fe62ebcfba7625eb954e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 3 16:09:05 2007 +0000 rpcrt4: Put the delegating stub thunks in an executable memory page, rather than on the heap. --- dlls/rpcrt4/cstub.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 52c11d9..c81408d 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -109,13 +109,15 @@ static CRITICAL_SECTION delegating_vtbl_section = { &critsect_debug, -1, 0, 0, 0 typedef struct { DWORD ref; + DWORD size; + void **methods; IUnknownVtbl vtbl; + /* remaining entries in vtbl */ } ref_counted_vtbl; static struct { ref_counted_vtbl *table; - DWORD size; } current_vtbl; @@ -156,7 +158,7 @@ typedef struct { } vtbl_method_t; #include "poppack.h" -static void fill_table(IUnknownVtbl *vtbl, DWORD num) +static void fill_table(IUnknownVtbl *vtbl, void **methods, DWORD num) { vtbl_method_t *method; void **entry; @@ -166,7 +168,7 @@ static void fill_table(IUnknownVtbl *vtbl, DWORD num) vtbl->AddRef = delegating_AddRef; vtbl->Release = delegating_Release; - method = (vtbl_method_t*)((void **)vtbl + num); + method = (vtbl_method_t*)methods; entry = (void**)(vtbl + 1); for(i = 3; i < num; i++) @@ -209,19 +211,25 @@ void create_delegating_vtbl(DWORD num_methods) } EnterCriticalSection(&delegating_vtbl_section); - if(num_methods > current_vtbl.size) + if(!current_vtbl.table || num_methods > current_vtbl.table->size) { DWORD size; + DWORD old_protect; if(current_vtbl.table && current_vtbl.table->ref == 0) { TRACE("freeing old table\n"); + VirtualFree(current_vtbl.table->methods, + (current_vtbl.table->size - 3) * sizeof(vtbl_method_t), + MEM_RELEASE); HeapFree(GetProcessHeap(), 0, current_vtbl.table); } - size = sizeof(DWORD) + num_methods * sizeof(void*) + (num_methods - 3) * sizeof(vtbl_method_t); - current_vtbl.table = HeapAlloc(GetProcessHeap(), 0, size); - fill_table(&current_vtbl.table->vtbl, num_methods); + size = (num_methods - 3) * sizeof(vtbl_method_t); + current_vtbl.table = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(ref_counted_vtbl, vtbl) + num_methods * sizeof(void*)); current_vtbl.table->ref = 0; - current_vtbl.size = num_methods; + current_vtbl.table->size = num_methods; + current_vtbl.table->methods = VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE); + fill_table(&current_vtbl.table->vtbl, current_vtbl.table->methods, num_methods); + VirtualProtect(current_vtbl.table->methods, size, PAGE_EXECUTE_READ, &old_protect); } LeaveCriticalSection(&delegating_vtbl_section); } @@ -247,6 +255,9 @@ static void release_delegating_vtbl(IUnknownVtbl *vtbl) if(table->ref == 0 && table != current_vtbl.table) { TRACE("... and we're not current so free'ing\n"); + VirtualFree(current_vtbl.table->methods, + (current_vtbl.table->size - 3) * sizeof(vtbl_method_t), + MEM_RELEASE); HeapFree(GetProcessHeap(), 0, table); } LeaveCriticalSection(&delegating_vtbl_section);

1 0

Rob Shearman : ole32: Fix the test of the size returned from WdtpInterfacePointer_UserSize.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: b711d35d406c8979d50ce310555329c4e90ca3db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b711d35d406c8979d50ce3105… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 3 16:08:41 2007 +0000 ole32: Fix the test of the size returned from WdtpInterfacePointer_UserSize. It varies on different versions of Windows, so we shouldn't test it for an exact value. --- dlls/ole32/tests/usrmarshal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index d6fd7ee..60e85cf 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -441,7 +441,8 @@ static void test_marshal_WdtpInterfacePointer(void) unk = &Test_Unknown; size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, unk, &IID_IUnknown); todo_wine - ok(size == 108, "size should be 108 bytes, not %d\n", size); + ok(size > 28, "size should be > 28 bytes, not %d\n", size); + trace("WdtpInterfacePointer_UserSize returned %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, buffer, unk, &IID_IUnknown); wireip = buffer;

1 0

Rob Shearman : rpcrt4: Handle all non-continuable exceptions in CStdStubBuffer_Invoke.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: a016d7b335aaca7aba15df4752944ea00cf68ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a016d7b335aaca7aba15df475… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Nov 30 18:09:01 2007 +0000 rpcrt4: Handle all non-continuable exceptions in CStdStubBuffer_Invoke. --- dlls/rpcrt4/cstub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index c81408d..b04c494 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); static WINE_EXCEPTION_FILTER(stub_filter) { - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) + if (GetExceptionInformation()->ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_EXECUTE_HANDLER; }

1 0