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
f49f36f9
Commit
f49f36f9
authored
Aug 23, 2005
by
Mike McCormack
Committed by
Alexandre Julliard
Aug 23, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix gcc 4.0 warnings.
parent
7ab28137
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
12 deletions
+16
-12
shlexec.c
dlls/shell32/tests/shlexec.c
+2
-2
capability.c
dlls/twain/capability.c
+1
-1
resource.c
dlls/version/resource.c
+4
-4
winaspi16.c
dlls/winaspi/winaspi16.c
+4
-2
winaspi32.c
dlls/winaspi/winaspi32.c
+5
-3
No files found.
dlls/shell32/tests/shlexec.c
View file @
f49f36f9
...
...
@@ -206,7 +206,7 @@ static void create_test_association(const char* extension)
rc
=
RegCreateKeyEx
(
HKEY_CLASSES_ROOT
,
extension
,
0
,
NULL
,
0
,
KEY_SET_VALUE
,
NULL
,
&
hkey
,
NULL
);
assert
(
rc
==
ERROR_SUCCESS
);
rc
=
RegSetValueEx
(
hkey
,
NULL
,
0
,
REG_SZ
,
class
,
strlen
(
class
)
+
1
);
rc
=
RegSetValueEx
(
hkey
,
NULL
,
0
,
REG_SZ
,
(
LPBYTE
)
class
,
strlen
(
class
)
+
1
);
assert
(
rc
==
ERROR_SUCCESS
);
CloseHandle
(
hkey
);
...
...
@@ -250,7 +250,7 @@ static void create_test_verb(const char* extension, const char* verb,
cmd
=
malloc
(
strlen
(
argv0
)
+
10
+
strlen
(
child_file
)
+
2
+
strlen
(
cmdtail
)
+
1
);
sprintf
(
cmd
,
"%s shlexec
\"
%s
\"
%s"
,
argv0
,
child_file
,
cmdtail
);
rc
=
RegSetValueEx
(
hkey_cmd
,
NULL
,
0
,
REG_SZ
,
cmd
,
strlen
(
cmd
)
+
1
);
rc
=
RegSetValueEx
(
hkey_cmd
,
NULL
,
0
,
REG_SZ
,
(
LPBYTE
)
cmd
,
strlen
(
cmd
)
+
1
);
assert
(
rc
==
ERROR_SUCCESS
);
free
(
cmd
);
...
...
dlls/twain/capability.c
View file @
f49f36f9
...
...
@@ -223,7 +223,7 @@ TW_UINT16 TWAIN_ICAPXferMech (activeDS *pSource, pTW_CAPABILITY pCapability,
case
MSG_SET
:
if
(
pCapability
->
ConType
==
TWON_ONEVALUE
)
{
TW_UINT32
xfermechtemp
;
TW_UINT32
xfermechtemp
=
0
;
if
(
!
TWAIN_OneValueGet
(
pCapability
,
&
xfermechtemp
))
return
TWCC_LOWMEMORY
;
pSource
->
capXferMech
=
xfermechtemp
;
...
...
dlls/version/resource.c
View file @
f49f36f9
...
...
@@ -200,7 +200,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
if
(
!
resTab
)
return
FALSE
;
LZSeek
(
lzfd
,
nehd
.
ne_rsrctab
+
nehdoffset
,
SEEK_SET
);
if
(
resTabSize
!=
LZRead
(
lzfd
,
resTab
,
resTabSize
)
)
if
(
resTabSize
!=
LZRead
(
lzfd
,
(
char
*
)
resTab
,
resTabSize
)
)
{
HeapFree
(
GetProcessHeap
(),
0
,
resTab
);
return
FALSE
;
...
...
@@ -217,7 +217,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
if
(
!
(
typeInfo
->
type_id
&
0x8000
))
{
BYTE
*
p
=
resTab
+
typeInfo
->
type_id
;
if
((
*
p
==
len
)
&&
!
strncasecmp
(
p
+
1
,
typeid
,
len
))
goto
found_type
;
if
((
*
p
==
len
)
&&
!
strncasecmp
(
(
char
*
)
p
+
1
,
typeid
,
len
))
goto
found_type
;
}
typeInfo
=
(
NE_TYPEINFO
*
)((
char
*
)(
typeInfo
+
1
)
+
typeInfo
->
count
*
sizeof
(
NE_NAMEINFO
));
...
...
@@ -247,7 +247,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
{
BYTE
*
p
=
resTab
+
nameInfo
->
id
;
if
(
nameInfo
->
id
&
0x8000
)
continue
;
if
((
*
p
==
len
)
&&
!
strncasecmp
(
p
+
1
,
resid
,
len
))
goto
found_name
;
if
((
*
p
==
len
)
&&
!
strncasecmp
(
(
char
*
)
p
+
1
,
resid
,
len
))
goto
found_name
;
}
}
else
/* numeric resource id */
...
...
@@ -340,7 +340,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
}
LZSeek
(
lzfd
,
sections
[
i
].
PointerToRawData
,
SEEK_SET
);
if
(
resSectionSize
!=
LZRead
(
lzfd
,
resSection
,
resSectionSize
)
)
goto
done
;
if
(
resSectionSize
!=
LZRead
(
lzfd
,
(
char
*
)
resSection
,
resSectionSize
)
)
goto
done
;
/* Find resource */
resDir
=
resSection
+
(
resDataDir
->
VirtualAddress
-
sections
[
i
].
VirtualAddress
);
...
...
dlls/winaspi/winaspi16.c
View file @
f49f36f9
...
...
@@ -391,6 +391,8 @@ DWORD ASPI_SendASPICommand(DWORD ptrSRB, UINT16 mode)
{
#ifdef linux
LPSRB16
lpSRB
=
PTR_TO_LIN
(
ptrSRB
,
mode
);
static
const
char
szId
[]
=
"Wine ASPI16"
;
static
const
char
szWh
[]
=
"Wine host"
;
if
(
mode
==
ASPI_WIN16
&&
ASPIChainFunc
)
{
...
...
@@ -412,8 +414,8 @@ DWORD ASPI_SendASPICommand(DWORD ptrSRB, UINT16 mode)
lpSRB
->
inquiry
.
SRB_ExtBufferSize
=
0x2000
;
/* bogus value */
lpSRB
->
inquiry
.
HA_Count
=
HA_Count
;
lpSRB
->
inquiry
.
HA_SCSI_ID
=
7
;
/* not always ID 7 */
strcat
(
lpSRB
->
inquiry
.
HA_ManagerId
,
"Wine ASPI16"
);
/* max 15 chars */
strcat
(
lpSRB
->
inquiry
.
HA_Identifier
,
"Wine host"
);
/* FIXME: return host
memcpy
(
lpSRB
->
inquiry
.
HA_ManagerId
,
szId
,
sizeof
szId
);
/* max 15 chars */
memcpy
(
lpSRB
->
inquiry
.
HA_Identifier
,
szWh
,
sizeof
szWh
);
/* FIXME: return host
adapter name */
memset
(
lpSRB
->
inquiry
.
HA_Unique
,
0
,
16
);
/* default HA_Unique content */
lpSRB
->
inquiry
.
HA_Unique
[
6
]
=
0x02
;
/* Maximum Transfer Length (128K, Byte> 4-7) */
...
...
dlls/winaspi/winaspi32.c
View file @
f49f36f9
...
...
@@ -513,13 +513,15 @@ DWORD __cdecl GetASPI32SupportInfo(void)
DWORD
__cdecl
SendASPI32Command
(
LPSRB
lpSRB
)
{
#ifdef linux
static
const
char
szId
[]
=
"ASPI for WIN32"
;
static
const
char
szWh
[]
=
"Wine host"
;
switch
(
lpSRB
->
common
.
SRB_Cmd
)
{
case
SC_HA_INQUIRY
:
lpSRB
->
inquiry
.
SRB_Status
=
SS_COMP
;
/* completed successfully */
lpSRB
->
inquiry
.
HA_Count
=
ASPI_GetNumControllers
();
lpSRB
->
inquiry
.
HA_SCSI_ID
=
7
;
/* not always ID 7 */
strcpy
(
lpSRB
->
inquiry
.
HA_ManagerId
,
"ASPI for WIN32"
);
/* max 15 chars, don't change */
strcpy
(
lpSRB
->
inquiry
.
HA_Identifier
,
"Wine host"
);
/* FIXME: return host adapter name */
memcpy
(
lpSRB
->
inquiry
.
HA_ManagerId
,
szId
,
sizeof
szId
);
/* max 15 chars, don't change */
memcpy
(
lpSRB
->
inquiry
.
HA_Identifier
,
szWh
,
sizeof
szWh
);
/* FIXME: return host adapter name */
memset
(
lpSRB
->
inquiry
.
HA_Unique
,
0
,
16
);
/* default HA_Unique content */
lpSRB
->
inquiry
.
HA_Unique
[
6
]
=
0x02
;
/* Maximum Transfer Length (128K, Byte> 4-7) */
lpSRB
->
inquiry
.
HA_Unique
[
3
]
=
0x08
;
/* Maximum number of SCSI targets */
...
...
@@ -530,7 +532,7 @@ DWORD __cdecl SendASPI32Command(LPSRB lpSRB)
/* FIXME: We should return SS_NO_DEVICE if the device is not configured */
/* FIXME: We should return SS_INVALID_HA if HostAdapter!=0 */
SRB
tmpsrb
;
char
inqbuf
[
200
];
unsigned
char
inqbuf
[
200
];
DWORD
ret
;
memset
(
&
tmpsrb
,
0
,
sizeof
(
tmpsrb
));
...
...
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