wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

Stefan Dösinger : wined3d: Rotate through swapchain buffers.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 2c5d3fad89bb19e6f7a0368e285db845f009fc06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5d3fad89bb19e6f7a0368e2… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Feb 24 22:28:08 2016 +0000 wined3d: Rotate through swapchain buffers. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d71f452c4d70a9fa6513322a5751f1eb0f46b4e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/visual.c | 10 +++++----- dlls/d3d9/tests/visual.c | 10 +++++----- dlls/wined3d/swapchain.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 0663e18..16984ca 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8044,9 +8044,9 @@ static void test_flip(void) /* Contents were changed. */ color = get_surface_color(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); color = get_surface_color(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); @@ -8055,15 +8055,15 @@ static void test_flip(void) ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = get_surface_color(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); color = get_surface_color(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = get_surface_color(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) IDirect3DSurface8_Release(back_buffers[i]); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 120d688..c91d02c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20199,9 +20199,9 @@ static void test_flip(void) /* Contents were changed. */ color = getPixelColorFromSurface(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); color = getPixelColorFromSurface(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); @@ -20210,15 +20210,15 @@ static void test_flip(void) ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = getPixelColorFromSurface(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); color = getPixelColorFromSurface(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = getPixelColorFromSurface(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) IDirect3DSurface9_Release(back_buffers[i]); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f7d48de..fe2208c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -422,6 +422,51 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, } } +/* Context activation is done by the caller. */ +static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct wined3d_context *context) +{ + struct gl_texture tex0; + GLuint rb0; + DWORD locations0; + struct wined3d_surface *surface, *surface_prev; + unsigned int i; + static const DWORD supported_locations = WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_RB_MULTISAMPLE; + + if (swapchain->desc.backbuffer_count < 2 || !swapchain->render_to_fbo) + return; + + surface_prev = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)); + + /* Back buffer 0 is already in the draw binding. */ + tex0 = swapchain->back_buffers[0]->texture_rgb; + rb0 = surface_prev->rb_multisample; + locations0 = surface_prev->locations; + + for (i = 1; i < swapchain->desc.backbuffer_count; ++i) + { + surface = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->back_buffers[i], 0)); + + if (!(surface->locations & supported_locations)) + surface_load_location(surface, context, swapchain->back_buffers[i]->resource.draw_binding); + + swapchain->back_buffers[i - 1]->texture_rgb = swapchain->back_buffers[i]->texture_rgb; + surface_prev->rb_multisample = surface->rb_multisample; + + surface_validate_location(surface_prev, surface->locations & supported_locations); + surface_invalidate_location(surface_prev, ~(surface->locations & supported_locations)); + + surface_prev = surface; + } + + swapchain->back_buffers[i - 1]->texture_rgb = tex0; + surface_prev->rb_multisample = rb0; + + surface_validate_location(surface_prev, locations0 & supported_locations); + surface_invalidate_location(surface_prev, ~(locations0 & supported_locations)); + + device_invalidate_state(swapchain->device, STATE_FRAMEBUFFER); +} + static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, const RECT *dst_rect_in, const RGNDATA *dirty_region, DWORD flags) { @@ -549,7 +594,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT gl_info->gl_ops.gl.p_glFinish(); /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */ - gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc); /* TODO: cycle through the swapchain buffers */ + gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc); + + wined3d_swapchain_rotate(swapchain, context); TRACE("SwapBuffers called, Starting new frame\n"); /* FPS support */

1 0

Sebastian Lackner : services: Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 3515f70c19ca73d7552813dd9c60dcc805d20069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3515f70c19ca73d7552813dd9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 16 06:02:30 2016 +0100 services: Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 94fb7c3b8bdb8e713dd229ad78621f91916240ab) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/services/services.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 1335837..53a3846 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -631,7 +631,8 @@ static DWORD get_service_binary_path(const struct service_entry *service_entry, ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName, *path, size); - if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER) + if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER || + service_entry->config.dwServiceType == SERVICE_FILE_SYSTEM_DRIVER) { static const WCHAR winedeviceW[] = {'\\','w','i','n','e','d','e','v','i','c','e','.','e','x','e',' ',0}; WCHAR system_dir[MAX_PATH];

1 0

Sebastian Lackner : ntdll: Skip unused import descriptors when loading libraries.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 9c9a758d5c9b729590484bf52aab930faa214f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9a758d5c9b729590484bf52… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 17:38:28 2016 +0100 ntdll: Skip unused import descriptors when loading libraries. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b89f88841e38e0adc0cd6f35e6e62b00ba19ec41) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/loader.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index cb9a4e2..3e45690 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -564,7 +564,7 @@ static FARPROC find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY * * Import the dll specified by the given import descriptor. * The loader_section must be locked while calling this function. */ -static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LPCWSTR load_path ) +static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LPCWSTR load_path, WINE_MODREF **pwm ) { NTSTATUS status; WINE_MODREF *wmImp; @@ -586,6 +586,13 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d else import_list = thunk_list; + if (!import_list->u1.Ordinal) + { + WARN( "Skipping unused import %s\n", name ); + *pwm = NULL; + return TRUE; + } + while (len && name[len-1] == ' ') len--; /* remove trailing spaces */ if (len * sizeof(WCHAR) < sizeof(buffer)) @@ -597,7 +604,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d else /* need to allocate a larger buffer */ { WCHAR *ptr = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); - if (!ptr) return NULL; + if (!ptr) return FALSE; ascii_to_unicode( ptr, name, len ); ptr[len] = 0; status = load_dll( load_path, ptr, 0, &wmImp ); @@ -612,7 +619,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d else ERR("Loading library %s (which is needed by %s) failed (error %x).\n", name, debugstr_w(current_modref->ldr.FullDllName.Buffer), status); - return NULL; + return FALSE; } /* unprotect the import address table since it can be located in @@ -693,7 +700,8 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d done: /* restore old protection of the import address table */ NtProtectVirtualMemory( NtCurrentProcess(), &protect_base, &protect_size, protect_old, &protect_old ); - return wmImp; + *pwm = wmImp; + return TRUE; } @@ -901,8 +909,11 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) status = STATUS_SUCCESS; for (i = 0; i < nb_imports; i++) { - if (!(wm->deps[i] = import_dll( wm->ldr.BaseAddress, &imports[i], load_path ))) + if (!import_dll( wm->ldr.BaseAddress, &imports[i], load_path, &wm->deps[i] )) + { + wm->deps[i] = NULL; status = STATUS_DLL_NOT_FOUND; + } } current_modref = prev; if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie );

1 0

Andrew Eikum : mmdevapi: Fix some DEVPKEY definitions.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 955fba01049862e5ab42777aa2d6e707556942cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=955fba01049862e5ab42777aa… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 9 10:17:04 2016 -0500 mmdevapi: Fix some DEVPKEY definitions. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ba858c28fd489a812ea0f55a11680a8edaf99ce5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/devenum.c | 1 + dlls/mmdevapi/tests/propstore.c | 6 +++--- include/devpkey.h | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index d50d206..1d838e3 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -356,6 +356,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st pv.vt = VT_LPWSTR; pv.u.pwszVal = name; MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); + MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_DeviceDesc, &pv); pv.u.pwszVal = guidstr; diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 06fe690..4ddd4b0 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -64,7 +64,7 @@ static void test_propertystore(IPropertyStore *store) pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); - ok(pv.vt == VT_EMPTY, "Key should not be found\n"); + ok(pv.vt == VT_LPWSTR && pv.u.pwszVal, "FriendlyName value had wrong type: 0x%x or was NULL\n", pv.vt); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_Enabled, &pv); @@ -118,8 +118,8 @@ static void test_getat(IPropertyStore *store) if (IsEqualPropertyKey(pkey, DEVPKEY_Device_DeviceDesc)) found_desc = TRUE; } - ok(found_name || broken(!found_name), "DEVPKEY_Device_FriendlyName not found\n"); - ok(found_desc == TRUE, "DEVPKEY_Device_DeviceDesc not found\n"); + ok(found_name, "DEVPKEY_Device_FriendlyName not found\n"); + ok(found_desc, "DEVPKEY_Device_DeviceDesc not found\n"); } static void test_setvalue_on_wow64(IPropertyStore *store) diff --git a/include/devpkey.h b/include/devpkey.h index ebaabc1..648ef42 100644 --- a/include/devpkey.h +++ b/include/devpkey.h @@ -57,6 +57,6 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_InstallState, 0xa45c254e,0xdf1c,0x4efd,0x80,0x2 DEFINE_DEVPROPKEY(DEVPKEY_Device_LocationPaths, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 37); DEFINE_DEVPROPKEY(DEVPKEY_Device_BaseContainerId, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 38); -DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_FriendlyName, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 2); -DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Enabled, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 3); -DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_ClassGuid, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 4); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_FriendlyName, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 2); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Enabled, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 3); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_ClassGuid, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 4);

1 0

Austin English : apphelp: Add SdbGetAppPatchDir stub.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: eb3f1521af805056db603872e0ec1f5282df0483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3f1521af805056db603872e… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 26 21:10:08 2016 -0500 apphelp: Add SdbGetAppPatchDir stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 48091559b50c28b2a9fd9a6cbc390363d38d24b9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/apphelp/apphelp.c | 6 ++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 64dcd87..0ff74aa 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -111,3 +111,9 @@ void WINAPI SdbCloseDatabase(PDB pdb) { FIXME("stub: %p\n", pdb); } + +void WINAPI SdbGetAppPatchDir(HSDB hsdb, WCHAR *path, DWORD size) +{ + FIXME("stub: %p %p %d\n", hsdb, path, size); + if (size && path) *path = 0; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index a658e5c..2b0e0c6 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -49,7 +49,7 @@ @ stub SdbFreeFileInfo @ stub SdbFreeFlagInfo @ stub SdbGetAppCompatDataSize -@ stub SdbGetAppPatchDir +@ stdcall SdbGetAppPatchDir(long ptr long) @ stub SdbGetBinaryTagData @ stub SdbGetDatabaseID @ stub SdbGetDatabaseInformation

1 0

Nikolay Sivov : comctl32/treeview: Fill full row for TVS_FULLROWSELECT style.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 72f4b36c028e8e88660261e9fd42e3eb0e2bd2dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f4b36c028e8e88660261e9f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 22 12:50:14 2016 +0300 comctl32/treeview: Fill full row for TVS_FULLROWSELECT style. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 382dc1ded8e13bb5d15d6d18e238b66f0997dffd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/treeview.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index d33a783..88af9e4 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -31,7 +31,7 @@ * missing notifications: TVN_GETINFOTIP, TVN_KEYDOWN, * TVN_SETDISPINFO * - * missing styles: TVS_FULLROWSELECT, TVS_INFOTIP, TVS_RTLREADING, + * missing styles: TVS_INFOTIP, TVS_RTLREADING, * * missing item styles: TVIS_EXPANDPARTIAL, TVIS_EX_FLAT, * TVIS_EX_DISABLED @@ -2571,6 +2571,13 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) if (cditem & CDRF_NEWFONT) TREEVIEW_ComputeTextWidth(infoPtr, item, hdc); + if (TREEVIEW_IsFullRowSelect(infoPtr)) + { + HBRUSH brush = CreateSolidBrush(nmcdhdr.clrTextBk); + FillRect(hdc, &item->rect, brush); + DeleteObject(brush); + } + TREEVIEW_DrawItemLines(infoPtr, hdc, item); /* Set colors. Custom draw handler can change these so we do this after it. */

1 0

Nikolay Sivov : comctl32/treeview: Fix hot-tracking with TVS_FULLROWSELECT.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 12bf89b30b25585e76f8f3064ccea517cf708117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12bf89b30b25585e76f8f3064… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 8 10:57:16 2016 +0300 comctl32/treeview: Fix hot-tracking with TVS_FULLROWSELECT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0220d47c0293545a60dea87af7383edee2fc0000) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/treeview.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 453150f..d33a783 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -350,6 +350,20 @@ TREEVIEW_IsChildOf(const TREEVIEW_ITEM *parent, const TREEVIEW_ITEM *child) return FALSE; } +static BOOL +TREEVIEW_IsFullRowSelect(const TREEVIEW_INFO *infoPtr) +{ + return !(infoPtr->dwStyle & TVS_HASLINES) && (infoPtr->dwStyle & TVS_FULLROWSELECT); +} + +static BOOL +TREEVIEW_IsItemHit(const TREEVIEW_INFO *infoPtr, const TVHITTESTINFO *ht) +{ + if (TREEVIEW_IsFullRowSelect(infoPtr)) + return ht->flags & (TVHT_ONITEMINDENT | TVHT_ONITEMBUTTON | TVHT_ONITEM | TVHT_ONITEMRIGHT); + else + return ht->flags & TVHT_ONITEM; +} /* Tree Traversal *******************************************************/ @@ -5328,6 +5342,7 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) TRACKMOUSEEVENT trackinfo; TREEVIEW_ITEM * item; TVHITTESTINFO ht; + BOOL item_hit; if (!(infoPtr->dwStyle & TVS_TRACKSELECT)) return 0; @@ -5356,12 +5371,13 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) ht.pt.y = (short)HIWORD(lParam); item = TREEVIEW_HitTest(infoPtr, &ht); - if ((item != infoPtr->hotItem) || !(ht.flags & TVHT_ONITEM)) + item_hit = TREEVIEW_IsItemHit(infoPtr, &ht); + if ((item != infoPtr->hotItem) || !item_hit) { /* redraw old hot item */ TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); infoPtr->hotItem = NULL; - if (item && (ht.flags & TVHT_ONITEM)) + if (item && item_hit) { infoPtr->hotItem = item; /* redraw new hot item */ @@ -5526,7 +5542,7 @@ TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (TREEVIEW_SendRealNotify(infoPtr, NM_SETCURSOR, &nmmouse.hdr)) return 0; - if (item && (infoPtr->dwStyle & TVS_TRACKSELECT) && (ht.flags & TVHT_ONITEM)) + if (item && (infoPtr->dwStyle & TVS_TRACKSELECT) && TREEVIEW_IsItemHit(infoPtr, &ht)) { SetCursor(infoPtr->hcurHand); return 0;

1 0

Austin English : wlanapi: Add WlanCloseHandle() stub.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: e23bd1b3034c46b948f846a0195bca8861884b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23bd1b3034c46b948f846a01… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 19 02:14:19 2016 -0500 wlanapi: Add WlanCloseHandle() stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4227eb417dd0fabb7a1d6000a49a234b05e37be5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wlanapi/main.c | 6 ++++++ dlls/wlanapi/wlanapi.spec | 2 +- include/wlanapi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 3674f79..c9fbae0 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -34,6 +34,12 @@ DWORD WINAPI WlanEnumInterfaces(HANDLE client, void *reserved, WLAN_INTERFACE_IN return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI WlanCloseHandle(HANDLE client_handle, VOID *reserved) +{ + FIXME("(%p, %p) stub\n", client_handle, reserved); + return ERROR_CALL_NOT_IMPLEMENTED; +} + DWORD WINAPI WlanOpenHandle(DWORD clientVersion, PVOID reserved, PDWORD negotiatedVersion, PHANDLE clientHandle) { diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index e55bf06..59454f4 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -1,5 +1,5 @@ @ stub WlanAllocateMemory -@ stub WlanCloseHandle +@ stdcall WlanCloseHandle(ptr ptr) @ stub WlanConnect @ stub WlanDeleteProfile @ stub WlanDisconnect diff --git a/include/wlanapi.h b/include/wlanapi.h index 63922be..73b4583 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -45,6 +45,7 @@ typedef struct _WLAN_INTERFACE_INFO_LIST WLAN_INTERFACE_INFO InterfaceInfo[1]; } WLAN_INTERFACE_INFO_LIST, *PWLAN_INTERFACE_INFO_LIST; +DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *);

1 0

Austin English : wlanapi: Add a stub for WlanEnumInterfaces.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 4eb21e4cb2222300c3e39179f67ab82b301b05c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb21e4cb2222300c3e39179f… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jan 24 21:32:20 2016 -0600 wlanapi: Add a stub for WlanEnumInterfaces. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d92dc216f29223b63be086d1262c1a78ef1416a9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wlanapi/main.c | 8 ++++++++ dlls/wlanapi/wlanapi.spec | 2 +- include/Makefile.in | 1 + include/wlanapi.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 0b0d100..3674f79 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -24,8 +24,16 @@ #include "winbase.h" #include "wine/debug.h" +#include "wlanapi.h" + WINE_DEFAULT_DEBUG_CHANNEL(wlanapi); +DWORD WINAPI WlanEnumInterfaces(HANDLE client, void *reserved, WLAN_INTERFACE_INFO_LIST **interface_list) +{ + FIXME("(%p, %p, %p) stub\n", client, reserved, interface_list); + return ERROR_CALL_NOT_IMPLEMENTED; +} + DWORD WINAPI WlanOpenHandle(DWORD clientVersion, PVOID reserved, PDWORD negotiatedVersion, PHANDLE clientHandle) { diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index 79f9e43..e55bf06 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -3,7 +3,7 @@ @ stub WlanConnect @ stub WlanDeleteProfile @ stub WlanDisconnect -@ stub WlanEnumInterfaces +@ stdcall WlanEnumInterfaces(long ptr ptr) @ stub WlanExtractPsdIEDataList @ stub WlanFreeMemory @ stub WlanGetAvailableNetworkList diff --git a/include/Makefile.in b/include/Makefile.in index 85088fe..bd8f16f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -654,6 +654,7 @@ HEADER_SRCS = \ winuser.h \ winuser.rh \ winver.h \ + wlanapi.h \ wmistr.h \ wnaspi32.h \ wownt32.h \ diff --git a/include/wlanapi.h b/include/wlanapi.h new file mode 100644 index 0000000..63922be --- /dev/null +++ b/include/wlanapi.h @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2016 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WLAN_WLANAPI_H +#define _WLAN_WLANAPI_H + +typedef enum _WLAN_INTERFACE_STATE +{ + wlan_interface_state_not_ready, + wlan_interface_state_connected, + wlan_interface_state_ad_hoc_network_formed, + wlan_interface_state_disconnecting, + wlan_interface_state_disconnected, + wlan_interface_state_associating, + wlan_interface_state_discovering, + wlan_interface_state_authenticating +} WLAN_INTERFACE_STATE, *PWLAN_INTERFACE_STATE; + +typedef struct _WLAN_INTERFACE_INFO +{ + GUID InterfaceGuid; + WCHAR strInterfaceDescription[256]; + WLAN_INTERFACE_STATE isState; +} WLAN_INTERFACE_INFO, *PWLAN_INTERFACE_INFO; + +typedef struct _WLAN_INTERFACE_INFO_LIST +{ + DWORD dwNumberOfItems; + DWORD dwIndex; + WLAN_INTERFACE_INFO InterfaceInfo[1]; +} WLAN_INTERFACE_INFO_LIST, *PWLAN_INTERFACE_INFO_LIST; + +DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); +DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *); + +#endif /* _WLAN_WLANAPI_H */

1 0

Sebastian Lackner : kernel32: Do not inherit QT_* environment variables to Windows environment.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 158042a3e68514fc4667048d397510c919d8710b URL: http://source.winehq.org/git/wine.git/?a=commit;h=158042a3e68514fc4667048d3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 16 04:48:10 2016 +0100 kernel32: Do not inherit QT_* environment variables to Windows environment. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4ac066cdaa3255b4c527b45ba685e30b189cb16d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1d306a7..86333be 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -134,7 +134,8 @@ static inline BOOL is_special_env_var( const char *var ) !strncmp( var, "PWD=", sizeof("PWD=")-1 ) || !strncmp( var, "HOME=", sizeof("HOME=")-1 ) || !strncmp( var, "TEMP=", sizeof("TEMP=")-1 ) || - !strncmp( var, "TMP=", sizeof("TMP=")-1 )); + !strncmp( var, "TMP=", sizeof("TMP=")-1 ) || + !strncmp( var, "QT_", sizeof("QT_")-1 )); }

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
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