Module: wine
Branch: refs/heads/master
Commit: 4aa6418d5144bb33d50e4a9b958811f8d79ea2aa
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4aa6418d5144bb33d50e4a9…
Author: Francois Gouget <fgouget(a)free.fr>
Date: Fri Feb 24 16:11:36 2006 +0100
Assorted spelling fixes.
---
dlls/user/tests/menu.c | 2 +-
dlls/winmm/wavemap/wavemap.c | 4 ++--
dlls/winmm/winealsa/midi.c | 2 +-
programs/winecfg/theme.c | 2 +-
server/change.c | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/user/tests/menu.c b/dlls/user/tests/menu.c
index 45c1b06..7de5d6d 100644
--- a/dlls/user/tests/menu.c
+++ b/dlls/user/tests/menu.c
@@ -60,7 +60,7 @@ static LRESULT WINAPI menu_check_wnd_pro
/* menu texts with their sizes */
static struct {
char *text;
- SIZE size; /* size of text upto any \t */
+ SIZE size; /* size of text up to any \t */
SIZE sc_size; /* size of the short-cut */
} MOD_txtsizes[] = {
{ "Pinot &Noir" },
diff --git a/dlls/winmm/wavemap/wavemap.c b/dlls/winmm/wavemap/wavemap.c
index 7189352..c01be8c 100644
--- a/dlls/winmm/wavemap/wavemap.c
+++ b/dlls/winmm/wavemap/wavemap.c
@@ -453,7 +453,7 @@ static DWORD wodGetPosition(WAVEMAPDATA*
DWORD remainder = 0;
/* If we are up sampling (going from lower sample rate to higher),
- ** we need to make a special accomodation for times when we've
+ ** we need to make a special accommodation for times when we've
** written a partial output sample. This happens frequently
** to us because we use msacm to do our up sampling, and it
** will up sample on an unaligned basis.
@@ -1007,7 +1007,7 @@ static DWORD widGetPosition(WAVEMAPDATA*
DWORD remainder = 0;
/* If we are up sampling (going from lower sample rate to higher),
- ** we need to make a special accomodation for times when we've
+ ** we need to make a special accommodation for times when we've
** written a partial output sample. This happens frequently
** to us because we use msacm to do our up sampling, and it
** will up sample on an unaligned basis.
diff --git a/dlls/winmm/winealsa/midi.c b/dlls/winmm/winealsa/midi.c
index c815ecb..f92dc47 100644
--- a/dlls/winmm/winealsa/midi.c
+++ b/dlls/winmm/winealsa/midi.c
@@ -945,7 +945,7 @@ static DWORD modLongData(WORD wDevID, LP
* If the latest is true, then the following WARNing will fire up
*/
if (lpData[0] != 0xF0 || lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) {
- WARN("Alledged system exclusive buffer is not correct\n\tPlease report with MIDI file\n");
+ WARN("Alleged system exclusive buffer is not correct\n\tPlease report with MIDI file\n");
lpNewData = HeapAlloc(GetProcessHeap(), 0, lpMidiHdr->dwBufferLength + 2);
}
diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c
index e3d53b2..d819552 100644
--- a/programs/winecfg/theme.c
+++ b/programs/winecfg/theme.c
@@ -767,7 +767,7 @@ static void apply_shell_folder_changes()
HRESULT hr;
for (i=0; i<NUM_ELEMS(asfiInfo); i++) {
- /* Ignore non existent link targets */
+ /* Ignore nonexistent link targets */
if (asfiInfo[i].szLinkTarget[0] && stat(asfiInfo[i].szLinkTarget, &statPath))
continue;
diff --git a/server/change.c b/server/change.c
index 4a8d222..cef1c3e 100644
--- a/server/change.c
+++ b/server/change.c
@@ -777,9 +777,9 @@ static void inotify_notify_all( struct i
action = FILE_ACTION_MODIFIED;
/*
- * Work our way up the inode heirachy
+ * Work our way up the inode hierarchy
* extending the relative path as we go
- * and notifyiny all recursive watches.
+ * and notifying all recursive watches.
*/
if (!prepend( &path, ie->name ))
return;
Module: wine
Branch: refs/heads/master
Commit: a323238301e600669d9b17a5b0f41da9e45e1901
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a323238301e600669d9b17a…
Author: Francois Gouget <fgouget(a)free.fr>
Date: Fri Feb 24 15:49:20 2006 +0100
d3d8: Remove spaces before '\n', spelling fix.
---
dlls/d3d8/device.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index b41c83f..5db038b 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -817,13 +817,13 @@ HRESULT WINAPI IDirect3DDevice8Impl_Cre
IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
TRACE("(%p) Relay\n", This);
if(MultisampleQuality < 0) {
- FIXME("MultisampleQuality out of range %ld, substituting 0 \n", MultisampleQuality);
+ FIXME("MultisampleQuality out of range %ld, substituting 0\n", MultisampleQuality);
/*FIXME: Find out what windows does with a MultisampleQuality < 0 */
MultisampleQuality=0;
}
if(MultisampleQuality > 0){
- FIXME("MultisampleQuality set to %ld, bstituting 0 \n" , MultisampleQuality);
+ FIXME("MultisampleQuality set to %ld, substituting 0\n" , MultisampleQuality);
/*
MultisampleQuality
[in] Quality level. The valid range is between zero and one less than the level returned by pQualityLevels used by IDirect3D8::CheckDeviceMultiSampleType. Passing a larger value returns the error D3DERR_INVALIDCALL. The MultisampleQuality values of paired render targets, depth stencil surfaces, and the MultiSample type must all match.
Module: wine
Branch: refs/heads/master
Commit: 6edd77228dd18f013fb64a22abaaa4da14fde707
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6edd77228dd18f013fb64a2…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Fri Feb 24 12:58:16 2006 +0100
user: Fix ExitWindows().
- Use 0 to get an infinite timeout with SendMessageTimeoutW().
- Use SendMessageTimeoutW() to send the WM_ENDSESSION messages too so
we don't get stuck if a process is hung.
- Only send WM_ENDSESSION to windows that received a
WM_QUERYENDSESSION message. Also better mimick the Windows behavior.
---
dlls/user/user_main.c | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c
index 7cca47c..0e2d830 100644
--- a/dlls/user/user_main.c
+++ b/dlls/user/user_main.c
@@ -374,23 +374,25 @@ BOOL WINAPI ExitWindowsEx( UINT flags, D
{
HWND *phwnd;
UINT send_flags;
- DWORD_PTR result;
+ DWORD_PTR result=1;
- /* Send a WM_QUERYENDSESSION message to every window */
+ /* Send a WM_QUERYENDSESSION / WM_ENDSESSION message pair to
+ * each window. Note: it might be better to send all the
+ * WM_QUERYENDSESSION messages, aggregate the results and then
+ * send all the WM_ENDSESSION messages with the results but
+ * that's not what Windows does.
+ */
send_flags=(flags & EWX_FORCEIFHUNG) ? SMTO_ABORTIFHUNG : SMTO_NORMAL;
for (phwnd = list; *phwnd; phwnd++)
{
/* Make sure that the window still exists */
if (!IsWindow( *phwnd )) continue;
- if (SendMessageTimeoutW( *phwnd, WM_QUERYENDSESSION, 0, 0, send_flags, INFINITE, &result) && !result) break;
- }
- result = (*phwnd == NULL);
-
- /* Now notify all windows that got a WM_QUERYENDSESSION of the result */
- for (phwnd = list; *phwnd; phwnd++)
- {
- if (!IsWindow( *phwnd )) continue;
- SendMessageW( *phwnd, WM_ENDSESSION, result, 0 );
+ if (SendMessageTimeoutW( *phwnd, WM_QUERYENDSESSION, 0, 0, send_flags, 0, &result))
+ {
+ DWORD_PTR dummy;
+ SendMessageTimeoutW( *phwnd, WM_ENDSESSION, result, 0, send_flags, 0, &dummy );
+ if (!result) break;
+ }
}
HeapFree( GetProcessHeap(), 0, list );