wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

Józef Kucia : wined3d: Clean up buffer_internal_preload().
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: e3a8cd20ced9f33db64a35f60bc8487ae8173e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a8cd20ced9f33db64a35f60… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Oct 16 21:46:45 2016 +0200 wined3d: Clean up buffer_internal_preload(). The conversion should never be performed for buffers with buffer_type_hint other than GL_ARRAY_BUFFER. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8943144..49bed64 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -422,7 +422,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_s return ret; } -static inline void fixup_d3dcolor(DWORD *dst_color) +static inline unsigned int fixup_d3dcolor(DWORD *dst_color) { DWORD src_color = *dst_color; @@ -439,9 +439,11 @@ static inline void fixup_d3dcolor(DWORD *dst_color) *dst_color |= (src_color & 0xff00ff00u); /* Alpha Green */ *dst_color |= (src_color & 0x00ff0000u) >> 16; /* Red */ *dst_color |= (src_color & 0x000000ffu) << 16; /* Blue */ + + return sizeof(*dst_color); } -static inline void fixup_transformed_pos(float *p) +static inline unsigned int fixup_transformed_pos(float *p) { /* rhw conversion like in position_float4(). */ if (p[3] != 1.0f && p[3] != 0.0f) @@ -452,6 +454,8 @@ static inline void fixup_transformed_pos(float *p) p[2] *= w; p[3] = w; } + + return 4 * sizeof(*p); } /* Context activation is done by the caller. */ @@ -741,10 +745,8 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte { DWORD flags = buffer->flags & (WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_device *device = buffer->resource.device; - UINT start, end, len, vertices; + unsigned int i, j, start, end, len, vertex_count; BOOL decl_changed = FALSE; - unsigned int i, j; BYTE *data; TRACE("buffer %p.\n", buffer); @@ -851,9 +853,6 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte } } - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - device_invalidate_state(device, STATE_INDEXBUFFER); - if (!buffer->conversion_map) { /* That means that there is nothing to fixup. Just upload from @@ -871,17 +870,23 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte return; } - if(!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) - { + /* This would potentially invalidate the element array buffer binding. */ + if (buffer->buffer_type_hint != GL_ARRAY_BUFFER) + ERR("Converting data in non-vertex buffer.\n"); + + if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) buffer_get_sysmem(buffer, context); - } /* Now for each vertex in the buffer that needs conversion */ - vertices = buffer->resource.size / buffer->stride; + vertex_count = buffer->resource.size / buffer->stride; - data = HeapAlloc(GetProcessHeap(), 0, buffer->resource.size); + if (!(data = HeapAlloc(GetProcessHeap(), 0, buffer->resource.size))) + { + ERR("Out of memory.\n"); + return; + } - while(buffer->modified_areas) + while (buffer->modified_areas) { buffer->modified_areas--; start = buffer->maps[buffer->modified_areas].offset; @@ -889,27 +894,25 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte end = start + len; memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); - for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertices); ++i) + for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertex_count); ++i) { - for (j = 0; j < buffer->stride; ++j) + for (j = 0; j < buffer->stride;) { switch (buffer->conversion_map[j]) { case CONV_NONE: /* Done already */ - j += 3; + j += sizeof(DWORD); break; case CONV_D3DCOLOR: - fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); - j += 3; + j += fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); break; - case CONV_POSITIONT: - fixup_transformed_pos((float *) (data + i * buffer->stride + j)); - j += 15; + j += fixup_transformed_pos((float *) (data + i * buffer->stride + j)); break; default: - FIXME("Unimplemented conversion %d in shifted conversion\n", buffer->conversion_map[j]); + FIXME("Unimplemented conversion %d in shifted conversion.\n", buffer->conversion_map[j]); + ++j; } } }

1 0

Józef Kucia : wined3d: Let buffer_direct_upload() invalidate STATE_INDEXBUFFER if needed.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: b1cc82a29f50dd7cc6703c33ee11df0f0db84b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1cc82a29f50dd7cc6703c33e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Oct 16 21:46:44 2016 +0200 wined3d: Let buffer_direct_upload() invalidate STATE_INDEXBUFFER if needed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b50132a..8943144 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -668,15 +668,13 @@ drop_query: } /* The caller provides a GL context */ -static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info, DWORD flags) +static void buffer_direct_upload(struct wined3d_buffer *This, struct wined3d_context *context, DWORD flags) { + const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int start, len; BYTE *map; - UINT start, len; - /* This potentially invalidates the element array buffer binding, but the - * caller always takes care of this. */ - GL_EXTCALL(glBindBuffer(This->buffer_type_hint, This->buffer_object)); - checkGLcall("glBindBuffer"); + buffer_bind(This, context); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { GLbitfield mapflags; @@ -686,7 +684,7 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined else if (!(flags & WINED3D_BUFFER_SYNC)) mapflags |= GL_MAP_UNSYNCHRONIZED_BIT; map = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, - This->resource.size, mapflags)); + This->resource.size, mapflags)); checkGLcall("glMapBufferRange"); } else @@ -867,12 +865,9 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte /* Nothing to do because we locked directly into the vbo */ if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) - { return; - } - - buffer_direct_upload(buffer, gl_info, flags); + buffer_direct_upload(buffer, context, flags); return; }

1 0

Jacek Caban : ws2_32: Added FreeAddrInfoExW stub.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 7e7f46f43667eecf794795c7ed9fe7c7b5580663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7f46f43667eecf794795c7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 18 14:28:59 2016 +0200 ws2_32: Added FreeAddrInfoExW stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 8 ++++++++ dlls/ws2_32/ws2_32.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e8c5130..3d9a99b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6810,6 +6810,14 @@ void WINAPI FreeAddrInfoW(PADDRINFOW ai) } } +/*********************************************************************** + * FreeAddrInfoExW (WS2_32.@) + */ +void WINAPI FreeAddrInfoExW(ADDRINFOEXW *ai) +{ + FIXME("%p\n", ai); +} + int WINAPI WS_getnameinfo(const SOCKADDR *sa, WS_socklen_t salen, PCHAR host, DWORD hostlen, PCHAR serv, DWORD servlen, INT flags) { diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 0482b7d..df5e9d3 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -50,6 +50,7 @@ 500 stub WEP +@ stdcall FreeAddrInfoExW(ptr) @ stdcall FreeAddrInfoW(ptr) @ stdcall GetAddrInfoExW(wstr wstr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr)

1 0

Sebastian Lackner : hidclass.sys: Use MmGetSystemAddressForMdlSafe to access MDL data.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 6d8eb8ba0cbdaf58839d83812d4151883d419371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8eb8ba0cbdaf58839d83812… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 16 08:59:23 2016 +0200 hidclass.sys: Use MmGetSystemAddressForMdlSafe to access MDL data. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index d2a4710..189cd2e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -419,7 +419,7 @@ static NTSTATUS handle_minidriver_string(DEVICE_OBJECT *device, IRP *irp, SHORT if (status == STATUS_SUCCESS) { - WCHAR *out_buffer = (WCHAR*)(((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset); + WCHAR *out_buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); int length = irpsp->Parameters.DeviceIoControl.OutputBufferLength/sizeof(WCHAR); TRACE("got string %s from minidriver\n",debugstr_w(buffer)); lstrcpynW(out_buffer, buffer, length); @@ -440,7 +440,7 @@ static NTSTATUS HID_get_feature(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = 0; - out_buffer = (((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset); + out_buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", device, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer); len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; @@ -569,7 +569,7 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_GET_INPUT_REPORT: { HID_XFER_PACKET packet; - BYTE* buffer = ((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset; + BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); if (extension->preparseData->InputReports[0].reportID) packet.reportId = buffer[0];

1 0

Roman Pisl : process: Make PROCESS_QUERY_LIMITED_INFORMATION sufficient for QueryFullProcessImageName ().
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: ddfc5275af0081cba6e834bf9d9e35dcaa17d256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfc5275af0081cba6e834bf9… Author: Roman Pisl <rpisl(a)seznam.cz> Date: Fri Oct 14 21:02:48 2016 +0200 process: Make PROCESS_QUERY_LIMITED_INFORMATION sufficient for QueryFullProcessImageName(). Signed-off-by: Roman Pisl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 6 +----- server/process.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8a135ef..5131126 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1953,7 +1953,7 @@ static void test_QueryFullProcessImageNameW(void) expect_eq_d(lstrlenW(buf), size); expect_eq_ws_i(buf, module_name); - hSelf = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, GetCurrentProcessId()); + hSelf = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentProcessId()); /* Real handle */ size = sizeof(buf) / sizeof(buf[0]); expect_eq_d(TRUE, pQueryFullProcessImageNameW(hSelf, 0, buf, &size)); @@ -3061,11 +3061,7 @@ static void test_process_info(void) case ProcessWow64Information: case ProcessDefaultHardErrorMode: case ProcessHandleCount: - ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); - break; - case ProcessImageFileName: -todo_wine ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); break; diff --git a/server/process.c b/server/process.c index 2f2d1ad..528ec74 100644 --- a/server/process.c +++ b/server/process.c @@ -1469,7 +1469,7 @@ DECL_HANDLER(get_dll_info) { struct process *process; - if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_INFORMATION ))) + if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_LIMITED_INFORMATION ))) { struct process_dll *dll;

1 0

Andrew Eikum : quartz: Clarify debug strings.
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: 4fefafe5cd545d0ed78c90bb6b0335ff6edda81a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fefafe5cd545d0ed78c90bb6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 14 14:27:59 2016 -0500 quartz: Clarify debug strings. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 5488afb..88af2f6 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -690,14 +690,14 @@ static HRESULT WINAPI FilterGraph2_ConnectDirect(IFilterGraph2 *iface, IPin *ppi if (FAILED(hr)) return hr; - TRACE("Filter owning first pin => %p\n", PinInfo.pFilter); + TRACE("Filter owning ppinIn(%p) => %p\n", ppinIn, PinInfo.pFilter); IBaseFilter_Release(PinInfo.pFilter); hr = IPin_QueryPinInfo(ppinOut, &PinInfo); if (FAILED(hr)) return hr; - TRACE("Filter owning second pin => %p\n", PinInfo.pFilter); + TRACE("Filter owning ppinOut(%p) => %p\n", ppinOut, PinInfo.pFilter); IBaseFilter_Release(PinInfo.pFilter); } @@ -919,14 +919,14 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, if (FAILED(hr)) return hr; - TRACE("Filter owning first pin => %p\n", PinInfo.pFilter); + TRACE("Filter owning ppinIn(%p) => %p\n", ppinIn, PinInfo.pFilter); IBaseFilter_Release(PinInfo.pFilter); hr = IPin_QueryPinInfo(ppinOut, &PinInfo); if (FAILED(hr)) return hr; - TRACE("Filter owning second pin => %p\n", PinInfo.pFilter); + TRACE("Filter owning ppinOut(%p) => %p\n", ppinOut, PinInfo.pFilter); IBaseFilter_Release(PinInfo.pFilter); } @@ -947,6 +947,8 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, { IPin *temp; + TRACE("Directions seem backwards, swapping pins\n"); + temp = ppinIn; ppinIn = ppinOut; ppinOut = temp;

1 0

Carlo Bramini : comdlg32: Uses SetDlgItemInt() to simplify the code.
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: a1b0d925874942881b8ad15b967530beba65aa33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b0d925874942881b8ad15b9… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sat Oct 15 13:39:31 2016 +0200 comdlg32: Uses SetDlgItemInt() to simplify the code. Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/colordlg.c | 21 ++++++--------------- dlls/comdlg32/fontdlg.c | 4 +--- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 6bf54c3..5e67499 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -673,15 +673,11 @@ static void CC_EditSetRGB( CCPRIV *infoPtr ) int r = GetRValue(cr); int g = GetGValue(cr); int b = GetBValue(cr); - char buffer[10]; infoPtr->updating = TRUE; - sprintf(buffer, "%d", r); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_R), buffer); - sprintf(buffer, "%d", g); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_G), buffer); - sprintf( buffer, "%d", b ); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_B), buffer); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_R, r, TRUE); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_G, g, TRUE); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_B, b, TRUE); infoPtr->updating = FALSE; } } @@ -693,15 +689,10 @@ static void CC_EditSetHSL( CCPRIV *infoPtr ) { if (IsWindowVisible( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_GRAPH) )) /* if full size */ { - char buffer[10]; - infoPtr->updating = TRUE; - sprintf(buffer, "%d", infoPtr->h); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_H), buffer); - sprintf(buffer, "%d", infoPtr->s); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_S), buffer); - sprintf(buffer, "%d", infoPtr->l); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_L), buffer); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_H, infoPtr->h, TRUE); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_S, infoPtr->s, TRUE); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_L, infoPtr->l, TRUE); infoPtr->updating = FALSE; } CC_PaintLumBar(infoPtr); diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index ed2615d..c08b246 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -534,7 +534,6 @@ static INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW * static void CFn_FitFontSize( HWND hDlg, int points) { - WCHAR buffW[16]; int i,n; /* look for fitting font size in combobox3 */ @@ -553,8 +552,7 @@ static void CFn_FitFontSize( HWND hDlg, int points) } /* no default matching size, set text manually */ - sprintfW(buffW, fontsizefmtW, points); - SetDlgItemTextW(hDlg, cmb3, buffW); + SetDlgItemInt(hDlg, cmb3, points, TRUE); } static BOOL CFn_FitFontStyle( HWND hDlg, LONG packedstyle )

1 0

Sebastian Lackner : ntoskrnl.exe: Explicitly set MappedSystemVa for MDLs.
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: b466e893116af5007a1302aef56030f150884b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b466e893116af5007a1302aef… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 16 08:57:21 2016 +0200 ntoskrnl.exe: Explicitly set MappedSystemVa for MDLs. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 26 ++++++++++++++++++++++++-- include/ddk/wdm.h | 9 +++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index eac81f7..854d68d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -820,6 +820,7 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, { PIRP irp; PIO_STACK_LOCATION irpsp; + MDL *mdl; TRACE( "%x, %p, %p, %u, %p, %u, %u, %p, %p\n", code, device, in_buff, in_len, out_buff, out_len, internal, event, iosb ); @@ -847,7 +848,16 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, case METHOD_IN_DIRECT: case METHOD_OUT_DIRECT: irp->AssociatedIrp.SystemBuffer = in_buff; - IoAllocateMdl( out_buff, out_len, FALSE, FALSE, irp ); + + mdl = IoAllocateMdl( out_buff, out_len, FALSE, FALSE, irp ); + if (!mdl) + { + IoFreeIrp( irp ); + return NULL; + } + + mdl->MdlFlags |= MDL_MAPPED_TO_SYSTEM_VA; + mdl->MappedSystemVa = out_buff; break; case METHOD_NEITHER: irpsp->Parameters.DeviceIoControl.Type3InputBuffer = in_buff; @@ -882,7 +892,19 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, irpsp->CompletionRoutine = NULL; irp->AssociatedIrp.SystemBuffer = buffer; - if (device->Flags & DO_DIRECT_IO) IoAllocateMdl( buffer, length, FALSE, FALSE, irp ); + + if (device->Flags & DO_DIRECT_IO) + { + MDL *mdl = IoAllocateMdl( buffer, length, FALSE, FALSE, irp ); + if (!mdl) + { + IoFreeIrp( irp ); + return NULL; + } + + mdl->MdlFlags |= MDL_MAPPED_TO_SYSTEM_VA; + mdl->MappedSystemVa = buffer; + } switch (majorfunc) { diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 3829e8b..95de8d0 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1306,8 +1306,17 @@ PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); +PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDL,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,ULONG); MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); +static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) +{ + if (mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | MDL_SOURCE_IS_NONPAGED_POOL)) + return mdl->MappedSystemVa; + else + return MmMapLockedPagesSpecifyCache(mdl, KernelMode, MmCached, NULL, FALSE, priority); +} + void WINAPI ObDereferenceObject(void*); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**);

1 0

Sebastian Lackner : ntoskrnl.exe: Use MmInitializeMdl in IoAllocateMdl.
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: 9912ef778fd0435fab9fc0d0c85ebe92dec51345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9912ef778fd0435fab9fc0d0c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 16 08:53:29 2016 +0200 ntoskrnl.exe: Use MmInitializeMdl in IoAllocateMdl. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 ++++--------------- include/ddk/wdm.h | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 912d084..eac81f7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -744,31 +744,20 @@ PVOID WINAPI IoAllocateErrorLogEntry( PVOID IoObject, UCHAR EntrySize ) */ PMDL WINAPI IoAllocateMdl( PVOID va, ULONG length, BOOLEAN secondary, BOOLEAN charge_quota, IRP *irp ) { + SIZE_T mdl_size; PMDL mdl; - ULONG_PTR address = (ULONG_PTR)va; - ULONG_PTR page_address; - SIZE_T nb_pages, mdl_size; TRACE("(%p, %u, %i, %i, %p)\n", va, length, secondary, charge_quota, irp); if (charge_quota) FIXME("Charge quota is not yet supported\n"); - /* FIXME: We suppose that page size is 4096 */ - page_address = address & ~(4096 - 1); - nb_pages = (((address + length - 1) & ~(4096 - 1)) - page_address) / 4096 + 1; - - mdl_size = sizeof(MDL) + nb_pages * sizeof(PVOID); - - mdl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mdl_size); + mdl_size = sizeof(MDL) + sizeof(PFN_NUMBER) * ADDRESS_AND_SIZE_TO_SPAN_PAGES(va, length); + mdl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mdl_size ); if (!mdl) return NULL; - mdl->Size = mdl_size; - mdl->Process = NULL; /* FIXME: IoGetCurrentProcess */ - mdl->StartVa = (PVOID)page_address; - mdl->ByteCount = length; - mdl->ByteOffset = address - page_address; + MmInitializeMdl( mdl, va, length ); if (!irp) return mdl; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 3e93469..3829e8b 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -28,6 +28,16 @@ #define POINTER_ALIGNMENT #endif +/* FIXME: We suppose that page size is 4096 */ +#undef PAGE_SIZE +#define PAGE_SIZE 0x1000 +#define PAGE_SHIFT 12 + +#define BYTE_OFFSET(va) ((ULONG)((ULONG_PTR)(va) & (PAGE_SIZE - 1))) +#define PAGE_ALIGN(va) ((PVOID)((ULONG_PTR)(va) & ~(PAGE_SIZE - 1))) +#define ADDRESS_AND_SIZE_TO_SPAN_PAGES(va, length) \ + ((BYTE_OFFSET(va) + ((SIZE_T)(length)) + (PAGE_SIZE - 1)) >> PAGE_SHIFT) + typedef LONG KPRIORITY; typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK; @@ -1035,6 +1045,17 @@ typedef struct _MDL { } MDL, *PMDL; typedef MDL *PMDLX; +typedef ULONG PFN_NUMBER, *PPFN_NUMBER; + +static inline void MmInitializeMdl(MDL *mdl, void *va, SIZE_T length) +{ + mdl->Next = NULL; + mdl->Size = sizeof(MDL) + sizeof(PFN_NUMBER) * ADDRESS_AND_SIZE_TO_SPAN_PAGES(va, length); + mdl->MdlFlags = 0; + mdl->StartVa = (void *)PAGE_ALIGN(va); + mdl->ByteOffset = BYTE_OFFSET(va); + mdl->ByteCount = length; +} typedef struct _KTIMER { DISPATCHER_HEADER Header;

1 0

Sebastian Lackner : ntoskrnl.exe: Add support for METHOD_IN_DIRECT/ METHOD_OUT_DIRECT ioctls.
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: eb7ac554d1b857cc64ed9bc12e430bb26efa592b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7ac554d1b857cc64ed9bc12… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 16 08:51:06 2016 +0200 ntoskrnl.exe: Add support for METHOD_IN_DIRECT/METHOD_OUT_DIRECT ioctls. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 ++ dlls/ntoskrnl.exe/ntoskrnl.c | 21 +++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 7fbde50..cefc1dd 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1561,6 +1561,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, req->async.event = wine_server_obj_handle( event ); req->async.cvalue = cvalue; wine_server_add_data( req, in_buffer, in_size ); + if ((code & 3) != METHOD_BUFFERED) + wine_server_add_data( req, out_buffer, out_size ); wine_server_set_reply( req, out_buffer, out_size ); status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3c18ee6..912d084 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -428,17 +428,27 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG TRACE( "ioctl %x device %p file %p in_size %u out_size %u\n", params->ioctl.code, device, file, in_size, out_size ); - if ((params->ioctl.code & 3) == METHOD_BUFFERED) out_size = max( in_size, out_size ); - if (out_size) { - if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY; - if ((params->ioctl.code & 3) == METHOD_BUFFERED) + if ((params->ioctl.code & 3) != METHOD_BUFFERED) + { + if (in_size < out_size) return STATUS_INVALID_DEVICE_REQUEST; + in_size -= out_size; + if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY; + memcpy( out_buff, (char *)in_buff + in_size, out_size ); + } + else if (out_size > in_size) { + if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY; memcpy( out_buff, in_buff, in_size ); to_free = in_buff; in_buff = out_buff; } + else + { + out_buff = in_buff; + out_size = in_size; + } } irp = IoBuildDeviceIoControlRequest( params->ioctl.code, device, in_buff, in_size, out_buff, out_size, @@ -449,6 +459,9 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG return STATUS_NO_MEMORY; } + if (out_size && (params->ioctl.code & 3) != METHOD_BUFFERED) + HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, in_buff, in_size ); + irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; irp->AssociatedIrp.SystemBuffer = in_buff;

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2016