wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Marcus Meissner : kernel32/tests: Fixed incorrect buffer sizes.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 0cf2adb36d9542e45b527cac0e2a44c79c525d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf2adb36d9542e45b527cac0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Mar 20 21:55:08 2017 +0100 kernel32/tests: Fixed incorrect buffer sizes. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index b384135..1f88e24 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1822,7 +1822,7 @@ static void test_message_from_64bit_number(void) { r = doitW(FORMAT_MESSAGE_FROM_STRING, I64u, 0, 0, outW, sizeof(outW) / sizeof(WCHAR), unsigned_tests[i].number); - MultiByteToWideChar(CP_ACP, 0, unsigned_tests[i].expected, -1, expW, sizeof(expW)); + MultiByteToWideChar(CP_ACP, 0, unsigned_tests[i].expected, -1, expW, sizeof(expW) / sizeof(WCHAR)); todo_wine { ok(!lstrcmpW(outW, expW),"[%d] failed, expected %s, got %s\n", i, unsigned_tests[i].expected, wine_dbgstr_w(outW)); @@ -1841,7 +1841,7 @@ todo_wine { { r = doitW(FORMAT_MESSAGE_FROM_STRING, I64d, 0, 0, outW, sizeof(outW) / sizeof(WCHAR), signed_tests[i].number); - MultiByteToWideChar(CP_ACP, 0, signed_tests[i].expected, -1, expW, sizeof(expW)); + MultiByteToWideChar(CP_ACP, 0, signed_tests[i].expected, -1, expW, sizeof(expW) / sizeof(WCHAR)); todo_wine { ok(!lstrcmpW(outW, expW),"[%d] failed, expected %s, got %s\n", i, signed_tests[i].expected, wine_dbgstr_w(outW));

1 0

Austin English : kernel32: Add GetVolumeInformationByHandleW stub.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: ad6c781eb2f27e158e973e55aced6b01f320c542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad6c781eb2f27e158e973e55a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 6 17:34:40 2016 -0500 kernel32: Add GetVolumeInformationByHandleW stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-file-l1-1-0.spec | 2 +- .../api-ms-win-core-file-l1-2-0.spec | 2 +- .../api-ms-win-core-file-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/volume.c | 22 ++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 7 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec b/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec index 61e8038..612e491 100644 --- a/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec +++ b/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec @@ -49,7 +49,7 @@ @ stdcall GetLongPathNameW(wstr long long) kernel32.GetLongPathNameW @ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW @ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW -@ stub GetVolumeInformationByHandleW +@ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationByHandleW @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationW @ stdcall GetVolumePathNameW(wstr ptr long) kernel32.GetVolumePathNameW @ stdcall LocalFileTimeToFileTime(ptr ptr) kernel32.LocalFileTimeToFileTime diff --git a/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec index cddf112..1aba68d 100644 --- a/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec +++ b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec @@ -50,7 +50,7 @@ @ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW @ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW @ stdcall GetTempPathW(long ptr) kernel32.GetTempPathW -@ stub GetVolumeInformationByHandleW +@ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationByHandleW @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationW @ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) kernel32.GetVolumeNameForVolumeMountPointW @ stdcall GetVolumePathNameW(wstr ptr long) kernel32.GetVolumePathNameW diff --git a/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec b/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec index a9acd8d..5bf5cb3 100644 --- a/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec +++ b/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec @@ -52,7 +52,7 @@ @ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW @ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW @ stdcall GetTempPathW(long ptr) kernel32.GetTempPathW -@ stub GetVolumeInformationByHandleW +@ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationByHandleW @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationW @ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) kernel32.GetVolumeNameForVolumeMountPointW @ stdcall GetVolumePathNameW(wstr ptr long) kernel32.GetVolumePathNameW diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a144fd1..31ce456 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -877,7 +877,7 @@ @ stdcall GetVersionExA(ptr) @ stdcall GetVersionExW(ptr) @ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) -# @ stub GetVolumeInformationByHandleW +@ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) @ stdcall GetVolumeNameForVolumeMountPointA(str ptr long) @ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 68cc762..92bcf53 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -2309,3 +2309,25 @@ BOOL WINAPI SetVolumeMountPointW(LPCWSTR path, LPCWSTR volume) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * GetVolumeInformationByHandleW (KERNEL32.@) + */ +BOOL WINAPI GetVolumeInformationByHandleW(HANDLE handle, WCHAR *volnamebuf, DWORD volnamesize, DWORD *volserial, DWORD *maxlength, DWORD *flags, WCHAR *fsnamebuf, DWORD fsnamesize) +{ + FIXME("%p %p %d %p %p %p %p %d\n", handle, volnamebuf, volnamesize, volserial, maxlength, flags, fsnamebuf, fsnamesize); + + if(volnamebuf && volnamesize) + *volnamebuf = 0; + if(volserial) + *volserial = 0; + if(maxlength) + *maxlength = 0; + if(flags) + *flags = 0; + if(fsnamebuf && fsnamesize) + *fsnamebuf = 0; + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 064f792..95ce6c1 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -337,7 +337,7 @@ @ stdcall GetVersion() kernel32.GetVersion @ stdcall GetVersionExA(ptr) kernel32.GetVersionExA @ stdcall GetVersionExW(ptr) kernel32.GetVersionExW -@ stub GetVolumeInformationByHandleW +@ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationByHandleW @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationW @ stdcall GetVolumePathNameW(wstr ptr long) kernel32.GetVolumePathNameW @ stdcall GetWindowsAccountDomainSid(ptr ptr ptr) advapi32.GetWindowsAccountDomainSid diff --git a/include/winbase.h b/include/winbase.h index 2345443..894156c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2217,6 +2217,7 @@ WINBASEAPI BOOL WINAPI GetVersionExW(OSVERSIONINFOW*); WINBASEAPI BOOL WINAPI GetVolumeInformationA(LPCSTR,LPSTR,DWORD,LPDWORD,LPDWORD,LPDWORD,LPSTR,DWORD); WINBASEAPI BOOL WINAPI GetVolumeInformationW(LPCWSTR,LPWSTR,DWORD,LPDWORD,LPDWORD,LPDWORD,LPWSTR,DWORD); #define GetVolumeInformation WINELIB_NAME_AW(GetVolumeInformation) +WINBASEAPI BOOL WINAPI GetVolumeInformationByHandleW(HANDLE,WCHAR *,DWORD,DWORD *,DWORD *,DWORD *,WCHAR *,DWORD); WINBASEAPI BOOL WINAPI GetVolumeNameForVolumeMountPointA(LPCSTR,LPSTR,DWORD); WINBASEAPI BOOL WINAPI GetVolumeNameForVolumeMountPointW(LPCWSTR,LPWSTR,DWORD); #define GetVolumeNameForVolumeMountPoint WINELIB_NAME_AW(GetVolumeNameForVolumeMountPoint)

1 0

Huw Davies : msi/tests: Clean up the registry in the correct order.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 582245b5c49452c28a1e6ed30d8935772d368340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=582245b5c49452c28a1e6ed30… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 20:16:01 2017 +0000 msi/tests: Clean up the registry in the correct order. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 46d0b73..ad7fb84 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -11217,18 +11217,18 @@ static void test_MsiEnumPatchesEx_machine(void) ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); delete_key(hpatch, "", access & KEY_WOW64_64KEY); + RegDeleteValueA(hpatch, "State"); RegCloseKey(hpatch); delete_key(udpatch, "", access & KEY_WOW64_64KEY); RegCloseKey(udpatch); + delete_key(udprod, "", access & KEY_WOW64_64KEY); + RegCloseKey(udprod); done: RegDeleteValueA(patches, patch_squashed); RegDeleteValueA(patches, "Patches"); delete_key(patches, "", access & KEY_WOW64_64KEY); RegCloseKey(patches); - RegDeleteValueA(hpatch, "State"); - delete_key(udprod, "", access & KEY_WOW64_64KEY); - RegCloseKey(udprod); delete_key(prodkey, "", access & KEY_WOW64_64KEY); RegCloseKey(prodkey); }

1 0

Henri Verbeet : wined3d: Check for GL_FRONT before GL_BACK in wined3d_texture_get_gl_buffer().
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 0d0f3c940f45d10f3d8dceb5fa52bb9f1893c75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0f3c940f45d10f3d8dceb5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 23:34:15 2017 +0100 wined3d: Check for GL_FRONT before GL_BACK in wined3d_texture_get_gl_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4351089..d4436d9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -60,7 +60,13 @@ GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) return GL_NONE; } - if (swapchain->back_buffers && swapchain->back_buffers[0] == texture) + if (texture == swapchain->front_buffer) + { + TRACE("Returning GL_FRONT.\n"); + return GL_FRONT; + } + + if (texture == swapchain->back_buffers[0]) { if (swapchain->render_to_fbo) { @@ -70,11 +76,6 @@ GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) TRACE("Returning GL_BACK.\n"); return GL_BACK; } - else if (texture == swapchain->front_buffer) - { - TRACE("Returning GL_FRONT.\n"); - return GL_FRONT; - } FIXME("Higher back buffer, returning GL_BACK.\n"); return GL_BACK;

1 0

Henri Verbeet : wined3d: Merge surface_blt_to_drawable() into surface_load_drawable().
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 5ab99b1643a7a26db5b17a14fcfe2a1f98bb7785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab99b1643a7a26db5b17a14f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 23:34:14 2017 +0100 wined3d: Merge surface_blt_to_drawable() into surface_load_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 008ca47..94ec035 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2098,29 +2098,6 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW rect->bottom = drawable_height - rect->bottom; } -/* Context activation is done by the caller. */ -static void surface_blt_to_drawable(struct wined3d_device *device, - struct wined3d_context *context, enum wined3d_texture_filter_type filter, - struct wined3d_surface *src_surface, const RECT *src_rect_in, - struct wined3d_surface *dst_surface, const RECT *dst_rect_in) -{ - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *dst_texture = dst_surface->container; - struct wined3d_surface *restore_rt = NULL; - - restore_rt = context_get_rt_surface(context); - if (restore_rt != dst_surface) - context = context_acquire(device, dst_texture, dst_sub_resource_idx); - else - restore_rt = NULL; - - device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, - src_surface, src_rect_in, dst_surface, dst_rect_in, NULL, filter); - - if (restore_rt) - context_restore(context, restore_rt); -} - HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) { struct wined3d_resource *resource = &s->container->resource; @@ -2337,6 +2314,8 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; + struct wined3d_surface *restore_rt = NULL; + struct wined3d_device *device; RECT r; if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) @@ -2354,10 +2333,20 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, return FALSE; } + device = texture->resource.device; + restore_rt = context_get_rt_surface(context); + if (restore_rt != surface) + context = context_acquire(device, texture, sub_resource_idx); + else + restore_rt = NULL; + surface_get_rect(surface, NULL, &r); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - surface_blt_to_drawable(texture->resource.device, context, - WINED3D_TEXF_POINT, surface, &r, surface, &r); + device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, + surface, &r, surface, &r, NULL, WINED3D_TEXF_POINT); + + if (restore_rt) + context_restore(context, restore_rt); return TRUE; }

1 0

Henri Verbeet : wined3d: Use blit_shader.blit_surface() in surface_blt_to_drawable().
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: cbede20ae84988dddfb0e3ff24a7b2137b719b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbede20ae84988dddfb0e3ff2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 23:34:13 2017 +0100 wined3d: Use blit_shader.blit_surface() in surface_blt_to_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fcbb8e5..008ca47 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2099,51 +2099,23 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW } /* Context activation is done by the caller. */ -static void surface_blt_to_drawable(const struct wined3d_device *device, - struct wined3d_context *old_ctx, enum wined3d_texture_filter_type filter, +static void surface_blt_to_drawable(struct wined3d_device *device, + struct wined3d_context *context, enum wined3d_texture_filter_type filter, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; - RECT src_rect, dst_rect; - - src_rect = *src_rect_in; - dst_rect = *dst_rect_in; - restore_rt = context_get_rt_surface(old_ctx); + restore_rt = context_get_rt_surface(context); if (restore_rt != dst_surface) context = context_acquire(device, dst_texture, dst_sub_resource_idx); else restore_rt = NULL; - gl_info = context->gl_info; - - /* Make sure the surface is up-to-date. This should probably use - * surface_load_location() and worry about the destination surface too, - * unless we're overwriting it completely. */ - wined3d_texture_load(src_texture, context, FALSE); - - /* Activate the destination context, set it up for blitting */ - context_apply_blit_state(context, device); - - if (!wined3d_resource_is_offscreen(&dst_texture->resource)) - surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); - - device->blitter->set_shader(device->blit_priv, context, src_surface, NULL); - - draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); - - /* Leave the opengl state valid for blitting */ - device->blitter->unset_shader(context->gl_info); - - if (wined3d_settings.strict_draw_ordering - || (dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture)) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ + device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, + src_surface, src_rect_in, dst_surface, dst_rect_in, NULL, filter); if (restore_rt) context_restore(context, restore_rt);

1 0

Henri Verbeet : wined3d: Get rid of the (now) redundant "alpha_test" parameter to surface_blt_to_drawable().
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 8c9990157dbca8f81c26cbccb9d3136059e7c9aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9990157dbca8f81c26cbccb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 23:34:12 2017 +0100 wined3d: Get rid of the (now) redundant "alpha_test" parameter to surface_blt_to_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a35feb1..fcbb8e5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2100,8 +2100,7 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW /* Context activation is done by the caller. */ static void surface_blt_to_drawable(const struct wined3d_device *device, - struct wined3d_context *old_ctx, - enum wined3d_texture_filter_type filter, BOOL alpha_test, + struct wined3d_context *old_ctx, enum wined3d_texture_filter_type filter, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { @@ -2137,35 +2136,8 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, device->blitter->set_shader(device->blit_priv, context, src_surface, NULL); - if (alpha_test) - { - gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); - checkGLcall("glEnable(GL_ALPHA_TEST)"); - - /* For P8 surfaces, the alpha component contains the palette index. - * Which means that the colorkey is one of the palette entries. In - * other cases pixels that should be masked away have alpha set to 0. */ - if (src_texture->resource.format->id == WINED3DFMT_P8_UINT) - gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, - (float)src_texture->async.src_blt_color_key.color_space_low_value / 255.0f); - else - gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, 0.0f); - checkGLcall("glAlphaFunc"); - } - else - { - gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); - checkGLcall("glDisable(GL_ALPHA_TEST)"); - } - draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); - if (alpha_test) - { - gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); - checkGLcall("glDisable(GL_ALPHA_TEST)"); - } - /* Leave the opengl state valid for blitting */ device->blitter->unset_shader(context->gl_info); @@ -2413,7 +2385,7 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, surface_get_rect(surface, NULL, &r); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); surface_blt_to_drawable(texture->resource.device, context, - WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); + WINED3D_TEXF_POINT, surface, &r, surface, &r); return TRUE; }

1 0

Henri Verbeet : wined3d: Inline surface_blt_to_drawable() into ffp_blit_blit_surface().
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 07a6637d7ef48db5ca8acd9e9d21eca0adbc4656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a6637d7ef48db5ca8acd9e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 23:34:11 2017 +0100 wined3d: Inline surface_blt_to_drawable() into ffp_blit_blit_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 60 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 12ed35a..a35feb1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2786,24 +2786,68 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { struct wined3d_texture *src_texture = src_surface->container; + struct wined3d_texture *dst_texture = dst_surface->container; const struct wined3d_gl_info *gl_info = context->gl_info; - - /* Blit from offscreen surface to render target */ - struct wined3d_color_key old_blt_key = src_texture->async.src_blt_color_key; - DWORD old_color_key_flags = src_texture->async.color_key_flags; + struct wined3d_color_key old_blt_key; + DWORD old_color_key_flags; + RECT r; TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); + old_blt_key = src_texture->async.src_blt_color_key; + old_color_key_flags = src_texture->async.color_key_flags; wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT, color_key); - if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + /* Make sure the surface is up-to-date. This should probably use + * surface_load_location() and worry about the destination surface too, + * unless we're overwriting it completely. */ + wined3d_texture_load(src_texture, context, FALSE); + + /* Activate the destination context, set it up for blitting. */ + context_apply_blit_state(context, device); + + if (!wined3d_resource_is_offscreen(&dst_texture->resource)) + { + r = *dst_rect; + surface_translate_drawable_coords(dst_surface, context->win_handle, &r); + dst_rect = &r; + } + + ffp_blit_set(device->blit_priv, context, src_surface, NULL); + + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) + { gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); + checkGLcall("glEnable(GL_ALPHA_TEST)"); + } + + if (color_key) + { + /* For P8 surfaces, the alpha component contains the palette index. + * Which means that the colorkey is one of the palette entries. In + * other cases pixels that should be masked away have alpha set to 0. */ + if (src_texture->resource.format->id == WINED3DFMT_P8_UINT) + gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, + (float)src_texture->async.src_blt_color_key.color_space_low_value / 255.0f); + else + gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, 0.0f); + checkGLcall("glAlphaFunc"); + } - surface_blt_to_drawable(device, context, filter, - !!color_key, src_surface, src_rect, dst_surface, dst_rect); + draw_textured_quad(src_surface, context, src_rect, dst_rect, filter); - if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) + { gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable(GL_ALPHA_TEST)"); + } + + /* Leave the OpenGL state valid for blitting. */ + ffp_blit_unset(gl_info); + + if (wined3d_settings.strict_draw_ordering + || (dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture)) + gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ /* Restore the color key parameters */ wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT,

1 0

Francois Gouget : winetest/build-index: The system locale should not impact the date formatting code.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: tools Branch: master Commit: 6c5dbad3630f5860e8fb0bbea56e335f638d2c99 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6c5dbad3630f5860e8fb0bbe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 21 00:08:41 2017 +0100 winetest/build-index: The system locale should not impact the date formatting code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/winetest/build-index b/winetest/build-index index 9a67d15..e811b62 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -62,7 +62,8 @@ sub get_build_info($) return ($date, $subject); } -use POSIX qw(strftime); +use POSIX qw(locale_h strftime); +setlocale(LC_ALL, "C"); sub short_date($) {

1 0

Francois Gouget : winetest/build-index: Factorize the Git commit info and date formatting code.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: tools Branch: master Commit: 7a847041b22ff0ea3618eea0645f07b38a3b092e URL: http://source.winehq.org/git/tools.git/?a=commit;h=7a847041b22ff0ea3618eea0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 21 00:08:19 2017 +0100 winetest/build-index: Factorize the Git commit info and date formatting code. This clarifies the code, removes a bit of duplication and makes it easier to reuse that code elsewhere. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 59 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index e15792c..9a67d15 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -23,7 +23,6 @@ use strict; use warnings; use open ':utf8'; use CGI qw(:standard); -use POSIX qw(strftime); sub BEGIN { @@ -43,6 +42,41 @@ binmode STDOUT, ':utf8'; $ENV{GIT_DIR} = $gitdir; +sub get_build_info($) +{ + my ($build) = @_; + my ($date, $subject); + + my $commit = `git log --max-count=1 --pretty="format:%ct %s" "$build^0" 2>/dev/null` if ($build =~ /^[0-9a-f]{40}$/); + if ($commit && $commit =~ /^(\d+) (.*)$/) + { + ($date, $subject) = ($1, $2); + # Make sure the directory's mtime matches the commit time + utime $date, $date, "data/$build"; + } + else + { + $date = (stat "./data/$build")[9]; + $subject = ""; + } + return ($date, $subject); +} + +use POSIX qw(strftime); + +sub short_date($) +{ + my ($date) = @_; + return strftime("%b %d", gmtime($date)); +} + +sub long_date($) +{ + my ($date) = @_; + return strftime("%b %d %H:%M:%S", gmtime($date)); +} + + my %w95 = (name => "Win95"); my %w98 = (name => "Win98"); my %me = (name => "Me"); @@ -81,23 +115,16 @@ foreach my $build (readdir(DIR)) next unless $build =~ /^[-.0-9a-zA-Z]+$/; next unless -f "./data/$build/index.html"; - my ($commit, $date, $subject); - $commit = `git log --max-count=1 --pretty="format:%ct %s" "$build^0" 2>/dev/null` if ($build =~ /^[0-9a-f]{40}$/); - if ($commit && $commit =~ /^(\d+) (.*)$/) + my ($date, $subject) = get_build_info($build); + if (time() - $date > 60 * 24 * 60 * 60) { - $date = $1; - $subject = $2; - # make sure the file mtime matches the commit time - utime $date, $date, "data/$build"; + # Archive builds older than 60 days + push @too_old, $build; } else { - $date = (stat "./data/$build")[9]; - $subject = ""; + push @builds, { name => $build, date => $date, subj => $subject }; } - # archive builds older than 2 months - if (time() - $date > 60 * 24 * 60 * 60) { push @too_old, $build; } - else { push @builds, { name => $build, date => $date, subj => $subject }; } } closedir(DIR); @@ -204,7 +231,7 @@ EOF next unless defined $alltests{$test}->{$build->{name}}; printf OUT " <tr><td class=\"build\"><a href=\"../%s\" title=\"%s\">%s</a></td>\n", $build->{name}, $build->{name}, substr($build->{name},0,12); - printf OUT " <td class=\"date\">%s</td>", strftime("%b %d", gmtime($build->{date})); + printf OUT " <td class=\"date\">%s</td>", short_date($build->{date}); foreach my $group (@groups) { next unless defined $used_group{$group->{name}}; @@ -252,7 +279,7 @@ print OUT "<th colspan=\"3\">Failures</th><th></th></tr></thead>\n"; foreach my $build (@builds) { printf OUT " <tr><td class=\"build\"><a href=\"%s\" title=\"%s\">%s</a></td>\n", $build->{name}, $build->{name}, substr($build->{name},0,12); - printf OUT " <td class=\"date\">%s</td>", strftime("%b %d", gmtime($build->{date})); + printf OUT " <td class=\"date\">%s</td>", short_date($build->{date}); my ($total_runs, $total_tests, $total_errors, $total_todos); foreach my $ver (@groups) { @@ -336,7 +363,7 @@ print OUT "<table class=\"report\"><thead><tr><th class=\"date\">Date</th><th cl foreach my $err (sort { $b->{date} <=> $a->{date}; } @errors) { - printf OUT "<tr><td class=\"date\">%s</td>\n", strftime("%b %d %H:%M:%S", gmtime($err->{date})); + printf OUT "<tr><td class=\"date\">%s</td>\n", long_date($err->{date}); printf OUT "<td class=\"commitlink\"><a href=\"%s\">%s</a></td></tr>\n", $err->{url}, escapeHTML($err->{msg}); } print OUT "</table>", end_html();

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
72
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 March 2017