June 2015 - Wine-commits - list.winehq.org

Hans Leidekker : msi/tests: Fix test failures on win2k3.
by Alexandre Julliard 22 Jun '15

22 Jun '15

Module: wine Branch: master Commit: 806ff30f921c9463e39dde6b0ce601eb0605b8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=806ff30f921c9463e39dde6b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 12:12:08 2015 +0200 msi/tests: Fix test failures on win2k3. --- dlls/msi/tests/install.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=806ff30f921c9463e39dd…

1 0

Hans Leidekker : msi: Open database cabinet streams through the streams implementation.
by Alexandre Julliard 22 Jun '15

22 Jun '15

Module: wine Branch: master Commit: 597c5f9c4b35c7645d916cd687cede42fd331d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=597c5f9c4b35c7645d916cd68… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 12:12:48 2015 +0200 msi: Open database cabinet streams through the streams implementation. --- dlls/msi/action.c | 7 ++++--- dlls/msi/media.c | 35 +++++++++++++++++++++++------------ dlls/msi/tests/patch.c | 30 +++++++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 16 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e87dd7f..88bb1bb 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1313,9 +1313,10 @@ static UINT load_media( MSIRECORD *row, LPVOID param ) const WCHAR *cabinet = MSI_RecordGetString( row, 4 ); /* FIXME: load external cabinets and directory sources too */ - if (!cabinet || cabinet[0] != '#') return ERROR_SUCCESS; - msi_add_cabinet_stream( package, disk_id, package->db->storage, cabinet ); - return ERROR_SUCCESS; + if (!cabinet || cabinet[0] != '#' || disk_id >= MSI_INITIAL_MEDIA_TRANSFORM_DISKID) + return ERROR_SUCCESS; + + return msi_add_cabinet_stream( package, disk_id, package->db->storage, cabinet ); } static UINT load_all_media( MSIPACKAGE *package ) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 7c8c94f..d75f59f 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -220,28 +220,39 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) { MSICABINETSTREAM *cab; IStream *stream; - WCHAR *encoded; - HRESULT hr; - cab = msi_get_cabinet_stream( package_disk.package, package_disk.id ); - if (!cab) + if (!(cab = msi_get_cabinet_stream( package_disk.package, package_disk.id ))) { WARN("failed to get cabinet stream\n"); return -1; } - if (!cab->stream[0] || !(encoded = encode_streamname( FALSE, cab->stream + 1 ))) + if (cab->storage == package_disk.package->db->storage) { - WARN("failed to encode stream name\n"); - return -1; + UINT r = msi_get_stream( package_disk.package->db, cab->stream + 1, &stream ); + if (r != ERROR_SUCCESS) + { + WARN("failed to get stream %u\n", r); + return -1; + } } - hr = IStorage_OpenStream( cab->storage, encoded, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stream ); - if (FAILED(hr)) + else /* patch storage */ { - WARN("failed to open stream 0x%08x\n", hr); + HRESULT hr; + WCHAR *encoded; + + if (!(encoded = encode_streamname( FALSE, cab->stream + 1 ))) + { + WARN("failed to encode stream name\n"); + return -1; + } + hr = IStorage_OpenStream( cab->storage, encoded, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stream ); msi_free( encoded ); - return -1; + if (FAILED(hr)) + { + WARN("failed to open stream 0x%08x\n", hr); + return -1; + } } - msi_free( encoded ); return (INT_PTR)stream; } diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 62a4b86..3c23656 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -969,6 +969,29 @@ static UINT find_entry( MSIHANDLE hdb, const char *table, const char *entry ) return r; } +static UINT find_entryW( MSIHANDLE hdb, const WCHAR *table, const WCHAR *entry ) +{ + static const WCHAR fmt[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','`','%','s','`',' ', + 'W','H','E','R','E',' ','`','N','a','m','e','`',' ','=',' ','\'','%','s','\'',0}; + WCHAR query[0x100]; + MSIHANDLE hview, hrec; + UINT r; + + wsprintfW( query, fmt, table, entry ); + r = MsiDatabaseOpenViewW( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + MsiCloseHandle( hrec ); + return r; +} + static INT get_integer( MSIHANDLE hdb, UINT field, const char *query) { UINT r; @@ -1032,11 +1055,13 @@ static char *get_string( MSIHANDLE hdb, UINT field, const char *query) static void test_system_tables( void ) { + static const char patchsource[] = "MSPSRC0F96CDC04CDF4304B2837B9264889EF7"; + static const WCHAR streamsW[] = {'_','S','t','r','e','a','m','s',0}; + static const WCHAR CAB_msitest_encodedW[] = {0x3a8c,0x47cb,0x45b0,0x45ec,0x45a8,0x4837,0}; UINT r; char *cr; const char *query; MSIHANDLE hproduct, hdb, hview, hrec; - static const char patchsource[] = "MSPSRC0F96CDC04CDF4304B2837B9264889EF7"; if (!pMsiApplyPatchA) { @@ -1138,6 +1163,9 @@ static void test_system_tables( void ) r = find_entry( hdb, "_Streams", "\5SummaryInformation" ); ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + r = find_entryW( hdb, streamsW, CAB_msitest_encodedW ); + ok( r == ERROR_NO_MORE_ITEMS, "failed to find entry %u\n", r ); + query = "SELECT * FROM `_Storages`"; r = MsiDatabaseOpenViewA( hdb, query, &hview ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r );

1 0

Hans Leidekker : wbemprox: Fix some memory leaks (Coverity).
by Alexandre Julliard 22 Jun '15

22 Jun '15

Module: wine Branch: master Commit: 13490899f1439d4653ef96c308d93b4c42ca0ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13490899f1439d4653ef96c30… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 12:13:30 2015 +0200 wbemprox: Fix some memory leaks (Coverity). --- dlls/wbemprox/builtin.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b55e9ad..0c6f8a7 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1586,6 +1586,8 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c for (;;) { + heap_free( glob ); + heap_free( path ); path = pop_dir( dirstack, &len ); if (!(glob = build_glob( root[0], path, len ))) { @@ -1635,8 +1637,6 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c FindClose( handle ); } if (!peek_dir( dirstack )) break; - heap_free( glob ); - heap_free( path ); } } @@ -1678,6 +1678,8 @@ static enum fill_status fill_directory( struct table *table, const struct expr * for (;;) { + heap_free( glob ); + heap_free( path ); path = pop_dir( dirstack, &len ); if (!(glob = build_glob( root[0], path, len ))) { @@ -1728,8 +1730,6 @@ static enum fill_status fill_directory( struct table *table, const struct expr * FindClose( handle ); } if (!peek_dir( dirstack )) break; - heap_free( glob ); - heap_free( path ); } }

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.Primary.
by Alexandre Julliard 22 Jun '15

22 Jun '15

Module: wine Branch: master Commit: bd647dc013d275781c0608a767e5f5af8a3e65c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd647dc013d275781c0608a76… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 12:13:56 2015 +0200 wbemprox: Implement Win32_OperatingSystem.Primary. --- dlls/wbemprox/builtin.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 0c6f8a7..41a8e97 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -271,6 +271,8 @@ static const WCHAR prop_pnpdeviceidW[] = {'P','N','P','D','e','v','i','c','e','I','D',0}; static const WCHAR prop_pprocessidW[] = {'P','a','r','e','n','t','P','r','o','c','e','s','s','I','D',0}; +static const WCHAR prop_primaryW[] = + {'P','r','i','m','a','r','y',0}; static const WCHAR prop_processidW[] = {'P','r','o','c','e','s','s','I','D',0}; static const WCHAR prop_processoridW[] = @@ -480,6 +482,7 @@ static const struct column col_os[] = { prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, { prop_ostypeW, CIM_UINT16, VT_I4 }, + { prop_primaryW, CIM_BOOLEAN }, { prop_serialnumberW, CIM_STRING }, { prop_servicepackmajorW, CIM_UINT16, VT_I4 }, { prop_servicepackminorW, CIM_UINT16, VT_I4 }, @@ -861,6 +864,7 @@ struct record_operatingsystem UINT32 oslanguage; UINT32 osproductsuite; UINT16 ostype; + int primary; const WCHAR *serialnumber; UINT16 servicepackmajor; UINT16 servicepackminor; @@ -2491,6 +2495,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->oslanguage = GetSystemDefaultLangID(); rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ + rec->primary = -1; rec->serialnumber = os_serialnumberW; rec->servicepackmajor = 3; rec->servicepackminor = 0;

1 0

Hans Leidekker : wbemprox: Implement Win32_Process.WorkingSetSize.
by Alexandre Julliard 22 Jun '15

22 Jun '15

Module: wine Branch: master Commit: 927400be6318ff65bb8b99f6c59faeb1ca075e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=927400be6318ff65bb8b99f6c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 12:14:21 2015 +0200 wbemprox: Implement Win32_Process.WorkingSetSize. --- dlls/wbemprox/builtin.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 41a8e97..f1e5c4a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -351,6 +351,8 @@ static const WCHAR prop_volumenameW[] = {'V','o','l','u','m','e','N','a','m','e',0}; static const WCHAR prop_volumeserialnumberW[] = {'V','o','l','u','m','e','S','e','r','i','a','l','N','u','m','b','e','r',0}; +static const WCHAR prop_workingsetsizeW[] = + {'W','o','r','k','i','n','g','S','e','t','S','i','z','e',0}; /* column definitions must be kept in sync with record structures below */ static const struct column col_baseboard[] = @@ -521,16 +523,17 @@ static const struct column col_printer[] = }; static const struct column col_process[] = { - { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_commandlineW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_handleW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_pprocessidW, CIM_UINT32, VT_I4 }, - { prop_processidW, CIM_UINT32, VT_I4 }, - { prop_threadcountW, CIM_UINT32, VT_I4 }, + { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_commandlineW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_handleW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_pprocessidW, CIM_UINT32, VT_I4 }, + { prop_processidW, CIM_UINT32, VT_I4 }, + { prop_threadcountW, CIM_UINT32, VT_I4 }, + { prop_workingsetsizeW, CIM_UINT64 }, /* methods */ - { method_getownerW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } + { method_getownerW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } }; static const struct column col_processor[] = { @@ -911,6 +914,7 @@ struct record_process UINT32 pprocess_id; UINT32 process_id; UINT32 thread_count; + UINT64 workingsetsize; /* methods */ class_method *get_owner; }; @@ -2204,16 +2208,17 @@ static enum fill_status fill_process( struct table *table, const struct expr *co if (!resize_table( table, row + 1, sizeof(*rec) )) goto done; rec = (struct record_process *)(table->data + offset); - rec->caption = heap_strdupW( entry.szExeFile ); - rec->commandline = get_cmdline( entry.th32ProcessID ); - rec->description = heap_strdupW( entry.szExeFile ); + rec->caption = heap_strdupW( entry.szExeFile ); + rec->commandline = get_cmdline( entry.th32ProcessID ); + rec->description = heap_strdupW( entry.szExeFile ); sprintfW( handle, fmtW, entry.th32ProcessID ); - rec->handle = heap_strdupW( handle ); - rec->name = heap_strdupW( entry.szExeFile ); - rec->process_id = entry.th32ProcessID; - rec->pprocess_id = entry.th32ParentProcessID; - rec->thread_count = entry.cntThreads; - rec->get_owner = process_get_owner; + rec->handle = heap_strdupW( handle ); + rec->name = heap_strdupW( entry.szExeFile ); + rec->process_id = entry.th32ProcessID; + rec->pprocess_id = entry.th32ParentProcessID; + rec->thread_count = entry.cntThreads; + rec->workingsetsize = 0; + rec->get_owner = process_get_owner; if (!match_row( table, row, cond, &status )) { free_row_values( table, row );

1 0

Bernhard Übelacker : advapi32: Fix RegEnumValueW when enumerating long values.
by Alexandre Julliard 22 Jun '15

22 Jun '15

Module: wine Branch: master Commit: 443ef6e7a6026f6aaa5ffcfcbc33d582da780ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=443ef6e7a6026f6aaa5ffcfcb… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Sun Jun 21 18:25:48 2015 +0200 advapi32: Fix RegEnumValueW when enumerating long values. --- dlls/advapi32/registry.c | 68 +++++++++++++++++++----------------------- dlls/advapi32/tests/registry.c | 13 ++++++++ 2 files changed, 44 insertions(+), 37 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 30130b1..f8bf21a 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1922,53 +1922,47 @@ LSTATUS WINAPI RegEnumValueW( HKEY hkey, DWORD index, LPWSTR value, LPDWORD val_ status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, buffer, total_size, &total_size ); - if (status && status != STATUS_BUFFER_OVERFLOW) goto done; - if (value || data) + /* retry with a dynamically allocated buffer */ + while (status == STATUS_BUFFER_OVERFLOW) { - /* retry with a dynamically allocated buffer */ - while (status == STATUS_BUFFER_OVERFLOW) - { - if (buf_ptr != buffer) heap_free( buf_ptr ); - if (!(buf_ptr = heap_alloc( total_size ))) - return ERROR_NOT_ENOUGH_MEMORY; - info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; - status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, - buf_ptr, total_size, &total_size ); - } + if (buf_ptr != buffer) heap_free( buf_ptr ); + if (!(buf_ptr = heap_alloc( total_size ))) return ERROR_NOT_ENOUGH_MEMORY; + info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; + status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, + buf_ptr, total_size, &total_size ); + } - if (status) goto done; + if (status) goto done; - if (value) + if (value) + { + if (info->NameLength/sizeof(WCHAR) >= *val_count) { - if (info->NameLength/sizeof(WCHAR) >= *val_count) - { - status = STATUS_BUFFER_OVERFLOW; - goto overflow; - } - memcpy( value, info->Name, info->NameLength ); - *val_count = info->NameLength / sizeof(WCHAR); - value[*val_count] = 0; + status = STATUS_BUFFER_OVERFLOW; + goto overflow; } + memcpy( value, info->Name, info->NameLength ); + *val_count = info->NameLength / sizeof(WCHAR); + value[*val_count] = 0; + } - if (data) + if (data) + { + if (total_size - info->DataOffset > *count) { - if (total_size - info->DataOffset > *count) - { - status = STATUS_BUFFER_OVERFLOW; - goto overflow; - } - memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); - if (total_size - info->DataOffset <= *count-sizeof(WCHAR) && is_string(info->Type)) - { - /* if the type is REG_SZ and data is not 0-terminated - * and there is enough space in the buffer NT appends a \0 */ - WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); - if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; - } + status = STATUS_BUFFER_OVERFLOW; + goto overflow; + } + memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); + if (total_size - info->DataOffset <= *count-sizeof(WCHAR) && is_string(info->Type)) + { + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); + if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; } } - else status = STATUS_SUCCESS; overflow: if (type) *type = info->Type; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c801384..561101b 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -522,6 +522,8 @@ static void test_enum_value(void) static const WCHAR foobarW[] = {'f','o','o','b','a','r',0}; static const WCHAR testW[] = {'T','e','s','t',0}; static const WCHAR xxxW[] = {'x','x','x','x','x','x','x','x',0}; + WCHAR longW[128]; + int i; /* create the working key for new 'Test' value */ res = RegCreateKeyA( hkey_main, "TestKey", &test_key ); @@ -710,6 +712,17 @@ static void test_enum_value(void) ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); ok( !memcmp( dataW, foobarW, sizeof(foobarW) ), "data is not 'foobar'\n" ); + /* tests the overflow case for the fixed "char buffer[]" in RegEnumValueW */ + for (i = 0; i < sizeof(longW)/sizeof(WCHAR); i++) longW[i] = 'x'; + longW[i - 1] = 0; + res = RegSetValueExW( test_key, testW, 0, REG_SZ, (const BYTE *)longW, sizeof(longW) ); + ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); + data_count = 20; + type = 1234; + res = RegEnumValueW( test_key, 0, NULL, NULL, NULL, &type, NULL, &data_count); + ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); + ok( data_count == sizeof(longW), "data_count set to %d\n", data_count ); + cleanup: RegDeleteKeyA(test_key, ""); RegCloseKey(test_key);

1 0

Piotr Caban : msvcr110: Add __crtGetLocaleInfoEx implementation.
by Alexandre Julliard 22 Jun '15

22 Jun '15

Module: wine Branch: master Commit: d940ac24126d7b3a1c568edc5b1bdbd7118977ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d940ac24126d7b3a1c568edc5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 22 12:52:30 2015 +0200 msvcr110: Add __crtGetLocaleInfoEx implementation. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcrt/locale.c | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 516af25..e5ef1bb 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -917,7 +917,7 @@ @ stub -arch=i386,win64 __crtFlsGetValue @ stub -arch=i386,win64 __crtFlsSetValue @ stub -arch=i386,win64 __crtGetDateFormatEx -@ stub -arch=i386,win64 __crtGetLocaleInfoEx +@ cdecl -arch=i386,win64 __crtGetLocaleInfoEx(wstr long ptr long) @ cdecl __crtGetShowWindowMode() MSVCR110__crtGetShowWindowMode @ stub -arch=i386,win64 __crtGetTimeFormatEx @ stub -arch=i386,win64 __crtGetUserDefaultLocaleName diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 6646df3..ff034b7 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -902,7 +902,7 @@ @ stub -arch=i386,win64 __crtFlsSetValue @ stub -arch=i386,win64 __crtGetDateFormatEx @ stub __crtGetFileInformationByHandleEx -@ stub -arch=i386,win64 __crtGetLocaleInfoEx +@ cdecl -arch=i386,win64 __crtGetLocaleInfoEx(wstr long ptr long) @ cdecl __crtGetShowWindowMode() MSVCR110__crtGetShowWindowMode @ stub __crtGetTickCount64 @ stub -arch=i386,win64 __crtGetTimeFormatEx diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index ad0cc98..bd919e6 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -628,6 +628,15 @@ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, MSVCRT_wchar_t *buffer, i } /********************************************************************* + * __crtGetLocaleInfoEx (MSVC110.@) + */ +int CDECL __crtGetLocaleInfoEx( const WCHAR *locale, LCTYPE type, MSVCRT_wchar_t *buffer, int len ) +{ + TRACE("(%s, %x, %p, %d)\n", debugstr_w(locale), type, buffer, len); + return GetLocaleInfoEx(locale, type, buffer, len); +} + +/********************************************************************* * btowc(MSVCRT.@) */ MSVCRT_wint_t CDECL MSVCRT_btowc(int c)

1 0

Nikolay Sivov : ole32/tests: Fix source buffer leak (Valgrind).
by Alexandre Julliard 22 Jun '15

22 Jun '15

Module: wine Branch: master Commit: 1e97a2db17950fc853c917bef734a2871201c5c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e97a2db17950fc853c917bef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 20 21:25:25 2015 +0300 ole32/tests: Fix source buffer leak (Valgrind). --- dlls/ole32/tests/usrmarshal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index b1803df..23cb910 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -869,6 +869,8 @@ static void test_marshal_SNB(void) g_expect_user_free = TRUE; SNB_UserFree(&umcb.Flags, &snb2); g_expect_user_free = FALSE; + + HeapFree(GetProcessHeap(), 0, src); } static void test_marshal_HDC(void)

1 0

Nikolay Sivov : amstream: Get rid of some casts by using proper iface types.
by Alexandre Julliard 22 Jun '15

22 Jun '15

Module: wine Branch: master Commit: 5b248546806c247c8a3c5011fc2d78af8d9da253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b248546806c247c8a3c5011f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 20 23:34:58 2015 +0300 amstream: Get rid of some casts by using proper iface types. --- dlls/amstream/amstream.c | 41 ++++++++++++++++++--------------------- dlls/amstream/amstream_private.h | 5 +++-- dlls/amstream/audiodata.c | 2 -- dlls/amstream/main.c | 1 - dlls/amstream/mediastream.c | 9 ++++----- dlls/amstream/mediastreamfilter.c | 1 - 6 files changed, 26 insertions(+), 33 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index fcef7ec..372ddd6 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -27,7 +27,6 @@ #include "wingdi.h" #include "amstream_private.h" -#include "amstream.h" WINE_DEFAULT_DEBUG_CHANNEL(amstream); @@ -37,10 +36,10 @@ typedef struct { IGraphBuilder* pFilterGraph; IMediaSeeking* media_seeking; IMediaControl* media_control; - IBaseFilter* media_stream_filter; + IMediaStreamFilter *media_stream_filter; IPin* ipin; ULONG nbStreams; - IMediaStream** pStreams; + IAMMediaStream **pStreams; STREAM_TYPE StreamType; OAEVENT event; } IAMMultiMediaStreamImpl; @@ -114,11 +113,11 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) if (!ref) { for(i = 0; i < This->nbStreams; i++) - IMediaStream_Release(This->pStreams[i]); + IAMMediaStream_Release(This->pStreams[i]); if (This->ipin) IPin_Release(This->ipin); if (This->media_stream_filter) - IBaseFilter_Release(This->media_stream_filter); + IMediaStreamFilter_Release(This->media_stream_filter); if (This->media_seeking) IMediaSeeking_Release(This->media_seeking); if (This->media_control) @@ -151,10 +150,10 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream for (i = 0; i < This->nbStreams; i++) { - IMediaStream_GetInformation(This->pStreams[i], &PurposeId, NULL); + IAMMediaStream_GetInformation(This->pStreams[i], &PurposeId, NULL); if (IsEqualIID(&PurposeId, idPurpose)) { - *ppMediaStream = This->pStreams[i]; + *ppMediaStream = (IMediaStream*)This->pStreams[i]; IMediaStream_AddRef(*ppMediaStream); return S_OK; } @@ -258,9 +257,9 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if if (SUCCEEDED(hr)) hr = IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaControl, (void**)&This->media_control); if (SUCCEEDED(hr)) - hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&This->media_stream_filter); + hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaStreamFilter, (void**)&This->media_stream_filter); if (SUCCEEDED(hr)) - hr = IGraphBuilder_AddFilter(This->pFilterGraph, This->media_stream_filter, filternameW); + hr = IGraphBuilder_AddFilter(This->pFilterGraph, (IBaseFilter*)This->media_stream_filter, filternameW); if (SUCCEEDED(hr)) { IMediaEventEx* media_event = NULL; @@ -277,7 +276,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if if (FAILED(hr)) { if (This->media_stream_filter) - IBaseFilter_Release(This->media_stream_filter); + IMediaStreamFilter_Release(This->media_stream_filter); This->media_stream_filter = NULL; if (This->media_seeking) IMediaSeeking_Release(This->media_seeking); @@ -313,19 +312,17 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* iface, IMediaStreamFilter** ppFilter) { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); - HRESULT hr = S_OK; TRACE("(%p/%p)->(%p)\n", This, iface, ppFilter); if (!ppFilter) return E_POINTER; - *ppFilter = NULL; - - if (This->media_stream_filter) - hr = IBaseFilter_QueryInterface(This->media_stream_filter, &IID_IMediaStreamFilter, (LPVOID*)ppFilter); + *ppFilter = This->media_stream_filter; + if (*ppFilter) + IMediaStreamFilter_AddRef(*ppFilter); - return hr; + return S_OK; } static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream* iface, IUnknown* stream_object, const MSPID* PurposeId, @@ -333,8 +330,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); HRESULT hr; - IMediaStream* pStream; - IMediaStream** pNewStreams; + IAMMediaStream* pStream; + IAMMediaStream** pNewStreams; TRACE("(%p/%p)->(%p,%s,%x,%p)\n", This, iface, stream_object, debugstr_guid(PurposeId), dwFlags, ppNewStream); @@ -374,10 +371,10 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream hr = audiomediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); if (SUCCEEDED(hr)) { - pNewStreams = CoTaskMemRealloc(This->pStreams, (This->nbStreams+1) * sizeof(IMediaStream*)); + pNewStreams = CoTaskMemRealloc(This->pStreams, (This->nbStreams+1) * sizeof(IAMMediaStream*)); if (!pNewStreams) { - IMediaStream_Release(pStream); + IAMMediaStream_Release(pStream); return E_OUTOFMEMORY; } This->pStreams = pNewStreams; @@ -385,13 +382,13 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream This->nbStreams++; if (ppNewStream) - *ppNewStream = pStream; + *ppNewStream = (IMediaStream*)pStream; } if (SUCCEEDED(hr)) { /* Add stream to the media stream filter */ - IMediaStreamFilter_AddMediaStream((IMediaStreamFilter*)This->media_stream_filter, (IAMMediaStream*)pStream); + IMediaStreamFilter_AddMediaStream(This->media_stream_filter, pStream); } return hr; diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index 0881c3e..64a376f 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -31,13 +31,14 @@ #include "dshow.h" #include "mmstream.h" #include "austream.h" +#include "amstream.h" HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, - STREAM_TYPE StreamType, IMediaStream **ppMediaStream) DECLSPEC_HIDDEN; + STREAM_TYPE StreamType, IAMMediaStream **ppMediaStream) DECLSPEC_HIDDEN; HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - STREAM_TYPE stream_type, IMediaStream **media_stream) DECLSPEC_HIDDEN; + STREAM_TYPE stream_type, IAMMediaStream **media_stream) DECLSPEC_HIDDEN; #endif /* __AMSTREAM_PRIVATE_INCLUDED__ */ diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 3a62a9f..c3bc1a6 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -25,8 +25,6 @@ #include "winbase.h" #include "amstream_private.h" -#include "amstream.h" - WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index e80c491..1149584 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -32,7 +32,6 @@ #include "rpcproxy.h" #include "amstream_private.h" -#include "amstream.h" #include "wine/debug.h" diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index f619cbd..b457d1f 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -26,7 +26,6 @@ #include "wingdi.h" #include "amstream_private.h" -#include "amstream.h" #include "ddstream.h" @@ -428,7 +427,7 @@ static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStreamImpl_IDirect }; HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - STREAM_TYPE stream_type, IMediaStream **media_stream) + STREAM_TYPE stream_type, IAMMediaStream **media_stream) { DirectDrawMediaStreamImpl *object; @@ -446,7 +445,7 @@ HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object->purpose_id = *purpose_id; object->stream_type = stream_type; - *media_stream = (IMediaStream*)&object->IAMMediaStream_iface; + *media_stream = &object->IAMMediaStream_iface; return S_OK; } @@ -828,7 +827,7 @@ static const struct IAudioMediaStreamVtbl AudioMediaStreamImpl_IAudioMediaStream }; HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - STREAM_TYPE stream_type, IMediaStream **media_stream) + STREAM_TYPE stream_type, IAMMediaStream **media_stream) { AudioMediaStreamImpl *object; @@ -846,7 +845,7 @@ HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object->purpose_id = *purpose_id; object->stream_type = stream_type; - *media_stream = (IMediaStream*)&object->IAMMediaStream_iface; + *media_stream = &object->IAMMediaStream_iface; return S_OK; } diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 8c26c8e..d428970 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -29,7 +29,6 @@ #include "wine/strmbase.h" #include "amstream_private.h" -#include "amstream.h" #include "ddstream.h"

1 0

Nikolay Sivov : amstream/tests: Get rid of global stream pointer that we don't really need.
by Alexandre Julliard 22 Jun '15

22 Jun '15

Module: wine Branch: master Commit: 84c2fda63dc5c4725f585b1da26a2c19ef5f5d51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84c2fda63dc5c4725f585b1da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 21 00:26:50 2015 +0300 amstream/tests: Get rid of global stream pointer that we don't really need. --- dlls/amstream/tests/amstream.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 5121b35..f2f5723 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -28,19 +28,15 @@ static const WCHAR filenameW[] = {'t','e','s','t','.','a','v','i',0}; -static IAMMultiMediaStream* pams; static IDirectDraw7* pdd7; static IDirectDrawSurface7* pdds7; -static int create_ammultimediastream(void) +static IAMMultiMediaStream *create_ammultimediastream(void) { - return S_OK == CoCreateInstance( - &CLSID_AMMultiMediaStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMultiMediaStream, (LPVOID*)&pams); -} - -static void release_ammultimediastream(void) -{ - IAMMultiMediaStream_Release(pams); + IAMMultiMediaStream *stream = NULL; + CoCreateInstance(&CLSID_AMMultiMediaStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMultiMediaStream, + (void**)&stream); + return stream; } static int create_directdraw(void) @@ -89,10 +85,11 @@ static void release_directdraw(void) static void test_openfile(void) { + IAMMultiMediaStream *pams; HRESULT hr; IGraphBuilder* pgraph; - if (!create_ammultimediastream()) + if (!(pams = create_ammultimediastream())) return; hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); @@ -112,21 +109,22 @@ static void test_openfile(void) if (pgraph) IGraphBuilder_Release(pgraph); - release_ammultimediastream(); + IAMMultiMediaStream_Release(pams); } static void test_renderfile(void) { + IAMMultiMediaStream *pams; HRESULT hr; IMediaStream *pvidstream = NULL; IDirectDrawMediaStream *pddstream = NULL; IDirectDrawStreamSample *pddsample = NULL; - if (!create_ammultimediastream()) + if (!(pams = create_ammultimediastream())) return; if (!create_directdraw()) { - release_ammultimediastream(); + IAMMultiMediaStream_Release(pams); return; } @@ -162,22 +160,23 @@ error: IMediaStream_Release(pvidstream); release_directdraw(); - release_ammultimediastream(); + IAMMultiMediaStream_Release(pams); } static void test_media_streams(void) { + IAMMultiMediaStream *pams; HRESULT hr; IMediaStream *video_stream = NULL; IMediaStream *audio_stream = NULL; IMediaStream *dummy_stream; IMediaStreamFilter* media_stream_filter = NULL; - if (!create_ammultimediastream()) + if (!(pams = create_ammultimediastream())) return; if (!create_directdraw()) { - release_ammultimediastream(); + IAMMultiMediaStream_Release(pams); return; } @@ -424,7 +423,7 @@ static void test_media_streams(void) IMediaStreamFilter_Release(media_stream_filter); release_directdraw(); - release_ammultimediastream(); + IAMMultiMediaStream_Release(pams); } START_TEST(amstream)

1 0