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
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
Alexey Alyaev
wine
Commits
6e9fea22
Commit
6e9fea22
authored
17 years ago
by
Rémi Assailly
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
user32: Moved some 16-bit functions.
parent
263cb44d
Loading
Loading
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/user32/clipboard.c
+0
-51
0 additions, 51 deletions
dlls/user32/clipboard.c
dlls/user32/desktop.c
+0
-9
0 additions, 9 deletions
dlls/user32/desktop.c
dlls/user32/user16.c
+27
-0
27 additions, 0 deletions
dlls/user32/user16.c
with
27 additions
and
60 deletions
dlls/user32/clipboard.c
+
0
−
51
View file @
6e9fea22
...
...
@@ -485,35 +485,6 @@ BOOL WINAPI ChangeClipboardChain(HWND hWnd, HWND hWndNext)
}
/**************************************************************************
* SetClipboardData (USER.141)
*/
HANDLE16
WINAPI
SetClipboardData16
(
UINT16
wFormat
,
HANDLE16
hData
)
{
CLIPBOARDINFO
cbinfo
;
HANDLE16
hResult
=
0
;
TRACE
(
"(%04X, %04x) !
\n
"
,
wFormat
,
hData
);
/* If it's not owned, data can only be set if the format doesn't exists
and its rendering is not delayed */
if
(
!
CLIPBOARD_GetClipboardInfo
(
&
cbinfo
)
||
(
!
(
cbinfo
.
flags
&
CB_OWNER
)
&&
!
hData
))
{
WARN
(
"Clipboard not owned by calling task. Operation failed.
\n
"
);
return
0
;
}
if
(
USER_Driver
->
pSetClipboardData
(
wFormat
,
hData
,
0
,
cbinfo
.
flags
&
CB_OWNER
))
{
hResult
=
hData
;
bCBHasChanged
=
TRUE
;
}
return
hResult
;
}
/**************************************************************************
* SetClipboardData (USER32.@)
*/
...
...
@@ -585,28 +556,6 @@ BOOL WINAPI IsClipboardFormatAvailable(UINT wFormat)
}
/**************************************************************************
* GetClipboardData (USER.142)
*/
HANDLE16
WINAPI
GetClipboardData16
(
UINT16
wFormat
)
{
HANDLE16
hData
=
0
;
CLIPBOARDINFO
cbinfo
;
if
(
!
CLIPBOARD_GetClipboardInfo
(
&
cbinfo
)
||
(
~
cbinfo
.
flags
&
CB_OPEN
))
{
WARN
(
"Clipboard not opened by calling task.
\n
"
);
SetLastError
(
ERROR_CLIPBOARD_NOT_OPEN
);
return
0
;
}
if
(
!
USER_Driver
->
pGetClipboardData
(
wFormat
,
&
hData
,
NULL
))
hData
=
0
;
return
hData
;
}
/**************************************************************************
* GetClipboardData (USER32.@)
*/
...
...
This diff is collapsed.
Click to expand it.
dlls/user32/desktop.c
+
0
−
9
View file @
6e9fea22
...
...
@@ -187,15 +187,6 @@ BOOL16 WINAPI SetDeskPattern(void)
}
/***********************************************************************
* SetDeskWallPaper (USER.285)
*/
BOOL16
WINAPI
SetDeskWallPaper16
(
LPCSTR
filename
)
{
return
SetDeskWallPaper
(
filename
);
}
/***********************************************************************
* SetDeskWallPaper (USER32.@)
*
...
...
This diff is collapsed.
Click to expand it.
dlls/user32/user16.c
+
27
−
0
View file @
6e9fea22
...
...
@@ -446,6 +446,24 @@ BOOL16 WINAPI EmptyClipboard16(void)
}
/**************************************************************************
* SetClipboardData (USER.141)
*/
HANDLE16
WINAPI
SetClipboardData16
(
UINT16
wFormat
,
HANDLE16
hData
)
{
return
HANDLE_16
(
SetClipboardData
(
wFormat
,
HANDLE_32
(
hData
)));
}
/**************************************************************************
* GetClipboardData (USER.142)
*/
HANDLE16
WINAPI
GetClipboardData16
(
UINT16
wFormat
)
{
return
HANDLE_16
(
GetClipboardData
(
wFormat
));
}
/**************************************************************************
* CountClipboardFormats (USER.143)
*/
...
...
@@ -982,6 +1000,15 @@ WORD WINAPI GetFreeSystemResources16( WORD resType )
}
/***********************************************************************
* SetDeskWallPaper (USER.285)
*/
BOOL16
WINAPI
SetDeskWallPaper16
(
LPCSTR
filename
)
{
return
SetDeskWallPaper
(
filename
);
}
/***********************************************************************
* GetClipCursor (USER.309)
*/
...
...
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