Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sam Joan Roque-Worcel
wine
Commits
6ca85a5e
Commit
6ca85a5e
authored
25 years ago
by
Ulrich Weigand
Committed by
Alexandre Julliard
25 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Bugfix: relay/snoop debugging was broken by last patch ...
parent
578c1009
No related branches found
Branches containing commit
Tags
wine-991114
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
relay32/kernel32.spec
+0
-4
0 additions, 4 deletions
relay32/kernel32.spec
relay32/relay386.c
+6
-1
6 additions, 1 deletion
relay32/relay386.c
relay32/snoop.c
+9
-4
9 additions, 4 deletions
relay32/snoop.c
with
15 additions
and
9 deletions
relay32/kernel32.spec
+
0
−
4
View file @
6ca85a5e
...
...
@@ -924,7 +924,3 @@ import ntdll.dll
#1599 wrong ordinal (249 in Win32s's W32SCOMB.DLL) !
1599 stdcall Get16DLLAddress(long str) Get16DLLAddress
# Wine internal functions
1600 register SNOOP_Entry() SNOOP_Entry
1601 register SNOOP_Return() SNOOP_Return
1602 register RELAY_CallFrom32Regs() RELAY_CallFrom32Regs
This diff is collapsed.
Click to expand it.
relay32/relay386.c
+
6
−
1
View file @
6ca85a5e
...
...
@@ -61,6 +61,8 @@ int RELAY_ShowDebugmsgRelay(const char *func) {
}
#ifdef __i386__
/***********************************************************************
* RELAY_PrintArgs
*/
...
...
@@ -222,7 +224,9 @@ int RELAY_CallFrom32( int ret_addr, ... )
* ... >128 bytes space free to be modified (ensured by the assembly glue)
*/
void
WINAPI
RELAY_CallFrom32Regs
(
CONTEXT86
*
context
)
void
WINAPI
RELAY_DoCallFrom32Regs
(
CONTEXT86
*
context
);
DEFINE_REGS_ENTRYPOINT_0
(
RELAY_CallFrom32Regs
,
RELAY_DoCallFrom32Regs
)
void
WINAPI
RELAY_DoCallFrom32Regs
(
CONTEXT86
*
context
)
{
unsigned
int
typemask
;
char
buffer
[
80
];
...
...
@@ -301,4 +305,5 @@ void WINAPI RELAY_CallFrom32Regs( CONTEXT86 *context )
SYSLEVEL_CheckNotLevel
(
2
);
}
#endif
/* __i386__ */
This diff is collapsed.
Click to expand it.
relay32/snoop.c
+
9
−
4
View file @
6ca85a5e
...
...
@@ -24,11 +24,11 @@ DEFAULT_DEBUG_CHANNEL(snoop)
char
**
debug_snoop_excludelist
=
NULL
,
**
debug_snoop_includelist
=
NULL
;
#ifdef __i386__
extern
void
WINAPI
SNOOP_Entry
();
extern
void
WINAPI
SNOOP_Return
();
#ifdef __i386__
#ifdef NEED_UNDERSCORE_PREFIX
# define PREFIX "_"
#else
...
...
@@ -251,7 +251,10 @@ SNOOP_PrintArg(DWORD x) {
}
#define CALLER1REF (*(DWORD*)ESP_reg(context))
void
WINAPI
SNOOP_Entry
(
CONTEXT86
*
context
)
void
WINAPI
SNOOP_DoEntry
(
CONTEXT86
*
context
);
DEFINE_REGS_ENTRYPOINT_0
(
SNOOP_Entry
,
SNOOP_DoEntry
);
void
WINAPI
SNOOP_DoEntry
(
CONTEXT86
*
context
)
{
DWORD
ordinal
=
0
,
entry
=
EIP_reg
(
context
)
-
5
;
SNOOP_DLL
*
dll
=
firstdll
;
...
...
@@ -331,7 +334,9 @@ void WINAPI SNOOP_Entry( CONTEXT86 *context )
DPRINTF
(
") ret=%08lx fs=%04lx
\n
"
,(
DWORD
)
ret
->
origreturn
,
FS_reg
(
context
));
}
void
WINAPI
SNOOP_Return
(
CONTEXT86
*
context
)
void
WINAPI
SNOOP_DoReturn
(
CONTEXT86
*
context
);
DEFINE_REGS_ENTRYPOINT_0
(
SNOOP_Return
,
SNOOP_DoReturn
);
void
WINAPI
SNOOP_DoReturn
(
CONTEXT86
*
context
)
{
SNOOP_RETURNENTRY
*
ret
=
(
SNOOP_RETURNENTRY
*
)(
EIP_reg
(
context
)
-
5
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment