December 2014 - Wine-commits

Martin Storsjo : api-ms-win-core-file-l2-1-1: Add stub dll.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 25f2f17bfb29ccb92a8aa8914589eef0616415d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f2f17bfb29ccb92a8aa8914… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:03 2014 +0200 api-ms-win-core-file-l2-1-1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-file-l2-1-1/Makefile.in | 1 + .../api-ms-win-core-file-l2-1-1.spec | 12 ++++++++++++ tools/make_specfiles | 1 + 5 files changed, 17 insertions(+) diff --git a/configure b/configure index b3993ca..7902a84 100755 --- a/configure +++ b/configure @@ -858,6 +858,7 @@ enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 enable_api_ms_win_core_file_l1_2_0 +enable_api_ms_win_core_file_l2_1_1 enable_api_ms_win_core_handle_l1_1_0 enable_api_ms_win_core_heap_l1_2_0 enable_api_ms_win_core_heap_obsolete_l1_1_0 @@ -16772,6 +16773,7 @@ wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 wine_fn_config_dll api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 +wine_fn_config_dll api-ms-win-core-file-l2-1-1 enable_api_ms_win_core_file_l2_1_1 wine_fn_config_dll api-ms-win-core-handle-l1-1-0 enable_api_ms_win_core_handle_l1_1_0 wine_fn_config_dll api-ms-win-core-heap-l1-2-0 enable_api_ms_win_core_heap_l1_2_0 wine_fn_config_dll api-ms-win-core-heap-obsolete-l1-1-0 enable_api_ms_win_core_heap_obsolete_l1_1_0 diff --git a/configure.ac b/configure.ac index edf5408..8b3f400 100644 --- a/configure.ac +++ b/configure.ac @@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-heap-obsolete-l1-1-0) diff --git a/dlls/api-ms-win-core-file-l2-1-1/Makefile.in b/dlls/api-ms-win-core-file-l2-1-1/Makefile.in new file mode 100644 index 0000000..f43a928 --- /dev/null +++ b/dlls/api-ms-win-core-file-l2-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-file-l2-1-1.dll diff --git a/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec b/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec new file mode 100644 index 0000000..36cf6c3 --- /dev/null +++ b/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec @@ -0,0 +1,12 @@ +@ stub CopyFile2 +@ stdcall CopyFileExW(wstr wstr ptr ptr ptr long) kernel32.CopyFileExW +@ stdcall CreateDirectoryExW(wstr wstr ptr) kernel32.CreateDirectoryExW +@ stdcall CreateHardLinkW(wstr wstr ptr) kernel32.CreateHardLinkW +@ stub CreateSymbolicLinkW +@ stdcall GetFileInformationByHandleEx(long long ptr long) kernel32.GetFileInformationByHandleEx +@ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW +@ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW +@ stdcall OpenFileById(long ptr long long ptr long) kernel32.OpenFileById +@ stub ReOpenFile +@ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW +@ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW diff --git a/tools/make_specfiles b/tools/make_specfiles index 9eae0ac..04be4c9 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -156,6 +156,7 @@ my @dll_groups = "api-ms-win-core-psapi-l1-1-0", "api-ms-win-core-threadpool-legacy-l1-1-0", "api-ms-win-core-timezone-l1-1-0", + "api-ms-win-core-file-l2-1-1", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-sysinfo-l1-2-1: Add stub dll.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 1396c977a87eb284b4a49cc6fa3920cabc71f72d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1396c977a87eb284b4a49cc6f… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:04 2014 +0200 api-ms-win-core-sysinfo-l1-2-1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-sysinfo-l1-2-1/Makefile.in | 1 + .../api-ms-win-core-sysinfo-l1-2-1.spec | 36 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 41 insertions(+) diff --git a/configure b/configure index 7902a84..e8b75a8 100755 --- a/configure +++ b/configure @@ -882,6 +882,7 @@ enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 enable_api_ms_win_core_sysinfo_l1_2_0 +enable_api_ms_win_core_sysinfo_l1_2_1 enable_api_ms_win_core_threadpool_legacy_l1_1_0 enable_api_ms_win_core_timezone_l1_1_0 enable_api_ms_win_core_url_l1_1_0 @@ -16797,6 +16798,7 @@ wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 +wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-1 enable_api_ms_win_core_sysinfo_l1_2_1 wine_fn_config_dll api-ms-win-core-threadpool-legacy-l1-1-0 enable_api_ms_win_core_threadpool_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-timezone-l1-1-0 enable_api_ms_win_core_timezone_l1_1_0 wine_fn_config_dll api-ms-win-core-url-l1-1-0 enable_api_ms_win_core_url_l1_1_0 diff --git a/configure.ac b/configure.ac index 8b3f400..15d4dee 100644 --- a/configure.ac +++ b/configure.ac @@ -2674,6 +2674,7 @@ WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-threadpool-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-1/Makefile.in b/dlls/api-ms-win-core-sysinfo-l1-2-1/Makefile.in new file mode 100644 index 0000000..384a87b --- /dev/null +++ b/dlls/api-ms-win-core-sysinfo-l1-2-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-sysinfo-l1-2-1.dll diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec new file mode 100644 index 0000000..79bfc60 --- /dev/null +++ b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec @@ -0,0 +1,36 @@ +@ stub DnsHostnameToComputerNameExW +@ stub EnumSystemFirmwareTables +@ stdcall GetComputerNameExA(long ptr ptr) kernel32.GetComputerNameExA +@ stdcall GetComputerNameExW(long ptr ptr) kernel32.GetComputerNameExW +@ stdcall GetLocalTime(ptr) kernel32.GetLocalTime +@ stdcall GetLogicalProcessorInformation(ptr ptr) kernel32.GetLogicalProcessorInformation +@ stdcall GetLogicalProcessorInformationEx(long ptr ptr) kernel32.GetLogicalProcessorInformationEx +@ stdcall GetNativeSystemInfo(ptr) kernel32.GetNativeSystemInfo +@ stub GetOsSafeBootMode +@ stub GetPhysicallyInstalledSystemMemory +@ stdcall GetProductInfo(long long long long ptr) kernel32.GetProductInfo +@ stdcall GetSystemDirectoryA(ptr long) kernel32.GetSystemDirectoryA +@ stdcall GetSystemDirectoryW(ptr long) kernel32.GetSystemDirectoryW +@ stub GetSystemFirmwareTable +@ stdcall GetSystemInfo(ptr) kernel32.GetSystemInfo +@ stdcall GetSystemTime(ptr) kernel32.GetSystemTime +@ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment +@ stdcall GetSystemTimeAsFileTime(ptr) kernel32.GetSystemTimeAsFileTime +@ stub GetSystemTimePreciseAsFileTime +@ stdcall GetSystemWindowsDirectoryA(ptr long) kernel32.GetSystemWindowsDirectoryA +@ stdcall GetSystemWindowsDirectoryW(ptr long) kernel32.GetSystemWindowsDirectoryW +@ stdcall -ret64 GetTickCount64() kernel32.GetTickCount64 +@ stdcall GetTickCount() kernel32.GetTickCount +@ stdcall GetVersion() kernel32.GetVersion +@ stdcall GetVersionExA(ptr) kernel32.GetVersionExA +@ stdcall GetVersionExW(ptr) kernel32.GetVersionExW +@ stdcall GetWindowsDirectoryA(ptr long) kernel32.GetWindowsDirectoryA +@ stdcall GetWindowsDirectoryW(ptr long) kernel32.GetWindowsDirectoryW +@ stdcall GlobalMemoryStatusEx(ptr) kernel32.GlobalMemoryStatusEx +@ stub InstallELAMCertificateInfo +@ stub SetComputerNameEx2W +@ stdcall SetComputerNameExW(long wstr) kernel32.SetComputerNameExW +@ stdcall SetLocalTime(ptr) kernel32.SetLocalTime +@ stdcall SetSystemTime(ptr) kernel32.SetSystemTime +@ stdcall SetSystemTimeAdjustment(long long) kernel32.SetSystemTimeAdjustment +@ stdcall -ret64 VerSetConditionMask(long long long long) kernel32.VerSetConditionMask diff --git a/tools/make_specfiles b/tools/make_specfiles index 04be4c9..226f1ba 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -157,6 +157,7 @@ my @dll_groups = "api-ms-win-core-threadpool-legacy-l1-1-0", "api-ms-win-core-timezone-l1-1-0", "api-ms-win-core-file-l2-1-1", + "api-ms-win-core-sysinfo-l1-2-1", ], [ "ole32",

1 0

André Hentschel : kernel32/tests: Remove unused strings (Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 3135b0254658451e5c83ede2a1b8dcea70e0928e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3135b0254658451e5c83ede2a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:56:10 2014 +0100 kernel32/tests: Remove unused strings (Clang). --- dlls/kernel32/tests/actctx.c | 2 -- dlls/kernel32/tests/file.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index c964743..97e7dd2 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -304,8 +304,6 @@ static const WCHAR wndClass2W[] = {'w','n','d','C','l','a','s','s','2',0}; static const WCHAR wndClass3W[] = {'w','n','d','C','l','a','s','s','3',0}; -static const WCHAR acr_manifest[] = - {'a','c','r','.','m','a','n','i','f','e','s','t',0}; static WCHAR app_dir[MAX_PATH], exe_path[MAX_PATH], work_dir[MAX_PATH], work_dir_subdir[MAX_PATH]; static WCHAR app_manifest_path[MAX_PATH], manifest_path[MAX_PATH], depmanifest_path[MAX_PATH]; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3a30fc2..8849eb3 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -47,9 +47,7 @@ static BOOL (WINAPI *pSetFileValidData)(HANDLE, LONGLONG); static HRESULT (WINAPI *pCopyFile2)(PCWSTR,PCWSTR,COPYFILE2_EXTENDED_PARAMETERS*); static HANDLE (WINAPI *pCreateFile2)(LPCWSTR, DWORD, DWORD, DWORD, CREATEFILE2_EXTENDED_PARAMETERS*); -/* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; -static const WCHAR filenameW[] = { 't','e','s','t','f','i','l','e','.','x','x','x',0 }; static const char sillytext[] = "en larvig liten text dx \033 gx hej 84 hej 4484 ! \001\033 bla bl\na.. bla bla." "1234 43 4kljf lf &%%%&&&&&& 34 4 34 3############# 33 3 3 3 # 3## 3"

1 0

André Hentschel : mshtml/tests: Remove unused variable (Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 93b36efe61c30006b4b2f48a6aba1cc13fa42058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b36efe61c30006b4b2f48a6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:56:14 2014 +0100 mshtml/tests: Remove unused variable (Clang). --- dlls/mshtml/tests/events.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 7360024..64c0556 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -98,7 +98,6 @@ typedef struct { } xy_test_t; static const xy_test_t no_xy = {-10,-10,-10,-10}; -static const xy_test_t zero_xy = {0,0,0,0}; static const char empty_doc_str[] = "<html></html>";

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 00fb86081975a8b3dc43458b203f54665a344b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=00fb86081975a8b3dc43458b2… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Nov 29 07:35:57 2014 +0100 po: Update Polish translation. --- po/pl.po | 492 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 219 insertions(+), 273 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00fb86081975a8b3dc434…

1 0

Gerald Pfeifer : wordpad: Check for array index before using it in registry_set_filelist.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 1994140f3da38c30a9c19b7423e3d5e9d8840d4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1994140f3da38c30a9c19b742… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Nov 29 12:59:26 2014 +0100 wordpad: Check for array index before using it in registry_set_filelist. --- programs/wordpad/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index 472ed4d..5b570e7 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -293,7 +293,7 @@ void registry_set_filelist(LPCWSTR newFile, HWND hMainWnd) if(lstrcmpiW(newFile, pFiles[0])) { - for(i = 0; pFiles[i] && i < FILELIST_ENTRIES; i++) + for(i = 0; i < FILELIST_ENTRIES && pFiles[i]; i++) { if(!lstrcmpiW(pFiles[i], newFile)) {

1 0

Marcus Meissner : dwrite: Avoid leaking filemapping (Coverity).
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 6ea025fc7f7b52a734659ce6cd5e9081547b77d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea025fc7f7b52a734659ce6c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 30 10:45:13 2014 +0100 dwrite: Avoid leaking filemapping (Coverity). --- dlls/dwrite/font.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9d11e94..26afb92 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2228,8 +2228,10 @@ static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFi CloseHandle(mapping); stream = heap_alloc(sizeof(*stream)); - if (!stream) + if (!stream) { + UnmapViewOfFile(file_ptr); return E_OUTOFMEMORY; + } stream->key = heap_alloc(key_size); if (!stream->key) {

1 0

Marcus Meissner : dwrite: Remove unused hresult assignment (Coverity).
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: c7e9ffa70aa66af92c7cc0ceccd6faca9c049f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e9ffa70aa66af92c7cc0cec… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 30 10:45:45 2014 +0100 dwrite: Remove unused hresult assignment (Coverity). --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 26afb92..5e82b81 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1586,7 +1586,7 @@ HRESULT create_font_collection(IDWriteFactory* factory, IDWriteFontFileEnumerato exists = FALSE; hr = collection_find_family(collection, buffer, &index, &exists); if (exists) - hr = fontfamily_add_font(collection->family_data[index], font_data); + fontfamily_add_font(collection->family_data[index], font_data); else { struct dwrite_fontfamily_data *family_data;

1 0

Marcus Meissner : dwrite: Initialize a variable (Coverity).
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 2bfb3ef624c0dc0e67a5b6b27e392cc3b97d4c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bfb3ef624c0dc0e67a5b6b27… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 30 10:45:16 2014 +0100 dwrite: Initialize a variable (Coverity). --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 3670e46..17e0351 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -845,7 +845,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, { const struct dwritescript_properties *scriptprops; struct scriptshaping_context context; - struct scriptshaping_cache *cache; + struct scriptshaping_cache *cache = NULL; WCHAR *string; BOOL update_cluster; UINT32 i, g;

1 0

Marcus Meissner : oleacc: Free the mapping on error (Coverity).
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 9ad8aff7e1286a66cca09ca245ecf3b2b1759fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ad8aff7e1286a66cca09ca24… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 30 13:09:23 2014 +0100 oleacc: Free the mapping on error (Coverity). --- dlls/oleacc/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index e5fe6cd..fa7d592 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -219,8 +219,10 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo return E_FAIL; data = GlobalAlloc(GMEM_FIXED, size); - if(!data) + if(!data) { + UnmapViewOfFile(view); return E_OUTOFMEMORY; + } memcpy(data, view, size); UnmapViewOfFile(view);

1 0