February 2006 - Wine-commits

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 24 Feb '06

24 Feb '06

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;

1 0

Francois Gouget : crypt32: Add CryptQueryObject() prototype.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: 8851c4fc4e8fa67c29c51f92d05a5e33f796c593 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8851c4fc4e8fa67c29c51f9… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 24 16:03:49 2006 +0100 crypt32: Add CryptQueryObject() prototype. Update win32.api. --- include/wincrypt.h | 6 ++++++ tools/winapi/win32.api | 4 ++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 0427b2d..678f466 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2732,6 +2732,12 @@ BOOL WINAPI CryptHashToBeSigned(HCRYPTPR const BYTE *pbEncoded, DWORD cbEncoded, BYTE *pbComputedHash, DWORD *pcbComputedHash); +BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void* pvObject, + DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, + DWORD dwFlags, DWORD* pdwMsgAndCertEncodingType, DWORD* pdwContentType, + DWORD* pdwFormatType, HCERTSTORE* phCertStore, HCRYPTMSG* phMsg, + const void** ppvContext); + BOOL WINAPI CryptSignCertificate(HCRYPTPROV hCryptProv, DWORD dwKeySpec, DWORD dwCertEncodingType, const BYTE *pbEncodedToBeSigned, DWORD cbEncodedToBeSigned, PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm, diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 8911a2d..db06841 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -620,7 +620,9 @@ DATA_BLOB * DWORD * GUID * HCERTSTORE +HCERTSTORE * HCRYPTKEY * +HCRYPTMSG * HCRYPTOIDFUNCADDR HCRYPTOIDFUNCADDR * HCRYPTOIDFUNCSET @@ -633,8 +635,10 @@ PCCERT_CONTEXT PCCERT_CONTEXT * PCCRL_CONTEXT PCCRL_CONTEXT * +PCCRYPT_OID_INFO PCCTL_CONTEXT PCCTL_CONTEXT * +PCERT_ENHKEY_USAGE PCERT_EXTENSION PCERT_INFO PCERT_NAME_BLOB

1 0

Francois Gouget : winsock: Tweak getnameinfo() prototype.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: dcb90635f8b4acad25685a21167105967281ab2a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dcb90635f8b4acad25685a2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 24 15:58:09 2006 +0100 winsock: Tweak getnameinfo() prototype. Tweak the getnameinfo() prototype to better match the Windows PSDK and the GetNameInfoW() prototype. Update win32.api. --- dlls/winsock/socket.c | 4 ++-- include/ws2tcpip.h | 2 +- tools/winapi/win32.api | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index a07c5b4..8ca3a3e 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -3235,8 +3235,8 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename return EAI_FAIL; } -int WINAPI WS_getnameinfo(const struct WS_sockaddr *sa, socklen_t salen, char *host, - DWORD hostlen, char *serv, DWORD servlen, int flags) +int WINAPI WS_getnameinfo(const SOCKADDR *sa, socklen_t salen, PCHAR host, + DWORD hostlen, PCHAR serv, DWORD servlen, INT flags) { #if HAVE_GETNAMEINFO int ret; diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 16efab6..9847dab 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -215,7 +215,7 @@ int WINAPI WS(getaddrinfo)(const char*, #define GetAddrInfoA WS(getaddrinfo) int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*); #define GetAddrInfo WINELIB_NAME_AW(GetAddrInfo) -int WINAPI WS(getnameinfo)(const struct WS(sockaddr)*,socklen_t,char*,DWORD,char*,DWORD,int); +int WINAPI WS(getnameinfo)(const SOCKADDR*,socklen_t,PCHAR,DWORD,PCHAR,DWORD,INT); #define GetNameInfoA WS(getnameinfo) INT WINAPI GetNameInfoW(const SOCKADDR*,socklen_t,PWCHAR,DWORD,PWCHAR,DWORD,INT); #define GetNameInfo WINELIB_NAME_AW(GetNameInfo) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index aa19883..8911a2d 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5347,6 +5347,7 @@ WSAESETSERVICEOP WSAEVENT int long +socklen_t u_long u_short @@ -5378,6 +5379,7 @@ LPWSAQUERYSETW LPWSASERVICECLASSINFOA LPWSASERVICECLASSINFOW PADDRINFOW * +SOCKADDR * WS_fd_set * int * struct WS_addrinfo * @@ -5394,6 +5396,7 @@ u_short * LPCSTR LPSTR +PCHAR char * %unknown

1 0

Francois Gouget : sfc: Updates.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: 4c2f22f7c628837a45ff79dbc88fea10e5861cf8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4c2f22f7c628837a45ff79d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 24 15:44:15 2006 +0100 sfc: Updates. Add a missing sfc.dll prototype. Add an sfc.dll section to win32.api for winapi_check. --- include/sfc.h | 1 + tools/winapi/win32.api | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/sfc.h b/include/sfc.h index 5e2e3a9..4bb0221 100644 --- a/include/sfc.h +++ b/include/sfc.h @@ -36,6 +36,7 @@ typedef struct _PROTECTED_FILE_DATA { BOOL WINAPI SfcGetNextProtectedFile(HANDLE, PPROTECTED_FILE_DATA); BOOL WINAPI SfcIsFileProtected(HANDLE, LPCWSTR); +BOOL WINAPI SfpVerifyFile(LPCSTR, LPSTR, DWORD); #ifdef __cplusplus } diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index c0ad8c3..aa19883 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3773,6 +3773,17 @@ LPWSTR PCWSTR PWSTR +%%sfc.dll + +%long + +BOOL +HANDLE + +%wstr + +LPCWSTR + %%shdocvw.dll %long

1 0

Francois Gouget : msftedit: Fix CreateTextServices() forward.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: 44344a31bb4091e62b3a51f15d87d2dc20cf962d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=44344a31bb4091e62b3a51f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 24 15:50:44 2006 +0100 msftedit: Fix CreateTextServices() forward. --- dlls/msftedit/msftedit.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msftedit/msftedit.spec b/dlls/msftedit/msftedit.spec index ec9350f..be36be5 100644 --- a/dlls/msftedit/msftedit.spec +++ b/dlls/msftedit/msftedit.spec @@ -1,6 +1,6 @@ 2 extern IID_IRichEditOle 3 extern IID_IRichEditOleCallback -4 stdcall CreateTextServices(ptr ptr ptr) riched32.CreateTextServices +4 stdcall CreateTextServices(ptr ptr ptr) riched20.CreateTextServices 5 stub IID_ITextServices 6 stub IID_ITextHost 7 stub IID_ITextHost2

1 0

Francois Gouget : d3d8: Remove spaces before '\n', spelling fix.
by Alexandre Julliard 24 Feb '06

24 Feb '06

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.

1 0

Francois Gouget : Add trailing '\n's to ok() calls.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: e092adfc9b5c3496f7b1fcc49c65b0424270daf5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e092adfc9b5c3496f7b1fcc… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 24 15:45:43 2006 +0100 Add trailing '\n's to ok() calls. --- dlls/msvcrt/tests/file.c | 2 +- dlls/ole32/tests/compobj.c | 4 ++-- dlls/riched20/tests/editor.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index bcc60fd..9166ee9 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -121,7 +121,7 @@ static void test_fileops( void ) fclose (file); file = fopen("fdopen.tst", "rb"); - ok( file != NULL, "fopen failed"); + ok( file != NULL, "fopen failed\n"); /* sizeof(buffer) > content of file */ ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n"); /* feof should be set now */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index f1f97cf..52c97df 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -87,7 +87,7 @@ static void test_CoCreateInstance(void) REFCLSID rclsid = &CLSID_MyComputer; IUnknown *pUnk = (IUnknown *)0xdeadbeef; HRESULT hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); - ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have return CO_E_NOTINITIALIZED instead of 0x%08lx", hr); + ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have returned CO_E_NOTINITIALIZED instead of 0x%08lx\n", hr); ok(pUnk == NULL, "CoCreateInstance should have changed the passed in pointer to NULL, instead of %p\n", pUnk); OleInitialize(NULL); @@ -97,7 +97,7 @@ static void test_CoCreateInstance(void) OleUninitialize(); hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); - ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have return CO_E_NOTINITIALIZED instead of 0x%08lx", hr); + ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have returned CO_E_NOTINITIALIZED instead of 0x%08lx\n", hr); } START_TEST(compobj) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 814fc1c..aae3486 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -483,7 +483,7 @@ static void test_TM_PLAINTEXT() /*Compare the two formattings. They should be the same.*/ ok((cf2.dwMask == cf2test.dwMask) && (cf2.dwEffects == cf2test.dwEffects), - "Copied text retained formatting - cf2.dwMask: %f, cf2test.dwMask: %f, cf2.dwEffects: %f, cf2test.dwEffects: %f", + "Copied text retained formatting - cf2.dwMask: %f, cf2test.dwMask: %f, cf2.dwEffects: %f, cf2test.dwEffects: %f\n", (double) cf2.dwMask, (double) cf2test.dwMask, (double) cf2.dwEffects, (double) cf2test.dwEffects); DestroyWindow(hwndRichEdit); }

1 0

Francois Gouget : user32: Handle WM_ENDSESSION in DefWinProc().
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: 29b5c987d53baced430abc6cabdd55115107d688 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29b5c987d53baced430abc6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 24 15:34:09 2006 +0100 user32: Handle WM_ENDSESSION in DefWinProc(). DefWinProc() should call PostQuitMessage() on WM_ENDSESSION if the shutdown is proceeding. --- dlls/user/defwnd.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user/defwnd.c b/dlls/user/defwnd.c index 27d0683..5ea3ee4 100644 --- a/dlls/user/defwnd.c +++ b/dlls/user/defwnd.c @@ -648,6 +648,11 @@ static LRESULT DEFWND_DefWinProc( HWND h case WM_QUERYENDSESSION: return 1; + case WM_ENDSESSION: + if (wParam) + PostQuitMessage(0); + return 0; + case WM_SETICON: { HICON ret;

1 0

Francois Gouget : user32: 0 vs. INFINITE timeout.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: feb153c6492f6e9ca5397fe4cecee2ed0e8da161 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=feb153c6492f6e9ca5397fe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 24 13:14:17 2006 +0100 user32: 0 vs. INFINITE timeout. It is 0 that denotes an infinite timeout for the wine server now, not -1 (INFINITE). Document put_message_in_queue()'s check for INFINITE (done for backwards compatibility with Windows 9x). --- dlls/user/message.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user/message.c b/dlls/user/message.c index 2a1a9d9..3fc261d 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -1372,7 +1372,7 @@ static BOOL post_dde_message( DWORD dest req->wparam = info->wparam; req->lparam = lp; req->time = GetCurrentTime(); - req->timeout = -1; + req->timeout = 0; for (i = 0; i < data->count; i++) wine_server_add_data( req, data->data[i], data->size[i] ); if ((res = wine_server_call( req ))) @@ -2151,8 +2151,11 @@ static BOOL put_message_in_queue( DWORD { struct packed_message data; unsigned int res; - int i, timeout = -1; + int i, timeout = 0; + /* Check for INFINITE timeout for compatibility with Win9x, + * although Windows >= NT does not do so + */ if (info->type != MSG_NOTIFY && info->type != MSG_CALLBACK && info->type != MSG_POSTED &&

1 0

Jeff Latimer : usp10: Tidy default values.
by Alexandre Julliard 24 Feb '06

24 Feb '06

Module: wine Branch: refs/heads/master Commit: ec6744490d6ac1f4db8690061dd14ff69ba3e6c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec6744490d6ac1f4db86900… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Feb 24 20:13:51 2006 +1100 usp10: Tidy default values. Set values for pwLogClust, uJustification and fClusterStart similar to what Windows uses. --- dlls/usp10/usp10.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a150274..c02689d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -297,12 +297,11 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRI HDC phdc; int cnt; DWORD hr; - int clusterinit; Scriptcache *pScriptcache; *pcGlyphs = cChars; FIXME("(%p, %p, %p, %d, %d, %p): semi-stub\n", hdc, psc, pwcChars, cChars, cMaxGlyphs, psa); - if (psa) TRACE("%d, %d, %d, %d, %d, %d, %d\n", psa->eScript, psa->fRTL, psa->fLayoutRTL, + if (psa) TRACE("psa values: %d, %d, %d, %d, %d, %d, %d\n", psa->eScript, psa->fRTL, psa->fLayoutRTL, psa->fLinkBefore, psa->fLinkAfter, psa->fLogicalOrder, psa->fNoGlyphIndex); @@ -348,14 +347,13 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRI TRACE("\n"); } - /* Set up a valid SCRIPT_VISATTR for this run */ - clusterinit = 1; /* Start of Cluster */ + /* Set up a valid SCRIPT_VISATTR and LogClust for each char in this run */ for (cnt = 0; cnt < cChars; cnt++) { - psva[cnt].uJustification = 0; - psva[cnt].fClusterStart = clusterinit; - clusterinit = 0; + psva[cnt].uJustification = 2; + psva[cnt].fClusterStart = 1; psva[cnt].fDiacritic = 0; psva[cnt].fZeroWidth = 0; + pwLogClust[cnt] = cnt; } return 0; }

1 0