wine-commits September 2015

wine-commits@winehq.org

2 participants
318 discussions

André Hentschel : psapi/tests: Don' t check for exact value.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: a3ab34b4197ee66c53fc1a202cdd9fe1a6b4bd13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ab34b4197ee66c53fc1a202… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 20 14:43:46 2015 +0200 psapi/tests: Don't check for exact value. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/psapi/tests/psapi_main.c | 55 +++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index cebfc5f..d7d3a1e 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -194,6 +194,11 @@ static void test_GetModuleInformation(void) ok(info.lpBaseOfDll == hMod, "lpBaseOfDll=%p hMod=%p\n", info.lpBaseOfDll, hMod); } +static BOOL check_with_margin(SIZE_T perf, SIZE_T sysperf, int margin) +{ + return (perf >= max(sysperf, margin) - margin && perf <= sysperf + margin); +} + static void test_GetPerformanceInfo(void) { PERFORMANCE_INFORMATION info; @@ -227,36 +232,30 @@ static void test_GetPerformanceInfo(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); ok(size >= sizeof(SYSTEM_PERFORMANCE_INFORMATION), "incorrect length %d\n", size); - ok(info.CommitTotal == sys_performance_info->TotalCommittedPages, - "expected info.CommitTotal=%u but got %u\n", - sys_performance_info->TotalCommittedPages, (ULONG)info.CommitTotal); - ok(info.CommitLimit == sys_performance_info->TotalCommitLimit, - "expected info.CommitLimit=%u but got %u\n", - sys_performance_info->TotalCommitLimit, (ULONG)info.CommitLimit); + ok(check_with_margin(info.CommitTotal, sys_performance_info->TotalCommittedPages, 288), + "expected approximately %ld but got %d\n", info.CommitTotal, sys_performance_info->TotalCommittedPages); + + ok(check_with_margin(info.CommitLimit, sys_performance_info->TotalCommitLimit, 32), + "expected approximately %ld but got %d\n", info.CommitLimit, sys_performance_info->TotalCommitLimit); - ok(info.CommitPeak == sys_performance_info->PeakCommitment, - "expected info.CommitPeak=%u but got %u\n", - sys_performance_info->PeakCommitment, (ULONG)info.CommitPeak); + ok(check_with_margin(info.CommitPeak, sys_performance_info->PeakCommitment, 32), + "expected approximately %ld but got %d\n", info.CommitPeak, sys_performance_info->PeakCommitment); - ok(info.PhysicalAvailable >= max(sys_performance_info->AvailablePages, 25) - 25 && - info.PhysicalAvailable <= sys_performance_info->AvailablePages + 25, - "expected approximately info.PhysicalAvailable=%u but got %u\n", - sys_performance_info->AvailablePages, (ULONG)info.PhysicalAvailable); + ok(check_with_margin(info.PhysicalAvailable, sys_performance_info->AvailablePages, 64), + "expected approximately %ld but got %d\n", info.PhysicalAvailable, sys_performance_info->AvailablePages); /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ - ok(info.KernelTotal == sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, - "expected info.KernelTotal=%u but got %u\n", - sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelTotal); + ok(check_with_margin(info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, 64), + "expected approximately %ld but got %d\n", info.KernelTotal, + sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage); - ok(info.KernelPaged == sys_performance_info->PagedPoolUsage, - "expected info.KernelPaged=%u but got %u\n", - sys_performance_info->PagedPoolUsage, (ULONG)info.KernelPaged); + ok(check_with_margin(info.KernelPaged, sys_performance_info->PagedPoolUsage, 64), + "expected approximately %ld but got %d\n", info.KernelPaged, sys_performance_info->PagedPoolUsage); - ok(info.KernelNonpaged == sys_performance_info->NonPagedPoolUsage, - "expected info.KernelNonpaged=%u but got %u\n", - sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelNonpaged); + ok(check_with_margin(info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage, 8), + "expected approximately %ld but got %d\n", info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage); /* compare with values from SYSTEM_BASIC_INFORMATION */ size = 0; @@ -297,14 +296,14 @@ static void test_GetPerformanceInfo(void) } HeapFree(GetProcessHeap(), 0, sys_process_info); - ok(info.HandleCount == handle_count, - "expected info.HandleCount=%u but got %u\n", handle_count, info.HandleCount); + ok(check_with_margin(info.HandleCount, handle_count, 8), + "expected approximately %d but got %d\n", info.HandleCount, handle_count); - ok(info.ProcessCount == process_count, - "expected info.ProcessCount=%u but got %u\n", process_count, info.ProcessCount); + ok(check_with_margin(info.ProcessCount, process_count, 4), + "expected approximately %d but got %d\n", info.ProcessCount, process_count); - ok(info.ThreadCount == thread_count, - "expected info.ThreadCount=%u but got %u\n", thread_count, info.ThreadCount); + ok(check_with_margin(info.ThreadCount, thread_count, 4), + "expected approximately %d but got %d\n", info.ThreadCount, thread_count); } }

1 0

André Hentschel : ntdll/tests: Simplify the RtlRandom test.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: c6b888f16f65db07172131f705a4be4a8c35b219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b888f16f65db07172131f70… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 15 21:43:44 2015 +0200 ntdll/tests: Simplify the RtlRandom test. --- dlls/ntdll/tests/rtl.c | 222 ++----------------------------------------------- 1 file changed, 8 insertions(+), 214 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 9a4ec48..ce23310 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -657,46 +657,11 @@ static void test_RtlUniform(void) } -static ULONG my_RtlRandom(PULONG seed) -{ - static ULONG saved_value[128] = - { /* 0 */ 0x4c8bc0aa, 0x4c022957, 0x2232827a, 0x2f1e7626, 0x7f8bdafb, 0x5c37d02a, 0x0ab48f72, 0x2f0c4ffa, - /* 8 */ 0x290e1954, 0x6b635f23, 0x5d3885c0, 0x74b49ff8, 0x5155fa54, 0x6214ad3f, 0x111e9c29, 0x242a3a09, - /* 16 */ 0x75932ae1, 0x40ac432e, 0x54f7ba7a, 0x585ccbd5, 0x6df5c727, 0x0374dad1, 0x7112b3f1, 0x735fc311, - /* 24 */ 0x404331a9, 0x74d97781, 0x64495118, 0x323e04be, 0x5974b425, 0x4862e393, 0x62389c1d, 0x28a68b82, - /* 32 */ 0x0f95da37, 0x7a50bbc6, 0x09b0091c, 0x22cdb7b4, 0x4faaed26, 0x66417ccd, 0x189e4bfa, 0x1ce4e8dd, - /* 40 */ 0x5274c742, 0x3bdcf4dc, 0x2d94e907, 0x32eac016, 0x26d33ca3, 0x60415a8a, 0x31f57880, 0x68c8aa52, - /* 48 */ 0x23eb16da, 0x6204f4a1, 0x373927c1, 0x0d24eb7c, 0x06dd7379, 0x2b3be507, 0x0f9c55b1, 0x2c7925eb, - /* 56 */ 0x36d67c9a, 0x42f831d9, 0x5e3961cb, 0x65d637a8, 0x24bb3820, 0x4d08e33d, 0x2188754f, 0x147e409e, - /* 64 */ 0x6a9620a0, 0x62e26657, 0x7bd8ce81, 0x11da0abb, 0x5f9e7b50, 0x23e444b6, 0x25920c78, 0x5fc894f0, - /* 72 */ 0x5e338cbb, 0x404237fd, 0x1d60f80f, 0x320a1743, 0x76013d2b, 0x070294ee, 0x695e243b, 0x56b177fd, - /* 80 */ 0x752492e1, 0x6decd52f, 0x125f5219, 0x139d2e78, 0x1898d11e, 0x2f7ee785, 0x4db405d8, 0x1a028a35, - /* 88 */ 0x63f6f323, 0x1f6d0078, 0x307cfd67, 0x3f32a78a, 0x6980796c, 0x462b3d83, 0x34b639f2, 0x53fce379, - /* 96 */ 0x74ba50f4, 0x1abc2c4b, 0x5eeaeb8d, 0x335a7a0d, 0x3973dd20, 0x0462d66b, 0x159813ff, 0x1e4643fd, - /* 104 */ 0x06bc5c62, 0x3115e3fc, 0x09101613, 0x47af2515, 0x4f11ec54, 0x78b99911, 0x3db8dd44, 0x1ec10b9b, - /* 112 */ 0x5b5506ca, 0x773ce092, 0x567be81a, 0x5475b975, 0x7a2cde1a, 0x494536f5, 0x34737bb4, 0x76d9750b, - /* 120 */ 0x2a1f6232, 0x2e49644d, 0x7dddcbe7, 0x500cebdb, 0x619dab9e, 0x48c626fe, 0x1cda3193, 0x52dabe9d }; - ULONG rand; - int pos; - ULONG result; - - rand = (*seed * 0x7fffffed + 0x7fffffc3) % 0x7fffffff; - *seed = (rand * 0x7fffffed + 0x7fffffc3) % 0x7fffffff; - pos = *seed & 0x7f; - result = saved_value[pos]; - saved_value[pos] = rand; - return(result); -} - - static void test_RtlRandom(void) { - ULONGLONG num; + int i, j; ULONG seed; - ULONG seed_bak; - ULONG seed_expected; - ULONG result; - ULONG result_expected; + ULONG res[512]; if (!pRtlRandom) { @@ -704,185 +669,14 @@ static void test_RtlRandom(void) return; } -/* - * Unlike RtlUniform, RtlRandom is not documented. We guess that for - * RtlRandom D.H. Lehmer's 1948 algorithm is used like stated in - * the documentation of the RtlUniform function. This algorithm is: - * - * seed = (seed * const_1 + const_2) % const_3; - * - * According to the RtlUniform documentation the random number is - * distributed over [0..MAXLONG], but in reality it is distributed - * over [0..MAXLONG-1]. Therefore const_3 might be MAXLONG + 1 or - * MAXLONG: - * - * seed = (seed * const_1 + const_2) % (MAXLONG + 1); - * - * or - * - * seed = (seed * const_1 + const_2) % MAXLONG; - * - * To find out const_2 we just call RtlRandom with seed set to 0: - */ seed = 0; - result_expected = 0x320a1743; - seed_expected =0x44b; - result = pRtlRandom(&seed); - -/* - * Windows Vista uses different algorithms, so skip the rest of the tests - * until that is figured out. Trace output for the failures is about 10.5 MB! - */ - - if (seed == 0x3fc) { - skip("Most likely running on Windows Vista which uses a different algorithm\n"); - return; + for (i = 0; i < sizeof(res) / sizeof(res[0]); i++) + { + res[i] = pRtlRandom(&seed); + ok(seed != res[i], "%i: seed is same as res %x\n", i, seed); + for (j = 0; j < i; j++) + ok(res[i] != res[j], "res[%i] (%x) is same as res[%i] (%x)\n", j, res[j], i, res[i]); } - - ok(result == result_expected, - "pRtlRandom(&seed (seed == 0)) returns %x, expected %x\n", - result, result_expected); - ok(seed == seed_expected, - "pRtlRandom(&seed (seed == 0)) sets seed to %x, expected %x\n", - seed, seed_expected); -/* - * Seed is not equal to result as with RtlUniform. To see more we - * call RtlRandom again with seed set to 0: - */ - seed = 0; - result_expected = 0x7fffffc3; - seed_expected =0x44b; - result = pRtlRandom(&seed); - ok(result == result_expected, - "RtlRandom(&seed (seed == 0)) returns %x, expected %x\n", - result, result_expected); - ok(seed == seed_expected, - "RtlRandom(&seed (seed == 0)) sets seed to %x, expected %x\n", - seed, seed_expected); -/* - * Seed is set to the same value as before but the result is different. - * To see more we call RtlRandom again with seed set to 0: - */ - seed = 0; - result_expected = 0x7fffffc3; - seed_expected =0x44b; - result = pRtlRandom(&seed); - ok(result == result_expected, - "RtlRandom(&seed (seed == 0)) returns %x, expected %x\n", - result, result_expected); - ok(seed == seed_expected, - "RtlRandom(&seed (seed == 0)) sets seed to %x, expected %x\n", - seed, seed_expected); -/* - * Seed is again set to the same value as before. This time we also - * have the same result as before. Interestingly the value of the - * result is 0x7fffffc3 which is the same value used in RtlUniform - * as const_2. If we do - * - * seed = 0; - * result = RtlUniform(&seed); - * - * we get the same result (0x7fffffc3) as with - * - * seed = 0; - * RtlRandom(&seed); - * seed = 0; - * result = RtlRandom(&seed); - * - * And there is another interesting thing. If we do - * - * seed = 0; - * RtlUniform(&seed); - * RtlUniform(&seed); - * - * seed is set to the value 0x44b which ist the same value that - * - * seed = 0; - * RtlRandom(&seed); - * - * assigns to seed. Putting these two findings together leads to - * the conclusion that RtlRandom saves the value in some variable, - * like in the following algorithm: - * - * result = saved_value; - * saved_value = RtlUniform(&seed); - * RtlUniform(&seed); - * return(result); - * - * Now we do further tests with seed set to 1: - */ - seed = 1; - result_expected = 0x7a50bbc6; - seed_expected =0x5a1; - result = pRtlRandom(&seed); - ok(result == result_expected, - "RtlRandom(&seed (seed == 1)) returns %x, expected %x\n", - result, result_expected); - ok(seed == seed_expected, - "RtlRandom(&seed (seed == 1)) sets seed to %x, expected %x\n", - seed, seed_expected); -/* - * If there is just one saved_value the result now would be - * 0x7fffffc3. From this test we can see that there is more than - * one saved_value, like with this algorithm: - * - * result = saved_value[pos]; - * saved_value[pos] = RtlUniform(&seed); - * RtlUniform(&seed); - * return(result); - * - * But how is the value of pos determined? The calls to RtlUniform - * create a sequence of random numbers. Every second random number - * is put into the saved_value array and is used in some later call - * of RtlRandom as result. The only reasonable source to determine - * pos are the random numbers generated by RtlUniform which are not - * put into the saved_value array. This are the values of seed - * between the two calls of RtlUniform as in this algorithm: - * - * rand = RtlUniform(&seed); - * RtlUniform(&seed); - * pos = position(seed); - * result = saved_value[pos]; - * saved_value[pos] = rand; - * return(result); - * - * What remains to be determined is: The size of the saved_value array, - * the initial values of the saved_value array and the function - * position(seed). These tests are not shown here. - * The result of these tests is: The size of the saved_value array - * is 128, the initial values can be seen in the my_RtlRandom - * function and the position(seed) function is (seed & 0x7f). - * - * For a full test of RtlRandom use one of the following loop heads: - * - * for (num = 0; num <= 0xffffffff; num++) { - * seed = num; - * ... - * - * seed = 0; - * for (num = 0; num <= 0xffffffff; num++) { - * ... - */ - seed = 0; - for (num = 0; num <= 100000; num++) { - seed_bak = seed; - seed_expected = seed; - result_expected = my_RtlRandom(&seed_expected); - /* The following corrections are necessary because the */ - /* previous tests changed the saved_value array */ - if (num == 0) { - result_expected = 0x7fffffc3; - } else if (num == 81) { - result_expected = 0x7fffffb1; - } /* if */ - result = pRtlRandom(&seed); - ok(result == result_expected, - "test: 0x%x%08x RtlRandom(&seed (seed == %x)) returns %x, expected %x\n", - (DWORD)(num >> 32), (DWORD)num, seed_bak, result, result_expected); - ok(seed == seed_expected, - "test: 0x%x%08x RtlRandom(&seed (seed == %x)) sets seed to %x, expected %x\n", - (DWORD)(num >> 32), (DWORD)num, seed_bak, result, seed_expected); - } /* for */ }

1 0

André Hentschel : kernel32/tests: Don' t test for the exact process count.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: 774efacbec2d15d2e4aab93932fae5605fc8ed0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=774efacbec2d15d2e4aab9393… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Sep 19 17:01:42 2015 +0200 kernel32/tests: Don't test for the exact process count. --- dlls/kernel32/tests/toolhelp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index ed76c9c..c40dbc4 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -175,8 +175,8 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) num++; } while (pThread32Next( hSnapshot, &te )); } - ok(curr_found == 1, "couldn't find self in thread list\n"); - ok(sub_found == 2, "couldn't find sub-process thread's in thread list\n"); + ok(curr_found, "couldn't find self in thread list\n"); + ok(sub_found >= 2, "couldn't find sub-process threads in thread list\n"); /* check that first really resets enumeration */ curr_found = 0; @@ -192,8 +192,8 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) num--; } while (pThread32Next( hSnapshot, &te )); } - ok(curr_found == 1, "couldn't find self in thread list\n"); - ok(sub_found == 2, "couldn't find sub-process thread's in thread list\n"); + ok(curr_found, "couldn't find self in thread list\n"); + ok(sub_found >= 2, "couldn't find sub-process threads in thread list\n"); me.dwSize = sizeof(me); ok(!pModule32First( hSnapshot, &me ), "shouldn't return a module\n");

1 0

André Hentschel : ws2_32/tests: Don' t test function directly when reporting WSAGetLastError().
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: d0a5a32546b600eaabe1c03f0137c418e1fff591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0a5a32546b600eaabe1c03f0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Sep 19 15:42:51 2015 +0200 ws2_32/tests: Don't test function directly when reporting WSAGetLastError(). --- dlls/ws2_32/tests/sock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2bcc92e..8a0e375 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3737,7 +3737,8 @@ static void test_select(void) ok(FD_ISSET(fdRead, &writefds), "fdRead socket is not in the set\n"); len = sizeof(id); id = 0xdeadbeef; - ok(!getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len), "getsockopt failed with %d\n",WSAGetLastError()); + ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); + ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); ok(id == 0, "expected 0, got %d\n", id); /* When data is received the receiver gets the read descriptor */ @@ -3821,7 +3822,8 @@ static void test_select(void) ok(ret == 1, "expected 1, got %d\n", ret); len = sizeof(id); id = 0xdeadbeef; - ok(!getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len), "getsockopt failed with %d\n",WSAGetLastError()); + ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); + ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n");

1 0

André Hentschel : Add WWN 399
by Jeremy Newman 25 Sep '15

25 Sep '15

Module: website Branch: master Commit: 43a01bdfb4e6275fb49b977849d2799e8749b7fc URL: http://source.winehq.org/git/website.git/?a=commit;h=43a01bdfb4e6275fb49b97… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 24 20:59:15 2015 +0200 Add WWN 399 --- news/de/2015092401.xml | 11 ++++++++ news/en/2015092401.xml | 11 ++++++++ wwn/en/wn20150924_399.xml | 67 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+) diff --git a/news/de/2015092401.xml b/news/de/2015092401.xml new file mode 100644 index 0000000..ebf4363 --- /dev/null +++ b/news/de/2015092401.xml @@ -0,0 +1,11 @@ +<news> + <date>24. September 2015</date> + <title>World Wine News Ausgabe 399</title> + <body> +<a href="{$root}/wwn/399">WWN Ausgabe 399</a> wurde heute veröffentlicht. +<ul> +<li><a href="{$root}/wwn/399#WineConf 2015">WineConf 2015</a></li> +<li><a href="{$root}/wwn/399#Wine Stable/Release Changes">Wine Stable/Release Änderungen</a></li> +</ul> + </body> +</news> diff --git a/news/en/2015092401.xml b/news/en/2015092401.xml new file mode 100644 index 0000000..8c6b5b0 --- /dev/null +++ b/news/en/2015092401.xml @@ -0,0 +1,11 @@ +<news> + <date>September 24, 2015</date> + <title>World Wine News Issue 399</title> + <body> +<a href="{$root}/wwn/399">WWN Issue 399</a> was released today. +<ul> +<li><a href="{$root}/wwn/399#WineConf 2015">WineConf 2015</a></li> +<li><a href="{$root}/wwn/399#Wine Stable/Release Changes">Wine Stable/Release Changes</a></li> +</ul> + </body> +</news> diff --git a/wwn/en/wn20150924_399.xml b/wwn/en/wn20150924_399.xml new file mode 100644 index 0000000..77cb901 --- /dev/null +++ b/wwn/en/wn20150924_399.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" ?> +<kc> +<title>Wine Traffic</title> + +<author contact="http://www.dawncrow.de/wine/">André Hentschel</author> +<issue num="399" date="09/24/2015" /> +<intro> This is the 399th issue of the World Wine News publication. This time a special edition! </intro> + +<section + title="WineConf 2015" + subject="WineConf" + archive="http://wiki.winehq.org/WineConf2015" + posts="1" +> + + Last weekend at WineConf 2015 in Vienna we intensively talked about our stable releases, how + to integrate wine-staging, signing off patches and much more. + In this WWN special edition I want to present changes to our stable release process. + + + See also: + <a href="http://wiki.winehq.org/WineConf2015">WineConf2015 in our Wiki</a> + +</section> + +<section + title="Wine Stable/Release Changes" + subject="WineConf" + archive="//www.winehq.org/pipermail/wine-devel/2015-September/109355.html" + posts="1" +> +<![CDATA[ + + Michael Stefaniuc wrote in: + +<blockquote> +<pre> +Hello, + +at WineConf we had a fairly uncontroversial discussion about the Wine +Stable release process. As the current process of feature based Wine +releases isn't working following changes were agreed upon. + +Release Process Changes +- ----------------------- +- - Switch to time based releases. + +- - Major releases once a year in autumn/fall. Code freeze starts around + mid/end of September. + +- - Michael Stefaniuc will be the stable maintainer starting with 1.8.x. + Other people are more than welcome to help out with Wine Stable. + I'll document stuff and send out a request for help during the code + freeze. + +- - The stable release will be supported in bugzilla. + +- - This changes take effect immediately. You can expect Alexandre to + announce a code freeze in the next couple of weeks. + +- - We will revisit this changes should the need arise, e.g. reduce the + time between two major stable releases. +</pre> +]]> +</section> + +</kc>

1 0

Jactry Zeng : Update Simplified Chinese translation for download page.
by Jeremy Newman 23 Sep '15

23 Sep '15

Module: website Branch: master Commit: 26f6f982c8e81ac8cc5b5d1488851f0e5c160c55 URL: http://source.winehq.org/git/website.git/?a=commit;h=26f6f982c8e81ac8cc5b5d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Sep 23 22:33:52 2015 +0200 Update Simplified Chinese translation for download page. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- templates/zh-cn/download.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index d3d51ca..3ce949d 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -60,15 +60,15 @@ requested in exchange for hosting the Wine web site. <tr bgcolor="#ffffff"> <td align="center"><a href="{$root}/download/ubuntu"> - <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux"border="0"></a> + <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">下载 Ubuntu 安装包</a> - - Ubuntu Trusty (14.04 LTS) 的二进制和源码 .debs</td> + - Ubuntu 的二进制和源码 .debs</td> <td><a href="mailto:scottritchie@ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="{$root}/download/debian"> + <td align="center"><a href="{$root}/download/debian"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> <td> <a href="{$root}/download/debian">下载 Debian 安装包</a>

1 0

Jeremy Newman : sync translations
by Jeremy Newman 21 Sep '15

21 Sep '15

Module: website Branch: master Commit: b521df30902492f72dae79114e7bf9c75dbd34e1 URL: http://source.winehq.org/git/website.git/?a=commit;h=b521df30902492f72dae79… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Sep 21 13:24:20 2015 -0500 sync translations --- templates/de/download.template | 6 +++--- templates/fr/download.template | 8 ++++---- templates/he/download.template | 4 ++-- templates/pl/download.template | 6 +++--- templates/pt/download.template | 6 +++--- templates/tr/download.template | 6 +++--- templates/uk/download.template | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 479a717..c44773a 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -64,15 +64,15 @@ für das Hosten der Wine-Webseite erbeten hat. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Ubuntu</a> - Binär- und Quellpakete (.deb) für Ubuntu Trusty (14.04 LTS)</td> + Binär- und Quellpakete (.deb) für Ubuntu Trusty</td> <td><a href="mailto:scottritchie@ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine-development"> + <td align="center"><a href="{$root}/download/debian"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine-development">Debian</a> + <td> <a href="{$root}/download/debian">Debian</a> Binärpakete (.deb) für Debian</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> diff --git a/templates/fr/download.template b/templates/fr/download.template index 0d34178..971e073 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -66,16 +66,16 @@ center;">Voyez la <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Paquets Ubuntu</a> - - .deb binaires et sources pour Ubuntu Precise (12.04), Quantal (12.10), Raring (13.04) et Saucy (13.10) + - .deb binaires et sources pour Ubuntu <td><a href="mailto:scottritchie@ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine-development"> + <td align="center"><a href="{$root}/download/debian"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine-development">Paquets Debian</a> - - .deb binaires pour Debian Sid</td> + <td> <a href="{$root}/download/debian">Paquets Debian</a> + - .deb binaires pour Debian</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> diff --git a/templates/he/download.template b/templates/he/download.template index fd10e37..1a36569 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -67,10 +67,10 @@ </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine-development"> + <td align="center"><a href="{$root}/download/debian"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine-development">הורדת חבילות לדביאן</a> + <td> <a href="{$root}/download/debian">הורדת חבילות לדביאן</a> - קובצי .debבינריים לדביאן; <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> diff --git a/templates/pl/download.template b/templates/pl/download.template index 4b39e63..10e09f8 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -60,15 +60,15 @@ <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/deb">Pobierz paczki dla Ubuntu</a> - - binarne i źródłowe paczki .deb dla Ubuntu Trusty (14.04 LTS)</td> + - binarne i źródłowe paczki .deb dla Ubuntu</td> <td><a href="mailto:scottritchie@ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine-development"> + <td align="center"><a href="{$root}/download/debian"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine-development">Pobierz paczki dla Debian</a> + <td> <a href="{$root}/download/debian">Pobierz paczki dla Debian</a> - binarne paczki .deb dla Debian</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> diff --git a/templates/pt/download.template b/templates/pt/download.template index 66ce52f..fad296b 100644 --- a/templates/pt/download.template +++ b/templates/pt/download.template @@ -59,15 +59,15 @@ <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Descarregar pacotes para Ubuntu</a> - - .debs binários e do código fonte para Ubuntu Precise (12.04), Quantal (12.10), e Raring (13.04) + - .debs binários e do código fonte para Ubuntu <td><a href="mailto:scottritchie@ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine-development"> + <td align="center"><a href="{$root}/download/debian"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine-development">Descarregar pacotes para Debian</a> + <td> <a href="{$root}/download/debian">Descarregar pacotes para Debian</a> - .debs binários para Debian</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> diff --git a/templates/tr/download.template b/templates/tr/download.template index 4cc7d3d..8689d07 100644 --- a/templates/tr/download.template +++ b/templates/tr/download.template @@ -59,15 +59,15 @@ <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Ubuntu paketleri indirin</a> - - Ubuntu Precise (12.04), Quantal (12.10) ve Raring (13.04) için .debs ikili ve kaynak paketi + - Ubuntu için .debs ikili ve kaynak paketi <td><a href="mailto:scottritchie@ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine-development"> + <td align="center"><a href="{$root}/download/debian"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine-development">Debian paketleri indirin</a> + <td> <a href="{$root}/download/debian">Debian paketleri indirin</a> - Debian için ikili .deb dosyaları</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr> diff --git a/templates/uk/download.template b/templates/uk/download.template index 5440152..a36ebc1 100644 --- a/templates/uk/download.template +++ b/templates/uk/download.template @@ -60,15 +60,15 @@ <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Завантажити пакунки Ubuntu</a> - - бінарні та вихідні .deb файли для Ubuntu Trusty (14.04 LTS) + - бінарні та вихідні .deb файли для Ubuntu <td><a href="mailto:scottritchie@ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine-development"> + <td align="center"><a href="{$root}/download/debian"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine-development">Завантажити пакунки Debian</a> + <td> <a href="{$root}/download/debian">Завантажити пакунки Debian</a> - бінарні .deb файли для Debian</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr>

1 0

Kyle Auble : Update download entries for Ubuntu & Debian
by Jeremy Newman 21 Sep '15

21 Sep '15

Module: website Branch: master Commit: daa3cf55171f9b86aa1760a2f12781e029da3775 URL: http://source.winehq.org/git/website.git/?a=commit;h=daa3cf55171f9b86aa1760… Author: Kyle Auble <kyle.auble(a)zoho.com> Date: Mon Sep 21 13:18:43 2015 -0500 Update download entries for Ubuntu & Debian --- templates/en/download.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 02bc360..7001c9b 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -63,15 +63,15 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Download Ubuntu packages</a> - - binary and source .debs for Ubuntu Trusty (14.04 LTS)</td> + - binary and source .debs for Ubuntu</td> <td><a href="mailto:scottritchie@ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="https://packages.debian.org/stable/wine-development"> + <td align="center"><a href="{$root}/download/debian"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="https://packages.debian.org/stable/wine-development">Download Debian packages</a> + <td> <a href="{$root}/download/debian">Download Debian packages</a> - binary and source .debs for Debian</td> <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> </tr>

1 0

Kyle Auble : Add up-to-date download page for Debian
by Jeremy Newman 21 Sep '15

21 Sep '15

Module: website Branch: master Commit: ff9da5f0e0281e3def2b10ae1077fa67bc6c084a URL: http://source.winehq.org/git/website.git/?a=commit;h=ff9da5f0e0281e3def2b10… Author: Kyle Auble <kyle.auble(a)zoho.com> Date: Sun Sep 20 20:24:13 2015 -0600 Add up-to-date download page for Debian I incorporated all of Jens' suggestions, plus tweaked the language to sound better in a few places and gave the HTML more space to breathe. The 2nd patch in the series should still be fine without any changes. --- templates/en/download/debian.template | 162 ++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/templates/en/download/debian.template b/templates/en/download/debian.template new file mode 100644 index 0000000..00c611b --- /dev/null +++ b/templates/en/download/debian.template @@ -0,0 +1,162 @@ + + + + +<h1 class="title"> +<a href="https://www.debian.org/" target="_new"> +<img src="{$root}/images/distro/debian.png" width="50" height="50" + alt="Debian Logo" border="0"></a> +Wine on Debian +<a href="https://www.debian.org/" target="_new"> +<img src="{$root}/images/distro/debian.png" width="50" height="50" + alt="Debian Logo" border="0"></a> +</h1> + + +You can directly install software for Debian from .deb package +files, but using the APT package manager (or a front-end such as +Aptitude or Synaptic) to get software from the official Debian repos is +much safer and cleaner. Here are instructions and hints for installing +your preferred version of Wine, the Debian way.... + + + +<h2>For 32-Bit Debian</h2> + + +So long as your package system is configured correctly and +up-to-date, grabbing Wine should be simple, whether you use Debian +stable, testing, or unstable. On 32-bit +Debian, you can install a stable release of Wine with a single +apt-get command: + + +<pre>sudo apt-get install wine</pre> + + +Starting with Debian Jessie (release 8.0), there is also a package of +Wine's development release that can be installed alongside the stable +release: + + +<pre>sudo apt-get install wine-development</pre> + + +Note that you currently need to use the command +'wine-development' instead of 'wine' to run the +development version from the command-line. + + + +You should be able to closely track upstream with the +"wine-development" package. While the version on stable will only +upgrade with each major Debian release, current packages for users on +stable will be regularly available from +<a href="http://backports.debian.org/" + target="_new">Debian Backports</a> (see below for details). + +Similarly, the packages in testing and unstable won't be +updated while Debian is in its biennial code-freeze. Advanced users that +really need a packaged, cutting-edge version of Wine during those +months can still find it in +<a href="https://wiki.debian.org/DebianExperimental" + target="_new">Debian experimental</a>. + + + +<h2>On 64-Bit Debian</h2> + + +Even if your system uses 64-bit Debian, you probably still +want a Wine installation that can run 32-bit Windows applications. To +install 32-bit application support, just make sure your system is +configured to pull in 32-bit packages and the index is updated +first: + + +<pre> +sudo dpkg --add-architecture i386 +sudo apt-get update +sudo apt-get install wine-development +</pre> + +Starting with Debian Stretch, you can also install Wine on 64-bit ARM +systems: + +<pre> +sudo dpkg --add-architecture armhf +sudo apt-get update +sudo apt-get install wine-development +</pre> + + +<h2>Debian Backports</h2> + + +If you are on stable and want a newer version of +"wine-development", starting with Debian Jessie, you can grab a version +in sync with upstream from Debian Backports. To install it, you need to +enable the Backports repo first by adding the following line to one of +your sources.list files: + + +<pre> +deb http://httpredir.debian.org/debian/ jessie-backports main +</pre> + + +You can do this either through Synaptic + (Settings -> Repositories -> Other Software -> Add) +or by editing the sources.list file directly + ('sudo editor /etc/apt/sources.list'). +Then once you've added your sources, update your package index + (Reload in Synaptic or 'sudo apt-get update' on the + command-line). + + + +If you don't mind possibly upgrading other dependencies to Backports +versions too, you can install everything from the command-line in one +swoop: + + +<pre>sudo apt-get install -t jessie-backports wine-development</pre> + +If you want to be more selective about keeping stable +dependencies though, you can use the form: + +<pre>sudo apt-get install wine-development/jessie-backports</pre> + + +However, if any other packages need to be installed or updated, this +method will abort with a list of such packages. You can selectively +install those from either stable or Backports, then repeat the +command to install "wine-development/jessie-backports". + + + +<h2>More Information</h2> + +For more info, you can see the Debian package site: + +<ul><li> +<a href="https://packages.debian.org/wine" + target="_new">wine</a> (stable release) +</li> + +<li> +<a href="https://packages.debian.org/wine-development" + target="_new">wine-development</a> (development release) +</li></ul> + +There are also useful wiki pages out there too: + +<ul><li> +<a href="http://wiki.winehq.org/Debian" + target="_new">Debian on the Wine Wiki</a> +</li> + +<li> +<a href="https://wiki.debian.org/Wine" + target="_new">Wine on the Debian Wiki</a> +</li></ul>

1 0

Iván Matellanes : msvcirt: Implement strstreambuf:: overflow.
by Alexandre Julliard 18 Sep '15

18 Sep '15

Module: wine Branch: master Commit: 60d1d6f5952e8b5d6fb0327a28c047058851fa70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d1d6f5952e8b5d6fb0327a2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Sep 17 11:06:54 2015 +0200 msvcirt: Implement strstreambuf::overflow. --- dlls/msvcirt/msvcirt.c | 14 +++++++-- dlls/msvcirt/tests/msvcirt.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index a320879..0a34ac0 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1332,8 +1332,18 @@ void __thiscall strstreambuf_freeze(strstreambuf *this, int frozen) DEFINE_THISCALL_WRAPPER(strstreambuf_overflow, 8) int __thiscall strstreambuf_overflow(strstreambuf *this, int c) { - FIXME("(%p %d) stub\n", this, c); - return EOF; + TRACE("(%p %d)\n", this, c); + if (this->base.pptr >= this->base.epptr) { + /* increase the buffer size if it's dynamic */ + if (!this->dynamic || call_streambuf_doallocate(&this->base) == EOF) + return EOF; + if (!this->base.epptr) + this->base.pbase = this->base.pptr = this->base.egptr ? this->base.egptr : this->base.base; + this->base.epptr = this->base.ebuf; + } + if (c != EOF) + *this->base.pptr++ = c; + return 1; } /* ?seekoff@strstreambuf@@UAEJJW4seek_dir@ios@@H@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 5e29e9a..9bf93af 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -195,6 +195,7 @@ static strstreambuf* (*__thiscall p_strstreambuf_ctor)(strstreambuf*); static void (*__thiscall p_strstreambuf_dtor)(strstreambuf*); static int (*__thiscall p_strstreambuf_doallocate)(strstreambuf*); static void (*__thiscall p_strstreambuf_freeze)(strstreambuf*, int); +static int (*__thiscall p_strstreambuf_overflow)(strstreambuf*, int); static streambuf* (*__thiscall p_strstreambuf_setbuf)(strstreambuf*, char*, int); static int (*__thiscall p_strstreambuf_underflow)(strstreambuf*); @@ -351,6 +352,7 @@ static BOOL init(void) SET(p_strstreambuf_dtor, "??1strstreambuf@@UEAA@XZ"); SET(p_strstreambuf_doallocate, "?doallocate@strstreambuf@@MEAAHXZ"); SET(p_strstreambuf_freeze, "?freeze@strstreambuf@@QEAAXH@Z"); + SET(p_strstreambuf_overflow, "?overflow@strstreambuf@@UEAAHH@Z"); SET(p_strstreambuf_setbuf, "?setbuf@strstreambuf@@UEAAPEAVstreambuf@@PEADH@Z"); SET(p_strstreambuf_underflow, "?underflow@strstreambuf@@UEAAHXZ"); @@ -427,6 +429,7 @@ static BOOL init(void) SET(p_strstreambuf_dtor, "??1strstreambuf@@UAE@XZ"); SET(p_strstreambuf_doallocate, "?doallocate@strstreambuf@@MAEHXZ"); SET(p_strstreambuf_freeze, "?freeze@strstreambuf@@QAEXH@Z"); + SET(p_strstreambuf_overflow, "?overflow@strstreambuf@@UAEHH@Z"); SET(p_strstreambuf_setbuf, "?setbuf@strstreambuf@@UAEPAVstreambuf@@PADH@Z"); SET(p_strstreambuf_underflow, "?underflow@strstreambuf@@UAEHXZ"); @@ -1624,6 +1627,71 @@ static void test_strstreambuf(void) ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); ok(ret == EOF, "expected EOF got %d\n", ret); + /* overflow */ + ssb1.base.pptr = ssb1.base.epptr - 1; + ret = (int) call_func2(p_strstreambuf_overflow, &ssb1, EOF); + ok(ret == 1, "expected 1 got %d\n", ret); + ret = (int) call_func2(p_strstreambuf_overflow, &ssb1, 'A'); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(ssb1.base.pptr == ssb1.base.epptr, "wrong put pointer, expected %p got %p\n", ssb1.base.epptr, ssb1.base.pptr); + ok(*(ssb1.base.pptr - 1) == 'A', "expected 'A' got %d\n", *(ssb1.base.pptr - 1)); + ret = (int) call_func2(p_strstreambuf_overflow, &ssb1, 'B'); + ok(ret == EOF, "expected EOF got %d\n", ret); + ret = (int) call_func2(p_strstreambuf_overflow, &ssb1, EOF); + ok(ret == EOF, "expected EOF got %d\n", ret); + ssb2.dynamic = 0; + ret = (int) call_func2(p_strstreambuf_overflow, &ssb2, 'C'); + ok(ret == EOF, "expected EOF got %d\n", ret); + ssb2.dynamic = 1; + ret = (int) call_func2(p_strstreambuf_overflow, &ssb2, 'C'); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(ssb2.base.ebuf == ssb2.base.base + 12, "expected %p got %p\n", ssb2.base.base + 12, ssb2.base.ebuf); + ok(ssb2.base.gptr == ssb2.base.base + 11, "wrong get pointer, expected %p got %p\n", ssb2.base.base + 11, ssb2.base.gptr); + ok(ssb2.base.pbase == ssb2.base.base + 11, "wrong put base, expected %p got %p\n", ssb2.base.base + 11, ssb2.base.pbase); + ok(ssb2.base.pptr == ssb2.base.base + 12, "wrong put pointer, expected %p got %p\n", ssb2.base.base + 12, ssb2.base.pptr); + ok(ssb2.base.epptr == ssb2.base.base + 12, "wrong put end, expected %p got %p\n", ssb2.base.base + 12, ssb2.base.epptr); + ok(*(ssb2.base.pptr - 1) == 'C', "expected 'C' got %d\n", *(ssb2.base.pptr - 1)); + ssb2.increase = 4; + ssb2.base.eback = ssb2.base.gptr = ssb2.base.egptr = NULL; + ssb2.base.pbase = ssb2.base.pptr = ssb2.base.epptr = NULL; + ret = (int) call_func2(p_strstreambuf_overflow, &ssb2, 'D'); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(ssb2.base.ebuf == ssb2.base.base + 16, "expected %p got %p\n", ssb2.base.base + 16, ssb2.base.ebuf); + ok(ssb2.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, ssb2.base.gptr); + ok(ssb2.base.pbase == ssb2.base.base, "wrong put base, expected %p got %p\n", ssb2.base.base, ssb2.base.pbase); + ok(ssb2.base.pptr == ssb2.base.base + 1, "wrong put pointer, expected %p got %p\n", ssb2.base.base + 1, ssb2.base.pptr); + ok(ssb2.base.epptr == ssb2.base.base + 16, "wrong put end, expected %p got %p\n", ssb2.base.base + 16, ssb2.base.epptr); + ok(*(ssb2.base.pptr - 1) == 'D', "expected 'D' got %d\n", *(ssb2.base.pptr - 1)); + ssb2.base.pbase = ssb2.base.base + 3; + ssb2.base.pptr = ssb2.base.epptr + 5; + ret = (int) call_func2(p_strstreambuf_overflow, &ssb2, 'E'); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(ssb2.base.ebuf == ssb2.base.base + 20, "expected %p got %p\n", ssb2.base.base + 20, ssb2.base.ebuf); + ok(ssb2.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, ssb2.base.gptr); + ok(ssb2.base.pbase == ssb2.base.base + 3, "wrong put base, expected %p got %p\n", ssb2.base.base + 3, ssb2.base.pbase); + ok(ssb2.base.pptr == ssb2.base.base + 22, "wrong put pointer, expected %p got %p\n", ssb2.base.base + 22, ssb2.base.pptr); + ok(ssb2.base.epptr == ssb2.base.base + 20, "wrong put end, expected %p got %p\n", ssb2.base.base + 20, ssb2.base.epptr); + ok(*(ssb2.base.pptr - 1) == 'E', "expected 'E' got %d\n", *(ssb2.base.pptr - 1)); + ssb2.base.egptr = ssb2.base.base + 2; + ret = (int) call_func2(p_strstreambuf_overflow, &ssb2, 'F'); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(ssb2.base.ebuf == ssb2.base.base + 24, "expected %p got %p\n", ssb2.base.base + 24, ssb2.base.ebuf); + ok(ssb2.base.gptr != NULL, "wrong get pointer, expected != NULL\n"); + ok(ssb2.base.pbase == ssb2.base.base + 3, "wrong put base, expected %p got %p\n", ssb2.base.base + 3, ssb2.base.pbase); + ok(ssb2.base.pptr == ssb2.base.base + 23, "wrong put pointer, expected %p got %p\n", ssb2.base.base + 23, ssb2.base.pptr); + ok(ssb2.base.epptr == ssb2.base.base + 24, "wrong put end, expected %p got %p\n", ssb2.base.base + 24, ssb2.base.epptr); + ok(*(ssb2.base.pptr - 1) == 'F', "expected 'F' got %d\n", *(ssb2.base.pptr - 1)); + ssb2.base.eback = ssb2.base.gptr = ssb2.base.base; + ssb2.base.epptr = NULL; + ret = (int) call_func2(p_strstreambuf_overflow, &ssb2, 'G'); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(ssb2.base.ebuf == ssb2.base.base + 28, "expected %p got %p\n", ssb2.base.base + 28, ssb2.base.ebuf); + ok(ssb2.base.gptr == ssb2.base.base, "wrong get pointer, expected %p got %p\n", ssb2.base.base, ssb2.base.gptr); + ok(ssb2.base.pbase == ssb2.base.base + 2, "wrong put base, expected %p got %p\n", ssb2.base.base + 2, ssb2.base.pbase); + ok(ssb2.base.pptr == ssb2.base.base + 3, "wrong put pointer, expected %p got %p\n", ssb2.base.base + 3, ssb2.base.pptr); + ok(ssb2.base.epptr == ssb2.base.base + 28, "wrong put end, expected %p got %p\n", ssb2.base.base + 28, ssb2.base.epptr); + ok(*(ssb2.base.pptr - 1) == 'G', "expected 'G' got %d\n", *(ssb2.base.pptr - 1)); + call_func1(p_strstreambuf_dtor, &ssb1); call_func1(p_strstreambuf_dtor, &ssb2); }

1 0

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 September 2015