August 2015 - Wine-Commits - list.winehq.org

Jacek Caban : widl: Added support for -ns_prefix option.
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: 21740b5e156e98ae12239a7720113c4d557d7b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=21740b5e156e98ae12239a772… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 5 12:52:15 2015 +0200 widl: Added support for -ns_prefix option. --- include/windows.foundation.idl | 2 +- tools/widl/header.c | 10 ++++++++-- tools/widl/parser.l | 7 +++++++ tools/widl/typetree.c | 12 ++++++++++-- tools/widl/widl.c | 7 +++++++ tools/widl/widl.h | 1 + tools/widl/widl.man.in | 2 ++ 7 files changed, 36 insertions(+), 5 deletions(-) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index f926202..6d66070 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -17,7 +17,7 @@ */ #ifdef __WIDL__ -#pragma winrt +#pragma winrt ns_prefix #endif import "inspectable.idl"; diff --git a/tools/widl/header.c b/tools/widl/header.c index 76f7ed0..866e3c1 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -155,8 +155,11 @@ static const char *uuid_string(const UUID *uuid) static void write_namespace_start(FILE *header, struct namespace *namespace) { - if(is_global_namespace(namespace)) + if(is_global_namespace(namespace)) { + if(use_abi_namespace) + write_line(header, 1, "namespace ABI {"); return; + } write_namespace_start(header, namespace->parent); write_line(header, 1, "namespace %s {", namespace->name); @@ -164,8 +167,11 @@ static void write_namespace_start(FILE *header, struct namespace *namespace) static void write_namespace_end(FILE *header, struct namespace *namespace) { - if(is_global_namespace(namespace)) + if(is_global_namespace(namespace)) { + if(use_abi_namespace) + write_line(header, -1, "}", namespace->name); return; + } write_line(header, -1, "}", namespace->name); write_namespace_end(header, namespace->parent); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index c95277c..5c2dcab 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -152,7 +152,14 @@ UUID *parse_uuid(const char *u) if(!winrt_mode) error_loc("winrt IDL file imported in non-winrt mode\n"); }else { + const char *ptr = yytext+5; + winrt_mode = TRUE; + + while(isspace(*ptr)) + ptr++; + if(!strncmp(ptr, "ns_prefix", 9) && (!*(ptr += 9) || isspace(*ptr))) + use_abi_namespace = TRUE; } yy_pop_state(); } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index d27a92a..15b7c73 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -80,8 +80,13 @@ static const var_t *find_arg(const var_list_t *args, const char *name) static char *append_namespace(char *ptr, struct namespace *namespace, const char *separator) { - if(is_global_namespace(namespace)) - return ptr; + if(is_global_namespace(namespace)) { + if(!use_abi_namespace) + return ptr; + strcpy(ptr, "ABI"); + strcat(ptr, separator); + return ptr + strlen(ptr); + } ptr = append_namespace(ptr, namespace->parent, separator); strcpy(ptr, namespace->name); @@ -96,6 +101,9 @@ char *format_namespace(struct namespace *namespace, const char *prefix, const ch struct namespace *iter; char *ret, *ptr; + if(use_abi_namespace && !is_global_namespace(namespace)) + len += 3 /* strlen("ABI") */ + sep_len; + for(iter = namespace; !is_global_namespace(iter); iter = iter->parent) len += strlen(iter->name) + sep_len; diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 788c45e..a38f917 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -73,6 +73,7 @@ static const char usage[] = " --prefix-server=p Prefix names of server functions with 'p'\n" " -r Generate registration script\n" " --winrt Enable Windows Runtime mode\n" +" --ns_prefix Prefix namespaces with ABI namespace\n" " -s Generate server stub\n" " -t Generate typelib\n" " -u Generate interface identifiers file\n" @@ -115,6 +116,7 @@ int do_win64 = 1; int win32_packing = 8; int win64_packing = 8; int winrt_mode = 0; +int use_abi_namespace = 0; static enum stub_mode stub_mode = MODE_Os; char *input_name; @@ -155,6 +157,7 @@ enum { PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, PRINT_HELP, + RT_NS_PREFIX, RT_OPTION, WIN32_OPTION, WIN64_OPTION, @@ -170,6 +173,7 @@ static const struct option long_options[] = { { "dlldata-only", 0, NULL, DLLDATA_ONLY_OPTION }, { "help", 0, NULL, PRINT_HELP }, { "local-stubs", 1, NULL, LOCAL_STUBS_OPTION }, + { "ns_prefix", 0, NULL, RT_NS_PREFIX }, { "oldnames", 0, NULL, OLDNAMES_OPTION }, { "output", 0, NULL, 'o' }, { "prefix-all", 1, NULL, PREFIX_ALL_OPTION }, @@ -580,6 +584,9 @@ int main(int argc,char *argv[]) case RT_OPTION: winrt_mode = 1; break; + case RT_NS_PREFIX: + use_abi_namespace = 1; + break; case WIN32_OPTION: do_win32 = 1; do_win64 = 0; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index d046f28..09e7871 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -50,6 +50,7 @@ extern int do_win64; extern int win32_packing; extern int win64_packing; extern int winrt_mode; +extern int use_abi_namespace; extern char *input_name; extern char *input_idl_name; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 179ffba..9259afd 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -85,6 +85,8 @@ file). .PP .IP "\fB--winrt\fR" Enable Windows Runtime mode. +.IP "\fB--ns_prefix\fR" +Prefix namespaces with ABI namespace. .PP .B Registration script options: .IP "\fB-r\fR"

1 0

Sebastian Lackner : winex11: Initialize thread data in clip_cursor_notify.
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: 0f3fa3965bf1c680760822b3893c80e2a98128e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3fa3965bf1c680760822b38… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 4 18:43:26 2015 +0200 winex11: Initialize thread data in clip_cursor_notify. --- dlls/winex11.drv/mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 3a11b41..e462b55 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -452,7 +452,7 @@ void reset_clipping_window(void) */ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) { - struct x11drv_thread_data *data = x11drv_thread_data(); + struct x11drv_thread_data *data = x11drv_init_thread_data(); if (hwnd == GetDesktopWindow()) /* change the clip window stored in the desktop process */ {

1 0

Nikolay Sivov : dwrite: Release run info as soon as it' s rendered to save some memory.
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: 6597453403d33b7e372ae9a7d611f771f1008a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6597453403d33b7e372ae9a7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 4 11:16:35 2015 +0300 dwrite: Release run info as soon as it's rendered to save some memory. --- dlls/dwrite/font.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 707ef6d..aaa0f42 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2907,7 +2907,8 @@ static ULONG WINAPI glyphrunanalysis_Release(IDWriteGlyphRunAnalysis *iface) TRACE("(%p)->(%u)\n", This, ref); if (!ref) { - IDWriteFontFace_Release(This->run.fontFace); + if (This->run.fontFace) + IDWriteFontFace_Release(This->run.fontFace); heap_free(This->glyphs); heap_free(This->advances); heap_free(This->offsets); @@ -3088,6 +3089,20 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW IDWriteFontFace2_Release(fontface2); analysis->ready |= RUNANALYSIS_BITMAP; + + /* we don't need this anymore */ + heap_free(analysis->glyphs); + heap_free(analysis->advances); + heap_free(analysis->offsets); + IDWriteFontFace_Release(analysis->run.fontFace); + + analysis->glyphs = NULL; + analysis->advances = NULL; + analysis->offsets = NULL; + analysis->run.glyphIndices = NULL; + analysis->run.glyphAdvances = NULL; + analysis->run.glyphOffsets = NULL; + analysis->run.fontFace = NULL; } static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysis *iface, DWRITE_TEXTURE_TYPE type,

1 0

Ken Thomases : dbghelp: Ignore Mach-O segments other than __TEXT for images in dyld' s shared cache.
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: 49f0bf6f0ba3163028afb2a5910ef4d709abe26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f0bf6f0ba3163028afb2a59… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Aug 4 02:40:38 2015 -0500 dbghelp: Ignore Mach-O segments other than __TEXT for images in dyld's shared cache. Images in the shared cache have their segments mapped non-contiguously. We don't know how to find where the non-__TEXT segments actually are. Also, the code assumes that the image is mapped contiguously in various places. So, we just ignore those segments. Treating the non-contiguous segments as though they were contiguous caused their apparent memory ranges to overlap, leading to addresses being attributed to the wrong module, let alone symbol. --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/image_private.h | 1 + dlls/dbghelp/macho_module.c | 96 ++++++++++++++++++++++++++++++++++-------- dlls/dbghelp/minidump.c | 2 +- dlls/dbghelp/path.c | 2 +- 5 files changed, 83 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49f0bf6f0ba3163028afb…

1 0

Sebastian Lackner : wine.inf: Update timezone information for Morocco Standard Time.
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: 74e6f56a010ddb0aecd7374aae044dd04e2d5dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=74e6f56a010ddb0aecd7374aa… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 4 02:05:22 2015 +0200 wine.inf: Update timezone information for Morocco Standard Time. The timezone information for Morocco was updated recently. --- loader/wine.inf.in | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9214acd..29b0c83 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2936,14 +2936,13 @@ HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Display",,"Africa/Casa HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Dlt",,"Morocco Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Std",,"Morocco Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"TZI",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2015",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,0a,00,00,00,19,00,03,00,00,00,00,00,00,00,df,07,07,00,06,00,12,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2016",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e0,07,0a,00,00,00,1e,00,03,00,00,00,00,00,00,00,e0,07,07,00,06,00,09,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2022",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e6,07,0a,00,00,00,1e,00,03,00,00,00,00,00,00,00,e6,07,05,00,06,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2023",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,0a,00,00,00,1d,00,03,00,00,00,00,00,00,00,e7,07,04,00,06,00,16,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2024",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e8,07,0a,00,00,00,1b,00,03,00,00,00,00,00,00,00,e8,07,04,00,06,00,0d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2025",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e9,07,0a,00,00,00,1a,00,03,00,00,00,00,00,00,00,e9,07,04,00,06,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2035",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,f3,07,0a,00,06,00,1b,00,03,00,00,00,00,00,00,00,f3,07,03,00,00,00,19,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2036",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,f4,07,0a,00,06,00,12,00,03,00,00,00,00,00,00,00,f4,07,03,00,00,00,1e,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2015",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,0a,00,00,00,19,00,03,00,00,00,00,00,00,00,df,07,07,00,00,00,13,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2016",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e0,07,0a,00,00,00,1e,00,03,00,00,00,00,00,00,00,e0,07,07,00,00,00,0a,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2022",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e6,07,0a,00,00,00,1e,00,03,00,00,00,00,00,00,00,e6,07,05,00,00,00,08,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2023",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,0a,00,00,00,1d,00,03,00,00,00,00,00,00,00,e7,07,04,00,00,00,17,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2024",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e8,07,0a,00,00,00,1b,00,03,00,00,00,00,00,00,00,e8,07,04,00,00,00,0e,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2025",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e9,07,0a,00,00,00,1a,00,03,00,00,00,00,00,00,00,e9,07,04,00,00,00,06,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2036",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,f4,07,0a,00,00,00,13,00,03,00,00,00,00,00,00,00,f4,07,03,00,00,00,1e,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Display",,"America/Denver" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Dlt",,"Mountain Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Std",,"Mountain Standard Time"

1 0

Ken Thomases : dbghelp: Fix a copy-paste error in comparing Mach-O segment names.
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: be68890cac2ef9e875e0ccac7288834fa9f9bb43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be68890cac2ef9e875e0ccac7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Aug 4 02:40:37 2015 -0500 dbghelp: Fix a copy-paste error in comparing Mach-O segment names. --- dlls/dbghelp/macho_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 3e91403..8a1c5b2 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -337,7 +337,7 @@ BOOL macho_find_section(struct image_file_map* ifm, const char* segname, const c for (i = 0; i < fmap->num_sections; i++) { if (strcmp(fmap->sect[i].section->sectname, sectname) == 0 && - (!segname || strcmp(fmap->sect[i].section->sectname, segname) == 0)) + (!segname || strcmp(fmap->sect[i].section->segname, segname) == 0)) { ism->fmap = ifm; ism->sidx = i;

1 0

Henri Verbeet : d3d8/tests: Port test_get_set_texture() to d3d8.
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: 1e439a5ed1a0d82931ca8288e2cf961356746b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e439a5ed1a0d82931ca8288e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 08:53:29 2015 +0200 d3d8/tests: Port test_get_set_texture() to d3d8. --- dlls/d3d8/tests/device.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 7158cf7..d7400e7 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4394,6 +4394,58 @@ static void test_cube_textures(void) DestroyWindow(window); } +static void test_get_set_texture(void) +{ + const IDirect3DBaseTexture8Vtbl *texture_vtbl; + IDirect3DBaseTexture8 *texture; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + texture = (IDirect3DBaseTexture8 *)0xdeadbeef; + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_GetTexture(device, 0, &texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!texture, "Got unexpected texture %p.\n", texture); + + hr = IDirect3DDevice8_CreateTexture(device, 16, 16, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_MANAGED, (IDirect3DTexture8 **)&texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + texture_vtbl = texture->lpVtbl; + texture->lpVtbl = (IDirect3DBaseTexture8Vtbl *)0xdeadbeef; + hr = IDirect3DDevice8_SetTexture(device, 0, texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + texture->lpVtbl = NULL; + hr = IDirect3DDevice8_SetTexture(device, 0, texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + texture->lpVtbl = texture_vtbl; + IDirect3DBaseTexture8_Release(texture); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + /* Test the behaviour of the IDirect3DDevice8::CreateImageSurface() method. * * The expected behaviour (as documented in the original DX8 docs) is that the @@ -7270,6 +7322,7 @@ START_TEST(device) test_vb_lock_flags(); test_texture_stage_states(); test_cube_textures(); + test_get_set_texture(); test_image_surface_pool(); test_surface_get_container(); test_lockrect_invalid();

1 0

Henri Verbeet : d2d1: Use the same device for all WIC render targets from the same factory.
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: f0bf9e81fa8cc215f8e9c1d93134ac836deb056d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0bf9e81fa8cc215f8e9c1d93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 08:53:26 2015 +0200 d2d1: Use the same device for all WIC render targets from the same factory. --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/factory.c | 16 +++++++++++++++- dlls/d2d1/wic_render_target.c | 16 ++-------------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index d3c0117..08e0b3f 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -105,7 +105,7 @@ struct d2d_wic_render_target }; HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ID2D1Factory *factory, - IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; + ID3D10Device1 *device, IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; struct d2d_gradient { diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 91534ce..0d15548 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -28,6 +28,8 @@ struct d2d_factory { ID2D1Factory ID2D1Factory_iface; LONG refcount; + + ID3D10Device1 *wic_device; }; static inline struct d2d_factory *impl_from_ID2D1Factory(ID2D1Factory *iface) @@ -71,7 +73,11 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + if (factory->wic_device) + ID3D10Device1_Release(factory->wic_device); HeapFree(GetProcessHeap(), 0, factory); + } return refcount; } @@ -210,6 +216,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory *iface, IWICBitmap *target, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { + struct d2d_factory *factory = impl_from_ID2D1Factory(iface); struct d2d_wic_render_target *object; HRESULT hr; @@ -218,7 +225,14 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_wic_render_target_init(object, iface, target, desc))) + if (!factory->wic_device && FAILED(hr = D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, + D3D10_CREATE_DEVICE_BGRA_SUPPORT, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &factory->wic_device))) + { + WARN("Failed to create device, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = d2d_wic_render_target_init(object, iface, factory->wic_device, target, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index a2ad73a..973303c 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -782,11 +782,10 @@ static const struct ID2D1RenderTargetVtbl d2d_wic_render_target_vtbl = }; HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ID2D1Factory *factory, - IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc) + ID3D10Device1 *device, IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc) { D3D10_TEXTURE2D_DESC texture_desc; ID3D10Texture2D *texture; - ID3D10Device1 *device; HRESULT hr; FIXME("Ignoring render target properties.\n"); @@ -846,17 +845,9 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - if (FAILED(hr = D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, - D3D10_CREATE_DEVICE_BGRA_SUPPORT, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) - { - WARN("Failed to create device, hr %#x.\n", hr); - return hr; - } - if (FAILED(hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &texture))) { WARN("Failed to create texture, hr %#x.\n", hr); - ID3D10Device1_Release(device); return hr; } @@ -865,7 +856,6 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, if (FAILED(hr)) { WARN("Failed to get DXGI surface interface, hr %#x.\n", hr); - ID3D10Device1_Release(device); return hr; } @@ -873,9 +863,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, texture_desc.BindFlags = 0; texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; - hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &render_target->readback_texture); - ID3D10Device1_Release(device); - if (FAILED(hr)) + if (FAILED(hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &render_target->readback_texture))) { WARN("Failed to create readback texture, hr %#x.\n", hr); IDXGISurface_Release(render_target->dxgi_surface);

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateSharedBitmap() .
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: cd59e3db6cd9867dc2f4833323dfb44a22d04ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd59e3db6cd9867dc2f483332… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 08:53:27 2015 +0200 d2d1: Implement d2d_d3d_render_target_CreateSharedBitmap(). --- dlls/d2d1/bitmap.c | 108 +++++++++++++++++++++--------- dlls/d2d1/d2d1_private.h | 4 +- dlls/d2d1/render_target.c | 25 +++++-- dlls/d2d1/tests/Makefile.in | 2 +- dlls/d2d1/tests/d2d1.c | 155 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 259 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd59e3db6cd9867dc2f48…

1 0

Sebastian Lackner : ntdll: Lookup DynamicDST based on current year, instead of year of daylight date.
by Alexandre Julliard Aug. 5, 2015

Aug. 5, 2015

Module: wine Branch: master Commit: 3977ebafc068cf0115df4d6fc22f1d2823e04a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3977ebafc068cf0115df4d6fc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 4 02:05:05 2015 +0200 ntdll: Lookup DynamicDST based on current year, instead of year of daylight date. When there are no further time changes, the function find_dst_change() will return (year_end + 1). This patch ensures that we don't lookup the wrong DynamicDST entry in such a case. --- dlls/ntdll/time.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 850d78f..96ffcfa 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -584,7 +584,7 @@ static BOOL reg_query_value(HKEY hkey, LPCWSTR name, DWORD type, void *data, DWO return TRUE; } -static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi) +static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, int year) { static const WCHAR Time_ZonesW[] = { 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', @@ -600,7 +600,7 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi) UNICODE_STRING nameW, nameDynamicW; WCHAR buf[128], yearW[16]; - sprintfW(yearW, fmtW, tzi->DaylightDate.wYear); + sprintfW(yearW, fmtW, year); attrDynamic.Length = sizeof(attrDynamic); attrDynamic.RootDirectory = 0; /* will be replaced later */ @@ -856,7 +856,7 @@ static int init_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi) tzi->StandardBias); } - find_reg_tz_info(tzi); + find_reg_tz_info(tzi, current_year + 1900); cached_tzi = *tzi; RtlLeaveCriticalSection( &TIME_tz_section );

1 0