wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Robert van Herk : msvcrt: Fix file mode T (temporary file).
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 516bb0ba64c44f8226c0863547b5866c97deb425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=516bb0ba64c44f8226c086354… Author: Robert van Herk <mijnspamboxje(a)hotmail.com> Date: Tue Mar 27 14:43:55 2012 +0200 msvcrt: Fix file mode T (temporary file). --- dlls/msvcrt/file.c | 8 +++++++- dlls/msvcrt/tests/file.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1c56eee..df2c7cd 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1281,10 +1281,16 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st *open_flags |= MSVCRT__O_BINARY; *open_flags &= ~MSVCRT__O_TEXT; break; - case 'T': case 't': + case 't': *open_flags |= MSVCRT__O_TEXT; *open_flags &= ~MSVCRT__O_BINARY; break; + case 'D': + *open_flags |= MSVCRT__O_TEMPORARY; + break; + case 'T': + *open_flags |= MSVCRT__O_SHORT_LIVED; + break; case '+': case ' ': break; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 0f94083..e450b72 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -434,6 +434,37 @@ static void test_asciimode2(void) unlink("ascii2.tst"); } +static void test_filemodeT(void) +{ + char DATA [] = {26, 't', 'e', 's' ,'t'}; + char DATA2 [100]; + char temppath[MAX_PATH]; + char tempfile[MAX_PATH]; + FILE* f; + size_t bytesWritten; + size_t bytesRead; + WIN32_FIND_DATA findData; + HANDLE h; + + GetTempPath (MAX_PATH, temppath); + GetTempFileName (temppath, "", 0, tempfile); + + f = fopen(tempfile, "w+bDT"); + bytesWritten = fwrite(DATA, 1, sizeof(DATA), f); + rewind(f); + bytesRead = fread(DATA2, 1, sizeof(DATA2), f); + fclose(f); + + ok (bytesRead == bytesWritten && bytesRead == sizeof(DATA), + "fopen file mode 'T' wrongly interpreted as 't'\n" ); + + h = FindFirstFile(tempfile, &findData); + + ok (h == INVALID_HANDLE_VALUE, "file wasn't deleted when closed.\n" ); + + if (h != INVALID_HANDLE_VALUE) FindClose(h); +} + static WCHAR* AtoW( const char* p ) { WCHAR* buffer; @@ -1628,6 +1659,7 @@ START_TEST(file) test_fileops(); test_asciimode(); test_asciimode2(); + test_filemodeT(); test_readmode(FALSE); /* binary mode */ test_readmode(TRUE); /* ascii mode */ test_readboundary();

1 0

Andoni Morales Alastruey : msi: Implement MSIMODIFY_MERGE function in TABLE_modify.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 342fcb6198d08c3a6423c1e7f9682a3b6989aa9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=342fcb6198d08c3a6423c1e7f… Author: Andoni Morales Alastruey <ylatuya(a)gmail.com> Date: Mon Mar 19 23:19:17 2012 +0100 msi: Implement MSIMODIFY_MERGE function in TABLE_modify. --- dlls/msi/table.c | 14 ++++++++++++-- dlls/msi/tests/db.c | 24 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index d37947e..54743bd 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1766,7 +1766,7 @@ static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - UINT r, column; + UINT r, frow, column; TRACE("%p %d %p\n", view, eModifyMode, rec ); @@ -1811,8 +1811,18 @@ static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, r = msi_table_assign( view, rec ); break; - case MSIMODIFY_REPLACE: case MSIMODIFY_MERGE: + /* check row that matches this record */ + r = msi_table_find_row( tv, rec, &frow, &column ); + if (r != ERROR_SUCCESS) + { + r = table_validate_new( tv, rec, NULL ); + if (r == ERROR_SUCCESS) + r = TABLE_insert_row( view, rec, -1, FALSE ); + } + break; + + case MSIMODIFY_REPLACE: case MSIMODIFY_VALIDATE: case MSIMODIFY_VALIDATE_FIELD: case MSIMODIFY_VALIDATE_DELETE: diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index d33eb0c..4c91bd8 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -923,6 +923,30 @@ static void test_viewmodify(void) r = MsiViewModify(hview, MSIMODIFY_INSERT_TEMPORARY, hrec ); ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n"); + /* try to merge the same record */ + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewModify(hview, MSIMODIFY_MERGE, hrec ); + ok(r == ERROR_SUCCESS, "MsiViewModify failed\n"); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + /* try merging a new record */ + hrec = MsiCreateRecord(3); + + r = MsiRecordSetInteger(hrec, 1, 10); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + r = MsiRecordSetString(hrec, 2, "pepe"); + ok(r == ERROR_SUCCESS, "failed to set string\n"); + r = MsiRecordSetString(hrec, 3, "7654321"); + ok(r == ERROR_SUCCESS, "failed to set string\n"); + + r = MsiViewModify(hview, MSIMODIFY_MERGE, hrec ); + ok(r == ERROR_SUCCESS, "MsiViewModify failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n");

1 0

Christian Costa : include: Add missing error codes.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: e08a7a6131865e13375f8071099cca7939743dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e08a7a6131865e13375f80710… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Mar 27 23:44:14 2012 +0200 include: Add missing error codes. --- include/qedit.idl | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/qedit.idl b/include/qedit.idl index ea1e593..1cf0996 100644 --- a/include/qedit.idl +++ b/include/qedit.idl @@ -166,3 +166,13 @@ coclass MediaDet { [default] interface IMediaDet; }; + +enum +{ + E_NOTINTREE = 0x80040400, + E_RENDER_ENGINE_IS_BROKEN = 0x80040401, + E_MUST_INIT_RENDERER = 0x80040402, + E_NOTDETERMINED = 0x80040403, + E_NO_TIMELINE = 0x80040404, + S_WARN_OUTPUTRESET = 40404 +};

1 0

Michael Stefaniuc : riched20/tests: Add COM aggregation tests for CreateTextServices().
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 39f416cd9d771381184a01b2639f125f675ba4c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f416cd9d771381184a01b26… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 28 00:35:47 2012 +0200 riched20/tests: Add COM aggregation tests for CreateTextServices(). --- dlls/riched20/tests/txtsrv.c | 65 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index e55f5ef..fbd1f6b 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -21,6 +21,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <stdio.h> #include <stdarg.h> @@ -811,6 +812,69 @@ static void test_IIDs(void) "unexpected value for IID_ITextHost2: %s\n", debugstr_guid(pIID_ITextHost2)); } +/* Outer IUnknown for COM aggregation tests */ +struct unk_impl { + IUnknown IUnknown_iface; + LONG ref; + IUnknown *inner_unk; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return IUnknown_QueryInterface(This->inner_unk, riid, ppv); +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + +static void test_COM(void) +{ + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; + struct ITextHostTestImpl texthost = {{&itextHostVtbl}, 1}; + ITextServices *textsrv; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = pCreateTextServices(&unk_obj.IUnknown_iface, &texthost.ITextHost_iface, + &unk_obj.inner_unk); + ok(hr == S_OK, "CreateTextServices failed: %08x\n", hr); + hr = IUnknown_QueryInterface(unk_obj.inner_unk, pIID_ITextServices, (void**)&textsrv); + ok(hr == S_OK, "QueryInterface for IID_ITextServices failed: %08x\n", hr); + refcount = ITextServices_AddRef(textsrv); + ok(refcount == unk_obj.ref, "CreateTextServices just pretends to support COM aggregation\n"); + refcount = ITextServices_Release(textsrv); + ok(refcount == unk_obj.ref, "CreateTextServices just pretends to support COM aggregation\n"); + refcount = ITextServices_Release(textsrv); + ok(refcount == 19, "Refcount should be back at 19 but is %u\n", refcount); + + IUnknown_Release(unk_obj.inner_unk); +} START_TEST( txtsrv ) { @@ -827,6 +891,7 @@ START_TEST( txtsrv ) pCreateTextServices = (void*)GetProcAddress(hmoduleRichEdit, "CreateTextServices"); test_IIDs(); + test_COM(); if (init_texthost()) {

1 0

Michael Stefaniuc : riched20/tests: Get the CreateTextServices() pointer only once.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 67389533bcb46f5281d074bd115d5278c39340e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67389533bcb46f5281d074bd1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 28 00:34:31 2012 +0200 riched20/tests: Get the CreateTextServices() pointer only once. --- dlls/riched20/tests/txtsrv.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 8d126ea..e55f5ef 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -38,6 +38,7 @@ static HMODULE hmoduleRichEdit; static IID *pIID_ITextServices; static IID *pIID_ITextHost; static IID *pIID_ITextHost2; +static PCreateTextServices pCreateTextServices; static const char *debugstr_guid(REFIID riid) { @@ -620,7 +621,6 @@ static BOOL init_texthost(void) { IUnknown *init; HRESULT result; - PCreateTextServices pCreateTextServices; dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); if (dummyTextHost == NULL) { @@ -633,7 +633,6 @@ static BOOL init_texthost(void) /* MSDN states that an IUnknown object is returned by CreateTextServices which is then queried to obtain a ITextServices object. */ - pCreateTextServices = (void*)GetProcAddress(hmoduleRichEdit, "CreateTextServices"); result = (*pCreateTextServices)(NULL, &dummyTextHost->ITextHost_iface, &init); ok(result == S_OK, "Did not return S_OK when created (result = %x)\n", result); if (result != S_OK) { @@ -825,6 +824,8 @@ START_TEST( txtsrv ) pIID_ITextServices = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextServices"); pIID_ITextHost = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextHost"); pIID_ITextHost2 = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextHost2"); + pCreateTextServices = (void*)GetProcAddress(hmoduleRichEdit, "CreateTextServices"); + test_IIDs(); if (init_texthost())

1 0

Michael Stefaniuc : riched20: Support COM aggregation in CreateTextServices ().
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 74c5d202a18b40a784a6464e2bde4727452b100b URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c5d202a18b40a784a6464e2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 28 00:33:10 2012 +0200 riched20: Support COM aggregation in CreateTextServices(). --- dlls/riched20/txtsrv.c | 96 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 65 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 25b3283..e9cc5e1 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -54,53 +54,57 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); typedef struct ITextServicesImpl { + IUnknown IUnknown_inner; ITextServices ITextServices_iface; - ITextHost *pMyHost; + IUnknown *outer_unk; LONG ref; + ITextHost *pMyHost; CRITICAL_SECTION csTxtSrv; ME_TextEditor *editor; char spare[256]; } ITextServicesImpl; -static inline ITextServicesImpl *impl_from_ITextServices(ITextServices *iface) +static inline ITextServicesImpl *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, ITextServicesImpl, ITextServices_iface); + return CONTAINING_RECORD(iface, ITextServicesImpl, IUnknown_inner); } -static HRESULT WINAPI fnTextSrv_QueryInterface(ITextServices *iface, REFIID riid, void **ppv) +static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - ITextServicesImpl *This = impl_from_ITextServices(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextServices)) - *ppv = This; - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - TRACE ("-- Interface = %p\n", *ppv); - return S_OK; + ITextServicesImpl *This = impl_from_IUnknown(iface); + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = &This->IUnknown_inner; + else if IsEqualIID(riid, &IID_ITextServices) + *ppv = &This->ITextServices_iface; + else { + *ppv = NULL; + FIXME("Unknown interface: %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } - FIXME("Unknown interface: %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static ULONG WINAPI fnTextSrv_AddRef(ITextServices *iface) +static ULONG WINAPI ITextServicesImpl_AddRef(IUnknown *iface) { - ITextServicesImpl *This = impl_from_ITextServices(iface); - DWORD ref = InterlockedIncrement(&This->ref); + ITextServicesImpl *This = impl_from_IUnknown(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); - TRACE("(%p/%p)->() AddRef from %d\n", This, iface, ref - 1); return ref; } -static ULONG WINAPI fnTextSrv_Release(ITextServices *iface) +static ULONG WINAPI ITextServicesImpl_Release(IUnknown *iface) { - ITextServicesImpl *This = impl_from_ITextServices(iface); - DWORD ref = InterlockedDecrement(&This->ref); + ITextServicesImpl *This = impl_from_IUnknown(iface); + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p)->() Release from %d\n", This, iface, ref + 1); + TRACE("(%p) ref=%d\n", This, ref); if (!ref) { @@ -112,6 +116,36 @@ static ULONG WINAPI fnTextSrv_Release(ITextServices *iface) return ref; } +static const IUnknownVtbl textservices_inner_vtbl = +{ + ITextServicesImpl_QueryInterface, + ITextServicesImpl_AddRef, + ITextServicesImpl_Release +}; + +static inline ITextServicesImpl *impl_from_ITextServices(ITextServices *iface) +{ + return CONTAINING_RECORD(iface, ITextServicesImpl, ITextServices_iface); +} + +static HRESULT WINAPI fnTextSrv_QueryInterface(ITextServices *iface, REFIID riid, void **ppv) +{ + ITextServicesImpl *This = impl_from_ITextServices(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} + +static ULONG WINAPI fnTextSrv_AddRef(ITextServices *iface) +{ + ITextServicesImpl *This = impl_from_ITextServices(iface); + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI fnTextSrv_Release(ITextServices *iface) +{ + ITextServicesImpl *This = impl_from_ITextServices(iface); + return IUnknown_Release(This->outer_unk); +} + DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxSendMessage(ITextServices *iface, UINT msg, WPARAM wparam, LPARAM lparam, LRESULT *plresult) { @@ -371,6 +405,7 @@ HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, I ITextImpl->ref = 1; ITextHost_AddRef(pITextHost); ITextImpl->pMyHost = pITextHost; + ITextImpl->IUnknown_inner.lpVtbl = &textservices_inner_vtbl; ITextImpl->ITextServices_iface.lpVtbl = &textservices_vtbl; ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); ITextImpl->editor->exStyleFlags = 0; @@ -382,11 +417,10 @@ HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, I ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); if (pUnkOuter) - { - FIXME("Support aggregation\n"); - return CLASS_E_NOAGGREGATION; - } + ITextImpl->outer_unk = pUnkOuter; + else + ITextImpl->outer_unk = &ITextImpl->IUnknown_inner; - *ppUnk = (IUnknown *)&ITextImpl->ITextServices_iface; + *ppUnk = &ITextImpl->IUnknown_inner; return S_OK; }

1 0

Michael Stefaniuc : riched20: Avoid a forward declaration of a vtbl.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 6f299c5d76bcece865d46fafae288443c89ce902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f299c5d76bcece865d46fafa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 28 00:31:45 2012 +0200 riched20: Avoid a forward declaration of a vtbl. --- dlls/riched20/txtsrv.c | 84 +++++++++++++++++++++++------------------------- 1 files changed, 40 insertions(+), 44 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index a2fe8dc..25b3283 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -62,49 +62,6 @@ typedef struct ITextServicesImpl { char spare[256]; } ITextServicesImpl; -static const ITextServicesVtbl textservices_Vtbl; - -/****************************************************************** - * CreateTextServices (RICHED20.4) - */ -HRESULT WINAPI CreateTextServices(IUnknown * pUnkOuter, - ITextHost * pITextHost, - IUnknown **ppUnk) -{ - ITextServicesImpl *ITextImpl; - HRESULT hres; - TRACE("%p %p --> %p\n", pUnkOuter, pITextHost, ppUnk); - if (pITextHost == NULL) - return E_POINTER; - - ITextImpl = CoTaskMemAlloc(sizeof(*ITextImpl)); - if (ITextImpl == NULL) - return E_OUTOFMEMORY; - InitializeCriticalSection(&ITextImpl->csTxtSrv); - ITextImpl->csTxtSrv.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ITextServicesImpl.csTxtSrv"); - ITextImpl->ref = 1; - ITextHost_AddRef(pITextHost); - ITextImpl->pMyHost = pITextHost; - ITextImpl->ITextServices_iface.lpVtbl = &textservices_Vtbl; - ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); - ITextImpl->editor->exStyleFlags = 0; - ITextImpl->editor->rcFormat.left = 0; - ITextImpl->editor->rcFormat.top = 0; - ITextImpl->editor->rcFormat.right = 0; - ITextImpl->editor->rcFormat.bottom = 0; - - ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); - - if (pUnkOuter) - { - FIXME("Support aggregation\n"); - return CLASS_E_NOAGGREGATION; - } - - *ppUnk = (IUnknown *)&ITextImpl->ITextServices_iface; - return S_OK; -} - static inline ITextServicesImpl *impl_from_ITextServices(ITextServices *iface) { return CONTAINING_RECORD(iface, ITextServicesImpl, ITextServices_iface); @@ -370,7 +327,7 @@ DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget,8) DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxPropertyBitsChange,12) DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCachedSize,12) -static const ITextServicesVtbl textservices_Vtbl = +static const ITextServicesVtbl textservices_vtbl = { fnTextSrv_QueryInterface, fnTextSrv_AddRef, @@ -394,3 +351,42 @@ static const ITextServicesVtbl textservices_Vtbl = THISCALL(fnTextSrv_OnTxPropertyBitsChange), THISCALL(fnTextSrv_TxGetCachedSize) }; + +/****************************************************************** + * CreateTextServices (RICHED20.4) + */ +HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, IUnknown **ppUnk) +{ + ITextServicesImpl *ITextImpl; + HRESULT hres; + TRACE("%p %p --> %p\n", pUnkOuter, pITextHost, ppUnk); + if (pITextHost == NULL) + return E_POINTER; + + ITextImpl = CoTaskMemAlloc(sizeof(*ITextImpl)); + if (ITextImpl == NULL) + return E_OUTOFMEMORY; + InitializeCriticalSection(&ITextImpl->csTxtSrv); + ITextImpl->csTxtSrv.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ITextServicesImpl.csTxtSrv"); + ITextImpl->ref = 1; + ITextHost_AddRef(pITextHost); + ITextImpl->pMyHost = pITextHost; + ITextImpl->ITextServices_iface.lpVtbl = &textservices_vtbl; + ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); + ITextImpl->editor->exStyleFlags = 0; + ITextImpl->editor->rcFormat.left = 0; + ITextImpl->editor->rcFormat.top = 0; + ITextImpl->editor->rcFormat.right = 0; + ITextImpl->editor->rcFormat.bottom = 0; + + ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); + + if (pUnkOuter) + { + FIXME("Support aggregation\n"); + return CLASS_E_NOAGGREGATION; + } + + *ppUnk = (IUnknown *)&ITextImpl->ITextServices_iface; + return S_OK; +}

1 0

Bruno Jesus : kernel32: Avoid ini cache if file does not exist anymore.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 40f0145d002404ca75c3f998437df1556df45677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40f0145d002404ca75c3f9984… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Mar 28 02:30:27 2012 -0300 kernel32: Avoid ini cache if file does not exist anymore. --- dlls/kernel32/profile.c | 2 +- dlls/kernel32/tests/profile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 89b96a1..3d00c29 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -817,10 +817,10 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) CurProfile->LastWriteTime = LastWriteTime; } CloseHandle(hFile); + return TRUE; } else TRACE("(%s): already opened, not yet created (mru=%d)\n", debugstr_w(buffer), i); - return TRUE; } } diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 745f3b5..211d0c6 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -504,7 +504,7 @@ static void test_profile_refresh(void) /* Cache must be invalidated if file no longer exists and default must be returned */ SetLastError(0xdeadbeef); res = GetPrivateProfileInt(SECTION, KEY, 421, testfile); - todo_wine ok( res == 421 || + ok( res == 421 || broken(res == 0 && GetLastError() == 0xdeadbeef), /* Win9x, WinME */ "Got %d instead of 421\n", res); }

1 0

Bruno Jesus : kernel32/tests: Show that ini cache must not be used if file no longer exists.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: a4e3268886c0dc719ef2882ce9830195fbb5ca08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e3268886c0dc719ef2882ce… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Mar 28 02:26:42 2012 -0300 kernel32/tests: Show that ini cache must not be used if file no longer exists. --- dlls/kernel32/tests/profile.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 44a7927..745f3b5 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -500,6 +500,13 @@ static void test_profile_refresh(void) /* This also deletes the file */ CloseHandle(h); + + /* Cache must be invalidated if file no longer exists and default must be returned */ + SetLastError(0xdeadbeef); + res = GetPrivateProfileInt(SECTION, KEY, 421, testfile); + todo_wine ok( res == 421 || + broken(res == 0 && GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "Got %d instead of 421\n", res); } static void create_test_file(LPCSTR name, LPCSTR data, DWORD size)

1 0

Henri Verbeet : wined3d: Recognise AMD HD 6770M and HD 6750M with closed drivers.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 426535a7dd35aae347c586e721116a3d0fb55252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426535a7dd35aae347c586e72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 27 20:35:53 2012 +0200 wined3d: Recognise AMD HD 6770M and HD 6750M with closed drivers. --- dlls/wined3d/directx.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e5be4ad..3ae0945 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1709,6 +1709,8 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in /* Northern Islands */ {"HD 6900", CARD_AMD_RADEON_HD6900}, {"HD 6800", CARD_AMD_RADEON_HD6800}, + {"HD 6770M",CARD_AMD_RADEON_HD6600M}, + {"HD 6750M",CARD_AMD_RADEON_HD6600M}, {"HD 6630M",CARD_AMD_RADEON_HD6600M}, {"HD 6600M",CARD_AMD_RADEON_HD6600M}, {"HD 6600", CARD_AMD_RADEON_HD6600},

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
71
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 March 2012