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

Robert Shearman : rpcrt4: Don' t set the memory pointer to NULL before calling PointerUnmarshall.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: 19fad8e71032707cb036239f69f085e1b0249d01 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19fad8e71032707cb036239… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 19 16:03:13 2006 +0100 rpcrt4: Don't set the memory pointer to NULL before calling PointerUnmarshall. Call it with fMustAlloc set to TRUE instead to achieve the same result without side-effects. --- dlls/rpcrt4/ndr_marshall.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 15d7ae8..99777ea 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1109,8 +1109,7 @@ static unsigned char * EmbeddedPointerUn for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; - *(void **)memptr = NULL; - PointerUnmarshall(pStubMsg, bufptr, (unsigned char**)memptr, info+4, fMustAlloc); + PointerUnmarshall(pStubMsg, bufptr, (unsigned char**)memptr, info+4, TRUE); } } pFormat += 8 * count; @@ -1667,9 +1666,8 @@ static unsigned char * ComplexUnmarshall pMemory += 4; break; case RPC_FC_POINTER: - *(unsigned char**)pMemory = NULL; TRACE("pointer => %p\n", pMemory); - NdrPointerUnmarshall(pStubMsg, (unsigned char**)pMemory, pPointer, fMustAlloc); + NdrPointerUnmarshall(pStubMsg, (unsigned char**)pMemory, pPointer, TRUE); pPointer += 4; pMemory += 4; break; @@ -3767,11 +3765,10 @@ unsigned char * WINAPI NdrNonEncapsulat case RPC_FC_UP: case RPC_FC_OP: case RPC_FC_FP: - **(void***)ppMemory = NULL; ALIGN_POINTER(pStubMsg->Buffer, 4); saved_buffer = pStubMsg->Buffer; pStubMsg->Buffer += 4; /* for pointer ID */ - PointerUnmarshall(pStubMsg, saved_buffer, *(unsigned char ***)ppMemory, desc, fMustAlloc); + PointerUnmarshall(pStubMsg, saved_buffer, *(unsigned char ***)ppMemory, desc, TRUE); break; default: m(pStubMsg, ppMemory, desc, fMustAlloc);

1 0

Robert Shearman : rpcrt4: Make more internal functions static.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: 87ecf526b3444f3fb3ccfa1b7f4f97df6550c35c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=87ecf526b3444f3fb3ccfa1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 19 16:02:41 2006 +0100 rpcrt4: Make more internal functions static. --- dlls/rpcrt4/ndr_marshall.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 9ade412..15d7ae8 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -743,7 +743,7 @@ static inline void dump_pointer_attr(uns /*********************************************************************** * PointerMarshall */ -void WINAPI PointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, +static void PointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *Buffer, unsigned char *Pointer, PFORMAT_STRING pFormat) @@ -794,7 +794,7 @@ #endif /*********************************************************************** * PointerUnmarshall */ -void WINAPI PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *Buffer, unsigned char **pPointer, PFORMAT_STRING pFormat, @@ -849,7 +849,7 @@ void WINAPI PointerUnmarshall(PMIDL_STUB /*********************************************************************** * PointerBufferSize */ -void WINAPI PointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +static void PointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *Pointer, PFORMAT_STRING pFormat) { @@ -891,7 +891,7 @@ void WINAPI PointerBufferSize(PMIDL_STUB /*********************************************************************** * PointerMemorySize [RPCRT4.@] */ -unsigned long WINAPI PointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +static unsigned long PointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *Buffer, PFORMAT_STRING pFormat) { @@ -927,7 +927,7 @@ unsigned long WINAPI PointerMemorySize(P /*********************************************************************** * PointerFree [RPCRT4.@] */ -void WINAPI PointerFree(PMIDL_STUB_MESSAGE pStubMsg, +static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *Pointer, PFORMAT_STRING pFormat) { @@ -989,7 +989,7 @@ notfree: /*********************************************************************** * EmbeddedPointerMarshall */ -unsigned char * WINAPI EmbeddedPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, +static unsigned char * EmbeddedPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1055,7 +1055,7 @@ unsigned char * WINAPI EmbeddedPointerMa /*********************************************************************** * EmbeddedPointerUnmarshall */ -unsigned char * WINAPI EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -1122,7 +1122,7 @@ unsigned char * WINAPI EmbeddedPointerUn /*********************************************************************** * EmbeddedPointerBufferSize */ -void WINAPI EmbeddedPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +static void EmbeddedPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1183,7 +1183,7 @@ void WINAPI EmbeddedPointerBufferSize(PM /*********************************************************************** * EmbeddedPointerMemorySize */ -unsigned long WINAPI EmbeddedPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +static unsigned long EmbeddedPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { unsigned long Offset = pStubMsg->Offset; @@ -1244,7 +1244,7 @@ unsigned long WINAPI EmbeddedPointerMemo /*********************************************************************** * EmbeddedPointerFree */ -void WINAPI EmbeddedPointerFree(PMIDL_STUB_MESSAGE pStubMsg, +static void EmbeddedPointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) {

1 0

Robert Shearman : rpcrt4: Add the definition of RpcAuthVerifier to rpc_defs .h from the DCE/RPC spec.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: 0592210bcd45758cedac290be0958c3c67c41a09 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0592210bcd45758cedac290… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 19 16:02:23 2006 +0100 rpcrt4: Add the definition of RpcAuthVerifier to rpc_defs.h from the DCE/RPC spec. Use it in RPCRT4_SendAuth instead of writing out the data byte-by-byte. --- dlls/rpcrt4/rpc_defs.h | 9 +++++++++ dlls/rpcrt4/rpc_message.c | 20 ++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_defs.h b/dlls/rpcrt4/rpc_defs.h index 454c1c6..896fea1 100644 --- a/dlls/rpcrt4/rpc_defs.h +++ b/dlls/rpcrt4/rpc_defs.h @@ -134,6 +134,15 @@ typedef union RpcPktBindNAckHdr bind_nack; } RpcPktHdr; +typedef struct +{ + unsigned char auth_type; /* authentication scheme in use */ + unsigned char auth_level; /* RPC_C_AUTHN_LEVEL* */ + unsigned char auth_pad_length; /* length of padding to restore n % 4 alignment */ + unsigned char auth_reserved; /* reserved, must be zero */ + unsigned long auth_context_id; /* unique value for the authenticated connection */ +} RpcAuthVerifier; + #define RPC_VER_MAJOR 5 #define RPC_VER_MINOR 0 diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 6646ce7..f18cd47 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -271,8 +271,8 @@ static RPC_STATUS RPCRT4_SendAuth(RpcCon PUCHAR buffer_pos; DWORD hdr_size; LONG count; - unsigned char *pkt, *auth_hdr; - LONG alen = AuthLength ? (AuthLength + 8) : 0; + unsigned char *pkt; + LONG alen = AuthLength ? (AuthLength + sizeof(RpcAuthVerifier)) : 0; buffer_pos = Buffer; /* The packet building functions save the packet header size, so we can use it. */ @@ -309,16 +309,16 @@ static RPC_STATUS RPCRT4_SendAuth(RpcCon /* add the authorization info */ if (Connection->AuthInfo && AuthLength) { - auth_hdr = &pkt[Header->common.frag_len - alen]; - - auth_hdr[0] = Connection->AuthInfo->AuthnSvc; - auth_hdr[1] = Connection->AuthInfo->AuthnLevel; - auth_hdr[2] = auth_pad_len; - auth_hdr[3] = 0x00; + RpcAuthVerifier *auth_hdr = (RpcAuthVerifier *)&pkt[Header->common.frag_len - alen]; + auth_hdr->auth_type = Connection->AuthInfo->AuthnSvc; + auth_hdr->auth_level = Connection->AuthInfo->AuthnLevel; + auth_hdr->auth_pad_length = auth_pad_len; + auth_hdr->auth_reserved = 0; /* a unique number... */ - memcpy(&auth_hdr[4], &Connection, 4); - memcpy(&auth_hdr[8], Auth, AuthLength); + auth_hdr->auth_context_id = (unsigned long)Connection; + + memcpy(auth_hdr + 1, Auth, AuthLength); } write:

1 0

Robert Shearman : rpcrt4: Add more format characters and add context handle flags to ndrtypes.h.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: 46005c2f9cffc48662d306a3d8f6581072da706c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46005c2f9cffc48662d306a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 19 16:02:33 2006 +0100 rpcrt4: Add more format characters and add context handle flags to ndrtypes.h. --- include/ndrtypes.h | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/include/ndrtypes.h b/include/ndrtypes.h index 606703a..7a5ec60 100644 --- a/include/ndrtypes.h +++ b/include/ndrtypes.h @@ -149,6 +149,33 @@ typedef enum FC_UP, /* 0x12 */ /* unique pointer */ FC_OP, /* 0x13 */ /* object pointer */ FC_FP, /* 0x14 */ /* full pointer */ + + FC_STRUCT, /* 0x15 */ /* simple structure */ + FC_PSTRUCT, /* 0x16 */ /* simple structure w/ pointers */ + FC_CSTRUCT, /* 0x17 */ /* conformant structure */ + FC_CPSTRUCT, /* 0x18 */ /* conformant structure w/ pointers */ + FC_CVSTRUCT, /* 0x19 */ /* conformant varying struct */ + FC_BOGUS_STRUCT, /* 0x1a */ /* complex structure */ + + FC_CARRAY, /* 0x1b */ /* conformant array */ + FC_CVARRAY, /* 0x1c */ /* conformant varying array */ + FC_SMFARRAY, /* 0x1d */ /* small (<64K) fixed array */ + FC_LGFARRAY, /* 0x1e */ /* large (>= 64k) fixed array */ + FC_SMVARRAY, /* 0x1f */ /* small (<64k) varying array */ + FC_LGVARRAY, /* 0x20 */ /* large (>= 64k) varying array */ + FC_BOGUS_ARRAY, /* 0x21 */ /* complex array */ } FORMAT_CHARACTER; +/* flags for all handle types */ +#define HANDLE_PARAM_IS_VIA_PTR 0x80 +#define HANDLE_PARAM_IS_IN 0x40 +#define HANDLE_PARAM_IS_OUT 0x20 +#define HANDLE_PARAM_IS_RETURN 0x10 + +/* flags for context handles */ +#define NDR_STRICT_CONTEXT_HANDLE 0x08 +#define NDR_CONTEXT_HANDLE_NOSERIALIZE 0x04 +#define NDR_CONTEXT_HANDLE_SERIALIZE 0x02 +#define NDR_CONTEXT_HANDLE_CANNOT_BE_NULL 0x01 + #endif

1 0

Dmitry Timoshkov : Add a stub implementation of ntdsapi.dll.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: 5fd4d3410d18a656601b3876db265082fa64df3f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5fd4d3410d18a656601b387… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 19 16:36:20 2006 +0900 Add a stub implementation of ntdsapi.dll. --- configure | 3 + configure.ac | 1 dlls/Makefile.in | 5 ++ dlls/ntdsapi/.gitignore | 2 + dlls/ntdsapi/Makefile.in | 14 +++++++ dlls/ntdsapi/ntdsapi.c | 68 ++++++++++++++++++++++++++++++++ dlls/ntdsapi/ntdsapi.spec | 96 +++++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 include/ntdsapi.h | 34 ++++++++++++++++ 9 files changed, 223 insertions(+), 1 deletions(-) create mode 100644 dlls/ntdsapi/.gitignore create mode 100644 dlls/ntdsapi/Makefile.in create mode 100644 dlls/ntdsapi/ntdsapi.c create mode 100644 dlls/ntdsapi/ntdsapi.spec create mode 100644 include/ntdsapi.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5fd4d3410d18a656601…

1 0

Paul Chitescu : advapi32: Add stub FileEncryptionStatus and declarations.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: b1cbecbbc6b80149471966bb2b0ead4dcc5e286a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b1cbecbbc6b80149471966b… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri May 19 16:19:18 2006 +0300 advapi32: Add stub FileEncryptionStatus and declarations. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/security.c | 24 ++++++++++++++++++++++++ include/winbase.h | 16 ++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index abdab0b..1187696 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -217,8 +217,8 @@ # @ stub EnumerateTraceGuids # @ stub EqualDomainSid @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) -# @ stub FileEncryptionStatusA -# @ stub FileEncryptionStatusW +@ stdcall FileEncryptionStatusA(str ptr) +@ stdcall FileEncryptionStatusW(wstr ptr) @ stdcall FindFirstFreeAce(ptr ptr) # @ stub FlushTraceA # @ stub FlushTraceW diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ccd3ded..69f4282 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3543,6 +3543,30 @@ BOOL WINAPI EncryptFileA(LPCSTR lpFileNa } /****************************************************************************** + * FileEncryptionStatusW [ADVAPI32.@] + */ +BOOL WINAPI FileEncryptionStatusW(LPCWSTR lpFileName, LPDWORD lpStatus) +{ + FIXME("(%s %p): stub\n", debugstr_w(lpFileName), lpStatus); + if (!lpStatus) + return FALSE; + *lpStatus = FILE_SYSTEM_NOT_SUPPORT; + return TRUE; +} + +/****************************************************************************** + * FileEncryptionStatusA [ADVAPI32.@] + */ +BOOL WINAPI FileEncryptionStatusA(LPCSTR lpFileName, LPDWORD lpStatus) +{ + FIXME("(%s %p): stub\n", debugstr_a(lpFileName), lpStatus); + if (!lpStatus) + return FALSE; + *lpStatus = FILE_SYSTEM_NOT_SUPPORT; + return TRUE; +} + +/****************************************************************************** * SetSecurityInfo [ADVAPI32.@] */ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, diff --git a/include/winbase.h b/include/winbase.h index fbbbbcd..4d4bb3f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -625,6 +625,19 @@ #define FILE_TYPE_CHAR 2 #define FILE_TYPE_PIPE 3 #define FILE_TYPE_REMOTE 32768 +/* File encryption status + */ +#define FILE_ENCRYPTABLE 0 +#define FILE_IS_ENCRYPTED 1 +#define FILE_SYSTEM_ATTR 2 +#define FILE_ROOT_DIR 3 +#define FILE_SYSTEM_DIR 4 +#define FILE_UNKNOWN 5 +#define FILE_SYSTEM_NOT_SUPPORT 6 +#define FILE_USER_DISALLOWED 7 +#define FILE_READ_ONLY 8 +#define FILE_DIR_DISALOWED 9 + /* File creation flags */ #define FILE_FLAG_WRITE_THROUGH 0x80000000UL @@ -1385,6 +1398,9 @@ void WINAPI FatalAppExitA(UINT,LP void WINAPI FatalAppExitW(UINT,LPCWSTR); void WINAPI FatalExit(int); #define FatalAppExit WINELIB_NAME_AW(FatalAppExit) +BOOL WINAPI FileEncryptionStatusA(LPCSTR,LPDWORD); +BOOL WINAPI FileEncryptionStatusW(LPCWSTR,LPDWORD); +#define FileEncryptionStatus WINELIB_NAME_AW(FileEncryptionStatus) BOOL WINAPI FileTimeToDosDateTime(const FILETIME*,LPWORD,LPWORD); BOOL WINAPI FileTimeToLocalFileTime(const FILETIME*,LPFILETIME); BOOL WINAPI FileTimeToSystemTime(const FILETIME*,LPSYSTEMTIME);

1 0

Alexandre Julliard : user: Make a lot of winproc functions static.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: 917d03bd045e1d1167b5392a50609052c06ab340 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=917d03bd045e1d1167b5392… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 20 16:36:52 2006 +0200 user: Make a lot of winproc functions static. --- dlls/user/winproc.c | 72 +++++++++++++++++++++++++++++++++++++++++--------- dlls/user/winproc.h | 73 --------------------------------------------------- 2 files changed, 59 insertions(+), 86 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 39f914c..21f1375 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -67,6 +67,53 @@ static CRITICAL_SECTION_DEBUG critsect_d }; static CRITICAL_SECTION winproc_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +typedef struct +{ + WPARAM16 wParam; + LPARAM lParam; + LRESULT lResult; +} MSGPARAM16; + +/* map a Unicode string to a 16-bit pointer */ +inline static SEGPTR map_str_32W_to_16( LPCWSTR str ) +{ + LPSTR ret; + INT len; + + if (!HIWORD(str)) return (SEGPTR)LOWORD(str); + len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); + if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) + WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); + return MapLS(ret); +} + +/* unmap a Unicode string that was converted to a 16-bit pointer */ +inline static void unmap_str_32W_to_16( SEGPTR str ) +{ + if (!HIWORD(str)) return; + HeapFree( GetProcessHeap(), 0, MapSL(str) ); + UnMapLS( str ); +} + +/* map a 16-bit pointer to a Unicode string */ +inline static LPWSTR map_str_16_to_32W( SEGPTR str ) +{ + LPWSTR ret; + INT len; + + if (!HIWORD(str)) return (LPWSTR)(ULONG_PTR)LOWORD(str); + len = MultiByteToWideChar( CP_ACP, 0, MapSL(str), -1, NULL, 0 ); + if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_ACP, 0, MapSL(str), -1, ret, len ); + return ret; +} + +/* unmap a 16-bit pointer that was converted to a Unicode string */ +inline static void unmap_str_16_to_32W( LPCWSTR str ) +{ + if (HIWORD(str)) HeapFree( GetProcessHeap(), 0, (void *)str ); +} + /* find an existing winproc for a given 16-bit function and type */ /* FIXME: probably should do something more clever than a linear search */ static inline WINDOWPROC *find_winproc16( WNDPROC16 func ) @@ -1367,8 +1414,8 @@ INT WINPROC_MapMsg16To32A( HWND hwnd, UI * * Unmap a message that was mapped from 16- to 32-bit Ansi. */ -LRESULT WINPROC_UnmapMsg16To32A( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, - LRESULT result ) +static LRESULT WINPROC_UnmapMsg16To32A( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, + LRESULT result ) { switch(msg) { @@ -1485,8 +1532,8 @@ LRESULT WINPROC_UnmapMsg16To32A( HWND hw * Map a message from 16- to 32-bit Unicode. * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed. */ -INT WINPROC_MapMsg16To32W( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32, - WPARAM *pwparam32, LPARAM *plparam ) +static INT WINPROC_MapMsg16To32W( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32, + WPARAM *pwparam32, LPARAM *plparam ) { *pmsg32=(UINT)msg16; *pwparam32 = (WPARAM)wParam16; @@ -1603,8 +1650,8 @@ INT WINPROC_MapMsg16To32W( HWND hwnd, UI * * Unmap a message that was mapped from 16- to 32-bit Unicode. */ -LRESULT WINPROC_UnmapMsg16To32W( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, - LRESULT result, WNDPROC dispatch ) +static LRESULT WINPROC_UnmapMsg16To32W( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, + LRESULT result, WNDPROC dispatch ) { switch(msg) { @@ -2233,8 +2280,8 @@ INT WINPROC_MapMsg32ATo16( HWND hwnd, UI * * Unmap a message that was mapped from 32-bit Ansi to 16-bit. */ -void WINPROC_UnmapMsg32ATo16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, - MSGPARAM16* p16 ) +static void WINPROC_UnmapMsg32ATo16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, + MSGPARAM16* p16 ) { switch(msg) { @@ -2442,9 +2489,8 @@ void WINPROC_UnmapMsg32ATo16( HWND hwnd, * Map a message from 32-bit Unicode to 16-bit. * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed. */ -INT WINPROC_MapMsg32WTo16( HWND hwnd, UINT msg32, WPARAM wParam32, - UINT16 *pmsg16, WPARAM16 *pwparam16, - LPARAM *plparam ) +static INT WINPROC_MapMsg32WTo16( HWND hwnd, UINT msg32, WPARAM wParam32, + UINT16 *pmsg16, WPARAM16 *pwparam16, LPARAM *plparam ) { *pmsg16 = LOWORD(msg32); *pwparam16 = LOWORD(wParam32); @@ -2558,8 +2604,8 @@ INT WINPROC_MapMsg32WTo16( HWND hwnd, UI * * Unmap a message that was mapped from 32-bit Unicode to 16-bit. */ -void WINPROC_UnmapMsg32WTo16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, - MSGPARAM16* p16 ) +static void WINPROC_UnmapMsg32WTo16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, + MSGPARAM16* p16 ) { switch(msg) { diff --git a/dlls/user/winproc.h b/dlls/user/winproc.h index 4bbc6f3..53ebb94 100644 --- a/dlls/user/winproc.h +++ b/dlls/user/winproc.h @@ -26,23 +26,6 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "wine/winbase16.h" -#include "winnls.h" - -typedef struct -{ - WPARAM16 wParam; - LPARAM lParam; - LRESULT lResult; -} MSGPARAM16; - -typedef struct -{ - WPARAM wParam; - LPARAM lParam; - LRESULT lResult; -} MSGPARAM; - -struct tagWINDOWPROC; typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ); @@ -65,70 +48,14 @@ extern LRESULT WINPROC_CallProc32ATo16( extern INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32, WPARAM *pwparam32, LPARAM *plparam ); -extern INT WINPROC_MapMsg16To32W( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, - UINT *pmsg32, WPARAM *pwparam32, - LPARAM *plparam ); extern INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32, WPARAM wParam32, UINT16 *pmsg16, WPARAM16 *pwparam16, LPARAM *plparam ); -extern INT WINPROC_MapMsg32WTo16( HWND hwnd, UINT msg32, - WPARAM wParam32, UINT16 *pmsg16, - WPARAM16 *pwparam16, LPARAM *plparam ); -extern LRESULT WINPROC_UnmapMsg16To32A( HWND hwnd, UINT msg, WPARAM wParam, - LPARAM lParam, LRESULT result ); -extern LRESULT WINPROC_UnmapMsg16To32W( HWND hwnd, UINT msg, WPARAM wParam, - LPARAM lParam, LRESULT result, - WNDPROC dispatch ); -extern void WINPROC_UnmapMsg32ATo16( HWND hwnd, UINT msg, WPARAM wParam, - LPARAM lParam, MSGPARAM16* pm16 ); -extern void WINPROC_UnmapMsg32WTo16( HWND hwnd, UINT msg, WPARAM wParam, - LPARAM lParam, MSGPARAM16* pm16 ); extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ); extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); -/* map a Unicode string to a 16-bit pointer */ -inline static SEGPTR map_str_32W_to_16( LPCWSTR str ) -{ - LPSTR ret; - INT len; - - if (!HIWORD(str)) return (SEGPTR)LOWORD(str); - len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) - WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); - return MapLS(ret); -} - -/* unmap a Unicode string that was converted to a 16-bit pointer */ -inline static void unmap_str_32W_to_16( SEGPTR str ) -{ - if (!HIWORD(str)) return; - HeapFree( GetProcessHeap(), 0, MapSL(str) ); - UnMapLS( str ); -} - -/* map a 16-bit pointer to a Unicode string */ -inline static LPWSTR map_str_16_to_32W( SEGPTR str ) -{ - LPWSTR ret; - INT len; - - if (!HIWORD(str)) return (LPWSTR)(ULONG_PTR)LOWORD(str); - len = MultiByteToWideChar( CP_ACP, 0, MapSL(str), -1, NULL, 0 ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) - MultiByteToWideChar( CP_ACP, 0, MapSL(str), -1, ret, len ); - return ret; -} - -/* unmap a 16-bit pointer that was converted to a Unicode string */ -inline static void unmap_str_16_to_32W( LPCWSTR str ) -{ - if (HIWORD(str)) HeapFree( GetProcessHeap(), 0, (void *)str ); -} - - /* Class functions */ struct tagCLASS; /* opaque structure */ struct tagWND;

1 0

Alexandre Julliard : user: Get rid of the MSGPARAMS16 structure.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: b73c5e895f679a75dd52bc2e08afcabf70baba4e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b73c5e895f679a75dd52bc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 20:39:01 2006 +0200 user: Get rid of the MSGPARAMS16 structure. --- dlls/user/winproc.c | 163 ++++++++++++++++++++++++--------------------------- 1 files changed, 77 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b73c5e895f679a75dd5…

1 0

Alexandre Julliard : user: Call the A version of message functions from 16-bit code.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: ca570aade29f77229b693858d3f508e922d7399f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca570aade29f77229b69385… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 20 16:35:44 2006 +0200 user: Call the A version of message functions from 16-bit code. This avoids having to export too many different message translation functions. --- dlls/user/msg16.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/user/msg16.c b/dlls/user/msg16.c index e8b9d4c..a5b0f0c 100644 --- a/dlls/user/msg16.c +++ b/dlls/user/msg16.c @@ -91,10 +91,10 @@ BOOL16 WINAPI PostMessage16( HWND16 hwnd UINT msg32; HWND hwnd = WIN_Handle32( hwnd16 ); - switch (WINPROC_MapMsg16To32W( hwnd, msg, wparam, &msg32, &wparam32, &lparam )) + switch (WINPROC_MapMsg16To32A( hwnd, msg, wparam, &msg32, &wparam32, &lparam )) { case 0: - return PostMessageW( hwnd, msg32, wparam32, lparam ); + return PostMessageA( hwnd, msg32, wparam32, lparam ); case 1: ERR( "16-bit message 0x%04x contains pointer, cannot post\n", msg ); return FALSE; @@ -114,10 +114,10 @@ BOOL16 WINAPI PostAppMessage16( HTASK16 DWORD tid = HTASK_32( hTask ); if (!tid) return FALSE; - switch (WINPROC_MapMsg16To32W( 0, msg, wparam, &msg32, &wparam32, &lparam )) + switch (WINPROC_MapMsg16To32A( 0, msg, wparam, &msg32, &wparam32, &lparam )) { case 0: - return PostThreadMessageW( tid, msg32, wparam32, lparam ); + return PostThreadMessageA( tid, msg32, wparam32, lparam ); case 1: ERR( "16-bit message %x contains pointer, cannot post\n", msg ); return FALSE; @@ -157,7 +157,7 @@ BOOL16 WINAPI PeekMessage32_16( MSG32_16 if(USER16_AlertableWait) MsgWaitForMultipleObjectsEx( 0, NULL, 1, 0, MWMO_ALERTABLE ); - if (!PeekMessageW( &msg, hwnd, first, last, flags )) return FALSE; + if (!PeekMessageA( &msg, hwnd, first, last, flags )) return FALSE; msg16->msg.hwnd = HWND_16( msg.hwnd ); msg16->msg.lParam = msg.lParam; @@ -166,7 +166,7 @@ BOOL16 WINAPI PeekMessage32_16( MSG32_16 msg16->msg.pt.y = (INT16)msg.pt.y; if (wHaveParamHigh) msg16->wParamHigh = HIWORD(msg.wParam); - return (WINPROC_MapMsg32WTo16( msg.hwnd, msg.message, msg.wParam, + return (WINPROC_MapMsg32ATo16( msg.hwnd, msg.message, msg.wParam, &msg16->msg.message, &msg16->msg.wParam, &msg16->msg.lParam ) != -1); } @@ -288,7 +288,7 @@ BOOL16 WINAPI GetMessage32_16( MSG32_16 { if(USER16_AlertableWait) MsgWaitForMultipleObjectsEx( 0, NULL, INFINITE, 0, MWMO_ALERTABLE ); - GetMessageW( &msg, hwnd, first, last ); + GetMessageA( &msg, hwnd, first, last ); msg16->msg.hwnd = HWND_16( msg.hwnd ); msg16->msg.lParam = msg.lParam; msg16->msg.time = msg.time; @@ -296,7 +296,7 @@ BOOL16 WINAPI GetMessage32_16( MSG32_16 msg16->msg.pt.y = (INT16)msg.pt.y; if (wHaveParamHigh) msg16->wParamHigh = HIWORD(msg.wParam); } - while (WINPROC_MapMsg32WTo16( msg.hwnd, msg.message, msg.wParam, + while (WINPROC_MapMsg32ATo16( msg.hwnd, msg.message, msg.wParam, &msg16->msg.message, &msg16->msg.wParam, &msg16->msg.lParam ) == -1); @@ -419,11 +419,10 @@ BOOL16 WINAPI IsDialogMessage16( HWND16 case WM_KEYDOWN: case WM_CHAR: case WM_SYSCHAR: - msg.lParam = msg16->lParam; - WINPROC_MapMsg16To32W( msg.hwnd, msg16->message, msg16->wParam, - &msg.message, &msg.wParam, &msg.lParam ); - /* these messages don't need an unmap */ - return IsDialogMessageW( hwndDlg32, &msg ); + msg.message = msg16->message; + msg.wParam = msg16->wParam; + msg.lParam = msg16->lParam; + return IsDialogMessageA( hwndDlg32, &msg ); } if ((hwndDlg32 != msg.hwnd) && !IsChild( hwndDlg32, msg.hwnd )) return FALSE;

1 0

Alexandre Julliard : user: Use winproc callbacks instead of message map/ unmap for 16-bit hooks.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: dc61a4bc65617b0748b978a68c8a18d111d3e6a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc61a4bc65617b0748b978a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 20 16:34:14 2006 +0200 user: Use winproc callbacks instead of message map/unmap for 16-bit hooks. --- dlls/user/hook16.c | 85 +++++++++++++++++++++++++++++++++++---------------- dlls/user/winproc.c | 4 +- dlls/user/winproc.h | 2 + 3 files changed, 62 insertions(+), 29 deletions(-) diff --git a/dlls/user/hook16.c b/dlls/user/hook16.c index cbec32c..db1c05e 100644 --- a/dlls/user/hook16.c +++ b/dlls/user/hook16.c @@ -133,6 +133,50 @@ static LRESULT call_hook_16( INT id, INT } +struct wndproc_hook_params +{ + HHOOK hhook; + INT code; + WPARAM wparam; +}; + +/* callback for WINPROC_Call16To32A */ +static LRESULT wndproc_hook_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + struct wndproc_hook_params *params = arg; + CWPSTRUCT cwp; + + cwp.hwnd = hwnd; + cwp.message = msg; + cwp.wParam = wp; + cwp.lParam = lp; + *result = 0; + return CallNextHookEx( params->hhook, params->code, params->wparam, (LPARAM)&cwp ); +} + +/* callback for WINPROC_Call32ATo16 */ +static LRESULT wndproc_hook_callback16( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + struct wndproc_hook_params *params = arg; + CWPSTRUCT16 cwp; + LRESULT ret; + + cwp.hwnd = hwnd; + cwp.message = msg; + cwp.wParam = wp; + cwp.lParam = lp; + + lp = MapLS( &cwp ); + ret = call_hook_16( WH_CALLWNDPROC, params->code, params->wparam, lp ); + UnMapLS( lp ); + + *result = 0; + return ret; +} + + /*********************************************************************** * call_WH_MSGFILTER */ @@ -184,26 +228,14 @@ static LRESULT CALLBACK call_WH_GETMESSA */ static LRESULT CALLBACK call_WH_CALLWNDPROC( INT code, WPARAM wp, LPARAM lp ) { + struct wndproc_hook_params params; CWPSTRUCT *cwp32 = (CWPSTRUCT *)lp; - CWPSTRUCT16 cwp16; - MSGPARAM16 mp16; - LRESULT ret; - - cwp16.hwnd = HWND_16(cwp32->hwnd); - cwp16.lParam = cwp32->lParam; + LRESULT result; - WINPROC_MapMsg32ATo16( cwp32->hwnd, cwp32->message, cwp32->wParam, - &cwp16.message, &cwp16.wParam, &cwp16.lParam ); - - lp = MapLS( &cwp16 ); - ret = call_hook_16( WH_CALLWNDPROC, code, wp, lp ); - UnMapLS( lp ); - - mp16.wParam = cwp16.wParam; - mp16.lParam = cwp16.lParam; - mp16.lResult = 0; - WINPROC_UnmapMsg32ATo16( cwp32->hwnd, cwp32->message, cwp32->wParam, cwp32->lParam, &mp16 ); - return ret; + params.code = code; + params.wparam = wp; + return WINPROC_CallProc32ATo16( wndproc_hook_callback16, cwp32->hwnd, cwp32->message, + cwp32->wParam, cwp32->lParam, &result, &params ); } @@ -499,15 +531,14 @@ LRESULT WINAPI CallNextHookEx16( HHOOK h case WH_CALLWNDPROC: { CWPSTRUCT16 *cwp16 = MapSL(lparam); - CWPSTRUCT cwp32; - - cwp32.hwnd = WIN_Handle32(cwp16->hwnd); - cwp32.lParam = cwp16->lParam; - - WINPROC_MapMsg16To32A( cwp32.hwnd, cwp16->message, cwp16->wParam, - &cwp32.message, &cwp32.wParam, &cwp32.lParam ); - ret = CallNextHookEx( hhook, code, wparam, (LPARAM)&cwp32 ); - WINPROC_UnmapMsg16To32A( cwp32.hwnd, cwp32.message, cwp32.wParam, cwp32.lParam, 0 ); + LRESULT result; + struct wndproc_hook_params params; + + params.hhook = hhook; + params.code = code; + params.wparam = wparam; + ret = WINPROC_CallProc16To32A( wndproc_hook_callback, cwp16->hwnd, cwp16->message, + cwp16->wParam, cwp16->lParam, &result, &params ); break; } diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 37f9c79..39f914c 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -2967,8 +2967,8 @@ LRESULT WINAPI __wine_call_wndproc( HWND * * Call a 16-bit window procedure, translating the 32-bit args. */ -static LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ) +LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ) { LRESULT ret; UINT16 msg16; diff --git a/dlls/user/winproc.h b/dlls/user/winproc.h index 4db36d5..4bbc6f3 100644 --- a/dlls/user/winproc.h +++ b/dlls/user/winproc.h @@ -59,6 +59,8 @@ extern LRESULT WINPROC_CallProcAtoW( win WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg ); +extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); extern INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32, WPARAM *pwparam32,

1 0