wine-commits December 2017

wine-commits@winehq.org

2 participants
450 discussions

Józef Kucia : build: Use AC_USE_SYSTEM_EXTENSIONS instead of ugly AC_EGREP_CPP test.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: ad8e27166ac564583e1fff0c76888f597ab6f792 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=ad8e27166ac564583e1fff0c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:55 2017 +0100 build: Use AC_USE_SYSTEM_EXTENSIONS instead of ugly AC_EGREP_CPP test. In order to use C functions which are not part of C99, e.g. strdup() and strncmp(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index a4db072..27c03a6 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,8 @@ AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) +AC_USE_SYSTEM_EXTENSIONS + dnl Check for progs AM_PROG_AR AC_PROG_CC @@ -29,7 +31,7 @@ LT_PREREQ([2.4.2]) LT_INIT dnl Check compiler specific flags -AC_SUBST([VKD3D_CFLAGS], [""]) +AC_SUBST([VKD3D_CFLAGS]) AS_IF([test "x${GCC}" = "xyes"], [VKD3D_CFLAGS="-Wall -pipe" VKD3D_CHECK_CFLAGS([-std=c99]) @@ -39,17 +41,6 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-Wvla]) VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])]) -AC_EGREP_CPP(yes, - [#define _POSIX_C_SOURCE 200809L - #include <unistd.h> - #ifdef _POSIX_VERSION - #if _POSIX_VERSION == 200809L - yes - #endif - #endif], - [AC_DEFINE([_POSIX_C_SOURCE], [200809L], [Define the POSIX version.])], - []) - dnl Check for cross compilers VKD3D_CHECK_MINGW32_PROG([CROSSCC32], [CROSSTARGET32], [no]) VKD3D_CHECK_MINGW64_PROG([CROSSCC64], [CROSSTARGET64], [no])

1 0

Józef Kucia : tests: Make sure that config.h is included before other headers.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: d100804e912ba050121c866f5647186af437ce16 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=d100804e912ba050121c866f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:54 2017 +0100 tests: Make sure that config.h is included before other headers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_test.h | 3 +-- tests/d3d12.c | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index 7eb72d3..c66b227 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -19,6 +19,7 @@ #ifndef __VKD3D_TEST_H #define __VKD3D_TEST_H +#include "vkd3d_common.h" #include <assert.h> #include <inttypes.h> #include <stdarg.h> @@ -27,8 +28,6 @@ #include <stdlib.h> #include <string.h> -#include "vkd3d_common.h" - static void vkd3d_test_main(int argc, char **argv); static const char *vkd3d_test_name; diff --git a/tests/d3d12.c b/tests/d3d12.c index 90f848f..caf94d2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -36,11 +36,6 @@ typedef int HRESULT; #endif -#include <inttypes.h> -#include <limits.h> -#include <math.h> -#include <time.h> - #define COBJMACROS #define INITGUID #include "vkd3d_test.h" @@ -48,6 +43,11 @@ typedef int HRESULT; #define WIDL_C_INLINE_WRAPPERS #include "d3d12.h" +#include <inttypes.h> +#include <limits.h> +#include <math.h> +#include <time.h> + #ifdef _WIN32 # include "dxgi1_4.h" #else

1 0

Hans Leidekker : dplayx/tests: Remove the firewall exception after running the tests.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: ca9ca79d12e6e5031067d20d0afb30f34fc54759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9ca79d12e6e5031067d20d0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 13 13:59:37 2017 +0100 dplayx/tests: Remove the firewall exception after running the tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 0786d16..f4e7301 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6951,7 +6951,7 @@ START_TEST(dplayx) if (!winetest_interactive) { skip("Run in interactive mode to run all dplayx tests.\n"); - return; + goto done; } trace("Running in interactive mode, tests will take a while\n"); @@ -6991,6 +6991,8 @@ START_TEST(dplayx) test_remote_data_replication(); test_host_migration(); +done: FreeLibrary(module); CoUninitialize(); + if (firewall_enabled) set_firewall(APP_REMOVE); }

1 0

Alex Henrie : appwiz.cpl: Add comment explaining why we use HTTP instead of HTTPS.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 70366fcd9001ba05a058de193e750bb977c32cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70366fcd9001ba05a058de193… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 12 19:55:37 2017 -0700 appwiz.cpl: Add comment explaining why we use HTTP instead of HTTPS. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 5ec49cf..76f00a0 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -80,6 +80,9 @@ typedef struct { LPCWSTR dialog_template; } addon_info_t; +/* Download addon files over HTTP because Wine depends on an external library + * for TLS, so we can't be sure that HTTPS will work. The integrity of each file + * is checked with a hardcoded cryptographically secure hash. */ static const addon_info_t addons_info[] = { { GECKO_VERSION,

1 0

Henri Verbeet : d2d1/tests: Introduce an ARRAY_SIZE macro.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 1ddbab3f2773e550a8aaed04d99a9ff2796e1a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ddbab3f2773e550a8aaed04d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 13 20:36:13 2017 +0330 d2d1/tests: Introduce an ARRAY_SIZE macro. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5116d78..af023a1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -26,6 +26,10 @@ #include "dwrite.h" #include "wincodec.h" +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif + struct resource_readback { ID3D10Resource *resource; @@ -1618,7 +1622,7 @@ static void test_bitmap_brush(void) ID2D1RenderTarget_Clear(rt, &color); ID2D1BitmapBrush_SetOpacity(brush, 1.0f); - for (i = 0; i < sizeof(extend_mode_tests) / sizeof(*extend_mode_tests); ++i) + for (i = 0; i < ARRAY_SIZE(extend_mode_tests); ++i) { ID2D1BitmapBrush_SetExtendModeX(brush, extend_mode_tests[i].extend_mode_x); extend_mode = ID2D1BitmapBrush_GetExtendModeX(brush); @@ -1776,7 +1780,7 @@ static void test_linear_brush(void) ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); - hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, sizeof(stops) / sizeof(*stops), + hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops), D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient); ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr); @@ -1813,7 +1817,7 @@ static void test_linear_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test1) / sizeof(*test1); ++i) + for (i = 0; i < ARRAY_SIZE(test1); ++i) { DWORD colour; @@ -1886,7 +1890,7 @@ static void test_linear_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test2) / sizeof(*test2); ++i) + for (i = 0; i < ARRAY_SIZE(test2); ++i) { DWORD colour; @@ -1982,7 +1986,7 @@ static void test_radial_brush(void) ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); - hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, sizeof(stops) / sizeof(*stops), + hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops), D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient); ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr); @@ -2025,7 +2029,7 @@ static void test_radial_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test1) / sizeof(*test1); ++i) + for (i = 0; i < ARRAY_SIZE(test1); ++i) { DWORD colour; @@ -2100,7 +2104,7 @@ static void test_radial_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test2) / sizeof(*test2); ++i) + for (i = 0; i < ARRAY_SIZE(test2); ++i) { DWORD colour; @@ -3622,7 +3626,7 @@ static void test_bitmap_formats(void) bitmap_desc.dpiX = 96.0f; bitmap_desc.dpiY = 96.0f; - for (i = 0; i < sizeof(bitmap_formats) / sizeof(*bitmap_formats); ++i) + for (i = 0; i < ARRAY_SIZE(bitmap_formats); ++i) { for (j = 0; j < 4; ++j) { @@ -4406,7 +4410,7 @@ static void test_create_target(void) hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); - for (i = 0; i < sizeof(create_dpi_tests) / sizeof(*create_dpi_tests); ++i) + for (i = 0; i < ARRAY_SIZE(create_dpi_tests); ++i) { ID2D1GdiInteropRenderTarget *interop; D2D1_RENDER_TARGET_PROPERTIES desc; @@ -4595,7 +4599,7 @@ todo_wine hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(hr == S_OK, "EndDraw failure expected, hr %#x.\n", hr); - for (i = 0; i < sizeof(antialias_mode_tests)/sizeof(*antialias_mode_tests); i++) + for (i = 0; i < ARRAY_SIZE(antialias_mode_tests); ++i) { IDWriteRenderingParams *rendering_params; @@ -4691,7 +4695,7 @@ static void test_dc_target(void) hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); - for (i = 0; i < sizeof(invalid_formats) / sizeof(*invalid_formats); ++i) + for (i = 0; i < ARRAY_SIZE(invalid_formats); ++i) { desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; desc.pixelFormat = invalid_formats[i]; @@ -5219,7 +5223,7 @@ static void test_stroke_style(void) desc.miterLimit = 1.5f; desc.dashOffset = 0.0f; - for (i = 0; i < sizeof(dash_style_tests)/sizeof(dash_style_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(dash_style_tests); ++i) { float dashes[10]; UINT dash_count; @@ -5232,7 +5236,7 @@ static void test_stroke_style(void) dash_count = ID2D1StrokeStyle_GetDashesCount(style); ok(dash_count == dash_style_tests[i].dash_count, "%u: unexpected dash count %u, expected %u.\n", i, dash_count, dash_style_tests[i].dash_count); - ok(dash_count < sizeof(dashes)/sizeof(dashes[0]), "%u: unexpectedly large dash count %u.\n", i, dash_count); + ok(dash_count < ARRAY_SIZE(dashes), "%u: unexpectedly large dash count %u.\n", i, dash_count); if (dash_count == dash_style_tests[i].dash_count) { unsigned int j; @@ -5243,11 +5247,11 @@ static void test_stroke_style(void) /* Ask for more dashes than style actually has. */ memset(dashes, 0xcc, sizeof(dashes)); - ID2D1StrokeStyle_GetDashes(style, dashes, sizeof(dashes)/sizeof(dashes[0])); + ID2D1StrokeStyle_GetDashes(style, dashes, ARRAY_SIZE(dashes)); ok(!memcmp(dashes, dash_style_tests[i].dashes, sizeof(*dashes) * dash_count), "%u: unexpected dash array.\n", i); - for (j = dash_count; j < sizeof(dashes)/sizeof(dashes[0]); j++) + for (j = dash_count; j < ARRAY_SIZE(dashes); ++j) ok(dashes[j] == 0.0f, "%u: unexpected dash value at %u.\n", i, j); } @@ -5308,9 +5312,9 @@ static void test_gradient(void) set_color(&stops[0].color, 1.0f, 0.5f, 0.4f, 1.0f); color = stops[0].color; stops[2] = stops[1] = stops[0]; - ID2D1GradientStopCollection_GetGradientStops(gradient, stops, sizeof(stops)/sizeof(stops[0])); + ID2D1GradientStopCollection_GetGradientStops(gradient, stops, ARRAY_SIZE(stops)); ok(!memcmp(stops, stops2, sizeof(*stops) * count), "Unexpected gradient stops array.\n"); - for (i = count; i < sizeof(stops)/sizeof(stops[0]); i++) + for (i = count; i < ARRAY_SIZE(stops); ++i) { ok(stops[i].position == 123.4f, "%u: unexpected stop position %f.\n", i, stops[i].position); ok(!memcmp(&stops[i].color, &color, sizeof(color)), "%u: unexpected stop color.\n", i);

1 0

Matteo Bruni : d3d11/tests: Add a couple of testcases for sRGB SRVs.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 77276430a1bc3a09047e7aa8c0aa2fa7146c30d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77276430a1bc3a09047e7aa8c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Dec 13 20:36:12 2017 +0330 d3d11/tests: Add a couple of testcases for sRGB SRVs. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4b23546..74c0488 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3287,6 +3287,7 @@ static void test_create_shader_resource_view(void) #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN #define RGBA8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define RGBA8_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB #define RGBA8_UINT DXGI_FORMAT_R8G8B8A8_UINT #define RGBA8_TL DXGI_FORMAT_R8G8B8A8_TYPELESS #define DIM_UNKNOWN D3D11_SRV_DIMENSION_UNKNOWN @@ -3412,6 +3413,8 @@ static void test_create_shader_resource_view(void) {{TEX_2D, 1, 9, RGBA8_UNORM}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UINT, TEX_2D, 0, 1}}, {{TEX_2D, 1, 1, RGBA8_UINT}, {RGBA8_UNORM, TEX_2D, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_SRGB, TEX_2D, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_SRGB}, {RGBA8_UNORM, TEX_2D, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D_ARRAY, 0, 1, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D, 0, 1}}, @@ -3431,6 +3434,9 @@ static void test_create_shader_resource_view(void) }; #undef FMT_UNKNOWN #undef RGBA8_UNORM +#undef RGBA8_SRGB +#undef RGBA8_UINT +#undef RGBA8_TL #undef DIM_UNKNOWN #undef TEX_1D #undef TEX_1D_ARRAY @@ -8001,6 +8007,7 @@ static void test_render_target_views(void) #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN #define RGBA8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM #define RGBA8_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB +#define RGBA8_UINT DXGI_FORMAT_R8G8B8A8_UINT #define RGBA8_TL DXGI_FORMAT_R8G8B8A8_TYPELESS #define DIM_UNKNOWN D3D11_RTV_DIMENSION_UNKNOWN #define TEX_1D D3D11_RTV_DIMENSION_TEXTURE1D @@ -8062,6 +8069,7 @@ static void test_render_target_views(void) #undef FMT_UNKNOWN #undef RGBA8_UNORM #undef RGBA8_SRGB +#undef RGBA8_UINT #undef RGBA8_TL #undef DIM_UNKNOWN #undef TEX_1D

1 0

Martin Payne : user.exe16: Implemented OldExitWindows() user.exe16 function.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 7f47234c9b80b038a11da1cff994450f89b90687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f47234c9b80b038a11da1cff… Author: Martin Payne <development(a)martinpayne.me.uk> Date: Wed Dec 13 10:23:50 2017 +0000 user.exe16: Implemented OldExitWindows() user.exe16 function. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user.c | 9 +++++++++ dlls/user.exe16/user.exe16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index eac4a19..729e973 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -510,6 +510,15 @@ static void free_clipboard_formats(void) } +/*********************************************************************** + * OldExitWindows (USER.2) + */ +void WINAPI OldExitWindows16(void) +{ + ExitWindows16(0, 0); +} + + /********************************************************************** * InitApp (USER.5) */ diff --git a/dlls/user.exe16/user.exe16.spec b/dlls/user.exe16/user.exe16.spec index 8d928bc..ec57180 100644 --- a/dlls/user.exe16/user.exe16.spec +++ b/dlls/user.exe16/user.exe16.spec @@ -1,5 +1,5 @@ 1 pascal -ret16 MessageBox(word str str word) MessageBox16 -2 stub OldExitWindows +2 pascal -ret16 OldExitWindows() OldExitWindows16 3 stub EnableOEMLayer 4 stub DisableOEMLayer 5 pascal -ret16 InitApp(word) InitApp16

1 0

Martin Payne : krnl386.exe16: Shared libraries have a ".exe" rather than " .dll" extension on Windows < 3.0.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 4a8834f6ce6ac183faf773c968ad4359cc9fd02e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8834f6ce6ac183faf773c96… Author: Martin Payne <development(a)martinpayne.me.uk> Date: Wed Dec 13 10:23:08 2017 +0000 krnl386.exe16: Shared libraries have a ".exe" rather than ".dll" extension on Windows < 3.0. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/ne_module.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 70f8a46..14f8075 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -788,9 +788,9 @@ static BOOL NE_LoadDLLs( NE_MODULE *pModule ) /* its handle in the list of DLLs to initialize. */ HMODULE16 hDLL; - /* Append .DLL to name if no extension present */ + /* Append .DLL (Windows >= 3.00) or .EXE (Windows < 3.00) to name if no extension present */ if (!(p = strrchr( buffer, '.')) || strchr( p, '/' ) || strchr( p, '\\')) - strcat( buffer, ".DLL" ); + strcat( buffer, (GetExeVersion16() >= 0x0300) ? ".DLL" : ".EXE" ); if ((hDLL = MODULE_LoadModule16( buffer, TRUE, TRUE )) < 32) { @@ -988,7 +988,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ strcpy( dllname, basename ); q = strrchr( dllname, '.' ); - if (!q) strcat( dllname, ".dll" ); + if (!q) strcat( dllname, (GetExeVersion16() >= 0x0300) ? ".dll" : ".exe" ); for (q = dllname; *q; q++) if (*q >= 'A' && *q <= 'Z') *q += 32; strcpy( q, "16" );

1 0

Martin Payne : kernel32: Don't report valid non-Win16 NE executables ( e.g. OS/2) as broken.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: e562d4de81432f7206217b066514953b553f90ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e562d4de81432f7206217b066… Author: Martin Payne <development(a)martinpayne.me.uk> Date: Wed Dec 13 10:21:00 2017 +0000 kernel32: Don't report valid non-Win16 NE executables (e.g. OS/2) as broken. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index b4d5fe7..c0d9918 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -253,8 +253,8 @@ BOOL WINAPI DisableThreadLibraryCalls( HMODULE hModule ) /* Check whether a file is an OS/2 or a very old Windows executable * by testing on import of KERNEL. * - * FIXME: is reading the module imports the only way of discerning - * old Windows binaries from OS/2 ones ? At least it seems so... + * Reading the module imports is the only reasonable way of discerning + * old Windows binaries from OS/2 ones. */ static DWORD MODULE_Decide_OS2_OldWin(HANDLE hfile, const IMAGE_DOS_HEADER *mz, const IMAGE_OS2_HEADER *ne) { @@ -270,31 +270,28 @@ static DWORD MODULE_Decide_OS2_OldWin(HANDLE hfile, const IMAGE_DOS_HEADER *mz, || (!(modtab = HeapAlloc( GetProcessHeap(), 0, ne->ne_cmod*sizeof(WORD)))) || (!(ReadFile(hfile, modtab, ne->ne_cmod*sizeof(WORD), &len, NULL))) || (len != ne->ne_cmod*sizeof(WORD)) ) - goto broken; + goto done; /* read imported names table */ if ( (SetFilePointer( hfile, mz->e_lfanew + ne->ne_imptab, NULL, SEEK_SET ) == -1) || (!(nametab = HeapAlloc( GetProcessHeap(), 0, ne->ne_enttab - ne->ne_imptab))) || (!(ReadFile(hfile, nametab, ne->ne_enttab - ne->ne_imptab, &len, NULL))) || (len != ne->ne_enttab - ne->ne_imptab) ) - goto broken; + goto done; for (i=0; i < ne->ne_cmod; i++) { - LPSTR module = &nametab[modtab[i]]; - TRACE("modref: %.*s\n", module[0], &module[1]); - if (!(strncmp(&module[1], "KERNEL", module[0]))) - { /* very old Windows file */ - MESSAGE("This seems to be a very old (pre-3.0) Windows executable. Expect crashes, especially if this is a real-mode binary !\n"); + LPSTR module = &nametab[modtab[i]]; + TRACE("modref: %.*s\n", module[0], &module[1]); + if (!(strncmp(&module[1], "KERNEL", module[0]))) + { /* very old Windows file */ + MESSAGE("This seems to be a very old (pre-3.0) Windows executable. Expect crashes, especially if this is a real-mode binary !\n"); ret = BINARY_WIN16; - goto good; - } + break; + } } -broken: - ERR("Hmm, an error occurred. Is this binary file broken?\n"); - -good: +done: HeapFree( GetProcessHeap(), 0, modtab); HeapFree( GetProcessHeap(), 0, nametab); SetFilePointer( hfile, currpos, NULL, SEEK_SET); /* restore filepos */

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: fa48c269a9f5cb47b3e3782089d92cf49fd73f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa48c269a9f5cb47b3e378208… Author: Kim Malmo <berencamlost(a)msn.com> Date: Wed Dec 13 14:43:51 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 124 ++++++++++++++++++++++++------------------------------------ 1 file changed, 49 insertions(+), 75 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 300ee86..0a6af74 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-19 16:00+0100\n" +"PO-Revision-Date: 2017-12-11 21:00+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -6962,7 +6962,7 @@ msgstr "Evaluerer startbetingelser" #: msi.rc:109 msgid "Migrating feature states from related applications" -msgstr "" +msgstr "Migrerer egenskapstilstand fra relaterte programmer" #: msi.rc:110 msgid "Moving files" @@ -6974,13 +6974,11 @@ msgstr "Publiserer assembly informasjon" #: msi.rc:112 msgid "Unpublishing assembly information" -msgstr "" +msgstr "Avpubliserer assembly informasjon" #: msi.rc:113 -#, fuzzy -#| msgid "Icon files" msgid "Patching files" -msgstr "Ikonfiler" +msgstr "Oppdaterer filer" #: msi.rc:114 msgid "Updating component registration" @@ -6992,7 +6990,7 @@ msgstr "Publiserer kvalifiserte komponenter" #: msi.rc:116 msgid "Publishing Product Features" -msgstr "" +msgstr "Publiserer produktegenskaper" #: msi.rc:117 msgid "Publishing product information" @@ -7008,7 +7006,7 @@ msgstr "Registrerer COM+ programmer og komponenter" #: msi.rc:120 msgid "Registering extension servers" -msgstr "" +msgstr "Registrerer utvidelsestjenere" #: msi.rc:121 msgid "Registering fonts" @@ -7024,7 +7022,7 @@ msgstr "Registrerer produkt" #: msi.rc:124 msgid "Registering program identifiers" -msgstr "" +msgstr "Registrerer programidentifikatorer" #: msi.rc:125 msgid "Registering type libraries" @@ -7039,10 +7037,8 @@ msgid "Removing duplicated files" msgstr "Fjerner duplikate filer" #: msi.rc:128 msi.rc:152 -#, fuzzy -#| msgid "Applying font settings" msgid "Updating environment strings" -msgstr "Aktiverer skriftinnstillinger" +msgstr "Oppdaterer miljøvariabler" #: msi.rc:129 msgid "Removing applications" @@ -7058,7 +7054,7 @@ msgstr "Fjerner mapper" #: msi.rc:132 msgid "Removing INI files entries" -msgstr "" +msgstr "Fjerner INI filoppføringer" #: msi.rc:133 msgid "Removing ODBC components" @@ -7098,7 +7094,7 @@ msgstr "Avpubliserer kvalifiserte komponenter" #: msi.rc:143 msgid "Unpublishing Product Features" -msgstr "" +msgstr "Avpubliserer produktegenskaper" #: msi.rc:144 msgid "Unpublishing product information" @@ -7114,7 +7110,7 @@ msgstr "Avregistrerer COM+ programmer og komponenter" #: msi.rc:147 msgid "Unregistering extension servers" -msgstr "" +msgstr "Avregistrerer utvidelsestjenere" #: msi.rc:148 msgid "Unregistering fonts" @@ -7126,7 +7122,7 @@ msgstr "Avregistrerer MIME informasjon" #: msi.rc:150 msgid "Unregistering program identifiers" -msgstr "" +msgstr "Avregistrerer programidentifikatorer" #: msi.rc:151 msgid "Unregistering type libraries" @@ -7134,7 +7130,7 @@ msgstr "Avregistrerer typebibliotek" #: msi.rc:153 msgid "Writing INI files values" -msgstr "" +msgstr "Skriver INI filverdier" #: msi.rc:154 msgid "Writing system registry values" @@ -7146,7 +7142,7 @@ msgstr "Plass ledig: [1]" #: msi.rc:161 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "Egenskap: [1], Signatur: [2]" #: msi.rc:162 msgid "File: [1]" @@ -7190,7 +7186,7 @@ msgstr "Program: [1]" #: msi.rc:174 msi.rc:175 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "" +msgstr "Programkontekst:[1], Assemblynavn:[2]" #: msi.rc:176 msgid "File: [1], Directory: [2], Size: [3]" @@ -7198,19 +7194,19 @@ msgstr "Fil: [1], Mappe: [2], Størrelse: [6]" #: msi.rc:177 msi.rc:198 msgid "Component ID: [1], Qualifier: [2]" -msgstr "" +msgstr "Komponent ID: [1], Kvalifiserer: [2]" #: msi.rc:178 msi.rc:199 msgid "Feature: [1]" -msgstr "" +msgstr "Egenskap: [1]" #: msi.rc:179 msi.rc:200 msgid "Class Id: [1]" -msgstr "" +msgstr "Klasse ID: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2], Brukere: [3], RSN: [4]}" #: msi.rc:181 msi.rc:202 msgid "Extension: [1]" @@ -7222,7 +7218,7 @@ msgstr "Skrift: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "MIME innholdstype: [1], Utvidelse: [2]" #: msi.rc:184 msi.rc:205 msgid "ProgId: [1]" @@ -7234,27 +7230,27 @@ msgstr "" #: msi.rc:186 msi.rc:189 msgid "File: [1], Directory: [9]" -msgstr "" +msgstr "Fil: [1], Mappe: [2]" #: msi.rc:187 msi.rc:207 msgid "Name: [1], Value: [2], Action [3]" -msgstr "" +msgstr "Navn: [1], Verdi: [2], Handling [3]" #: msi.rc:188 msgid "Application: [1], Command line: [2]" -msgstr "" +msgstr "Program: [1], Kommandolinje: [2]" #: msi.rc:191 msi.rc:208 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "" +msgstr "Fil: [1], Seksjon: [2], Nøkkel: [3], Verdi: [4]" #: msi.rc:192 msgid "Key: [1], Name: [2]" -msgstr "" +msgstr "Nøkkel: [1], Navn: [2]" #: msi.rc:194 msi.rc:195 msgid "File: [1], Folder: [2]" -msgstr "" +msgstr "Fil: [1], Mappe: [2]" #: msi.rc:201 msgid "AppId: [1]{{, AppType: [2]}}" @@ -7262,7 +7258,7 @@ msgstr "" #: msi.rc:209 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "" +msgstr "Nøkkel: [1], Navn: [2], Verdi: [3]" #: msi.rc:71 msgid "{{Fatal error: }}" @@ -7286,6 +7282,9 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"Installeren har truffet på ett eventet problem under installeringen av denne " +"pakken. Dette kan skyldes ett problem med denne pakken. Errorkoden er [1]. " +"{{Argumentene er: [2], [3], [4]}}" #: msi.rc:76 msgid "{{Disk full: }}" @@ -7293,33 +7292,35 @@ msgstr "{{Disken er full: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -msgstr "" +msgstr "Handling [Tid]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "" +msgstr "Meldingstype: [1], Argument: [2]{, [3]" #: msi.rc:81 msgid "=== Logging started: [Date] [Time] ===" -msgstr "" +msgstr "=== Logging startet: [Dato] [Tid] ===" #: msi.rc:79 msgid "Action start [Time]: [1]." -msgstr "" +msgstr "Handling startet [Tid]: [1]." #: msi.rc:80 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "" +msgstr "Handling avsluttet [Tid]: [1]. Returnert verdi [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Vennligst sett inn disk: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"Kildefil ikke funnet{{(cabinet)}}: [2]. Bekreft at den finnes og at du har " +"tilgang til den." #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8923,10 +8924,8 @@ msgid " sec" msgstr " sek" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Velg mappe" +msgstr "Velg kilde" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -12039,17 +12038,6 @@ msgid "Icons (*.ico)" msgstr "Ikoner (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12065,7 +12053,7 @@ msgstr "" " REG [operasjon] [parametere]\n" "\n" "Støttede operasjoner:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "For hjelp med spesifikke operasjoner, skriv:\n" " REG [operasjon] /?\n" @@ -12195,43 +12183,31 @@ msgstr "(verdi ikke oppgitt)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT fil.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: Filen \"%1\" ble ikke funnet.\n" +msgstr "reg: Filen \"%1\" ble ikke funnet.\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: Kan ikke åpne registernøkkelen \"%1\".\n" +msgstr "reg: Kan ikke åpne registernøkkelen \"%1\".\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Ukjent escape-sekvens [\\%1!c!]\n" +msgstr "reg: Ukjent escape-sekvens [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG QUERY key_name [/v value_name | /ve] [/s]\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG QUERY nøkkelnavn [/v verdi | /ve] [/s]\n" +msgstr "REG EXPORT nøkkelnavn fil.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: Ugyldig systemnøkkel [%1]\n" +msgstr "reg: Ugyldig systemnøkkel [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "Registerverdien \"%1\" finnes fra før. Vil du erstatte den?" +msgstr "Filen \"%1\" finnes fra før. Vil du erstatte den?" #: regedit.rc:34 msgid "&Registry" @@ -15003,10 +14979,8 @@ msgid "Expert" msgstr "Ekspert" #: winemine.rc:74 winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Resultat" +msgstr "Tilbakestill resultater" #: winemine.rc:80 msgid "Congratulations!" @@ -15034,7 +15008,7 @@ msgstr "Miner" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Alle resultater vil bli tapt. Er du sikker?" #: winemine.rc:30 msgid "WineMine"

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
45
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 December 2017