February 2017 - Wine-commits

Aric Stewart : hid/tests: Test device reads.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 150f1797163963d5beca989a6f352ce2547fb697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=150f1797163963d5beca989a6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 31 11:03:58 2017 -0600 hid/tests: Test device reads. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 221 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 221 insertions(+) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index 068360a..adc6e10 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -16,14 +16,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windows.h" #include "setupapi.h" +#include "hidusage.h" #include "ddk/hidsdi.h" #include "wine/test.h" +#define READ_MAX_TIME 5000 + typedef void (device_test)(HANDLE device); static void test_device_info(HANDLE device) @@ -85,7 +89,224 @@ static void run_for_each_device(device_test *test) SetupDiDestroyDeviceInfoList(info_set); } +static HANDLE get_device(USHORT page, USHORT usages[], UINT usage_count, DWORD access) +{ + GUID hid_guid; + HDEVINFO info_set; + DWORD index = 0; + SP_DEVICE_INTERFACE_DATA interface_data; + DWORD detail_size = MAX_PATH * sizeof(WCHAR); + SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; + NTSTATUS status; + BOOL rc; + + HidD_GetHidGuid(&hid_guid); + + ZeroMemory(&interface_data, sizeof(interface_data)); + interface_data.cbSize = sizeof(interface_data); + + data = HeapAlloc(GetProcessHeap(), 0 , sizeof(*data) + detail_size); + data->cbSize = sizeof(*data); + + info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE); + while (SetupDiEnumDeviceInterfaces(info_set, NULL, &hid_guid, index, &interface_data)) + { + index ++; + + if (SetupDiGetDeviceInterfaceDetailW(info_set, &interface_data, data, sizeof(*data) + detail_size, NULL, NULL)) + { + PHIDP_PREPARSED_DATA ppd; + HIDP_CAPS Caps; + HANDLE file = CreateFileW(data->DevicePath, access, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0); + if (file == INVALID_HANDLE_VALUE) + { + trace("Failed to access device %s, likely not plugged in or access is denied.\n", wine_dbgstr_w(data->DevicePath)); + continue; + } + rc = HidD_GetPreparsedData(file, &ppd); + ok(rc, "Failed to get preparsed data(0x%x)\n", GetLastError()); + status = HidP_GetCaps(ppd, &Caps); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get Caps(0x%x)\n", status); + rc = HidD_FreePreparsedData(ppd); + ok(rc, "Failed to free preparsed data(0x%x)\n", GetLastError()); + if (!page || page == Caps.UsagePage) + { + int j; + if (!usage_count) + { + HeapFree(GetProcessHeap(), 0, data); + SetupDiDestroyDeviceInfoList(info_set); + return file; + } + for (j = 0; j < usage_count; j++) + if (!usages[j] || usages[j] == Caps.Usage) + { + HeapFree(GetProcessHeap(), 0, data); + SetupDiDestroyDeviceInfoList(info_set); + return file; + } + } + CloseHandle(file); + } + } + HeapFree(GetProcessHeap(), 0, data); + SetupDiDestroyDeviceInfoList(info_set); + return NULL; +} + +static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, DWORD data_length) +{ + INT i; + NTSTATUS status; + + if (Caps.NumberInputButtonCaps) + { + USAGE button_pages[100]; + + for (i = 1; i < 0xff; i++) + { + ULONG usage_length = 100; + status = HidP_GetUsages(HidP_Input, i, 0, button_pages, &usage_length, ppd, data, data_length); + ok (status == HIDP_STATUS_SUCCESS || (status != HIDP_STATUS_SUCCESS && usage_length == 0), + "HidP_GetUsages failed (%x) but usage length still %i\n", status, usage_length); + if (usage_length) + { + CHAR report[50]; + int count; + int j; + + count = usage_length; + j = 0; + report[0] = 0; + trace("\tButtons [0x%x: %i buttons]:\n", i, usage_length); + for (count = 0; count < usage_length; count += 15) + { + for (j=count; j < count+15 && j < usage_length; j++) + { + CHAR btn[5]; + sprintf(btn, "%i ", button_pages[j]); + strcat(report, btn); + } + trace("\t\t%s\n", report); + } + } + } + } + + if (Caps.NumberInputValueCaps) + { + ULONG value; + USHORT length; + HIDP_VALUE_CAPS *values = NULL; + + values = HeapAlloc(GetProcessHeap(), 0, sizeof(HIDP_VALUE_CAPS) * Caps.NumberInputValueCaps); + length = Caps.NumberInputValueCaps; + status = HidP_GetValueCaps(HidP_Input, values, &length, ppd); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get value caps (%x)\n",status); + + trace("\tValues: \n"); + for (i = 0; i < length; i++) + { + status = HidP_GetUsageValue(HidP_Input, values[i].UsagePage, 0, + values[i].Range.UsageMin, &value, ppd, data, data_length); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get value [%i,%i] (%x)\n", + values[i].UsagePage, values[i].Range.UsageMin, status); + trace("[%02x, %02x]: %u\n",values[i].UsagePage, values[i].Range.UsageMin, value); + } + + HeapFree(GetProcessHeap(), 0, values); + } +} + +static void test_read_device(void) +{ + PHIDP_PREPARSED_DATA ppd; + HIDP_CAPS Caps; + OVERLAPPED overlapped; + WCHAR device_name[128]; + CHAR *data = NULL; + DWORD read; + BOOL rc; + NTSTATUS status; + DWORD timeout, tick, spent, max_time; + char *report; + + USAGE device_usages[] = {HID_USAGE_GENERIC_JOYSTICK, HID_USAGE_GENERIC_GAMEPAD}; + HANDLE device = get_device(HID_USAGE_PAGE_GENERIC, device_usages, 2, GENERIC_READ); + + if (!device) + device = get_device(0x0, NULL, 0x0, GENERIC_READ); + + if (!device) + { + trace("No device found for reading\n"); + return; + } + rc = HidD_GetProductString(device, device_name, sizeof(device_name)); + ok(rc, "Failed to get product string(0x%x)\n", GetLastError()); + trace("Read tests on device :%s\n",wine_dbgstr_w(device_name)); + + rc = HidD_GetPreparsedData(device, &ppd); + ok(rc, "Failed to get preparsed data(0x%x)\n", GetLastError()); + status = HidP_GetCaps(ppd, &Caps); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get Caps(0x%x)\n", status); + data = HeapAlloc(GetProcessHeap(), 0, Caps.InputReportByteLength); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + if (winetest_interactive) + { + max_time = READ_MAX_TIME; + timeout = 1000; + } + else + max_time = timeout = 100; + if (winetest_interactive) + trace("Test your device for the next %i seconds\n", max_time/1000); + report = HeapAlloc(GetProcessHeap(), 0, 3 * Caps.InputReportByteLength); + tick = GetTickCount(); + spent = 0; + do + { + ReadFile(device, data, Caps.InputReportByteLength, NULL, &overlapped); + if (WaitForSingleObject(overlapped.hEvent, timeout) != WAIT_OBJECT_0) + { + ResetEvent(overlapped.hEvent); + spent = GetTickCount() - tick; + trace("REMAINING: %d ms\n", max_time - spent); + continue; + } + ResetEvent(overlapped.hEvent); + spent = GetTickCount() - tick; + GetOverlappedResult(device, &overlapped, &read, FALSE); + if (read) + { + int i; + + report[0] = 0; + for (i = 0; i < read && i < Caps.InputReportByteLength; i++) + { + char bytestr[5]; + sprintf(bytestr, "%x ", (BYTE)data[i]); + strcat(report, bytestr); + } + trace("Input report (%i): %s\n", read, report); + + process_data(Caps, ppd, data, read); + } + trace("REMAINING: %d ms\n", max_time - spent); + } while(spent < max_time); + + CloseHandle(overlapped.hEvent); + rc = HidD_FreePreparsedData(ppd); + ok(rc, "Failed to free preparsed data(0x%x)\n", GetLastError()); + CloseHandle(device); + HeapFree(GetProcessHeap(), 0, data); + HeapFree(GetProcessHeap(), 0, report); +} + START_TEST(device) { run_for_each_device(test_device_info); + test_read_device(); }

1 0

Aric Stewart : hid/tests: Test HidD_GetInputReport.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 41a82d803776c5cc485d47d26cbe74a0d7f676e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41a82d803776c5cc485d47d26… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 31 11:04:11 2017 -0600 hid/tests: Test HidD_GetInputReport. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index adc6e10..ff47e30 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -305,8 +305,84 @@ static void test_read_device(void) HeapFree(GetProcessHeap(), 0, report); } +static void test_get_input_report(void) +{ + PHIDP_PREPARSED_DATA ppd; + HIDP_CAPS Caps; + WCHAR device_name[128]; + CHAR *data = NULL; + DWORD tick, spent, max_time; + char *report; + BOOL rc; + NTSTATUS status; + + USAGE device_usages[] = {HID_USAGE_GENERIC_JOYSTICK, HID_USAGE_GENERIC_GAMEPAD}; + HANDLE device = get_device(HID_USAGE_PAGE_GENERIC, device_usages, 2, GENERIC_READ); + + if (!device) + device = get_device(0x0, NULL, 0x0, GENERIC_READ); + + if (!device) + { + trace("No device found for testing\n"); + return; + } + rc = HidD_GetProductString(device, device_name, sizeof(device_name)); + ok(rc, "Failed to get product string(0x%x)\n", GetLastError()); + trace("HidD_GetInputRpeort tests on device :%s\n",wine_dbgstr_w(device_name)); + + rc = HidD_GetPreparsedData(device, &ppd); + ok(rc, "Failed to get preparsed data(0x%x)\n", GetLastError()); + status = HidP_GetCaps(ppd, &Caps); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get Caps(0x%x)\n", status); + data = HeapAlloc(GetProcessHeap(), 0, Caps.InputReportByteLength); + + if (winetest_interactive) + max_time = READ_MAX_TIME; + else + max_time = 100; + if (winetest_interactive) + trace("Test your device for the next %i seconds\n", max_time/1000); + report = HeapAlloc(GetProcessHeap(), 0, 3 * Caps.InputReportByteLength); + tick = GetTickCount(); + spent = 0; + do + { + int i; + + data[0] = 0; /* Just testing report ID 0 for now, That will catch most devices */ + rc = HidD_GetInputReport(device, data, Caps.InputReportByteLength); + spent = GetTickCount() - tick; + + if (rc) + { + report[0] = 0; + for (i = 0; i < Caps.InputReportByteLength && i < Caps.InputReportByteLength; i++) + { + char bytestr[5]; + sprintf(bytestr, "%x ", (BYTE)data[i]); + strcat(report, bytestr); + } + trace("Input report (%i): %s\n", Caps.InputReportByteLength, report); + + process_data(Caps, ppd, data, Caps.InputReportByteLength); + } + else + trace("Failed to get Input Report, (%x)\n", rc); + trace("REMAINING: %d ms\n", max_time - spent); + Sleep(500); + } while(spent < max_time); + + rc = HidD_FreePreparsedData(ppd); + ok(rc, "Failed to free preparsed data(0x%x)\n", GetLastError()); + CloseHandle(device); + HeapFree(GetProcessHeap(), 0, data); + HeapFree(GetProcessHeap(), 0, report); +} + START_TEST(device) { run_for_each_device(test_device_info); test_read_device(); + test_get_input_report(); }

1 0

Lauri Kenttä : kernel32: LZOpenFile should preserve cBytes on failure.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: ae147195384c19b20b2f399566f00a21b58f11b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae147195384c19b20b2f39956… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Jan 31 23:38:08 2017 +0200 kernel32: LZOpenFile should preserve cBytes on failure. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lzexpand.c | 3 +++ dlls/lz32/tests/lzexpand_main.c | 8 -------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/lzexpand.c b/dlls/kernel32/lzexpand.c index 8f9b409..319c1c8 100644 --- a/dlls/kernel32/lzexpand.c +++ b/dlls/kernel32/lzexpand.c @@ -534,6 +534,7 @@ static LPSTR LZEXPAND_MangleName( LPCSTR fn ) HFILE WINAPI LZOpenFileA( LPSTR fn, LPOFSTRUCT ofs, WORD mode ) { HFILE fd,cfd; + BYTE ofs_cBytes = ofs->cBytes; TRACE("(%s,%p,%d)\n",fn,ofs,mode); /* 0x70 represents all OF_SHARE_* flags, ignore them for the check */ @@ -544,6 +545,8 @@ HFILE WINAPI LZOpenFileA( LPSTR fn, LPOFSTRUCT ofs, WORD mode ) fd = OpenFile(mfn,ofs,mode); HeapFree( GetProcessHeap(), 0, mfn ); } + if (fd==HFILE_ERROR) + ofs->cBytes = ofs_cBytes; if ((mode&~0x70)!=OF_READ) return fd; if (fd==HFILE_ERROR) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 4980cf7..c37f3fa 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -229,7 +229,6 @@ static void test_LZOpenFileA_nonexisting_compressed(void) "LZOpenFileA succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -249,7 +248,6 @@ static void test_LZOpenFileA_nonexisting_compressed(void) "LZOpenFileA succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -269,7 +267,6 @@ static void test_LZOpenFileA_nonexisting_compressed(void) "LZOpenFileA succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -289,7 +286,6 @@ static void test_LZOpenFileA_nonexisting_compressed(void) "LZOpenFileA succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -633,7 +629,6 @@ static void test_LZOpenFileW_nonexisting_compressed(void) "LZOpenFileW succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileW set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -653,7 +648,6 @@ static void test_LZOpenFileW_nonexisting_compressed(void) "LZOpenFileW succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileW set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -673,7 +667,6 @@ static void test_LZOpenFileW_nonexisting_compressed(void) "LZOpenFileW succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileW set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -693,7 +686,6 @@ static void test_LZOpenFileW_nonexisting_compressed(void) "LZOpenFileW succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileW set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND,

1 0

Nikolay Sivov : comctl32/tests: Use HGLOBAL stream to Read/ Write tests on imagelists.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: a95dff650110e923d6320b796c4c0d7738eb6fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a95dff650110e923d6320b796… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 08:08:12 2017 +0300 comctl32/tests: Use HGLOBAL stream to Read/Write tests on imagelists. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 120 ++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a95dff650110e923d6320…

1 0

Andrey Gusev : d3dx11: Add D3DX11CreateShaderResourceViewFromMemory stub.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 943ed2c3eba5e72a080417683b9a6ca6d7b7be65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=943ed2c3eba5e72a080417683… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 30 14:00:56 2017 +0200 d3dx11: Add D3DX11CreateShaderResourceViewFromMemory stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/d3dx11_43.spec | 2 +- dlls/d3dx11_43/texture.c | 10 ++++++++++ include/d3dx11tex.h | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index f97ec24..815c162 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -17,7 +17,7 @@ @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stub D3DX11CreateShaderResourceViewFromMemory +@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW @ stub D3DX11CreateTextureFromFileA diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 217cad1..452e513 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -17,7 +17,7 @@ @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stub D3DX11CreateShaderResourceViewFromMemory +@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW @ stub D3DX11CreateTextureFromFileA diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index 65598a6..fe291d9 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -25,6 +25,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data, + SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, + ID3D11ShaderResourceView **view, HRESULT *hresult) +{ + FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, view %p, hresult %p stub!\n", + device, data, data_size, load_info, pump, view, hresult); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data, SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult) diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index bd22f32..16b280a 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -86,6 +86,10 @@ typedef struct D3DX11_IMAGE_LOAD_INFO extern "C" { #endif +HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data, + SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, + ID3D11ShaderResourceView **view, HRESULT *hresult); + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult);

1 0

Detlef Riekenberg : maintainers: Add myself for printing.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 45111f901d8db97f08c8505a4078ee3cc1627a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45111f901d8db97f08c8505a4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jan 31 18:24:22 2017 +0100 maintainers: Add myself for printing. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index b362489..738e1b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -210,10 +210,15 @@ OpenMP M: Sebastian Lackner <sebastian(a)fds-team.de> F: dlls/vcomp*/ +Postscript Driver +M: Huw Davies <huw(a)codeweavers.com> +F: dlls/wineps.drv/ + Printing M: Huw Davies <huw(a)codeweavers.com> +P: Detlef Riekenberg <wine.dev(a)web.de> F: dlls/localspl/ -F: dlls/wineps.drv/ +F: dlls/spoolss/ F: dlls/winspool.drv/ Richedit

1 0

Andrey Gusev : shlwapi: Avoid 'else if' for IStream_fnQueryInterface.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 437123b58a2be16af857eb022f0ab2f4d7802f5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=437123b58a2be16af857eb022… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jan 25 13:19:46 2017 +0200 shlwapi: Avoid 'else if' for IStream_fnQueryInterface. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/regstream.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 1b0ca4e..63615d3 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -67,10 +67,8 @@ static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVO *ppvObj = NULL; - if(IsEqualIID(riid, &IID_IUnknown)) /*IUnknown*/ - *ppvObj = This; - else if(IsEqualIID(riid, &IID_IStream)) /*IStream*/ - *ppvObj = This; + if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IStream)) + *ppvObj = &This->IStream_iface; if(*ppvObj) {

1 0

Jacek Caban : server: Create iosb objects inside read/ write request handlers.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: cf08bd0e385b1c701eb5ea5251b24ce2c60aec5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf08bd0e385b1c701eb5ea525… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 00:51:49 2017 +0100 server: Create iosb objects inside read/write request handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 34 ++++++++++++++++++++-------------- server/fd.c | 24 ++++++++++++++++-------- server/file.h | 33 +++++++++++++++++---------------- 3 files changed, 53 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf08bd0e385b1c701eb5e…

1 0

Jacek Caban : ntdll: Always set iosb->Information in irp_completion.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 534ec7f5fbf56750abcc3c692960eca1122294fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=534ec7f5fbf56750abcc3c692… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 00:51:58 2017 +0100 ntdll: Always set iosb->Information in irp_completion. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 907c2aa..c7669ee 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -417,6 +417,7 @@ static struct async_fileio *alloc_fileio( DWORD size, HANDLE handle, PIO_APC_ROU static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc, void **arg ) { struct async_irp *async = user; + ULONG information = 0; if (status == STATUS_ALERTED) { @@ -425,13 +426,14 @@ static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status req->user_arg = wine_server_client_ptr( async ); wine_server_set_reply( req, async->buffer, async->size ); status = wine_server_call( req ); - if (status != STATUS_PENDING) io->Information = reply->size; + information = reply->size; } SERVER_END_REQ; } if (status != STATUS_PENDING) { io->u.Status = status; + io->Information = information; *apc = async->io.apc; *arg = async->io.apc_arg; release_fileio( &async->io );

1 0

Mike Swanson : loader/wine.man.in: Document the WINEPATH environment variable.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 3c640470714b76a8094035cf9cd520d19c2e3932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c640470714b76a8094035cf9… Author: Mike Swanson <mikeonthecomputer(a)gmail.com> Date: Thu Jan 26 10:08:48 2017 -0800 loader/wine.man.in: Document the WINEPATH environment variable. Signed-off-by: Mike Swanson <mikeonthecomputer(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.man.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/loader/wine.man.in b/loader/wine.man.in index 1439b3c..5482896 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -201,6 +201,20 @@ the builtin load fails; load shell32 always as builtin and comctl32 always as native; oleaut32 will be disabled. .RE .TP +.B WINEPATH +Specifies additional path(s) to be prepended to the default Windows +.B PATH +environment variable. This is a list of Windows-style directories +separated by ";". +.RS +.PP +For a permanent alternative, edit (create if needed) the +.B PATH +value under the +.B HKEY_CURRENT_USER\\\\Environment +registry key. +.RE +.TP .B WINEARCH Specifies the Windows architecture to support. It can be set either to .B win32

1 0