June 2019 - Wine-Commits - list.winehq.org

Paul Gofman : ddraw: Set _TSS_ALPHA_OP to _SELECT_ARG1 in case of NULL texture in fixup_texture_alpha_op ().
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: cc2e05bdc734753a206a55d1ba0da587182e1b0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc2e05bdc734753a206a55d1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Sat Jun 22 19:56:26 2019 +0300 ddraw: Set _TSS_ALPHA_OP to _SELECT_ARG1 in case of NULL texture in fixup_texture_alpha_op(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 6 ++--- dlls/ddraw/tests/ddraw4.c | 65 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 49 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 284daa3..fb33372 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2667,7 +2667,7 @@ static void fixup_texture_alpha_op(struct d3d_device *device) /* This fixup is required by the way D3DTBLEND_MODULATE maps to texture stage states. See d3d_device3_SetRenderState() for details. */ struct wined3d_texture *tex; - BOOL tex_alpha = FALSE; + BOOL tex_alpha = TRUE; DDPIXELFORMAT ddfmt; if (!(device->legacyTextureBlending && device->texture_map_blend == D3DTBLEND_MODULATE)) @@ -2680,8 +2680,8 @@ static void fixup_texture_alpha_op(struct d3d_device *device) wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); ddfmt.dwSize = sizeof(ddfmt); ddrawformat_from_wined3dformat(&ddfmt, desc.format); - if (ddfmt.u5.dwRGBAlphaBitMask) - tex_alpha = TRUE; + if (!ddfmt.u5.dwRGBAlphaBitMask) + tex_alpha = FALSE; } /* Args 1 and 2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6a8ecde..013d49c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9506,6 +9506,7 @@ static void test_texturemapblend(void) DDCOLORKEY ckey; D3DCOLOR color; ULONG refcount; + DWORD value; HWND window; DDBLTFX fx; HRESULT hr; @@ -9548,20 +9549,24 @@ static void test_texturemapblend(void) } hr = IDirect3DDevice3_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); - ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); viewport = create_viewport(device, 0, 0, 640, 480); hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); - ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_TEXTUREMAPBLEND, &texturemapblend); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(texturemapblend == D3DTBLEND_MODULATE, "Got unexpected texture map blend %#x.\n", texturemapblend); + hr = IDirect3DDevice3_GetTextureStageState(device, 0, D3DTSS_ALPHAOP, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == D3DTOP_SELECTARG1, "Got unexpected D3DTSS_ALPHAOP value %#x.\n", value); + /* Test alpha with DDPF_ALPHAPIXELS texture - should be taken from texture * alpha channel. * @@ -9582,15 +9587,29 @@ static void test_texturemapblend(void) U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; U5(U4(surface_desc).ddpfPixelFormat).dwRGBAlphaBitMask = 0xff000000; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_QueryInterface(surface, &IID_IDirect3DTexture2, (void **)&texture); - ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_SetTexture(device, 0, texture); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice3_GetTextureStageState(device, 0, D3DTSS_ALPHAOP, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == D3DTOP_SELECTARG1, "Got unexpected D3DTSS_ALPHAOP value %#x.\n", value); + + hr = IDirect3DDevice3_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice3_GetTextureStageState(device, 0, D3DTSS_ALPHAOP, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == D3DTOP_SELECTARG1, "Got unexpected D3DTSS_ALPHAOP value %#x.\n", value); + + hr = IDirect3DDevice3_SetTexture(device, 0, texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DViewport3_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memset(&fx, 0, sizeof(fx)); fx.dwSize = sizeof(fx); @@ -9615,8 +9634,12 @@ static void test_texturemapblend(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, TRUE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + +#if 0 + /* Disable the call to test that the device has this state by default. */ hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); +#endif /* Texture stage state does not change so legacy texture blending stays enabled. */ hr = IDirect3DDevice3_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_MODULATE); @@ -9727,7 +9750,7 @@ static void test_texturemapblend(void) ok(compare_color(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice3_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3DTexture2_Release(texture); refcount = IDirectDrawSurface4_Release(surface); ok(!refcount, "Surface not properly released, refcount %u.\n", refcount); @@ -9748,33 +9771,37 @@ static void test_texturemapblend(void) U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_QueryInterface(surface, &IID_IDirect3DTexture2, (void **)&texture); - ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_SetTexture(device, 0, texture); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice3_GetTextureStageState(device, 0, D3DTSS_ALPHAOP, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == D3DTOP_SELECTARG2, "Got unexpected D3DTSS_ALPHAOP value %#x.\n", value); hr = IDirect3DViewport3_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); U5(fx).dwFillColor = 0xff0000ff; hr = IDirectDrawSurface4_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - ok(SUCCEEDED(hr), "Failed to clear texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); U5(fx).dwFillColor = 0x800000ff; hr = IDirectDrawSurface4_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - ok(SUCCEEDED(hr), "Failed to clear texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1, &test1_quads[0], 4, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1, &test1_quads[4], 4, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 5, 5); ok(compare_color(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color);

1 0

Alistair Leslie-Hughes : wininet: Always set last error in InternetReadFile.
by Alexandre Julliard June 24, 2019

June 24, 2019

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

Fabian Maurer : ntdll: Check the activation context before looking for the module basename.
by Alexandre Julliard June 24, 2019

June 24, 2019

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

Fabian Maurer : kernel32/tests: Add sxs tests.
by Alexandre Julliard June 24, 2019

June 24, 2019

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 : uianimation: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 761a693bd94cd1cf1106cfee51bc3aeec781ca67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=761a693bd94cd1cf1106cfee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:13:31 2019 +0200 uianimation: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/Makefile.in | 2 ++ dlls/uianimation/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in index b504181..85bf167 100644 --- a/dlls/uianimation/Makefile.in +++ b/dlls/uianimation/Makefile.in @@ -1,4 +1,6 @@ MODULE = uianimation.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index 92d594f..ea35a30 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : url: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

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 June 24, 2019

June 24, 2019

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

Alexandre Julliard : uiribbon: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 59c2df1552bce81c41a147fb68e716e64074dfce URL: https://source.winehq.org/git/wine.git/?a=commit;h=59c2df1552bce81c41a147fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:13:48 2019 +0200 uiribbon: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiribbon/Makefile.in | 2 ++ dlls/uiribbon/uiribbon.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/uiribbon/Makefile.in b/dlls/uiribbon/Makefile.in index 0b9724d..f41b4d4 100644 --- a/dlls/uiribbon/Makefile.in +++ b/dlls/uiribbon/Makefile.in @@ -1,6 +1,8 @@ MODULE = uiribbon.dll IMPORTS = uuid ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c \ uiribbon.c diff --git a/dlls/uiribbon/uiribbon.c b/dlls/uiribbon/uiribbon.c index 58ac51a..18cb487 100644 --- a/dlls/uiribbon/uiribbon.c +++ b/dlls/uiribbon/uiribbon.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include "wine/debug.h" #define COBJMACROS

1 0

Alexandre Julliard : uianimationcore: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 71dfe2dd1065f3701ccbcf43e80176c070f0eb28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71dfe2dd1065f3701ccbcf43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:13:36 2019 +0200 uianimationcore: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 5221450..b6edec5 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,5 +1,7 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ uia_main.c

1 0

Alexandre Julliard : ntdll: Try to use the name of the PE file also when loading .so builtin.
by Alexandre Julliard June 24, 2019

June 24, 2019

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