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
79404213
Commit
79404213
authored
Oct 25, 2002
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Oct 25, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Compile the shlwapi dll with -DSTRICT.
parent
789b4b42
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
48 additions
and
48 deletions
+48
-48
Makefile.in
dlls/shlwapi/Makefile.in
+1
-1
ordinal.c
dlls/shlwapi/ordinal.c
+8
-8
path.c
dlls/shlwapi/path.c
+4
-4
reg.c
dlls/shlwapi/reg.c
+27
-27
regstream.c
dlls/shlwapi/regstream.c
+4
-4
shlwapi_main.c
dlls/shlwapi/shlwapi_main.c
+1
-1
thread.c
dlls/shlwapi/thread.c
+3
-3
No files found.
dlls/shlwapi/Makefile.in
View file @
79404213
EXTRADEFS
=
-D_SHLWAPI_
-DWINE_NO_STRICT
EXTRADEFS
=
-D_SHLWAPI_
TOPSRCDIR
=
@top_srcdir@
TOPOBJDIR
=
../..
SRCDIR
=
@srcdir@
...
...
dlls/shlwapi/ordinal.c
View file @
79404213
...
...
@@ -700,7 +700,7 @@ BOOL WINAPI SHLWAPI_35(LPVOID p1, DWORD dw2, LPVOID p3)
*/
BOOL
WINAPI
SHLWAPI_36
(
HMENU
hMenu
,
UINT
flags
,
UINT
id
,
LPCWSTR
str
)
{
TRACE
(
"(
0x%08x
,0x%08x,0x%08x,%s)
\n
"
,
hMenu
,
flags
,
id
,
debugstr_w
(
str
));
TRACE
(
"(
%p
,0x%08x,0x%08x,%s)
\n
"
,
hMenu
,
flags
,
id
,
debugstr_w
(
str
));
return
InsertMenuW
(
hMenu
,
-
1
,
flags
|
MF_BITMAP
,
id
,
str
);
}
...
...
@@ -992,7 +992,7 @@ LONG WINAPI SHLWAPI_165(HWND hwnd, INT offset, UINT wMask, UINT wFlags)
*/
DWORD
WINAPI
SHLWAPI_167
(
HWND
hWnd
,
HWND
hWndParent
)
{
FIXME
(
"
0x%08x,0x%08x
\n
"
,
hWnd
,
hWndParent
);
FIXME
(
"
%p,%p
\n
"
,
hWnd
,
hWndParent
);
return
0
;
}
...
...
@@ -1163,7 +1163,7 @@ HRESULT WINAPI SHLWAPI_172(IUnknown *lpUnknown, PHWND lphWnd)
hRet
=
IOleWindow_GetWindow
((
IOleWindow
*
)
lpOle
,
lphWnd
);
IUnknown_Release
(
lpOle
);
if
(
lphWnd
)
TRACE
(
"Returning HWND=%
08x
\n
"
,
*
lphWnd
);
TRACE
(
"Returning HWND=%
p
\n
"
,
*
lphWnd
);
}
return
hRet
;
...
...
@@ -1541,7 +1541,7 @@ VOID WINAPI SHLWAPI_203(LPCSTR lpszStr)
*/
BOOL
WINAPI
SHLWAPI_204
(
HWND
hParent
,
HWND
hChild
)
{
TRACE
(
"(%
08x,%08x
)
\n
"
,
hParent
,
hChild
);
TRACE
(
"(%
p,%p
)
\n
"
,
hParent
,
hChild
);
if
(
!
hParent
||
!
hChild
)
return
TRUE
;
...
...
@@ -1815,7 +1815,7 @@ DWORD WINAPI SHLWAPI_237 (WNDCLASSW * lpWndClass)
{
WNDCLASSW
WndClass
;
TRACE
(
"(
0x%08x
%s)
\n
"
,
lpWndClass
->
hInstance
,
debugstr_w
(
lpWndClass
->
lpszClassName
));
TRACE
(
"(
%p
%s)
\n
"
,
lpWndClass
->
hInstance
,
debugstr_w
(
lpWndClass
->
lpszClassName
));
if
(
GetClassInfoW
(
lpWndClass
->
hInstance
,
lpWndClass
->
lpszClassName
,
&
WndClass
))
return
TRUE
;
...
...
@@ -1827,7 +1827,7 @@ DWORD WINAPI SHLWAPI_237 (WNDCLASSW * lpWndClass)
*/
DWORD
WINAPI
SHLWAPI_239
(
HINSTANCE
hInstance
,
LPVOID
p2
,
DWORD
dw3
)
{
FIXME
(
"(
0x%08x
%p 0x%08lx) stub
\n
"
,
FIXME
(
"(
%p
%p 0x%08lx) stub
\n
"
,
hInstance
,
p2
,
dw3
);
return
0
;
#if 0
...
...
@@ -2021,7 +2021,7 @@ HWND WINAPI SHLWAPI_278 (
HCURSOR
hCursor
;
char
*
clsname
=
"WorkerA"
;
FIXME
(
"(0x%08lx
0x%08x 0x%08lx 0x%08lx 0x%08x
0x%08lx) partial stub
\n
"
,
FIXME
(
"(0x%08lx
%p 0x%08lx 0x%08lx %p
0x%08lx) partial stub
\n
"
,
wndProc
,
hWndParent
,
dwExStyle
,
dwStyle
,
hMenu
,
z
);
hCursor
=
LoadCursorA
(
0x00000000
,
IDC_ARROWA
);
...
...
@@ -2033,7 +2033,7 @@ HWND WINAPI SHLWAPI_278 (
wndclass
.
cbWndExtra
=
4
;
wndclass
.
hInstance
=
shlwapi_hInstance
;
wndclass
.
hCursor
=
hCursor
;
wndclass
.
hbrBackground
=
COLOR_BTNSHADOW
;
wndclass
.
hbrBackground
=
(
HBRUSH
)
COLOR_BTNSHADOW
;
wndclass
.
lpszMenuName
=
NULL
;
wndclass
.
lpszClassName
=
clsname
;
RegisterClassA
(
&
wndclass
);
...
...
dlls/shlwapi/path.c
View file @
79404213
...
...
@@ -2683,7 +2683,7 @@ BOOL WINAPI PathCompactPathA(HDC hDC, LPSTR lpszPath, UINT dx)
{
BOOL
bRet
=
FALSE
;
TRACE
(
"(%
08x
,%s,%d)
\n
"
,
hDC
,
debugstr_a
(
lpszPath
),
dx
);
TRACE
(
"(%
p
,%s,%d)
\n
"
,
hDC
,
debugstr_a
(
lpszPath
),
dx
);
if
(
lpszPath
)
{
...
...
@@ -2709,7 +2709,7 @@ BOOL WINAPI PathCompactPathW(HDC hDC, LPWSTR lpszPath, UINT dx)
SIZE
size
;
DWORD
dwLen
;
TRACE
(
"(%
08x
,%s,%d)
\n
"
,
hDC
,
debugstr_w
(
lpszPath
),
dx
);
TRACE
(
"(%
p
,%s,%d)
\n
"
,
hDC
,
debugstr_w
(
lpszPath
),
dx
);
if
(
!
lpszPath
)
return
bRet
;
...
...
@@ -3343,7 +3343,7 @@ VOID WINAPI PathSetDlgItemPathA(HWND hDlg, int id, LPCSTR lpszPath)
{
WCHAR
szPath
[
MAX_PATH
];
TRACE
(
"(%
8x
,%8x,%s)
\n
"
,
hDlg
,
id
,
debugstr_a
(
lpszPath
));
TRACE
(
"(%
p
,%8x,%s)
\n
"
,
hDlg
,
id
,
debugstr_a
(
lpszPath
));
if
(
lpszPath
)
MultiByteToWideChar
(
0
,
0
,
lpszPath
,
-
1
,
szPath
,
MAX_PATH
);
...
...
@@ -3365,7 +3365,7 @@ VOID WINAPI PathSetDlgItemPathW(HWND hDlg, int id, LPCWSTR lpszPath)
HDC
hdc
;
HGDIOBJ
hPrevObj
;
TRACE
(
"(%
8x
,%8x,%s)
\n
"
,
hDlg
,
id
,
debugstr_w
(
lpszPath
));
TRACE
(
"(%
p
,%8x,%s)
\n
"
,
hDlg
,
id
,
debugstr_w
(
lpszPath
));
if
(
!
(
hwItem
=
GetDlgItem
(
hDlg
,
id
)))
return
;
...
...
dlls/shlwapi/reg.c
View file @
79404213
This diff is collapsed.
Click to expand it.
dlls/shlwapi/regstream.c
View file @
79404213
...
...
@@ -377,7 +377,7 @@ IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey,
LPBYTE
lpBuff
=
NULL
;
DWORD
dwLength
,
dwType
;
TRACE
(
"(
0x%08x
,%s,%s,0x%08lx)
\n
"
,
hKey
,
pszSubkey
,
pszValue
,
dwMode
);
TRACE
(
"(
%p
,%s,%s,0x%08lx)
\n
"
,
hKey
,
pszSubkey
,
pszValue
,
dwMode
);
/* Open the key, read in binary data and create stream */
if
(
!
RegOpenKeyExA
(
hKey
,
pszSubkey
,
0
,
KEY_READ
,
&
hStrKey
)
&&
...
...
@@ -406,7 +406,7 @@ IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey,
LPBYTE
lpBuff
=
NULL
;
DWORD
dwLength
,
dwType
;
TRACE
(
"(
0x%08x
,%s,%s,0x%08lx)
\n
"
,
hKey
,
debugstr_w
(
pszSubkey
),
TRACE
(
"(
%p
,%s,%s,0x%08lx)
\n
"
,
hKey
,
debugstr_w
(
pszSubkey
),
debugstr_w
(
pszValue
),
dwMode
);
/* Open the key, read in binary data and create stream */
...
...
@@ -445,7 +445,7 @@ IStream * WINAPI SHOpenRegStreamA(HKEY hkey, LPCSTR pszSubkey,
{
IStream
*
iStream
;
TRACE
(
"(
0x%08x
,%s,%s,0x%08lx)
\n
"
,
hkey
,
pszSubkey
,
pszValue
,
dwMode
);
TRACE
(
"(
%p
,%s,%s,0x%08lx)
\n
"
,
hkey
,
pszSubkey
,
pszValue
,
dwMode
);
iStream
=
SHOpenRegStream2A
(
hkey
,
pszSubkey
,
pszValue
,
dwMode
);
return
iStream
?
iStream
:
(
IStream
*
)
&
rsDummyRegStream
;
...
...
@@ -461,7 +461,7 @@ IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey,
{
IStream
*
iStream
;
TRACE
(
"(
0x%08x
,%s,%s,0x%08lx)
\n
"
,
hkey
,
debugstr_w
(
pszSubkey
),
TRACE
(
"(
%p
,%s,%s,0x%08lx)
\n
"
,
hkey
,
debugstr_w
(
pszSubkey
),
debugstr_w
(
pszValue
),
dwMode
);
iStream
=
SHOpenRegStream2W
(
hkey
,
pszSubkey
,
pszValue
,
dwMode
);
return
iStream
?
iStream
:
(
IStream
*
)
&
rsDummyRegStream
;
...
...
dlls/shlwapi/shlwapi_main.c
View file @
79404213
...
...
@@ -47,7 +47,7 @@ DWORD SHLWAPI_ThreadRef_index = -1;
*/
BOOL
WINAPI
SHLWAPI_LibMain
(
HINSTANCE
hinstDLL
,
DWORD
fdwReason
,
LPVOID
fImpLoad
)
{
TRACE
(
"
0x%x
0x%lx %p
\n
"
,
hinstDLL
,
fdwReason
,
fImpLoad
);
TRACE
(
"
%p
0x%lx %p
\n
"
,
hinstDLL
,
fdwReason
,
fImpLoad
);
switch
(
fdwReason
)
{
case
DLL_PROCESS_ATTACH
:
...
...
dlls/shlwapi/thread.c
View file @
79404213
...
...
@@ -353,7 +353,7 @@ DWORD WINAPI SHLWAPI_223(HANDLE hSem)
{
DWORD
dwOldCount
=
0
;
TRACE
(
"(
0x%08x
)
\n
"
,
hSem
);
TRACE
(
"(
%p
)
\n
"
,
hSem
);
ReleaseSemaphore
(
hSem
,
1
,
&
dwOldCount
);
/* +1 */
WaitForSingleObject
(
hSem
,
0
);
/* -1 */
return
dwOldCount
;
...
...
@@ -374,7 +374,7 @@ DWORD WINAPI SHLWAPI_224(HANDLE hSem)
{
DWORD
dwOldCount
=
0
;
TRACE
(
"(
0x%08x
)
\n
"
,
hSem
);
TRACE
(
"(
%p
)
\n
"
,
hSem
);
ReleaseSemaphore
(
hSem
,
1
,
&
dwOldCount
);
return
dwOldCount
+
1
;
}
...
...
@@ -394,7 +394,7 @@ DWORD WINAPI SHLWAPI_424(HANDLE hSem)
{
DWORD
dwOldCount
=
0
;
TRACE
(
"(
0x%08x
)
\n
"
,
hSem
);
TRACE
(
"(
%p
)
\n
"
,
hSem
);
dwOldCount
=
SHLWAPI_223
(
hSem
);
WaitForSingleObject
(
hSem
,
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