January 2015 - Wine-commits

Henri Verbeet : wined3d: Create GL sampler objects for wined3d sampler objects.
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: c6232e1d111ae8929c53c02211cde4a9777311fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6232e1d111ae8929c53c0221… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 15 17:19:06 2015 +0100 wined3d: Create GL sampler objects for wined3d sampler objects. --- dlls/d3d10core/state.c | 2 +- dlls/wined3d/context.c | 2 ++ dlls/wined3d/device.c | 44 ++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 16 ++++++++++ dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/sampler.c | 66 +++++++++++++++++++++++++++++++++++++++--- dlls/wined3d/state.c | 46 +++++++++++++++++++++++++---- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 4 +++ include/wine/wined3d.h | 2 +- 11 files changed, 173 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6232e1d111ae8929c53c…

1 0

Henri Verbeet : wined3d: Merge shader_glsl_load_vsamplers() and shader_glsl_load_psamplers().
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: 60d44af34e7fa30f4ad0ecfc256367fa4aa057ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d44af34e7fa30f4ad0ecfc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 15 17:19:07 2015 +0100 wined3d: Merge shader_glsl_load_vsamplers() and shader_glsl_load_psamplers(). --- dlls/wined3d/glsl_shader.c | 77 +++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 24a8b46..a829651 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -413,55 +413,50 @@ static void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLh } /* Context activation is done by the caller. */ -static void shader_glsl_load_psamplers(const struct wined3d_gl_info *gl_info, - const DWORD *tex_unit_map, GLhandleARB programId) +static void shader_glsl_load_samplers(const struct wined3d_gl_info *gl_info, + const DWORD *tex_unit_map, GLhandleARB program_id) { - GLint name_loc; + unsigned int mapped_unit; char sampler_name[20]; - unsigned int i; + const char *prefix; + unsigned int i, j; + GLint name_loc; - for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + static const struct { - snprintf(sampler_name, sizeof(sampler_name), "ps_sampler%u", i); - name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name)); - if (name_loc != -1) { - DWORD mapped_unit = tex_unit_map[i]; - if (mapped_unit != WINED3D_UNMAPPED_STAGE && mapped_unit < gl_info->limits.fragment_samplers) - { - TRACE("Loading %s for texture %d\n", sampler_name, mapped_unit); - GL_EXTCALL(glUniform1iARB(name_loc, mapped_unit)); - checkGLcall("glUniform1iARB"); - } else { - ERR("Trying to load sampler %s on unsupported unit %d\n", sampler_name, mapped_unit); - } - } + enum wined3d_shader_type type; + unsigned int base_idx; + unsigned int count; } -} - -/* Context activation is done by the caller. */ -static void shader_glsl_load_vsamplers(const struct wined3d_gl_info *gl_info, - const DWORD *tex_unit_map, GLhandleARB programId) -{ - GLint name_loc; - char sampler_name[20]; - unsigned int i; + sampler_info[] = + { + {WINED3D_SHADER_TYPE_PIXEL, 0, MAX_FRAGMENT_SAMPLERS}, + {WINED3D_SHADER_TYPE_VERTEX, MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS}, + }; - for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) + for (i = 0; i < ARRAY_SIZE(sampler_info); ++i) { - snprintf(sampler_name, sizeof(sampler_name), "vs_sampler%u", i); - name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name)); - if (name_loc != -1) { - DWORD mapped_unit = tex_unit_map[MAX_FRAGMENT_SAMPLERS + i]; - if (mapped_unit != WINED3D_UNMAPPED_STAGE && mapped_unit < gl_info->limits.combined_samplers) + prefix = shader_glsl_get_prefix(sampler_info[i].type); + + for (j = 0; j < sampler_info[i].count; ++j) + { + snprintf(sampler_name, sizeof(sampler_name), "%s_sampler%u", prefix, j); + name_loc = GL_EXTCALL(glGetUniformLocationARB(program_id, sampler_name)); + if (name_loc == -1) + continue; + + mapped_unit = tex_unit_map[sampler_info[i].base_idx + j]; + if (mapped_unit == WINED3D_UNMAPPED_STAGE || mapped_unit >= gl_info->limits.combined_samplers) { - TRACE("Loading %s for texture %d\n", sampler_name, mapped_unit); - GL_EXTCALL(glUniform1iARB(name_loc, mapped_unit)); - checkGLcall("glUniform1iARB"); - } else { - ERR("Trying to load sampler %s on unsupported unit %d\n", sampler_name, mapped_unit); + ERR("Trying to load sampler %s on unsupported unit %u.\n", sampler_name, mapped_unit); + continue; } + + TRACE("Loading sampler %s on unit %u.\n", sampler_name, mapped_unit); + GL_EXTCALL(glUniform1iARB(name_loc, mapped_unit)); } } + checkGLcall("glUniform1iARB"); } /* Context activation is done by the caller. */ @@ -5996,10 +5991,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const * vertex shader with fixed function pixel processing is used we make sure that the card * supports enough samplers to allow the max number of vertex samplers with all possible * fixed function fragment processing setups. So once the program is linked these samplers - * won't change. - */ - shader_glsl_load_vsamplers(gl_info, context->tex_unit_map, programId); - shader_glsl_load_psamplers(gl_info, context->tex_unit_map, programId); + * won't change. */ + shader_glsl_load_samplers(gl_info, context->tex_unit_map, programId); entry->constant_update_mask = 0; if (vshader)

1 0

Matteo Bruni : opengl32: Update to GL 4.5.
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: d6450cfad5618036998385c08aefe830606c1330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6450cfad5618036998385c08… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 15 20:00:02 2015 +0100 opengl32: Update to GL 4.5. --- dlls/opengl32/make_opengl | 34 +- dlls/opengl32/opengl_ext.c | 1265 +++++++++++++++++++++++++++++++++++++++++-- dlls/opengl32/opengl_norm.c | 360 +++++++++++- include/wine/wgl.h | 431 ++++++++++++++- include/wine/wgl_driver.h | 179 +++++- 5 files changed, 2181 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6450cfad561803699838…

1 0

Bruno Jesus : ws2_32: Trace getpeername() result.
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: 632de943bed4aa0072c0690dbe903eef8328240b URL: http://source.winehq.org/git/wine.git/?a=commit;h=632de943bed4aa0072c0690db… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 14 22:51:16 2015 -0200 ws2_32: Trace getpeername() result. --- dlls/ws2_32/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5b9a441..0bc9d16 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2985,7 +2985,10 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) /* The buffer was too small */ SetLastError(WSAEFAULT); else + { res = 0; + TRACE("=> %s\n", debugstr_sockaddr(name)); + } } else SetLastError(wsaErrno());

1 0

Sebastian Lackner : ntoskrnl: Initialize irp.Tail.Overlay.OriginalFileObject with stub file object.
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: cffe06af801471584344462e6118c8bc7ab73b6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cffe06af801471584344462e6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 10 23:48:14 2014 +0100 ntoskrnl: Initialize irp.Tail.Overlay.OriginalFileObject with stub file object. --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c10377a..af1626d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -143,6 +143,7 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, IRP irp; MDL mdl; IO_STACK_LOCATION irpsp; + FILE_OBJECT file; PDRIVER_DISPATCH dispatch = device->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL]; NTSTATUS status; LARGE_INTEGER count; @@ -153,6 +154,7 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, memset( &irp, 0x55, sizeof(irp) ); memset( &irpsp, 0x66, sizeof(irpsp) ); memset( &mdl, 0x77, sizeof(mdl) ); + memset( &file, 0x88, sizeof(file) ); irp.RequestorMode = UserMode; if ((code & 3) == METHOD_BUFFERED) @@ -167,6 +169,7 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, irp.UserBuffer = out_buff; irp.MdlAddress = &mdl; irp.Tail.Overlay.s.u2.CurrentStackLocation = &irpsp; + irp.Tail.Overlay.OriginalFileObject = &file; irp.UserIosb = NULL; irpsp.MajorFunction = IRP_MJ_DEVICE_CONTROL; @@ -183,6 +186,9 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, mdl.ByteCount = *out_size; mdl.ByteOffset = 0; + file.FsContext = NULL; + file.FsContext2 = NULL; + device->CurrentIrp = &irp; KeQueryTickCount( &count ); /* update the global KeTickCount */

1 0

Michael Müller : shlwapi: Correctly treat '.' when enumerating files in PathIsDirectoryEmptyW.
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: 8758a8a671c14d4e4c1303ea9dacd5e7066e5475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8758a8a671c14d4e4c1303ea9… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Sep 28 17:30:45 2014 +0200 shlwapi: Correctly treat '.' when enumerating files in PathIsDirectoryEmptyW. --- dlls/shlwapi/path.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index a3b462c..dae949a 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3872,13 +3872,13 @@ BOOL WINAPI PathIsDirectoryEmptyW(LPCWSTR lpszPath) WCHAR szSearch[MAX_PATH]; DWORD dwLen; HANDLE hfind; - BOOL retVal = FALSE; + BOOL retVal = TRUE; WIN32_FIND_DATAW find_data; TRACE("(%s)\n",debugstr_w(lpszPath)); if (!lpszPath || !PathIsDirectoryW(lpszPath)) - return FALSE; + return FALSE; lstrcpynW(szSearch, lpszPath, MAX_PATH); PathAddBackslashW(szSearch); @@ -3888,14 +3888,23 @@ BOOL WINAPI PathIsDirectoryEmptyW(LPCWSTR lpszPath) strcpyW(szSearch + dwLen, szAllFiles); hfind = FindFirstFileW(szSearch, &find_data); - if (hfind != INVALID_HANDLE_VALUE) + if (hfind == INVALID_HANDLE_VALUE) + return FALSE; + + do { - if (find_data.cFileName[0] == '.' && find_data.cFileName[1] == '.') - /* The only directory entry should be the parent */ - retVal = !FindNextFileW(hfind, &find_data); - FindClose(hfind); + if (find_data.cFileName[0] == '.') + { + if (find_data.cFileName[1] == '\0') continue; + if (find_data.cFileName[1] == '.' && find_data.cFileName[2] == '\0') continue; + } + + retVal = FALSE; + break; } + while (FindNextFileW(hfind, &find_data)); + FindClose(hfind); return retVal; }

1 0

Qian Hong : atl100/tests: Added tests for AtlAxAttachControl.
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: e1999c2a0eea1b5cbeda28cd6b59945b702b1f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1999c2a0eea1b5cbeda28cd6… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Jan 15 17:28:14 2015 +0800 atl100/tests: Added tests for AtlAxAttachControl. --- dlls/atl100/tests/atl.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index dcc199f..6a8bbce 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -25,6 +25,7 @@ #include <windef.h> #include <winbase.h> #include <winuser.h> +#include <exdisp.h> #include <atlbase.h> #include <mshtml.h> @@ -757,8 +758,104 @@ static void test_ax_win(void) todo_wine ok(wndproc[0] != wndproc[1], "expected different proc!\n"); } +static ATOM register_class(void) +{ + WNDCLASSA wndclassA; + + wndclassA.style = 0; + wndclassA.lpfnWndProc = DefWindowProcA; + wndclassA.cbClsExtra = 0; + wndclassA.cbWndExtra = 0; + wndclassA.hInstance = GetModuleHandleA(NULL); + wndclassA.hIcon = NULL; + wndclassA.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW); + wndclassA.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); + wndclassA.lpszMenuName = NULL; + wndclassA.lpszClassName = "WineAtlTestClass"; + + return RegisterClassA(&wndclassA); +} + +static HWND create_container_window(void) +{ + return CreateWindowA("WineAtlTestClass", "Wine ATL Test Window", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, NULL, NULL, NULL, NULL); +} + +static void test_AtlAxAttachControl(void) +{ + HWND hwnd; + HRESULT hr; + IUnknown *control, *container; + LONG val; + + hr = AtlAxAttachControl(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + + container = (IUnknown *)0xdeadbeef; + hr = AtlAxAttachControl(NULL, NULL, &container); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + ok(container == (IUnknown *)0xdeadbeef, + "Expected the output container pointer to be untouched, got %p\n", container); + + hwnd = create_container_window(); + hr = AtlAxAttachControl(NULL, hwnd, NULL); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + DestroyWindow(hwnd); + + hwnd = create_container_window(); + container = (IUnknown *)0xdeadbeef; + hr = AtlAxAttachControl(NULL, hwnd, &container); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + ok(container == (IUnknown *)0xdeadbeef, "returned %p\n", container); + DestroyWindow(hwnd); + + hr = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IOleObject, (void **)&control); + ok(hr == S_OK, "Expected CoCreateInstance to return S_OK, got 0x%08x\n", hr); + + if (FAILED(hr)) + { + skip("Couldn't obtain a test IOleObject instance\n"); + return; + } + + hr = AtlAxAttachControl(control, NULL, NULL); + ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); + + container = NULL; + hr = AtlAxAttachControl(control, NULL, &container); + ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); + ok(container != NULL, "got %p\n", container); + IUnknown_Release(container); + + hwnd = create_container_window(); + SetWindowLongW(hwnd, GWLP_USERDATA, 0xdeadbeef); + hr = AtlAxAttachControl(control, hwnd, NULL); + ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); + val = GetWindowLongW(hwnd, GWLP_USERDATA); + ok(val == 0xdeadbeef, "returned %08x\n", val); + DestroyWindow(hwnd); + + hwnd = create_container_window(); + SetWindowLongW(hwnd, GWLP_USERDATA, 0xdeadbeef); + container = NULL; + hr = AtlAxAttachControl(control, hwnd, &container); + ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); + ok(container != NULL, "Expected not NULL!\n"); + val = GetWindowLongW(hwnd, GWLP_USERDATA); + todo_wine ok(val == 0xdeadbeef, "Expected unchanged, returned %08x\n", val); + DestroyWindow(hwnd); + + IUnknown_Release(control); +} + START_TEST(atl) { + if (!register_class()) + return; + CoInitialize(NULL); test_winmodule(); @@ -767,6 +864,7 @@ START_TEST(atl) test_cp(); test_source_iface(); test_ax_win(); + test_AtlAxAttachControl(); CoUninitialize(); }

1 0

Qian Hong : atl: Don't conflict GWLP_USERDATA with user applications.
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: 6756049be4b97de448f4bcbee8757db2cfda5c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6756049be4b97de448f4bcbee… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Jan 15 17:28:50 2015 +0800 atl: Don't conflict GWLP_USERDATA with user applications. --- dlls/atl/atl_ax.c | 12 +++++++----- dlls/atl100/tests/atl.c | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index d7cf074..d16cdfd 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -55,6 +55,8 @@ typedef struct IOCS { BOOL fActive, fInPlace, fWindowless; } IOCS; +static const WCHAR wine_atl_iocsW[] = {'_','_','W','I','N','E','_','A','T','L','_','I','O','C','S','\0'}; + /********************************************************************** * AtlAxWin class window procedure */ @@ -150,7 +152,7 @@ static HRESULT IOCS_Detach( IOCS *This ) /* remove subclassing */ if ( This->hWnd ) { SetWindowLongPtrW( This->hWnd, GWLP_WNDPROC, (ULONG_PTR) This->OrigWndProc ); - SetWindowLongPtrW( This->hWnd, GWLP_USERDATA, 0 ); + RemovePropW( This->hWnd, wine_atl_iocsW); This->hWnd = NULL; } if ( This->control ) @@ -906,7 +908,7 @@ static LRESULT IOCS_OnWndProc( IOCS *This, HWND hWnd, UINT uMsg, WPARAM wParam, static LRESULT CALLBACK AtlHost_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) { - IOCS *This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA ); + IOCS *This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); return IOCS_OnWndProc( This, hWnd, wMsg, wParam, lParam ); } @@ -915,7 +917,7 @@ static HRESULT IOCS_Attach( IOCS *This, HWND hWnd, IUnknown *pUnkControl ) /* su This->hWnd = hWnd; IUnknown_QueryInterface( pUnkControl, &IID_IOleObject, (void**)&This->control ); IOleObject_SetClientSite( This->control, &This->IOleClientSite_iface ); - SetWindowLongPtrW( hWnd, GWLP_USERDATA, (ULONG_PTR) This ); + SetPropW( hWnd, wine_atl_iocsW, This ); This->OrigWndProc = (WNDPROC)SetWindowLongPtrW( hWnd, GWLP_WNDPROC, (ULONG_PTR) AtlHost_wndproc ); return S_OK; @@ -1328,7 +1330,7 @@ HRESULT WINAPI AtlAxGetHost(HWND hWnd, IUnknown **host) *host = NULL; - This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA ); + This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); if ( !This ) { WARN("No container attached to %p\n", hWnd ); @@ -1350,7 +1352,7 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk) *pUnk = NULL; - This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA ); + This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); if ( !This || !This->control ) { WARN("No control attached to %p\n", hWnd ); diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 6a8bbce..8cf0a32 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -845,7 +845,7 @@ static void test_AtlAxAttachControl(void) ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); ok(container != NULL, "Expected not NULL!\n"); val = GetWindowLongW(hwnd, GWLP_USERDATA); - todo_wine ok(val == 0xdeadbeef, "Expected unchanged, returned %08x\n", val); + ok(val == 0xdeadbeef, "Expected unchanged, returned %08x\n", val); DestroyWindow(hwnd); IUnknown_Release(control);

1 0

Qian Hong : ntdll: Fixed buffer size checking for ProcessWow64Information on 64bit in NtQueryInformationProcess.
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: d45bda3014cbf21e8fa8e8e429531aed4eeb530e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45bda3014cbf21e8fa8e8e42… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Jan 15 16:52:26 2015 +0800 ntdll: Fixed buffer size checking for ProcessWow64Information on 64bit in NtQueryInformationProcess. --- dlls/ntdll/process.c | 12 +++++--- dlls/ntdll/tests/info.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 633a668..3defb6e 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -403,10 +403,13 @@ NTSTATUS WINAPI NtQueryInformationProcess( break; case ProcessWow64Information: - len = sizeof(DWORD); - if (ProcessInformationLength == len) + len = sizeof(ULONG_PTR); + if (ProcessInformationLength != len) ret = STATUS_INFO_LENGTH_MISMATCH; + else if (!ProcessInformation) ret = STATUS_ACCESS_VIOLATION; + else if(!ProcessHandle) ret = STATUS_INVALID_HANDLE; + else { - DWORD val = 0; + ULONG_PTR val = 0; if (ProcessHandle == GetCurrentProcess()) val = is_wow64; else if (server_cpus & (1 << CPU_x86_64)) @@ -418,9 +421,8 @@ NTSTATUS WINAPI NtQueryInformationProcess( } SERVER_END_REQ; } - *(DWORD *)ProcessInformation = val; + *(ULONG_PTR *)ProcessInformation = val; } - else ret = STATUS_INFO_LENGTH_MISMATCH; break; case ProcessImageFileName: /* FIXME: this will return a DOS path. Windows returns an NT path. Changing this would require also changing kernel32.QueryFullProcessImageName. diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index af00401..5fff490 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -737,6 +737,84 @@ static void test_query_processor_power_info(void) HeapFree(GetProcessHeap(), 0, ppi); } +static void test_query_process_wow64(void) +{ + NTSTATUS status; + ULONG ReturnLength; + ULONG_PTR pbi[2], dummy; + + memset(&dummy, 0xcc, sizeof(dummy)); + + /* Do not give a handle and buffer */ + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, NULL, 0, NULL); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + + /* Use a correct info class and buffer size, but still no handle and buffer */ + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, NULL, sizeof(ULONG_PTR), NULL); + ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE, got %08x\n", status); + + /* Use a correct info class, buffer size and handle, but no buffer */ + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, NULL, sizeof(ULONG_PTR), NULL); + ok( status == STATUS_ACCESS_VIOLATION , "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + + /* Use a correct info class, buffer and buffer size, but no handle */ + pbi[0] = pbi[1] = dummy; + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + + /* Use a greater buffer size */ + pbi[0] = pbi[1] = dummy; + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, pbi, sizeof(ULONG_PTR) + 1, NULL); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + + /* Use no ReturnLength */ + pbi[0] = pbi[1] = dummy; + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + trace( "Platform is_wow64 %d, ProcessInformation of ProcessWow64Information %lx\n", is_wow64, pbi[0]); + ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]); + ok( pbi[0] != dummy, "pbi[0] %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + /* Test written size on 64 bit by checking high 32 bit buffer */ + if (sizeof(ULONG_PTR) > sizeof(DWORD)) + { + DWORD *ptr = (DWORD *)pbi; + ok( ptr[1] != (DWORD)dummy, "ptr[1] unchanged!\n"); + } + + /* Finally some correct calls */ + pbi[0] = pbi[1] = dummy; + ReturnLength = 0xdeadbeef; + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), &ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + ok( ReturnLength == sizeof(ULONG_PTR), "Inconsistent length %d\n", ReturnLength); + + /* Everything is correct except a too small buffer size */ + pbi[0] = pbi[1] = dummy; + ReturnLength = 0xdeadbeef; + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR) - 1, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", ReturnLength); + + /* Everything is correct except a too large buffer size */ + pbi[0] = pbi[1] = dummy; + ReturnLength = 0xdeadbeef; + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR) + 1, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", ReturnLength); +} + static void test_query_process_basic(void) { NTSTATUS status; @@ -1714,6 +1792,10 @@ START_TEST(info) trace("Starting test_query_process_handlecount()\n"); test_query_process_handlecount(); + /* 0x1A ProcessWow64Information */ + trace("Starting test_query_process_wow64()\n"); + test_query_process_wow64(); + /* 0x1B ProcessImageFileName */ trace("Starting test_query_process_image_file_name()\n"); test_query_process_image_file_name();

1 0

Matteo Bruni : wined3d: Use the core version of the gl*Buffer* functions.
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: 79a0dece8b2a27979835076914a21f468515d8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a0dece8b2a2797983507691… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 14 16:27:31 2015 +0100 wined3d: Use the core version of the gl*Buffer* functions. --- dlls/wined3d/buffer.c | 56 ++++++++++++++++---------------- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 26 ++++++++++++--- dlls/wined3d/state.c | 32 +++++++++---------- dlls/wined3d/surface.c | 86 +++++++++++++++++++++++++------------------------- dlls/wined3d/volume.c | 42 ++++++++++++------------ 6 files changed, 130 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79a0dece8b2a279798350…

1 0