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
d3672524
Commit
d3672524
authored
Oct 01, 2013
by
Francois Gouget
Committed by
Alexandre Julliard
Oct 01, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Assorted spelling fixes.
parent
b0755344
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
19 deletions
+19
-19
trackbar.c
dlls/comctl32/tests/trackbar.c
+1
-1
font.c
dlls/gdi32/tests/font.c
+1
-1
imm32.c
dlls/imm32/tests/imm32.c
+1
-1
console.c
dlls/kernel32/tests/console.c
+3
-3
nsiface.idl
dlls/mshtml/nsiface.idl
+1
-1
htmldoc.c
dlls/mshtml/tests/htmldoc.c
+11
-11
utils.c
tools/winebuild/utils.c
+1
-1
No files found.
dlls/comctl32/tests/trackbar.c
View file @
d3672524
...
@@ -731,7 +731,7 @@ static void test_selection(HWND hWndTrackbar){
...
@@ -731,7 +731,7 @@ static void test_selection(HWND hWndTrackbar){
expect
(
8
,
r
);
expect
(
8
,
r
);
ok_sequence
(
sequences
,
TRACKBAR_SEQ_INDEX
,
selection_test_seq
,
"selection test sequence"
,
TRUE
);
ok_sequence
(
sequences
,
TRACKBAR_SEQ_INDEX
,
selection_test_seq
,
"selection test sequence"
,
TRUE
);
ok_sequence
(
sequences
,
PARENT_SEQ_INDEX
,
parent_selection_test_seq
,
"parent selection test seqence"
,
TRUE
);
ok_sequence
(
sequences
,
PARENT_SEQ_INDEX
,
parent_selection_test_seq
,
"parent selection test seq
u
ence"
,
TRUE
);
}
}
static
void
test_thumb_length
(
HWND
hWndTrackbar
){
static
void
test_thumb_length
(
HWND
hWndTrackbar
){
...
...
dlls/gdi32/tests/font.c
View file @
d3672524
...
@@ -1304,7 +1304,7 @@ static void test_GetCharABCWidths(void)
...
@@ -1304,7 +1304,7 @@ static void test_GetCharABCWidths(void)
strcpy
(
lf
.
lfFaceName
,
"Tahoma"
);
strcpy
(
lf
.
lfFaceName
,
"Tahoma"
);
lf
.
lfHeight
=
20
;
lf
.
lfHeight
=
20
;
trace
(
"ABC sign test for a varity of transforms:
\n
"
);
trace
(
"ABC sign test for a vari
e
ty of transforms:
\n
"
);
hfont
=
CreateFontIndirectA
(
&
lf
);
hfont
=
CreateFontIndirectA
(
&
lf
);
hwnd
=
CreateWindowEx
(
0
,
"static"
,
""
,
WS_POPUP
,
0
,
0
,
100
,
100
,
hwnd
=
CreateWindowEx
(
0
,
"static"
,
""
,
WS_POPUP
,
0
,
0
,
100
,
100
,
0
,
0
,
0
,
NULL
);
0
,
0
,
0
,
NULL
);
...
...
dlls/imm32/tests/imm32.c
View file @
d3672524
...
@@ -1056,7 +1056,7 @@ static void test_InvalidIMC(void)
...
@@ -1056,7 +1056,7 @@ static void test_InvalidIMC(void)
imc2
=
ImmGetContext
(
hwnd
);
imc2
=
ImmGetContext
(
hwnd
);
ok
(
imc1
==
imc2
,
"imc should not changed! imc1 %p, imc2 %p
\n
"
,
imc1
,
imc2
);
ok
(
imc1
==
imc2
,
"imc should not changed! imc1 %p, imc2 %p
\n
"
,
imc1
,
imc2
);
/* Test associating NULL imc, which is different
to
invalid imc */
/* Test associating NULL imc, which is different
from an
invalid imc */
oldimc
=
ImmAssociateContext
(
hwnd
,
imc_null
);
oldimc
=
ImmAssociateContext
(
hwnd
,
imc_null
);
ok
(
oldimc
!=
NULL
,
"Associating to NULL imc should success!
\n
"
);
ok
(
oldimc
!=
NULL
,
"Associating to NULL imc should success!
\n
"
);
imc2
=
ImmGetContext
(
hwnd
);
imc2
=
ImmGetContext
(
hwnd
);
...
...
dlls/kernel32/tests/console.c
View file @
d3672524
...
@@ -458,7 +458,7 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize)
...
@@ -458,7 +458,7 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize)
static
void
testWrite
(
HANDLE
hCon
,
COORD
sbSize
)
static
void
testWrite
(
HANDLE
hCon
,
COORD
sbSize
)
{
{
/* FIXME: should in fact
insure that the sb is at least 10 character
wide */
/* FIXME: should in fact
ensure that the sb is at least 10 characters
wide */
ok
(
SetConsoleTextAttribute
(
hCon
,
TEST_ATTRIB
),
"Setting default text color
\n
"
);
ok
(
SetConsoleTextAttribute
(
hCon
,
TEST_ATTRIB
),
"Setting default text color
\n
"
);
resetContent
(
hCon
,
sbSize
,
FALSE
);
resetContent
(
hCon
,
sbSize
,
FALSE
);
testEmptyWrite
(
hCon
);
testEmptyWrite
(
hCon
);
...
@@ -654,8 +654,8 @@ static void testCtrlHandler(void)
...
@@ -654,8 +654,8 @@ static void testCtrlHandler(void)
ok
(
!
SetConsoleCtrlHandler
(
mch
,
FALSE
),
"Shouldn't succeed
\n
"
);
ok
(
!
SetConsoleCtrlHandler
(
mch
,
FALSE
),
"Shouldn't succeed
\n
"
);
ok
(
GetLastError
()
==
ERROR_INVALID_PARAMETER
,
"Bad error %u
\n
"
,
GetLastError
());
ok
(
GetLastError
()
==
ERROR_INVALID_PARAMETER
,
"Bad error %u
\n
"
,
GetLastError
());
ok
(
SetConsoleCtrlHandler
(
mch
,
TRUE
),
"Couldn't set handler
\n
"
);
ok
(
SetConsoleCtrlHandler
(
mch
,
TRUE
),
"Couldn't set handler
\n
"
);
/* wine requires the event for the test, as we cannot
insure, so far, that even
t
/* wine requires the event for the test, as we cannot
ensure, so far, tha
t
* are processed synchronously in GenerateConsoleCtrlEvent()
*
events
are processed synchronously in GenerateConsoleCtrlEvent()
*/
*/
mch_event
=
CreateEventA
(
NULL
,
TRUE
,
FALSE
,
NULL
);
mch_event
=
CreateEventA
(
NULL
,
TRUE
,
FALSE
,
NULL
);
mch_count
=
0
;
mch_count
=
0
;
...
...
dlls/mshtml/nsiface.idl
View file @
d3672524
...
@@ -3692,7 +3692,7 @@ interface nsIDocShell : nsIDocShellTreeItem
...
@@ -3692,7 +3692,7 @@ interface nsIDocShell : nsIDocShellTreeItem
nsresult
GetHasEditingSession
(
bool
*
aHasEditingSession
)
;
nsresult
GetHasEditingSession
(
bool
*
aHasEditingSession
)
;
nsresult
MakeEditable
(
bool
inWaitForUriLoad
)
;
nsresult
MakeEditable
(
bool
inWaitForUriLoad
)
;
nsresult
GetChildSHEntry
(
int32_t
aChildOffset
,
nsISHEntry
**
_retval
)
;
nsresult
GetChildSHEntry
(
int32_t
aChildOffset
,
nsISHEntry
**
_retval
)
;
nsresult
AddChildSHEntry
(
nsISHEntry
*
aCloneReference
,
nsISHEntry
*
aHistoryEntry
,
int32_t
aChildOffset
,
uint32_t
aLoadType
,
bool
aCloneChilden
)
;
nsresult
AddChildSHEntry
(
nsISHEntry
*
aCloneReference
,
nsISHEntry
*
aHistoryEntry
,
int32_t
aChildOffset
,
uint32_t
aLoadType
,
bool
aCloneChild
r
en
)
;
nsresult
GetUseGlobalHistory
(
bool
*
aUseGlobalHistory
)
;
nsresult
GetUseGlobalHistory
(
bool
*
aUseGlobalHistory
)
;
nsresult
SetUseGlobalHistory
(
bool
aUseGlobalHistory
)
;
nsresult
SetUseGlobalHistory
(
bool
aUseGlobalHistory
)
;
nsresult
RemoveFromSessionHistory
()
;
nsresult
RemoveFromSessionHistory
()
;
...
...
dlls/mshtml/tests/htmldoc.c
View file @
d3672524
...
@@ -219,7 +219,7 @@ static BOOL asynchronous_binding = FALSE;
...
@@ -219,7 +219,7 @@ static BOOL asynchronous_binding = FALSE;
static
BOOL
support_wbapp
,
allow_new_window
,
no_travellog
;
static
BOOL
support_wbapp
,
allow_new_window
,
no_travellog
;
static
BOOL
report_mime
;
static
BOOL
report_mime
;
static
BOOL
testing_submit
;
static
BOOL
testing_submit
;
static
BOOL
reseting_document
;
static
BOOL
reset
t
ing_document
;
static
int
stream_read
,
protocol_read
;
static
int
stream_read
,
protocol_read
;
static
IStream
*
history_stream
;
static
IStream
*
history_stream
;
static
enum
load_state_t
{
static
enum
load_state_t
{
...
@@ -950,7 +950,7 @@ static ULONG WINAPI PropertyNotifySink_Release(IPropertyNotifySink *iface)
...
@@ -950,7 +950,7 @@ static ULONG WINAPI PropertyNotifySink_Release(IPropertyNotifySink *iface)
static
HRESULT
WINAPI
PropertyNotifySink_OnChanged
(
IPropertyNotifySink
*
iface
,
DISPID
dispID
)
static
HRESULT
WINAPI
PropertyNotifySink_OnChanged
(
IPropertyNotifySink
*
iface
,
DISPID
dispID
)
{
{
if
(
reseting_document
)
if
(
reset
t
ing_document
)
return
S_OK
;
return
S_OK
;
switch
(
dispID
)
{
switch
(
dispID
)
{
...
@@ -1853,7 +1853,7 @@ static HRESULT WINAPI InPlaceFrame_RemoveMenus(IOleInPlaceFrame *iface, HMENU hm
...
@@ -1853,7 +1853,7 @@ static HRESULT WINAPI InPlaceFrame_RemoveMenus(IOleInPlaceFrame *iface, HMENU hm
static
HRESULT
WINAPI
InPlaceFrame_SetStatusText
(
IOleInPlaceFrame
*
iface
,
LPCOLESTR
pszStatusText
)
static
HRESULT
WINAPI
InPlaceFrame_SetStatusText
(
IOleInPlaceFrame
*
iface
,
LPCOLESTR
pszStatusText
)
{
{
if
(
!
reseting_document
)
if
(
!
reset
t
ing_document
)
CHECK_EXPECT2
(
SetStatusText
);
CHECK_EXPECT2
(
SetStatusText
);
if
(
!
expect_status_text
)
if
(
!
expect_status_text
)
ok
(
pszStatusText
==
NULL
,
"pszStatusText=%p, expected NULL
\n
"
,
pszStatusText
);
ok
(
pszStatusText
==
NULL
,
"pszStatusText=%p, expected NULL
\n
"
,
pszStatusText
);
...
@@ -2490,7 +2490,7 @@ static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface
...
@@ -2490,7 +2490,7 @@ static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface
static
HRESULT
WINAPI
DocHostUIHandler_GetHostInfo
(
IDocHostUIHandler2
*
iface
,
DOCHOSTUIINFO
*
pInfo
)
static
HRESULT
WINAPI
DocHostUIHandler_GetHostInfo
(
IDocHostUIHandler2
*
iface
,
DOCHOSTUIINFO
*
pInfo
)
{
{
if
(
!
reseting_document
)
if
(
!
reset
t
ing_document
)
CHECK_EXPECT
(
GetHostInfo
);
CHECK_EXPECT
(
GetHostInfo
);
ok
(
iface
==
expect_uihandler_iface
,
"called on unexpected iface
\n
"
);
ok
(
iface
==
expect_uihandler_iface
,
"called on unexpected iface
\n
"
);
ok
(
pInfo
!=
NULL
,
"pInfo=NULL
\n
"
);
ok
(
pInfo
!=
NULL
,
"pInfo=NULL
\n
"
);
...
@@ -2783,7 +2783,7 @@ static void test_save_history(IUnknown *unk)
...
@@ -2783,7 +2783,7 @@ static void test_save_history(IUnknown *unk)
static
HRESULT
WINAPI
OleCommandTarget_Exec
(
IOleCommandTarget
*
iface
,
const
GUID
*
pguidCmdGroup
,
static
HRESULT
WINAPI
OleCommandTarget_Exec
(
IOleCommandTarget
*
iface
,
const
GUID
*
pguidCmdGroup
,
DWORD
nCmdID
,
DWORD
nCmdexecopt
,
VARIANT
*
pvaIn
,
VARIANT
*
pvaOut
)
DWORD
nCmdID
,
DWORD
nCmdexecopt
,
VARIANT
*
pvaIn
,
VARIANT
*
pvaOut
)
{
{
if
(
reseting_document
)
if
(
reset
t
ing_document
)
return
E_FAIL
;
return
E_FAIL
;
if
(
!
pguidCmdGroup
)
{
if
(
!
pguidCmdGroup
)
{
...
@@ -3160,7 +3160,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF
...
@@ -3160,7 +3160,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF
LCID
lcid
,
WORD
wFlags
,
DISPPARAMS
*
pDispParams
,
VARIANT
*
pVarResult
,
LCID
lcid
,
WORD
wFlags
,
DISPPARAMS
*
pDispParams
,
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
{
if
(
reseting_document
)
if
(
reset
t
ing_document
)
return
E_FAIL
;
return
E_FAIL
;
ok
(
IsEqualGUID
(
&
IID_NULL
,
riid
),
"riid != IID_NULL
\n
"
);
ok
(
IsEqualGUID
(
&
IID_NULL
,
riid
),
"riid != IID_NULL
\n
"
);
...
@@ -3231,7 +3231,7 @@ static HRESULT WINAPI EventDispatch_Invoke(IDispatch *iface, DISPID dispIdMember
...
@@ -3231,7 +3231,7 @@ static HRESULT WINAPI EventDispatch_Invoke(IDispatch *iface, DISPID dispIdMember
IHTMLDocument2
*
doc
;
IHTMLDocument2
*
doc
;
BSTR
state
;
BSTR
state
;
if
(
reseting_document
)
if
(
reset
t
ing_document
)
return
E_FAIL
;
return
E_FAIL
;
ok
(
IsEqualGUID
(
&
IID_NULL
,
riid
),
"riid = %s
\n
"
,
debugstr_guid
(
riid
));
ok
(
IsEqualGUID
(
&
IID_NULL
,
riid
),
"riid = %s
\n
"
,
debugstr_guid
(
riid
));
...
@@ -3514,7 +3514,7 @@ static HRESULT WINAPI DocObjectService_GetPendingUrl(
...
@@ -3514,7 +3514,7 @@ static HRESULT WINAPI DocObjectService_GetPendingUrl(
IDocObjectService
*
This
,
IDocObjectService
*
This
,
BSTR
*
pbstrPendingUrl
)
BSTR
*
pbstrPendingUrl
)
{
{
if
(
!
reseting_document
)
if
(
!
reset
t
ing_document
)
CHECK_EXPECT
(
GetPendingUrl
);
CHECK_EXPECT
(
GetPendingUrl
);
return
E_NOTIMPL
;
return
E_NOTIMPL
;
}
}
...
@@ -5294,7 +5294,7 @@ static void _test_readyState(unsigned line, IUnknown *unk)
...
@@ -5294,7 +5294,7 @@ static void _test_readyState(unsigned line, IUnknown *unk)
"uninitialized"
"uninitialized"
};
};
if
(
open_call
||
reseting_document
)
if
(
open_call
||
reset
t
ing_document
)
return
;
/* FIXME */
return
;
/* FIXME */
if
(
!
unk
)
if
(
!
unk
)
...
@@ -7679,12 +7679,12 @@ static void reset_document(IHTMLDocument2 *doc)
...
@@ -7679,12 +7679,12 @@ static void reset_document(IHTMLDocument2 *doc)
if
(
FAILED
(
hres
))
if
(
FAILED
(
hres
))
return
;
return
;
reseting_document
=
TRUE
;
reset
t
ing_document
=
TRUE
;
hres
=
IPersistStreamInit_InitNew
(
init
);
hres
=
IPersistStreamInit_InitNew
(
init
);
ok
(
hres
==
S_OK
,
"Load failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"Load failed: %08x
\n
"
,
hres
);
reseting_document
=
FALSE
;
reset
t
ing_document
=
FALSE
;
test_GetCurMoniker
((
IUnknown
*
)
doc
,
NULL
,
"about:blank"
,
FALSE
);
test_GetCurMoniker
((
IUnknown
*
)
doc
,
NULL
,
"about:blank"
,
FALSE
);
...
...
tools/winebuild/utils.c
View file @
d3672524
...
@@ -473,7 +473,7 @@ const char *get_nm_command(void)
...
@@ -473,7 +473,7 @@ const char *get_nm_command(void)
if
(
!
nm_command
)
if
(
!
nm_command
)
fatal_error
(
"cannot find suitable name lister
\n
"
);
fatal_error
(
"cannot find suitable name lister
\n
"
);
if
(
nm_command
->
count
>
1
)
if
(
nm_command
->
count
>
1
)
fatal_error
(
"multiple argu
em
nts in nm command not supported yet
\n
"
);
fatal_error
(
"multiple argu
me
nts in nm command not supported yet
\n
"
);
return
nm_command
->
str
[
0
];
return
nm_command
->
str
[
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