July 2014 - Wine-commits - list.winehq.org

Vincent Povirk : ole32: Simplify the FileMonikerImpl_BindToStorage code.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 69ff6f74b25866d55a8c13053836796243902c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ff6f74b25866d55a8c13053… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 30 13:40:02 2014 -0500 ole32: Simplify the FileMonikerImpl_BindToStorage code. --- dlls/ole32/filemoniker.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 06c4798..c7bbb66 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -605,22 +605,11 @@ FileMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLef /* get the file name */ IMoniker_GetDisplayName(iface,pbc,pmkToLeft,&filePath); - /* verify if the file contains a storage object */ - res=StgIsStorageFile(filePath); + res=StgOpenStorage(filePath,NULL,STGM_READWRITE|STGM_SHARE_DENY_WRITE,NULL,0,&pstg); - if(res==S_OK){ + if (SUCCEEDED(res)) + *ppvObject=pstg; - res=StgOpenStorage(filePath,NULL,STGM_READWRITE|STGM_SHARE_DENY_WRITE,NULL,0,&pstg); - - if (SUCCEEDED(res)){ - - *ppvObject=pstg; - - IStorage_AddRef(pstg); - - return res; - } - } CoTaskMemFree(filePath); } else

1 0

Bruno Jesus : rsaenh/tests: Add more AES encrypt/decrypt tests.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 87f214c7ff9bab466a0ff1697acbbd0bf5fbad76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f214c7ff9bab466a0ff1697… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jul 1 01:05:41 2014 -0300 rsaenh/tests: Add more AES encrypt/decrypt tests. --- dlls/rsaenh/tests/rsaenh.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index f0b7b19..abc90e1 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1048,24 +1048,54 @@ static void test_aes(int keylen) HCRYPTKEY hKey; BOOL result; DWORD dwLen, dwMode; - unsigned char pbData[16], enc_data[16], bad_data[16]; + unsigned char pbData[48], enc_data[16], bad_data[16]; int i; - + static const BYTE aes_plain[32] = { + "AES Test With 2 Blocks Of Data." }; + static const BYTE aes_cbc_enc[3][48] = { + /* 128 bit key encrypted text */ + { 0xfe, 0x85, 0x3b, 0xe1, 0xf5, 0xe1, 0x58, 0x75, 0xd5, 0xa9, 0x74, 0xe3, 0x09, 0xea, 0xa5, 0x04, + 0x23, 0x35, 0xa2, 0x3b, 0x5c, 0xf1, 0x6c, 0x6f, 0xb9, 0xcd, 0x64, 0x06, 0x3e, 0x41, 0x83, 0xef, + 0x2a, 0xfe, 0xea, 0xb5, 0x6c, 0x17, 0x20, 0x79, 0x8c, 0x51, 0x3e, 0x56, 0xed, 0xe1, 0x47, 0x68 }, + /* 192 bit key encrypted text */ + { 0x6b, 0xf0, 0xfd, 0x32, 0xee, 0xc6, 0x06, 0x13, 0xa8, 0xe6, 0x3c, 0x81, 0x85, 0xb8, 0x2e, 0xa1, + 0xd4, 0x3b, 0xe8, 0x22, 0xa5, 0x74, 0x4a, 0xbe, 0x9d, 0xcf, 0xcc, 0x37, 0x26, 0x19, 0x5a, 0xd1, + 0x7f, 0x76, 0xbf, 0x94, 0x28, 0xce, 0x27, 0x21, 0x61, 0x87, 0xeb, 0xb9, 0x8b, 0xa8, 0xb4, 0x57 }, + /* 256 bit key encrypted text */ + { 0x20, 0x57, 0x17, 0x0b, 0x17, 0x76, 0xd8, 0x3b, 0x26, 0x90, 0x8b, 0x4c, 0xf2, 0x00, 0x79, 0x33, + 0x29, 0x2b, 0x13, 0x9c, 0xe2, 0x95, 0x09, 0xc1, 0xcd, 0x20, 0x87, 0x22, 0x32, 0x70, 0x9d, 0x75, + 0x9a, 0x94, 0xf5, 0x76, 0x5c, 0xb1, 0x62, 0x2c, 0xe1, 0x76, 0x7c, 0x86, 0x73, 0xe6, 0x7a, 0x23 } + }; switch (keylen) { case 256: result = derive_key(CALG_AES_256, &hKey, 0); + i = 2; break; case 192: result = derive_key(CALG_AES_192, &hKey, 0); + i = 1; break; default: case 128: result = derive_key(CALG_AES_128, &hKey, 0); + i = 0; break; } if (!result) return; + dwLen = sizeof(aes_plain); + memcpy(pbData, aes_plain, dwLen); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, sizeof(pbData)); + ok(result, "Expected OK, got last error %d\n", GetLastError()); + ok(dwLen == 48, "Expected dwLen 48, got %d\n", dwLen); +todo_wine + ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); + + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); + ok(result && dwLen == 32 && !memcmp(aes_plain, pbData, dwLen), + "%08x, dwLen: %d\n", GetLastError(), dwLen); + for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; /* Does AES provider support salt? */

1 0

Jactry Zeng : riched20: Don' t create too many IRichEditOle interface for a RichEdit.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 6ea4da40381bd6a8634457a4291878920f1ad9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea4da40381bd6a8634457a42… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Jul 1 00:08:28 2014 +0800 riched20: Don't create too many IRichEditOle interface for a RichEdit. --- dlls/riched20/editor.c | 13 +++++++++++-- dlls/riched20/editstr.h | 1 + dlls/riched20/tests/richole.c | 19 ++++++++++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2af2582..06d8690 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2886,6 +2886,11 @@ static void ME_DestroyEditor(ME_TextEditor *editor) if(editor->lpOleCallback) IRichEditOleCallback_Release(editor->lpOleCallback); ITextHost_Release(editor->texthost); + if (editor->reOle) + { + IRichEditOle_Release(editor->reOle); + editor->reOle = NULL; + } OleUninitialize(); FREE_OBJ(editor->pBuffer); @@ -4467,8 +4472,12 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_GETOLEINTERFACE: { - LPVOID *ppvObj = (LPVOID*) lParam; - return CreateIRichEditOle(editor, ppvObj); + if (!editor->reOle) + if (!CreateIRichEditOle(editor, (LPVOID *)&editor->reOle)) + return 0; + *(LPVOID *)lParam = editor->reOle; + IRichEditOle_AddRef(editor->reOle); + return 1; } case EM_GETPASSWORDCHAR: { diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index f139c29..4fd965c 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -388,6 +388,7 @@ typedef struct tagME_TextEditor { HWND hWnd, hwndParent; ITextHost *texthost; + IRichEditOle *reOle; BOOL bEmulateVersion10; ME_TextBuffer *pBuffer; ME_Cursor *pCursors; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 5a3ffbe..d10c063 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -92,15 +92,22 @@ static void release_interfaces(HWND *w, IRichEditOle **reOle, ITextDocument **tx ITextSelection_Release(*txtSel); } +static ULONG get_refcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + static void test_Interfaces(void) { - IRichEditOle *reOle = NULL; + IRichEditOle *reOle = NULL, *reOle1 = NULL; ITextDocument *txtDoc = NULL; ITextSelection *txtSel = NULL; IUnknown *punk; HRESULT hres; LRESULT res; HWND w; + ULONG refcount; w = new_richedit(NULL); if (!w) { @@ -111,6 +118,14 @@ static void test_Interfaces(void) res = SendMessageA(w, EM_GETOLEINTERFACE, 0, (LPARAM)&reOle); ok(res, "SendMessage\n"); ok(reOle != NULL, "EM_GETOLEINTERFACE\n"); + refcount = get_refcount((IUnknown *)reOle); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + res = SendMessageA(w, EM_GETOLEINTERFACE, 0, (LPARAM)&reOle1); + ok(res == 1, "SendMessage\n"); + ok(reOle1 == reOle, "Should not return a new IRichEditOle interface\n"); + refcount = get_refcount((IUnknown *)reOle); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); hres = IRichEditOle_QueryInterface(reOle, &IID_ITextDocument, (void **) &txtDoc); @@ -142,6 +157,8 @@ static void test_Interfaces(void) ITextDocument_Release(txtDoc); IRichEditOle_Release(reOle); + refcount = IRichEditOle_Release(reOle); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); DestroyWindow(w); /* Methods should return CO_E_RELEASED if the backing document has

1 0

Joris van der Wel : server: Any of the 4 SE_*_DEFAULTED controls should not be stored on objects, their usage is transient.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 11674b2f61554ce8b573e345a5c2a716fe484028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11674b2f61554ce8b573e345a… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Wed Jun 25 23:08:47 2014 +0200 server: Any of the 4 SE_*_DEFAULTED controls should not be stored on objects, their usage is transient. --- dlls/advapi32/tests/security.c | 4 ++-- server/object.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 05da0ae..d75354f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5341,7 +5341,7 @@ static void test_default_dacl_owner_sid(void) ret = GetSecurityDescriptorOwner( sd, &owner, &defaulted ); ok( ret, "error %u\n", GetLastError() ); ok( owner != (void *)0xdeadbeef, "owner not set\n" ); - todo_wine ok( !defaulted, "owner defaulted\n" ); + ok( !defaulted, "owner defaulted\n" ); dacl = (void *)0xdeadbeef; present = FALSE; @@ -5350,7 +5350,7 @@ static void test_default_dacl_owner_sid(void) ok( ret, "error %u\n", GetLastError() ); ok( present, "dacl not present\n" ); ok( dacl != (void *)0xdeadbeef, "dacl not set\n" ); - todo_wine ok( !defaulted, "dacl defaulted\n" ); + ok( !defaulted, "dacl defaulted\n" ); index = 0; found = FALSE; diff --git a/server/object.c b/server/object.c index c206747..021c741 100644 --- a/server/object.c +++ b/server/object.c @@ -443,7 +443,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, { owner = token_get_user( current->process->token ); new_sd.owner_len = security_sid_len( owner ); - new_sd.control |= SE_OWNER_DEFAULTED; } group = sd_get_group( sd ); @@ -453,7 +452,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, { group = token_get_primary_group( current->process->token ); new_sd.group_len = security_sid_len( group ); - new_sd.control |= SE_GROUP_DEFAULTED; } new_sd.control |= SE_SACL_PRESENT; @@ -469,7 +467,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, else { new_sd.sacl_len = 0; - new_sd.control |= SE_SACL_DEFAULTED; } } @@ -487,7 +484,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, { dacl = token_get_default_dacl( current->process->token ); new_sd.dacl_len = dacl->AclSize; - new_sd.control |= SE_DACL_DEFAULTED; } }

1 0

Joris van der Wel : advapi32/tests: Changed an invalid comment.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: c3f87add45d1172ede6de0e12093657cb9e9a4db URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f87add45d1172ede6de0e12… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Wed Jun 25 23:47:37 2014 +0200 advapi32/tests: Changed an invalid comment. --- dlls/advapi32/tests/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d75354f..a394620 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2547,7 +2547,7 @@ static void test_process_security(void) CHECK_SET_SECURITY( event, GROUP_SECURITY_INFORMATION, ERROR_INVALID_SECURITY_DESCR ); CHECK_SET_SECURITY( event, SACL_SECURITY_INFORMATION, ERROR_ACCESS_DENIED ); CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); - /* NULL DACL is valid and means default DACL from token */ + /* NULL DACL is valid and means that everyone has access */ SecurityDescriptor->Control |= SE_DACL_PRESENT; CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS );

1 0

Joris van der Wel : advapi32/tests: Refactor the retrieval of a security descriptor into a separate function so that it can be used in other tests.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 6930012f86531e78eac7da55e04b3f9454a5ba84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6930012f86531e78eac7da55e… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Wed Jun 25 23:53:23 2014 +0200 advapi32/tests: Refactor the retrieval of a security descriptor into a separate function so that it can be used in other tests. --- dlls/advapi32/tests/security.c | 47 +++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a394620..f3ccc8e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -208,6 +208,32 @@ static void init(void) myARGC = winetest_get_mainargs( &myARGV ); } +static SECURITY_DESCRIPTOR* test_get_security_descriptor(HANDLE handle, int line) +{ + /* use HeapFree(GetProcessHeap(), 0, sd); when done */ + DWORD ret, length, needed; + SECURITY_DESCRIPTOR *sd; + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + NULL, 0, &needed); + ok_(__FILE__, line)(!ret, "GetKernelObjectSecurity should fail\n"); + ok_(__FILE__, line)(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok_(__FILE__, line)(needed != 0xdeadbeef, "GetKernelObjectSecurity should return required buffer length\n"); + + length = needed; + sd = HeapAlloc(GetProcessHeap(), 0, length); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + sd, length, &needed); + ok_(__FILE__, line)(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); + ok_(__FILE__, line)(needed == length || needed == 0 /* file, pipe */, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); + return sd; +} + static void test_sid(void) { struct sidRef refs[] = { @@ -4432,29 +4458,12 @@ todo_wine static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MAPPING *mapping) { - DWORD ret, length, needed, granted, priv_set_len; + DWORD ret, granted, priv_set_len; BOOL status; PRIVILEGE_SET priv_set; SECURITY_DESCRIPTOR *sd; - needed = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - NULL, 0, &needed); - ok(!ret, "GetKernelObjectSecurity should fail\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - ok(needed != 0xdeadbeef, "GetKernelObjectSecurity should return required buffer length\n"); - - length = needed; - sd = HeapAlloc(GetProcessHeap(), 0, length); - - needed = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - sd, length, &needed); - ok(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); - ok(needed == length || needed == 0 /* file, pipe */, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); - + sd = test_get_security_descriptor(handle, __LINE__); validate_default_security_descriptor(sd); priv_set_len = sizeof(priv_set);

1 0

Frédéric Delanoy : Assorted spelling/ grammar fixes.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 95ae71f3ab47c57b6a3af58e787976436b5b3e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ae71f3ab47c57b6a3af58e7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jun 29 13:12:33 2014 +0200 Assorted spelling/grammar fixes. --- dlls/d3dx9_36/surface.c | 6 +++--- dlls/msvfw32/msvideo_main.c | 2 +- dlls/urlmon/sec_mgr.c | 2 +- dlls/urlmon/tests/uri.c | 2 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/ws2_32/socket.c | 2 +- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 4 ++-- tools/c2man.pl | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 09c2fce..ad38444 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1030,7 +1030,7 @@ HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, const WCHAR *resour * * RETURNS * Success: D3D_OK - * Failure: D3DERR_INVALIDCALL, if pDestSurface or pSrcData or SrcDataSize are NULL + * Failure: D3DERR_INVALIDCALL, if pDestSurface, pSrcData or SrcDataSize is NULL * D3DXERR_INVALIDDATA, if pSrcData is no valid image file * */ @@ -1720,7 +1720,7 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic * RETURNS * Success: D3D_OK, if we successfully load the pixel data into our surface or * if pSrcMemory is NULL but the other parameters are valid - * Failure: D3DERR_INVALIDCALL, if pDestSurface, SrcPitch or pSrcRect are NULL or + * Failure: D3DERR_INVALIDCALL, if pDestSurface, SrcPitch or pSrcRect is NULL or * if SrcFormat is an invalid format (other than D3DFMT_UNKNOWN) or * if DestRect is invalid * D3DXERR_INVALIDDATA, if we fail to lock pDestSurface @@ -1871,7 +1871,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, * * RETURNS * Success: D3D_OK - * Failure: D3DERR_INVALIDCALL, if pDestSurface or pSrcSurface are NULL + * Failure: D3DERR_INVALIDCALL, if pDestSurface or pSrcSurface is NULL * D3DXERR_INVALIDDATA, if one of the surfaces is not lockable * */ diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index ea38e0f..b6b7507 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -67,7 +67,7 @@ struct _reg_driver static reg_driver* reg_driver_list = NULL; -/* This one is a macro such that it works for both ASCII and Unicode */ +/* This one is a macro in order to work for both ASCII and Unicode */ #define fourcc_to_string(str, fcc) do { \ (str)[0] = LOBYTE(LOWORD(fcc)); \ (str)[1] = HIBYTE(LOWORD(fcc)); \ diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index dc57c88..5c145ae 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -2077,7 +2077,7 @@ HRESULT WINAPI CompareSecurityIds(BYTE *secid1, DWORD size1, BYTE *secid2, DWORD /******************************************************************** * IsInternetESCEnabledLocal (URLMON.108) * - * Undocumented, returns if IE is running in Enhanced Security Configuration. + * Undocumented, returns TRUE if IE is running in Enhanced Security Configuration. */ BOOL WINAPI IsInternetESCEnabledLocal(void) { diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index f142ffb..737d1bb 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4583,7 +4583,7 @@ typedef struct _invalid_uri { static const invalid_uri invalid_uri_tests[] = { /* Has to have a scheme name. */ {"://www.winehq.org",0,FALSE}, - /* Window's doesn't like URI's which are implicitly file paths without the + /* Windows doesn't like URIs which are implicitly file paths without the * ALLOW_IMPLICIT_FILE_SCHEME flag set. */ {"C:/test/test.mp3",0,FALSE}, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 229d04c..faefd71 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -99,7 +99,7 @@ typedef struct _tagAFM { const AFMMETRICS *Metrics; } AFM; -/* Note no 'next' in AFM. Use AFMLISTENTRY as a container. This allow more than +/* Note no 'next' in AFM. Use AFMLISTENTRY as a container. This allows more than one list to exist without having to reallocate the entire AFM structure. We keep a global list of all afms (PSDRV_AFMFontList) plus a list of available fonts for each DC (dc->physDev->Fonts) */ diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 10857dc..e1d0ce5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4758,7 +4758,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, switch(optname) { /* Some options need some conversion before they can be sent to - * setsockopt. The conversions are done here, then they will fall though + * setsockopt. The conversions are done here, then they will fall through * to the general case. Special options that are not passed to * setsockopt follow below that.*/ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 53229a7..4c95b43 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -874,7 +874,7 @@ void WCMD_copy(WCHAR * args) { if (thiscopy->binarycopy == -1) thiscopy->binarycopy = !anyconcats; /* Convert to fully qualified path/filename in srcpath, file filenamepart pointing - to where the filename portion begins (used for wildcart expansion. */ + to where the filename portion begins (used for wildcard expansion). */ GetFullPathNameW(thiscopy->name, sizeof(srcpath)/sizeof(WCHAR), srcpath, &filenamepart); WINE_TRACE("Full src name is '%s'\n", wine_dbgstr_w(srcpath)); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 647f988..c475ad2 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1605,8 +1605,8 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, case WCMD_FOR: case WCMD_IF: /* Very oddly, probably because of all the special parsing required for - these two commands, neither for nor if are supported when called, - ie call if 1==1... will fail. */ + these two commands, neither 'for' nor 'if' is supported when called, + i.e. 'call if 1==1...' will fail. */ if (!retrycall) { if (i==WCMD_FOR) WCMD_for (p, cmdList); else if (i==WCMD_IF) WCMD_if (p, cmdList); diff --git a/tools/c2man.pl b/tools/c2man.pl index 029f460..fba17ab 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -521,7 +521,7 @@ sub process_comment_text($) s/\[I\]|\[i\]|\[in\]|\[IN\]/\[In\] /g; s/\[O\]|\[o\]|\[out\]|\[OUT\]/\[Out\]/g; s/\[I\/O\]|\[I\,O\]|\[i\/o\]|\[in\/out\]|\[IN\/OUT\]/\[In\/Out\]/g; - # TRUE/FALSE/NULL are defines, capitilise them + # TRUE/FALSE/NULL are defines, capitalise them s/True|true/TRUE/g; s/False|false/FALSE/g; s/Null|null/NULL/g;

1 0