wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

Alexandre Julliard : ntdll: Allocate a separate pointer for each TLS slot.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 384d698a9e4af8084b469b5f42619493ef83434d URL: http://source.winehq.org/git/wine.git/?a=commit;h=384d698a9e4af8084b469b5f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 23 12:27:39 2013 +0100 ntdll: Allocate a separate pointer for each TLS slot. --- dlls/ntdll/loader.c | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5eb8755..817cf8a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -96,10 +96,7 @@ static struct builtin_load_info *builtin_load_info = &default_load_info; static HANDLE main_exe_file; static UINT tls_module_count; /* number of modules with TLS directory */ -static UINT tls_total_size; /* total size of TLS storage */ static const IMAGE_TLS_DIRECTORY **tls_dirs; /* array of TLS directories */ -#define TLS_ALIGNMENT (2 * sizeof(void *)) -#define TLS_ALIGN(size) (((size) + TLS_ALIGNMENT - 1) & ~(TLS_ALIGNMENT - 1)) static RTL_CRITICAL_SECTION loader_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = @@ -887,12 +884,11 @@ static NTSTATUS alloc_process_tls(void) continue; size = (dir->EndAddressOfRawData - dir->StartAddressOfRawData) + dir->SizeOfZeroFill; if (!size && !dir->AddressOfCallBacks) continue; - tls_total_size += TLS_ALIGN(size); tls_module_count++; } if (!tls_module_count) return STATUS_SUCCESS; - TRACE( "count %u size %u\n", tls_module_count, tls_total_size ); + TRACE( "count %u\n", tls_module_count ); tls_dirs = RtlAllocateHeap( GetProcessHeap(), 0, tls_module_count * sizeof(*tls_dirs) ); if (!tls_dirs) return STATUS_NO_MEMORY; @@ -921,29 +917,34 @@ static NTSTATUS alloc_process_tls(void) static NTSTATUS alloc_thread_tls(void) { void **pointers; - char *data; UINT i, size; if (!tls_module_count) return STATUS_SUCCESS; - size = TLS_ALIGN( tls_module_count * sizeof(*pointers) ); - if (!(pointers = RtlAllocateHeap( GetProcessHeap(), 0, size + tls_total_size ))) + if (!(pointers = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, + tls_module_count * sizeof(*pointers) ))) return STATUS_NO_MEMORY; - data = (char *)pointers + size; for (i = 0; i < tls_module_count; i++) { const IMAGE_TLS_DIRECTORY *dir = tls_dirs[i]; + + if (!dir) continue; size = dir->EndAddressOfRawData - dir->StartAddressOfRawData; + if (!size && !dir->SizeOfZeroFill) continue; + + if (!(pointers[i] = RtlAllocateHeap( GetProcessHeap(), 0, size + dir->SizeOfZeroFill ))) + { + while (i) RtlFreeHeap( GetProcessHeap(), 0, pointers[--i] ); + RtlFreeHeap( GetProcessHeap(), 0, pointers ); + return STATUS_NO_MEMORY; + } + memcpy( pointers[i], (void *)dir->StartAddressOfRawData, size ); + memset( (char *)pointers[i] + size, 0, dir->SizeOfZeroFill ); TRACE( "thread %04x idx %d: %d/%d bytes from %p to %p\n", GetCurrentThreadId(), i, size, dir->SizeOfZeroFill, - (void *)dir->StartAddressOfRawData, data ); - - pointers[i] = data; - memcpy( data, (void *)dir->StartAddressOfRawData, size ); - memset( data + size, 0, dir->SizeOfZeroFill ); - data += TLS_ALIGN( size + dir->SizeOfZeroFill ); + (void *)dir->StartAddressOfRawData, pointers[i] ); } NtCurrentTeb()->ThreadLocalStoragePointer = pointers; return STATUS_SUCCESS; @@ -2482,6 +2483,8 @@ void WINAPI LdrShutdownThread(void) { PLIST_ENTRY mark, entry; PLDR_MODULE mod; + UINT i; + void **pointers; TRACE("()\n"); @@ -2504,8 +2507,12 @@ void WINAPI LdrShutdownThread(void) DLL_THREAD_DETACH, NULL ); } + if ((pointers = NtCurrentTeb()->ThreadLocalStoragePointer)) + { + for (i = 0; i < tls_module_count; i++) RtlFreeHeap( GetProcessHeap(), 0, pointers[i] ); + RtlFreeHeap( GetProcessHeap(), 0, pointers ); + } RtlLeaveCriticalSection( &loader_section ); - RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->ThreadLocalStoragePointer ); }

1 0

Zhenbo Li : kernel32/tests: Add some tests for DeleteFileA.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: f39c64a85ce3617bd1008f98d1e555114da378cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39c64a85ce3617bd1008f98d… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Dec 20 21:25:10 2013 +0800 kernel32/tests: Add some tests for DeleteFileA. --- dlls/kernel32/tests/file.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index daf8851..3ac4be8 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1632,6 +1632,9 @@ static void test_DeleteFileA( void ) GetLastError() == ERROR_INVALID_FUNCTION), "DeleteFileA(\"nul\") returned ret=%d error=%d\n",ret,GetLastError()); + ret = DeleteFileA("nonexist.txt"); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "DeleteFileA(\"nonexist.txt\") returned ret=%d error=%d\n",ret,GetLastError()); + GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "tst", 0, temp_file); @@ -1650,6 +1653,15 @@ todo_wine ret = DeleteFileA(temp_file); todo_wine ok(!ret, "DeleteFile should fail\n"); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryA("testdir", NULL); + ok(ret, "CreateDirectory failed, got err %d\n", GetLastError()); + ret = DeleteFileA("testdir"); + ok(!ret && GetLastError() == ERROR_ACCESS_DENIED, + "Expected ERROR_ACCESS_DENIED, got error %d\n", GetLastError()); + ret = RemoveDirectoryA("testdir"); + ok(ret, "Remove a directory failed, got error %d\n", GetLastError()); } static void test_DeleteFileW( void )

1 0

Nikolay Sivov : oleacc: Added DllGetClassObject() stub.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 3740b2bbcfd0a433309dbc464b846489f91f59a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3740b2bbcfd0a433309dbc464… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 22 13:10:54 2013 +0400 oleacc: Added DllGetClassObject() stub. --- dlls/oleacc/main.c | 6 ++++++ dlls/oleacc/oleacc.spec | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index c554c8a..4a3e920 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -81,6 +81,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, return TRUE; } +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv) +{ + FIXME("%s %s %p: stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + return E_NOTIMPL; +} + HRESULT WINAPI DllRegisterServer(void) { FIXME("\n"); diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 3909a79..6851454 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -5,6 +5,7 @@ @ stdcall CreateStdAccessibleObject(ptr long ptr ptr) @ stub CreateStdAccessibleProxyA @ stub CreateStdAccessibleProxyW +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stdcall GetOleaccVersionInfo(ptr ptr)

1 0

Sebastian Lackner : ntdll/tests: Add test for _snprintf.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 09bb38d12bbbe5fbeede2e29c8893877d853d792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09bb38d12bbbe5fbeede2e29c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 16 04:12:18 2013 +0100 ntdll/tests: Add test for _snprintf. --- dlls/ntdll/tests/string.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 9349f5d..7b56691 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -59,6 +59,7 @@ static LPWSTR (WINAPIV *p_wcsrchr)(LPCWSTR, WCHAR); static void (__cdecl *p_qsort)(void *,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); static void* (__cdecl *p_bsearch)(void *,void*,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); +static int (__cdecl *p__snprintf)(char *, size_t, const char *, ...); static void InitFunctionPtrs(void) @@ -96,6 +97,8 @@ static void InitFunctionPtrs(void) p_wcsrchr= (void *)GetProcAddress(hntdll, "wcsrchr"); p_qsort= (void *)GetProcAddress(hntdll, "qsort"); p_bsearch= (void *)GetProcAddress(hntdll, "bsearch"); + + p__snprintf = (void *)GetProcAddress(hntdll, "_snprintf"); } /* if */ } @@ -1270,6 +1273,34 @@ static void test_bsearch(void) } } +static void test__snprintf(void) +{ + const char *origstring = "XXXXXXXXXXXX"; + const char *teststring = "hello world"; + char buffer[32]; + int res; + + res = p__snprintf(NULL, 0, teststring); + ok(res == lstrlenA(teststring), "_snprintf returned %d, expected %d.\n", res, lstrlenA(teststring)); + + res = p__snprintf(NULL, 1, teststring); + ok(res == lstrlenA(teststring) /* WinXP */ || res < 0 /* Vista and greater */, + "_snprintf returned %d, expected %d or < 0.\n", res, lstrlenA(teststring)); + + res = p__snprintf(buffer, strlen(teststring) - 1, teststring); + ok(res < 0, "_snprintf returned %d, expected < 0.\n", res); + + strcpy(buffer, origstring); + res = p__snprintf(buffer, strlen(teststring), teststring); + ok(res == lstrlenA(teststring), "_snprintf returned %d, expected %d.\n", res, lstrlenA(teststring)); + ok(!strcmp(buffer, "hello worldX"), "_snprintf returned buffer '%s', expected 'hello worldX'.\n", buffer); + + strcpy(buffer, origstring); + res = p__snprintf(buffer, strlen(teststring) + 1, teststring); + ok(res == lstrlenA(teststring), "_snprintf returned %d, expected %d.\n", res, lstrlenA(teststring)); + ok(!strcmp(buffer, teststring), "_snprintf returned buffer '%s', expected '%s'.\n", buffer, teststring); +} + START_TEST(string) { InitFunctionPtrs(); @@ -1304,4 +1335,6 @@ START_TEST(string) test_qsort(); if (p_bsearch) test_bsearch(); + if (p__snprintf) + test__snprintf(); }

1 0

Sebastian Lackner : ntdll: Allow passing NULL buffer to printf functions.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 3c2dc4a7b3d5187307edc678b805b4c64ab16351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c2dc4a7b3d5187307edc678b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 20 05:56:40 2013 +0100 ntdll: Allow passing NULL buffer to printf functions. --- dlls/ntdll/printf.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index e09833a..65dc62d 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -75,16 +75,17 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) if( out->unicode ) { LPWSTR p = out->buf.W + out->used; + out->used += len; + if (!out->buf.W) + return len; if( space >= len ) { memcpy( p, str, len*sizeof(WCHAR) ); - out->used += len; return len; } if( space > 0 ) memcpy( p, str, space*sizeof(WCHAR) ); - out->used += len; } else { @@ -92,14 +93,16 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) ULONG n; RtlUnicodeToMultiByteSize( &n, str, len * sizeof(WCHAR) ); + out->used += n; + + if (!out->buf.A) + return len; if( space >= n ) { RtlUnicodeToMultiByteN( p, n, NULL, str, len * sizeof(WCHAR) ); - out->used += n; return len; } if (space > 0) RtlUnicodeToMultiByteN( p, space, NULL, str, len * sizeof(WCHAR) ); - out->used += n; } return -1; } @@ -113,16 +116,17 @@ static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) if( !out->unicode ) { LPSTR p = out->buf.A + out->used; + out->used += len; + if (!out->buf.A) + return len; if( space >= len ) { memcpy( p, str, len ); - out->used += len; return len; } if( space > 0 ) memcpy( p, str, space ); - out->used += len; } else { @@ -130,14 +134,16 @@ static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) ULONG n; RtlMultiByteToUnicodeSize( &n, str, len ); + out->used += n / sizeof(WCHAR); + + if (!out->buf.W) + return len; if (space >= n / sizeof(WCHAR)) { RtlMultiByteToUnicodeN( p, n, NULL, str, len ); - out->used += n / sizeof(WCHAR); return len; } if (space > 0) RtlMultiByteToUnicodeN( p, space * sizeof(WCHAR), NULL, str, len ); - out->used += n / sizeof(WCHAR); } return -1; }

1 0

Dmitry Timoshkov : taskschd: Add new dll.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 73edf08041318899da0e5ae3de533cfa83cf819d URL: http://source.winehq.org/git/wine.git/?a=commit;h=73edf08041318899da0e5ae3d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 23 16:37:49 2013 +0900 taskschd: Add new dll. --- configure | 2 + configure.ac | 1 + dlls/taskschd/Makefile.in | 6 +++++ dlls/taskschd/taskschd.c | 48 +++++++++++++++++++++++++++++++++++++++++++ dlls/taskschd/taskschd.spec | 5 ++++ 5 files changed, 62 insertions(+), 0 deletions(-) diff --git a/configure b/configure index b18d271..f9b91aa 100755 --- a/configure +++ b/configure @@ -1190,6 +1190,7 @@ enable_svrapi enable_sxs enable_t2embed enable_tapi32 +enable_taskschd enable_traffic enable_twain_32 enable_unicows @@ -17236,6 +17237,7 @@ wine_fn_config_test dlls/sxs/tests sxs_test wine_fn_config_dll system.drv16 enable_win16 wine_fn_config_dll t2embed enable_t2embed wine_fn_config_dll tapi32 enable_tapi32 implib +wine_fn_config_dll taskschd enable_taskschd wine_fn_config_dll toolhelp.dll16 enable_win16 wine_fn_config_dll traffic enable_traffic wine_fn_config_dll twain.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index d80a2bc..94b1e29 100644 --- a/configure.ac +++ b/configure.ac @@ -3192,6 +3192,7 @@ WINE_CONFIG_TEST(dlls/sxs/tests) WINE_CONFIG_DLL(system.drv16,enable_win16) WINE_CONFIG_DLL(t2embed) WINE_CONFIG_DLL(tapi32,,[implib]) +WINE_CONFIG_DLL(taskschd) WINE_CONFIG_DLL(toolhelp.dll16,enable_win16) WINE_CONFIG_DLL(traffic) WINE_CONFIG_DLL(twain.dll16,enable_win16) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in new file mode 100644 index 0000000..39e6c5b --- /dev/null +++ b/dlls/taskschd/Makefile.in @@ -0,0 +1,6 @@ +MODULE = taskschd.dll + +C_SRCS = \ + taskschd.c + +@MAKE_DLL_RULES@ diff --git a/dlls/taskschd/taskschd.c b/dlls/taskschd/taskschd.c new file mode 100644 index 0000000..241db94 --- /dev/null +++ b/dlls/taskschd/taskschd.c @@ -0,0 +1,48 @@ +/* + * Task Scheduler + * + * Copyright 2013 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(taskschd); + +/****************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break; + } + return TRUE; +} diff --git a/dlls/taskschd/taskschd.spec b/dlls/taskschd/taskschd.spec new file mode 100644 index 0000000..b79e689 --- /dev/null +++ b/dlls/taskschd/taskschd.spec @@ -0,0 +1,5 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllGetVersion +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Andrey Gusev : d3d8: Added missing hyphen in WARN message.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: fe57612c1cf1e4b54fe74b6f406c7bf4ad4454f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe57612c1cf1e4b54fe74b6f4… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Dec 22 12:01:05 2013 +0200 d3d8: Added missing hyphen in WARN message. --- dlls/d3d8/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index f7096bb..7d61fd6 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -95,7 +95,7 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d if (reg == D3DVSDE_NORMAL && type != D3DVSDT_FLOAT3 && !byte_code) { - WARN("Attempt to use a non-FLOAT3 normal with the fixed function function\n"); + WARN("Attempt to use a non-FLOAT3 normal with the fixed-function function\n"); return D3DERR_INVALIDCALL; } }

1 0

Frédéric Delanoy : hlink/tests: Constify some character strings.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 4849e578662bd57d5ba7d804ba25170c095c0e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4849e578662bd57d5ba7d804b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 21 14:32:25 2013 +0100 hlink/tests: Constify some character strings. --- dlls/hlink/tests/hlink.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 91f7c4a..f4e3d5c 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1719,8 +1719,8 @@ static void test_HashLink(void) } } -static WCHAR site_monikerW[] = {'S','I','T','E','_','M','O','N','I','K','E','R',0}; -static WCHAR ref_monikerW[] = {'R','E','F','_','M','O','N','I','K','E','R',0}; +static const WCHAR site_monikerW[] = {'S','I','T','E','_','M','O','N','I','K','E','R',0}; +static const WCHAR ref_monikerW[] = {'R','E','F','_','M','O','N','I','K','E','R',0}; static HRESULT WINAPI hls_test_Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *toLeft, REFIID riid, void **obj)

1 0

Frédéric Delanoy : gdi32/tests: Constify a character string.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: cc97a2385a7e8fe5bbb738d10d25dfe9e54dfe76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc97a2385a7e8fe5bbb738d10… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 21 14:32:24 2013 +0100 gdi32/tests: Constify a character string. --- dlls/gdi32/tests/font.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cbeb9c3..54e32ad 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2132,18 +2132,18 @@ static void test_GetOutlineTextMetrics(void) ReleaseDC(0, hdc); } -static void testJustification(HDC hdc, PSTR str, RECT *clientArea) +static void testJustification(HDC hdc, PCSTR str, RECT *clientArea) { INT y, breakCount, areaWidth = clientArea->right - clientArea->left, nErrors = 0, e; - PSTR pFirstChar, pLastChar; + const char *pFirstChar, *pLastChar; SIZE size; TEXTMETRICA tm; struct err { - char *start; + const char *start; int len; int GetTextExtentExPointWWidth; } error[20]; @@ -2220,7 +2220,7 @@ static void test_SetTextJustification(void) SIZE size, expect; int i; WORD indices[2]; - static char testText[] = + static const char testText[] = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do " "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut " "enim ad minim veniam, quis nostrud exercitation ullamco laboris "

1 0

Frédéric Delanoy : faultrep/tests: Constify some character strings.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 9f2ebd77365674ae32899a49beb9448d94c8e177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2ebd77365674ae32899a49b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 21 14:32:23 2013 +0100 faultrep/tests: Constify some character strings. --- dlls/faultrep/tests/faultrep.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index 948310d..934eee7 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -30,8 +30,8 @@ #include "errorrep.h" #include "wine/test.h" -static char regpath_root[] = "Software\\Microsoft\\PCHealth\\ErrorReporting"; -static char regpath_exclude[] = "ExclusionList"; +static const char regpath_root[] = "Software\\Microsoft\\PCHealth\\ErrorReporting"; +static const char regpath_exclude[] = "ExclusionList"; /* ###### */

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
47
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 2013