December 2016 - Wine-Commits

Filip Frąckiewicz : wined3d: Add AMD Radeon HD 6480G IGP.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: af1a0634192bc0451e0e2cb5e39fad45efe26f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1a0634192bc0451e0e2cb5e… Author: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Date: Wed Sep 28 03:16:16 2016 +0200 wined3d: Add AMD Radeon HD 6480G IGP. Signed-off-by: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1fdfe82663e329a8138313888cd4d3f870d07061) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 095e3cb..6fe1cdb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1334,6 +1334,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6300, "AMD Radeon HD 6300 series Graphics", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6400, "AMD Radeon HD 6400 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6410D, "AMD Radeon HD 6410D", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6480G, "AMD Radeon HD 6480G", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6550D, "AMD Radeon HD 6550D", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600, "AMD Radeon HD 6600 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600M, "AMD Radeon HD 6600M Series", DRIVER_AMD_R600, 512 }, @@ -1931,6 +1932,7 @@ cards_amd_binary[] = {"HD 6570", CARD_AMD_RADEON_HD6600}, {"HD 6500M", CARD_AMD_RADEON_HD6600M}, {"HD 6500", CARD_AMD_RADEON_HD6600}, + {"HD 6480G", CARD_AMD_RADEON_HD6480G}, {"HD 6400", CARD_AMD_RADEON_HD6400}, {"HD 6300", CARD_AMD_RADEON_HD6300}, {"HD 6200", CARD_AMD_RADEON_HD6300}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5203e4a..4e83cc6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1519,6 +1519,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD6300 = 0x9803, CARD_AMD_RADEON_HD6400 = 0x6770, CARD_AMD_RADEON_HD6410D = 0x9644, + CARD_AMD_RADEON_HD6480G = 0x9648, CARD_AMD_RADEON_HD6550D = 0x9640, CARD_AMD_RADEON_HD6600 = 0x6758, CARD_AMD_RADEON_HD6600M = 0x6741,

1 0

Filip Frąckiewicz : wined3d: Add NVIDIA GTX 690 ( GK104) to the GPU list.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 85f4168013b92f064a873ac58c37926d355fcbb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f4168013b92f064a873ac58… Author: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Date: Thu Sep 22 05:56:42 2016 +0200 wined3d: Add NVIDIA GTX 690 (GK104) to the GPU list. Signed-off-by: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7c261059d4f676fd16f98275b3432e38089ed932) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3b0f32b..095e3cb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1272,6 +1272,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1787,6 +1788,7 @@ cards_nvidia_binary[] = {"GT 740M", CARD_NVIDIA_GEFORCE_GT740M}, /* Geforce 700 - midend mobile */ {"GT 730M", CARD_NVIDIA_GEFORCE_GT730M}, /* Geforce 700 - midend mobile */ {"GT 730", CARD_NVIDIA_GEFORCE_GT730}, /* Geforce 700 - lowend */ + {"GTX 690", CARD_NVIDIA_GEFORCE_GTX690}, /* Geforce 600 - highend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ @@ -2149,7 +2151,7 @@ cards_nvidia_mesa[] = {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, - {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, + {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 */ /* Fermi */ {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, {"NVD7", CARD_NVIDIA_GEFORCE_820M}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23d681b..5203e4a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1616,6 +1616,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GTX690 = 0x1188, CARD_NVIDIA_GEFORCE_GT730 = 0x1287, CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, CARD_NVIDIA_GEFORCE_GT740M = 0x1292,

1 0

Nikolay Sivov : ucrtbase: Fix some spec file entries.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 4e2163b65ae19aab965c0049d3a46cff426981d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2163b65ae19aab965c0049d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 14:18:04 2016 +0300 ucrtbase: Fix some spec file entries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0ca1093335dbe072e4ad52e3e39129b1213e0ff8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 16 ++++++++-------- dlls/ucrtbase/ucrtbase.spec | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 5acd7aa..10a2ab7 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -1,21 +1,21 @@ @ cdecl __acrt_iob_func(long) ucrtbase.__acrt_iob_func @ cdecl __p__commode() ucrtbase.__p__commode @ cdecl __p__fmode() ucrtbase.__p__fmode -@ cdecl __stdio_common_vfprintf(int64 ptr ptr ptr ptr) ucrtbase.__stdio_common_vfprintf +@ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p @ stub __stdio_common_vfprintf_s @ stub __stdio_common_vfscanf -@ cdecl __stdio_common_vfwprintf(int64 ptr ptr ptr ptr) ucrtbase.__stdio_common_vfwprintf +@ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s @ stub __stdio_common_vfwscanf -@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long ptr ptr ptr) ucrtbase.__stdio_common_vsnprintf_s -@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long ptr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s -@ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf +@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s +@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s +@ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p -@ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf_s -@ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsscanf -@ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vswprintf +@ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf_s +@ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsscanf +@ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3948de3..fde39e8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -146,21 +146,21 @@ @ stub __std_type_info_destroy_list @ stub __std_type_info_hash @ stub __std_type_info_name -@ cdecl __stdio_common_vfprintf(int64 ptr ptr ptr ptr) MSVCRT__stdio_common_vfprintf +@ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p @ stub __stdio_common_vfprintf_s @ stub __stdio_common_vfscanf -@ cdecl __stdio_common_vfwprintf(int64 ptr ptr ptr ptr) MSVCRT__stdio_common_vfwprintf +@ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s @ stub __stdio_common_vfwscanf -@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long ptr ptr ptr) MSVCRT__stdio_common_vsnprintf_s -@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long ptr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s -@ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf +@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s +@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s +@ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p -@ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf_s -@ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsscanf -@ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vswprintf +@ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s +@ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf +@ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf

1 0

Nikolay Sivov : rpcrt4: Added NdrAsyncServerCall stub.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: c7fa4757f3b9c72e702477ec6b02cb2fb0f95f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7fa4757f3b9c72e702477ec6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 28 18:17:16 2016 +0300 rpcrt4: Added NdrAsyncServerCall stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 858064abf694877de6b6558e5074bcee508cdbe5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 5 +++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index f5a6bab..92a3665 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1850,3 +1850,8 @@ RPCRTAPI LONG RPC_ENTRY NdrAsyncStubCall(struct IRpcStubBuffer* pThis, FIXME("unimplemented, expect crash!\n"); return 0; } + +void RPC_ENTRY NdrAsyncServerCall(PRPC_MESSAGE pRpcMsg) +{ + FIXME("unimplemented, %p\n", pRpcMsg); +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 244bc2a..01c5d32 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -117,7 +117,7 @@ @ stub NDRcopy @ stdcall NdrAllocate(ptr long) @ varargs NdrAsyncClientCall(ptr ptr) -@ stub NdrAsyncServerCall +@ stdcall NdrAsyncServerCall(ptr) @ stdcall NdrAsyncStubCall(ptr ptr ptr ptr) @ stdcall NdrByteCountPointerBufferSize(ptr ptr ptr) @ stdcall NdrByteCountPointerFree(ptr ptr ptr)

1 0

Ruslan Kabatsayev : wined3d: Initialise p_wglGetPixelFormat when USE_WIN32_OPENGL is defined.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 9732bcbcc0a06650d182e9701fe7e5aaac33e3db URL: http://source.winehq.org/git/wine.git/?a=commit;h=9732bcbcc0a06650d182e9701… Author: Ruslan Kabatsayev <b7.10110111(a)gmail.com> Date: Fri Sep 2 12:40:19 2016 +0200 wined3d: Initialise p_wglGetPixelFormat when USE_WIN32_OPENGL is defined. This fixes a regression introduced by commit b53256b8b752855576252cc2290dfbc9cb0f1280. Signed-off-by: Ruslan Kabatsayev <b7.10110111(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c2e316a3e6afaf1eea05a9f86f9e5275cbfcf9e6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c07c7ff..3b0f32b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5931,6 +5931,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) ALL_WGL_FUNCS #undef USE_GL_FUNC gl_info->gl_ops.wgl.p_wglSwapBuffers = (void *)GetProcAddress(mod_gl, "wglSwapBuffers"); + gl_info->gl_ops.wgl.p_wglGetPixelFormat = (void *)GetProcAddress(mod_gl, "wglGetPixelFormat"); } #else /* To bypass the opengl32 thunks retrieve functions from the WGL driver instead of opengl32 */

1 0

Nikolay Sivov : dbghelp: Support CIE version 4 in parse_cie_details().
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: cc97cd5df2eb5d942057b8ac8163f2e660d28f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc97cd5df2eb5d942057b8ac8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 7 01:43:27 2016 +0300 dbghelp: Support CIE version 4 in parse_cie_details(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ab27cb48fc6bc0a11bff05f0be49b8befc3718e4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/dwarf.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index dcbcf0a..3fd1920 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2641,7 +2641,7 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* /* parse the CIE first */ version = dwarf2_parse_byte(ctx); - if (version != 1 && version != 3) + if (version != 1 && version != 3 && version != 4) { FIXME("unknown CIE version %u at %p\n", version, ctx->data - 1); return FALSE; @@ -2649,12 +2649,21 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* augmentation = (const char*)ctx->data; ctx->data += strlen(augmentation) + 1; - info->code_align = dwarf2_leb128_as_unsigned(ctx); - info->data_align = dwarf2_leb128_as_signed(ctx); - if (version == 1) - info->retaddr_reg = dwarf2_parse_byte(ctx); - else - info->retaddr_reg = dwarf2_leb128_as_unsigned(ctx); + switch (version) + { + case 4: + /* skip 'address_size' and 'segment_size' */ + ctx->data += 2; + /* fallthrough */ + case 1: + case 3: + info->code_align = dwarf2_leb128_as_unsigned(ctx); + info->data_align = dwarf2_leb128_as_signed(ctx); + info->retaddr_reg = version == 1 ? dwarf2_parse_byte(ctx) :dwarf2_leb128_as_unsigned(ctx); + break; + default: + ; + } info->state.cfa_rule = RULE_CFA_OFFSET; end = NULL;

1 0

Francois Gouget : testbot: Spelling fixes in a few comments.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: tools Branch: master Commit: b2943cadb232d0766fbe397c1b15a93f0818e390 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b2943cadb232d0766fbe397c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 19 08:04:02 2016 +0100 testbot: Spelling fixes in a few comments. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- testbot/src/testagentd/platform.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 24b2b28..6dcbf48 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -232,7 +232,7 @@ if (opendir(my $dh, "$DataDir/staging")) { if ($Age >= 1 and !unlink $FileName) { - # The user abandonned the submit procedure half-way + # The user abandoned the submit procedure half-way through LogMsg "Could not delete '$FileName': $!\n" if (!unlink($FileName)); } } diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index 46e4d37..ea807fb 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -18,7 +18,7 @@ /* - * Compatiblity definitions. + * Compatibility definitions. */ #ifdef WIN32 @@ -53,7 +53,7 @@ typedef int SOCKET; /* - * Platform-specific unctions. + * Platform-specific functions. */ int platform_init(void);

1 0

Francois Gouget : transl: A couple of spelling fixes in comments.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: tools Branch: master Commit: 314039343f920e50413e001fdaa903e7d2338c8c URL: http://source.winehq.org/git/tools.git/?a=commit;h=314039343f920e50413e001f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 19 08:08:27 2016 +0100 transl: A couple of spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- transl/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/transl/style.css b/transl/style.css index 557de2c..d492393 100644 --- a/transl/style.css +++ b/transl/style.css @@ -78,7 +78,7 @@ table.index td { background-color: #fff4f4; } -/* used to mark resource parts that are not literaly in the string, like \0, \n etc*/ +/* used to mark resource parts that are not literally in the string, like \0, \n, etc */ .resmeta { color: #c34b4b; @@ -120,7 +120,7 @@ table.resource tr.subheader background-color: #f3dcdc; } -/* rows are different (in resource comparision mode) */ +/* rows are different (in resource comparison mode) */ table.resource tr.diff { background-color: #e3acac;

1 0

Francois Gouget : testbot: Fix a typo in an error message.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: tools Branch: master Commit: 1a4018f612a45d4cc4a0702b984807faa1931a99 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1a4018f612a45d4cc4a0702b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 19 08:05:16 2016 +0100 testbot: Fix a typo in an error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index f36e74a..d410949 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -327,7 +327,7 @@ $Script .= " >>Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) { - FatalTAError($TA, "Coud not send the build script to the VM"); + FatalTAError($TA, "Could not send the build script to the VM"); } Debug(Elapsed($Start), " Starting the script\n");

1 0

Francois Gouget : testbot/testagentd: Mark a couple of variables static.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: tools Branch: master Commit: 8cd87a57d5c82b39c9f64031bbb19b05d0d728ec URL: http://source.winehq.org/git/tools.git/?a=commit;h=8cd87a57d5c82b39c9f64031… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 19 07:58:26 2016 +0100 testbot/testagentd: Mark a couple of variables static. They are not used outside testagentd.c. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/testagentd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index e776cc7..bc3d32b 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -44,8 +44,8 @@ #define BLOCK_SIZE 65536 static char** server_argv; -const char *name0; -int opt_debug = 0; +static const char *name0; +static int opt_debug = 0; /*

1 0