wine-commits June 2014

wine-commits@winehq.org

4 participants
378 discussions

Francois Gouget : server: Treat ENOTSUP the same way as ENOLCK, consider locking to be non-functional on that filesystem.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: f4c7e6d607d15c681daa60cfb12b128e4376b809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c7e6d607d15c681daa60cfb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 17:53:06 2014 +0200 server: Treat ENOTSUP the same way as ENOLCK, consider locking to be non-functional on that filesystem. --- server/fd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/fd.c b/server/fd.c index 7043d04..e3b722c 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1167,6 +1167,7 @@ static int set_unix_lock( struct fd *fd, file_pos_t start, file_pos_t end, int t /* fall through */ case EIO: case ENOLCK: + case ENOTSUP: /* no locking on this fs, just ignore it */ fd->fs_locks = 0; return 1;

1 0

Francois Gouget : ole32: FileLockBytesImpl_WriteAt() should return STG_E_WRITEFAULT for write errors.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: cc4ad353d765234901ddd0c94e9db97db379e4d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc4ad353d765234901ddd0c94… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 17:44:12 2014 +0200 ole32: FileLockBytesImpl_WriteAt() should return STG_E_WRITEFAULT for write errors. --- dlls/ole32/filelockbytes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index 52c1d26..1c8c938 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -265,14 +265,14 @@ static HRESULT WINAPI FileLockBytesImpl_WriteAt( ret = SetFilePointerEx(This->hfile, offset, NULL, FILE_BEGIN); if (!ret) - return STG_E_READFAULT; + return STG_E_WRITEFAULT; while (bytes_left) { ret = WriteFile(This->hfile, writePtr, bytes_left, &cbWritten, NULL); if (!ret) - return STG_E_READFAULT; + return STG_E_WRITEFAULT; if (pcbWritten) *pcbWritten += cbWritten;

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: 6144bae7f873e2881c554762dc01c87cb9200aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6144bae7f873e2881c554762d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 19 00:27:53 2014 +0900 po: Update Japanese translation. --- po/ja.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ja.po b/po/ja.po index 82d4e3e..8214d10 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-05-22 01:00+0900\n" -"Last-Translator: Toshiaki Hirose <t_hirose(a)aol.com>\n" +"PO-Revision-Date: 2014-06-19 00:15+0900\n" +"Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" "MIME-Version: 1.0\n" @@ -6581,10 +6581,8 @@ msgid "This network connection does not exist.\n" msgstr "このネットワーク接続は存在しません。\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "接続は拒否されました。\n" +msgstr "相手側により接続がリセットされました。\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Grazvydas Ignotas : msvcrt/tests: Test _cnt value after rewind/fflush.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: 47909d8d8b33a2c849477477bf0e063c326b2f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47909d8d8b33a2c849477477b… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jun 18 13:55:51 2014 +0300 msvcrt/tests: Test _cnt value after rewind/fflush. --- dlls/msvcrt/tests/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 73965f3..353ebb4 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2232,12 +2232,14 @@ static void test_write_flush_size(FILE *file, int bufsize) for (size = bufsize + 1; size >= bufsize - 1; size--) { rewind(file); + ok(file->_cnt == 0, "_cnt should be 0 after rewind, but is %d\n", file->_cnt); fwrite(outbuffer, 1, size, file); /* lseek() below intentionally redirects the write in fflush() to detect * if fwrite() has already flushed the whole buffer or not. */ lseek(fd, 1, SEEK_SET); fflush(file); + todo_wine ok(file->_cnt == 0, "_cnt should be 0 after fflush, but is %d\n", file->_cnt); fseek(file, 0, SEEK_SET); ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); if (size == bufsize)

1 0

Piotr Caban : msvcrt: Add small blocks heap tests.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: ac399b084262cd494e368298c3cc6e90d17849d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac399b084262cd494e368298c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 18 11:35:26 2014 +0200 msvcrt: Add small blocks heap tests. --- dlls/msvcrt/tests/heap.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 309e194..2aaf48d 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -413,6 +413,49 @@ static void test_aligned(void) test_aligned_offset_realloc(256, 128, 64, 112); } +static void test_sbheap(void) +{ + void *mem; + int threshold; + + if(sizeof(void*) == 8) { + ok(!_set_sbh_threshold(0), "_set_sbh_threshold succeeded\n"); + ok(!_set_sbh_threshold(1000), "_set_sbh_threshold succeeded\n"); + return; + } + + mem = malloc(1); + ok(mem != NULL, "malloc failed\n"); + + ok(_set_sbh_threshold(1), "_set_sbh_threshold failed\n"); + threshold = _get_sbh_threshold(); + ok(threshold == 16, "threshold = %d\n", threshold); + + ok(_set_sbh_threshold(8), "_set_sbh_threshold failed\n"); + threshold = _get_sbh_threshold(); + ok(threshold == 16, "threshold = %d\n", threshold); + + ok(_set_sbh_threshold(1000), "_set_sbh_threshold failed\n"); + threshold = _get_sbh_threshold(); + ok(threshold == 1008, "threshold = %d\n", threshold); + + free(mem); + + mem = malloc(1); + ok(mem != NULL, "malloc failed\n"); + ok(!((UINT_PTR)mem & 0xf), "incorrect alignement (%p)\n", mem); + + mem = realloc(mem, 10); + ok(mem != NULL, "realloc failed\n"); + ok(!((UINT_PTR)mem & 0xf), "incorrect alignement (%p)\n", mem); + + ok(_set_sbh_threshold(0), "_set_sbh_threshold failed\n"); + threshold = _get_sbh_threshold(); + ok(threshold == 0, "threshold = %d\n", threshold); + + free(mem); +} + START_TEST(heap) { void *mem; @@ -436,4 +479,5 @@ START_TEST(heap) free(mem); test_aligned(); + test_sbheap(); }

1 0

Piotr Caban : msvcrt: Allocate data with 16-bytes alignement if small blocks heap is used.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: 608605c7dcb9584cf658e247938c18fa13a7b0b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=608605c7dcb9584cf658e2479… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 18 11:35:19 2014 +0200 msvcrt: Allocate data with 16-bytes alignement if small blocks heap is used. --- dlls/msvcrt/heap.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 105 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 0cac3fe..432df86 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -38,7 +38,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); ((((DWORD_PTR)((char *)ptr + alignment + sizeof(void *) + offset)) & \ ~(alignment - 1)) - offset)) -static HANDLE heap; +#define SB_HEAP_ALIGN 16 + +static HANDLE heap, sb_heap; typedef int (CDECL *MSVCRT_new_handler_func)(MSVCRT_size_t size); @@ -50,6 +52,78 @@ static unsigned int MSVCRT_amblksiz = 16; /* FIXME - According to documentation it should be 480 bytes, at runtime default is 0 */ static MSVCRT_size_t MSVCRT_sbh_threshold = 0; +static void* msvcrt_heap_alloc(DWORD flags, MSVCRT_size_t size) +{ + if(size < MSVCRT_sbh_threshold) + { + void *memblock, *temp, **saved; + + temp = HeapAlloc(sb_heap, flags, size+sizeof(void*)+SB_HEAP_ALIGN); + if(!temp) return NULL; + + memblock = ALIGN_PTR(temp, SB_HEAP_ALIGN, 0); + saved = SAVED_PTR(memblock); + *saved = temp; + return memblock; + } + + return HeapAlloc(heap, flags, size); +} + +static void* msvcrt_heap_realloc(DWORD flags, void *ptr, MSVCRT_size_t size) +{ + if(sb_heap && ptr && !HeapValidate(heap, 0, ptr)) + { + /* TODO: move data to normal heap if it exceeds sbh_threshold limit */ + void *memblock, *temp, **saved; + MSVCRT_size_t old_padding, new_padding, old_size; + + saved = SAVED_PTR(ptr); + old_padding = (char*)ptr - (char*)*saved; + old_size = HeapSize(sb_heap, 0, *saved); + if(old_size == -1) + return NULL; + old_size -= old_padding; + + temp = HeapReAlloc(sb_heap, flags, *saved, size+sizeof(void*)+SB_HEAP_ALIGN); + if(!temp) return NULL; + + memblock = ALIGN_PTR(temp, SB_HEAP_ALIGN, 0); + saved = SAVED_PTR(memblock); + new_padding = (char*)memblock - (char*)temp; + + if(new_padding != old_padding) + memmove(memblock, (char*)temp+old_padding, old_size>size ? size : old_size); + + *saved = temp; + return memblock; + } + + return HeapReAlloc(heap, flags, ptr, size); +} + +static BOOL msvcrt_heap_free(void *ptr) +{ + if(sb_heap && ptr && !HeapValidate(heap, 0, ptr)) + { + void **saved = SAVED_PTR(ptr); + return HeapFree(sb_heap, 0, *saved); + } + + return HeapFree(heap, 0, ptr); +} + +static MSVCRT_size_t msvcrt_heap_size(void *ptr) +{ + if(sb_heap && ptr && !HeapValidate(heap, 0, ptr)) + { + void **saved = SAVED_PTR(ptr); + return HeapSize(sb_heap, 0, *saved); + } + + return HeapSize(heap, 0, ptr); +} + /********************************************************************* * ??2@YAPAXI@Z (MSVCRT.@) */ @@ -60,7 +134,7 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) do { - retval = HeapAlloc(heap, 0, size); + retval = msvcrt_heap_alloc(0, size); if(retval) { TRACE("(%ld) returning %p\n", size, retval); @@ -95,7 +169,7 @@ void* CDECL MSVCRT_operator_new_dbg(MSVCRT_size_t size, int type, const char *fi void CDECL MSVCRT_operator_delete(void *mem) { TRACE("(%p)\n", mem); - HeapFree(heap, 0, mem); + msvcrt_heap_free(mem); } @@ -167,7 +241,7 @@ int CDECL _callnewh(MSVCRT_size_t size) */ void* CDECL _expand(void* mem, MSVCRT_size_t size) { - return HeapReAlloc(heap, HEAP_REALLOC_IN_PLACE_ONLY, mem, size); + return msvcrt_heap_realloc(HEAP_REALLOC_IN_PLACE_ONLY, mem, size); } /********************************************************************* @@ -175,7 +249,8 @@ void* CDECL _expand(void* mem, MSVCRT_size_t size) */ int CDECL _heapchk(void) { - if (!HeapValidate( heap, 0, NULL)) + if (!HeapValidate(heap, 0, NULL) || + (sb_heap && !HeapValidate(sb_heap, 0, NULL))) { msvcrt_set_errno(GetLastError()); return MSVCRT__HEAPBADNODE; @@ -188,7 +263,8 @@ int CDECL _heapchk(void) */ int CDECL _heapmin(void) { - if (!HeapCompact( heap, 0 )) + if (!HeapCompact( heap, 0 ) || + (sb_heap && !HeapCompact( sb_heap, 0 ))) { if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) msvcrt_set_errno(GetLastError()); @@ -204,6 +280,9 @@ int CDECL _heapwalk(struct MSVCRT__heapinfo* next) { PROCESS_HEAP_ENTRY phe; + if (sb_heap) + FIXME("small blocks heap not supported\n"); + LOCK_HEAP; phe.lpData = next->_pentry; phe.cbData = next->_size; @@ -280,7 +359,7 @@ MSVCRT_intptr_t CDECL _get_heap_handle(void) */ MSVCRT_size_t CDECL _msize(void* mem) { - MSVCRT_size_t size = HeapSize(heap,0,mem); + MSVCRT_size_t size = msvcrt_heap_size(mem); if (size == ~(MSVCRT_size_t)0) { WARN(":Probably called with non wine-allocated memory, ret = -1\n"); @@ -310,7 +389,7 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs */ void* CDECL MSVCRT_calloc(MSVCRT_size_t size, MSVCRT_size_t count) { - return HeapAlloc( heap, HEAP_ZERO_MEMORY, size * count ); + return msvcrt_heap_alloc(HEAP_ZERO_MEMORY, size*count); } /********************************************************************* @@ -318,7 +397,7 @@ void* CDECL MSVCRT_calloc(MSVCRT_size_t size, MSVCRT_size_t count) */ void CDECL MSVCRT_free(void* ptr) { - HeapFree(heap,0,ptr); + msvcrt_heap_free(ptr); } /********************************************************************* @@ -326,7 +405,7 @@ void CDECL MSVCRT_free(void* ptr) */ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) { - void *ret = HeapAlloc(heap,0,size); + void *ret = msvcrt_heap_alloc(0, size); if (!ret) *MSVCRT__errno() = MSVCRT_ENOMEM; return ret; @@ -338,7 +417,7 @@ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) { if (!ptr) return MSVCRT_malloc(size); - if (size) return HeapReAlloc(heap, 0, ptr, size); + if (size) return msvcrt_heap_realloc(0, ptr, size); MSVCRT_free(ptr); return NULL; } @@ -389,11 +468,22 @@ MSVCRT_size_t CDECL _get_sbh_threshold(void) */ int CDECL _set_sbh_threshold(MSVCRT_size_t threshold) { +#ifdef _WIN64 + return 0; +#else if(threshold > 1016) return 0; - else - MSVCRT_sbh_threshold = threshold; + + if(!sb_heap) + { + sb_heap = HeapCreate(0, 0, 0); + if(!sb_heap) + return 0; + } + + MSVCRT_sbh_threshold = (threshold+0xf) & ~0xf; return 1; +#endif } /********************************************************************* @@ -726,4 +816,6 @@ BOOL msvcrt_init_heap(void) void msvcrt_destroy_heap(void) { HeapDestroy(heap); + if(sb_heap) + HeapDestroy(sb_heap); }

1 0

Andrew Eikum : packager: Add loading support for Ole10Native storage objects.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: d03c1cfc17fdbbff60db665ddd78ec3bf94d4a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03c1cfc17fdbbff60db665dd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 17 11:43:39 2014 -0500 packager: Add loading support for Ole10Native storage objects. --- configure | 1 + configure.ac | 1 + dlls/packager/Makefile.in | 2 +- dlls/packager/packager_main.c | 277 ++++++++++++++++++++++++++- dlls/packager/tests/Makefile.in | 5 + dlls/packager/tests/oleobj.c | 400 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 684 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d03c1cfc17fdbbff60db6…

1 0

Andrew Eikum : packager: Add stub Packager implementation.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: b456eb5213dbf638c57076038e23a160a6b6d386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b456eb5213dbf638c57076038… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 17 08:22:32 2014 -0500 packager: Add stub Packager implementation. --- configure | 2 + configure.ac | 1 + dlls/packager/Makefile.in | 8 + dlls/packager/packager.rc | 24 +++ dlls/packager/packager.rgs | 15 ++ dlls/packager/packager.spec | 4 + dlls/packager/packager_classes.idl | 26 +++ dlls/packager/packager_main.c | 369 ++++++++++++++++++++++++++++++++++++ 8 files changed, 449 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b456eb5213dbf638c5707…

1 0

Alexandre Julliard : msvcrt/tests: Avoid size_t in traces.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: 762c94144fe43e3c2402d6dc5cbae8e45a790396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=762c94144fe43e3c2402d6dc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 18 19:52:27 2014 +0200 msvcrt/tests: Avoid size_t in traces. --- dlls/msvcrt/tests/file.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index c98adf4..73965f3 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2219,12 +2219,11 @@ static void test__open_osfhandle(void) CloseHandle(tmp); } -static void test_write_flush_size(FILE *file, size_t bufsize) +static void test_write_flush_size(FILE *file, int bufsize) { char *inbuffer; char *outbuffer; - size_t size; - int fd; + int size, fd; fd = fileno(file); inbuffer = calloc(bufsize + 1, 1);

1 0

Alexandre Julliard : kernel32: Only try to load krnl386 in native applications.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: b0953a09bdc8d807b6549051c4283a6e2dc6ad88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0953a09bdc8d807b6549051c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 18 18:35:19 2014 +0200 kernel32: Only try to load krnl386 in native applications. --- dlls/kernel32/kernel_main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 13c01ed..6afc1cb 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -101,7 +101,13 @@ static BOOL process_attach( HMODULE module ) /* Securom checks for this one when version is NT */ set_entry_point( module, "FT_Thunk", 0 ); } - else LoadLibraryA( "krnl386.exe16" ); + else + { + LDR_MODULE *ldr; + + if (LdrFindEntryForAddress( GetModuleHandleW( 0 ), &ldr ) || !(ldr->Flags & LDR_WINE_INTERNAL)) + LoadLibraryA( "krnl386.exe16" ); + } /* finish the process initialisation for console bits, if needed */ __wine_set_signal_handler(SIGINT, CONSOLE_HandleCtrlC);

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2014