wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Nikolay Sivov : kernel32/tests: Some tests for invalid classes in SetFileInformationByHandle().
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 5742497a35691abc4fad7133265a0a69784679f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5742497a35691abc4fad71332… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 13:59:05 2015 +0300 kernel32/tests: Some tests for invalid classes in SetFileInformationByHandle(). --- dlls/kernel32/tests/file.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 31 ++++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 9480bd4..384dd8d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -55,6 +55,7 @@ static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES PLARGE_INTEGER, ULONG, ULONG, ULONG, ULONG, PVOID, ULONG); static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR*); static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING, PCANSI_STRING, BOOLEAN); +static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, void*, DWORD); static const char filename[] = "testfile.xxx"; static const char sillytext[] = @@ -99,6 +100,7 @@ static void InitFunctionPointers(void) pCreateFile2 = (void *) GetProcAddress(hkernel32, "CreateFile2"); pGetFinalPathNameByHandleA = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleA"); pGetFinalPathNameByHandleW = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleW"); + pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle"); } static void test__hread( void ) @@ -4581,6 +4583,62 @@ static void test_GetFinalPathNameByHandleW(void) CloseHandle(file); } +static void test_SetFileInformationByHandle(void) +{ + FILE_ATTRIBUTE_TAG_INFO fileattrinfo = { 0 }; + FILE_REMOTE_PROTOCOL_INFO protinfo = { 0 }; + FILE_STANDARD_INFO stdinfo = { }; + FILE_COMPRESSION_INFO compressinfo; + char tempFileName[MAX_PATH]; + char tempPath[MAX_PATH]; + HANDLE file; + BOOL ret; + + if (!pSetFileInformationByHandle) + { + win_skip("SetFileInformationByHandle is not supported\n"); + return; + } + + ret = GetTempPathA(sizeof(tempPath), tempPath); + ok(ret, "GetTempPathA failed, got error %u.\n", GetLastError()); + + /* ensure the existence of a file in the temp folder */ + ret = GetTempFileNameA(tempPath, "abc", 0, tempFileName); + ok(ret, "GetTempFileNameA failed, got error %u.\n", GetLastError()); + + file = CreateFileA(tempFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed to open the temp file, error %u.\n", GetLastError()); + + /* invalid classes */ + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileStandardInfo, &stdinfo, sizeof(stdinfo)); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + memset(&compressinfo, 0, sizeof(compressinfo)); + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileCompressionInfo, &compressinfo, sizeof(compressinfo)); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileAttributeTagInfo, &fileattrinfo, sizeof(fileattrinfo)); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + memset(&protinfo, 0, sizeof(protinfo)); + protinfo.StructureVersion = 1; + protinfo.StructureSize = sizeof(protinfo); + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileRemoteProtocolInfo, &protinfo, sizeof(protinfo)); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + CloseHandle(file); +} + START_TEST(file) { InitFunctionPointers(); @@ -4636,4 +4694,5 @@ START_TEST(file) test_file_access(); test_GetFinalPathNameByHandleA(); test_GetFinalPathNameByHandleW(); + test_SetFileInformationByHandle(); } diff --git a/include/winbase.h b/include/winbase.h index 4795d87..c558b21 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -874,6 +874,37 @@ typedef struct _FILE_RENAME_INFO { WCHAR FileName[1]; } FILE_RENAME_INFO, *PFILE_RENAME_INFO; +typedef struct _FILE_ATTRIBUTE_TAG_INFO { + DWORD FileAttributes; + DWORD ReparseTag; +} FILE_ATTRIBUTE_TAG_INFO, *PFILE_ATTRIBUTE_TAG_INFO; + +typedef struct _FILE_COMPRESSION_INFO { + LARGE_INTEGER CompressedFileSize; + WORD CompressionFormat; + UCHAR CompressionUnitShift; + UCHAR ChunkShift; + UCHAR ClusterShift; + UCHAR Reserved[3]; +} FILE_COMPRESSION_INFO, *PFILE_COMPRESSION_INFO; + +typedef struct _FILE_REMOTE_PROTOCOL_INFO { + USHORT StructureVersion; + USHORT StructureSize; + ULONG Protocol; + USHORT ProtocolMajorVersion; + USHORT ProtocolMinorVersion; + USHORT ProtocolRevision; + USHORT Reserved; + ULONG Flags; + struct { + ULONG Reserved[8]; + } GenericReserved; + struct { + ULONG Reserved[16]; + } ProtocolSpecificReserved; +} FILE_REMOTE_PROTOCOL_INFO, *PFILE_REMOTE_PROTOCOL_INFO; + #define PIPE_ACCESS_INBOUND 1 #define PIPE_ACCESS_OUTBOUND 2 #define PIPE_ACCESS_DUPLEX 3

1 0

Nikolay Sivov : oledb32/tests: Added a test for GetDataSource() with created provider and custom properties.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: b95d31845407debb1b19ec58ce61a767b65041be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95d31845407debb1b19ec58c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 6 17:19:05 2015 +0300 oledb32/tests: Added a test for GetDataSource() with created provider and custom properties. --- dlls/oledb32/tests/database.c | 184 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index c1e440d..042be38 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -21,6 +21,7 @@ #define COBJMACROS #define CONST_VTABLE +#define DBINITCONSTANTS #include "windef.h" #include "winbase.h" @@ -29,6 +30,7 @@ #include "msdasc.h" #include "msdaguid.h" #include "initguid.h" +#include "oledb.h" #include "oledberr.h" #include "wine/test.h" @@ -103,6 +105,185 @@ static void test_GetDataSource(WCHAR *initstring) IDataInitialize_Release(datainit); } +/* IDBProperties stub */ +static HRESULT WINAPI dbprops_QI(IDBProperties *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IDBProperties) || IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IDBProperties_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dbprops_AddRef(IDBProperties *iface) +{ + return 2; +} + +static ULONG WINAPI dbprops_Release(IDBProperties *iface) +{ + return 1; +} + +static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertySets, DBPROPSET **prgPropertySets) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertyInfoSets, DBPROPINFOSET **prgPropertyInfoSets, + OLECHAR **ppDescBuffer) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG set_count, DBPROPSET propsets[]) +{ + ok(set_count == 1, "got %u\n", set_count); + + ok(IsEqualIID(&propsets->guidPropertySet, &DBPROPSET_DBINIT), "set guid %s\n", wine_dbgstr_guid(&propsets->guidPropertySet)); +todo_wine + ok(propsets->cProperties == 2, "got propcount %u\n", propsets->cProperties); + +if (propsets->cProperties == 2) { + ok(propsets->rgProperties[0].dwPropertyID == DBPROP_INIT_DATASOURCE, "got propid[0] %u\n", propsets->rgProperties[0].dwPropertyID); + ok(propsets->rgProperties[0].dwOptions == DBPROPOPTIONS_REQUIRED, "got options[0] %u\n", propsets->rgProperties[0].dwOptions); + ok(propsets->rgProperties[0].dwStatus == 0, "got status[0] %u\n", propsets->rgProperties[0].dwStatus); + ok(V_VT(&propsets->rgProperties[0].vValue) == VT_BSTR, "got vartype[0] %u\n", V_VT(&propsets->rgProperties[0].vValue)); + + ok(propsets->rgProperties[1].dwPropertyID == DBPROP_INIT_PROVIDERSTRING, "got propid[1] %u\n", propsets->rgProperties[1].dwPropertyID); + ok(propsets->rgProperties[1].dwOptions == DBPROPOPTIONS_REQUIRED, "got options[1] %u\n", propsets->rgProperties[1].dwOptions); + ok(propsets->rgProperties[1].dwStatus == 0, "got status[1] %u\n", propsets->rgProperties[1].dwStatus); + ok(V_VT(&propsets->rgProperties[1].vValue) == VT_BSTR, "got vartype[1] %u\n", V_VT(&propsets->rgProperties[1].vValue)); +} + return S_OK; +} + +static const IDBPropertiesVtbl dbpropsvtbl = { + dbprops_QI, + dbprops_AddRef, + dbprops_Release, + dbprops_GetProperties, + dbprops_GetPropertyInfo, + dbprops_SetProperties +}; + +static IDBProperties dbprops = { &dbpropsvtbl }; + +/* IPersist stub */ +static HRESULT WINAPI dbpersist_QI(IPersist *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IPersist_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dbpersist_AddRef(IPersist *iface) +{ + return 2; +} + +static ULONG WINAPI dbpersist_Release(IPersist *iface) +{ + return 1; +} + +static HRESULT WINAPI dbpersist_GetClassID(IPersist *iface, CLSID *clsid) +{ + static const WCHAR msdasqlW[] = {'M','S','D','A','S','Q','L',0}; + return CLSIDFromProgID(msdasqlW, clsid); +} + +static const IPersistVtbl dbpersistvtbl = { + dbpersist_QI, + dbpersist_AddRef, + dbpersist_Release, + dbpersist_GetClassID +}; + +static IPersist dbpersist = { &dbpersistvtbl }; + +/* IDBInitialize stub */ +static HRESULT WINAPI dbinit_QI(IDBInitialize *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IDBInitialize) || IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IDBInitialize_AddRef(iface); + return S_OK; + } + else if (IsEqualIID(riid, &IID_IPersist)) { + *obj = &dbpersist; + return S_OK; + } + else if (IsEqualIID(riid, &IID_IDBProperties)) { + *obj = &dbprops; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dbinit_AddRef(IDBInitialize *iface) +{ + return 2; +} + +static ULONG WINAPI dbinit_Release(IDBInitialize *iface) +{ + return 1; +} + +static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI dbinit_Uninitialize(IDBInitialize *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IDBInitializeVtbl dbinitvtbl = { + dbinit_QI, + dbinit_AddRef, + dbinit_Release, + dbinit_Initialize, + dbinit_Uninitialize +}; + +static IDBInitialize dbinittest = { &dbinitvtbl }; + +static void test_GetDataSource2(WCHAR *initstring) +{ + IDataInitialize *datainit = NULL; + IDBInitialize *dbinit = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); + ok(hr == S_OK, "got %08x\n", hr); + + dbinit = &dbinittest; + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, initstring, &IID_IDBInitialize, (IUnknown**)&dbinit); +todo_wine + ok(hr == S_OK, "got %08x\n", hr); + + IDataInitialize_Release(datainit); +} + static void test_database(void) { static WCHAR initstring_jet[] = {'P','r','o','v','i','d','e','r','=','M','i','c','r','o','s','o','f','t','.', @@ -110,6 +291,8 @@ static void test_database(void) 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', 'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o','=','F','a','l','s','e',';',0}; static WCHAR initstring_lower[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';',0}; + static WCHAR customprop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', + 'c','u','s','t','o','m','p','r','o','p','=','1','2','3','.','4',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; @@ -125,6 +308,7 @@ static void test_database(void) test_GetDataSource(initstring_jet); test_GetDataSource(initstring_default); test_GetDataSource(initstring_lower); + test_GetDataSource2(customprop); } static void test_errorinfo(void)

1 0

Nikolay Sivov : oledb32: Fix instance leak on error path (Valgrind).
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: afa6cb528add488a416dbc0e7d80fd56fce52227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa6cb528add488a416dbc0e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 6 16:09:49 2015 +0300 oledb32: Fix instance leak on error path (Valgrind). --- dlls/oledb32/datainit.c | 21 +++++++++++++++++++-- dlls/oledb32/tests/database.c | 27 ++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 3e1f509..f9db094 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -424,6 +424,7 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r','=',0}; static const WCHAR msdasqlW[] = {'M','S','D','A','S','Q','L',0}; datainit *This = impl_from_IDataInitialize(iface); + BOOL datasource_created = FALSE; IDBProperties *dbprops; DBPROPSET *propset; WCHAR *prov = NULL; @@ -511,6 +512,8 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o if (FAILED(hr) && IsEqualIID(riid, &IID_IDBInitialize)) hr = create_db_init(datasource); + + datasource_created = *datasource != NULL; } /* now set properties */ @@ -521,7 +524,12 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o hr = IUnknown_QueryInterface(*datasource, &IID_IDBProperties, (void**)&dbprops); if (FAILED(hr)) { - WARN("provider doesn't support IDBProperties\n"); + ERR("provider doesn't support IDBProperties\n"); + if (datasource_created) + { + IUnknown_Release(*datasource); + *datasource = NULL; + } return hr; } @@ -557,7 +565,16 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o hr = IDBProperties_SetProperties(dbprops, 1, propset); free_dbpropset(1, propset); - TRACE("provider ret 0x%08x\n", hr); + if (FAILED(hr)) + { + ERR("failed to set property, 0x%08x\n", hr); + if (datasource_created) + { + IUnknown_Release(*datasource); + *datasource = NULL; + } + break; + } } IDBProperties_Release(dbprops); diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 9e20fec..c1e440d 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -37,6 +37,14 @@ DEFINE_GUID(CSLID_MSDAER, 0xc8b522cf,0x5cf3,0x11ce,0xad,0xe5,0x00,0xaa,0x00,0x44 static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc = IUnknown_AddRef(obj); + IUnknown_Release(obj); + ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); +} + static void test_GetDataSource(WCHAR *initstring) { IDataInitialize *datainit = NULL; @@ -48,12 +56,17 @@ static void test_GetDataSource(WCHAR *initstring) hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); ok(hr == S_OK, "got %08x\n", hr); + EXPECT_REF(datainit, 1); + /* a failure to create data source here may indicate provider is simply not present */ hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, initstring, &IID_IDBInitialize, (IUnknown**)&dbinit); if(SUCCEEDED(hr)) { IDBProperties *props = NULL; + EXPECT_REF(datainit, 1); + EXPECT_REF(dbinit, 1); + hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); ok(hr == S_OK, "got %08x\n", hr); if(SUCCEEDED(hr)) @@ -62,6 +75,8 @@ static void test_GetDataSource(WCHAR *initstring) DBPROPINFOSET *pInfoset; OLECHAR *ary; + EXPECT_REF(dbinit, 2); + EXPECT_REF(props, 2); hr = IDBProperties_GetPropertyInfo(props, 0, NULL, &cnt, &pInfoset, &ary); todo_wine ok(hr == S_OK, "got %08x\n", hr); if(hr == S_OK) @@ -80,9 +95,11 @@ static void test_GetDataSource(WCHAR *initstring) IDBProperties_Release(props); } + EXPECT_REF(dbinit, 1); IDBInitialize_Release(dbinit); } + EXPECT_REF(datainit, 1); IDataInitialize_Release(datainit); } @@ -186,7 +203,7 @@ static void test_initializationstring(void) static const WCHAR initstring_sqloledb[] = {'P','r','o','v','i','d','e','r','=','S','Q','L','O','L','E','D','B','.','1',';', 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; IDataInitialize *datainit = NULL; - IDBInitialize *dbinit = NULL; + IDBInitialize *dbinit; HRESULT hr; WCHAR *initstring = NULL; @@ -194,10 +211,16 @@ static void test_initializationstring(void) ok(hr == S_OK, "got %08x\n", hr); if(SUCCEEDED(hr)) { + EXPECT_REF(datainit, 1); + + dbinit = NULL; hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, initstring_default, &IID_IDBInitialize, (IUnknown**)&dbinit); if(SUCCEEDED(hr)) { + EXPECT_REF(datainit, 1); + EXPECT_REF(dbinit, 1); + hr = IDataInitialize_GetInitializationString(datainit, (IUnknown*)dbinit, 0, &initstring); ok(hr == S_OK, "got %08x\n", hr); if(hr == S_OK) @@ -210,6 +233,8 @@ static void test_initializationstring(void) IDBInitialize_Release(dbinit); } + else + ok(dbinit == NULL, "got %p\n", dbinit); IDataInitialize_Release(datainit); }

1 0

Huw Davies : riched20: Append a final \par when writing the whole buffer.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 17f273360afc7bf4a3f7f4effe942404560f9fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f273360afc7bf4a3f7f4eff… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 8 14:53:46 2015 +0100 riched20: Append a final \par when writing the whole buffer. --- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- dlls/riched20/writer.c | 5 ++++- 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 38861fd..3ce6c91 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1708,7 +1708,7 @@ ME_StreamInRTFString(ME_TextEditor *editor, BOOL selection, char *string) data.pos = 0; es.dwCookie = (DWORD_PTR)&data; es.pfnCallback = ME_ReadFromRTFString; - ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, FALSE); + ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, TRUE); } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 09437ef..c3470d4 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3422,6 +3422,19 @@ static DWORD CALLBACK test_esCallback_written_1(DWORD_PTR dwCookie, return 0; } +static int count_pars(const char *buf) +{ + const char *p = buf; + int count = 0; + while ((p = strstr( p, "\\par" )) != NULL) + { + if (!isalpha( p[4] )) + count++; + p++; + } + return count; +} + static void test_EM_STREAMOUT(void) { HWND hwndRichEdit = new_richedit(NULL); @@ -3446,6 +3459,19 @@ static void test_EM_STREAMOUT(void) ok(strcmp(buf, TestItem1) == 0, "streamed text different, got %s\n", buf); + /* RTF mode writes the final end of para \r if it's part of the selection */ + p = buf; + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF, (LPARAM)&es); + ok (count_pars(buf) == 1, "got %s\n", buf); + p = buf; + SendMessageA(hwndRichEdit, EM_SETSEL, 0, 12); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + ok (count_pars(buf) == 0, "got %s\n", buf); + p = buf; + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + ok (count_pars(buf) == 1, "got %s\n", buf); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)TestItem2); p = buf; es.dwCookie = (DWORD_PTR)&p; @@ -3458,6 +3484,20 @@ static void test_EM_STREAMOUT(void) ok(r == 14, "streamed text length is %d, expecting 14\n", r); ok(strcmp(buf, TestItem3) == 0, "streamed text different from, got %s\n", buf); + + /* And again RTF mode writes the final end of para \r if it's part of the selection */ + p = buf; + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF, (LPARAM)&es); + ok (count_pars(buf) == 2, "got %s\n", buf); + p = buf; + SendMessageA(hwndRichEdit, EM_SETSEL, 0, 13); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + ok (count_pars(buf) == 1, "got %s\n", buf); + p = buf; + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + ok (count_pars(buf) == 2, "got %s\n", buf); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)TestItem3); p = buf; es.dwCookie = (DWORD_PTR)&p; @@ -4904,7 +4944,7 @@ static void test_WM_PASTE(void) SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); result = strcmp(buffer,"cut\r\n"); - todo_wine ok(result == 0, + ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); /* Simulates undo (Ctrl-Z) */ hold_key(VK_CONTROL); @@ -4919,7 +4959,7 @@ static void test_WM_PASTE(void) (MapVirtualKeyA('Y', MAPVK_VK_TO_VSC) << 16) | 1); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); result = strcmp(buffer,"cut\r\n"); - todo_wine ok(result == 0, + ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); release_key(VK_CONTROL); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 26a64a7..2c7386a 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -788,8 +788,11 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, ME_Cursor cursor = *start; ME_DisplayItem *prev_para = cursor.pPara; ME_Cursor endCur = cursor; + int actual_chars; - ME_MoveCursorChars(editor, &endCur, nChars); + actual_chars = ME_MoveCursorChars(editor, &endCur, nChars); + /* Include the final \r which MoveCursorChars will ignore. */ + if (actual_chars != nChars) endCur.nOffset++; if (!ME_StreamOutRTFHeader(pStream, dwFormat)) return FALSE;

1 0

Jeremy Newman : missed a section
by Jeremy Newman 08 Jun '15

08 Jun '15

Module: website Branch: master Commit: ee87d5f5aa9a2e8818044661cb22307dcee9e465 URL: http://source.winehq.org/git/website.git/?a=commit;h=ee87d5f5aa9a2e88180446… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jun 8 13:56:03 2015 -0500 missed a section --- wwn/en/wn20150607_392.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wwn/en/wn20150607_392.xml b/wwn/en/wn20150607_392.xml index 99362fa..495e69a 100644 --- a/wwn/en/wn20150607_392.xml +++ b/wwn/en/wn20150607_392.xml @@ -158,6 +158,7 @@ Tom Wickline finally set up a <a href="https://www.facebook.com/pages/winehqorg/1634558060090404">Facebook</a> page for WineHQ! Make sure to subscribe to it to receive interesting and Wine related posts. +]]> </section> <section @@ -166,6 +167,7 @@ Make sure to subscribe to it to receive interesting and Wine related posts. archive="//www.winehq.org/pipermail/wine-devel/2015-June/107722.html" posts="14" > +<![CDATA[ Austin writes:

1 0

Jeremy Newman : wrap all html using XML CDATA, change quote to blockquote
by Jeremy Newman 08 Jun '15

08 Jun '15

Module: website Branch: master Commit: 78222447404f704282d96633420eb2e3c92c5e71 URL: http://source.winehq.org/git/website.git/?a=commit;h=78222447404f704282d966… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jun 8 13:51:44 2015 -0500 wrap all html using XML CDATA, change quote to blockquote --- wwn/en/wn20150607_392.xml | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/wwn/en/wn20150607_392.xml b/wwn/en/wn20150607_392.xml index 90f2772..99362fa 100644 --- a/wwn/en/wn20150607_392.xml +++ b/wwn/en/wn20150607_392.xml @@ -4,8 +4,8 @@ <author contact="http://www.dawncrow.de/wine/">André Hentschel</author> <issue num="392" date="06/07/2015" /> -<intro> This is the 392nd issue of the World Wine News publication. -Its main goal is to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> </intro> +<intro><![CDATA[ This is the 392nd issue of the World Wine News publication. +Its main goal is to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> ]]></intro> <stats posts="140" size="102" contrib="36" multiples="17" lastweek="11"> <person posts="6" size="8" who="austinenglish at gmail.com (Austin English)" /> @@ -27,6 +27,7 @@ Its main goal is to inform you of what's going on around Wine. Wine is an open s archive="http://wiki.winehq.org/WineConf2015" posts="1" > +<![CDATA[ Instead of visiting FOSDEM a third time we decided to do our own conference again this year. WineConf will be held in Vienna in September and we have a very interesting preliminary agenda: @@ -51,6 +52,7 @@ Possibly we'll also have: <li>Wine's desktop and system integration - Damjan Jovanovic</li> <li>Wine and Valgrind - Austin English</li> </ul> +]]> </section> <section @@ -59,6 +61,7 @@ Possibly we'll also have: archive="https://www.google-melange.com/gsoc/homepage/google/gsoc2015" posts="1" > +<![CDATA[ I haven't wrote about GSoC 2015 yet, but the Wine Project already was <a href="http://www.phoronix.com/scan.php?page=news_item&px=GSoC-2015-Interesting-Wo…">on the news</a> with it. @@ -68,7 +71,7 @@ We have four projects which are already in the coding period: Direct3DRM - Implement rendering backend for D3DRM - <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/jam/575…">Project</a> <a href="//www.winehq.org/pipermail/wine-devel/2015-May/107608.html">by Aaryaman Vasishta</a> -<quote> +<blockquote> Thank you for inviting me to this opportunity! I will try my best to keep it short, though it might be a bit long for some. There's a TL;DR at the end, though. :) A bit about myself. My name is Aaryaman Vasishta and I'm currently studying in my third year of Computer Engineering in Pune Institute of Computer Technology, India. My interests lie in game programming and computer graphics. My project focuses on implementing the rendering backend for the D3DRM API [1]. @@ -77,31 +80,31 @@ We have four projects which are already in the coding period: The API is quite old (it has been removed since DX 8 SDK, and the dll doesn't come included with vista onwards) but there are a few popular games that used it. Namely, Lego Rock Raiders and Steel Beasts, and applications as well, like FMS (Flying Model Simulator). So there is some merit in working on this. Implementing these functions will help accelerate further development of this API to get some long-awaited apps to run on wine (I can see quite a few threads on google of people trying to get FMS running, and a couple for LRR too, so there is some demand for it). As an added bonus, I also get to interact with wine's ddraw implementation for this one, which could potentially help ddraw's implementation via possible bug detection/fixes and implementing any ddraw functionality that d3drm requires. TL;DR: I'm implementing a main chunk of a graphics API called Direct3D Retained Mode, which is based on Direct3D Immediate Mode. The API is mostly a stub in wine and this project should help get things going. [1] - https://www.google-melange.com/gsoc/project/details/google/gsoc2015/jam/575… -</quote> +</blockquote> Implement the Visual C++ iostream library - <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/sulley/…">Project</a> <a href="//www.winehq.org/pipermail/wine-devel/2015-May/107619.html">by Iván Matellanes</a> -<quote> +<blockquote> I'm looking forward to contributing to Wine. My project consists on implementing part of the legacy Visual C++ iostream runtime, which was shipped with Visual Studio versions up to 6.0 and is currently a stub. I'll work on as many functions as time permits, and one of the key points is to reuse code from the modern Visual C++ runtime library that is already implemented. Some old applications and games (like MS Reader and Tron 2.0) would benefit from this, as they would run with the built-in library. A quick search on Bugzilla for 'msvcirt' shows several bugs related to unimplemented functions. -</quote> +</blockquote> Implementing functions from tr2 namespace - <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/yonghao…">Project</a> <a href="//www.winehq.org/pipermail/wine-devel/2015-May/107628.html">by YongHao Hu</a> -<quote> +<blockquote> My project focuses on implementing all the functions from tr2 namespace, which was included in the <filesystem> header and being proposed for standardization. Though there are many methods to implement the functions like _File_size and _Equivalent etc, the hard part is finding the most appropriate one. New applications like MSVC12[1] would benefit from this. [1]: //bugs.winehq.org/show_bug.cgi?id=35774 -</quote> +</blockquote> Improve mshtml.dll - <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/zhenbo/…">Project</a> <a href="//www.winehq.org/pipermail/wine-devel/2015-May/107609.html">by Zhenbo Li</a> -<quote> +<blockquote> I'm glad to working on Wine GSoC this year. My project's focus is IHMLTXMLHttpRequest. Many websites would use hacks to determine whether the browser was IE6.0 or IE 7+. As XMLHttpRequest object @@ -119,8 +122,8 @@ necessary to make wine IE more usable. [0]: http://en.wikipedia.org/wiki/XMLHttpRequest [1]: https://getfirebug.com/firebuglite [2]: https://developer.mozilla.org/en-US/docs/nsIXMLHttpRequest -</quote> - +</blockquote> +]]> </section> <section @@ -129,16 +132,18 @@ necessary to make wine IE more usable. archive="https://www.linux.com/news/featured-blogs/200-libby-clark/822789-git-succes…" posts="1" > +<![CDATA[ Alexandre Julliard was <a href="https://www.linux.com/news/featured-blogs/200-libby-clark/822789-git-succes…"> interviewed by Linux.com</a> and it's an interesting read! -<quote> +<blockquote> I can no longer imagine doing software development without it. -</quote> +</blockquote> +]]> </section> <section @@ -147,6 +152,7 @@ I can no longer imagine doing software development without it. archive="https://www.facebook.com/pages/winehqorg/1634558060090404" posts="0" > +<![CDATA[ Tom Wickline finally set up a <a href="https://www.facebook.com/pages/winehqorg/1634558060090404">Facebook</a> page for WineHQ! @@ -163,7 +169,7 @@ Make sure to subscribe to it to receive interesting and Wine related posts. Austin writes: -<quote> +<blockquote> Given SourceForge's recent activities [1] with taking over open source @@ -174,10 +180,11 @@ wine-gecko/wine-mono installers, and the wine-gecko git repository. [1] http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijackin… -</quote> +</blockquote> So far there was mostly (or only) positive feedback to that suggestion and planning seems to be in progress. +]]> </section> <section @@ -186,6 +193,7 @@ So far there was mostly (or only) positive feedback to that suggestion and plann archive="//appdb.winehq.org" posts="0" > +<![CDATA[ <topic>AppDB / Bugzilla</topic> <center>Bugzilla Changes:</center> <center> @@ -762,4 +770,5 @@ will have the same experience and would provide a similar rating. </td> </tr> </table></div> +]]> </section></kc>

1 0

Jeremy Newman : add a blockquote to wwn
by Jeremy Newman 08 Jun '15

08 Jun '15

Module: website Branch: master Commit: 735c3a94ab4a5a51358aef50d824dbfee7e9bee8 URL: http://source.winehq.org/git/website.git/?a=commit;h=735c3a94ab4a5a51358aef… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jun 8 13:51:25 2015 -0500 add a blockquote to wwn --- styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/styles.css b/styles.css index 65c948f..d9ba833 100644 --- a/styles.css +++ b/styles.css @@ -250,6 +250,7 @@ div.rbox div.content { margin: 0; background-color: #FFFFFF; } /* WWN Colors */ .wwn TABLE { margin: 0px; padding: 0px; border-spacing: 0; } .wwn TH { color: #A50D0D; border-bottom: 1px solid #A50D0D; margin: 5px 0 5px 0; padding: 5px 0 5px 0; text-align: left; } +.wwn BLOCKQUOTE { margin: 1em 1em 1em 1em; color: #A8003C; } .wwnQuote { color: #A8003C; } p.indent { padding-left: 1em; padding-right: 1em;}

1 0

Jeremy Newman : encode a non tag
by Jeremy Newman 08 Jun '15

08 Jun '15

Module: website Branch: master Commit: 2e57778be1f9892f4c9283239fffc934c24d7330 URL: http://source.winehq.org/git/website.git/?a=commit;h=2e57778be1f9892f4c9283… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jun 8 08:55:10 2015 -0500 encode a non tag --- wwn/en/wn20150607_392.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wwn/en/wn20150607_392.xml b/wwn/en/wn20150607_392.xml index e7fa396..90f2772 100644 --- a/wwn/en/wn20150607_392.xml +++ b/wwn/en/wn20150607_392.xml @@ -92,7 +92,7 @@ We have four projects which are already in the coding period: <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/yonghao…">Project</a> <a href="//www.winehq.org/pipermail/wine-devel/2015-May/107628.html">by YongHao Hu</a> <quote> -My project focuses on implementing all the functions from tr2 namespace, which was included in the <filesystem> header and being proposed for standardization. +My project focuses on implementing all the functions from tr2 namespace, which was included in the <filesystem> header and being proposed for standardization. Though there are many methods to implement the functions like _File_size and _Equivalent etc, the hard part is finding the most appropriate one. New applications like MSVC12[1] would benefit from this. [1]: //bugs.winehq.org/show_bug.cgi?id=35774

1 0

Piotr Caban : msvcrt: Fix strtol implementation on strings not containing valid number.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 0922865b377913a27cea568ac688787a8117d8a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0922865b377913a27cea568ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 8 12:00:55 2015 +0200 msvcrt: Fix strtol implementation on strings not containing valid number. --- dlls/msvcrt/string.c | 10 ++++++++-- dlls/msvcrt/tests/string.c | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 6f9280f..fdeb4e0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -839,7 +839,9 @@ MSVCRT_size_t CDECL MSVCRT_strnlen(const char *s, MSVCRT_size_t maxlen) */ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCRT__locale_t locale) { + const char *p = nptr; BOOL negative = FALSE; + BOOL got_digit = FALSE; __int64 ret = 0; TRACE("(%s %p %d %p)\n", debugstr_a(nptr), endptr, base, locale); @@ -881,6 +883,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR break; v = cur-'a'+10; } + got_digit = TRUE; if(negative) v = -v; @@ -898,7 +901,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR } if(endptr) - *endptr = (char*)nptr; + *endptr = (char*)(got_digit ? nptr : p); return ret; } @@ -1014,7 +1017,9 @@ MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) */ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int base, MSVCRT__locale_t locale) { + const char *p = nptr; BOOL negative = FALSE; + BOOL got_digit = FALSE; unsigned __int64 ret = 0; TRACE("(%s %p %d %p)\n", debugstr_a(nptr), endptr, base, locale); @@ -1056,6 +1061,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b break; v = cur-'a'+10; } + got_digit = TRUE; nptr++; @@ -1067,7 +1073,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b } if(endptr) - *endptr = (char*)nptr; + *endptr = (char*)(got_digit ? nptr : p); return negative ? -ret : ret; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 3893ba7..9920df0 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1401,6 +1401,8 @@ static void test_strtok(void) static void test_strtol(void) { + static char neg[] = "-0x"; + char* e; LONG l; ULONG ul; @@ -1457,6 +1459,12 @@ static void test_strtol(void) ul = strtoul("-4294967296", NULL, 0); ok(ul == 1, "wrong value %u\n", ul); ok(errno == ERANGE, "wrong errno %d\n", errno); + + errno = 0; + l = strtol(neg, &e, 0); + ok(l == 0, "wrong value %d\n", l); + ok(errno == 0, "wrong errno %d\n", errno); + ok(e == neg, "e = %p, neg = %p\n", e, neg); } static void test_strnlen(void)

1 0

Nikolay Sivov : usp10: Remove dead null check that can't fail (Coverity).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 7a02782f48c582c7353d3a716afb4b4717272079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a02782f48c582c7353d3a716… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 11:49:21 2015 +0300 usp10: Remove dead null check that can't fail (Coverity). --- dlls/usp10/shape.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0291f17..e942880 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3348,14 +3348,9 @@ rpRangeProperties = &ShapingData[psa->eScript].defaultTextRange; void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WORD* pwGlyphs, INT cGlyphs, int *piAdvance, GOFFSET *pGoffset ) { - const TEXTRANGE_PROPERTIES *rpRangeProperties; + const TEXTRANGE_PROPERTIES *rpRangeProperties = &ShapingData[psa->eScript].defaultGPOSTextRange; int i; - rpRangeProperties = &ShapingData[psa->eScript].defaultGPOSTextRange; - - if (!rpRangeProperties) - return; - load_ot_tables(hdc, psc); if (!psc->GPOS_Table || !psc->otm)

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015