July 2016 - Wine-commits - list.winehq.org

Andrey Gusev : wined3d: Fix a typo in state_zwriteenable() function name.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: cf69c12c544ba2f2ddeadcbbb316145f7ecab258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf69c12c544ba2f2ddeadcbbb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jul 27 11:08:06 2016 +0300 wined3d: Fix a typo in state_zwriteenable() function name. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a35f9c8..42416a1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -204,7 +204,7 @@ static void state_ditherenable(struct wined3d_context *context, const struct win } } -static void state_zwritenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void state_zwriteenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -4962,7 +4962,7 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_RENDER(WINED3D_RS_MONOENABLE), { STATE_RENDER(WINED3D_RS_MONOENABLE), state_monoenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ROP2), { STATE_RENDER(WINED3D_RS_ROP2), state_rop2 }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PLANEMASK), { STATE_RENDER(WINED3D_RS_PLANEMASK), state_planemask }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_ZWRITEENABLE), { STATE_RENDER(WINED3D_RS_ZWRITEENABLE), state_zwritenable }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3D_RS_ZWRITEENABLE), { STATE_RENDER(WINED3D_RS_ZWRITEENABLE), state_zwriteenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LASTPIXEL), { STATE_RENDER(WINED3D_RS_LASTPIXEL), state_lastpixel }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_CULLMODE), { STATE_RENDER(WINED3D_RS_CULLMODE), state_cullmode }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZFUNC), { STATE_RENDER(WINED3D_RS_ZFUNC), state_zfunc }, WINED3D_GL_EXT_NONE },

1 0

Hugh McMaster : reg/tests: Add some tests for 'reg import'.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 78fecb03975d7d5ccdab93562b99fa245ae44cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=78fecb03975d7d5ccdab93562… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 25 07:54:21 2016 +0000 reg/tests: Add some tests for 'reg import'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0339e6e..b163cf0 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include <windows.h> #include "wine/test.h" @@ -675,9 +676,37 @@ static void test_v_flags(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } +static BOOL write_reg_file(const char *value, char *tmp_name) +{ + static const char regedit4[] = "REGEDIT4"; + static const char key[] = "[HKEY_CURRENT_USER\\" KEY_BASE "]"; + char file_data[MAX_PATH], tmp_path[MAX_PATH]; + HANDLE hfile; + DWORD written; + BOOL ret; + + sprintf(file_data, "%s\n\n%s\n%s\n", regedit4, key, value); + + GetTempPathA(MAX_PATH, tmp_path); + GetTempFileNameA(tmp_path, "reg", 0, tmp_name); + + hfile = CreateFileA(tmp_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hfile == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(hfile, file_data, strlen(file_data), &written, NULL); + CloseHandle(hfile); + return ret; +} + static void test_import(void) { - DWORD r; + DWORD r, dword = 0x123; + char test1_reg[MAX_PATH], test2_reg[MAX_PATH]; + char cmdline[MAX_PATH]; + char test_string[] = "Test string"; + HKEY hkey; + LONG err; run_reg_exe("reg import", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -687,6 +716,37 @@ static void test_import(void) run_reg_exe("reg import missing.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Create test files */ + ok(write_reg_file("\"Wine\"=dword:00000123", test1_reg), "Failed to write registry file\n"); + ok(write_reg_file("@=\"Test string\"", test2_reg), "Failed to write registry file\n"); + + sprintf(cmdline, "reg import %s", test1_reg); + run_reg_exe(cmdline, &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + sprintf(cmdline, "reg import %s", test2_reg); + run_reg_exe(cmdline, &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + todo_wine verify_reg(hkey, "Wine", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "", REG_SZ, test_string, sizeof(test_string), 0); + + err = RegCloseKey(hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + sprintf(cmdline, "reg import %s %s", test1_reg, test2_reg); + run_reg_exe(cmdline, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + DeleteFileA(test1_reg); + DeleteFileA(test2_reg); } START_TEST(reg)

1 0

Martin Storsjo : ucrtbase: Expose the fabsf function on arm.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: b05704dbbd429a5325132c77a3e13fcb88b2995f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05704dbbd429a5325132c77a… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 27 13:21:17 2016 +0300 ucrtbase: Expose the fabsf function on arm. It isn't available in the x86 or x64 versions of ucrtbase.dll or api-ms-win-crt-math-l1-1-0.dll, but exists (and gets used by MSVC 2015) on arm. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 1 + dlls/ucrtbase/ucrtbase.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index f752c83..05a0ac0 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -235,6 +235,7 @@ @ stub expm1f @ stub expm1l @ cdecl fabs(double) ucrtbase.fabs +@ cdecl -arch=arm fabsf(float) ucrtbase.fabsf @ stub fdim @ stub fdimf @ stub fdiml diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7058990..90639a2 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2281,6 +2281,7 @@ @ stub expm1f @ stub expm1l @ cdecl fabs(double) MSVCRT_fabs +@ cdecl -arch=arm fabsf(float) MSVCRT_fabsf @ cdecl fclose(ptr) MSVCRT_fclose @ stub fdim @ stub fdimf

1 0

Andrew Eikum : winepulse.drv: Don' t hold PA-owned buffer between capture callbacks.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: ee2310f7674c95b1ebc6229e3acd5b2bc408ba73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee2310f7674c95b1ebc6229e3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jul 26 12:51:16 2016 -0500 winepulse.drv: Don't hold PA-owned buffer between capture callbacks. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 55 +++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 32db0d1..bb533d9 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -173,8 +173,8 @@ struct ACImpl { INT32 locked; UINT32 bufsize_frames, bufsize_bytes, capture_period, pad, started, peek_ofs, wri_offs_bytes, lcl_offs_bytes; - UINT32 tmp_buffer_bytes, held_bytes; - BYTE *local_buffer, *tmp_buffer; + UINT32 tmp_buffer_bytes, held_bytes, peek_len, peek_buffer_len; + BYTE *local_buffer, *tmp_buffer, *peek_buffer; void *locked_ptr; pa_stream *stream; @@ -764,28 +764,42 @@ static void pulse_rd_loop(ACImpl *This, size_t bytes) dst = p->data; while (rem) { - pa_stream_peek(This->stream, (const void**)&src, &src_len); - assert(src_len); - assert(This->peek_ofs < src_len); - src += This->peek_ofs; - src_len -= This->peek_ofs; - assert(src_len <= bytes); + if (This->peek_len) { + copy = min(rem, This->peek_len - This->peek_ofs); - copy = rem; - if (copy > src_len) - copy = src_len; - memcpy(dst, src, rem); - src += copy; - src_len -= copy; - dst += copy; - rem -= copy; + memcpy(dst, This->peek_buffer + This->peek_ofs, copy); - if (!src_len) { - This->peek_ofs = 0; - pa_stream_drop(This->stream); - } else + rem -= copy; + dst += copy; This->peek_ofs += copy; + if(This->peek_len == This->peek_ofs) + This->peek_len = 0; + } else { + pa_stream_peek(This->stream, (const void**)&src, &src_len); + + copy = min(rem, src_len); + + memcpy(dst, src, rem); + + dst += copy; + rem -= copy; + + if (copy < src_len) { + if (src_len > This->peek_buffer_len) { + HeapFree(GetProcessHeap(), 0, This->peek_buffer); + This->peek_buffer = HeapAlloc(GetProcessHeap(), 0, src_len); + This->peek_buffer_len = src_len; + } + + memcpy(This->peek_buffer, src + copy, src_len - copy); + This->peek_len = src_len - copy; + This->peek_ofs = 0; + } + + pa_stream_drop(This->stream); + } } + bytes -= This->capture_period; } } @@ -1036,6 +1050,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) IUnknown_Release(This->marshal); IMMDevice_Release(This->parent); HeapFree(GetProcessHeap(), 0, This->tmp_buffer); + HeapFree(GetProcessHeap(), 0, This->peek_buffer); HeapFree(GetProcessHeap(), 0, This->local_buffer); HeapFree(GetProcessHeap(), 0, This); }

1 0

Nikolay Sivov : comctl32/treeview: Handle WM_SYSKEYDOWN.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 11beaf9978365ba58ac7c4d00680d95a5675ea39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11beaf9978365ba58ac7c4d00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 26 23:16:51 2016 +0300 comctl32/treeview: Handle WM_SYSKEYDOWN. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index a703ae7..6540fdb 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5752,6 +5752,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_HScroll(infoPtr, wParam); case WM_KEYDOWN: + case WM_SYSKEYDOWN: return TREEVIEW_KeyDown(infoPtr, wParam); case WM_KILLFOCUS: @@ -5816,8 +5817,6 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) COMCTL32_RefreshSysColors(); return 0; - /* WM_SYSKEYDOWN */ - case WM_TIMER: return TREEVIEW_HandleTimer(infoPtr, wParam);

1 0

Akihiro Sagawa : include: Add definition of GetProcessIdOfThread.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 719d86b70e593bedc300fd350fedea2587624e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719d86b70e593bedc300fd350… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 27 00:47:45 2016 +0900 include: Add definition of GetProcessIdOfThread. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index c5332c0..5d8b1ff 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2085,6 +2085,7 @@ WINBASEAPI BOOL WINAPI GetLogicalProcessorInformation(PSYSTEM_LOGICAL_PRO WINBASEAPI BOOL WINAPI GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP,PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX,PDWORD); WINBASEAPI DWORD WINAPI GetProcessHeaps(DWORD,PHANDLE); WINBASEAPI DWORD WINAPI GetProcessId(HANDLE); +WINBASEAPI DWORD WINAPI GetProcessIdOfThread(HANDLE); WINBASEAPI BOOL WINAPI GetProcessIoCounters(HANDLE,PIO_COUNTERS); WINBASEAPI BOOL WINAPI GetProcessPriorityBoost(HANDLE,PBOOL); WINBASEAPI BOOL WINAPI GetProcessShutdownParameters(LPDWORD,LPDWORD);

1 0

Alexandre Julliard : kernel32/tests: Fix loader test failures on some Windows versions.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 24b49c477587bf1b7621ed1550b9d49ba21a424f URL: http://source.winehq.org/git/wine.git/?a=commit;h=24b49c477587bf1b7621ed155… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 16:09:40 2016 +0900 kernel32/tests: Fix loader test failures on some Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e845e0d..8ff511f 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -230,15 +230,22 @@ static void query_image_section( int id, const char *dll_name, const IMAGE_NT_HE NTSTATUS status; HANDLE file, mapping; ULONG file_size; + /* truncated header is not handled correctly in windows <= w2k3 */ + BOOL truncated = nt_header->FileHeader.SizeOfOptionalHeader < sizeof(nt_header->OptionalHeader); - file = CreateFileA( dll_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + file = CreateFileA( dll_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, 0 ); ok( file != INVALID_HANDLE_VALUE, "%u: CreateFile error %d\n", id, GetLastError() ); file_size = GetFileSize( file, NULL ); status = pNtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_MAP_READ | SECTION_QUERY, NULL, NULL, PAGE_READONLY, SEC_IMAGE, file ); ok( !status, "%u: NtCreateSection failed err %x\n", id, status ); - if (status) return; + if (status) + { + CloseHandle( file ); + return; + } status = pNtQuerySection( mapping, SectionImageInformation, &image, sizeof(image), &info_size ); ok( !status, "%u: NtQuerySection failed err %x\n", id, status ); ok( info_size == sizeof(image), "%u: NtQuerySection wrong size %u\n", id, info_size ); @@ -247,13 +254,13 @@ static void query_image_section( int id, const char *dll_name, const IMAGE_NT_HE image.TransferAddress, (char *)nt_header->OptionalHeader.ImageBase, nt_header->OptionalHeader.AddressOfEntryPoint ); ok( image.ZeroBits == 0, "%u: ZeroBits wrong %08x\n", id, image.ZeroBits ); - ok( image.MaximumStackSize == nt_header->OptionalHeader.SizeOfStackReserve, + ok( image.MaximumStackSize == nt_header->OptionalHeader.SizeOfStackReserve || broken(truncated), "%u: MaximumStackSize wrong %lx / %lx\n", id, image.MaximumStackSize, (SIZE_T)nt_header->OptionalHeader.SizeOfStackReserve ); - ok( image.CommittedStackSize == nt_header->OptionalHeader.SizeOfStackCommit, + ok( image.CommittedStackSize == nt_header->OptionalHeader.SizeOfStackCommit || broken(truncated), "%u: CommittedStackSize wrong %lx / %lx\n", id, image.CommittedStackSize, (SIZE_T)nt_header->OptionalHeader.SizeOfStackCommit ); - ok( image.SubSystemType == nt_header->OptionalHeader.Subsystem, + ok( image.SubSystemType == nt_header->OptionalHeader.Subsystem || broken(truncated), "%u: SubSystemType wrong %08x / %08x\n", id, image.SubSystemType, nt_header->OptionalHeader.Subsystem ); ok( image.SubsystemVersionLow == nt_header->OptionalHeader.MinorSubsystemVersion, @@ -262,11 +269,10 @@ static void query_image_section( int id, const char *dll_name, const IMAGE_NT_HE ok( image.SubsystemVersionHigh == nt_header->OptionalHeader.MajorSubsystemVersion, "%u: SubsystemVersionHigh wrong %04x / %04x\n", id, image.SubsystemVersionHigh, nt_header->OptionalHeader.MajorSubsystemVersion ); - ok( image.GpValue == 0, "%u: GpValue wrong %08x\n", id, image.GpValue ); ok( image.ImageCharacteristics == nt_header->FileHeader.Characteristics, "%u: ImageCharacteristics wrong %04x / %04x\n", id, image.ImageCharacteristics, nt_header->FileHeader.Characteristics ); - ok( image.DllCharacteristics == nt_header->OptionalHeader.DllCharacteristics, + ok( image.DllCharacteristics == nt_header->OptionalHeader.DllCharacteristics || broken(truncated), "%u: DllCharacteristics wrong %04x / %04x\n", id, image.DllCharacteristics, nt_header->OptionalHeader.DllCharacteristics ); ok( image.Machine == nt_header->FileHeader.Machine, "%u: Machine wrong %04x / %04x\n", id, @@ -274,11 +280,12 @@ static void query_image_section( int id, const char *dll_name, const IMAGE_NT_HE ok( image.LoaderFlags == nt_header->OptionalHeader.LoaderFlags, "%u: LoaderFlags wrong %08x / %08x\n", id, image.LoaderFlags, nt_header->OptionalHeader.LoaderFlags ); - ok( image.ImageFileSize == file_size, "%u: ImageFileSize wrong %08x / %08x\n", id, - image.ImageFileSize, file_size ); + ok( image.ImageFileSize == file_size || broken(!image.ImageFileSize), /* winxpsp1 */ + "%u: ImageFileSize wrong %08x / %08x\n", id, image.ImageFileSize, file_size ); ok( image.CheckSum == nt_header->OptionalHeader.CheckSum, "%u: CheckSum wrong %08x / %08x\n", id, image.CheckSum, nt_header->OptionalHeader.CheckSum ); /* FIXME: needs more work: */ + /* image.GpValue */ /* image.ImageFlags */ /* image.ImageContainsCode */ CloseHandle( mapping );

1 0

Alexandre Julliard : server: Avoid rounding mapping sizes on the server side.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 32c7153fdbca10398242a5e1600548c59927e4e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c7153fdbca10398242a5e16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 16:49:37 2016 +0900 server: Avoid rounding mapping sizes on the server side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 41 ++++++++++++++++++++++++++++++++++++++++- dlls/kernel32/tests/virtual.c | 25 ++++++++++++++++++++++--- dlls/ntdll/virtual.c | 17 +++++++++++------ include/wine/server_protocol.h | 3 ++- server/mapping.c | 22 +++++++++++++--------- server/protocol.def | 1 + server/trace.c | 6 ++++++ 7 files changed, 95 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32c7153fdbca10398242a…

1 0

Alexandre Julliard : server: Don' t grow the mapped file for read-only mappings.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: ef716e9d1eb3c0a46582d1ef28f6ca13d5af56dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef716e9d1eb3c0a46582d1ef2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 22:20:31 2016 +0900 server: Don't grow the mapped file for read-only mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 2 -- server/mapping.c | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 26cf09f..583abf6 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1014,9 +1014,7 @@ static void test_MapViewOfFile(void) map_size.QuadPart = 0x3457; status = pNtCreateSection( &mapping, SECTION_QUERY | SECTION_MAP_READ, NULL, &map_size, PAGE_READONLY, SEC_COMMIT, file ); - todo_wine ok( status == STATUS_SECTION_TOO_BIG, "NtCreateSection failed %x\n", status ); - if (!status) CloseHandle( mapping ); status = pNtCreateSection( &mapping, SECTION_QUERY | SECTION_MAP_READ, NULL, &map_size, PAGE_READONLY, SEC_IMAGE, file ); ok( status == STATUS_INVALID_IMAGE_NOT_MZ, "NtCreateSection failed %x\n", status ); diff --git a/server/mapping.c b/server/mapping.c index 1015a23..b68f281 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -574,7 +574,15 @@ static struct object *create_mapping( struct object *root, const struct unicode_ goto error; } } - else if (st.st_size < mapping->size && !grow_file( unix_fd, mapping->size )) goto error; + else if (st.st_size < mapping->size) + { + if (!(access & FILE_WRITE_DATA)) + { + set_error( STATUS_SECTION_TOO_BIG ); + goto error; + } + if (!grow_file( unix_fd, mapping->size )) goto error; + } } else /* Anonymous mapping (no associated file) */ {

1 0

Alexandre Julliard : ntoskrnl.exe: Fix ZwQuerySection spec file entry.
by Alexandre Julliard 27 Jul '16

27 Jul '16

Module: wine Branch: master Commit: 82ca87bc2d4805ddb728a08d065c6370db745bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ca87bc2d4805ddb728a08d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 22:19:38 2016 +0900 ntoskrnl.exe: Fix ZwQuerySection spec file entry. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 406c626..778c3ae 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1351,7 +1351,7 @@ @ stdcall ZwQueryInstallUILanguage(ptr) ntdll.ZwQueryInstallUILanguage @ stdcall ZwQueryKey(long long ptr long ptr) ntdll.ZwQueryKey @ stdcall ZwQueryObject(long long long long long) ntdll.ZwQueryObject -@ stdcall ZwQuerySection(long long long long long) ntdll.ZwQuerySection +@ stdcall ZwQuerySection(long long ptr long ptr) ntdll.ZwQuerySection @ stdcall ZwQuerySecurityObject(long long long long long) ntdll.ZwQuerySecurityObject @ stdcall ZwQuerySymbolicLinkObject(long ptr ptr) ntdll.ZwQuerySymbolicLinkObject @ stdcall ZwQuerySystemInformation(long long long long) ntdll.ZwQuerySystemInformation

1 0