wine-commits September 2016

wine-commits@winehq.org

2 participants
430 discussions

Andrey Gusev : api-ms-win-core-apiquery-l1-1-0: Add dll.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: e316b40ca1a57244a09407af39cb48079c387cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=e316b40ca1a57244a09407af3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Sep 14 12:22:36 2016 +0300 api-ms-win-core-apiquery-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-apiquery-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index e815d8b..8f58dd1 100755 --- a/configure +++ b/configure @@ -874,6 +874,7 @@ enable_actxprxy enable_advapi32 enable_advpack enable_amstream +enable_api_ms_win_core_apiquery_l1_1_0 enable_api_ms_win_core_atoms_l1_1_0 enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_com_l1_1_1 @@ -17534,6 +17535,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll api-ms-win-core-apiquery-l1-1-0 enable_api_ms_win_core_apiquery_l1_1_0 wine_fn_config_dll api-ms-win-core-atoms-l1-1-0 enable_api_ms_win_core_atoms_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_com_l1_1_1 diff --git a/configure.ac b/configure.ac index 5ef439e..59e7b7c 100644 --- a/configure.ac +++ b/configure.ac @@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in b/dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in new file mode 100644 index 0000000..492a265 --- /dev/null +++ b/dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-apiquery-l1-1-0.dll diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec new file mode 100644 index 0000000..6d63b5b --- /dev/null +++ b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec @@ -0,0 +1 @@ +@ stub ApiSetQueryApiSetPresence diff --git a/tools/make_specfiles b/tools/make_specfiles index b5a072c..554956c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -249,6 +249,7 @@ my @dll_groups = "msvcrt", "ntdll", "ntoskrnl.exe", + "api-ms-win-core-apiquery-l1-1-0", "api-ms-win-core-rtlsupport-l1-1-0", "api-ms-win-core-rtlsupport-l1-2-0", ],

1 0

Andrey Gusev : api-ms-win-core-kernel32-private-l1-1-1: Add dll.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: d2e0fa8b85e8ff67d1465b60b88f902ebf2beb1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e0fa8b85e8ff67d1465b60b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Sep 14 12:05:23 2016 +0300 api-ms-win-core-kernel32-private-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-kernel32-private-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-kernel32-private-l1-1-1.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index b8133ae..e815d8b 100755 --- a/configure +++ b/configure @@ -905,6 +905,7 @@ enable_api_ms_win_core_job_l1_1_0 enable_api_ms_win_core_job_l2_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_1 +enable_api_ms_win_core_kernel32_private_l1_1_1 enable_api_ms_win_core_libraryloader_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_1 enable_api_ms_win_core_libraryloader_l1_2_0 @@ -17564,6 +17565,7 @@ wine_fn_config_dll api-ms-win-core-job-l1-1-0 enable_api_ms_win_core_job_l1_1_0 wine_fn_config_dll api-ms-win-core-job-l2-1-0 enable_api_ms_win_core_job_l2_1_0 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-1 enable_api_ms_win_core_kernel32_legacy_l1_1_1 +wine_fn_config_dll api-ms-win-core-kernel32-private-l1-1-1 enable_api_ms_win_core_kernel32_private_l1_1_1 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-0 enable_api_ms_win_core_libraryloader_l1_1_0 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-1 enable_api_ms_win_core_libraryloader_l1_1_1 wine_fn_config_dll api-ms-win-core-libraryloader-l1-2-0 enable_api_ms_win_core_libraryloader_l1_2_0 diff --git a/configure.ac b/configure.ac index ac75845..5ef439e 100644 --- a/configure.ac +++ b/configure.ac @@ -2681,6 +2681,7 @@ WINE_CONFIG_DLL(api-ms-win-core-job-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-job-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-kernel32-private-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-2-0) diff --git a/dlls/api-ms-win-core-kernel32-private-l1-1-1/Makefile.in b/dlls/api-ms-win-core-kernel32-private-l1-1-1/Makefile.in new file mode 100644 index 0000000..b8cec6b --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-private-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-kernel32-private-l1-1-1.dll diff --git a/dlls/api-ms-win-core-kernel32-private-l1-1-1/api-ms-win-core-kernel32-private-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-private-l1-1-1/api-ms-win-core-kernel32-private-l1-1-1.spec new file mode 100644 index 0000000..277b59a --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-private-l1-1-1/api-ms-win-core-kernel32-private-l1-1-1.spec @@ -0,0 +1 @@ +@ stub PrivCopyFileExW diff --git a/tools/make_specfiles b/tools/make_specfiles index d8ea7c5..b5a072c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -161,6 +161,7 @@ my @dll_groups = "api-ms-win-core-job-l2-1-0", "api-ms-win-core-kernel32-legacy-l1-1-0", "api-ms-win-core-kernel32-legacy-l1-1-1", + "api-ms-win-core-kernel32-private-l1-1-1", "api-ms-win-core-localization-l1-1-0", "api-ms-win-core-localization-l1-2-0", "api-ms-win-core-localization-obsolete-l1-1-0",

1 0

Jacek Caban : mshtml: Use IUnknownVtbl in wrapper_vtbl.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: ca2e0c5e70da6c933ddc7d7f0a4ab7f536191cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2e0c5e70da6c933ddc7d7f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:48:36 2016 +0200 mshtml: Use IUnknownVtbl in wrapper_vtbl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/ifacewrap.c | 210 +++++++++++++++++++++++++----------------------- 1 file changed, 108 insertions(+), 102 deletions(-) diff --git a/dlls/mshtml/ifacewrap.c b/dlls/mshtml/ifacewrap.c index f31bb4a..a8a8928 100644 --- a/dlls/mshtml/ifacewrap.c +++ b/dlls/mshtml/ifacewrap.c @@ -215,107 +215,113 @@ DEFINE_WRAPPER_FUNC(98, 392, 784) DEFINE_WRAPPER_FUNC(99, 396, 792) /* The size was found by testing when calls start crashing. It looks like MS wraps up to 100 functions. */ -static const void *wrapper_vtbl[] = { - wrapper_QueryInterface, - wrapper_AddRef, - wrapper_Release, - wrapper_func_3, - wrapper_func_4, - wrapper_func_5, - wrapper_func_6, - wrapper_func_7, - wrapper_func_8, - wrapper_func_9, - wrapper_func_10, - wrapper_func_11, - wrapper_func_12, - wrapper_func_13, - wrapper_func_14, - wrapper_func_15, - wrapper_func_16, - wrapper_func_17, - wrapper_func_18, - wrapper_func_19, - wrapper_func_20, - wrapper_func_21, - wrapper_func_22, - wrapper_func_23, - wrapper_func_24, - wrapper_func_25, - wrapper_func_26, - wrapper_func_27, - wrapper_func_28, - wrapper_func_29, - wrapper_func_30, - wrapper_func_31, - wrapper_func_32, - wrapper_func_33, - wrapper_func_34, - wrapper_func_35, - wrapper_func_36, - wrapper_func_37, - wrapper_func_38, - wrapper_func_39, - wrapper_func_40, - wrapper_func_41, - wrapper_func_42, - wrapper_func_43, - wrapper_func_44, - wrapper_func_45, - wrapper_func_46, - wrapper_func_47, - wrapper_func_48, - wrapper_func_49, - wrapper_func_50, - wrapper_func_51, - wrapper_func_52, - wrapper_func_53, - wrapper_func_54, - wrapper_func_55, - wrapper_func_56, - wrapper_func_57, - wrapper_func_58, - wrapper_func_59, - wrapper_func_60, - wrapper_func_61, - wrapper_func_62, - wrapper_func_63, - wrapper_func_64, - wrapper_func_65, - wrapper_func_66, - wrapper_func_67, - wrapper_func_68, - wrapper_func_69, - wrapper_func_70, - wrapper_func_71, - wrapper_func_72, - wrapper_func_73, - wrapper_func_74, - wrapper_func_75, - wrapper_func_76, - wrapper_func_77, - wrapper_func_78, - wrapper_func_79, - wrapper_func_80, - wrapper_func_81, - wrapper_func_82, - wrapper_func_83, - wrapper_func_84, - wrapper_func_85, - wrapper_func_86, - wrapper_func_87, - wrapper_func_88, - wrapper_func_89, - wrapper_func_90, - wrapper_func_91, - wrapper_func_92, - wrapper_func_93, - wrapper_func_94, - wrapper_func_95, - wrapper_func_96, - wrapper_func_97, - wrapper_func_98, - wrapper_func_99 +static const struct { + IUnknownVtbl unk_vtbl; + const void *wrappers[97]; +} wrapper_vtbl = { + { + wrapper_QueryInterface, + wrapper_AddRef, + wrapper_Release + }, { + wrapper_func_3, + wrapper_func_4, + wrapper_func_5, + wrapper_func_6, + wrapper_func_7, + wrapper_func_8, + wrapper_func_9, + wrapper_func_10, + wrapper_func_11, + wrapper_func_12, + wrapper_func_13, + wrapper_func_14, + wrapper_func_15, + wrapper_func_16, + wrapper_func_17, + wrapper_func_18, + wrapper_func_19, + wrapper_func_20, + wrapper_func_21, + wrapper_func_22, + wrapper_func_23, + wrapper_func_24, + wrapper_func_25, + wrapper_func_26, + wrapper_func_27, + wrapper_func_28, + wrapper_func_29, + wrapper_func_30, + wrapper_func_31, + wrapper_func_32, + wrapper_func_33, + wrapper_func_34, + wrapper_func_35, + wrapper_func_36, + wrapper_func_37, + wrapper_func_38, + wrapper_func_39, + wrapper_func_40, + wrapper_func_41, + wrapper_func_42, + wrapper_func_43, + wrapper_func_44, + wrapper_func_45, + wrapper_func_46, + wrapper_func_47, + wrapper_func_48, + wrapper_func_49, + wrapper_func_50, + wrapper_func_51, + wrapper_func_52, + wrapper_func_53, + wrapper_func_54, + wrapper_func_55, + wrapper_func_56, + wrapper_func_57, + wrapper_func_58, + wrapper_func_59, + wrapper_func_60, + wrapper_func_61, + wrapper_func_62, + wrapper_func_63, + wrapper_func_64, + wrapper_func_65, + wrapper_func_66, + wrapper_func_67, + wrapper_func_68, + wrapper_func_69, + wrapper_func_70, + wrapper_func_71, + wrapper_func_72, + wrapper_func_73, + wrapper_func_74, + wrapper_func_75, + wrapper_func_76, + wrapper_func_77, + wrapper_func_78, + wrapper_func_79, + wrapper_func_80, + wrapper_func_81, + wrapper_func_82, + wrapper_func_83, + wrapper_func_84, + wrapper_func_85, + wrapper_func_86, + wrapper_func_87, + wrapper_func_88, + wrapper_func_89, + wrapper_func_90, + wrapper_func_91, + wrapper_func_92, + wrapper_func_93, + wrapper_func_94, + wrapper_func_95, + wrapper_func_96, + wrapper_func_97, + wrapper_func_98, + wrapper_func_99 + } }; HRESULT wrap_iface(IUnknown *iface, IUnknown *ref_unk, IUnknown **ret) @@ -326,7 +332,7 @@ HRESULT wrap_iface(IUnknown *iface, IUnknown *ref_unk, IUnknown **ret) if(!wrapper) return E_OUTOFMEMORY; - wrapper->IUnknown_iface.lpVtbl = (const IUnknownVtbl*)wrapper_vtbl; + wrapper->IUnknown_iface.lpVtbl = &wrapper_vtbl.unk_vtbl; wrapper->ref = 1; IUnknown_AddRef(iface);

1 0

Piotr Caban : user32: Fix DefWindowProc(WM_NCRBUTTONDOWN) tests on Win 8 and 10.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: 80a222a8cdb127aa9d292ff636ce2ad5f0b2989e URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a222a8cdb127aa9d292ff63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 14 12:19:47 2016 +0200 user32: Fix DefWindowProc(WM_NCRBUTTONDOWN) tests on Win 8 and 10. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 72614eb..b088d1c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13909,6 +13909,25 @@ static const struct message NCRBUTTONDOWNSeq[] = { 0 } }; +struct rbuttonup_thread_data +{ + HWND hwnd; + HANDLE wndproc_finished; +}; + +static DWORD CALLBACK post_rbuttonup_msg( void *arg ) +{ + struct rbuttonup_thread_data *data = arg; + DWORD ret; + + ret = WaitForSingleObject( data->wndproc_finished, 500 ); + todo_wine ok( ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret ); + if( ret == WAIT_OBJECT_0 ) return 0; + + PostMessageA( data->hwnd, WM_RBUTTONUP, 0, 0 ); + return 0; +} + static void test_defwinproc(void) { HWND hwnd; @@ -13918,6 +13937,8 @@ static void test_defwinproc(void) RECT rect; INT x, y; LRESULT res; + struct rbuttonup_thread_data data; + HANDLE thread; hwnd = CreateWindowExA(0, "TestWindowClass", "test_defwndproc", WS_VISIBLE | WS_CAPTION | WS_OVERLAPPEDWINDOW, 0,0,500,100,0,0,0, NULL); @@ -13933,11 +13954,25 @@ static void test_defwinproc(void) res = DefWindowProcA( hwnd, WM_NCHITTEST, 0, MAKELPARAM(x, y)); ok(res == HTCAPTION, "WM_NCHITTEST returned %ld\n", res); + mouse_event( MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0 ); + mouse_event( MOUSEEVENTF_LEFTUP, 0, 0, 0, 0 ); + flush_events(); + flush_sequence(); - PostMessageA( hwnd, WM_RBUTTONUP, 0, 0); + mouse_event( MOUSEEVENTF_RIGHTUP, 0, 0, 0, 0 ); + /* workaround for missing support for clicking on window frame */ + data.hwnd = hwnd; + data.wndproc_finished = CreateEventA( NULL, FALSE, FALSE, NULL ); + thread = CreateThread( NULL, 0, post_rbuttonup_msg, (void*)&data, 0, NULL ); + DefWindowProcA( hwnd, WM_NCRBUTTONDOWN, HTCAPTION, MAKELPARAM(x, y)); ok_sequence(NCRBUTTONDOWNSeq, "WM_NCRBUTTONDOWN on caption", FALSE); + SetEvent( data.wndproc_finished ); + WaitForSingleObject( thread, 1000 ); + CloseHandle( data.wndproc_finished ); + CloseHandle( thread ); + SetCursorPos(pos.x, pos.y); DefWindowProcA( hwnd, WM_ENDSESSION, 1, 0);

1 0

Hans Leidekker : qmgr: Job error codes are HRESULT values.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: ec6a17fa9c4dd816bbfe0a21a68d4fbdb734d9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6a17fa9c4dd816bbfe0a21a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 14 10:06:11 2016 +0200 qmgr: Job error codes are HRESULT values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/file.c | 12 ++++++------ dlls/qmgr/job.c | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index cdea329..3673ede 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -201,7 +201,7 @@ HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, return S_OK; } -static HRESULT error_from_http_response(DWORD code) +static HRESULT hresult_from_http_response(DWORD code) { switch (code) { @@ -239,7 +239,7 @@ static void CALLBACK progress_callback_http(HINTERNET handle, DWORD_PTR context, if (WinHttpQueryHeaders(handle, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &code, &size, NULL)) { - if ((job->error.code = error_from_http_response(code))) + if ((job->error.code = hresult_from_http_response(code))) { EnterCriticalSection(&job->cs); @@ -281,7 +281,7 @@ static void CALLBACK progress_callback_http(HINTERNET handle, DWORD_PTR context, case WINHTTP_CALLBACK_STATUS_REQUEST_ERROR: { WINHTTP_ASYNC_RESULT *result = (WINHTTP_ASYNC_RESULT *)buf; - job->error.code = result->dwError; + job->error.code = HRESULT_FROM_WIN32(result->dwError); transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_ERROR); break; } @@ -386,10 +386,10 @@ static BOOL transfer_file_http(BackgroundCopyFileImpl *file, URL_COMPONENTSW *uc if (!set_request_credentials(req, job)) goto done; if (!(WinHttpSendRequest(req, job->http_options.headers, ~0u, NULL, 0, 0, (DWORD_PTR)file))) goto done; - if (wait_for_completion(job) || job->error.code) goto done; + if (wait_for_completion(job) || FAILED(job->error.code)) goto done; if (!(WinHttpReceiveResponse(req, NULL))) goto done; - if (wait_for_completion(job) || job->error.code) goto done; + if (wait_for_completion(job) || FAILED(job->error.code)) goto done; transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_TRANSFERRING); @@ -400,7 +400,7 @@ static BOOL transfer_file_http(BackgroundCopyFileImpl *file, URL_COMPONENTSW *uc { file->read_size = 0; if (!(ret = WinHttpReadData(req, buf, sizeof(buf), NULL))) break; - if (wait_for_completion(job) || job->error.code) + if (wait_for_completion(job) || FAILED(job->error.code)) { ret = FALSE; break; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 33e3bd2..a12e511 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -371,7 +371,8 @@ static HRESULT WINAPI BackgroundCopyJob_Resume( && This->state != BG_JOB_STATE_TRANSFERRING) { This->state = BG_JOB_STATE_QUEUED; - This->error.context = This->error.code = 0; + This->error.context = 0; + This->error.code = S_OK; if (This->error.file) { IBackgroundCopyFile2_Release(This->error.file); @@ -1245,7 +1246,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->callback2 = FALSE; This->error.context = 0; - This->error.code = 0; + This->error.code = S_OK; This->error.file = NULL; memset(&This->http_options, 0, sizeof(This->http_options));

1 0

Hans Leidekker : msi: Use proper return types in MSI_RecordSetStreamFromFileW.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: 13af267e75fae8be2da63c2f5a4a739c8e4ea252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13af267e75fae8be2da63c2f5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 14 10:06:09 2016 +0200 msi: Use proper return types in MSI_RecordSetStreamFromFileW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/record.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 88d94a9..51e7a23 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -727,7 +727,8 @@ UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream) UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilename) { IStream *stm = NULL; - HRESULT r; + HRESULT hr; + UINT ret; if( (iField == 0) || (iField > rec->count) ) return ERROR_INVALID_PARAMETER; @@ -746,16 +747,16 @@ UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilenam return ERROR_INVALID_FIELD; ofs.QuadPart = 0; - r = IStream_Seek( stm, ofs, STREAM_SEEK_SET, &cur ); - if( FAILED( r ) ) + hr = IStream_Seek( stm, ofs, STREAM_SEEK_SET, &cur ); + if (FAILED( hr )) return ERROR_FUNCTION_FAILED; } else { /* read the file into a stream and save the stream in the record */ - r = RECORD_StreamFromFile(szFilename, &stm); - if( r != ERROR_SUCCESS ) - return r; + ret = RECORD_StreamFromFile(szFilename, &stm); + if (ret != ERROR_SUCCESS) + return ret; /* if all's good, store it in the record */ MSI_RecordSetStream(rec, iField, stm);

1 0

Hans Leidekker : msi: Use proper return types in msi_table_apply_transform.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: b0b2a1a4deee25474beb32573ce2fa770ff89cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0b2a1a4deee25474beb32573… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 14 10:06:10 2016 +0200 msi: Use proper return types in msi_table_apply_transform. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 9c31992..2b36091 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2738,7 +2738,7 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ) IEnumSTATSTG *stgenum = NULL; TRANSFORMDATA *transform; TRANSFORMDATA *tables = NULL, *columns = NULL; - HRESULT r; + HRESULT hr; STATSTG stat; string_table *strings; UINT ret = ERROR_FUNCTION_FAILED; @@ -2751,8 +2751,8 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ) if( !strings ) goto end; - r = IStorage_EnumElements( stg, 0, NULL, 0, &stgenum ); - if( FAILED( r ) ) + hr = IStorage_EnumElements( stg, 0, NULL, 0, &stgenum ); + if (FAILED( hr )) goto end; list_init(&transforms); @@ -2763,8 +2763,8 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ) WCHAR name[0x40]; ULONG count = 0; - r = IEnumSTATSTG_Next( stgenum, 1, &stat, &count ); - if ( FAILED( r ) || !count ) + hr = IEnumSTATSTG_Next( stgenum, 1, &stat, &count ); + if (FAILED( hr ) || !count) break; decode_streamname( stat.pwcsName, name ); @@ -2794,12 +2794,10 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ) TRACE("transform contains stream %s\n", debugstr_w(name)); /* load the table */ - r = TABLE_CreateView( db, transform->name, (MSIVIEW**) &tv ); - if( r != ERROR_SUCCESS ) + if (TABLE_CreateView( db, transform->name, (MSIVIEW**) &tv ) != ERROR_SUCCESS) continue; - r = tv->view.ops->execute( &tv->view, NULL ); - if( r != ERROR_SUCCESS ) + if (tv->view.ops->execute( &tv->view, NULL ) != ERROR_SUCCESS) { tv->view.ops->delete( &tv->view ); continue;

1 0

Nikolay Sivov : mshtml: Use proper constants as HRESULT return values.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: 7846f0947a1df69ee6417af0030bfcfa5620e0c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7846f0947a1df69ee6417af00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 13 21:54:20 2016 +0300 mshtml: Use proper constants as HRESULT return values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/ifacewrap.c | 4 ++-- dlls/mshtml/main.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 3f37840..76d5c2e 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -291,7 +291,7 @@ static HRESULT WINAPI HTMLImgElement_put_src(IHTMLImgElement *iface, BSTR v) if(NS_FAILED(nsres)) ERR("SetSrc failed: %08x\n", nsres); - return NS_OK; + return S_OK; } static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 80964c9..1ba477e 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1167,10 +1167,10 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDOMNode2_iface; }else if(IsEqualGUID(&IID_nsXPCOMCycleCollectionParticipant, riid)) { *ppv = &node_ccp; - return NS_OK; + return S_OK; }else if(IsEqualGUID(&IID_nsCycleCollectionISupports, riid)) { *ppv = &This->IHTMLDOMNode_iface; - return NS_OK; + return S_OK; }else if(dispex_query_interface(&This->event_target.dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 0ee848f..7a4ebe3 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -494,7 +494,7 @@ static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, stylei nsAString_Finish(&str_name); - return NS_OK; + return S_OK; } static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 14246a6..da1af2c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -458,7 +458,7 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H return hres; *ret = window; - return NS_OK; + return S_OK; } static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, VARIANT *pvarResult) diff --git a/dlls/mshtml/ifacewrap.c b/dlls/mshtml/ifacewrap.c index a22a008..f31bb4a 100644 --- a/dlls/mshtml/ifacewrap.c +++ b/dlls/mshtml/ifacewrap.c @@ -59,7 +59,7 @@ static HRESULT WINAPI wrapper_QueryInterface(IUnknown *iface, REFIID riid, void return IUnknown_QueryInterface(This->ref_unk, riid, ppv); } -static HRESULT WINAPI wrapper_AddRef(IUnknown *iface) +static ULONG WINAPI wrapper_AddRef(IUnknown *iface) { iface_wrapper_t *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -69,7 +69,7 @@ static HRESULT WINAPI wrapper_AddRef(IUnknown *iface) return ref; } -static HRESULT WINAPI wrapper_Release(IUnknown *iface) +static ULONG WINAPI wrapper_Release(IUnknown *iface) { iface_wrapper_t *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8a366bd..2a00aee 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -382,7 +382,7 @@ HRESULT WINAPI RunHTMLApplication( HINSTANCE hinst, HINSTANCE hPrevInst, LPSTR szCmdLine, INT nCmdShow ) { FIXME("%p %p %s %d\n", hinst, hPrevInst, debugstr_a(szCmdLine), nCmdShow ); - return 0; + return S_OK; } /***********************************************************************

1 0

Sebastian Lackner : msi: Do not return ERROR_* constant in HRESULT function.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: feb986ac5b9d8f59f4cc61e6bb8ab5192bf77e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb986ac5b9d8f59f4cc61e6b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 17:53:20 2016 +0200 msi: Do not return ERROR_* constant in HRESULT function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index ecc3e94..e812ebb 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2543,7 +2543,7 @@ HRESULT WINAPI MsiGetFileSignatureInformationA( LPCSTR path, DWORD flags, PCCERT TRACE("%s %08x %p %p %p\n", debugstr_a(path), flags, cert, hash, hashlen); - if (path && !(pathW = strdupAtoW( path ))) return ERROR_OUTOFMEMORY; + if (path && !(pathW = strdupAtoW( path ))) return E_OUTOFMEMORY; r = MsiGetFileSignatureInformationW( pathW, flags, cert, hash, hashlen ); msi_free( pathW ); return r;

1 0

Nikolay Sivov : d2d1: Initial implementation of DC render target.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: 03d301cc74a31b6f99195d4706cb8e4088a49ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d301cc74a31b6f99195d470… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 13 12:53:19 2016 +0300 d2d1: Initial implementation of DC render target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 3 +- dlls/d2d1/d2d1_private.h | 16 + dlls/d2d1/dc_render_target.c | 875 +++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/factory.c | 50 ++- dlls/d2d1/render_target.c | 36 ++ dlls/d2d1/tests/d2d1.c | 19 +- 6 files changed, 984 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03d301cc74a31b6f99195…

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
43
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 September 2016