wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Jeff Smith : d3drm: CreateViewport checks for non-NULL viewport pointer first.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 5ebd6117b2fa478252d9aab0e16f434afdacce66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ebd6117b2fa478252d9aab0… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Fri Jun 21 12:23:49 2019 -0500 d3drm: CreateViewport checks for non-NULL viewport pointer first. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 18 ++++++++++++------ dlls/d3drm/tests/d3drm.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 8ef5830..0b3af02 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -568,10 +568,12 @@ static HRESULT WINAPI d3drm1_CreateViewport(IDirect3DRM *iface, IDirect3DRMDevic TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); - if (!device || !camera) - return D3DRMERR_BADOBJECT; if (!viewport) return D3DRMERR_BADVALUE; + *viewport = NULL; + + if (!device || !camera) + return D3DRMERR_BADOBJECT; if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMDevice3, (void **)&device3))) return hr; @@ -1090,10 +1092,12 @@ static HRESULT WINAPI d3drm2_CreateViewport(IDirect3DRM2 *iface, IDirect3DRMDevi TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); - if (!device || !camera) - return D3DRMERR_BADOBJECT; if (!viewport) return D3DRMERR_BADVALUE; + *viewport = NULL; + + if (!device || !camera) + return D3DRMERR_BADOBJECT; if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMDevice3, (void **)&device3))) return hr; @@ -1761,10 +1765,12 @@ static HRESULT WINAPI d3drm3_CreateViewport(IDirect3DRM3 *iface, IDirect3DRMDevi TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); - if (!device || !camera) - return D3DRMERR_BADOBJECT; if (!viewport) return D3DRMERR_BADVALUE; + *viewport = NULL; + + if (!device || !camera) + return D3DRMERR_BADOBJECT; if (FAILED(hr = d3drm_viewport_create(&object, &d3drm->IDirect3DRM_iface))) return hr; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 6fe7dfa..a7cd594 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1863,42 +1863,72 @@ static void test_Viewport(void) ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4); /* Test all failures together */ + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport2); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport2); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport2); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport2); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);

1 0

Alistair Leslie-Hughes : wininet: Always set last error in InternetReadFile.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 8f5b9f4d4bf13cc95e809d9d7e9e24a96ea86878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f5b9f4d4bf13cc95e809d9d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 24 00:22:53 2019 +0000 wininet: Always set last error in InternetReadFile. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47352 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 3 +-- dlls/wininet/tests/http.c | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6671950..7294241 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2193,8 +2193,7 @@ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer, TRACE("-- %s (%u) (bytes read: %d)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE", res, pdwNumOfBytesRead ? *pdwNumOfBytesRead : -1); - if(res != ERROR_SUCCESS) - SetLastError(res); + SetLastError(res); return res == ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 70d5738..c8a2796 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -987,7 +987,10 @@ static void InternetReadFile_chunked_test(void) { char *buffer = HeapAlloc(GetProcessHeap(),0,length+1); + SetLastError(0xdeadbeef); res = InternetReadFile(hor,buffer,length,&got); + ok(GetLastError() == 0 || + broken(GetLastError() == 0xdeadbeef /* XP/W2K3 */), "Last Error not reset %u\n", GetLastError()); buffer[got]=0; trace("ReadFile -> %i %i\n",res,got); @@ -1000,8 +1003,11 @@ static void InternetReadFile_chunked_test(void) if (length == 0) { got = 0xdeadbeef; + SetLastError(0xdeadbeef); res = InternetReadFile( hor, buffer, 1, &got ); ok( res, "InternetReadFile failed: %u\n", GetLastError() ); + ok(GetLastError() == 0 || + broken(GetLastError() == 0xdeadbeef /* XP/W2K3 */), "Last Error not reset %u\n", GetLastError()); ok( !got, "got %u\n", got ); break; }

1 0

Alistair Leslie-Hughes : wininet: Always set last error in HttpQueryInfoW.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 3522b127a3a16949df16d023cc91d7dbbea1a8c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3522b127a3a16949df16d023… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 24 00:22:51 2019 +0000 wininet: Always set last error in HttpQueryInfoW. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 4 ++-- dlls/wininet/tests/http.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 782b258..9244393 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3920,8 +3920,8 @@ lend: WININET_Release( &request->hdr ); TRACE("%u <--\n", res); - if(res != ERROR_SUCCESS) - SetLastError(res); + + SetLastError(res); return res == ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5a0cc11..70d5738 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -722,8 +722,11 @@ static void InternetReadFile_test(int flags, const test_data_t *test) length = sizeof(buffer)-2; memset(buffer, 0x77, sizeof(buffer)); + SetLastError(0xdeadbeef); res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(GetLastError() == 0 || + broken(GetLastError() == 0xdeadbeef /* XP/W2K3 */), "Last Error not reset %u\n", GetLastError()); /* show that the function writes data past the length returned */ ok(buffer[length-2], "Expected any header character, got 0x00\n"); ok(!buffer[length-1], "Expected 0x00, got %02X\n", buffer[length-1]);

1 0

Alistair Leslie-Hughes : wininet: Support QueryOption INTERNET_OPTION_ERROR_MASK for http.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 223c3b4538f05489cbf36028918c304c60ced452 URL: https://source.winehq.org/git/wine.git/?a=commit;h=223c3b4538f05489cbf36028… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 21 03:58:45 2019 +0000 wininet: Support QueryOption INTERNET_OPTION_ERROR_MASK for http. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cbc95fb..782b258 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2266,6 +2266,15 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *(DWORD*)buffer = flags; return ERROR_SUCCESS; } + case INTERNET_OPTION_ERROR_MASK: + TRACE("INTERNET_OPTION_ERROR_MASK\n"); + + if (*size < sizeof(ULONG)) + return ERROR_INSUFFICIENT_BUFFER; + + *(ULONG*)buffer = hdr->ErrorMask; + *size = sizeof(ULONG); + return ERROR_SUCCESS; } return INET_QueryOption(hdr, option, buffer, size, unicode);

1 0

Fabian Maurer : ntdll: Check the activation context before looking for the module basename.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 6525a1667311988258c9cb47b695930eef811c70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6525a1667311988258c9cb47… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jun 20 17:50:32 2019 +0200 ntdll: Check the activation context before looking for the module basename. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 5 ----- dlls/ntdll/loader.c | 14 ++++++++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 9f2a401..4dede37 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -3300,12 +3300,10 @@ static void test_two_dlls_at_same_time(void) if (!fill_sxs_info(&dll_2, "2", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll, TRUE)) goto cleanup; - todo_wine ok(dll_1.module != dll_2.module, "Libraries are the same\n"); dll_1.get_path(path1, sizeof(path1)); ok(strcmp(path1, dll_1.path_dll) == 0, "Got '%s', expected '%s'\n", path1, dll_1.path_dll); dll_2.get_path(path2, sizeof(path2)); - todo_wine ok(strcmp(path2, dll_2.path_dll) == 0, "Got '%s', expected '%s'\n", path2, dll_2.path_dll); cleanup: @@ -3338,10 +3336,8 @@ static void test_one_sxs_and_one_local_1(void) if (!fill_sxs_info(&dll, "1", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll, TRUE)) goto cleanup; - todo_wine ok(dll.module != module, "Libraries are the same\n"); dll.get_path(path1, sizeof(path1)); - todo_wine ok(strcmp(path1, dll.path_dll) == 0, "Got '%s', expected '%s'\n", path1, dll.path_dll); get_path(path2, sizeof(path2)); ok(strcmp(path2, path_dll_local) == 0, "Got '%s', expected '%s'\n", path2, path_dll_local); @@ -3417,7 +3413,6 @@ static void test_one_with_sxs_and_GetModuleHandleA(void) ok(success, "ActivateActCtx failed: %d\n", GetLastError()); module_temp = GetModuleHandleA("sxs_dll.dll"); - todo_wine ok (module_temp == 0, "Expected 0, got %p\n", module_temp); DeactivateActCtx(0, dll.cookie); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8b42721..67efcaf 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2693,7 +2693,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, void **module, pe_image_info_t *image_info, struct stat *st ) { WCHAR *ext, *dllname; - NTSTATUS status = STATUS_SUCCESS; + NTSTATUS status; /* first append .dll if needed */ @@ -2716,8 +2716,6 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, { WCHAR *fullname = NULL; - if ((*pwm = find_basename_module( libname )) != NULL) goto done; - status = find_actctx_dll( libname, &fullname ); if (status == STATUS_SUCCESS) { @@ -2725,7 +2723,15 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, RtlFreeHeap( GetProcessHeap(), 0, dllname ); libname = dllname = fullname; } - else if (status != STATUS_SXS_KEY_NOT_FOUND) goto done; + else + { + if (status != STATUS_SXS_KEY_NOT_FOUND) goto done; + if ((*pwm = find_basename_module( libname )) != NULL) + { + status = STATUS_SUCCESS; + goto done; + } + } } if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH)

1 0

Alexandre Julliard : ntdll: Try to use the name of the PE file also when loading .so builtin.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 91bbc46c99dd850fad8c07e42c88ba36cc1df9ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=91bbc46c99dd850fad8c07e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:30:51 2019 +0200 ntdll: Try to use the name of the PE file also when loading .so builtin. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 1 - dlls/ntdll/loader.c | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index b7242af..9f2a401 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -3481,7 +3481,6 @@ static void test_builtin_sxs(void) GetModuleFileNameA(module_msvcp, path_msvcp, sizeof(path_msvcp)); GetModuleFileNameA(module_msvcr, path_msvcr, sizeof(path_msvcr)); ok(strnicmp(expected_path, path_msvcp, strlen(expected_path)) == 0, "Expected path to start with %s, got %s\n", expected_path, path_msvcp); - todo_wine ok(strnicmp(expected_path, path_msvcr, strlen(expected_path)) == 0, "Expected path to start with %s, got %s\n", expected_path, path_msvcr); DeactivateActCtx(0, cookie); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 43ca7c5..8b42721 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2427,7 +2427,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, } info.load_path = load_path; - info.filename = so_name ? NULL : nt_name; + info.filename = nt_name; info.status = STATUS_SUCCESS; info.wm = NULL; @@ -2528,7 +2528,9 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, const UNICODE_STRING *nt_na return load_native_dll( load_path, nt_name, module_ptr, &image_info, flags, pwm, &st ); } - return load_so_dll( load_path, nt_name, so_name, pwm ); + status = load_so_dll( load_path, nt_name, so_name, pwm ); + RtlFreeHeap( GetProcessHeap(), 0, so_name ); + return status; }

1 0

Fabian Maurer : kernel32/tests: Add sxs tests.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: aa97c30b01458a311609e9fbedc874254f9de23e URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa97c30b01458a311609e9fb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jun 20 17:50:30 2019 +0200 kernel32/tests: Add sxs tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 385 +++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/dummy.c | 21 ++- dlls/kernel32/tests/dummy.spec | 2 +- 3 files changed, 406 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa97c30b01458a311609…

1 0

Alexandre Julliard : urlmon: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 42d2477edf29afada764e2eecc3666d6ccff7795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42d2477edf29afada764e2ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:15:45 2019 +0200 urlmon: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/Makefile.in | 2 ++ dlls/urlmon/axinstall.c | 34 +++++++++--------- dlls/urlmon/binding.c | 4 +-- dlls/urlmon/file.c | 4 +-- dlls/urlmon/http.c | 8 ++--- dlls/urlmon/internet.c | 4 +-- dlls/urlmon/mimefilter.c | 16 ++++----- dlls/urlmon/mk.c | 4 +-- dlls/urlmon/protocol.c | 2 +- dlls/urlmon/sec_mgr.c | 42 ++++++++++------------ dlls/urlmon/session.c | 12 +++---- dlls/urlmon/umon.c | 4 +-- dlls/urlmon/uri.c | 90 ++++++++++++++++++++++------------------------- dlls/urlmon/urlmon_main.c | 6 ++-- dlls/urlmon/urlmon_main.h | 3 +- 15 files changed, 113 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=42d2477edf29afada764…

1 0

Alexandre Julliard : url: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: dac2ea3e700f6b49c4a6c5ee82995a6bfd8d85ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=dac2ea3e700f6b49c4a6c5ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:14:20 2019 +0200 url: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/url/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/url/Makefile.in b/dlls/url/Makefile.in index 1b8a69d..8f5c8da 100644 --- a/dlls/url/Makefile.in +++ b/dlls/url/Makefile.in @@ -2,4 +2,6 @@ MODULE = url.dll IMPORTLIB = url IMPORTS = shell32 shlwapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = url_main.c

1 0

Alexandre Julliard : updspapi: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: ec4035e58a98839b86b8e1bad2907a10ba824a08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec4035e58a98839b86b8e1ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:14:01 2019 +0200 updspapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/updspapi/Makefile.in | 2 ++ dlls/updspapi/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/updspapi/Makefile.in b/dlls/updspapi/Makefile.in index 3cf1922..e83354c 100644 --- a/dlls/updspapi/Makefile.in +++ b/dlls/updspapi/Makefile.in @@ -1,5 +1,7 @@ MODULE = updspapi.dll IMPORTS = setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/updspapi/main.c b/dlls/updspapi/main.c index 73af32f..61c8ea5 100644 --- a/dlls/updspapi/main.c +++ b/dlls/updspapi/main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
87
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 June 2019