wine-commits November 2017

wine-commits@winehq.org

2 participants
436 discussions

Ziqing Hui : mlang/tests: Add IMultiLanguage2_GetCodePageInfo tests.
by Alexandre Julliard 09 Nov '17

09 Nov '17

Module: wine Branch: master Commit: 4d84d0bc2f2e3c9f2e07c62a499aa2c7de40a507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d84d0bc2f2e3c9f2e07c62a4… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 9 21:17:23 2017 +0800 mlang/tests: Add IMultiLanguage2_GetCodePageInfo tests. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 208 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d84d0bc2f2e3c9f2e07c…

1 0

Zebediah Figura : quartz/tests: Remove thread-counting tests.
by Alexandre Julliard 09 Nov '17

09 Nov '17

Module: wine Branch: master Commit: 9a52a3e19545abfaab58c59deeac20b98d563c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a52a3e19545abfaab58c59de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 8 23:26:06 2017 -0600 quartz/tests: Remove thread-counting tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplitter.c | 77 ++--------------------------------------- 1 file changed, 2 insertions(+), 75 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 78ca8b8..29782a9 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -25,38 +25,8 @@ #include "dshow.h" #include "tlhelp32.h" -static HANDLE (WINAPI *pCreateToolhelp32Snapshot)(DWORD, DWORD); -static BOOL (WINAPI *pThread32First)(HANDLE, LPTHREADENTRY32); -static BOOL (WINAPI *pThread32Next)(HANDLE, LPTHREADENTRY32); - static IUnknown *pAviSplitter = NULL; -static int count_threads(void) -{ - THREADENTRY32 te; - int threads; - HANDLE h; - - h = pCreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); - te.dwSize = sizeof(te); - - if (h == INVALID_HANDLE_VALUE) - return -1; - - pThread32First(h, &te); - if (te.th32OwnerProcessID == GetCurrentProcessId()) - threads = 1; - else - threads = 0; - - while (pThread32Next(h, &te)) - if (te.th32OwnerProcessID == GetCurrentProcessId()) - ++threads; - - CloseHandle(h); - return threads; -} - static BOOL create_avisplitter(void) { HRESULT hr; @@ -303,37 +273,19 @@ static void test_filesourcefilter(void) static const WCHAR wfile[] = {'t','e','s','t','.','a','v','i',0}; static const char afile[] = "test.avi"; -/* This test doesn't use the quartz filtergraph because it makes it impossible - * to be certain that a thread is really one owned by the avi splitter. - * A lot of the decoder filters will also have their own thread, and Windows' - * filtergraph has a separate thread for start/stop/seeking requests. - * By avoiding the filtergraph altogether and connecting streams directly to - * the null renderer I am sure that this is not the case here. - */ -static void test_threads(void) +static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; IBaseFilter *preader = NULL, *pavi = NULL; IEnumPins *enumpins = NULL; IPin *filepin = NULL, *avipin = NULL; HRESULT hr; - int baselevel, curlevel, expected; HANDLE file = NULL; PIN_DIRECTION dir = PINDIR_OUTPUT; char buffer[13]; DWORD readbytes; FILTER_STATE state; - /* We need another way of counting threads on NT4. Skip these tests (for now) */ - if (!pCreateToolhelp32Snapshot || !pThread32First || !pThread32Next) - { - win_skip("Needed thread functions are not available (NT4)\n"); - return; - } - - /* Before doing anything (the thread count at the start differs per OS) */ - baselevel = count_threads(); - file = CreateFileW(wfile, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); if (file == INVALID_HANDLE_VALUE) @@ -409,20 +361,11 @@ static void test_threads(void) if (hr != S_OK) goto fail; - curlevel = count_threads(); - ok(curlevel == baselevel, - "The thread count should be %d not %d\n", baselevel, curlevel); - hr = IPin_Connect(filepin, avipin, NULL); ok(hr == S_OK, "Could not connect: %08x\n", hr); if (hr != S_OK) goto fail; - expected = 1 + baselevel; - curlevel = count_threads(); - ok(curlevel == expected, - "The thread count should be %d not %d\n", expected, curlevel); - IPin_Release(avipin); avipin = NULL; @@ -462,7 +405,6 @@ static void test_threads(void) break; } IBaseFilter_Run(pnull, 0); - ++expected; } IPin_Release(avipin); @@ -494,10 +436,6 @@ static void test_threads(void) IBaseFilter_Run(pavi, 0); IBaseFilter_GetState(pavi, INFINITE, &state); - curlevel = count_threads(); - ok(curlevel == expected, - "The thread count should be %d not %d\n", expected, curlevel); - IBaseFilter_Pause(pavi); IBaseFilter_Pause(preader); IBaseFilter_Stop(pavi); @@ -568,21 +506,10 @@ fail: IBaseFilter_Release(pavi); if (pfile) IFileSourceFilter_Release(pfile); - - curlevel = count_threads(); - todo_wine - ok(curlevel == baselevel, - "The thread count should be %d not %d\n", baselevel, curlevel); } START_TEST(avisplitter) { - HMODULE kernel32 = GetModuleHandleA("kernel32.dll"); - - pCreateToolhelp32Snapshot = (void*)GetProcAddress(kernel32, "CreateToolhelp32Snapshot"); - pThread32First = (void*)GetProcAddress(kernel32, "Thread32First"); - pThread32Next = (void*)GetProcAddress(kernel32, "Thread32Next"); - CoInitialize(NULL); if (!create_avisplitter()) @@ -594,7 +521,7 @@ START_TEST(avisplitter) test_query_interface(); test_basefilter(); test_filesourcefilter(); - test_threads(); + test_filter_graph(); release_avisplitter();

1 0

Alistair Leslie-Hughes : quartz: Output This in TRACE statements.
by Alexandre Julliard 09 Nov '17

09 Nov '17

Module: wine Branch: master Commit: e317164f8fea0910626cb2010613caa9c9c08e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e317164f8fea0910626cb2010… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 9 00:12:20 2017 +0000 quartz: Output This in TRACE statements. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 4154512..4290ac3 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -391,6 +391,8 @@ static IPin* WINAPI AsyncReader_GetPin(BaseFilter *iface, int pos) { AsyncReader *This = impl_from_BaseFilter(iface); + TRACE("%p->(%d)\n", This, pos); + if (pos >= 1 || !This->pOutputPin) return NULL; @@ -402,6 +404,8 @@ static LONG WINAPI AsyncReader_GetPinCount(BaseFilter *iface) { AsyncReader *This = impl_from_BaseFilter(iface); + TRACE("%p->()\n", This); + if (!This->pOutputPin) return 0; else @@ -447,7 +451,7 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii { AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); + TRACE("%p->(%s, %p)\n", This, qzdebugstr_guid(riid), ppv); *ppv = NULL; @@ -482,7 +486,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) AsyncReader *This = impl_from_IBaseFilter(iface); ULONG refCount = InterlockedDecrement(&This->filter.refCount); - TRACE("(%p)->() Release from %d\n", This, refCount + 1); + TRACE("%p->() Release from %d\n", This, refCount + 1); if (!refCount) { @@ -514,7 +518,7 @@ static HRESULT WINAPI AsyncReader_Stop(IBaseFilter * iface) { AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("()\n"); + TRACE("%p->()\n", This); This->filter.state = State_Stopped; @@ -525,7 +529,7 @@ static HRESULT WINAPI AsyncReader_Pause(IBaseFilter * iface) { AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("()\n"); + TRACE("%p->()\n", This); This->filter.state = State_Paused; @@ -536,7 +540,7 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart { AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); + TRACE("%p->(%s)\n", This, wine_dbgstr_longlong(tStart)); This->filter.state = State_Running; @@ -548,7 +552,7 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart static HRESULT WINAPI AsyncReader_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) { AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("(%s, %p)\n", debugstr_w(Id), ppPin); + TRACE("%p->(%s, %p)\n", This, debugstr_w(Id), ppPin); if (!Id || !ppPin) return E_POINTER; @@ -611,7 +615,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi IAsyncReader * pReader = NULL; AsyncReader *This = impl_from_IFileSourceFilter(iface); - TRACE("(%s, %p)\n", debugstr_w(pszFileName), pmt); + TRACE("%p->(%s, %p)\n", This, debugstr_w(pszFileName), pmt); if (!pszFileName) return E_POINTER; @@ -692,7 +696,7 @@ static HRESULT WINAPI FileSource_GetCurFile(IFileSourceFilter * iface, LPOLESTR { AsyncReader *This = impl_from_IFileSourceFilter(iface); - TRACE("(%p, %p)\n", ppszFileName, pmt); + TRACE("%p->(%p, %p)\n", This, ppszFileName, pmt); if (!ppszFileName) return E_POINTER; @@ -888,7 +892,7 @@ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(BasePin * iface, IPin BaseOutputPin *This = impl_BaseOutputPin_from_BasePin(iface); HRESULT hr; - TRACE("(%p, %p)\n", pReceivePin, pmt); + TRACE("%p->(%p, %p)\n", This, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); /* FIXME: call queryacceptproc */ @@ -996,7 +1000,7 @@ static HRESULT WINAPI FileAsyncReader_RequestAllocator(IAsyncReader * iface, IMe HRESULT hr = S_OK; - TRACE("(%p, %p, %p)\n", pPreferred, pProps, ppActual); + TRACE("%p->(%p, %p, %p)\n", This, pPreferred, pProps, ppActual); if (!pProps->cbAlign || (pProps->cbAlign % DEF_ALIGNMENT) != 0) pProps->cbAlign = DEF_ALIGNMENT; @@ -1092,7 +1096,7 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader * iface, IMediaSample FileAsyncReader *This = impl_from_IAsyncReader(iface); LPBYTE pBuffer = NULL; - TRACE("(%p, %lx)\n", pSample, dwUser); + TRACE("%p->(%p, %lx)\n", This, pSample, dwUser); if (!pSample) return E_POINTER; @@ -1170,7 +1174,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw FileAsyncReader *This = impl_from_IAsyncReader(iface); DWORD buffer = ~0; - TRACE("(%u, %p, %p)\n", dwTimeout, ppSample, pdwUser); + TRACE("%p->(%u, %p, %p)\n", This, dwTimeout, ppSample, pdwUser); *ppSample = NULL; *pdwUser = 0; @@ -1335,7 +1339,7 @@ static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader * iface, LONGLONG ll HRESULT hr = S_OK; FileAsyncReader *This = impl_from_IAsyncReader(iface); - TRACE("(%s, %d, %p)\n", wine_dbgstr_longlong(llPosition), lLength, pBuffer); + TRACE("%p->(%s, %d, %p)\n", This, wine_dbgstr_longlong(llPosition), lLength, pBuffer); ZeroMemory(&ovl, sizeof(ovl)); @@ -1370,7 +1374,7 @@ static HRESULT WINAPI FileAsyncReader_Length(IAsyncReader * iface, LONGLONG * pT DWORD dwSizeHigh; FileAsyncReader *This = impl_from_IAsyncReader(iface); - TRACE("(%p, %p)\n", pTotal, pAvailable); + TRACE("%p->(%p, %p)\n", This, pTotal, pAvailable); if (((dwSizeLow = GetFileSize(This->hFile, &dwSizeHigh)) == -1) && (GetLastError() != NO_ERROR)) @@ -1387,7 +1391,7 @@ static HRESULT WINAPI FileAsyncReader_BeginFlush(IAsyncReader * iface) { FileAsyncReader *This = impl_from_IAsyncReader(iface); - TRACE("()\n"); + TRACE("%p->()\n", This); EnterCriticalSection(&This->csList); This->bFlushing = TRUE; @@ -1403,7 +1407,7 @@ static HRESULT WINAPI FileAsyncReader_EndFlush(IAsyncReader * iface) FileAsyncReader *This = impl_from_IAsyncReader(iface); int x; - TRACE("()\n"); + TRACE("%p->()\n", This); EnterCriticalSection(&This->csList); ResetEvent(This->handle_list[This->samples]);

1 0

Alistair Leslie-Hughes : quartz: Output This in TRACE statements.
by Alexandre Julliard 09 Nov '17

09 Nov '17

Module: wine Branch: master Commit: c23bcce55215cfc5bfe98be34661ff8e86c58bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23bcce55215cfc5bfe98be34… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 9 01:08:41 2017 +0000 quartz: Output This in TRACE statements. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/parser.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index bc6b34d..a2ff407 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -68,7 +68,7 @@ static IPin* WINAPI Parser_GetPin(BaseFilter *iface, int pos) { ParserImpl *This = impl_from_BaseFilter(iface); - TRACE("Asking for pos %x\n", pos); + TRACE("%p->(%x)\n", This, pos); /* Input pin also has a pin, hence the > and not >= */ if (pos > This->cStreams || pos < 0) @@ -82,6 +82,8 @@ static LONG WINAPI Parser_GetPinCount(BaseFilter *iface) { ParserImpl *This = impl_from_BaseFilter(iface); + TRACE("%p->()\n", This); + return This->cStreams; } @@ -222,7 +224,7 @@ HRESULT WINAPI Parser_GetClassID(IBaseFilter * iface, CLSID * pClsid) { ParserImpl *This = impl_from_IBaseFilter(iface); - TRACE("(%p)\n", pClsid); + TRACE("%p->(%p)\n", This, pClsid); *pClsid = This->filter.clsid; @@ -237,7 +239,7 @@ HRESULT WINAPI Parser_Stop(IBaseFilter * iface) PullPin *pin = impl_PullPin_from_IPin(This->ppPins[0]); ULONG i; - TRACE("()\n"); + TRACE("%p->()\n", This); EnterCriticalSection(&pin->thread_lock); @@ -275,7 +277,7 @@ HRESULT WINAPI Parser_Pause(IBaseFilter * iface) ParserImpl *This = impl_from_IBaseFilter(iface); PullPin *pin = impl_PullPin_from_IPin(This->ppPins[0]); - TRACE("()\n"); + TRACE("%p->()\n", This); EnterCriticalSection(&pin->thread_lock); EnterCriticalSection(&This->filter.csFilter); @@ -311,7 +313,7 @@ HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart) ULONG i; - TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); + TRACE("%p->(%s)\n", This, wine_dbgstr_longlong(tStart)); EnterCriticalSection(&pin->thread_lock); EnterCriticalSection(&This->filter.csFilter); @@ -357,7 +359,7 @@ HRESULT WINAPI Parser_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FI PullPin *pin = impl_PullPin_from_IPin(This->ppPins[0]); HRESULT hr = S_OK; - TRACE("(%d, %p)\n", dwMilliSecsTimeout, pState); + TRACE("%p->(%d, %p)\n", This, dwMilliSecsTimeout, pState); EnterCriticalSection(&pin->thread_lock); EnterCriticalSection(&This->filter.csFilter); @@ -378,7 +380,7 @@ HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock ParserImpl *This = impl_from_IBaseFilter(iface); PullPin *pin = impl_PullPin_from_IPin(This->ppPins[0]); - TRACE("(%p)\n", pClock); + TRACE("%p->(%p)\n", This, pClock); EnterCriticalSection(&pin->thread_lock); BaseFilterImpl_SetSyncSource(iface,pClock); @@ -401,7 +403,8 @@ HRESULT WINAPI Parser_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) HRESULT WINAPI Parser_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) { - FIXME("(%p)->(%s,%p)\n", iface, debugstr_w(Id), ppPin); + ParserImpl *This = impl_from_IBaseFilter(iface); + FIXME("(%p)->(%s,%p)\n", This, debugstr_w(Id), ppPin); /* FIXME: critical section */

1 0

Vincent Povirk : tdh: Stub TdhLoadManifest.
by Alexandre Julliard 09 Nov '17

09 Nov '17

Module: wine Branch: master Commit: a46411499e9151d03756d079e9f0e886825ce3bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46411499e9151d03756d079e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 8 16:11:02 2017 -0600 tdh: Stub TdhLoadManifest. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tdh/tdh.spec | 2 +- dlls/tdh/tdh_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/tdh/tdh.spec b/dlls/tdh/tdh.spec index 8702802..0e7c5a5 100644 --- a/dlls/tdh/tdh.spec +++ b/dlls/tdh/tdh.spec @@ -21,7 +21,7 @@ @ stub TdhGetPropertySize @ stub TdhGetWppMessage @ stub TdhGetWppProperty -@ stub TdhLoadManifest +@ stdcall TdhLoadManifest(wstr) @ stub TdhLoadManifestFromBinary @ stub TdhOpenDecodingHandle @ stub TdhQueryProviderFieldInformation diff --git a/dlls/tdh/tdh_main.c b/dlls/tdh/tdh_main.c index 5e10487..c1885f8 100644 --- a/dlls/tdh/tdh_main.c +++ b/dlls/tdh/tdh_main.c @@ -20,8 +20,11 @@ #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(tdh); @@ -41,3 +44,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) return TRUE; } + +ULONG WINAPI TdhLoadManifest(LPWSTR manifest) +{ + FIXME("(%s): stub\n", debugstr_w(manifest)); + return STATUS_SUCCESS; +}

1 0

Aric Stewart : hidclass.sys: Handle opportunistic reads.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Module: wine Branch: master Commit: 97c925957cfaee0be915b1126cbd71fd3546bc4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c925957cfaee0be915b1126… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 7 10:08:10 2017 -0600 hidclass.sys: Handle opportunistic reads. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 40d458a..a5cbee9 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -316,7 +316,7 @@ static DWORD CALLBACK hid_device_thread(void *args) IoCompleteRequest(irp, IO_NO_INCREMENT ); - rc = WaitForSingleObject(ext->halt_event, ext->poll_interval); + rc = WaitForSingleObject(ext->halt_event, ext->poll_interval ? ext->poll_interval : DEFAULT_POLL_INTERVAL); if (rc == WAIT_OBJECT_0) break; @@ -546,9 +546,7 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) break; } poll_interval = *(ULONG *)irp->AssociatedIrp.SystemBuffer; - if (poll_interval == 0) - FIXME("Handle opportunistic reads\n"); - else if (poll_interval <= MAX_POLL_INTERVAL_MSEC) + if (poll_interval <= MAX_POLL_INTERVAL_MSEC) { extension->poll_interval = poll_interval; irp->IoStatus.u.Status = STATUS_SUCCESS; @@ -668,6 +666,7 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; UINT buffer_size = RingBuffer_GetBufferSize(ext->ring_buffer); NTSTATUS rc = STATUS_SUCCESS; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); int ptr = -1; packet = HeapAlloc(GetProcessHeap(), 0, buffer_size); @@ -691,9 +690,30 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) } else { - TRACE_(hid_report)("Queue irp\n"); - InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); - rc = STATUS_PENDING; + BASE_DEVICE_EXTENSION *extension = device->DeviceExtension; + if (extension->poll_interval) + { + TRACE_(hid_report)("Queue irp\n"); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); + rc = STATUS_PENDING; + } + else + { + HID_XFER_PACKET packet; + TRACE("No packet, but opportunistic reads enabled\n"); + packet.reportId = ((BYTE*)irp->AssociatedIrp.SystemBuffer)[0]; + packet.reportBuffer = &((BYTE*)irp->AssociatedIrp.SystemBuffer)[1]; + packet.reportBufferLen = irpsp->Parameters.Read.Length - 1; + rc = call_minidriver(IOCTL_HID_GET_INPUT_REPORT, device, NULL, 0, &packet, sizeof(packet)); + + if (rc == STATUS_SUCCESS) + { + ((BYTE*)irp->AssociatedIrp.SystemBuffer)[0] = packet.reportId; + irp->IoStatus.Information = packet.reportBufferLen + 1; + irp->IoStatus.u.Status = rc; + } + IoCompleteRequest(irp, IO_NO_INCREMENT); + } } HeapFree(GetProcessHeap(), 0, packet);

1 0

Alexandre Julliard : user32/tests: Avoid strlen in traces.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Module: wine Branch: master Commit: 92d2ebe662e3ed726bbe655e22d8bfc5115dfab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92d2ebe662e3ed726bbe655e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 22:12:45 2017 +0100 user32/tests: Avoid strlen in traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index d842dce..0926a58 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2877,7 +2877,7 @@ static void test_paste(void) SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); r = SendMessageA(hEdit, WM_PASTE, 0, 0); len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); - ok(strlen(str) == len, "expected %d, got %d\n", strlen(str), len); + ok(strlen(str) == len, "got %d\n", len); /* Prepare clipboard data with multiline text */ hmem = GlobalAlloc(GMEM_MOVEABLE, 255); @@ -2900,13 +2900,13 @@ static void test_paste(void) SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); r = SendMessageA(hEdit, WM_PASTE, 0, 0); len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); - ok(strlen("first line") == len, "expected %d, got %d\n", strlen("first line"), len); + ok(strlen("first line") == len, "got %d\n", len); /* Paste multiline text in multiline edit */ SendMessageA(hMultilineEdit, WM_SETTEXT, 0, (LPARAM)""); r = SendMessageA(hMultilineEdit, WM_PASTE, 0, 0); len = SendMessageA(hMultilineEdit, WM_GETTEXTLENGTH, 0, 0); - ok(strlen(str2) == len, "expected %d, got %d\n", strlen(str2), len); + ok(strlen(str2) == len, "got %d\n", len); /* Cleanup */ DestroyWindow(hEdit);

1 0

Marcus Meissner : oleaut32/tests: Fixed 64-bit crash on tmarshal test.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Module: wine Branch: master Commit: 4f45fa0581df0c9fe2ca791e6a027aad3787f877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f45fa0581df0c9fe2ca791e6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Nov 3 12:15:12 2017 +0100 oleaut32/tests: Fixed 64-bit crash on tmarshal test. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index d2b8dc9..67b8e22 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -2010,7 +2010,8 @@ static void test_external_connection(void) todo_wine ok(external_connections == 2, "external_connections = %d\n", external_connections); - ITestSecondDisp_Release(second); + if (hres == S_OK) + ITestSecondDisp_Release(second); todo_wine ok(external_connections == 2, "external_connections = %d\n", external_connections);

1 0

Alex Henrie : d3dx9/tests: Correct Fresnel reference term.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Module: wine Branch: master Commit: 4aef54759c9fabf3cbf247d62a4dc5524461a0b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aef54759c9fabf3cbf247d62… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 3 19:10:31 2017 +0100 d3dx9/tests: Correct Fresnel reference term. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index ff3b098..d8e1338 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -302,7 +302,7 @@ static void D3DXFresnelTest(void) BOOL equal; fresnel = D3DXFresnelTerm(0.5f, 1.5f); - equal = compare_float(fresnel, 8.91867056e-02f, 1); + equal = compare_float(fresnel, 8.91867128e-02f, 1); ok(equal, "Got unexpected Fresnel term %.8e.\n", fresnel); }

1 0

Hans Leidekker : advapi32: Fix QueryServiceConfig2 on Wow64.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Module: wine Branch: master Commit: 251c9ccff7077921a5ddd5b6616e104869d16501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=251c9ccff7077921a5ddd5b66… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 7 14:10:41 2017 +0100 advapi32: Fix QueryServiceConfig2 on Wow64. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 83 +++++++++++++++++++++++++++++++++++++++---------- include/wine/svcctl.idl | 6 ++++ programs/services/rpc.c | 37 ++++++++++++---------- 3 files changed, 94 insertions(+), 32 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 78491ae..3f2fb93 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1543,6 +1543,8 @@ BOOL WINAPI QueryServiceConfig2A(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe BOOL ret; LPBYTE bufferW = NULL; + TRACE("%p %u %p %u %p\n", hService, dwLevel, buffer, size, needed); + if(buffer && size) bufferW = heap_alloc(size); @@ -1591,24 +1593,42 @@ cleanup: BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffer, DWORD size, LPDWORD needed) { + BYTE *bufptr; DWORD err; - if(dwLevel!=SERVICE_CONFIG_DESCRIPTION && dwLevel!=SERVICE_CONFIG_PRESHUTDOWN_INFO) { + TRACE("%p %u %p %u %p\n", hService, dwLevel, buffer, size, needed); + + if (!buffer && size) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + + switch (dwLevel) + { + case SERVICE_CONFIG_DESCRIPTION: + if (!(bufptr = heap_alloc( size ))) return ERROR_OUTOFMEMORY; + break; + + case SERVICE_CONFIG_PRESHUTDOWN_INFO: + bufptr = buffer; + break; + + default: FIXME("Level %d not implemented\n", dwLevel); SetLastError(ERROR_INVALID_LEVEL); return FALSE; } - if(!buffer && size) { + if (!needed) + { SetLastError(ERROR_INVALID_ADDRESS); return FALSE; } - TRACE("%p 0x%d %p 0x%d %p\n", hService, dwLevel, buffer, size, needed); - __TRY { - err = svcctl_QueryServiceConfig2W(hService, dwLevel, buffer, size, needed); + err = svcctl_QueryServiceConfig2W(hService, dwLevel, bufptr, size, needed); } __EXCEPT(rpc_filter) { @@ -1616,22 +1636,53 @@ BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe } __ENDTRY - if (err != ERROR_SUCCESS) - { - SetLastError( err ); - return FALSE; - } - switch (dwLevel) { case SERVICE_CONFIG_DESCRIPTION: - if (buffer) + { + SERVICE_DESCRIPTIONW *desc = (SERVICE_DESCRIPTIONW *)buffer; + struct service_description *s = (struct service_description *)bufptr; + + if (err != ERROR_SUCCESS && err != ERROR_INSUFFICIENT_BUFFER) { - SERVICE_DESCRIPTIONW *descr = (SERVICE_DESCRIPTIONW *)buffer; - if (descr->lpDescription) /* make it an absolute pointer */ - descr->lpDescription = (WCHAR *)(buffer + (ULONG_PTR)descr->lpDescription); - break; + heap_free( bufptr ); + SetLastError( err ); + return FALSE; + } + + /* adjust for potentially larger SERVICE_DESCRIPTIONW structure */ + if (*needed == sizeof(*s)) *needed = sizeof(*desc); + else + *needed = *needed - FIELD_OFFSET(struct service_description, description) + sizeof(*desc); + + if (size < *needed) + { + heap_free( bufptr ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; } + if (desc) + { + if (!s->size) desc->lpDescription = NULL; + else + { + desc->lpDescription = (WCHAR *)(desc + 1); + memcpy( desc->lpDescription, s->description, s->size ); + } + } + heap_free( bufptr ); + break; + } + case SERVICE_CONFIG_PRESHUTDOWN_INFO: + if (err != ERROR_SUCCESS) + { + SetLastError( err ); + return FALSE; + } + break; + + default: + break; } return TRUE; diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index 7c5df7d..c14cd6b 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -225,6 +225,12 @@ struct enum_service_status_process SERVICE_STATUS_PROCESS service_status_process; }; +struct service_description +{ + USHORT size; + WCHAR description[1]; +}; + typedef struct _SERVICE_RPC_REQUIRED_PRIVILEGES_INFO { DWORD cbRequiredPrivileges; [size_is(cbRequiredPrivileges)] BYTE *pRequiredPrivileges; diff --git a/programs/services/rpc.c b/programs/services/rpc.c index a1d3c9e..20c5a27 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -879,27 +879,32 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, switch (level) { case SERVICE_CONFIG_DESCRIPTION: - { - SERVICE_DESCRIPTIONW *descr = (SERVICE_DESCRIPTIONW *)buffer; + { + struct service_description *desc = (struct service_description *)buffer; + DWORD total_size = sizeof(*desc); + + service_lock(service->service_entry); + if (service->service_entry->description) + total_size += strlenW(service->service_entry->description) * sizeof(WCHAR); - service_lock(service->service_entry); - *needed = sizeof(*descr); + *needed = total_size; + if (size >= total_size) + { if (service->service_entry->description) - *needed += (strlenW(service->service_entry->description) + 1) * sizeof(WCHAR); - if (size >= *needed) { - if (service->service_entry->description) - { - /* store a buffer offset instead of a pointer */ - descr->lpDescription = (WCHAR *)((BYTE *)(descr + 1) - buffer); - strcpyW( (WCHAR *)(descr + 1), service->service_entry->description ); - } - else descr->lpDescription = NULL; + strcpyW( desc->description, service->service_entry->description ); + desc->size = total_size - FIELD_OFFSET(struct service_description, description); + } + else + { + desc->description[0] = 0; + desc->size = 0; } - else err = ERROR_INSUFFICIENT_BUFFER; - service_unlock(service->service_entry); } - break; + else err = ERROR_INSUFFICIENT_BUFFER; + service_unlock(service->service_entry); + } + break; case SERVICE_CONFIG_PRESHUTDOWN_INFO: service_lock(service->service_entry);

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
44
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 November 2017