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
aab8fae5
Commit
aab8fae5
authored
Apr 21, 2008
by
Austin English
Committed by
Alexandre Julliard
Apr 21, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Spelling fixes.
parent
35979b92
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
54 additions
and
54 deletions
+54
-54
mciwave.c
dlls/mciwave/mciwave.c
+4
-4
dir.c
dlls/msvcrt/dir.c
+1
-1
rtl.c
dlls/ntdll/tests/rtl.c
+2
-2
string.c
dlls/ntdll/tests/string.c
+1
-1
misc.c
dlls/odbccp32/tests/misc.c
+1
-1
variant.c
dlls/oleaut32/variant.c
+8
-8
vartype.c
dlls/oleaut32/vartype.c
+1
-1
avisplit.c
dlls/quartz/avisplit.c
+2
-2
dsoundrender.c
dlls/quartz/dsoundrender.c
+1
-1
style.c
dlls/riched20/style.c
+1
-1
ndr_marshall.c
dlls/rpcrt4/ndr_marshall.c
+2
-2
confdlg.c
dlls/serialui/confdlg.c
+1
-1
devinst.c
dlls/setupapi/devinst.c
+1
-1
stringtable.c
dlls/setupapi/tests/stringtable.c
+1
-1
virtcopy.c
dlls/setupapi/virtcopy.c
+1
-1
shell.c
dlls/shell32/shell.c
+1
-1
shlfileop.c
dlls/shell32/shlfileop.c
+5
-5
shlfileop.c
dlls/shell32/tests/shlfileop.c
+4
-4
ordinal.c
dlls/shlwapi/ordinal.c
+5
-5
path.c
dlls/shlwapi/path.c
+4
-4
reg.c
dlls/shlwapi/reg.c
+1
-1
resource.h
dlls/shlwapi/resource.h
+1
-1
string.c
dlls/shlwapi/string.c
+2
-2
url.c
dlls/shlwapi/url.c
+2
-2
spoolss.c
dlls/spoolss/tests/spoolss.c
+1
-1
No files found.
dlls/mciwave/mciwave.c
View file @
aab8fae5
...
@@ -1015,11 +1015,11 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_RECORD_PARM
...
@@ -1015,11 +1015,11 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_RECORD_PARM
wmw
->
dwPosition
=
WAVE_ALIGN_ON_BLOCK
(
wmw
,
wmw
->
dwPosition
);
wmw
->
dwPosition
=
WAVE_ALIGN_ON_BLOCK
(
wmw
,
wmw
->
dwPosition
);
wmw
->
ckWaveData
.
cksize
=
WAVE_ALIGN_ON_BLOCK
(
wmw
,
wmw
->
ckWaveData
.
cksize
);
wmw
->
ckWaveData
.
cksize
=
WAVE_ALIGN_ON_BLOCK
(
wmw
,
wmw
->
ckWaveData
.
cksize
);
/*
go back to beginning of
chunk plus the requested position */
/*
Go back to the beginning of the
chunk plus the requested position */
/* FIXME: I'm not sure this is correct, notably because some data linked to
/* FIXME: I'm not sure this is correct, notably because some data linked to
* the decompression state machine will not be correcly initialized.
* the decompression state machine will not be correc
t
ly initialized.
*
t
ry it this way (other way would be to decompress from 0 up to dwPosition
*
T
ry it this way (other way would be to decompress from 0 up to dwPosition
* and to start sending to hWave when dwPosition is reached)
* and to start sending to hWave when dwPosition is reached)
.
*/
*/
mmioSeek
(
wmw
->
hFile
,
wmw
->
ckWaveData
.
dwDataOffset
+
wmw
->
dwPosition
,
SEEK_SET
);
/* >= 0 */
mmioSeek
(
wmw
->
hFile
,
wmw
->
ckWaveData
.
dwDataOffset
+
wmw
->
dwPosition
,
SEEK_SET
);
/* >= 0 */
...
...
dlls/msvcrt/dir.c
View file @
aab8fae5
...
@@ -942,7 +942,7 @@ VOID CDECL _wmakepath(MSVCRT_wchar_t *path, const MSVCRT_wchar_t *drive, const M
...
@@ -942,7 +942,7 @@ VOID CDECL _wmakepath(MSVCRT_wchar_t *path, const MSVCRT_wchar_t *drive, const M
/*********************************************************************
/*********************************************************************
* _searchenv (MSVCRT.@)
* _searchenv (MSVCRT.@)
*
*
* Search for a file in a list of paths from an envronment variable.
* Search for a file in a list of paths from an env
i
ronment variable.
*
*
* PARAMS
* PARAMS
* file [I] Name of the file to search for.
* file [I] Name of the file to search for.
...
...
dlls/ntdll/tests/rtl.c
View file @
aab8fae5
...
@@ -661,7 +661,7 @@ static void test_RtlRandom(void)
...
@@ -661,7 +661,7 @@ static void test_RtlRandom(void)
seed
,
seed_expected
);
seed
,
seed_expected
);
/*
/*
* Seed is set to the same value as before but the result is different.
* Seed is set to the same value as before but the result is different.
* To see more we call RtlRandom ag
g
ain with seed set to 0:
* To see more we call RtlRandom again with seed set to 0:
*/
*/
seed
=
0
;
seed
=
0
;
result_expected
=
0x7fffffc3
;
result_expected
=
0x7fffffc3
;
...
@@ -674,7 +674,7 @@ static void test_RtlRandom(void)
...
@@ -674,7 +674,7 @@ static void test_RtlRandom(void)
"RtlRandom(&seed (seed == 0)) sets seed to %x, expected %x
\n
"
,
"RtlRandom(&seed (seed == 0)) sets seed to %x, expected %x
\n
"
,
seed
,
seed_expected
);
seed
,
seed_expected
);
/*
/*
* Seed is ag
g
ain set to the same value as before. This time we also
* Seed is again set to the same value as before. This time we also
* have the same result as before. Interestingly the value of the
* have the same result as before. Interestingly the value of the
* result is 0x7fffffc3 which is the same value used in RtlUniform
* result is 0x7fffffc3 which is the same value used in RtlUniform
* as const_2. If we do
* as const_2. If we do
...
...
dlls/ntdll/tests/string.c
View file @
aab8fae5
...
@@ -1016,7 +1016,7 @@ static const str2longlong_t str2longlong[] = {
...
@@ -1016,7 +1016,7 @@ static const str2longlong_t str2longlong[] = {
{
"0o7"
,
0
},
/* one digit octal */
{
"0o7"
,
0
},
/* one digit octal */
{
"0o8"
,
0
},
/* empty octal */
{
"0o8"
,
0
},
/* empty octal */
{
"0o"
,
0
},
/* empty octal */
{
"0o"
,
0
},
/* empty octal */
{
"0d1011101100"
,
0
},
/* expli
z
it decimal with 0d */
{
"0d1011101100"
,
0
},
/* expli
c
it decimal with 0d */
{
"x89abcdef"
,
0
},
/* Hex with lower case digits a-f (x-notation) */
{
"x89abcdef"
,
0
},
/* Hex with lower case digits a-f (x-notation) */
{
"xFEDCBA00"
,
0
},
/* Hex with upper case digits A-F (x-notation) */
{
"xFEDCBA00"
,
0
},
/* Hex with upper case digits A-F (x-notation) */
{
"-xFEDCBA00"
,
0
},
/* Negative Hexadecimal (x-notation) */
{
"-xFEDCBA00"
,
0
},
/* Negative Hexadecimal (x-notation) */
...
...
dlls/odbccp32/tests/misc.c
View file @
aab8fae5
...
@@ -58,7 +58,7 @@ static void test_SQLInstallerError(void)
...
@@ -58,7 +58,7 @@ static void test_SQLInstallerError(void)
sql_ret
=
SQLInstallerError
(
0
,
NULL
,
NULL
,
0
,
NULL
);
sql_ret
=
SQLInstallerError
(
0
,
NULL
,
NULL
,
0
,
NULL
);
ok
(
sql_ret
==
SQL_ERROR
,
"SQLInstallerError(0...) failed with %d instead of SQL_ERROR
\n
"
,
sql_ret
);
ok
(
sql_ret
==
SQL_ERROR
,
"SQLInstallerError(0...) failed with %d instead of SQL_ERROR
\n
"
,
sql_ret
);
/* However numbers greater than 8 do not return SQL_ERROR.
/* However numbers greater than 8 do not return SQL_ERROR.
* I am currenly unsure as to whether it should return SQL_NO_DATA or "the same as for error 8";
* I am curren
t
ly unsure as to whether it should return SQL_NO_DATA or "the same as for error 8";
* I have never been able to generate 8 errors to test it
* I have never been able to generate 8 errors to test it
*/
*/
sql_ret
=
SQLInstallerError
(
65535
,
NULL
,
NULL
,
0
,
NULL
);
sql_ret
=
SQLInstallerError
(
65535
,
NULL
,
NULL
,
0
,
NULL
);
...
...
dlls/oleaut32/variant.c
View file @
aab8fae5
...
@@ -2666,8 +2666,8 @@ static HRESULT _VarChangeTypeExWrap (VARIANTARG* pvargDest,
...
@@ -2666,8 +2666,8 @@ static HRESULT _VarChangeTypeExWrap (VARIANTARG* pvargDest,
* Failure: An HRESULT error code indicating the error.
* Failure: An HRESULT error code indicating the error.
*
*
* NOTES
* NOTES
* Native VarCmp up to and including WinXP do
sn't like as input variants
* Native VarCmp up to and including WinXP do
esn't like I1, UI2, VT_UI4,
*
I1, UI2, VT_UI4, UI8 and UINT
. INT is accepted only as left variant.
*
UI8 and UINT as input variants
. INT is accepted only as left variant.
*
*
* If both input variants are ERROR then VARCMP_EQ will be returned, else
* If both input variants are ERROR then VARCMP_EQ will be returned, else
* an ERROR variant will trigger an error.
* an ERROR variant will trigger an error.
...
@@ -3115,10 +3115,10 @@ VarAnd_Exit:
...
@@ -3115,10 +3115,10 @@ VarAnd_Exit:
* Failure: An HRESULT error code indicating the error.
* Failure: An HRESULT error code indicating the error.
*
*
* NOTES
* NOTES
* Native VarAdd up to and including WinXP do
sn't like as input variants
* Native VarAdd up to and including WinXP do
esn't like I1, UI2, UI4,
*
I1, UI2, UI4, UI8, INT and UINT
.
*
UI8, INT and UINT as input variants
.
*
*
* Native VarAdd dosn't check for NULL in/out pointers and crashes. We do the
* Native VarAdd do
e
sn't check for NULL in/out pointers and crashes. We do the
* same here.
* same here.
*
*
* FIXME
* FIXME
...
@@ -3330,10 +3330,10 @@ end:
...
@@ -3330,10 +3330,10 @@ end:
* Failure: An HRESULT error code indicating the error.
* Failure: An HRESULT error code indicating the error.
*
*
* NOTES
* NOTES
* Native VarMul up to and including WinXP do
sn't like as input variants
* Native VarMul up to and including WinXP do
esn't like I1, UI2, UI4,
*
I1, UI2, UI4, UI8, INT and UINT
. But it can multiply apples with oranges.
*
UI8, INT and UINT as input variants
. But it can multiply apples with oranges.
*
*
* Native VarMul dosn't check for NULL in/out pointers and crashes. We do the
* Native VarMul do
e
sn't check for NULL in/out pointers and crashes. We do the
* same here.
* same here.
*
*
* FIXME
* FIXME
...
...
dlls/oleaut32/vartype.c
View file @
aab8fae5
...
@@ -5311,7 +5311,7 @@ static HRESULT VARIANT_DI_normalize(VARIANT_DI * val, int exponent2, int isDoubl
...
@@ -5311,7 +5311,7 @@ static HRESULT VARIANT_DI_normalize(VARIANT_DI * val, int exponent2, int isDoubl
VARIANT_int_add
(
val
->
bitsnum
,
3
,
&
x
,
1
);
VARIANT_int_add
(
val
->
bitsnum
,
3
,
&
x
,
1
);
}
}
}
}
/* This step is requi
e
red in order to remove excess bits of precision from the
/* This step is required in order to remove excess bits of precision from the
end of the bit representation, down to the precision guaranteed by the
end of the bit representation, down to the precision guaranteed by the
floating point number. */
floating point number. */
if
(
isDouble
)
{
if
(
isDouble
)
{
...
...
dlls/quartz/avisplit.c
View file @
aab8fae5
...
@@ -738,7 +738,7 @@ static HRESULT AVISplitter_InitializeStreams(AVISplitterImpl *This)
...
@@ -738,7 +738,7 @@ static HRESULT AVISplitter_InitializeStreams(AVISplitterImpl *This)
nMax
=
This
->
oldindex
->
cb
/
sizeof
(
This
->
oldindex
->
aIndex
[
0
]);
nMax
=
This
->
oldindex
->
cb
/
sizeof
(
This
->
oldindex
->
aIndex
[
0
]);
/* Ok, maybe this is more
an excercize to see if I interpret everything correctly or not, but that is useful for now
*/
/* Ok, maybe this is more
of an excercise to see if I interpret everything correctly or not, but that is useful for now.
*/
for
(
n
=
0
;
n
<
nMax
;
++
n
)
for
(
n
=
0
;
n
<
nMax
;
++
n
)
{
{
DWORD
streamId
=
StreamFromFOURCC
(
This
->
oldindex
->
aIndex
[
n
].
dwChunkId
);
DWORD
streamId
=
StreamFromFOURCC
(
This
->
oldindex
->
aIndex
[
n
].
dwChunkId
);
...
@@ -915,7 +915,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin)
...
@@ -915,7 +915,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin)
IAsyncReader_Length
(
This
->
pReader
,
&
total
,
&
avail
);
IAsyncReader_Length
(
This
->
pReader
,
&
total
,
&
avail
);
/* FIXME: AVIX files are added ("eXtended") beyond the "AVI
" length, and thus won't be played here */
/* FIXME: AVIX files are added ("eXtended") beyond the "AVI" length, and thus won't be played here */
if
(
hr
==
S_OK
)
if
(
hr
==
S_OK
)
{
{
This
->
rtStart
=
pAviSplit
->
CurrentChunkOffset
=
MEDIATIME_FROM_BYTES
(
pos
+
sizeof
(
RIFFLIST
));
This
->
rtStart
=
pAviSplit
->
CurrentChunkOffset
=
MEDIATIME_FROM_BYTES
(
pos
+
sizeof
(
RIFFLIST
));
...
...
dlls/quartz/dsoundrender.c
View file @
aab8fae5
...
@@ -79,7 +79,7 @@ typedef struct DSoundRenderImpl
...
@@ -79,7 +79,7 @@ typedef struct DSoundRenderImpl
long
pan
;
long
pan
;
}
DSoundRenderImpl
;
}
DSoundRenderImpl
;
/* Seeking is not needed for a renderer, rely on newsegment for the appropiate changes */
/* Seeking is not needed for a renderer, rely on newsegment for the approp
r
iate changes */
static
HRESULT
sound_mod_stop
(
IBaseFilter
*
iface
)
static
HRESULT
sound_mod_stop
(
IBaseFilter
*
iface
)
{
{
TRACE
(
"(%p)
\n
"
,
iface
);
TRACE
(
"(%p)
\n
"
,
iface
);
...
...
dlls/riched20/style.c
View file @
aab8fae5
...
@@ -341,7 +341,7 @@ void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt)
...
@@ -341,7 +341,7 @@ void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt)
if
(
lf
->
lfItalic
)
fmt
->
dwEffects
|=
CFM_ITALIC
;
if
(
lf
->
lfItalic
)
fmt
->
dwEffects
|=
CFM_ITALIC
;
if
(
lf
->
lfUnderline
)
fmt
->
dwEffects
|=
CFM_UNDERLINE
;
if
(
lf
->
lfUnderline
)
fmt
->
dwEffects
|=
CFM_UNDERLINE
;
/* notice that if a logfont was created with underline due to CFM_LINK, this
/* notice that if a logfont was created with underline due to CFM_LINK, this
would add an erron
ous CFM_UNDERLINE. This isn't currently ever a problem
*/
would add an erron
eous CFM_UNDERLINE. This isn't currently ever a problem.
*/
if
(
lf
->
lfStrikeOut
)
fmt
->
dwEffects
|=
CFM_STRIKEOUT
;
if
(
lf
->
lfStrikeOut
)
fmt
->
dwEffects
|=
CFM_STRIKEOUT
;
fmt
->
bPitchAndFamily
=
lf
->
lfPitchAndFamily
;
fmt
->
bPitchAndFamily
=
lf
->
lfPitchAndFamily
;
fmt
->
bCharSet
=
lf
->
lfCharSet
;
fmt
->
bCharSet
=
lf
->
lfCharSet
;
...
...
dlls/rpcrt4/ndr_marshall.c
View file @
aab8fae5
...
@@ -1930,7 +1930,7 @@ unsigned char * WINAPI NdrPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
...
@@ -1930,7 +1930,7 @@ unsigned char * WINAPI NdrPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
TRACE
(
"(%p,%p,%p,%d)
\n
"
,
pStubMsg
,
ppMemory
,
pFormat
,
fMustAlloc
);
TRACE
(
"(%p,%p,%p,%d)
\n
"
,
pStubMsg
,
ppMemory
,
pFormat
,
fMustAlloc
);
/*
increm
ement the buffer here instead of in PointerUnmarshall,
/*
Incr
ement the buffer here instead of in PointerUnmarshall,
* as that is used by embedded pointers which already handle the incrementing
* as that is used by embedded pointers which already handle the incrementing
* the buffer, and shouldn't read any additional pointer data from the
* the buffer, and shouldn't read any additional pointer data from the
* buffer */
* buffer */
...
@@ -1957,7 +1957,7 @@ void WINAPI NdrPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
...
@@ -1957,7 +1957,7 @@ void WINAPI NdrPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
{
{
TRACE
(
"(%p,%p,%p)
\n
"
,
pStubMsg
,
pMemory
,
pFormat
);
TRACE
(
"(%p,%p,%p)
\n
"
,
pStubMsg
,
pMemory
,
pFormat
);
/*
increm
ement the buffer length here instead of in PointerBufferSize,
/*
Incr
ement the buffer length here instead of in PointerBufferSize,
* as that is used by embedded pointers which already handle the buffer
* as that is used by embedded pointers which already handle the buffer
* length, and shouldn't write anything more to the wire */
* length, and shouldn't write anything more to the wire */
if
(
*
pFormat
!=
RPC_FC_RP
)
if
(
*
pFormat
!=
RPC_FC_RP
)
...
...
dlls/serialui/confdlg.c
View file @
aab8fae5
...
@@ -168,7 +168,7 @@ static void SERIALUI_AddConfItems(HWND hDlg, DWORD id, LPCPARAM2STR table, DWORD
...
@@ -168,7 +168,7 @@ static void SERIALUI_AddConfItems(HWND hDlg, DWORD id, LPCPARAM2STR table, DWORD
}
}
/*
/*
* Get the current sel
l
ection of the given combo box and set a DCB field to
* Get the current selection of the given combo box and set a DCB field to
* the value matching that selection.
* the value matching that selection.
*/
*/
static
BOOL
SERIALUI_GetConfItems
(
HWND
hDlg
,
DWORD
id
,
LPCPARAM2STR
table
,
LPDWORD
lpdwVal
)
static
BOOL
SERIALUI_GetConfItems
(
HWND
hDlg
,
DWORD
id
,
LPCPARAM2STR
table
,
LPDWORD
lpdwVal
)
...
...
dlls/setupapi/devinst.c
View file @
aab8fae5
...
@@ -1139,7 +1139,7 @@ SetupDiCreateDeviceInfoListExA(const GUID *ClassGuid,
...
@@ -1139,7 +1139,7 @@ SetupDiCreateDeviceInfoListExA(const GUID *ClassGuid,
* Create an empty DeviceInfoSet list.
* Create an empty DeviceInfoSet list.
*
*
* PARAMS
* PARAMS
* ClassGuid [I] if not NULL only devices with GUID Cl
c
assGuid are associated
* ClassGuid [I] if not NULL only devices with GUID ClassGuid are associated
* with this list.
* with this list.
* hwndParent [I] hwnd needed for interface related actions.
* hwndParent [I] hwnd needed for interface related actions.
* MachineName [I] name of machine to create emtpy DeviceInfoSet list, if NULL
* MachineName [I] name of machine to create emtpy DeviceInfoSet list, if NULL
...
...
dlls/setupapi/tests/stringtable.c
View file @
aab8fae5
...
@@ -187,7 +187,7 @@ START_TEST(stringtable)
...
@@ -187,7 +187,7 @@ START_TEST(stringtable)
test_StringTableLookUpString
();
test_StringTableLookUpString
();
test_StringTableStringFromId
();
test_StringTableStringFromId
();
/* assume we can always d
i
stroy */
/* assume we can always d
e
stroy */
pStringTableDestroy
(
table
);
pStringTableDestroy
(
table
);
pStringTableDestroy
(
table2
);
pStringTableDestroy
(
table2
);
}
}
dlls/setupapi/virtcopy.c
View file @
aab8fae5
...
@@ -539,7 +539,7 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest)
...
@@ -539,7 +539,7 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest)
TRACE
(
"(%04x, '%s')
\n
"
,
fl
,
lpszBackupDest
);
TRACE
(
"(%04x, '%s')
\n
"
,
fl
,
lpszBackupDest
);
/* FIXME: needs to sort
virtnode
s in case VCPFL_INSPECIFIEDORDER
/* FIXME: needs to sort
VIRTNODE
s in case VCPFL_INSPECIFIEDORDER
* is not set. This is done by VCP_Callback(VCPM_NODECOMPARE) */
* is not set. This is done by VCP_Callback(VCPM_NODECOMPARE) */
TRACE
(
"#1
\n
"
);
TRACE
(
"#1
\n
"
);
...
...
dlls/shell32/shell.c
View file @
aab8fae5
...
@@ -560,7 +560,7 @@ DWORD WINAPI RegSetValue16( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWO
...
@@ -560,7 +560,7 @@ DWORD WINAPI RegSetValue16( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWO
*
*
* HACK
* HACK
* The 16bit RegQueryValue doesn't handle selectorblocks anyway, so we just
* The 16bit RegQueryValue doesn't handle selectorblocks anyway, so we just
* mask out the high 16 bit. This (not so much incidently) hopefully fixes
* mask out the high 16 bit. This (not so much incident
al
ly) hopefully fixes
* Aldus FH4)
* Aldus FH4)
*/
*/
DWORD
WINAPI
RegQueryValue16
(
HKEY
hkey
,
LPCSTR
name
,
LPSTR
data
,
LPDWORD
count
DWORD
WINAPI
RegQueryValue16
(
HKEY
hkey
,
LPCSTR
name
,
LPSTR
data
,
LPDWORD
count
...
...
dlls/shell32/shlfileop.c
View file @
aab8fae5
...
@@ -649,11 +649,11 @@ static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists)
...
@@ -649,11 +649,11 @@ static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists)
* path [I] path of directory to create
* path [I] path of directory to create
*
*
* RETURNS
* RETURNS
* ERR
R
OR_SUCCESS or one of the following values:
* ERROR_SUCCESS or one of the following values:
* ERROR_BAD_PATHNAME if the path is relative
* ERROR_BAD_PATHNAME if the path is relative
* ERROR_FILE_EXISTS when a file with that name exists
* ERROR_FILE_EXISTS when a file with that name exists
* ERROR_PATH_NOT_FOUND can't find the path, probably invalid
* ERROR_PATH_NOT_FOUND can't find the path, probably invalid
* ERROR_INVLID_NAME if the path contains invalid chars
* ERROR_INV
A
LID_NAME if the path contains invalid chars
* ERROR_ALREADY_EXISTS when the directory already exists
* ERROR_ALREADY_EXISTS when the directory already exists
* ERROR_FILENAME_EXCED_RANGE if the filename was to long to process
* ERROR_FILENAME_EXCED_RANGE if the filename was to long to process
*
*
...
@@ -682,9 +682,9 @@ DWORD WINAPI SHCreateDirectory(HWND hWnd, LPCVOID path)
...
@@ -682,9 +682,9 @@ DWORD WINAPI SHCreateDirectory(HWND hWnd, LPCVOID path)
* sec [I] security attributes to use or NULL
* sec [I] security attributes to use or NULL
*
*
* RETURNS
* RETURNS
* ERR
R
OR_SUCCESS or one of the following values:
* ERROR_SUCCESS or one of the following values:
* ERROR_BAD_PATHNAME or ERROR_PATH_NOT_FOUND if the path is relative
* ERROR_BAD_PATHNAME or ERROR_PATH_NOT_FOUND if the path is relative
* ERROR_INVLID_NAME if the path contains invalid chars
* ERROR_INV
A
LID_NAME if the path contains invalid chars
* ERROR_FILE_EXISTS when a file with that name exists
* ERROR_FILE_EXISTS when a file with that name exists
* ERROR_ALREADY_EXISTS when the directory already exists
* ERROR_ALREADY_EXISTS when the directory already exists
* ERROR_FILENAME_EXCED_RANGE if the filename was to long to process
* ERROR_FILENAME_EXCED_RANGE if the filename was to long to process
...
@@ -1552,7 +1552,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp)
...
@@ -1552,7 +1552,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp)
/*************************************************************************
/*************************************************************************
* SHFreeNameMappings [shell32.246]
* SHFreeNameMappings [shell32.246]
*
*
* Free the mapping handle returned by SHFile
o
peration if FOF_WANTSMAPPINGHANDLE
* Free the mapping handle returned by SHFile
O
peration if FOF_WANTSMAPPINGHANDLE
* was specified.
* was specified.
*
*
* PARAMS
* PARAMS
...
...
dlls/shell32/tests/shlfileop.c
View file @
aab8fae5
...
@@ -809,7 +809,7 @@ static void test_copy(void)
...
@@ -809,7 +809,7 @@ static void test_copy(void)
shfo
.
pFrom
=
"test1.txt
\0
"
;
shfo
.
pFrom
=
"test1.txt
\0
"
;
shfo
.
pTo
=
"test2.txt
\0
"
;
shfo
.
pTo
=
"test2.txt
\0
"
;
shfo
.
fAnyOperationsAborted
=
FALSE
;
shfo
.
fAnyOperationsAborted
=
FALSE
;
/* without FOF_NOCOFIRMATION the confirmation is Yes/No */
/* without FOF_NOCO
N
FIRMATION the confirmation is Yes/No */
retval
=
SHFileOperation
(
&
shfo
);
retval
=
SHFileOperation
(
&
shfo
);
ok
(
retval
==
0
,
"Expected 0, got %d
\n
"
,
retval
);
ok
(
retval
==
0
,
"Expected 0, got %d
\n
"
,
retval
);
ok
(
file_has_content
(
"test2.txt"
,
"test1.txt
\n
"
),
"The file was not copied
\n
"
);
ok
(
file_has_content
(
"test2.txt"
,
"test1.txt
\n
"
),
"The file was not copied
\n
"
);
...
@@ -817,7 +817,7 @@ static void test_copy(void)
...
@@ -817,7 +817,7 @@ static void test_copy(void)
shfo
.
pFrom
=
"test3.txt
\0
test1.txt
\0
"
;
shfo
.
pFrom
=
"test3.txt
\0
test1.txt
\0
"
;
shfo
.
pTo
=
"test2.txt
\0
one.txt
\0
"
;
shfo
.
pTo
=
"test2.txt
\0
one.txt
\0
"
;
shfo
.
fFlags
=
FOF_NOCONFIRMATION
|
FOF_MULTIDESTFILES
;
shfo
.
fFlags
=
FOF_NOCONFIRMATION
|
FOF_MULTIDESTFILES
;
/* without FOF_NOCOFIRMATION the confirmation is Yes/Yes to All/No/Cancel */
/* without FOF_NOCO
N
FIRMATION the confirmation is Yes/Yes to All/No/Cancel */
retval
=
SHFileOperation
(
&
shfo
);
retval
=
SHFileOperation
(
&
shfo
);
ok
(
retval
==
0
,
"Expected 0, got %d
\n
"
,
retval
);
ok
(
retval
==
0
,
"Expected 0, got %d
\n
"
,
retval
);
ok
(
file_has_content
(
"test2.txt"
,
"test3.txt
\n
"
),
"The file was not copied
\n
"
);
ok
(
file_has_content
(
"test2.txt"
,
"test3.txt
\n
"
),
"The file was not copied
\n
"
);
...
@@ -825,7 +825,7 @@ static void test_copy(void)
...
@@ -825,7 +825,7 @@ static void test_copy(void)
shfo
.
pFrom
=
"one.txt
\0
"
;
shfo
.
pFrom
=
"one.txt
\0
"
;
shfo
.
pTo
=
"testdir2
\0
"
;
shfo
.
pTo
=
"testdir2
\0
"
;
shfo
.
fFlags
=
FOF_NOCONFIRMATION
;
shfo
.
fFlags
=
FOF_NOCONFIRMATION
;
/* without FOF_NOCOFIRMATION the confirmation is Yes/No */
/* without FOF_NOCO
N
FIRMATION the confirmation is Yes/No */
retval
=
SHFileOperation
(
&
shfo
);
retval
=
SHFileOperation
(
&
shfo
);
ok
(
retval
==
0
,
"Expected 0, got %d
\n
"
,
retval
);
ok
(
retval
==
0
,
"Expected 0, got %d
\n
"
,
retval
);
ok
(
file_has_content
(
"testdir2
\\
one.txt"
,
"test1.txt
\n
"
),
"The file was not copied
\n
"
);
ok
(
file_has_content
(
"testdir2
\\
one.txt"
,
"test1.txt
\n
"
),
"The file was not copied
\n
"
);
...
@@ -836,7 +836,7 @@ static void test_copy(void)
...
@@ -836,7 +836,7 @@ static void test_copy(void)
shfo
.
fFlags
=
FOF_NOCONFIRMATION
;
shfo
.
fFlags
=
FOF_NOCONFIRMATION
;
ok
(
!
SHFileOperation
(
&
shfo
),
"First SHFileOperation failed
\n
"
);
ok
(
!
SHFileOperation
(
&
shfo
),
"First SHFileOperation failed
\n
"
);
createTestFile
(
"test4.txt
\\
.
\\
test1.txt"
);
/* modify the content of the file */
createTestFile
(
"test4.txt
\\
.
\\
test1.txt"
);
/* modify the content of the file */
/* without FOF_NOCOFIRMATION the confirmation is "This folder already contains a folder named ..." */
/* without FOF_NOCO
N
FIRMATION the confirmation is "This folder already contains a folder named ..." */
retval
=
SHFileOperation
(
&
shfo
);
retval
=
SHFileOperation
(
&
shfo
);
ok
(
retval
==
0
,
"Expected 0, got %d
\n
"
,
retval
);
ok
(
retval
==
0
,
"Expected 0, got %d
\n
"
,
retval
);
ok
(
file_has_content
(
"testdir2
\\
test4.txt
\\
test1.txt"
,
"test4.txt
\\
.
\\
test1.txt
\n
"
),
"The file was not copied
\n
"
);
ok
(
file_has_content
(
"testdir2
\\
test4.txt
\\
test1.txt"
,
"test4.txt
\\
.
\\
test1.txt
\n
"
),
"The file was not copied
\n
"
);
...
...
dlls/shlwapi/ordinal.c
View file @
aab8fae5
...
@@ -62,7 +62,7 @@ HRESULT WINAPI SHInvokeCommand(HWND,IShellFolder*,LPCITEMIDLIST,BOOL);
...
@@ -62,7 +62,7 @@ HRESULT WINAPI SHInvokeCommand(HWND,IShellFolder*,LPCITEMIDLIST,BOOL);
BOOL
WINAPI
SHAboutInfoW
(
LPWSTR
,
DWORD
);
BOOL
WINAPI
SHAboutInfoW
(
LPWSTR
,
DWORD
);
/*
/*
NOTES: Most functions exported by ordinal seem to be superflous.
NOTES: Most functions exported by ordinal seem to be superfl
u
ous.
The reason for these functions to be there is to provide a wrapper
The reason for these functions to be there is to provide a wrapper
for unicode functions to provide these functions on systems without
for unicode functions to provide these functions on systems without
unicode functions eg. win95/win98. Since we have such functions we just
unicode functions eg. win95/win98. Since we have such functions we just
...
@@ -1959,7 +1959,7 @@ DWORD WINAPI SHFillRectClr(HDC hDC, LPCRECT pRect, COLORREF cRef)
...
@@ -1959,7 +1959,7 @@ DWORD WINAPI SHFillRectClr(HDC hDC, LPCRECT pRect, COLORREF cRef)
/*************************************************************************
/*************************************************************************
* @ [SHLWAPI.198]
* @ [SHLWAPI.198]
*
*
* Return the value asociated with a key in a map.
* Return the value as
s
ociated with a key in a map.
*
*
* PARAMS
* PARAMS
* lpKeys [I] A list of keys of length iLen
* lpKeys [I] A list of keys of length iLen
...
@@ -2101,7 +2101,7 @@ typedef struct
...
@@ -2101,7 +2101,7 @@ typedef struct
/*************************************************************************
/*************************************************************************
* @ [SHLWAPI.208]
* @ [SHLWAPI.208]
*
*
* Initialize an FDSA arra
ry.
* Initialize an FDSA arra
y.
*/
*/
BOOL
WINAPI
FDSA_Initialize
(
DWORD
block_size
,
DWORD
inc
,
FDSA_info
*
info
,
void
*
mem
,
BOOL
WINAPI
FDSA_Initialize
(
DWORD
block_size
,
DWORD
inc
,
FDSA_info
*
info
,
void
*
mem
,
DWORD
init_blocks
)
DWORD
init_blocks
)
...
@@ -2543,7 +2543,7 @@ DWORD WINAPI SHGetRestriction(LPCWSTR lpSubKey, LPCWSTR lpSubName, LPCWSTR lpVal
...
@@ -2543,7 +2543,7 @@ DWORD WINAPI SHGetRestriction(LPCWSTR lpSubKey, LPCWSTR lpSubName, LPCWSTR lpVal
* NOTES
* NOTES
* This function is used by the native SHRestricted function to search for the
* This function is used by the native SHRestricted function to search for the
* policy and cache it once retrieved. The current Wine implementation uses a
* policy and cache it once retrieved. The current Wine implementation uses a
* different POLICYDATA structure and implements a similar algorithm
e
adapted to
* different POLICYDATA structure and implements a similar algorithm adapted to
* that structure.
* that structure.
*/
*/
DWORD
WINAPI
SHRestrictionLookup
(
DWORD
WINAPI
SHRestrictionLookup
(
...
@@ -3433,7 +3433,7 @@ COLORREF WINAPI ColorAdjustLuma(COLORREF cRGB, int dwLuma, BOOL bUnknown)
...
@@ -3433,7 +3433,7 @@ COLORREF WINAPI ColorAdjustLuma(COLORREF cRGB, int dwLuma, BOOL bUnknown)
FIXME
(
"Ignoring luma adjustment
\n
"
);
FIXME
(
"Ignoring luma adjustment
\n
"
);
/* FIXME: The a
jd
ustment is not linear */
/* FIXME: The a
dj
ustment is not linear */
cRGB
=
ColorHLSToRGB
(
wH
,
wL
,
wS
);
cRGB
=
ColorHLSToRGB
(
wH
,
wL
,
wS
);
}
}
...
...
dlls/shlwapi/path.c
View file @
aab8fae5
...
@@ -894,7 +894,7 @@ VOID WINAPI PathRemoveBlanksW(LPWSTR lpszPath)
...
@@ -894,7 +894,7 @@ VOID WINAPI PathRemoveBlanksW(LPWSTR lpszPath)
/*************************************************************************
/*************************************************************************
* PathQuoteSpacesA [SHLWAPI.@]
* PathQuoteSpacesA [SHLWAPI.@]
*
*
* Surround a path containg spaces in quotes.
* Surround a path contain
in
g spaces in quotes.
*
*
* PARAMS
* PARAMS
* lpszPath [I/O] Path to quote
* lpszPath [I/O] Path to quote
...
@@ -2040,7 +2040,7 @@ BOOL WINAPI PathIsContentTypeW(LPCWSTR lpszPath, LPCWSTR lpszContentType)
...
@@ -2040,7 +2040,7 @@ BOOL WINAPI PathIsContentTypeW(LPCWSTR lpszPath, LPCWSTR lpszContentType)
* Determine if a path is a file specification.
* Determine if a path is a file specification.
*
*
* PARAMS
* PARAMS
* lpszPath [I] Path to ch
a
ck
* lpszPath [I] Path to ch
e
ck
*
*
* RETURNS
* RETURNS
* TRUE If lpszPath is a file specification (i.e. Contains no directories).
* TRUE If lpszPath is a file specification (i.e. Contains no directories).
...
@@ -2323,7 +2323,7 @@ BOOL WINAPI PathIsUNCServerShareW(LPCWSTR lpszPath)
...
@@ -2323,7 +2323,7 @@ BOOL WINAPI PathIsUNCServerShareW(LPCWSTR lpszPath)
*
*
* PARAMS
* PARAMS
* lpszBuf [O] Output path
* lpszBuf [O] Output path
* lpszPath [I] Path to cnonicalize
* lpszPath [I] Path to c
a
nonicalize
*
*
* RETURNS
* RETURNS
* Success: TRUE. lpszBuf contains the output path,
* Success: TRUE. lpszBuf contains the output path,
...
@@ -3344,7 +3344,7 @@ HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath,
...
@@ -3344,7 +3344,7 @@ HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath,
*
*
* RETURNS
* RETURNS
* TRUE If a relative path can be formed. lpszPath contains the new path
* TRUE If a relative path can be formed. lpszPath contains the new path
* FALSE If the paths are not rela
v
tive or any parameters are invalid
* FALSE If the paths are not relative or any parameters are invalid
*
*
* NOTES
* NOTES
* lpszTo should be at least MAX_PATH in length.
* lpszTo should be at least MAX_PATH in length.
...
...
dlls/shlwapi/reg.c
View file @
aab8fae5
...
@@ -215,7 +215,7 @@ LONG WINAPI SHRegCloseUSKey(
...
@@ -215,7 +215,7 @@ LONG WINAPI SHRegCloseUSKey(
* pszPath [I] Key name to create or open.
* pszPath [I] Key name to create or open.
* samDesired [I] Wanted security access.
* samDesired [I] Wanted security access.
* hRelativeUSKey [I] Base path if pszPath is relative. NULL otherwise.
* hRelativeUSKey [I] Base path if pszPath is relative. NULL otherwise.
* phNewUSKey [O] Receives a handle to the new or opene
ne
d key.
* phNewUSKey [O] Receives a handle to the new or opened key.
* dwFlags [I] Base key under which the key should be opened.
* dwFlags [I] Base key under which the key should be opened.
*
*
* RETURNS
* RETURNS
...
...
dlls/shlwapi/resource.h
View file @
aab8fae5
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
#define IDS_TIME_INTERVAL_MINUTES 66
#define IDS_TIME_INTERVAL_MINUTES 66
#define IDS_TIME_INTERVAL_SECONDS 67
#define IDS_TIME_INTERVAL_SECONDS 67
/* These numbers match native ID's and shouldn't be abitrarily changed */
/* These numbers match native ID's and shouldn't be a
r
bitrarily changed */
#define IDD_ERR_DIALOG 0x1200
#define IDD_ERR_DIALOG 0x1200
#define IDS_ERR_USER_MSG 0x1201
#define IDS_ERR_USER_MSG 0x1201
#define IDC_ERR_DONT_SHOW 0x1202
#define IDC_ERR_DONT_SHOW 0x1202
...
...
dlls/shlwapi/string.c
View file @
aab8fae5
...
@@ -445,11 +445,11 @@ int WINAPI StrCmpW(LPCWSTR lpszStr, LPCWSTR lpszComp)
...
@@ -445,11 +445,11 @@ int WINAPI StrCmpW(LPCWSTR lpszStr, LPCWSTR lpszComp)
/*************************************************************************
/*************************************************************************
* StrCatW [SHLWAPI.@]
* StrCatW [SHLWAPI.@]
*
*
* Concat
a
nate two strings.
* Concat
e
nate two strings.
*
*
* PARAMS
* PARAMS
* lpszStr [O] Initial string
* lpszStr [O] Initial string
* lpszSrc [I] String to concat
a
nate
* lpszSrc [I] String to concat
e
nate
*
*
* RETURNS
* RETURNS
* lpszStr.
* lpszStr.
...
...
dlls/shlwapi/url.c
View file @
aab8fae5
...
@@ -750,7 +750,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
...
@@ -750,7 +750,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
}
}
process_case
=
1
;
process_case
=
1
;
break
;
break
;
}
while
(
FALSE
);
/* a litte trick to allow easy exit from nested if's */
}
while
(
FALSE
);
/* a litt
l
e trick to allow easy exit from nested if's */
ret
=
S_OK
;
ret
=
S_OK
;
switch
(
process_case
)
{
switch
(
process_case
)
{
...
@@ -2312,7 +2312,7 @@ HRESULT WINAPI SHAutoComplete(HWND hwndEdit, DWORD dwFlags)
...
@@ -2312,7 +2312,7 @@ HRESULT WINAPI SHAutoComplete(HWND hwndEdit, DWORD dwFlags)
* dwDestLen [I] Length of lpszDest
* dwDestLen [I] Length of lpszDest
*
*
* RETURNS
* RETURNS
* Success: S_OK. lpszDest con
s
tains the resource Url.
* Success: S_OK. lpszDest contains the resource Url.
* Failure: E_INVALIDARG, if any argument is invalid, or
* Failure: E_INVALIDARG, if any argument is invalid, or
* E_FAIL if dwDestLen is too small.
* E_FAIL if dwDestLen is too small.
*/
*/
...
...
dlls/spoolss/tests/spoolss.c
View file @
aab8fae5
...
@@ -109,7 +109,7 @@ static void test_BuildOtherNamesFromMachineName(void)
...
@@ -109,7 +109,7 @@ static void test_BuildOtherNamesFromMachineName(void)
/* An array with 3 stringpointer is returned:
/* An array with 3 stringpointer is returned:
entry_#0: "" (empty String)
entry_#0: "" (empty String)
entry_#1: <hostname> (this is the same as the computernam)
entry_#1: <hostname> (this is the same as the computernam
e
)
entry_#2: <ip-address> (string with the ip-address of <hostname>)
entry_#2: <ip-address> (string with the ip-address of <hostname>)
*/
*/
todo_wine
todo_wine
...
...
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