April 2019 - Wine-commits - list.winehq.org

Francois Gouget : d3d11/tests: Limit the flood of failures in test_depth_bias().
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: 4385a3ecb6b6cbfa137b77bd5bb57c5d3ee1abe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4385a3ecb6b6cbfa137b77bd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 25 09:53:36 2019 +0200 d3d11/tests: Limit the flood of failures in test_depth_bias(). Only report the first failed row for each bias clamp test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3d6cbf5..2850d59 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -25681,6 +25681,7 @@ static void test_depth_bias(void) for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k) { + BOOL all_match = TRUE; rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); @@ -25691,21 +25692,23 @@ static void test_depth_bias(void) m = quad_slopes[i] / texture_desc.Height; bias = clamp_depth_bias(rasterizer_desc.SlopeScaledDepthBias * m, rasterizer_desc.DepthBiasClamp); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) + for (y = 0; y < texture_desc.Height && all_match; ++y) { depth = min(max(0.0f, depth_values[y] + bias), 1.0f); switch (format) { case DXGI_FORMAT_D32_FLOAT: data = get_readback_float(&rb, 0, y); - ok(compare_float(data, depth, 64), + all_match = compare_float(data, depth, 64); + ok(all_match, "Got depth %.8e, expected %.8e.\n", data, depth); break; case DXGI_FORMAT_D24_UNORM_S8_UINT: u32 = get_readback_data(&rb, 0, y, 0, sizeof(*u32)); u32_value = *u32 >> shift; expected_value = depth * 16777215.0f + 0.5f; - ok(abs(u32_value - expected_value) <= 3, + all_match = abs(u32_value - expected_value) <= 3; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", u32_value, u32_value / 16777215.0f, expected_value, expected_value / 16777215.0f); @@ -25713,7 +25716,8 @@ static void test_depth_bias(void) case DXGI_FORMAT_D16_UNORM: u16 = get_readback_data(&rb, 0, y, 0, sizeof(*u16)); expected_value = depth * 65535.0f + 0.5f; - ok(abs(*u16 - expected_value) <= 1, + all_match = abs(*u16 - expected_value) <= 1; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); break;

1 0

Nikolay Sivov : kernel32/tests: Add a test for critical section DebugInfo initial value.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: bf174815ba8529bfbbda8697503d3c2539f82359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf174815ba8529bfbbda8697… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 25 12:31:55 2019 +0300 kernel32/tests: Add a test for critical section DebugInfo initial value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index f7be51e..8dea3b3 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2636,6 +2636,26 @@ static void test_apc_deadlock(void) CloseHandle(pi.hProcess); } +static void test_crit_section(void) +{ + CRITICAL_SECTION cs; + BOOL ret; + + /* Win8+ does not initialize debug info, one has to use RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO + to override that. */ + memset(&cs, 0, sizeof(cs)); + InitializeCriticalSection(&cs); + ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); + + memset(&cs, 0, sizeof(cs)); + ret = InitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); + ok(ret, "Failed to initialize critical section.\n"); +todo_wine + ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); +} + START_TEST(sync) { char **argv; @@ -2694,4 +2714,5 @@ START_TEST(sync) test_srwlock_example(); test_alertable_wait(); test_apc_deadlock(); + test_crit_section(); }

1 0

Akihiro Sagawa : comctl32/tests: Use calculated WM_SETFONT margins in the CJK case.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: 640c92b807ef7aa3d7d72d12dddc5b33be2f4f89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=640c92b807ef7aa3d7d72d12… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 25 20:24:47 2019 +0900 comctl32/tests: Use calculated WM_SETFONT margins in the CJK case. In comctl32, ANSI version control also uses GetCharABCWidthsW(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index fa273a4..c7ca000 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1613,6 +1613,23 @@ static INT get_cjk_fontinfo_margin(INT width, INT side_bearing) return margin; } +static DWORD get_cjk_font_margins(HDC hdc) +{ + ABC abc[256]; + SHORT left, right; + UINT i; + + if (!GetCharABCWidthsW(hdc, 0, 255, abc)) + return 0; + + left = right = 0; + for (i = 0; i < ARRAY_SIZE(abc); i++) { + if (-abc[i].abcA > right) right = -abc[i].abcA; + if (-abc[i].abcC > left) left = -abc[i].abcC; + } + return MAKELONG(left, right); +} + static void test_margins_default(const char* facename, UINT charset) { HWND hwnd; @@ -1623,7 +1640,7 @@ static void test_margins_default(const char* facename, UINT charset) LOGFONTA lf; HFONT hfont; RECT rect; - INT margins, expect; + INT margins, expect, font_expect; const UINT small_margins = MAKELONG(1, 5); const WCHAR EditW[] = {'E','d','i','t',0}, strW[] = {'W',0}; struct char_width_info { @@ -1669,9 +1686,14 @@ static void test_margins_default(const char* facename, UINT charset) left = get_cjk_fontinfo_margin(size.cx, info.lsb); right = get_cjk_fontinfo_margin(size.cx, info.rsb); expect = MAKELONG(left, right); + + font_expect = get_cjk_font_margins(hdc); + if (!font_expect) + /* In this case, margins aren't updated */ + font_expect = small_margins; } else - expect = MAKELONG(size.cx / 2, size.cx / 2); + font_expect = expect = MAKELONG(size.cx / 2, size.cx / 2); hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); @@ -1681,8 +1703,8 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); + todo_wine_if(cjk) + ok(margins == font_expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); @@ -1700,8 +1722,8 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); + todo_wine_if(cjk) + ok(margins == font_expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0);

1 0

Akihiro Sagawa : comctl32/edit: Implement WM_SETFONT margins in the CJK case.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: 7f5f590d271862ac5cf2036245e5987c840a478c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f5f590d271862ac5cf20362… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 25 20:24:49 2019 +0900 comctl32/edit: Implement WM_SETFONT margins in the CJK case. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 30 ++++++++++++++++++++++++++++-- dlls/comctl32/tests/edit.c | 2 -- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index fc3742d..54a5d2b 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3708,6 +3708,29 @@ static void EDIT_WM_SetFocus(HTHEME theme, EDITSTATE *es) } +static DWORD get_font_margins(HDC hdc, const TEXTMETRICW *tm) +{ + ABC abc[256]; + SHORT left, right; + UINT i; + + if (!(tm->tmPitchAndFamily & (TMPF_VECTOR | TMPF_TRUETYPE))) + return MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO); + + if (!is_cjk(hdc)) + return MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO); + + if (!GetCharABCWidthsW(hdc, 0, 255, abc)) + return 0; + + left = right = 0; + for (i = 0; i < ARRAY_SIZE(abc); i++) { + if (-abc[i].abcA > right) right = -abc[i].abcA; + if (-abc[i].abcC > left ) left = -abc[i].abcC; + } + return MAKELONG(left, right); +} + /********************************************************************* * * WM_SETFONT @@ -3723,6 +3746,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) HDC dc; HFONT old_font = 0; RECT clientRect; + DWORD margins; es->font = font; EDIT_InvalidateUniscribeData(es); @@ -3732,6 +3756,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) GetTextMetricsW(dc, &tm); es->line_height = tm.tmHeight; es->char_width = tm.tmAveCharWidth; + margins = get_font_margins(dc, &tm); if (font) SelectObject(dc, old_font); ReleaseDC(es->hwndSelf, dc); @@ -3739,8 +3764,9 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) /* Reset the format rect and the margins */ GetClientRect(es->hwndSelf, &clientRect); EDIT_SetRectNP(es, &clientRect); - EDIT_EM_SetMargins(es, EC_LEFTMARGIN | EC_RIGHTMARGIN, - EC_USEFONTINFO, EC_USEFONTINFO, FALSE); + if (margins) + EDIT_EM_SetMargins(es, EC_LEFTMARGIN | EC_RIGHTMARGIN, + LOWORD(margins), HIWORD(margins), FALSE); if (es->style & ES_MULTILINE) EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index c7ca000..f454434 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1703,7 +1703,6 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk) ok(margins == font_expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); @@ -1722,7 +1721,6 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk) ok(margins == font_expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO));

1 0

Akihiro Sagawa : user32: Make the second parameter of get_font_margins const.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: e78d7b08fe4bffe1b70c92bd0c076d4cec92cb72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e78d7b08fe4bffe1b70c92bd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 25 20:24:51 2019 +0900 user32: Make the second parameter of get_font_margins const. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 24af8ef..3c5331f 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3812,7 +3812,7 @@ static void EDIT_WM_SetFocus(EDITSTATE *es) EDIT_NOTIFY_PARENT(es, EN_SETFOCUS); } -static DWORD get_font_margins(HDC hdc, TEXTMETRICW *tm, BOOL unicode) +static DWORD get_font_margins(HDC hdc, const TEXTMETRICW *tm, BOOL unicode) { ABC abc[256]; SHORT left, right;

1 0

Jacek Caban : server: Set file user pointer in get_next_device_request handler.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: 31f6f0eec2a23f9e6efe656d4d4037ab42800d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31f6f0eec2a23f9e6efe656d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 25 14:54:47 2019 +0200 server: Set file user pointer in get_next_device_request handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/server/device.c b/server/device.c index c798694..0bb2757 100644 --- a/server/device.c +++ b/server/device.c @@ -503,7 +503,6 @@ static int device_file_close_handle( struct object *obj, struct process *process memset( &params, 0, sizeof(params) ); params.close.major = IRP_MJ_CLOSE; - params.close.file = file->user_ptr; if ((irp = create_irp( file, &params, NULL ))) { @@ -529,26 +528,27 @@ static void device_file_destroy( struct object *obj ) release_object( file->device ); } -static void set_file_user_ptr( struct device_file *file, client_ptr_t ptr ) +static void fill_irp_params( struct irp_call *irp, irp_params_t *params ) { - struct irp_call *irp; - - if (file->user_ptr == ptr) return; /* nothing to do */ - - file->user_ptr = ptr; + *params = irp->params; - /* update already queued irps */ - - LIST_FOR_EACH_ENTRY( irp, &file->requests, struct irp_call, dev_entry ) + switch (params->major) { - switch (irp->params.major) - { - case IRP_MJ_CLOSE: irp->params.close.file = ptr; break; - case IRP_MJ_READ: irp->params.read.file = ptr; break; - case IRP_MJ_WRITE: irp->params.write.file = ptr; break; - case IRP_MJ_FLUSH_BUFFERS: irp->params.flush.file = ptr; break; - case IRP_MJ_DEVICE_CONTROL: irp->params.ioctl.file = ptr; break; - } + case IRP_MJ_CLOSE: + params->close.file = irp->file->user_ptr; + break; + case IRP_MJ_READ: + params->read.file = irp->file->user_ptr; + break; + case IRP_MJ_WRITE: + params->write.file = irp->file->user_ptr; + break; + case IRP_MJ_FLUSH_BUFFERS: + params->flush.file = irp->file->user_ptr; + break; + case IRP_MJ_DEVICE_CONTROL: + params->ioctl.file = irp->file->user_ptr; + break; } } @@ -580,7 +580,6 @@ static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos params.read.major = IRP_MJ_READ; params.read.key = 0; params.read.pos = pos; - params.read.file = file->user_ptr; return queue_irp( file, &params, async ); } @@ -593,7 +592,6 @@ static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos params.write.major = IRP_MJ_WRITE; params.write.key = 0; params.write.pos = pos; - params.write.file = file->user_ptr; return queue_irp( file, &params, async ); } @@ -604,7 +602,6 @@ static int device_file_flush( struct fd *fd, struct async *async ) memset( &params, 0, sizeof(params) ); params.flush.major = IRP_MJ_FLUSH_BUFFERS; - params.flush.file = file->user_ptr; return queue_irp( file, &params, async ); } @@ -616,7 +613,6 @@ static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *as memset( &params, 0, sizeof(params) ); params.ioctl.major = IRP_MJ_DEVICE_CONTROL; params.ioctl.code = code; - params.ioctl.file = file->user_ptr; return queue_irp( file, &params, async ); } @@ -752,7 +748,6 @@ void free_kernel_objects( struct object *obj ) /* abuse IRP_MJ_CLEANUP to request client to free no longer valid kernel object */ memset( &params, 0, sizeof(params) ); params.cleanup.major = IRP_MJ_CLEANUP; - params.cleanup.obj = kernel_object->user_ptr; if ((irp = create_irp( NULL, &params, NULL ))) { @@ -869,13 +864,13 @@ DECL_HANDLER(get_next_device_request) reply->client_thread = get_kernel_object_ptr( manager, &irp->thread->obj ); reply->client_tid = get_thread_id( irp->thread ); } - reply->params = irp->params; iosb = irp->iosb; reply->in_size = iosb->in_size; reply->out_size = iosb->out_size; if (iosb->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); else if (!irp->file || (reply->next = alloc_handle( current->process, irp, 0, 0 ))) { + fill_irp_params( irp, &reply->params ); set_reply_data_ptr( iosb->in_data, iosb->in_size ); iosb->in_data = NULL; iosb->in_size = 0; @@ -897,7 +892,7 @@ DECL_HANDLER(set_irp_result) if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops ))) { - if (irp->file) set_file_user_ptr( irp->file, req->file_ptr ); + if (irp->file) irp->file->user_ptr = req->file_ptr; set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->size ); close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ release_object( irp );

1 0

Jacek Caban : server: Ensure that IRP_MJ_CLOSE is queued only once.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: a77a1a543373826f92964359a788a8a2f6fa2bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a77a1a543373826f92964359… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 25 14:54:58 2019 +0200 server: Ensure that IRP_MJ_CLOSE is queued only once. Client may alloc new handle inside IRP_MJ_CLOSE handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/device.c b/server/device.c index 0bb2757..7037a2c 100644 --- a/server/device.c +++ b/server/device.c @@ -171,6 +171,7 @@ struct device_file struct device *device; /* device for this file */ struct fd *fd; /* file descriptor for irp */ client_ptr_t user_ptr; /* opaque ptr for client side */ + int closed; /* closed file flag */ struct list entry; /* entry in device list */ struct list requests; /* list of pending irp requests */ }; @@ -430,6 +431,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, if (!(file = alloc_object( &device_file_ops ))) return NULL; file->device = (struct device *)grab_object( device ); + file->closed = 0; file->user_ptr = 0; list_init( &file->requests ); list_add_tail( &device->files, &file->entry ); @@ -496,11 +498,12 @@ static int device_file_close_handle( struct object *obj, struct process *process { struct device_file *file = (struct device_file *)obj; - if (file->device->manager && obj->handle_count == 1) /* last handle */ + if (!file->closed && file->device->manager && obj->handle_count == 1) /* last handle */ { struct irp_call *irp; irp_params_t params; + file->closed = 1; memset( &params, 0, sizeof(params) ); params.close.major = IRP_MJ_CLOSE;

1 0

Jacek Caban : server: Use generic kernel object list to store client device file pointer.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: 52ff9bd3acb2fa42b63d6a079d3c128d588639e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52ff9bd3acb2fa42b63d6a07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 25 14:55:10 2019 +0200 server: Use generic kernel object list to store client device file pointer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 +-- server/device.c | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c1e6a9c..b353839 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -518,8 +518,7 @@ static const WCHAR file_type_name[] = {'F','i','l','e',0}; static struct _OBJECT_TYPE file_type = { file_type_name, - create_file_object, - free_kernel_object + create_file_object }; POBJECT_TYPE IoFileObjectType = &file_type; diff --git a/server/device.c b/server/device.c index 7037a2c..1d864e0 100644 --- a/server/device.c +++ b/server/device.c @@ -170,7 +170,7 @@ struct device_file struct object obj; /* object header */ struct device *device; /* device for this file */ struct fd *fd; /* file descriptor for irp */ - client_ptr_t user_ptr; /* opaque ptr for client side */ + struct list kernel_object; /* list of kernel object pointers */ int closed; /* closed file flag */ struct list entry; /* entry in device list */ struct list requests; /* list of pending irp requests */ @@ -178,6 +178,7 @@ struct device_file static void device_file_dump( struct object *obj, int verbose ); static struct fd *device_file_get_fd( struct object *obj ); +static struct list *device_file_get_kernel_obj_list( struct object *obj ); static int device_file_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); @@ -204,7 +205,7 @@ static const struct object_ops device_file_ops = no_link_name, /* link_name */ NULL, /* unlink_name */ no_open_file, /* open_file */ - no_kernel_obj_list, /* get_kernel_obj_list */ + device_file_get_kernel_obj_list, /* get_kernel_obj_list */ device_file_close_handle, /* close_handle */ device_file_destroy /* destroy */ }; @@ -432,7 +433,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, file->device = (struct device *)grab_object( device ); file->closed = 0; - file->user_ptr = 0; + list_init( &file->kernel_object ); list_init( &file->requests ); list_add_tail( &device->files, &file->entry ); if (device->unix_path) @@ -494,6 +495,12 @@ static struct fd *device_file_get_fd( struct object *obj ) return (struct fd *)grab_object( file->fd ); } +static struct list *device_file_get_kernel_obj_list( struct object *obj ) +{ + struct device_file *file = (struct device_file *)obj; + return &file->kernel_object; +} + static int device_file_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { struct device_file *file = (struct device_file *)obj; @@ -531,26 +538,26 @@ static void device_file_destroy( struct object *obj ) release_object( file->device ); } -static void fill_irp_params( struct irp_call *irp, irp_params_t *params ) +static void fill_irp_params( struct device_manager *manager, struct irp_call *irp, irp_params_t *params ) { *params = irp->params; switch (params->major) { case IRP_MJ_CLOSE: - params->close.file = irp->file->user_ptr; + params->close.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; case IRP_MJ_READ: - params->read.file = irp->file->user_ptr; + params->read.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; case IRP_MJ_WRITE: - params->write.file = irp->file->user_ptr; + params->write.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; case IRP_MJ_FLUSH_BUFFERS: - params->flush.file = irp->file->user_ptr; + params->flush.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; case IRP_MJ_DEVICE_CONTROL: - params->ioctl.file = irp->file->user_ptr; + params->ioctl.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; } } @@ -873,7 +880,7 @@ DECL_HANDLER(get_next_device_request) if (iosb->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); else if (!irp->file || (reply->next = alloc_handle( current->process, irp, 0, 0 ))) { - fill_irp_params( irp, &reply->params ); + fill_irp_params( manager, irp, &reply->params ); set_reply_data_ptr( iosb->in_data, iosb->in_size ); iosb->in_data = NULL; iosb->in_size = 0; @@ -895,7 +902,8 @@ DECL_HANDLER(set_irp_result) if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops ))) { - if (irp->file) irp->file->user_ptr = req->file_ptr; + if (irp->file && irp->file->device->manager) + set_kernel_object( irp->file->device->manager, &irp->file->obj, req->file_ptr ); set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->size ); close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ release_object( irp );

1 0

Vijay Kiran Kamuju : include: Add missing ACE and ACL related defines in winnt.h.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: a20014a5e731419a82897306b937680d9106d1ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=a20014a5e731419a82897306… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Apr 25 15:09:02 2019 +0200 include: Add missing ACE and ACL related defines in winnt.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 4 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index bdcd90a..b5393f5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4289,6 +4289,7 @@ static const WCHAR SE_CREATE_GLOBAL_NAME[] = { 'S','e','C','r','e','a','t','e',' #define SE_PRIVILEGE_ENABLED 0x00000002 #define SE_PRIVILEGE_REMOVED 0x00000004 #define SE_PRIVILEGE_USED_FOR_ACCESS 0x80000000 +#define SE_PRIVILEGE_VALID_ATTRIBUTES 0x80000007 #define PRIVILEGE_SET_ALL_NECESSARY 1 @@ -4356,6 +4357,7 @@ typedef struct _SID_AND_ATTRIBUTES { /* S-1-2 */ #define SECURITY_LOCAL_SID_AUTHORITY {0,0,0,0,0,2} +#define SECURITY_LOCAL_LOGON_RID __MSABI_LONG(0X00000000) /* S-1-3 */ #define SECURITY_CREATOR_SID_AUTHORITY {0,0,0,0,0,3} @@ -4390,16 +4392,35 @@ typedef struct _SID_AND_ATTRIBUTES { #define SECURITY_LOCAL_SERVICE_RID __MSABI_LONG(0x00000013) #define SECURITY_NETWORK_SERVICE_RID __MSABI_LONG(0x00000014) #define SECURITY_NT_NON_UNIQUE __MSABI_LONG(0x00000015) +#define SECURITY_ENTERPRISE_READONLY_CONTROLLERS_RID __MSABI_LONG(0x00000016) #define SECURITY_BUILTIN_DOMAIN_RID __MSABI_LONG(0x00000020) +#define SECURITY_WRITE_RESTRICTED_CODE_RID __MSABI_LONG(0x00000021) #define SECURITY_PACKAGE_BASE_RID __MSABI_LONG(0x00000040) #define SECURITY_PACKAGE_NTLM_RID __MSABI_LONG(0x0000000A) #define SECURITY_PACKAGE_SCHANNEL_RID __MSABI_LONG(0x0000000E) #define SECURITY_PACKAGE_DIGEST_RID __MSABI_LONG(0x00000015) +#define SECURITY_CRED_TYPE_BASE_RID __MSABI_LONG(0x00000041) +#define SECURITY_CRED_TYPE_THIS_ORG_CERT_RID __MSABI_LONG(0x00000001) +#define SECURITY_MIN_BASE_RID __MSABI_LONG(0x00000050) +#define SECURITY_SERVICE_ID_BASE_RID __MSABI_LONG(0x00000050) +#define SECURITY_RESERVED_ID_BASE_RID __MSABI_LONG(0x00000051) +#define SECURITY_APPPOOL_ID_BASE_RID __MSABI_LONG(0x00000052) +#define SECURITY_VIRTUALSERVER_ID_BASE_RID __MSABI_LONG(0x00000053) +#define SECURITY_USERMODEDRIVERHOST_ID_BASE_RID __MSABI_LONG(0x00000054) +#define SECURITY_CLOUD_INFRASTRUCTURE_SERVICES_ID_BASE_RID __MSABI_LONG(0x00000055) +#define SECURITY_WMIHOST_ID_BASE_RID __MSABI_LONG(0x00000056) +#define SECURITY_TASK_ID_BASE_RID __MSABI_LONG(0x00000057) +#define SECURITY_NFS_ID_BASE_RID __MSABI_LONG(0x00000058) +#define SECURITY_COM_ID_BASE_RID __MSABI_LONG(0x00000059) +#define SECURITY_MAX_BASE_RID __MSABI_LONG(0x0000006F) +#define SECURITY_WINDOWSMOBILE_ID_BASE_RID __MSABI_LONG(0x00000070) #define SECURITY_MAX_ALWAYS_FILTERED __MSABI_LONG(0x000003E7) #define SECURITY_MIN_NEVER_FILTERED __MSABI_LONG(0x000003E8) #define SECURITY_OTHER_ORGANIZATION_RID __MSABI_LONG(0x000003E8) +#define DOMAIN_GROUP_RID_ENTERPRISE_READONLY_DOMAIN_CONTROLLERS __MSABI_LONG(0x000001F2) + #define FOREST_USER_RID_MAX __MSABI_LONG(0x000001F3) #define DOMAIN_USER_RID_ADMIN __MSABI_LONG(0x000001F4) #define DOMAIN_USER_RID_GUEST __MSABI_LONG(0x000001F5) @@ -4415,6 +4436,9 @@ typedef struct _SID_AND_ATTRIBUTES { #define DOMAIN_GROUP_RID_SCHEMA_ADMINS __MSABI_LONG(0x00000206) #define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS __MSABI_LONG(0x00000207) #define DOMAIN_GROUP_RID_POLICY_ADMINS __MSABI_LONG(0x00000208) +#define DOMAIN_GROUP_RID_READONLY_CONTROLLERS __MSABI_LONG(0x00000209) + +#define SECURITY_RESOURCE_MANAGER_AUTHORITY {0,0,0,0,0,9} #define SECURITY_APP_PACKAGE_AUTHORITY {0,0,0,0,0,15} #define SECURITY_APP_PACKAGE_BASE_RID __MSABI_LONG(0x000000002) @@ -4432,9 +4456,13 @@ typedef struct _SID_AND_ATTRIBUTES { #define SECURITY_MANDATORY_UNTRUSTED_RID __MSABI_LONG(0x00000000) #define SECURITY_MANDATORY_LOW_RID __MSABI_LONG(0x00001000) #define SECURITY_MANDATORY_MEDIUM_RID __MSABI_LONG(0x00002000) +#define SECURITY_MANDATORY_MEDIUM_PLUS_RID __MSABI_LONG(0x00002100) #define SECURITY_MANDATORY_HIGH_RID __MSABI_LONG(0x00003000) #define SECURITY_MANDATORY_SYSTEM_RID __MSABI_LONG(0x00004000) #define SECURITY_MANDATORY_PROTECTED_PROCESS_RID __MSABI_LONG(0x00005000) +#define SECURITY_MANDATORY_MAXIMUM_USER_RID SECURITY_MANDATORY_SYSTEM_RID + +#define MANDATORY_LEVEL_TO_MANDATORY_RID(ML) (ML * 0x1000) #define DOMAIN_ALIAS_RID_ADMINS __MSABI_LONG(0x00000220) #define DOMAIN_ALIAS_RID_USERS __MSABI_LONG(0x00000221) @@ -4458,11 +4486,32 @@ typedef struct _SID_AND_ATTRIBUTES { #define DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS __MSABI_LONG(0x00000230) #define DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS __MSABI_LONG(0x00000231) #define DOMAIN_ALIAS_RID_DCOM_USERS __MSABI_LONG(0x00000232) +#define DOMAIN_ALIAS_RID_IUSERS __MSABI_LONG(0x00000238) +#define DOMAIN_ALIAS_RID_CRYPTO_OPERATORS __MSABI_LONG(0x00000239) +#define DOMAIN_ALIAS_RID_CACHEABLE_PRINCIPALS_GROUP __MSABI_LONG(0x0000023B) +#define DOMAIN_ALIAS_RID_NON_CACHEABLE_PRINCIPALS_GROUP __MSABI_LONG(0x0000023C) +#define DOMAIN_ALIAS_RID_EVENT_LOG_READERS_GROUP __MSABI_LONG(0x0000023D) +#define DOMAIN_ALIAS_RID_CERTSVC_DCOM_ACCESS_GROUP __MSABI_LONG(0x0000023E) #define SECURITY_SERVER_LOGON_RID SECURITY_ENTERPRISE_CONTROLLERS_RID #define SECURITY_PACKAGE_RID_COUNT __MSABI_LONG(2) +#define SECURITY_CRED_TYPE_RID_COUNT __MSABI_LONG(2) #define SECURITY_LOGON_IDS_RID_COUNT __MSABI_LONG(3) +#define SECURITY_NT_NON_UNIQUE_SUB_AUTH_COUNT __MSABI_LONG(3) +#define SECURITY_SERVICE_ID_RID_COUNT __MSABI_LONG(6) +#define SECURITY_APPPOOL_ID_RID_COUNT __MSABI_LONG(6) +#define SECURITY_VIRTUALSERVER_ID_RID_COUNT __MSABI_LONG(6) +#define SECURITY_USERMODEDRIVERHOST_ID_RID_COUNT __MSABI_LONG(6) +#define SECURITY_CLOUD_INFRASTRUCTURE_SERVICES_ID_RID_COUNT __MSABI_LONG(6) +#define SECURITY_WMIHOST_ID_RID_COUNT __MSABI_LONG(6) +#define SECURITY_VIRTUALACCOUNT_ID_RID_COUNT __MSABI_LONG(6) + +#define SYSTEM_LUID { 0x3e7, 0x0 } +#define ANONYMOUS_LOGON_LUID { 0x3e6, 0x0 } +#define LOCALSERVICE_LUID { 0x3e5, 0x0 } +#define NETWORKSERVICE_LUID { 0x3e4, 0x0 } +#define IUSER_LUID { 0x3e3, 0x0 } typedef enum { WinNullSid = 0, @@ -4815,11 +4864,30 @@ typedef struct _ACE_HEADER { } ACE_HEADER,*PACE_HEADER; /* AceType */ -#define ACCESS_ALLOWED_ACE_TYPE 0 -#define ACCESS_DENIED_ACE_TYPE 1 -#define SYSTEM_AUDIT_ACE_TYPE 2 -#define SYSTEM_ALARM_ACE_TYPE 3 +#define ACCESS_MIN_MS_ACE_TYPE 0x0 +#define ACCESS_ALLOWED_ACE_TYPE 0x0 +#define ACCESS_DENIED_ACE_TYPE 0x1 +#define SYSTEM_AUDIT_ACE_TYPE 0x2 +#define SYSTEM_ALARM_ACE_TYPE 0x3 +#define ACCESS_MAX_MS_V2_ACE_TYPE 0x3 +#define ACCESS_ALLOWED_COMPOUND_ACE_TYPE 0x4 +#define ACCESS_MAX_MS_V3_ACE_TYPE 0x4 +#define ACCESS_MIN_MS_OBJECT_ACE_TYPE 0x5 +#define ACCESS_ALLOWED_OBJECT_ACE_TYPE 0x5 +#define ACCESS_DENIED_OBJECT_ACE_TYPE 0x6 +#define ACCESS_AUDIT_OBJECT_ACE_TYPE 0x7 +#define ACCESS_ALARM_OBJECT_ACE_TYPE 0x8 +#define ACCESS_MAX_MS_V4_ACE_TYPE 0x8 +#define ACCESS_ALLOWED_CALLBACK_ACE_TYPE 0x9 +#define ACCESS_DENIED_CALLBACK_ACE_TYPE 0xa +#define ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE 0xb +#define ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE 0xc +#define SYSTEM_AUDIT_CALLBACK_ACE_TYPE 0xd +#define SYSTEM_ALARM_CALLBACK_ACE_TYPE 0xe +#define SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE 0xf +#define SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE 0x10 #define SYSTEM_MANDATORY_LABEL_ACE_TYPE 0x11 +#define ACCESS_MAX_MS_V5_ACE_TYPE 0x11 /* inherit AceFlags */ #define OBJECT_INHERIT_ACE 0x01

1 0

Dmitry Timoshkov : kernel32: Add MapUserPhysicalPages stub.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: f80059544b9a0cd793b7a93f669ddf1f7ee74796 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f80059544b9a0cd793b7a93f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 25 12:46:14 2019 +0800 kernel32: Add MapUserPhysicalPages stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-2.spec | 2 +- dlls/kernel32/heap.c | 8 ++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec index 9d96da9..85fd48b 100644 --- a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec +++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec @@ -11,7 +11,7 @@ @ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) kernel32.GetProcessWorkingSetSizeEx @ stdcall GetSystemFileCacheSize(ptr ptr ptr) kernel32.GetSystemFileCacheSize @ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch -@ stub MapUserPhysicalPages +@ stdcall MapUserPhysicalPages(ptr long ptr) kernel32.MapUserPhysicalPages @ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile @ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx @ stub MapViewOfFileFromApp diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index e68420a..31931af 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1491,3 +1491,11 @@ BOOL WINAPI FreeUserPhysicalPages(HANDLE process, ULONG_PTR *pages, ULONG_PTR *u SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI MapUserPhysicalPages(PVOID addr, ULONG_PTR page_count, PULONG_PTR pages) +{ + FIXME("(%p, %lu, %p): stub\n", addr, page_count, pages); + *pages = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 75e7cc5..295a4db 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1076,7 +1076,7 @@ @ stdcall -i386 -private MapLS(ptr) krnl386.exe16.MapLS @ stdcall -i386 -private MapSL(long) krnl386.exe16.MapSL @ stdcall -i386 -private MapSLFix(long) krnl386.exe16.MapSLFix -# @ stub MapUserPhysicalPages +@ stdcall MapUserPhysicalPages(ptr long ptr) # @ stub MapUserPhysicalPagesScatter @ stdcall MapViewOfFile(long long long long long) @ stdcall MapViewOfFileEx(long long long long long ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index ac6fc12..22ea65f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -948,7 +948,7 @@ @ stdcall MakeSelfRelativeSD(ptr ptr ptr) advapi32.MakeSelfRelativeSD @ stdcall MapGenericMask(ptr ptr) advapi32.MapGenericMask # @ stub MapPredefinedHandleInternal -# @ stub MapUserPhysicalPages +@ stdcall MapUserPhysicalPages(ptr long ptr) kernel32.MapUserPhysicalPages @ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile @ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx @ stub MapViewOfFileExNuma diff --git a/include/winbase.h b/include/winbase.h index c2e216c..6c97afe 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2435,6 +2435,7 @@ WINADVAPI BOOL WINAPI MakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_ WINADVAPI VOID WINAPI MapGenericMask(PDWORD,PGENERIC_MAPPING); WINBASEAPI HMODULE WINAPI MapHModuleSL(WORD); WINBASEAPI WORD WINAPI MapHModuleLS(HMODULE); +WINBASEAPI BOOL WINAPI MapUserPhysicalPages(PVOID,ULONG_PTR,PULONG_PTR); WINBASEAPI LPVOID WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,SIZE_T); WINBASEAPI LPVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,SIZE_T,LPVOID); WINBASEAPI BOOL WINAPI MoveFileA(LPCSTR,LPCSTR);

1 0