March 2012 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp90: Added basic_streambuf<char> implementation.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 143f8e87926d81eb8e6f9d15540c2d1f3182f33f URL: http://source.winehq.org/git/wine.git/?a=commit;h=143f8e87926d81eb8e6f9d155… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 28 11:20:56 2012 +0200 msvcp90: Added basic_streambuf<char> implementation. --- dlls/msvcp90/ios.c | 1858 +++++++++++++++++++++++++----------------------- dlls/msvcp90/msvcp90.h | 1 + 2 files changed, 987 insertions(+), 872 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=143f8e87926d81eb8e6f9…

1 0

Christian Costa : devenum: Add tests for devenum.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: c1b92ca1e2885d507a6c4760544fdded1e4e9221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b92ca1e2885d507a6c47605… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Mar 28 00:38:39 2012 +0200 devenum: Add tests for devenum. --- configure | 1 + configure.ac | 1 + dlls/devenum/tests/Makefile.in | 7 ++ dlls/devenum/tests/devenum.c | 124 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 133 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 1a810b9..ec451d1 100755 --- a/configure +++ b/configure @@ -15001,6 +15001,7 @@ wine_fn_config_test dlls/ddraw/tests ddraw_test wine_fn_config_dll ddrawex enable_ddrawex wine_fn_config_test dlls/ddrawex/tests ddrawex_test wine_fn_config_dll devenum enable_devenum po +wine_fn_config_test dlls/devenum/tests devenum_test wine_fn_config_dll dhcpcsvc enable_dhcpcsvc wine_fn_config_dll dinput enable_dinput implib,po,staticimplib wine_fn_config_test dlls/dinput/tests dinput_test diff --git a/configure.ac b/configure.ac index bebbb91..c499f86 100644 --- a/configure.ac +++ b/configure.ac @@ -2508,6 +2508,7 @@ WINE_CONFIG_TEST(dlls/ddraw/tests) WINE_CONFIG_DLL(ddrawex) WINE_CONFIG_TEST(dlls/ddrawex/tests) WINE_CONFIG_DLL(devenum,,[po]) +WINE_CONFIG_TEST(dlls/devenum/tests) WINE_CONFIG_DLL(dhcpcsvc) WINE_CONFIG_DLL(dinput,,[implib,po,staticimplib]) WINE_CONFIG_TEST(dlls/dinput/tests) diff --git a/dlls/devenum/tests/Makefile.in b/dlls/devenum/tests/Makefile.in new file mode 100644 index 0000000..a6b1951 --- /dev/null +++ b/dlls/devenum/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = devenum.dll +IMPORTS = oleaut32 ole32 advapi32 + +C_SRCS = \ + devenum.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c new file mode 100644 index 0000000..d8cd92f --- /dev/null +++ b/dlls/devenum/tests/devenum.c @@ -0,0 +1,124 @@ +/* + * Some unit tests for devenum + * + * Copyright (C) 2012 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdio.h> + +#include "wine/test.h" +#include "initguid.h" +#include "ole2.h" +#include "strmif.h" +#include "uuids.h" + +static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; + +struct category +{ + const char * name; + const GUID * clsid; +}; + +static struct category am_categories[] = +{ + { "Legacy AM Filter category", &CLSID_LegacyAmFilterCategory }, + { "Audio renderer category", &CLSID_AudioRendererCategory }, + { "Midi renderer category", &CLSID_MidiRendererCategory }, + { "Audio input device category", &CLSID_AudioInputDeviceCategory }, + { "Video input device category", &CLSID_VideoInputDeviceCategory }, + { "Audio compressor category", &CLSID_AudioCompressorCategory }, + { "Video compressor category", &CLSID_VideoCompressorCategory } +}; + +static void test_devenum(void) +{ + HRESULT res; + ICreateDevEnum* create_devenum; + IEnumMoniker* enum_moniker = NULL; + int i; + + CoInitialize(NULL); + + res = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, + &IID_ICreateDevEnum, (LPVOID*)&create_devenum); + if (res != S_OK) { + skip("Cannot create SystemDeviceEnum object (%x)\n", res); + CoUninitialize(); + return; + } + + trace("\n"); + + for (i = 0; i < (sizeof(am_categories) / sizeof(struct category)); i++) + { + trace("%s:\n", am_categories[i].name); + + res = ICreateDevEnum_CreateClassEnumerator(create_devenum, am_categories[i].clsid, &enum_moniker, 0); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + if (res == S_OK) + { + IMoniker* moniker; + while (IEnumMoniker_Next(enum_moniker, 1, &moniker, NULL) == S_OK) + { + IPropertyBag* prop_bag = NULL; + VARIANT var; + HRESULT hr; + + VariantInit(&var); + hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); + ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok((hr == S_OK) || broken(hr == 0x80070002), "IPropertyBag_Read failed with error %x\n", hr); + + if (SUCCEEDED(hr)) + { + trace(" %s\n", wine_dbgstr_w(V_UNION(&var, bstrVal))); + VariantClear(&var); + } + else + { + trace(" ???\n"); + } + } + + if (prop_bag) + IPropertyBag_Release(prop_bag); + IMoniker_Release(moniker); + } + IEnumMoniker_Release(enum_moniker); + } + + trace("\n"); + } + + ICreateDevEnum_Release(create_devenum); + + CoUninitialize(); +} + +/* CLSID_CDeviceMoniker */ + +START_TEST(devenum) +{ + test_devenum(); +}

1 0

Christian Costa : amstream/tests: Add tests for querying interfaces and creating samples on video and audio media streams .
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 303ce38bb3ed200b665051b992b6815c0c0a88e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=303ce38bb3ed200b665051b99… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Mar 27 23:46:19 2012 +0200 amstream/tests: Add tests for querying interfaces and creating samples on video and audio media streams. --- dlls/amstream/tests/amstream.c | 88 ++++++++++++++++++++++++++++++++-------- 1 files changed, 71 insertions(+), 17 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 176df7e..39add30 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -171,8 +171,6 @@ static void test_media_streams(void) IMediaStream *video_stream = NULL; IMediaStream *audio_stream = NULL; IMediaStream *dummy_stream; - IDirectDrawMediaStream *ddraw_stream = NULL; - IDirectDrawStreamSample *ddraw_sample = NULL; IMediaStreamFilter* media_stream_filter = NULL; if (!create_ammultimediastream()) @@ -192,6 +190,12 @@ static void test_media_streams(void) hr = IAMMultiMediaStream_GetFilter(pams, &media_stream_filter); ok(hr == S_OK, "IAMMultiMediaStream_GetFilter returned: %x\n", hr); + /* Verify behaviour with invalid purpose id */ + hr = IAMMultiMediaStream_GetMediaStream(pams, &IID_IUnknown, &dummy_stream); + ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &IID_IUnknown, 0, NULL); + ok(hr == MS_E_PURPOSEID, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + /* Verify there is no video media stream */ hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &video_stream); ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); @@ -222,6 +226,38 @@ static void test_media_streams(void) IMediaStream_Release(dummy_stream); } + /* Check interfaces and samples for video */ + if (video_stream) + { + IAMMediaStream* am_media_stream; + IAudioMediaStream* audio_media_stream; + IDirectDrawMediaStream *ddraw_stream = NULL; + IDirectDrawStreamSample *ddraw_sample = NULL; + + hr = IMediaStream_QueryInterface(video_stream, &IID_IAMMediaStream, (LPVOID*)&am_media_stream); + todo_wine ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); + todo_wine ok((void*)am_media_stream == (void*)video_stream, "Not same interface, got %p expected %p\n", am_media_stream, video_stream); + if (hr == S_OK) + IAMMediaStream_Release(am_media_stream); + + hr = IMediaStream_QueryInterface(video_stream, &IID_IAudioMediaStream, (LPVOID*)&audio_media_stream); + ok(hr == E_NOINTERFACE, "IMediaStream_QueryInterface returned: %x\n", hr); + + hr = IMediaStream_QueryInterface(video_stream, &IID_IDirectDrawMediaStream, (LPVOID*)&ddraw_stream); + ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &ddraw_sample); + todo_wine ok(hr==S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); + } + + if (ddraw_sample) + IDirectDrawMediaSample_Release(ddraw_sample); + if (ddraw_stream) + IDirectDrawMediaStream_Release(ddraw_stream); + } + /* Verify there is no audio media stream */ hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryAudio, &audio_stream); ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); @@ -274,28 +310,46 @@ static void test_media_streams(void) IMediaStream_Release(dummy_stream); } - /* Verify behaviour with invalid purpose id */ - hr = IAMMultiMediaStream_GetMediaStream(pams, &IID_IUnknown, &dummy_stream); - ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &IID_IUnknown, 0, NULL); - ok(hr == MS_E_PURPOSEID, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); - - if (video_stream) + /* Check interfaces and samples for audio */ + if (audio_stream) { - hr = IMediaStream_QueryInterface(video_stream, &IID_IDirectDrawMediaStream, (LPVOID*)&ddraw_stream); - ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); + IAMMediaStream* am_media_stream; + IDirectDrawMediaStream* ddraw_stream = NULL; + IAudioMediaStream* audio_media_stream = NULL; + IAudioStreamSample *audio_sample = NULL; + + hr = IMediaStream_QueryInterface(audio_stream, &IID_IAMMediaStream, (LPVOID*)&am_media_stream); + todo_wine ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); + todo_wine ok((void*)am_media_stream == (void*)audio_stream, "Not same interface, got %p expected %p\n", am_media_stream, video_stream); + if (hr == S_OK) + IAMMediaStream_Release(am_media_stream); + + hr = IMediaStream_QueryInterface(audio_stream, &IID_IDirectDrawMediaStream, (LPVOID*)&ddraw_stream); + todo_wine ok(hr == E_NOINTERFACE, "IMediaStream_QueryInterface returned: %x\n", hr); + + hr = IMediaStream_QueryInterface(audio_stream, &IID_IAudioMediaStream, (LPVOID*)&audio_media_stream); + todo_wine ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); if (SUCCEEDED(hr)) { - hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &ddraw_sample); - todo_wine ok(hr==S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); + IAudioData* audio_data = NULL; + hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); + todo_wine ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + + hr = IAudioMediaStream_CreateSample(audio_media_stream, NULL, 0, &audio_sample); + todo_wine ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); + hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample); + todo_wine ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr); + + if (audio_data) + IAudioData_Release(audio_data); + if (audio_sample) + IAudioStreamSample_Release(audio_sample); + if (audio_media_stream) + IAudioMediaStream_Release(audio_media_stream); } } - if (ddraw_sample) - IDirectDrawMediaSample_Release(ddraw_sample); - if (ddraw_stream) - IDirectDrawMediaStream_Release(ddraw_stream); if (video_stream) IMediaStream_Release(video_stream); if (audio_stream)

1 0

Christian Costa : amstream/tests: Verify if the dsound renderer is created when we create an audio stream with the default renderer .
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 3aab79792904c791d8a79bccc996d0cfca2ef952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aab79792904c791d8a79bccc… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Mar 27 23:46:11 2012 +0200 amstream/tests: Verify if the dsound renderer is created when we create an audio stream with the default renderer. --- dlls/amstream/tests/amstream.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index dce8c7d..176df7e 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -22,6 +22,7 @@ #include "wine/test.h" #include "initguid.h" +#include "uuids.h" #include "amstream.h" #include "vfwmsgs.h" @@ -228,6 +229,32 @@ static void test_media_streams(void) /* Verify no stream is created when using the default renderer for audio stream */ hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); ok((hr == S_OK) || (hr == VFW_E_NO_AUDIO_HARDWARE), "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + if (hr == S_OK) + { + IGraphBuilder* filtergraph = NULL; + IBaseFilter* filter = NULL; + const WCHAR name[] = {'0','0','0','1',0}; + CLSID clsid; + + hr = IAMMultiMediaStream_GetFilterGraph(pams, &filtergraph); + ok(hr == S_OK, "IAMMultiMediaStream_GetFilterGraph returned: %x\n", hr); + if (hr == S_OK) + { + hr = IGraphBuilder_FindFilterByName(filtergraph, name, &filter); + ok(hr == S_OK, "IGraphBuilder_FindFilterByName returned: %x\n", hr); + } + if (hr == S_OK) + { + hr = IBaseFilter_GetClassID(filter, &clsid); + ok(hr == S_OK, "IGraphBuilder_FindFilterByName returned: %x\n", hr); + } + if (hr == S_OK) + ok(IsEqualGUID(&clsid, &CLSID_DSoundRender), "Got wrong CLSID\n"); + if (filter) + IBaseFilter_Release(filter); + if (filtergraph) + IGraphBuilder_Release(filtergraph); + } hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryAudio, &audio_stream); ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr);

1 0

Christian Costa : amstream: Add stream to the media stream filter in IAMMultiMediaStreamImpl_AddMediaStream .
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 1349cf690248f21db30744b07f22eef3aeef8ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1349cf690248f21db30744b07… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Mar 27 23:46:03 2012 +0200 amstream: Add stream to the media stream filter in IAMMultiMediaStreamImpl_AddMediaStream. --- dlls/amstream/amstream.c | 8 +++++++- dlls/amstream/tests/amstream.c | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index b599bb6..89ea46b 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -333,7 +333,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream IMediaStream* pStream; IMediaStream** pNewStreams; - FIXME("(%p/%p)->(%p,%s,%x,%p) partial stub!\n", This, iface, pStreamObject, debugstr_guid(PurposeId), dwFlags, ppNewStream); + TRACE("(%p/%p)->(%p,%s,%x,%p)\n", This, iface, pStreamObject, debugstr_guid(PurposeId), dwFlags, ppNewStream); if (!IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && !IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) return MS_E_PURPOSEID; @@ -379,6 +379,12 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream *ppNewStream = pStream; } + if (SUCCEEDED(hr)) + { + /* Add stream to the media stream filter */ + IMediaStreamFilter_AddMediaStream((IMediaStreamFilter*)This->media_stream_filter, (IAMMediaStream*)pStream); + } + return hr; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 81a7565..dce8c7d 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -215,8 +215,8 @@ static void test_media_streams(void) if (media_stream_filter) { hr = IMediaStreamFilter_GetMediaStream(media_stream_filter, &MSPID_PrimaryVideo, &dummy_stream); - todo_wine ok(hr == S_OK, "IMediaStreamFilter_GetMediaStream returned: %x\n", hr); - todo_wine ok(dummy_stream == video_stream, "Got wrong returned pointer %p, expected %p\n", dummy_stream, video_stream); + ok(hr == S_OK, "IMediaStreamFilter_GetMediaStream returned: %x\n", hr); + ok(dummy_stream == video_stream, "Got wrong returned pointer %p, expected %p\n", dummy_stream, video_stream); if (SUCCEEDED(hr)) IMediaStream_Release(dummy_stream); } @@ -241,8 +241,8 @@ static void test_media_streams(void) if (media_stream_filter) { hr = IMediaStreamFilter_GetMediaStream(media_stream_filter, &MSPID_PrimaryAudio, &dummy_stream); - todo_wine ok(hr == S_OK, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); - todo_wine ok(dummy_stream == audio_stream, "Got wrong returned pointer %p, expected %p\n", dummy_stream, audio_stream); + ok(hr == S_OK, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + ok(dummy_stream == audio_stream, "Got wrong returned pointer %p, expected %p\n", dummy_stream, audio_stream); if (SUCCEEDED(hr)) IMediaStream_Release(dummy_stream); }

1 0

Piotr Caban : msvcp90: Added numpunct<wchar> implementation.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 52bcd2e082fb05a4d1e334e8df1eea6344bca15f URL: http://source.winehq.org/git/wine.git/?a=commit;h=52bcd2e082fb05a4d1e334e8d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 28 11:20:22 2012 +0200 msvcp90: Added numpunct<wchar> implementation. --- dlls/msvcp90/locale.c | 170 +++++++++++++++++++++++++++++++++++++----------- dlls/msvcp90/msvcp90.h | 2 + 2 files changed, 135 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52bcd2e082fb05a4d1e33…

1 0

Andoni Morales Alastruey : msi: Implement MSIMODIFY_MERGE function in TABLE_modify.
by Alexandre Julliard March 28, 2012

March 28, 2012

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

Robert van Herk : msvcrt: Fix file mode T (temporary file).
by Alexandre Julliard March 28, 2012

March 28, 2012

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

André Hentschel : winebuild: Create stubs for ARM.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 220aeda3a0e69309c65a1f09843fae7e517e0145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=220aeda3a0e69309c65a1f098… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 27 21:36:26 2012 +0200 winebuild: Create stubs for ARM. --- tools/winebuild/import.c | 15 +++++++++++++++ tools/winebuild/parser.c | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index af02a9d..c73b86c 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1256,6 +1256,21 @@ void output_stubs( DLLSPEC *spec ) output( "\tmovq $%d,%%rsi\n", odp->ordinal ); output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); break; + case CPU_ARM: + output( "\tldr r0,[PC,#0]\n"); + output( "\tmov PC,PC\n"); + output( "\t.long .L__wine_spec_file_name\n" ); + output( "\tldr r1,[PC,#0]\n"); + output( "\tmov PC,PC\n"); + if (exp_name) + { + output( "\t.long .L%s_string\n", name ); + count++; + } + else + output( "\t.long %d\n", odp->ordinal ); + output( "\tbl %s\n", asm_name("__wine_spec_unimplemented_stub") ); + break; default: assert(0); } diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 6a1eb85..1e23e3c 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -403,9 +403,9 @@ static int parse_spec_stub( ORDDEF *odp, DLLSPEC *spec ) odp->link_name = xstrdup(""); /* don't bother generating stubs for Winelib */ if (odp->flags & FLAG_CPU_MASK) - odp->flags &= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64); + odp->flags &= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM); else - odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64); + odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM); return parse_spec_arguments( odp, spec, 1 ); }

1 0

Christian Costa : include: Add missing error codes.
by Alexandre Julliard March 28, 2012

March 28, 2012

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