wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Hans Leidekker : webservices: Implement the Message Framing Protocol.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: 887af1b3bbc9893d68e6452e8409133836fac916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887af1b3bbc9893d68e6452e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 20 15:01:56 2017 +0200 webservices: Implement the Message Framing Protocol. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 625 +++++++++++++++++++++++++++++++-- dlls/webservices/proxy.c | 7 + dlls/webservices/string.c | 47 ++- dlls/webservices/webservices_private.h | 6 +- 4 files changed, 641 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=887af1b3bbc9893d68e64…

1 0

Hans Leidekker : webservices: Write Action and To headers unless the addressing version is WS_ADDRESSING_VERSION_TRANSPORT.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: bb2344b711e698c85c3417afeb5dbc887ee40fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb2344b711e698c85c3417afe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 20 15:01:55 2017 +0200 webservices: Write Action and To headers unless the addressing version is WS_ADDRESSING_VERSION_TRANSPORT. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 70 +++++++++++++++++++++++++++++++------------- dlls/webservices/tests/msg.c | 32 +++++++++++++++----- 2 files changed, 73 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb2344b711e698c85c341…

1 0

Hans Leidekker : webservices: Set default channel envelope and addressing versions.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: 0ea201cbf7d0f3c045674ad11e4f2fd5bbfdbc6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea201cbf7d0f3c045674ad11… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 20 15:01:54 2017 +0200 webservices: Set default channel envelope and addressing versions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 6 ++++++ dlls/webservices/tests/channel.c | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 6326d60..5abd394 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -193,12 +193,18 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, { struct channel *channel; ULONG i, msg_size = 65536; + WS_ENVELOPE_VERSION env_version = WS_ENVELOPE_VERSION_SOAP_1_2; + WS_ADDRESSING_VERSION addr_version = WS_ADDRESSING_VERSION_1_0; HRESULT hr; if (!(channel = alloc_channel())) return E_OUTOFMEMORY; prop_set( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, &msg_size, sizeof(msg_size) ); + prop_set( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_ENVELOPE_VERSION, + &env_version, sizeof(env_version) ); + prop_set( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_ADDRESSING_VERSION, + &addr_version, sizeof(addr_version) ); channel->type = type; channel->binding = binding; diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index ceefad9..86df4f7 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -28,6 +28,8 @@ static void test_WsCreateChannel(void) WS_CHANNEL_STATE state; WS_CHANNEL_PROPERTY prop; WS_ENCODING encoding; + WS_ENVELOPE_VERSION env_version; + WS_ADDRESSING_VERSION addr_version; ULONG size; hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ); @@ -48,6 +50,18 @@ static void test_WsCreateChannel(void) ok( hr == S_OK, "got %08x\n", hr ); ok( encoding == WS_ENCODING_XML_UTF8, "got %u\n", encoding ); + env_version = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_2, "got %u\n", env_version ); + + addr_version = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ADDRESSING_VERSION, &addr_version, sizeof(addr_version), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); + /* read-only property */ state = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); @@ -81,6 +95,18 @@ static void test_WsCreateChannel(void) hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENCODING, &encoding, sizeof(encoding), NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( encoding == WS_ENCODING_XML_BINARY_SESSION_1, "got %u\n", encoding ); + + env_version = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_2, "got %u\n", env_version ); + + addr_version = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ADDRESSING_VERSION, &addr_version, sizeof(addr_version), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); WsFreeChannel( channel ); }

1 0

Hans Leidekker : webservices: Add support for reading float values.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: 82306e84f327bf113f8ae3e07f0d90300a71510d URL: http://source.winehq.org/git/wine.git/?a=commit;h=82306e84f327bf113f8ae3e07… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 20 15:01:53 2017 +0200 webservices: Add support for reading float values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 164 ++++++++++++++++++++++++++++++++- dlls/webservices/tests/reader.c | 89 ++++++++++++++++++ dlls/webservices/webservices_private.h | 1 + include/webservices.h | 11 +++ 4 files changed, 263 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82306e84f327bf113f8ae…

1 0

Hugh McMaster : reg: Avoid using RegQueryInfoKey() to enumerate subkeys and values in the query operation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: fb22f6c416c6a95715866ff92a5454e1bc27e3c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb22f6c416c6a95715866ff92… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 20 11:33:33 2017 +0000 reg: Avoid using RegQueryInfoKey() to enumerate subkeys and values in the query operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 87 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 35 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 0975acd..a6927d0 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -627,11 +627,13 @@ static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, static unsigned int num_values_found = 0; +#define MAX_SUBKEY_LEN 257 + static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) { LONG rc; - DWORD num_subkeys, max_subkey_len, subkey_len; - DWORD max_data_bytes, data_size; + DWORD max_data_bytes = 2048, data_size; + DWORD subkey_len; DWORD type, path_len, i; BYTE *data; WCHAR fmt[] = {'%','1','\n',0}; @@ -639,14 +641,6 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) WCHAR *subkey_name, *subkey_path; HKEY subkey; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, - NULL, NULL, NULL, &max_data_bytes, NULL, NULL); - if (rc) - { - ERR("RegQueryInfoKey failed: %d\n", rc); - return 1; - } - data = HeapAlloc(GetProcessHeap(), 0, max_data_bytes); if (!data) { @@ -654,8 +648,18 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) return 1; } - data_size = max_data_bytes; - rc = RegQueryValueExW(key, value_name, NULL, &type, data, &data_size); + for (;;) + { + data_size = max_data_bytes; + rc = RegQueryValueExW(key, value_name, NULL, &type, data, &data_size); + if (rc == ERROR_MORE_DATA) + { + max_data_bytes = data_size; + data = HeapReAlloc(GetProcessHeap(), 0, data, max_data_bytes); + } + else break; + } + if (rc == ERROR_SUCCESS) { output_string(fmt, path); @@ -681,8 +685,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) return 0; } - max_subkey_len++; - subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); + subkey_name = HeapAlloc(GetProcessHeap(), 0, MAX_SUBKEY_LEN * sizeof(WCHAR)); if (!subkey_name) { ERR("Failed to allocate memory for subkey_name\n"); @@ -691,9 +694,10 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) path_len = strlenW(path); - for (i = 0; i < num_subkeys; i++) + i = 0; + for (;;) { - subkey_len = max_subkey_len; + subkey_len = MAX_SUBKEY_LEN; rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { @@ -704,7 +708,9 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) RegCloseKey(subkey); } HeapFree(GetProcessHeap(), 0, subkey_path); + i++; } + else break; } HeapFree(GetProcessHeap(), 0, subkey_name); @@ -714,9 +720,9 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) static int query_all(HKEY key, WCHAR *path, BOOL recurse) { LONG rc; - DWORD num_subkeys, max_subkey_len, subkey_len; - DWORD num_values, max_value_len, value_len; - DWORD max_data_bytes, data_size; + DWORD max_value_len = 256, value_len; + DWORD max_data_bytes = 2048, data_size; + DWORD subkey_len; DWORD i, type, path_len; WCHAR fmt[] = {'%','1','\n',0}; WCHAR fmt_path[] = {'%','1','\\','%','2','\n',0}; @@ -725,17 +731,8 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) BYTE *data; HKEY subkey; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, NULL, - &num_values, &max_value_len, &max_data_bytes, NULL, NULL); - if (rc) - { - ERR("RegQueryInfoKey failed: %d\n", rc); - return 1; - } - output_string(fmt, path); - max_value_len++; value_name = HeapAlloc(GetProcessHeap(), 0, max_value_len * sizeof(WCHAR)); if (!value_name) { @@ -751,23 +748,40 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 1; } - for (i = 0; i < num_values; i++) + i = 0; + for (;;) { value_len = max_value_len; data_size = max_data_bytes; rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size); if (rc == ERROR_SUCCESS) + { output_value(value_name, type, data, data_size); + i++; + } + else if (rc == ERROR_MORE_DATA) + { + if (data_size > max_data_bytes) + { + max_data_bytes = data_size; + data = HeapReAlloc(GetProcessHeap(), 0, data, max_data_bytes); + } + else + { + max_value_len *= 2; + value_name = HeapReAlloc(GetProcessHeap(), 0, value_name, max_value_len); + } + } + else break; } HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, value_name); - if (num_values || recurse) + if (i || recurse) output_string(newlineW); - max_subkey_len++; - subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); + subkey_name = HeapAlloc(GetProcessHeap(), 0, MAX_SUBKEY_LEN * sizeof(WCHAR)); if (!subkey_name) { ERR("Failed to allocate memory for subkey_name\n"); @@ -776,9 +790,10 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) path_len = strlenW(path); - for (i = 0; i < num_subkeys; i++) + i = 0; + for (;;) { - subkey_len = max_subkey_len; + subkey_len = MAX_SUBKEY_LEN; rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { @@ -793,12 +808,14 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) HeapFree(GetProcessHeap(), 0, subkey_path); } else output_string(fmt_path, path, subkey_name); + i++; } + else break; } HeapFree(GetProcessHeap(), 0, subkey_name); - if (num_subkeys && !recurse) + if (i && !recurse) output_string(newlineW); return 0;

1 0

Hugh McMaster : regedit: Re-size the data export buffer using the required size instead of doubling it.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: d62fb298662cbf9dce2cdd5d8b62562b7f981803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62fb298662cbf9dce2cdd5d8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 20 11:33:24 2017 +0000 regedit: Re-size the data export buffer using the required size instead of doubling it. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index b726251..394023b 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1384,7 +1384,7 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) { if (data_size > max_data_bytes) { - max_data_bytes *= 2; + max_data_bytes = data_size; data = resize_buffer(data, max_data_bytes); } else

1 0

Hugh McMaster : regedit: Remove unused header includes from regproc.c.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: 9d23db6b122fa5ce5f43b2eaf05f94a4b59d179b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d23db6b122fa5ce5f43b2eaf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 20 11:33:16 2017 +0000 regedit: Remove unused header includes from regproc.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 3f036f6..b726251 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -22,17 +22,12 @@ */ #include <errno.h> -#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <fcntl.h> #include <io.h> #include <windows.h> -#include <winnt.h> -#include <winreg.h> -#include <assert.h> #include <wine/unicode.h> -#include <wine/debug.h> #include "regproc.h" #define REG_VAL_BUF_SIZE 4096

1 0

Hugh McMaster : regedit: Remove an unused #define.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: cc1d2525c4e5f15db3e3154ec0b5319975936f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1d2525c4e5f15db3e3154ec… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 20 11:33:08 2017 +0000 regedit: Remove an unused #define. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 57be5da..3f036f6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -37,11 +37,6 @@ #define REG_VAL_BUF_SIZE 4096 -/* maximal number of characters in hexadecimal data line, - * including the indentation, but not including the '\' character - */ -#define REG_FILE_HEX_LINE_LEN (2 + 25 * 3) - extern const WCHAR* reg_class_namesW[]; static HKEY reg_class_keys[] = {

1 0

Alexandre Julliard : include: Undefine PARITY_NONE to avoid warnings.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: 43f5cd4e2827d70f8600fd88db812ff71f1666fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f5cd4e2827d70f8600fd88d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 16:26:41 2017 +0200 include: Undefine PARITY_NONE to avoid warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index d634c86..a8ccb2c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1478,6 +1478,7 @@ typedef struct tagCOMMPROP { #define STOPBITS_15 ((DWORD)2) #define STOPBITS_20 ((DWORD)4) +#undef PARITY_NONE /* defined on Android */ #define PARITY_NONE ((DWORD)0x100) #define PARITY_ODD ((DWORD)0x200) #define PARITY_EVEN ((DWORD)0x400)

1 0

Alexandre Julliard : ntdll: Add small assembly wrappers for snooping instead of saving/ restoring the entire context.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: 143143ad00631d97c860fcb6a558b9b02e63e648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=143143ad00631d97c860fcb6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 16:18:45 2017 +0200 ntdll: Add small assembly wrappers for snooping instead of saving/restoring the entire context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 101 +++++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index db21872..9ffe28a 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -840,9 +840,6 @@ typedef struct { /* code part */ BYTE lcall; /* 0xe8 call snoopentry (relative) */ - /* NOTE: If you move snoopentry OR nrofargs fix the relative offset - * calculation! - */ DWORD snoopentry; /* SNOOP_Entry relative */ /* unreached */ int nrofargs; @@ -863,15 +860,12 @@ typedef struct { /* code part */ BYTE lcall; /* 0xe8 call snoopret relative*/ - /* NOTE: If you move snoopret OR origreturn fix the relative offset - * calculation! - */ DWORD snoopret; /* SNOOP_Ret relative */ /* unreached */ FARPROC origreturn; SNOOP_DLL *dll; DWORD ordinal; - DWORD origESP; + void **origESP; DWORD *args; /* saved args across a stdcall */ } SNOOP_RETURNENTRY; @@ -1025,8 +1019,7 @@ FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *export { fun->name = ename; fun->lcall = 0xe8; - /* NOTE: origreturn struct member MUST come directly after snoopentry */ - fun->snoopentry = (char*)SNOOP_Entry-((char*)(&fun->nrofargs)); + fun->snoopentry = (char *)SNOOP_Entry - (char *)(&fun->snoopentry + 1); fun->origfun = origfun; fun->nrofargs = -1; } @@ -1070,29 +1063,19 @@ static void SNOOP_PrintArg(DWORD x) __ENDTRY } -#define CALLER1REF (*(DWORD*)context->Esp) - -void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) +void WINAPI __regs_SNOOP_Entry( void **stack ) { - DWORD ordinal=0,entry = context->Eip - 5; - SNOOP_DLL *dll = firstdll; - SNOOP_FUN *fun = NULL; + SNOOP_DLL *dll; + SNOOP_FUN *fun = (SNOOP_FUN *)((char *)stack[0] - 5); SNOOP_RETURNENTRIES **rets = &firstrets; SNOOP_RETURNENTRY *ret; int i=0, max; - while (dll) { - if ( ((char*)entry>=(char*)dll->funs) && - ((char*)entry<=(char*)(dll->funs+dll->nrofordinals)) - ) { - fun = (SNOOP_FUN*)entry; - ordinal = fun-dll->funs; - break; - } - dll=dll->next; - } + for (dll = firstdll; dll; dll = dll->next ) + if (fun >= dll->funs && fun < dll->funs + dll->nrofordinals) break; + if (!dll) { - FIXME("entrypoint 0x%08x not found\n",entry); + FIXME("entrypoint %p not found\n", fun); return; /* oops */ } /* guess cdecl ... */ @@ -1102,7 +1085,7 @@ void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) * which has (for xxxxxxxx up to 255 the opcode "83 C4 xx". * (after that 81 C2 xx xx xx xx) */ - LPBYTE reteip = (LPBYTE)CALLER1REF; + LPBYTE reteip = stack[1]; if (reteip) { if ((reteip[0]==0x83)&&(reteip[1]==0xc4)) @@ -1128,33 +1111,31 @@ void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) PAGE_EXECUTE_READWRITE); if (!addr) return; *rets = addr; - memset(*rets,0,4096); i = 0; /* entry 0 is free */ } ret = &((*rets)->entry[i]); ret->lcall = 0xe8; - /* NOTE: origreturn struct member MUST come directly after snoopret */ - ret->snoopret = ((char*)SNOOP_Return)-(char*)(&ret->origreturn); - ret->origreturn = (FARPROC)CALLER1REF; - CALLER1REF = (DWORD)&ret->lcall; + ret->snoopret = (char *)SNOOP_Return - (char *)(&ret->snoopret + 1); + ret->origreturn = stack[1]; + stack[1] = &ret->lcall; ret->dll = dll; ret->args = NULL; - ret->ordinal = ordinal; - ret->origESP = context->Esp; + ret->ordinal = fun - dll->funs; + ret->origESP = stack; - context->Eip = (DWORD)fun->origfun; + stack[0] = fun->origfun; if (!TRACE_ON(snoop)) return; if (TRACE_ON(timestamp)) print_timestamp(); if (fun->name) DPRINTF("%04x:CALL %s.%s(",GetCurrentThreadId(),dll->name,fun->name); - else DPRINTF("%04x:CALL %s.%d(",GetCurrentThreadId(),dll->name,dll->ordbase+ordinal); + else DPRINTF("%04x:CALL %s.%d(",GetCurrentThreadId(),dll->name,dll->ordbase+ret->ordinal); if (fun->nrofargs>0) { max = fun->nrofargs; if (max>16) max=16; for (i=0;i<max;i++) { - SNOOP_PrintArg(*(DWORD*)(context->Esp + 4 + sizeof(DWORD)*i)); + SNOOP_PrintArg( (DWORD)stack[i + 2] ); if (i<fun->nrofargs-1) DPRINTF(","); } if (max!=fun->nrofargs) @@ -1163,16 +1144,16 @@ void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) DPRINTF("<unknown, check return>"); ret->args = RtlAllocateHeap(GetProcessHeap(), 0,16*sizeof(DWORD)); - memcpy(ret->args,(LPBYTE)(context->Esp + 4),sizeof(DWORD)*16); + memcpy(ret->args, stack + 2, sizeof(DWORD)*16); } DPRINTF(") ret=%08x\n",(DWORD)ret->origreturn); } - -void WINAPI __regs_SNOOP_Return( CONTEXT *context ) +void WINAPI __regs_SNOOP_Return( void **stack ) { - SNOOP_RETURNENTRY *ret = (SNOOP_RETURNENTRY*)(context->Eip - 5); + SNOOP_RETURNENTRY *ret = (SNOOP_RETURNENTRY*)((char *)stack[0] - 5); SNOOP_FUN *fun = &ret->dll->funs[ret->ordinal]; + DWORD retval = (DWORD)stack[-1]; /* get saved %eax from the stack */ /* We haven't found out the nrofargs yet. If we called a cdecl * function it is too late anyway and we can just set '0' (which @@ -1180,8 +1161,8 @@ void WINAPI __regs_SNOOP_Return( CONTEXT *context ) * If stdcall -> everything ok. */ if (ret->dll->funs[ret->ordinal].nrofargs<0) - ret->dll->funs[ret->ordinal].nrofargs=(context->Esp - ret->origESP-4)/4; - context->Eip = (DWORD)ret->origreturn; + ret->dll->funs[ret->ordinal].nrofargs = stack - ret->origESP - 1; + stack[0] = ret->origreturn; if (!TRACE_ON(snoop)) { ret->origreturn = NULL; /* mark as empty */ @@ -1207,8 +1188,7 @@ void WINAPI __regs_SNOOP_Return( CONTEXT *context ) SNOOP_PrintArg(ret->args[i]); if (i<max-1) DPRINTF(","); } - DPRINTF(") retval=%08x ret=%08x\n", - context->Eax,(DWORD)ret->origreturn ); + DPRINTF(") retval=%08x ret=%08x\n", retval, (DWORD)ret->origreturn ); RtlFreeHeap(GetProcessHeap(),0,ret->args); ret->args = NULL; } @@ -1217,19 +1197,40 @@ void WINAPI __regs_SNOOP_Return( CONTEXT *context ) if (fun->name) DPRINTF("%04x:RET %s.%s() retval=%08x ret=%08x\n", GetCurrentThreadId(), - ret->dll->name, fun->name, context->Eax, (DWORD)ret->origreturn); + ret->dll->name, fun->name, retval, (DWORD)ret->origreturn); else DPRINTF("%04x:RET %s.%d() retval=%08x ret=%08x\n", GetCurrentThreadId(), ret->dll->name,ret->dll->ordbase+ret->ordinal, - context->Eax, (DWORD)ret->origreturn); + retval, (DWORD)ret->origreturn); } ret->origreturn = NULL; /* mark as empty */ } -/* assembly wrappers that save the context */ -DEFINE_REGS_ENTRYPOINT( SNOOP_Entry, 0 ) -DEFINE_REGS_ENTRYPOINT( SNOOP_Return, 0 ) +/* small wrappers that save registers and get the stack pointer */ +#define SNOOP_WRAPPER(name) \ + __ASM_STDCALL_FUNC( name, 0, \ + "pushl %eax\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "pushl %ecx\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "pushl %edx\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "leal 12(%esp),%eax\n\t" \ + "pushl %eax\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "call " __ASM_NAME("__regs_" #name) __ASM_STDCALL(4) "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") \ + "popl %edx\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") \ + "popl %ecx\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") \ + "popl %eax\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") \ + "ret" ) + +SNOOP_WRAPPER( SNOOP_Entry ) +SNOOP_WRAPPER( SNOOP_Return ) #else /* __i386__ */

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2017