wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Henri Verbeet : wined3d: Pass a texture and sub-resource index to wined3d_volume_srgb_transfer().
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: d262a183116dedfbeedc2d1ec2ea597673bfcd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d262a183116dedfbeedc2d1ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 13:29:39 2016 +0200 wined3d: Pass a texture and sub-resource index to wined3d_volume_srgb_transfer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 72ebd19..2e38aa7 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -141,12 +141,12 @@ static DWORD volume_access_from_location(DWORD location) } /* Context activation is done by the caller. */ -static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, +static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, BOOL dest_is_srgb) { - unsigned int sub_resource_idx = volume->texture_level; - struct wined3d_texture *texture = volume->container; + struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; struct wined3d_bo_address data; + /* Optimizations are possible, but the effort should be put into either * implementing EXT_SRGB_DECODE in the driver or finding out why we * picked the wrong copy for the original upload and fixing that. @@ -156,7 +156,7 @@ static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, WARN_(d3d_perf)("Performing slow rgb/srgb volume transfer.\n"); data.buffer_object = 0; - if (!(data.addr = HeapAlloc(GetProcessHeap(), 0, texture->sub_resources[sub_resource_idx].size))) + if (!(data.addr = HeapAlloc(GetProcessHeap(), 0, sub_resource->size))) return; wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); @@ -225,11 +225,11 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { - wined3d_volume_srgb_transfer(volume, context, TRUE); + texture3d_srgb_transfer(texture, sub_resource_idx, context, TRUE); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_SRGB) { - wined3d_volume_srgb_transfer(volume, context, FALSE); + texture3d_srgb_transfer(texture, sub_resource_idx, context, FALSE); } else {

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to wined3d_volume_download_data().
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 858e0913898c9a4f196df21dded35836a6058ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858e0913898c9a4f196df21dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 13:29:38 2016 +0200 wined3d: Pass a texture and sub-resource index to wined3d_volume_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 98e184d..72ebd19 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -88,10 +88,10 @@ void wined3d_volume_upload_data(struct wined3d_texture *texture, unsigned int su } /* Context activation is done by the caller. */ -static void wined3d_volume_download_data(struct wined3d_volume *volume, +static void texture3d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_bo_address *data) { - const struct wined3d_format *format = volume->container->resource.format; + const struct wined3d_format *format = texture->resource.format; const struct wined3d_gl_info *gl_info = context->gl_info; if (format->convert) @@ -107,7 +107,7 @@ static void wined3d_volume_download_data(struct wined3d_volume *volume, checkGLcall("glBindBuffer"); } - gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_3D, volume->texture_level, + gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_3D, sub_resource_idx, format->glFormat, format->glType, data->addr); checkGLcall("glGetTexImage"); @@ -144,6 +144,7 @@ static DWORD volume_access_from_location(DWORD location) static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, struct wined3d_context *context, BOOL dest_is_srgb) { + unsigned int sub_resource_idx = volume->texture_level; struct wined3d_texture *texture = volume->container; struct wined3d_bo_address data; /* Optimizations are possible, but the effort should be put into either @@ -155,13 +156,13 @@ static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, WARN_(d3d_perf)("Performing slow rgb/srgb volume transfer.\n"); data.buffer_object = 0; - if (!(data.addr = HeapAlloc(GetProcessHeap(), 0, texture->sub_resources[volume->texture_level].size))) + if (!(data.addr = HeapAlloc(GetProcessHeap(), 0, texture->sub_resources[sub_resource_idx].size))) return; wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); - wined3d_volume_download_data(volume, context, &data); + texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); - wined3d_volume_upload_data(texture, volume->texture_level, context, wined3d_const_bo_address(&data)); + wined3d_volume_upload_data(texture, sub_resource_idx, context, wined3d_const_bo_address(&data)); HeapFree(GetProcessHeap(), 0, data.addr); } @@ -248,7 +249,7 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, else wined3d_texture_bind_and_dirtify(texture, context, TRUE); - wined3d_volume_download_data(volume, context, &data); + texture3d_download_data(texture, sub_resource_idx, context, &data); ++texture->download_count; } else @@ -269,7 +270,7 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, else wined3d_texture_bind_and_dirtify(texture, context, TRUE); - wined3d_volume_download_data(volume, context, &data); + texture3d_download_data(texture, sub_resource_idx, context, &data); } else {

1 0

Piotr Caban : ucrtbase: Add _get_narrow_winmain_command_line tests.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 52a3a3b20633bf3a08860d43c8a9130a693cbedb URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a3a3b20633bf3a08860d43c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 28 12:24:43 2016 +0200 ucrtbase: Add _get_narrow_winmain_command_line tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 0111d2b..ad22699 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -73,6 +73,7 @@ static _invalid_parameter_handler (CDECL *p__get_invalid_parameter_handler)(void static _invalid_parameter_handler (CDECL *p__set_thread_local_invalid_parameter_handler)(_invalid_parameter_handler); static _invalid_parameter_handler (CDECL *p__get_thread_local_invalid_parameter_handler)(void); static int (CDECL *p__ltoa_s)(LONG, char*, size_t, int); +static char* (CDECL *p__get_narrow_winmain_command_line)(void); static void test__initialize_onexit_table(void) { @@ -312,6 +313,38 @@ static void test_invalid_parameter_handler(void) ok(ret == global_invalid_parameter_handler, "ret = %p\n", ret); } +static void test__get_narrow_winmain_command_line(char *path) +{ + PROCESS_INFORMATION proc; + STARTUPINFOA startup; + char cmd[MAX_PATH+32]; + char *ret, *cmdline, *name; + int len; + + ret = p__get_narrow_winmain_command_line(); + cmdline = GetCommandLineA(); + len = strlen(cmdline); + ok(ret>cmdline && ret<cmdline+len, "ret = %p, cmdline = %p (len = %d)\n", ret, cmdline, len); + + if(!path) { + ok(!lstrcmpA(ret, "\"misc\" cmd"), "ret = %s\n", ret); + return; + } + + for(len = strlen(path); len>0; len--) + if(path[len-1]=='\\' || path[len-1]=='/') break; + if(len) name = path+len; + else name = path; + + sprintf(cmd, "\"\"%c\"\"\"%s\" \t \"misc\" cmd", name[0], name+1); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + CreateProcessA(path, cmd, NULL, NULL, TRUE, + CREATE_DEFAULT_ERROR_MODE|NORMAL_PRIORITY_CLASS, + NULL, NULL, &startup, &proc); + winetest_wait_child_process(proc.hProcess); +} + static BOOL init(void) { HMODULE module = LoadLibraryA("ucrtbase.dll"); @@ -331,18 +364,29 @@ static BOOL init(void) p__set_thread_local_invalid_parameter_handler = (void*)GetProcAddress(module, "_set_thread_local_invalid_parameter_handler"); p__get_thread_local_invalid_parameter_handler = (void*)GetProcAddress(module, "_get_thread_local_invalid_parameter_handler"); p__ltoa_s = (void*)GetProcAddress(module, "_ltoa_s"); + p__get_narrow_winmain_command_line = (void*)GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "_get_narrow_winmain_command_line"); return TRUE; } START_TEST(misc) { + int arg_c; + char** arg_v; + if(!init()) return; + arg_c = winetest_get_mainargs(&arg_v); + if(arg_c == 3) { + test__get_narrow_winmain_command_line(NULL); + return; + } + test_invalid_parameter_handler(); test__initialize_onexit_table(); test__register_onexit_function(); test__execute_onexit_table(); test___fpe_flt_rounds(); + test__get_narrow_winmain_command_line(arg_v[0]); }

1 0

Nikolay Sivov : ucrtbase: Implement _get_narrow_winmain_command_line/ _get_wide_winmain_command_line.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 1411d800ee660b92798a0edbbc414e51a090da59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1411d800ee660b92798a0edbb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 28 12:24:24 2016 +0200 ucrtbase: Implement _get_narrow_winmain_command_line/_get_wide_winmain_command_line. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 4 +- dlls/msvcrt/data.c | 54 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 17b9861..cbda9ce 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -43,11 +43,11 @@ @ cdecl _get_initial_narrow_environment() ucrtbase._get_initial_narrow_environment @ cdecl _get_initial_wide_environment() ucrtbase._get_initial_wide_environment @ cdecl _get_invalid_parameter_handler() ucrtbase._get_invalid_parameter_handler -@ stub _get_narrow_winmain_command_line +@ cdecl _get_narrow_winmain_command_line() ucrtbase._get_narrow_winmain_command_line @ cdecl _get_pgmptr(ptr) ucrtbase._get_pgmptr @ cdecl _get_terminate() ucrtbase._get_terminate @ cdecl _get_thread_local_invalid_parameter_handler() ucrtbase._get_thread_local_invalid_parameter_handler -@ stub _get_wide_winmain_command_line +@ cdecl _get_wide_winmain_command_line() ucrtbase._get_wide_winmain_command_line @ cdecl _get_wpgmptr(ptr) ucrtbase._get_wpgmptr @ cdecl _getdllprocaddr(long str long) ucrtbase._getdllprocaddr @ cdecl _getpid() ucrtbase._getpid diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index fafbc38..5de80f4 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -692,3 +692,57 @@ int CDECL _initialize_wide_environment(void) FIXME("stub\n"); return 0; } + +/********************************************************************* + * _get_narrow_winmain_command_line (UCRTBASE.@) + */ +char* CDECL _get_narrow_winmain_command_line(void) +{ + static char *narrow_command_line; + char *s; + + if (narrow_command_line) + return narrow_command_line; + + s = GetCommandLineA(); + while (*s && *s != ' ' && *s != '\t') + { + if (*s++ == '"') + { + while (*s && *s++ != '"') + ; + } + } + + while (*s == ' ' || *s == '\t') + s++; + + return narrow_command_line = s; +} + +/********************************************************************* + * _get_wide_winmain_command_line (UCRTBASE.@) + */ +MSVCRT_wchar_t* CDECL _get_wide_winmain_command_line(void) +{ + static MSVCRT_wchar_t *wide_command_line; + MSVCRT_wchar_t *s; + + if (wide_command_line) + return wide_command_line; + + s = GetCommandLineW(); + while (*s && *s != ' ' && *s != '\t') + { + if (*s++ == '"') + { + while (*s && *s++ != '"') + ; + } + } + + while (*s == ' ' || *s == '\t') + s++; + + return wide_command_line = s; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 90639a2..2a34404 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -368,7 +368,7 @@ @ cdecl _get_initial_narrow_environment() @ cdecl _get_initial_wide_environment() @ cdecl _get_invalid_parameter_handler() -@ stub _get_narrow_winmain_command_line +@ cdecl _get_narrow_winmain_command_line() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @@ -379,7 +379,7 @@ @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected -@ stub _get_wide_winmain_command_line +@ cdecl _get_wide_winmain_command_line() @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch()

1 0

Huw Davies : gdi32: Access a few more properties directly from the DC in the dib driver.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 5118d1312cd890dc944f3115ebcc26c3470b9168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5118d1312cd890dc944f3115e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 28 10:49:48 2016 +0100 gdi32: Access a few more properties directly from the DC in the dib driver. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 3 ++- dlls/gdi32/dibdrv/objects.c | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index f93bda7..08e777d 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -68,12 +68,13 @@ static CRITICAL_SECTION font_cache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN clip ) { + DC *dc = get_physdev_dc( &pdev->dev ); struct clipped_rects clipped_rects; BOOL ret; if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, - GetROP2( pdev->dev.hdc )); + dc->ROPmode ); free_clipped_rects( &clipped_rects ); return ret; } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index e3e853f..cde20e3 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1291,10 +1291,10 @@ static void add_cap( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const PO static HRGN create_miter_region( dibdrv_physdev *pdev, const POINT *pt, const struct face *face_1, const struct face *face_2 ) { + DC *dc = get_physdev_dc( &pdev->dev ); int det = face_1->dx * face_2->dy - face_1->dy * face_2->dx; POINT pt_1, pt_2, pts[5]; double a, b, x, y; - FLOAT limit; if (det == 0) return 0; @@ -1315,9 +1315,8 @@ static HRGN create_miter_region( dibdrv_physdev *pdev, const POINT *pt, x = a * face_1->dx - b * face_2->dx; y = a * face_1->dy - b * face_2->dy; - GetMiterLimit( pdev->dev.hdc, &limit ); - - if (((x - pt->x) * (x - pt->x) + (y - pt->y) * (y - pt->y)) * 4 > limit * limit * pdev->pen_width * pdev->pen_width) + if (((x - pt->x) * (x - pt->x) + (y - pt->y) * (y - pt->y)) * 4 > + dc->miterLimit * dc->miterLimit * pdev->pen_width * pdev->pen_width) return 0; pts[0] = face_2->start; @@ -1746,8 +1745,9 @@ static inline int get_pen_device_width( DC *dc, int width ) COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); - if (GetCurrentObject(dev->hdc, OBJ_PEN) == GetStockObject( DC_PEN )) + if (dc->hPen == GetStockObject( DC_PEN )) pdev->pen_brush.colorref = color; return color; @@ -1996,7 +1996,7 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, int num, const RECT *rects, INT rop) { - POINT origin; + DC *dc = get_physdev_dc( &pdev->dev ); BOOL needs_reselect = FALSE; if (rop != brush->rop) @@ -2032,9 +2032,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, } } - GetBrushOrgEx(pdev->dev.hdc, &origin); - - dib->funcs->pattern_rects( dib, num, rects, &origin, &brush->dib, &brush->masks ); + dib->funcs->pattern_rects( dib, num, rects, &dc->brush_org, &brush->dib, &brush->masks ); if (needs_reselect) free_pattern_brush( brush ); return TRUE; @@ -2098,6 +2096,7 @@ static void select_brush( dibdrv_physdev *pdev, dib_brush *brush, HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); LOGBRUSH logbrush; TRACE("(%p, %p)\n", dev, hbrush); @@ -2105,7 +2104,7 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_patter GetObjectW( hbrush, sizeof(logbrush), &logbrush ); if (hbrush == GetStockObject( DC_BRUSH )) - logbrush.lbColor = GetDCBrushColor( dev->hdc ); + logbrush.lbColor = dc->dcBrushColor; select_brush( pdev, &pdev->brush, &logbrush, pattern ); return hbrush; @@ -2155,7 +2154,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte pdev->pen_width = get_pen_device_width( dc, logpen.lopnWidth.x ); if (hpen == GetStockObject( DC_PEN )) - logbrush.lbColor = GetDCPenColor( dev->hdc ); + logbrush.lbColor = dc->dcPenColor; set_dash_pattern( &pdev->pen_pattern, 0, NULL ); select_brush( pdev, &pdev->pen_brush, &logbrush, pattern ); @@ -2220,8 +2219,9 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); - if (GetCurrentObject(dev->hdc, OBJ_BRUSH) == GetStockObject( DC_BRUSH )) + if (dc->hBrush == GetStockObject( DC_BRUSH )) { LOGBRUSH logbrush = { BS_SOLID, color, 0 }; select_brush( pdev, &pdev->brush, &logbrush, NULL );

1 0

Huw Davies : gdi32: Pass a DC pointer to get_pixel_color().
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: d8e353f99f2110d0136dfdd2ddca1505aa90c596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8e353f99f2110d0136dfdd2d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 28 10:49:47 2016 +0100 gdi32: Pass a DC pointer to get_pixel_color(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 52 ++++++++++++++++++++++++-------------------- dlls/gdi32/dibdrv/objects.c | 52 ++++++++++++++++++++++++-------------------- dlls/gdi32/font.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- 5 files changed, 59 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8e353f99f2110d0136df…

1 0

Huw Davies : gdi32: Pass a DC pointer to get_mono_dc_colors().
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: cf386b8b6442d41074d78c1fe5fe8920e070490e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf386b8b6442d41074d78c1fe… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 28 10:49:46 2016 +0100 gdi32: Pass a DC pointer to get_mono_dc_colors(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 12 ++++++------ dlls/gdi32/dib.c | 2 +- dlls/gdi32/dibdrv/bitblt.c | 3 ++- dlls/gdi32/gdi_private.h | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 7e9a096..2506c02 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -222,10 +222,10 @@ static DWORD blend_bits( const BITMAPINFO *src_info, const struct gdi_image_bits } /* helper to retrieve either both colors or only the background color for monochrome blits */ -void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) +void get_mono_dc_colors( DC *dc, BITMAPINFO *info, int count ) { RGBQUAD *colors = info->bmiColors; - COLORREF color = GetBkColor( hdc ); + COLORREF color = dc->backgroundColor; colors[count - 1].rgbRed = GetRValue( color ); colors[count - 1].rgbGreen = GetGValue( color ); @@ -234,7 +234,7 @@ void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) if (count > 1) { - color = GetTextColor( hdc ); + color = dc->textColor; colors[0].rgbRed = GetRValue( color ); colors[0].rgbGreen = GetGValue( color ); colors[0].rgbBlue = GetBValue( color ); @@ -275,7 +275,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, /* 1-bpp source without a color table uses the destination DC colors */ if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) - get_mono_dc_colors( dst_dev->hdc, src_info, 2 ); + get_mono_dc_colors( dc_dst, src_info, 2 ); if (dst_info->bmiHeader.biBitCount == 1 && !dst_colors) { @@ -283,9 +283,9 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, * that contains only the background color; except with a 1-bpp source, * in which case it uses the source colors */ if (src_info->bmiHeader.biBitCount > 1) - get_mono_dc_colors( src_dev->hdc, dst_info, 1 ); + get_mono_dc_colors( dc_src, dst_info, 1 ); else - get_mono_dc_colors( src_dev->hdc, dst_info, 2 ); + get_mono_dc_colors( dc_src, dst_info, 2 ); } if (!(err = convert_bits( src_info, src, dst_info, &bits ))) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 9a1414e..c47729d 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -581,7 +581,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he if (dst_info->bmiHeader.biBitCount == 1 && !dst_colors) { if (src_info->bmiHeader.biBitCount > 1) - get_mono_dc_colors( dev->hdc, dst_info, 1 ); + get_mono_dc_colors( dc, dst_info, 1 ); else { memcpy( dst_info->bmiColors, src_info->bmiColors, 2 * sizeof(dst_info->bmiColors[0]) ); diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 41311fa..d865ffb 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -985,6 +985,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, const struct gdi_image_bits *bits, struct bitblt_coords *src, struct bitblt_coords *dst, DWORD rop ) { + DC *dc = get_physdev_dc( dev ); struct clipped_rects clipped_rects; DWORD ret = ERROR_SUCCESS; dib_info src_dib; @@ -1000,7 +1001,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, /* For mask_rect, 1-bpp source without a color table uses the destination DC colors */ if (info->bmiHeader.biBitCount == 1 && pdev->dib.bit_count != 1 && !info->bmiHeader.biClrUsed) - get_mono_dc_colors( dev->hdc, info, 2 ); + get_mono_dc_colors( dc, info, 2 ); init_dib_info_from_bitmapinfo( &src_dib, info, bits->ptr ); src_dib.bits.is_copy = bits->is_copy; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a837215..de8db4c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -199,7 +199,7 @@ extern BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_c extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, BITMAPINFO *dst_info, struct bitblt_coords *dst, struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; -extern void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) DECLSPEC_HIDDEN; +extern void get_mono_dc_colors( DC *dc, BITMAPINFO *info, int count ) DECLSPEC_HIDDEN; /* brush.c */ extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Get rid of separate function for SM5 derivative instructions.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 4b815d525aee79239d2fa195d892f0bf7a812434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b815d525aee79239d2fa195d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:48 2016 +0200 wined3d: Get rid of separate function for SM5 derivative instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ece9b72..b0de8c6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3528,7 +3528,11 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) { case WINED3DSIH_ABS: instruction = "abs"; break; case WINED3DSIH_DSX: instruction = "dFdx"; break; + case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; + case WINED3DSIH_DSX_FINE: instruction = "dFdxFine"; break; case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; + case WINED3DSIH_DSY_COARSE: instruction = "ycorrection.y * dFdyCoarse"; break; + case WINED3DSIH_DSY_FINE: instruction = "ycorrection.y * dFdyFine"; break; case WINED3DSIH_FRC: instruction = "fract"; break; case WINED3DSIH_IMAX: instruction = "max"; break; case WINED3DSIH_IMIN: instruction = "min"; break; @@ -3542,7 +3546,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_UMAX: instruction = "max"; break; case WINED3DSIH_UMIN: instruction = "min"; break; default: instruction = ""; - FIXME("Opcode %s not yet handled in GLSL.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); + ERR("Opcode %s not yet handled in GLSL.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); break; } @@ -3564,27 +3568,6 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "));\n"); } -static void shader_glsl_derivative(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_string_buffer *buffer = ins->ctx->buffer; - struct glsl_src_param src_param; - const char *instruction; - DWORD write_mask; - - switch (ins->handler_idx) - { - case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; - case WINED3DSIH_DSX_FINE: instruction = "dFdxFine"; break; - case WINED3DSIH_DSY_COARSE: instruction = "ycorrection.y * dFdyCoarse"; break; - case WINED3DSIH_DSY_FINE: instruction = "ycorrection.y * dFdyFine"; break; - default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; - } - - write_mask = shader_glsl_append_dst(buffer, ins); - shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); - shader_addline(buffer, "%s(%s));\n", instruction, src_param.param_str); -} - static void shader_glsl_nop(const struct wined3d_shader_instruction *ins) {} static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) @@ -8721,11 +8704,11 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DP4 */ shader_glsl_dot, /* WINED3DSIH_DST */ shader_glsl_dst, /* WINED3DSIH_DSX */ shader_glsl_map2gl, - /* WINED3DSIH_DSX_COARSE */ shader_glsl_derivative, - /* WINED3DSIH_DSX_FINE */ shader_glsl_derivative, + /* WINED3DSIH_DSX_COARSE */ shader_glsl_map2gl, + /* WINED3DSIH_DSX_FINE */ shader_glsl_map2gl, /* WINED3DSIH_DSY */ shader_glsl_map2gl, - /* WINED3DSIH_DSY_COARSE */ shader_glsl_derivative, - /* WINED3DSIH_DSY_FINE */ shader_glsl_derivative, + /* WINED3DSIH_DSY_COARSE */ shader_glsl_map2gl, + /* WINED3DSIH_DSY_FINE */ shader_glsl_map2gl, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit, /* WINED3DSIH_EMIT_STREAM */ shader_glsl_emit,

1 0

Józef Kucia : wined3d: Rename wined3d_cull enum values.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 7acf39c4304e72163e577b9a5ca88d5ead6edb98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7acf39c4304e72163e577b9a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:47 2016 +0200 wined3d: Rename wined3d_cull enum values. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 41a0319..187b3f0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -836,7 +836,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon { wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_CCW); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_BACK); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ANTIALIASEDLINEENABLE, FALSE); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4096caf..54ce2ee 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -194,13 +194,13 @@ static void state_cullmode(struct wined3d_context *context, const struct wined3d gl_info->gl_ops.gl.p_glDisable(GL_CULL_FACE); checkGLcall("glDisable GL_CULL_FACE"); break; - case WINED3D_CULL_CW: + case WINED3D_CULL_FRONT: gl_info->gl_ops.gl.p_glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); gl_info->gl_ops.gl.p_glCullFace(GL_FRONT); checkGLcall("glCullFace(GL_FRONT)"); break; - case WINED3D_CULL_CCW: + case WINED3D_CULL_BACK: gl_info->gl_ops.gl.p_glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); gl_info->gl_ops.gl.p_glCullFace(GL_BACK); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index bb15995..2fbfa2c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1083,7 +1083,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->render_states[WINED3D_RS_LASTPIXEL] = TRUE; state->render_states[WINED3D_RS_SRCBLEND] = WINED3D_BLEND_ONE; state->render_states[WINED3D_RS_DESTBLEND] = WINED3D_BLEND_ZERO; - state->render_states[WINED3D_RS_CULLMODE] = WINED3D_CULL_CCW; + state->render_states[WINED3D_RS_CULLMODE] = WINED3D_CULL_BACK; state->render_states[WINED3D_RS_ZFUNC] = WINED3D_CMP_LESSEQUAL; state->render_states[WINED3D_RS_ALPHAFUNC] = WINED3D_CMP_ALWAYS; state->render_states[WINED3D_RS_ALPHAREF] = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 52c20a4..e2f1004 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -462,8 +462,8 @@ enum wined3d_fill_mode enum wined3d_cull { WINED3D_CULL_NONE = 1, - WINED3D_CULL_CW = 2, - WINED3D_CULL_CCW = 3, + WINED3D_CULL_FRONT = 2, + WINED3D_CULL_BACK = 3, }; enum wined3d_stencil_op

1 0

Józef Kucia : d3d10core/tests: Add test for face culling.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 0ce9055263367716d6b99f55d97ff90490772f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce9055263367716d6b99f55d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:46 2016 +0200 d3d10core/tests: Add test for face culling. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 229 +++++++++++++++++++++++++++++++++--------- 1 file changed, 184 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ce9055263367716d6b99…

1 0

← Newer
1
2
3
4
5
6
7
8
...
68
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 July 2016