August 2016 - Wine-Commits - list.winehq.org

Alex Henrie : ucrtbase: Implement _(un)lock_locales.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 09433cd0f274bd3a9cf0d6083abc1c71747b2060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09433cd0f274bd3a9cf0d6083… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 14 12:28:12 2016 -0600 ucrtbase: Implement _(un)lock_locales. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c044cf410d10a78c76a2ea7e8e07d602713f9616) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-locale-l1-1-0.spec | 4 ++-- dlls/msvcrt/locale.c | 16 ++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec index 9749808..c7e5aae 100644 --- a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec +++ b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec @@ -11,9 +11,9 @@ @ cdecl _free_locale(ptr) ucrtbase._free_locale @ cdecl _get_current_locale() ucrtbase._get_current_locale @ cdecl _getmbcp() ucrtbase._getmbcp -@ stub _lock_locales +@ cdecl _lock_locales() ucrtbase._lock_locales @ cdecl _setmbcp(long) ucrtbase._setmbcp -@ stub _unlock_locales +@ cdecl _unlock_locales() ucrtbase._unlock_locales @ stub _wcreate_locale @ cdecl _wsetlocale(long wstr) ucrtbase._wsetlocale @ cdecl localeconv() ucrtbase.localeconv diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index a1551c2..543c1d9 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1592,6 +1592,22 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, } /********************************************************************* + * _lock_locales (UCRTBASE.@) + */ +void CDECL _lock_locales(void) +{ + LOCK_LOCALE +} + +/********************************************************************* + * _unlock_locales (UCRTBASE.@) + */ +void CDECL _unlock_locales(void) +{ + UNLOCK_LOCALE +} + +/********************************************************************* * _create_locale (MSVCRT.@) */ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 661d657..159ca79 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -563,7 +563,7 @@ @ cdecl _localtime64(ptr) MSVCRT__localtime64 @ cdecl _localtime64_s(ptr ptr) @ cdecl _lock_file(ptr) MSVCRT__lock_file -@ stub _lock_locales +@ cdecl _lock_locales() @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb(double) MSVCRT__logb @ cdecl -arch=arm,x86_64 _logbf(float) MSVCRT__logbf @@ -2000,7 +2000,7 @@ @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock_file(ptr) MSVCRT__unlock_file -@ stub _unlock_locales +@ cdecl _unlock_locales() @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) @ cdecl _waccess(wstr long) MSVCRT__waccess

1 0

Jean-Christophe Cardot : winhlp32: Add some trace calls.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: dfcc043e0cc8c448087574bb2fa5bc908b7ca4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfcc043e0cc8c448087574bb2… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:08 2016 +0200 winhlp32: Add some trace calls. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ae56f3d093c84b47248be6a66cebd58c0bb59668) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/hlpfile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index bc422d3..6a00235 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -705,6 +705,7 @@ static BOOL HLPFILE_RtfAddRawString(struct RtfData* rd, const char* str, size_t static BOOL HLPFILE_RtfAddControl(struct RtfData* rd, const char* str) { + WINE_TRACE("%s\n", debugstr_a(str)); if (*str == '\\' || *str == '{') rd->in_text = FALSE; else if (*str == '}') rd->in_text = TRUE; return HLPFILE_RtfAddRawString(rd, str, strlen(str)); @@ -1270,6 +1271,8 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, format = buf + 0x15; format_end = buf + GET_UINT(buf, 0x10); + WINE_TRACE("Record type (buf[0x14]) = 0x%x\n", buf[0x14]); + if (buf[0x14] == HLP_DISPLAY || buf[0x14] == HLP_TABLE) { fetch_long(&format); @@ -1452,13 +1455,13 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, /* else: null text, keep on storing attributes */ text += textsize + 1; + WINE_TRACE("format=%02x\n", *format); if (*format == 0xff) { format++; break; } - WINE_TRACE("format=%02x\n", *format); switch (*format) { case 0x20:

1 0

Alistair Leslie-Hughes : wined3d: Correct memory size for Geforce 9600 GT.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 6aa0569fe3b129bfde4c309c2ad15706047de840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa0569fe3b129bfde4c309c2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 15 07:48:30 2016 +0000 wined3d: Correct memory size for Geforce 9600 GT. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1da27c10b8edfa41e1308b8b67c80d236c4fed9e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 39eff73..29ca713 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1224,7 +1224,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400M, "NVIDIA GeForce 9400M", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE8, 384 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9700MGT, "NVIDIA GeForce 9700M GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", DRIVER_NVIDIA_GEFORCE8, 512 },

1 0

Austin English : kernel32: Implement GetLargePageMinimum.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: ba52b89d8e7895be444ac9f66f5330bc16e6d5dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba52b89d8e7895be444ac9f66… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 15 23:43:46 2016 +0200 kernel32: Implement GetLargePageMinimum. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4d313e6475383e5aa1ebd8c0917f1f11f5c81f66) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- dlls/kernel32/cpu.c | 12 ++++++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/process.c | 16 ++++++++++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec index 5d3eb13..959e65d 100644 --- a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec +++ b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec @@ -3,7 +3,7 @@ @ stdcall CreateFileMappingW(long ptr long long long wstr) kernel32.CreateFileMappingW @ stdcall CreateMemoryResourceNotification(long) kernel32.CreateMemoryResourceNotification @ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile -@ stub GetLargePageMinimum +@ stdcall GetLargePageMinimum() kernel32.GetLargePageMinimum @ stub GetProcessWorkingSetSizeEx @ stdcall GetSystemFileCacheSize(ptr ptr ptr) kernel32.GetSystemFileCacheSize @ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index f48fcf0..3a7a5e8 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -291,3 +291,15 @@ err: } return TRUE; } + +/*********************************************************************** + * GetLargePageMinimum (KERNEL32.@) + */ +SIZE_T WINAPI GetLargePageMinimum(void) +{ +#if defined(__i386___) || defined(__x86_64__) + return 2 * 1024 * 1024; +#endif + FIXME("Not implemented on your platform/architecture.\n"); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bc147c5..7936133 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -696,7 +696,7 @@ @ stdcall GetHandleInformation(long ptr) @ stub -i386 GetLSCallbackTarget @ stub -i386 GetLSCallbackTemplate -# @ stub GetLargePageMinimum +@ stdcall GetLargePageMinimum() @ stdcall GetLargestConsoleWindowSize(long) @ stdcall GetLastError() @ stub GetLinguistLangSize diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 0c4bded..dfebb34 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -88,6 +88,7 @@ static BOOL (WINAPI *pProcess32Next)(HANDLE, PROCESSENTRY32*); static BOOL (WINAPI *pThread32First)(HANDLE, THREADENTRY32*); static BOOL (WINAPI *pThread32Next)(HANDLE, THREADENTRY32*); static BOOL (WINAPI *pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); +static SIZE_T (WINAPI *pGetLargePageMinimum)(void); /* ############################### */ static char base[MAX_PATH]; @@ -252,6 +253,7 @@ static BOOL init(void) pThread32First = (void *)GetProcAddress(hkernel32, "Thread32First"); pThread32Next = (void *)GetProcAddress(hkernel32, "Thread32Next"); pGetLogicalProcessorInformationEx = (void *)GetProcAddress(hkernel32, "GetLogicalProcessorInformationEx"); + pGetLargePageMinimum = (void *)GetProcAddress(hkernel32, "GetLargePageMinimum"); return TRUE; } @@ -3142,6 +3144,19 @@ static void test_GetLogicalProcessorInformationEx(void) HeapFree(GetProcessHeap(), 0, info); } +static void test_largepages(void) +{ + SIZE_T size; + + if (!pGetLargePageMinimum) { + skip("No GetLargePageMinimum support.\n"); + return; + } + size = pGetLargePageMinimum(); + + ok((size == 0) || (size == 2*1024*1024) || (size == 4*1024*1024), "GetLargePageMinimum reports %ld size\n", size); +} + START_TEST(process) { HANDLE job; @@ -3214,6 +3229,7 @@ START_TEST(process) test_GetNumaProcessorNode(); test_session_info(); test_GetLogicalProcessorInformationEx(); + test_largepages(); /* things that can be tested: * lookup: check the way program to be executed is searched

1 0

Bruno Jesus : ws2_32: Ensure default route IP addresses are returned first in gethostbyname.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: e27f163a190a8c0d2ae66b3c9ff4c991fd021828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27f163a190a8c0d2ae66b3c9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jun 19 15:59:59 2016 -0300 ws2_32: Ensure default route IP addresses are returned first in gethostbyname. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 134bf22b8c7b291717f9717f0515dc485f489aaa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 23 +++++++++++++++++------ dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d31f0b4..6877063 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -596,7 +596,7 @@ struct per_thread_data struct route { struct in_addr addr; IF_INDEX interface; - DWORD metric; + DWORD metric, default_route; }; static INT num_startup; /* reference counter */ @@ -5931,7 +5931,14 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) */ static int WS_compare_routes_by_metric_asc(const void *left, const void *right) { - return ((const struct route*)left)->metric - ((const struct route*)right)->metric; + const struct route *a = left, *b = right; + if (a->default_route && b->default_route) + return a->default_route - b->default_route; + if (a->default_route && !b->default_route) + return -1; + if (b->default_route && !a->default_route) + return 1; + return a->metric - b->metric; } /*********************************************************************** @@ -5948,7 +5955,7 @@ static int WS_compare_routes_by_metric_asc(const void *left, const void *right) */ static struct WS_hostent* WS_get_local_ips( char *hostname ) { - int numroutes = 0, i, j; + int numroutes = 0, i, j, default_routes = 0; DWORD n; PIP_ADAPTER_INFO adapters = NULL, k; struct WS_hostent *hostlist = NULL; @@ -5975,10 +5982,13 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) for (n = 0; n < routes->dwNumEntries; n++) { IF_INDEX ifindex; - DWORD ifmetric; + DWORD ifmetric, ifdefault = 0; BOOL exists = FALSE; - if (routes->table[n].u1.ForwardType != MIB_IPROUTE_TYPE_DIRECT) + /* Check if this is a default route (there may be more than one) */ + if (!routes->table[n].dwForwardDest) + ifdefault = ++default_routes; + else if (routes->table[n].u1.ForwardType != MIB_IPROUTE_TYPE_DIRECT) continue; ifindex = routes->table[n].dwForwardIfIndex; ifmetric = routes->table[n].dwForwardMetric1; @@ -5999,13 +6009,14 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) goto cleanup; /* Memory allocation error, fail gracefully */ route_addrs[numroutes].interface = ifindex; route_addrs[numroutes].metric = ifmetric; + route_addrs[numroutes].default_route = ifdefault; /* If no IP is found in the next step (for whatever reason) * then fall back to the magic loopback address. */ memcpy(&(route_addrs[numroutes].addr.s_addr), magic_loopback_addr, 4); numroutes++; } - if (numroutes == 0) + if (numroutes == 0) goto cleanup; /* No routes, fall back to the Magic IP */ /* Find the IP address associated with each found interface */ for (i = 0; i < numroutes; i++) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 00fac77..ce09053 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4545,7 +4545,6 @@ static void test_gethostbyname(void) } } } -todo_wine ok (found_default, "failed to find the first IP from gethostbyname!\n"); cleanup:

1 0

Alex Henrie : ucrtbase: Implement _free_base.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 36d449a02ee03cfd998191e5db3e4add9462eb6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d449a02ee03cfd998191e5d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 16 18:02:25 2016 -0600 ucrtbase: Implement _free_base. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e4b8bc0edc640b36f2a2a26c53e18edea04fa74c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 2 +- dlls/msvcrt/heap.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec index 6dbd207..418926e 100644 --- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec +++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec @@ -9,7 +9,7 @@ @ cdecl _callnewh(long) ucrtbase._callnewh @ cdecl _calloc_base(long long) ucrtbase._calloc_base @ cdecl _expand(ptr long) ucrtbase._expand -@ stub _free_base +@ cdecl _free_base(ptr) ucrtbase._free_base @ cdecl _get_heap_handle() ucrtbase._get_heap_handle @ cdecl _heapchk() ucrtbase._heapchk @ cdecl _heapmin() ucrtbase._heapmin diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index d7d67cf..50613c7 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -414,6 +414,14 @@ void CDECL MSVCRT_free(void* ptr) } /********************************************************************* + * _free_base (UCRTBASE.@) + */ +void CDECL _free_base(void* ptr) +{ + msvcrt_heap_free(ptr); +} + +/********************************************************************* * malloc (MSVCRT.@) */ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5746a7b..f60aa29 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -333,7 +333,7 @@ @ cdecl _fputwchar(long) MSVCRT__fputwchar @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s -@ stub _free_base +@ cdecl _free_base(ptr) @ cdecl _free_locale(ptr) MSVCRT__free_locale @ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64

1 0

Alex Henrie : ucrtbase: Implement _malloc_base.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: f7f505994adf0762e14748d511da295db17cecec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7f505994adf0762e14748d51… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 16 18:02:24 2016 -0600 ucrtbase: Implement _malloc_base. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5325b8c95112be75f4fa0e2e2e45bcc88434fb5d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 2 +- dlls/msvcrt/heap.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec index 85b2b83..6dbd207 100644 --- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec +++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl _heapchk() ucrtbase._heapchk @ cdecl _heapmin() ucrtbase._heapmin @ cdecl _heapwalk(ptr) ucrtbase._heapwalk -@ stub _malloc_base +@ cdecl _malloc_base(long) ucrtbase._malloc_base @ cdecl _msize(ptr) ucrtbase._msize @ stub _query_new_handler @ stub _query_new_mode diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 01f06c8..d7d67cf 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -425,6 +425,14 @@ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) } /********************************************************************* + * _malloc_base (UCRTBASE.@) + */ +void* CDECL _malloc_base(MSVCRT_size_t size) +{ + return MSVCRT_malloc(size); +} + +/********************************************************************* * realloc (MSVCRT.@) */ void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d2b16c1..5746a7b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -580,7 +580,7 @@ @ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s @ cdecl _makepath(ptr str str str str) MSVCRT__makepath @ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s -@ stub _malloc_base +@ cdecl _malloc_base(long) @ cdecl _mbbtombc(long) @ stub _mbbtombc_l @ cdecl _mbbtype(long long)

1 0

Jean-Christophe Cardot : winhlp32: Fix table formatting.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 6440e558154be6cbc74d15016fa415990a491228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6440e558154be6cbc74d15016… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:12 2016 +0200 winhlp32: Fix table formatting. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 706145c563115afadc4eaab2a4f8ae8a7c8b26e5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/hlpfile.c | 54 ++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 8ea5577..2748e5c 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1228,9 +1228,8 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, char *text, *text_base, *text_end; LONG size, blocksize, datalen; unsigned short bits; - unsigned nc, ncol = 1; - short table_width; - BOOL in_table = FALSE; + unsigned ncol = 1; + short nc, lastcol, table_width; char tmp[256]; BOOL ret = FALSE; @@ -1274,9 +1273,8 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, if (buf[0x14] == HLP_TABLE) { - char type; + unsigned char type; - in_table = TRUE; ncol = *format++; if (!HLPFILE_RtfAddControl(rd, "\\trowd")) goto done; @@ -1285,6 +1283,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, { table_width = GET_SHORT(format, 0); format += 2; + if (!HLPFILE_RtfAddControl(rd, "\\trqc")) goto done; } else table_width = 32767; @@ -1294,10 +1293,10 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, { int pos; sprintf(tmp, "\\trgaph%d\\trleft%d", - HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 6), table_width, 32767)), - HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0), table_width, 32767))); + MulDiv(HLPFILE_HalfPointsScale(page, GET_SHORT(format, 6)), table_width, 32767), + MulDiv(HLPFILE_HalfPointsScale(page, GET_SHORT(format, 2) - GET_SHORT(format, 6)), table_width, 32767) - 1); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; - pos = HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 6) / 2, table_width, 32767)); + pos = GET_SHORT(format, 6) / 2; for (nc = 0; nc < ncol; nc++) { WINE_TRACE("column(%d/%d) gap=%d width=%d\n", @@ -1305,7 +1304,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, GET_SHORT(format, nc*4+2)); pos += GET_SHORT(format, nc * 4) + GET_SHORT(format, nc * 4 + 2); sprintf(tmp, "\\cellx%d", - HLPFILE_HalfPointsScale(page, MulDiv(pos, table_width, 32767))); + MulDiv(HLPFILE_HalfPointsScale(page, pos), table_width, 32767)); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } } @@ -1314,22 +1313,27 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, WINE_TRACE("column(0/%d) gap=%d width=%d\n", ncol, GET_SHORT(format, 0), GET_SHORT(format, 2)); sprintf(tmp, "\\trleft%d\\cellx%d ", - HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0), table_width, 32767)), - HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0) + GET_SHORT(format, 2), - table_width, 32767))); + MulDiv(HLPFILE_HalfPointsScale(page, GET_SHORT(format, 2)), table_width, 32767) - 1, + MulDiv(HLPFILE_HalfPointsScale(page, GET_SHORT(format, 0)), table_width, 32767)); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } format += ncol * 4; } + lastcol = -1; for (nc = 0; nc < ncol; /**/) { WINE_TRACE("looking for format at offset %lu in column %d\n", (SIZE_T)(format - (buf + 0x15)), nc); if (!HLPFILE_RtfAddControl(rd, "\\pard")) goto done; - if (in_table) + if (buf[0x14] == HLP_TABLE) { - nc = GET_SHORT(format, 0); - if (nc == -1) break; + nc = lastcol = GET_SHORT(format, 0); + if (nc == -1) /* last column */ + { + if (!HLPFILE_RtfAddControl(rd, "\\row")) goto done; + rd->char_pos += 2; + break; + } format += 5; if (!HLPFILE_RtfAddControl(rd, "\\intbl")) goto done; } @@ -1448,7 +1452,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, /* else: null text, keep on storing attributes */ text += textsize + 1; - WINE_TRACE("format=%02x\n", *format); + WINE_TRACE("format=0x%02x\n", *format); if (*format == 0xff) { format++; @@ -1502,15 +1506,24 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, break; case 0x82: - if (in_table) + if (buf[0x14] == HLP_TABLE) { if (format[1] != 0xFF) { if (!HLPFILE_RtfAddControl(rd, "\\par\\intbl")) goto done; } + else if (GET_SHORT(format, 2) == -1) + { + if (!HLPFILE_RtfAddControl(rd, "\\cell\\intbl\\row")) goto done; + rd->char_pos += 2; + } + else if (GET_SHORT(format, 2) == lastcol) + { + if (!HLPFILE_RtfAddControl(rd, "\\par\\pard")) goto done; + } else { - if (!HLPFILE_RtfAddControl(rd, "\\cell\\pard\\intbl")) goto done; + if (!HLPFILE_RtfAddControl(rd, "\\cell\\pard")) goto done; } } else if (!HLPFILE_RtfAddControl(rd, "\\par")) goto done; @@ -1676,11 +1689,6 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, } } } - if (in_table) - { - if (!HLPFILE_RtfAddControl(rd, "\\row\\par\\pard\\plain")) goto done; - rd->char_pos += 2; - } ret = TRUE; done:

1 0

Jean-Christophe Cardot : winhlp32: Rework and rename HLPFILE_HalfPointsToTwips.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: bab2800931a3835411a5c79094748fa10b097e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab2800931a3835411a5c7909… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:11 2016 +0200 winhlp32: Rework and rename HLPFILE_HalfPointsToTwips. HLPFILE_HalfPointsToTwips was performing a useless transformation of the RTF measures, using a hardcoded 72 DPI. As winhlp32 makes use of the richedit component, it is counter productive to transform the measures, as this is taken care of by richedit himself. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a01c003007f6b2a7e53f6d726384d584710f1966) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/hlpfile.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 3acd8a3..8ea5577 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1211,16 +1211,9 @@ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, return link; } -static unsigned HLPFILE_HalfPointsToTwips(unsigned pts) +static unsigned HLPFILE_HalfPointsScale(HLPFILE_PAGE* page, unsigned pts) { - static unsigned logPxY; - if (!logPxY) - { - HDC hdc = GetDC(NULL); - logPxY = GetDeviceCaps(hdc, LOGPIXELSY); - ReleaseDC(NULL, hdc); - } - return MulDiv(pts, 72 * 10, logPxY); + return pts * page->file->scale - page->file->rounderr; } /*********************************************************************** @@ -1301,10 +1294,10 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, { int pos; sprintf(tmp, "\\trgaph%d\\trleft%d", - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 6), table_width, 32767)), - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0), table_width, 32767))); + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 6), table_width, 32767)), + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0), table_width, 32767))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; - pos = HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 6) / 2, table_width, 32767)); + pos = HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 6) / 2, table_width, 32767)); for (nc = 0; nc < ncol; nc++) { WINE_TRACE("column(%d/%d) gap=%d width=%d\n", @@ -1312,7 +1305,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, GET_SHORT(format, nc*4+2)); pos += GET_SHORT(format, nc * 4) + GET_SHORT(format, nc * 4 + 2); sprintf(tmp, "\\cellx%d", - HLPFILE_HalfPointsToTwips(MulDiv(pos, table_width, 32767))); + HLPFILE_HalfPointsScale(page, MulDiv(pos, table_width, 32767))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } } @@ -1321,8 +1314,8 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, WINE_TRACE("column(0/%d) gap=%d width=%d\n", ncol, GET_SHORT(format, 0), GET_SHORT(format, 2)); sprintf(tmp, "\\trleft%d\\cellx%d ", - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0), table_width, 32767)), - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0) + GET_SHORT(format, 2), + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0), table_width, 32767)), + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0) + GET_SHORT(format, 2), table_width, 32767))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } @@ -1349,32 +1342,32 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, if (bits & 0x0001) fetch_long(&format); if (bits & 0x0002) { - sprintf(tmp, "\\sb%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\sb%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0004) { - sprintf(tmp, "\\sa%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\sa%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0008) { - sprintf(tmp, "\\sl%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\sl%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0010) { - sprintf(tmp, "\\li%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\li%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0020) { - sprintf(tmp, "\\ri%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\ri%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0040) { - sprintf(tmp, "\\fi%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\fi%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0100) @@ -1395,7 +1388,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, w = GET_SHORT(format, 0); format += 2; if (w) { - sprintf(tmp, "\\brdrw%d", HLPFILE_HalfPointsToTwips(w)); + sprintf(tmp, "\\brdrw%d", HLPFILE_HalfPointsScale(page, w)); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } } @@ -1419,7 +1412,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, } /* FIXME: do kind */ sprintf(tmp, "%s\\tx%d", - kind, HLPFILE_HalfPointsToTwips(tab & 0x3FFF)); + kind, HLPFILE_HalfPointsScale(page, tab & 0x3FFF)); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } }

1 0

Jean-Christophe Cardot : winhlp32: Replace magic numbers by symbols.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 51e25fb82d0e246a3f5a016b3588698b2f084420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e25fb82d0e246a3f5a016b3… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:07 2016 +0200 winhlp32: Replace magic numbers by symbols. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 58f16273c307a240d7c149adbd2f9f7ced0e5d70) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/hlpfile.c | 24 ++++++++++++------------ programs/winhlp32/hlpfile.h | 5 +++++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 3669d11..bc422d3 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1270,13 +1270,13 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, format = buf + 0x15; format_end = buf + GET_UINT(buf, 0x10); - if (buf[0x14] == 0x20 || buf[0x14] == 0x23) + if (buf[0x14] == HLP_DISPLAY || buf[0x14] == HLP_TABLE) { fetch_long(&format); *parlen = fetch_ushort(&format); } - if (buf[0x14] == 0x23) + if (buf[0x14] == HLP_TABLE) { char type; @@ -1338,7 +1338,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, if (!HLPFILE_RtfAddControl(rd, "\\intbl")) goto done; } else nc++; - if (buf[0x14] == 0x01) + if (buf[0x14] == HLP_DISPLAY30) format += 6; else format += 4; @@ -1811,12 +1811,12 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd, switch (buf[0x14]) { - case 0x02: + case HLP_TOPICHDR: if (count++) goto done; break; - case 0x01: - case 0x20: - case 0x23: + case HLP_DISPLAY30: + case HLP_DISPLAY: + case HLP_TABLE: if (!HLPFILE_BrowseParagraph(page, rd, buf, end, &parlen)) return FALSE; if (relative > index * 0x8000 + offs) rd->char_pos_rel = rd->char_pos; @@ -2617,7 +2617,7 @@ static BOOL HLPFILE_SkipParagraph(HLPFILE *hlpfile, const BYTE *buf, const BYTE if (buf + 0x19 > end) {WINE_WARN("header too small\n"); return FALSE;}; tmp = buf + 0x15; - if (buf[0x14] == 0x20 || buf[0x14] == 0x23) + if (buf[0x14] == HLP_DISPLAY || buf[0x14] == HLP_TABLE) { fetch_long(&tmp); *len = fetch_ushort(&tmp); @@ -2692,7 +2692,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) switch (buf[0x14]) { - case 0x02: + case HLP_TOPICHDR: /* Topic Header */ if (hlpfile->version <= 16) topicoffset = ref + index * 12; else @@ -2700,9 +2700,9 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) if (!HLPFILE_AddPage(hlpfile, buf, end, ref, topicoffset)) return FALSE; break; - case 0x01: - case 0x20: - case 0x23: + case HLP_DISPLAY30: + case HLP_DISPLAY: + case HLP_TABLE: if (!HLPFILE_SkipParagraph(hlpfile, buf, end, &len)) return FALSE; offs += len; break; diff --git a/programs/winhlp32/hlpfile.h b/programs/winhlp32/hlpfile.h index c3fa4b0..6c40c3a 100644 --- a/programs/winhlp32/hlpfile.h +++ b/programs/winhlp32/hlpfile.h @@ -199,3 +199,8 @@ struct RtfData { BOOL HLPFILE_BrowsePage(HLPFILE_PAGE*, struct RtfData* rd, unsigned font_scale, unsigned relative); + +#define HLP_DISPLAY30 0x01 /* version 3.0 displayable information */ +#define HLP_TOPICHDR 0x02 /* topic header information */ +#define HLP_DISPLAY 0x20 /* version 3.1 displayable information */ +#define HLP_TABLE 0x23 /* version 3.1 table */

1 0