May 2006 - Wine-commits - list.winehq.org

Mike McCormack : secur32: Tidy up the initialization code a little.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: d243b39c949d90a4555d1286457370852dcec3e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d243b39c949d90a4555d128… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri May 19 18:46:47 2006 +0900 secur32: Tidy up the initialization code a little. --- dlls/secur32/ntlm.c | 76 ++++++++++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 35 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 6cd34c9..3dd4801 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -33,9 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); #define NTLM_MAX_BUF 2010 -static char ntlm_name_A[] = "NTLM"; -static WCHAR ntlm_name_W[] = {'N', 'T', 'L', 'M', 0}; - /*********************************************************************** * QueryCredentialsAttributesA @@ -1232,10 +1229,47 @@ static SecurityFunctionTableW ntlmTableW NULL, /* SetContextAttributesW */ }; -static WCHAR ntlm_comment_W[] = { 'N', 'T', 'L', 'M', ' ', 'S', 'e', - 'c', 'u', 'r', 'i', 't', 'y', ' ', 'P', 'a', 'c', 'k', 'a', 'g', 'e',0}; +#define NTLM_COMMENT \ + { 'N', 'T', 'L', 'M', ' ', \ + 'S', 'e', 'c', 'u', 'r', 'i', 't', 'y', ' ', \ + 'P', 'a', 'c', 'k', 'a', 'g', 'e', 0} + +static CHAR ntlm_comment_A[] = NTLM_COMMENT; +static WCHAR ntlm_comment_W[] = NTLM_COMMENT; + +#define NTLM_NAME {'N', 'T', 'L', 'M', 0} -static CHAR ntlm_comment_A[] = "NTLM Security Package"; +static char ntlm_name_A[] = NTLM_NAME; +static WCHAR ntlm_name_W[] = NTLM_NAME; + +/* According to Windows, NTLM has the following capabilities. */ +#define CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_TOKEN_ONLY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_READONLY_WITH_CHECKSUM) + +static const SecPkgInfoW infoW = { + CAPS, + 1, + RPC_C_AUTHN_WINNT, + NTLM_MAX_BUF, + ntlm_name_W, + ntlm_comment_W +}; + +static const SecPkgInfoA infoA = { + CAPS, + 1, + RPC_C_AUTHN_WINNT, + NTLM_MAX_BUF, + ntlm_name_A, + ntlm_comment_A +}; void SECUR32_initNTLMSP(void) { @@ -1254,40 +1288,12 @@ void SECUR32_initNTLMSP(void) helper->version = -1; } else - { check_version(helper); - } if(helper->version > 2) { - - SecureProvider *provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, - NULL); - /* According to Windows, NTLM has the following capabilities. - */ - - static const LONG caps = - SECPKG_FLAG_INTEGRITY | - SECPKG_FLAG_PRIVACY | - SECPKG_FLAG_TOKEN_ONLY | - SECPKG_FLAG_CONNECTION | - SECPKG_FLAG_MULTI_REQUIRED | - SECPKG_FLAG_IMPERSONATION | - SECPKG_FLAG_ACCEPT_WIN32_NAME | - SECPKG_FLAG_READONLY_WITH_CHECKSUM; - - static const USHORT version = 1; - static const USHORT rpcid = 10; - /* In Windows, this is 12000, but ntlm_auth won't take more than 2010 - * characters, so there is no use reporting a bigger size */ - static const ULONG max_token = NTLM_MAX_BUF; - const SecPkgInfoW infoW = { caps, version, rpcid, max_token, ntlm_name_W, - ntlm_comment_W}; - const SecPkgInfoA infoA = { caps, version, rpcid, max_token, ntlm_name_A, - ntlm_comment_A}; - + SecureProvider *provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL); SECUR32_addPackages(provider, 1L, &infoA, &infoW); } cleanup_helper(helper); - }

1 0

Jacek Caban : widl: Don't add importlib if it is already on the list. Remove warning.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: dee8790c699fc8a3c027d4ca9210ab3704395b0d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dee8790c699fc8a3c027d4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 18 22:42:51 2006 +0200 widl: Don't add importlib if it is already on the list. Remove warning. --- tools/widl/typelib.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 77d5155..c4b644c 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -402,6 +402,13 @@ void add_importlib(const char *name) if(!typelib) return; + for(importlib = typelib->importlibs; importlib; importlib = NEXT_LINK(importlib)) { + if(!strcmp(name, importlib->name)) + return; + } + + chat("add_importlib: %s\n", name); + importlib = xmalloc(sizeof(*importlib)); importlib->name = xstrdup(name); @@ -409,6 +416,4 @@ void add_importlib(const char *name) LINK(importlib, typelib->importlibs); typelib->importlibs = importlib; - - warning("importlib is not yet supported.\n"); }

1 0

Jacek Caban : widl: Added support for importing parent interfaces from importlib.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: a7fa3a985bd46c3cd2d8280d85555bce22a908c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a7fa3a985bd46c3cd2d8280… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 18 22:42:32 2006 +0200 widl: Added support for importing parent interfaces from importlib. --- tools/widl/write_msft.c | 108 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 96 insertions(+), 12 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index fcb5f9c..ff9e0c8 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -583,7 +583,7 @@ static int ctl2_alloc_string( } /**************************************************************************** - * alloc_importinfo + * alloc_msft_importinfo * * Allocates and initializes an import information structure in a type library. * @@ -592,7 +592,7 @@ static int ctl2_alloc_string( * Success: The offset of the new importinfo. * Failure: -1 (this is invariably an out of memory condition). */ -static int alloc_importinfo( +static int alloc_msft_importinfo( msft_typelib_t *typelib, /* [I] The type library to allocate in. */ MSFT_ImpInfo *impinfo) /* [I] The import information to store. */ { @@ -664,6 +664,79 @@ static int alloc_importfile( return offset; } +static void alloc_importinfo(msft_typelib_t *typelib, importinfo_t *importinfo) +{ + importlib_t *importlib = importinfo->importlib; + + chat("alloc_importinfo: %s\n", importinfo->name); + + if(!importlib->allocated) { + MSFT_GuidEntry guid; + int guid_idx; + + chat("allocating importlib %s\n", importlib->name); + + importlib->allocated = -1; + + memcpy(&guid.guid, &importlib->guid, sizeof(GUID)); + guid.hreftype = 2; + + guid_idx = ctl2_alloc_guid(typelib, &guid); + + alloc_importfile(typelib, guid_idx, importlib->version&0xffff, + importlib->version>>16, importlib->name); + } + + if(importinfo->offset == -1 || !(importinfo->flags & MSFT_IMPINFO_OFFSET_IS_GUID)) { + MSFT_ImpInfo impinfo; + + impinfo.flags = importinfo->flags; + impinfo.oImpFile = 0; + + if(importinfo->flags & MSFT_IMPINFO_OFFSET_IS_GUID) { + MSFT_GuidEntry guid; + + guid.hreftype = 0; + memcpy(&guid.guid, &importinfo->guid, sizeof(GUID)); + + impinfo.oGuid = ctl2_alloc_guid(typelib, &guid); + + importinfo->offset = alloc_msft_importinfo(typelib, &impinfo); + + typelib->typelib_segment_data[MSFT_SEG_GUID][impinfo.oGuid+sizeof(GUID)] + = importinfo->offset+1; + + if(!strcmp(importinfo->name, "IDispatch")) + typelib->typelib_header.dispatchpos = importinfo->offset+1; + }else { + impinfo.oGuid = importinfo->id; + importinfo->offset = alloc_msft_importinfo(typelib, &impinfo); + } + } +} + +static importinfo_t *find_importinfo(msft_typelib_t *typelib, const char *name) +{ + importlib_t *importlib; + int i; + + chat("search importlib %s\n", name); + + if(!name) + return NULL; + + for(importlib = typelib->typelib->importlibs; importlib; importlib = NEXT_LINK(importlib)) { + for(i=0; i < importlib->ntypeinfos; i++) { + if(!strcmp(name, importlib->importinfos[i].name)) { + chat("Found %s in importlib.\n", name); + return importlib->importinfos+i; + } + } + } + + return NULL; +} + static void add_structure_typeinfo(msft_typelib_t *typelib, type_t *structure); static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface); static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration); @@ -1634,14 +1707,20 @@ static HRESULT add_var_desc(msft_typeinf return S_OK; } -static HRESULT add_impl_type(msft_typeinfo_t *typeinfo, type_t *ref) +static HRESULT add_impl_type(msft_typeinfo_t *typeinfo, type_t *ref, importinfo_t *importinfo) { - if(ref->typelib_idx == -1) - add_interface_typeinfo(typeinfo->typelib, ref); - if(ref->typelib_idx == -1) - error("add_impl_type: unable to add inherited interface\n"); + if(importinfo) { + alloc_importinfo(typeinfo->typelib, importinfo); + typeinfo->typeinfo->datatype1 = importinfo->offset+1; + }else { + if(ref->typelib_idx == -1) + add_interface_typeinfo(typeinfo->typelib, ref); + if(ref->typelib_idx == -1) + error("add_impl_type: unable to add inherited interface\n"); + + typeinfo->typeinfo->datatype1 = typeinfo->typelib->typelib_typeinfo_offsets[ref->typelib_idx]; + } - typeinfo->typeinfo->datatype1 = typeinfo->typelib->typelib_typeinfo_offsets[ref->typelib_idx]; typeinfo->typeinfo->cImplTypes++; return S_OK; } @@ -1807,7 +1886,7 @@ static void add_dispatch(msft_typelib_t impinfo.flags = TKIND_INTERFACE << 24 | MSFT_IMPINFO_OFFSET_IS_GUID; impinfo.oImpFile = impfile_offset; impinfo.oGuid = ctl2_alloc_guid(typelib, &guidentry); - typelib->typelib_header.dispatchpos = alloc_importinfo(typelib, &impinfo) | 0x01; + typelib->typelib_header.dispatchpos = alloc_msft_importinfo(typelib, &impinfo) | 0x01; } static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinterface) @@ -1861,6 +1940,7 @@ static void add_interface_typeinfo(msft_ func_t *func; type_t *ref; msft_typeinfo_t *msft_typeinfo; + importinfo_t *ref_importinfo = NULL; int num_parents = 0, num_funcs = 0; const attr_t *attr; const type_t *derived; @@ -1872,8 +1952,12 @@ static void add_interface_typeinfo(msft_ /* midl adds the parent interface first, unless the parent itself has no parent (i.e. it stops before IUnknown). */ - if(interface->ref && interface->ref->ref && interface->ref->typelib_idx == -1) - add_interface_typeinfo(typelib, interface->ref); + if(interface->ref) { + ref_importinfo = find_importinfo(typelib, interface->ref->name); + + if(!ref_importinfo && interface->ref->ref && interface->ref->typelib_idx == -1) + add_interface_typeinfo(typelib, interface->ref); + } interface->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_INTERFACE, interface->name, interface->attrs, @@ -1890,7 +1974,7 @@ static void add_interface_typeinfo(msft_ msft_typeinfo->typeinfo->flags &= ~0x40; /* TYPEFLAG_FDUAL */ if(interface->ref) - add_impl_type(msft_typeinfo, interface->ref); + add_impl_type(msft_typeinfo, interface->ref, ref_importinfo); /* count the number of inherited interfaces and non-local functions */ for(ref = interface->ref; ref; ref = ref->ref) {

1 0

Jacek Caban : shdocvw: Return S_OK in OnInPlaceDeactivate.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: ae2c061e8e7e071aa00ebfdc213eaa966a37628b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae2c061e8e7e071aa00ebfd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 18 22:43:01 2006 +0200 shdocvw: Return S_OK in OnInPlaceDeactivate. --- dlls/shdocvw/client.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 6ba5d03..4fa7044 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -246,8 +246,11 @@ static HRESULT WINAPI InPlaceSite_OnUIDe static HRESULT WINAPI InPlaceSite_OnInPlaceDeactivate(IOleInPlaceSite *iface) { DocHost *This = INPLACESITE_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + /* Nothing to do here */ + return S_OK; } static HRESULT WINAPI InPlaceSite_DiscardUndoState(IOleInPlaceSite *iface)

1 0

Phil Costin : wined3d: Trace output corrections and cleanups.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: df3902e6c1a1fb6bd13fd88011d1892acdcb9612 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=df3902e6c1a1fb6bd13fd88… Author: Phil Costin <philcostin(a)hotmail.com> Date: Thu May 18 18:21:00 2006 +0100 wined3d: Trace output corrections and cleanups. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 943e38f..a612f99 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1969,11 +1969,11 @@ UINT WINAPI IWineD3DDeviceImpl_GetAvaila IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; static BOOL showfixmes = TRUE; if (showfixmes) { - FIXME("(%p) : stub, emulating %dMib for now, returning %dMib\n", This, (emulated_textureram/(1024*1024)), + FIXME("(%p) : stub, emulating %dMB for now, returning %dMB\n", This, (emulated_textureram/(1024*1024)), ((emulated_textureram - wineD3DGlobalStatistics->glsurfaceram) / (1024*1024))); showfixmes = FALSE; } - TRACE("(%p) : emulating %dMib for now, returning %dMib\n", This, (emulated_textureram/(1024*1024)), + TRACE("(%p) : emulating %dMB for now, returning %dMB\n", This, (emulated_textureram/(1024*1024)), ((emulated_textureram - wineD3DGlobalStatistics->glsurfaceram) / (1024*1024))); /* videomemory is simulated videomemory + AGP memory left */ return (emulated_textureram - wineD3DGlobalStatistics->glsurfaceram); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c870942..9b1813a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1680,17 +1680,17 @@ #endif if (wined3d_settings.vs_mode == VS_HW && GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && wined3d_settings.glslRequested && DeviceType != WINED3DDEVTYPE_REF) { *pCaps->VertexShaderVersion = D3DVS_VERSION(3,0); - TRACE_(d3d_caps)("Hardware Vertex Shaders versions 2.0+ enabled\n"); + TRACE_(d3d_caps)("Hardware vertex shader versions 2.0+ enabled\n"); } else if (wined3d_settings.vs_mode == VS_HW && GL_SUPPORT(ARB_VERTEX_PROGRAM) && DeviceType != WINED3DDEVTYPE_REF) { *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); - TRACE_(d3d_caps)("Hardware Vertex Shader version 1.1 enabled\n"); + TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled\n"); } else if (wined3d_settings.vs_mode == VS_SW || DeviceType == WINED3DDEVTYPE_REF) { /* FIXME: Change the following line (when needed) to reflect the reported software vertex shader version implemented */ *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); - TRACE_(d3d_caps)("Software Vertex Shader version 1.1 enabled\n"); + TRACE_(d3d_caps)("Software vertex shader version 1.1 enabled\n"); } else { *pCaps->VertexShaderVersion = 0; - TRACE_(d3d_caps)("Vertex Shader functionality not available\n"); + TRACE_(d3d_caps)("Vertex shader functionality not available\n"); } if (This->gl_info.gl_vendor == VENDOR_MESA || This->gl_info.gl_vendor == VENDOR_WINE) { @@ -1704,20 +1704,20 @@ #endif *pCaps->PixelShaderVersion = D3DPS_VERSION(3,0); /* FIXME: The following line is card dependant. -1.0 to 1.0 is a safe default clamp range for now */ *pCaps->PixelShader1xMaxValue = 1.0; - TRACE_(d3d_caps)("Hardware Pixel Shaders versions 2.0+ enabled\n"); + TRACE_(d3d_caps)("Hardware pixel shader versions 2.0+ enabled\n"); } else if (wined3d_settings.ps_mode == PS_HW && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && DeviceType != WINED3DDEVTYPE_REF) { *pCaps->PixelShaderVersion = D3DPS_VERSION(1,4); *pCaps->PixelShader1xMaxValue = 1.0; - TRACE_(d3d_caps)("Hardware Pixel Shaders version 1.4 enabled\n"); + TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled\n"); /* FIXME: Uncomment this when there is support for software Pixel Shader 1.4 and PS_SW is defined } else if (wined3d_settings.ps_mode == PS_SW || DeviceType == WINED3DDEVTYPE_REF) { *pCaps->PixelShaderVersion = D3DPS_VERSION(1,4); *pCaps->PixelShader1xMaxValue = 1.0; - TRACE_(d3d_caps)("Software Pixel Shader version 1.4 enabled\n"); */ + TRACE_(d3d_caps)("Software pixel shader version 1.4 enabled\n"); */ } else { *pCaps->PixelShaderVersion = 0; *pCaps->PixelShader1xMaxValue = 0.0; - TRACE_(d3d_caps)("Pixel Shader functionality not available\n"); + TRACE_(d3d_caps)("Pixel shader functionality not available\n"); } /* ------------------------------------------------

1 0

Juan Lang : crypt32: Move CertFindCertificateInStore and related functions to cert.c.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: b564ef5b033287dc7b34459dd3093f6da8801178 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b564ef5b033287dc7b34459… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu May 18 07:34:03 2006 -0700 crypt32: Move CertFindCertificateInStore and related functions to cert.c. --- dlls/crypt32/cert.c | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/store.c | 203 -------------------------------------------------- 2 files changed, 203 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b564ef5b033287dc7b3…

1 0

Juan Lang : crypt32: Move context interface definition to common header.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: d9a027952d1096931310a3228905a772d95441e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d9a027952d1096931310a32… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu May 18 07:31:53 2006 -0700 crypt32: Move context interface definition to common header. --- dlls/crypt32/crypt32_private.h | 42 ++++++++++++++++++++ dlls/crypt32/serialize.c | 83 +++------------------------------------- dlls/crypt32/store.c | 40 +------------------ 3 files changed, 51 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d9a027952d109693131…

1 0

Alexandre Julliard : user: Convert the 16-bit winproc functions to use a callback pointer.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: 4316025294c568c2ebdd7474d34f54d78751d91a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4316025294c568c2ebdd747… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 19:44:30 2006 +0200 user: Convert the 16-bit winproc functions to use a callback pointer. --- dlls/user/winproc.c | 110 ++++++++++++++++++++++++--------------------------- dlls/user/winproc.h | 2 + 2 files changed, 54 insertions(+), 58 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 98b189a..db8b5ae 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -474,15 +474,11 @@ static LRESULT WINPROC_CallWndProc( WNDP return retvalue; } -/*********************************************************************** - * WINPROC_CallWndProc16 - * - * Call a 16-bit window procedure - */ -static LRESULT WINAPI WINPROC_CallWndProc16( WNDPROC16 proc, HWND16 hwnd, - UINT16 msg, WPARAM16 wParam, - LPARAM lParam ) +/* call a 16-bit window procedure */ +static LRESULT call_window_proc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam, + LRESULT *result, void *arg ) { + WNDPROC16 proc = arg; CONTEXT86 context; size_t size = 0; struct @@ -540,7 +536,17 @@ static LRESULT WINAPI WINPROC_CallWndPro args.params[1] = HIWORD(lParam); args.params[0] = LOWORD(lParam); WOWCallback16Ex( 0, WCB16_REGS, sizeof(args.params) + size, &args, (DWORD *)&context ); - return MAKELONG( LOWORD(context.Eax), LOWORD(context.Edx) ); + *result = MAKELONG( LOWORD(context.Eax), LOWORD(context.Edx) ); + return *result; +} + +/* call a 16-bit dialog procedure */ +static LRESULT call_dialog_proc16( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + LRESULT ret = call_window_proc16( hwnd, msg, wp, lp, result, arg ); + *result = GetWindowLongPtrW( WIN_Handle32(hwnd), DWLP_MSGRESULT ); + return LOWORD(ret); } @@ -2961,33 +2967,23 @@ LRESULT WINAPI __wine_call_wndproc( HWND * * Call a 16-bit window procedure, translating the 32-bit args. */ -static LRESULT WINPROC_CallProc32ATo16( WNDPROC16 func, HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, BOOL dialog ) +static LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ) { LRESULT ret; UINT16 msg16; MSGPARAM16 mp16; - TRACE_(msg)("func %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", - func, hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); + TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", + hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); mp16.lParam = lParam; if (WINPROC_MapMsg32ATo16( hwnd, msg, wParam, &msg16, &mp16.wParam, &mp16.lParam ) == -1) return 0; - ret = WINPROC_CallWndProc16( func, HWND_16(hwnd), msg16, mp16.wParam, mp16.lParam ); - if (dialog) - { - mp16.lResult = GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); - WINPROC_UnmapMsg32ATo16( hwnd, msg, wParam, lParam, &mp16 ); - SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, mp16.lResult ); - ret = LOWORD(ret); - } - else - { - mp16.lResult = ret; - WINPROC_UnmapMsg32ATo16( hwnd, msg, wParam, lParam, &mp16 ); - ret = mp16.lResult; - } + ret = callback( HWND_16(hwnd), msg16, mp16.wParam, mp16.lParam, result, arg ); + mp16.lResult = *result; + WINPROC_UnmapMsg32ATo16( hwnd, msg, wParam, lParam, &mp16 ); + *result = mp16.lResult; return ret; } @@ -2997,33 +2993,23 @@ static LRESULT WINPROC_CallProc32ATo16( * * Call a 16-bit window procedure, translating the 32-bit args. */ -static LRESULT WINPROC_CallProc32WTo16( WNDPROC16 func, HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, BOOL dialog ) +static LRESULT WINPROC_CallProc32WTo16( winproc_callback16_t callback, HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ) { LRESULT ret; UINT16 msg16; MSGPARAM16 mp16; - TRACE_(msg)("func %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", - func, hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); + TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", + hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); mp16.lParam = lParam; if (WINPROC_MapMsg32WTo16( hwnd, msg, wParam, &msg16, &mp16.wParam, &mp16.lParam ) == -1) return 0; - ret = WINPROC_CallWndProc16( func, HWND_16(hwnd), msg16, mp16.wParam, mp16.lParam ); - if (dialog) - { - mp16.lResult = GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); - WINPROC_UnmapMsg32WTo16( hwnd, msg, wParam, lParam, &mp16 ); - SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, mp16.lResult ); - ret = LOWORD(ret); - } - else - { - mp16.lResult = ret; - WINPROC_UnmapMsg32WTo16( hwnd, msg, wParam, lParam, &mp16 ); - ret = mp16.lResult; - } + ret = callback( HWND_16(hwnd), msg16, mp16.wParam, mp16.lParam, result, arg ); + mp16.lResult = *result; + WINPROC_UnmapMsg32WTo16( hwnd, msg, wParam, lParam, &mp16 ); + *result = mp16.lResult; return ret; } @@ -3040,14 +3026,13 @@ LRESULT WINAPI CallWindowProc16( WNDPROC if (!func) return 0; if (!(proc = handle16_to_proc( func ))) - return WINPROC_CallWndProc16( func, hwnd, msg, wParam, lParam ); - - if (proc->procA) + call_window_proc16( hwnd, msg, wParam, lParam, &result, func ); + else if (proc->procA) WINPROC_CallProc16To32A( call_window_proc, hwnd, msg, wParam, lParam, &result, proc->procA ); else if (proc->procW) WINPROC_CallProc16To32W( call_window_proc, hwnd, msg, wParam, lParam, &result, proc->procW ); else - result = WINPROC_CallWndProc16( proc->proc16, hwnd, msg, wParam, lParam ); + call_window_proc16( hwnd, msg, wParam, lParam, &result, proc->proc16 ); return result; } @@ -3096,7 +3081,7 @@ LRESULT WINAPI CallWindowProcA( else if (proc->procW) WINPROC_CallProcAtoW( call_window_proc, hwnd, msg, wParam, lParam, &result, proc->procW ); else - result = WINPROC_CallProc32ATo16( proc->proc16, hwnd, msg, wParam, lParam, FALSE ); + WINPROC_CallProc32ATo16( call_window_proc16, hwnd, msg, wParam, lParam, &result, proc->proc16 ); return result; } @@ -3121,7 +3106,7 @@ LRESULT WINAPI CallWindowProcW( WNDPROC else if (proc->procA) WINPROC_CallProcWtoA( call_window_proc, hwnd, msg, wParam, lParam, &result, proc->procA ); else - result = WINPROC_CallProc32WTo16( proc->proc16, hwnd, msg, wParam, lParam, FALSE ); + WINPROC_CallProc32WTo16( call_window_proc16, hwnd, msg, wParam, lParam, &result, proc->proc16 ); return result; } @@ -3138,9 +3123,10 @@ INT_PTR WINPROC_CallDlgProc16( DLGPROC16 if (!func) return 0; if (!(proc = handle16_to_proc( (WNDPROC16)func ))) - return LOWORD( WINPROC_CallWndProc16( (WNDPROC16)func, hwnd, msg, wParam, lParam ) ); - - if (proc->procA) + { + ret = call_dialog_proc16( hwnd, msg, wParam, lParam, &result, func ); + } + else if (proc->procA) { ret = WINPROC_CallProc16To32A( call_dialog_proc, hwnd, msg, wParam, lParam, &result, proc->procA ); @@ -3152,8 +3138,10 @@ INT_PTR WINPROC_CallDlgProc16( DLGPROC16 &result, proc->procW ); SetWindowLongPtrW( WIN_Handle32(hwnd), DWLP_MSGRESULT, result ); } - else ret = LOWORD( WINPROC_CallWndProc16( proc->proc16, hwnd, msg, wParam, lParam ) ); - + else + { + ret = call_dialog_proc16( hwnd, msg, wParam, lParam, &result, proc->proc16 ); + } return ret; } @@ -3179,7 +3167,10 @@ INT_PTR WINPROC_CallDlgProcA( DLGPROC fu SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); } else - ret = WINPROC_CallProc32ATo16( proc->proc16, hwnd, msg, wParam, lParam, TRUE ); + { + ret = WINPROC_CallProc32ATo16( call_dialog_proc16, hwnd, msg, wParam, lParam, &result, proc->proc16 ); + SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); + } return ret; } @@ -3205,6 +3196,9 @@ INT_PTR WINPROC_CallDlgProcW( DLGPROC fu SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); } else - ret = WINPROC_CallProc32WTo16( proc->proc16, hwnd, msg, wParam, lParam, TRUE ); + { + ret = WINPROC_CallProc32WTo16( call_dialog_proc16, hwnd, msg, wParam, lParam, &result, proc->proc16 ); + SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); + } return ret; } diff --git a/dlls/user/winproc.h b/dlls/user/winproc.h index bbe1278..02d96cf 100644 --- a/dlls/user/winproc.h +++ b/dlls/user/winproc.h @@ -46,6 +46,8 @@ struct tagWINDOWPROC; typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ); +typedef LRESULT (*winproc_callback16_t)( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp, + LRESULT *result, void *arg ); extern WNDPROC16 WINPROC_GetProc16( WNDPROC proc, BOOL unicode ); extern WNDPROC WINPROC_AllocProc16( WNDPROC16 func );

1 0

Alexandre Julliard : user: Convert the other winproc 32-bit functions to use a callback pointer.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: 6456317153ec668cac973756d7bdf77ee75affbd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6456317153ec668cac97375… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 19:09:32 2006 +0200 user: Convert the other winproc 32-bit functions to use a callback pointer. --- dlls/user/winproc.c | 171 ++++++++++++++++++++++++++++----------------------- 1 files changed, 94 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6456317153ec668cac9…

1 0

Alexandre Julliard : user: Make WINPROC_CallProc32WTo32A take a callback function pointer.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: d1a5d5ae98c7c2efbc6b9cf2a0cd2b7728097e2a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d1a5d5ae98c7c2efbc6b9cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 18:05:01 2006 +0200 user: Make WINPROC_CallProc32WTo32A take a callback function pointer. This way it doesn't need to know about dialog procedures. Also renamed it to WINPROC_CallProcWtoA. --- dlls/user/winproc.c | 125 ++++++++++++++++++++++++++++++++++----------------- dlls/user/winproc.h | 3 + 2 files changed, 87 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d1a5d5ae98c7c2efbc6…

1 0