Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
cc7042f9
Commit
cc7042f9
authored
Aug 16, 2002
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Aug 16, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement comctl32.417 and shlwapi.299. This avoids crash in IE's
History.
parent
08e69396
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
3 deletions
+28
-3
comctl32.spec
dlls/comctl32/comctl32.spec
+1
-1
comctl32undoc.c
dlls/comctl32/comctl32undoc.c
+11
-1
ordinal.c
dlls/shlwapi/ordinal.c
+14
-0
shlwapi.spec
dlls/shlwapi/shlwapi.spec
+1
-1
shlwapi_main.c
dlls/shlwapi/shlwapi_main.c
+1
-0
No files found.
dlls/comctl32/comctl32.spec
View file @
cc7042f9
...
...
@@ -110,7 +110,7 @@ init COMCTL32_LibMain
414 stub @
415 stdcall @(long long long long long) COMCTL32_415
416 stub @
417 st
ub @
417 st
dcall @(long long long long ptr wstr long ptr) COMCTL32_417
418 stub @
419 stdcall @(long long long long) COMCTL32_419
420 stub @
...
...
dlls/comctl32/comctl32undoc.c
View file @
cc7042f9
...
...
@@ -1845,7 +1845,7 @@ DPA_GetPtrIndex (const HDPA hdpa, LPVOID p)
{
INT
i
;
if
(
!
hdpa
->
ptrs
)
if
(
!
hdpa
||
!
hdpa
->
ptrs
)
return
-
1
;
for
(
i
=
0
;
i
<
hdpa
->
nItemCount
;
i
++
)
{
...
...
@@ -2812,6 +2812,16 @@ BOOL WINAPI COMCTL32_415( HWND hwnd, DWORD b, DWORD c, DWORD d, DWORD e)
}
/**************************************************************************
* @ [COMCTL32.417]
*
*/
BOOL
WINAPI
COMCTL32_417
(
HDC
hdc
,
INT
x
,
INT
y
,
UINT
flags
,
const
RECT
*
lprect
,
LPCWSTR
str
,
UINT
count
,
const
INT
*
lpDx
)
{
return
ExtTextOutW
(
hdc
,
x
,
y
,
flags
,
lprect
,
str
,
count
,
lpDx
);
}
/**************************************************************************
* @ [COMCTL32.419]
*
* FIXME: What's this supposed to do?
...
...
dlls/shlwapi/ordinal.c
View file @
cc7042f9
...
...
@@ -47,6 +47,7 @@ extern HINSTANCE shlwapi_hInstance;
extern
HMODULE
SHLWAPI_hshell32
;
extern
HMODULE
SHLWAPI_hwinmm
;
extern
HMODULE
SHLWAPI_hcomdlg32
;
extern
HMODULE
SHLWAPI_hcomctl32
;
extern
HMODULE
SHLWAPI_hmpr
;
extern
HMODULE
SHLWAPI_hmlang
;
extern
HMODULE
SHLWAPI_hversion
;
...
...
@@ -136,6 +137,7 @@ static BOOL (WINAPI *pGetOpenFileNameW)(LPOPENFILENAMEW);
static
DWORD
(
WINAPI
*
pGetFileVersionInfoSizeW
)(
LPCWSTR
,
LPDWORD
);
static
BOOL
(
WINAPI
*
pGetFileVersionInfoW
)(
LPCWSTR
,
DWORD
,
DWORD
,
LPVOID
);
static
WORD
(
WINAPI
*
pVerQueryValueW
)(
LPVOID
,
LPCWSTR
,
LPVOID
*
,
UINT
*
);
static
BOOL
(
WINAPI
*
pCOMCTL32_417
)(
HDC
,
INT
,
INT
,
UINT
,
const
RECT
*
,
LPCWSTR
,
UINT
,
const
INT
*
);
/*
NOTES: Most functions exported by ordinal seem to be superflous.
...
...
@@ -1824,6 +1826,18 @@ BOOL WINAPI SHLWAPI_295(LPWSTR str1, LPVOID x, LPWSTR str2, LPWSTR str3)
}
/*************************************************************************
* @ [SHLWAPI.299]
*
* Late bound call to comctl32.417
*/
BOOL
WINAPI
SHLWAPI_299
(
HDC
hdc
,
INT
x
,
INT
y
,
UINT
flags
,
const
RECT
*
lprect
,
LPCWSTR
str
,
UINT
count
,
const
INT
*
lpDx
)
{
GET_FUNC
(
pCOMCTL32_417
,
comctl32
,
(
LPCSTR
)
417
,
FALSE
);
return
pCOMCTL32_417
(
hdc
,
x
,
y
,
flags
,
lprect
,
str
,
count
,
lpDx
);
}
/*************************************************************************
* @ [SHLWAPI.313]
*
* Late bound call to shell32.SHGetFileInfoW
...
...
dlls/shlwapi/shlwapi.spec
View file @
cc7042f9
...
...
@@ -298,7 +298,7 @@ init SHLWAPI_LibMain
296 stub @
297 stub @
298 forward @ kernel32.WritePrivateProfileStringW
299 st
ub @
299 st
dcall @(long long long long ptr wstr long ptr) SHLWAPI_299
300 forward @ gdi32.CreateFontW
301 forward @ user32.DrawTextExW
302 forward @ user32.GetMenuItemInfoW
...
...
dlls/shlwapi/shlwapi_main.c
View file @
cc7042f9
...
...
@@ -32,6 +32,7 @@ HINSTANCE shlwapi_hInstance = 0;
HMODULE
SHLWAPI_hshell32
=
0
;
HMODULE
SHLWAPI_hwinmm
=
0
;
HMODULE
SHLWAPI_hcomdlg32
=
0
;
HMODULE
SHLWAPI_hcomctl32
=
0
;
HMODULE
SHLWAPI_hmpr
=
0
;
HMODULE
SHLWAPI_hmlang
=
0
;
HMODULE
SHLWAPI_hversion
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment