September 2011 - Wine-commits

Frédéric Delanoy : ntdll: Add NtCreateFile tests for invalid chars in file/dir name.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: a5229fc51f805d86dccbcc99389093a6dedf9113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5229fc51f805d86dccbcc993… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 11 22:52:45 2011 +0200 ntdll: Add NtCreateFile tests for invalid chars in file/dir name. --- dlls/ntdll/tests/file.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ec62fe7..e299560 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -160,8 +160,10 @@ static void create_file_test(void) { static const WCHAR systemrootW[] = {'\\','S','y','s','t','e','m','R','o','o','t', '\\','f','a','i','l','i','n','g',0}; + static const WCHAR questionmarkInvalidNameW[] = {'a','f','i','l','e','?',0}; + static const WCHAR pipeInvalidNameW[] = {'a','|','b',0}; NTSTATUS status; - HANDLE dir; + HANDLE dir, file; WCHAR path[MAX_PATH]; OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; @@ -249,6 +251,35 @@ static void create_file_test(void) todo_wine ok( status == STATUS_INVALID_PARAMETER, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + /* Invalid chars in file/dirnames */ + pRtlDosPathNameToNtPathName_U(questionmarkInvalidNameW, &nameW, NULL, NULL); + attr.ObjectName = &nameW; + status = pNtCreateFile(&dir, GENERIC_READ|SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ, FILE_CREATE, + FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok(status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + + status = pNtCreateFile(&file, GENERIC_WRITE|SYNCHRONIZE, &attr, &io, NULL, 0, + 0, FILE_CREATE, + FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok(status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + + pRtlDosPathNameToNtPathName_U(pipeInvalidNameW, &nameW, NULL, NULL); + attr.ObjectName = &nameW; + status = pNtCreateFile(&dir, GENERIC_READ|SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ, FILE_CREATE, + FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok(status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + + status = pNtCreateFile(&file, GENERIC_WRITE|SYNCHRONIZE, &attr, &io, NULL, 0, + 0, FILE_CREATE, + FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok(status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); } static void open_file_test(void)

1 0

Piotr Caban : msvcp60: Export more functions on win32.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: eba2ca4a1e33c4c024edc0db0b40a39a4e34f611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba2ca4a1e33c4c024edc0db0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:10:20 2011 +0200 msvcp60: Export more functions on win32. --- dlls/msvcp60/msvcp60.spec | 112 ++++++++++++++++++++++---------------------- 1 files changed, 56 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eba2ca4a1e33c4c024edc…

1 0

Piotr Caban : msvcp90: Added basic_string<char>(allocator<char>) constructor implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 6e4ad3394152077d630bac6cedfa47c81cecef4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4ad3394152077d630bac6ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:10:30 2011 +0200 msvcp90: Added basic_string<char>(allocator<char>) constructor implementation. --- dlls/msvcp90/memory.c | 4 ++-- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 24 ++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index 0941006..85d80ae 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -54,7 +54,7 @@ void* __thiscall MSVCP_allocator_char_ctor(void *this) /* ??0?$allocator(a)D@std@@QAE(a)ABV01@@Z */ /* ??0?$allocator(a)D@std@@QEAA(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_copy_ctor, 8) -void* __thiscall MSVCP_allocator_char_copy_ctor(void *this, void *copy) +void* __thiscall MSVCP_allocator_char_copy_ctor(void *this, const void *copy) { return this; } @@ -62,7 +62,7 @@ void* __thiscall MSVCP_allocator_char_copy_ctor(void *this, void *copy) /* ??4?$allocator(a)D@std@@QAEAAV01(a)ABV01@@Z */ /* ??4?$allocator(a)D@std@@QEAAAEAV01(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_assign, 8); -void* __thiscall MSVCP_allocator_char_assign(void *this, void *assign) +void* __thiscall MSVCP_allocator_char_assign(void *this, const void *assign) { return this; } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index f3062cd..277ef26 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -738,8 +738,8 @@ @ cdecl -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@_K1(a)Z(ptr ptr long long) MSVCP_basic_string_char_ctor_substr @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@IIABV?$allocator(a)D@1@@Z @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@_K1AEBV?$allocator(a)D@1@@Z -@ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV?$allocator(a)D@1@@Z -@ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV?$allocator(a)D@1@@Z +@ thiscall -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV?$allocator(a)D@1@@Z(ptr ptr) MSVCP_basic_string_char_ctor_alloc +@ cdecl -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV?$allocator(a)D@1@@Z(ptr ptr) MSVCP_basic_string_char_ctor_alloc @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ID@Z @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)PEBD0@Z @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)IDABV?$allocator(a)D@1@@Z @@ -790,8 +790,8 @@ @ cdecl -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@_K1(a)Z(ptr ptr long long) MSVCP_basic_string_wchar_ctor_substr @ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV01@IIABV?$allocator(a)_W@1@@Z @ stub -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@_K1AEBV?$allocator(a)_W@1@@Z -@ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV?$allocator(a)_W@1@@Z -@ stub -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV?$allocator(a)_W@1@@Z +@ thiscall -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV?$allocator(a)_W@1@@Z(ptr ptr) MSVCP_basic_string_wchar_ctor_alloc +@ cdecl -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV?$allocator(a)_W@1@@Z(ptr ptr) MSVCP_basic_string_wchar_ctor_alloc @ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)I_W@Z @ stub -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)PEB_W0@Z @ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)I_WABV?$allocator(a)_W@1@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 049659e..dfc0af5 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -793,6 +793,18 @@ basic_string_char* __thiscall MSVCP_basic_string_char_ctor_substr( return this; } +/* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV?$allocator(a)D@1@@Z */ +/* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV?$allocator(a)D@1@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_alloc, 8) +basic_string_char* __thiscall MSVCP_basic_string_char_ctor_alloc( + basic_string_char *this, const void *alloc) +{ + TRACE("%p %p\n", this, alloc); + + basic_string_char_tidy(this, FALSE, 0); + return this; +} + /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_dtor, 4) @@ -1622,6 +1634,18 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_substr( return this; } +/* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV?$allocator(a)_W@1@@Z */ +/* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV?$allocator(a)_W@1@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_ctor_alloc, 8) + basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_alloc( + basic_string_wchar *this, const void *alloc) +{ + TRACE("%p %p\n", this, alloc); + + basic_string_wchar_tidy(this, FALSE, 0); + return this; +} + /* ??1?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ */ /* ??1?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_dtor, 4)

1 0

Piotr Caban : msvcp90: Added basic_string::find(const char*, size_t) implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 44f64f29b33c5e268dc312d50d3ca0b11b809e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f64f29b33c5e268dc312d50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:10:40 2011 +0200 msvcp90: Added basic_string::find(const char*, size_t) implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 277ef26..5518c06 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3821,10 +3821,10 @@ @ stub -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KAEBV12(a)_K@Z @ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIDI(a)Z(ptr long long) MSVCP_basic_string_char_find_ch @ cdecl -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KD_K(a)Z(ptr long long) MSVCP_basic_string_char_find_ch -@ stub -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDI(a)Z +@ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDI(a)Z(ptr str long) MSVCP_basic_string_char_find_cstr_off @ cdecl -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z(ptr str long long) MSVCP_basic_string_char_find_cstr_substr @ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z(ptr str long long) MSVCP_basic_string_char_find_cstr_substr -@ stub -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K(a)Z +@ cdecl -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K(a)Z(ptr str long) MSVCP_basic_string_char_find_cstr_off @ stub -arch=win32 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIABV12(a)I@Z @ stub -arch=win64 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KAEBV12(a)_K@Z @ stub -arch=win32 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIGI(a)Z @@ -3835,10 +3835,10 @@ @ stub -arch=win64 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KPEBG_K(a)Z @ stub -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIABV12(a)I@Z @ stub -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KAEBV12(a)_K@Z -@ stub -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WI(a)Z +@ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WI(a)Z(ptr wstr long) MSVCP_basic_string_wchar_find_cstr_off @ cdecl -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K1(a)Z(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr @ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WII(a)Z(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr -@ stub -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K(a)Z +@ cdecl -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K(a)Z(ptr wstr long) MSVCP_basic_string_wchar_find_cstr_off @ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEI_WI(a)Z(ptr long long) MSVCP_basic_string_wchar_find_ch @ cdecl -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_K_W_K(a)Z(ptr long long) MSVCP_basic_string_wchar_find_ch @ cdecl -arch=win32 ?find@?$char_traits(a)D@std@@SAPBDPBDIABD(a)Z(ptr long ptr) MSVCP_char_traits_char_find diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index dfc0af5..c25c7f1 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1172,6 +1172,16 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_find_cstr_substr( return MSVCP_basic_string_char_npos; } +/* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDI(a)Z */ +/* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_cstr_off, 12) +MSVCP_size_t __thiscall MSVCP_basic_string_char_find_cstr_off( + const basic_string_char *this, const char *find, MSVCP_size_t pos) +{ + return MSVCP_basic_string_char_find_cstr_substr(this, find, pos, + MSVCP_char_traits_char_length(find)); +} + /* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIDI(a)Z */ /* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KD_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_ch, 12) @@ -2013,6 +2023,16 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_cstr_substr( return MSVCP_basic_string_wchar_npos; } +/* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WI(a)Z */ +/* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_cstr_off, 12) +MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_cstr_off( + const basic_string_wchar *this, const wchar_t *find, MSVCP_size_t pos) +{ + return MSVCP_basic_string_wchar_find_cstr_substr(this, find, pos, + MSVCP_char_traits_wchar_length(find)); +} + /* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEI_WI(a)Z */ /* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_K_W_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_ch, 12)

1 0

Alexandre Julliard : winex11: Create a separate graphics driver for XRender .
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 40957d025df468c1693b2c259a76466a857b6d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=40957d025df468c1693b2c259… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:39:17 2011 +0200 winex11: Create a separate graphics driver for XRender. --- dlls/winex11.drv/init.c | 10 ++- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xrender.c | 192 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 195 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40957d025df468c1693b2…

1 0

Alexandre Julliard : winex11: Store the XRender info structure inside the XRender physdev object.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: b74a33d9b3393c3396a1a17b8fbf650a082e3f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74a33d9b3393c3396a1a17b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:39:56 2011 +0200 winex11: Store the XRender info structure inside the XRender physdev object. --- dlls/winex11.drv/init.c | 2 - dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xrender.c | 82 +++++++++++++++++++++++++------------------ 3 files changed, 48 insertions(+), 37 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 94e6830..b0592fa 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -193,8 +193,6 @@ static BOOL X11DRV_DeleteDC( PHYSDEV dev ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - if(physDev->xrender) - X11DRV_XRender_DeleteDC( physDev ); DeleteObject( physDev->region ); wine_tsx11_lock(); XFreeGC( gdi_display, physDev->gc ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4793916..55b4f22 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -305,7 +305,6 @@ extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_XRender_Finalize(void) DECLSPEC_HIDDEN; extern BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE*, HFONT) DECLSPEC_HIDDEN; extern void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data) DECLSPEC_HIDDEN; -extern void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE*) DECLSPEC_HIDDEN; extern void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height) DECLSPEC_HIDDEN; extern BOOL X11DRV_XRender_ExtTextOut(X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 75ff44e..f5c37fe 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -156,6 +156,7 @@ struct xrender_physdev { struct gdi_physdev dev; X11DRV_PDEVICE *x11dev; + struct xrender_info info; }; static inline struct xrender_physdev *get_xrender_dev( PHYSDEV dev ) @@ -622,6 +623,29 @@ static Picture get_xrender_picture_source(X11DRV_PDEVICE *physDev, BOOL repeat) return info->pict_src; } +static void free_xrender_picture( struct xrender_physdev *dev ) +{ + if (dev->info.pict || dev->info.pict_src) + { + wine_tsx11_lock(); + XFlush( gdi_display ); + if (dev->info.pict) + { + TRACE("freeing pict = %lx dc = %p\n", dev->info.pict, dev->dev.hdc); + pXRenderFreePicture(gdi_display, dev->info.pict); + dev->info.pict = 0; + } + if(dev->info.pict_src) + { + TRACE("freeing pict = %lx dc = %p\n", dev->info.pict_src, dev->dev.hdc); + pXRenderFreePicture(gdi_display, dev->info.pict_src); + dev->info.pict_src = 0; + } + wine_tsx11_unlock(); + } + dev->info.format = NULL; +} + /* return a mask picture used to force alpha to 0 */ static Picture get_no_alpha_mask(void) { @@ -1112,18 +1136,28 @@ void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *da } } + +static BOOL create_xrender_dc( PHYSDEV *pdev ) +{ + X11DRV_PDEVICE *x11dev = get_x11drv_dev( *pdev ); + struct xrender_physdev *physdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physdev) ); + + if (!physdev) return FALSE; + physdev->x11dev = x11dev; + physdev->info.cache_index = -1; + physdev->info.format = get_xrender_format_from_color_shifts( x11dev->depth, x11dev->color_shifts ); + x11dev->xrender = &physdev->info; + push_dc_driver( pdev, &physdev->dev, &xrender_funcs ); + return TRUE; +} + /********************************************************************** * xrenderdrv_CreateDC */ static BOOL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW* initData ) { - struct xrender_physdev *physdev = HeapAlloc( GetProcessHeap(), 0, sizeof(*physdev) ); - - if (!physdev) return FALSE; - physdev->x11dev = get_x11drv_dev( *pdev ); - push_dc_driver( pdev, &physdev->dev, &xrender_funcs ); - return TRUE; + return create_xrender_dc( pdev ); } /********************************************************************** @@ -1131,8 +1165,6 @@ static BOOL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, */ static BOOL xrenderdrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) { - struct xrender_physdev *physdev; - if (orig) /* chain to x11drv first */ { orig = GET_NEXT_PHYSDEV( orig, pCreateCompatibleDC ); @@ -1140,10 +1172,7 @@ static BOOL xrenderdrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) } /* otherwise we have been called by x11drv */ - if (!(physdev = HeapAlloc( GetProcessHeap(), 0, sizeof(*physdev) ))) return FALSE; - physdev->x11dev = get_x11drv_dev( *pdev ); - push_dc_driver( pdev, &physdev->dev, &xrender_funcs ); - return TRUE; + return create_xrender_dc( pdev ); } /********************************************************************** @@ -1152,25 +1181,16 @@ static BOOL xrenderdrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) static BOOL xrenderdrv_DeleteDC( PHYSDEV dev ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); - HeapFree( GetProcessHeap(), 0, physdev ); - return TRUE; -} -/*********************************************************************** - * X11DRV_XRender_DeleteDC - */ -void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) -{ - X11DRV_XRender_UpdateDrawable(physDev); + free_xrender_picture( physdev ); - EnterCriticalSection(&xrender_cs); - if(physDev->xrender->cache_index != -1) - dec_ref_cache(physDev->xrender->cache_index); - LeaveCriticalSection(&xrender_cs); + EnterCriticalSection( &xrender_cs ); + if (physdev->info.cache_index != -1) dec_ref_cache( physdev->info.cache_index ); + LeaveCriticalSection( &xrender_cs ); - HeapFree(GetProcessHeap(), 0, physDev->xrender); - physDev->xrender = NULL; - return; + physdev->x11dev->xrender = NULL; + HeapFree( GetProcessHeap(), 0, physdev ); + return TRUE; } BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib) @@ -2596,12 +2616,6 @@ BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE *physDev, HFONT hfont) return FALSE; } -void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) -{ - assert(0); - return; -} - void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data) { assert(0);

1 0

Alexandre Julliard : winex11: Add an ExtEscape entry point in the XRender driver.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 89d8d1d427a322661970853026855fadc4dc317e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d8d1d427a32266197085302… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 12:04:41 2011 +0200 winex11: Add an ExtEscape entry point in the XRender driver. --- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/xrender.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index b0592fa..db430ec 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -358,7 +358,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d if (in_count >= sizeof(struct x11drv_escape_set_drawable)) { const struct x11drv_escape_set_drawable *data = in_data; - if(physDev->xrender) X11DRV_XRender_UpdateDrawable( physDev ); physDev->dc_rect = data->dc_rect; physDev->drawable = data->drawable; physDev->drawable_rect = data->drawable_rect; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index f5c37fe..3b931b2 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -646,6 +646,13 @@ static void free_xrender_picture( struct xrender_physdev *dev ) dev->info.format = NULL; } +static void update_xrender_drawable( struct xrender_physdev *dev ) +{ + free_xrender_picture( dev ); + dev->info.format = get_xrender_format_from_color_shifts( dev->x11dev->depth, + dev->x11dev->color_shifts ); +} + /* return a mask picture used to force alpha to 0 */ static Picture get_no_alpha_mask(void) { @@ -1193,6 +1200,28 @@ static BOOL xrenderdrv_DeleteDC( PHYSDEV dev ) return TRUE; } +/********************************************************************** + * xrenderdrv_ExtEscape + */ +static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data, + INT out_count, LPVOID out_data ) +{ + struct xrender_physdev *physdev = get_xrender_dev( dev ); + + dev = GET_NEXT_PHYSDEV( dev, pExtEscape ); + + if (escape == X11DRV_ESCAPE && in_data && in_count >= sizeof(enum x11drv_escape_codes)) + { + if (*(const enum x11drv_escape_codes *)in_data == X11DRV_SET_DRAWABLE) + { + BOOL ret = dev->funcs->pExtEscape( dev, escape, in_count, in_data, out_count, out_data ); + if (ret) update_xrender_drawable( physdev ); + return ret; + } + } + return dev->funcs->pExtEscape( dev, escape, in_count, in_data, out_count, out_data ); +} + BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib) { const WineXRenderFormat *fmt; @@ -2504,7 +2533,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pEnumICMProfiles */ NULL, /* pExcludeClipRect */ NULL, /* pExtDeviceMode */ - NULL, /* pExtEscape */ + xrenderdrv_ExtEscape, /* pExtEscape */ NULL, /* pExtFloodFill */ NULL, /* pExtSelectClipRgn */ NULL, /* pExtTextOut */

1 0

Alexandre Julliard : winex11: Add bitmap entry points to the XRender driver .
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 225d8abec90fbd41c59ec95af5d65c22a564b9b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=225d8abec90fbd41c59ec95af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 12:12:15 2011 +0200 winex11: Add bitmap entry points to the XRender driver. --- dlls/winex11.drv/bitmap.c | 3 - dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xrender.c | 101 +++++++++++++++++++++++++------------------ 3 files changed, 59 insertions(+), 46 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index af6266b..6c5eb26 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -95,9 +95,6 @@ HBITMAP X11DRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) if (!GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return 0; - if(physDev->xrender) - X11DRV_XRender_UpdateDrawable( physDev ); - if (hbitmap == BITMAP_stock_phys_bitmap.hbitmap) physBitmap = &BITMAP_stock_phys_bitmap; else if (!(physBitmap = X11DRV_get_phys_bitmap( hbitmap ))) return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 55b4f22..e8cda91 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -313,7 +313,6 @@ extern BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, const struct bitblt_coords *src, const struct bitblt_coords *dst ) DECLSPEC_HIDDEN; -extern void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) DECLSPEC_HIDDEN; extern BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, struct bitblt_coords *dst, X11DRV_PDEVICE *devSrc, struct bitblt_coords *src, BLENDFUNCTION blendfn ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 3b931b2..e2a9858 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1222,6 +1222,60 @@ static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID return dev->funcs->pExtEscape( dev, escape, in_count, in_data, out_count, out_data ); } +/**************************************************************************** + * xrenderdrv_CreateBitmap + */ +static BOOL xrenderdrv_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) +{ + dev = GET_NEXT_PHYSDEV( dev, pCreateBitmap ); + return dev->funcs->pCreateBitmap( dev, hbitmap ); +} + +/**************************************************************************** + * xrenderdrv_DeleteBitmap + */ +static BOOL xrenderdrv_DeleteBitmap( HBITMAP hbitmap ) +{ + return X11DRV_DeleteBitmap( hbitmap ); +} + +/*********************************************************************** + * xrenderdrv_SelectBitmap + */ +static HBITMAP xrenderdrv_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) +{ + HBITMAP ret; + struct xrender_physdev *physdev = get_xrender_dev( dev ); + + dev = GET_NEXT_PHYSDEV( dev, pSelectBitmap ); + ret = dev->funcs->pSelectBitmap( dev, hbitmap ); + if (ret) update_xrender_drawable( physdev ); + return ret; +} + +/*********************************************************************** + * xrenderdrv_GetImage + */ +static DWORD xrenderdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, + struct gdi_image_bits *bits, struct bitblt_coords *src ) +{ + if (hbitmap) return X11DRV_GetImage( dev, hbitmap, info, bits, src ); + dev = GET_NEXT_PHYSDEV( dev, pGetImage ); + return dev->funcs->pGetImage( dev, hbitmap, info, bits, src ); +} + +/*********************************************************************** + * xrenderdrv_PutImage + */ +static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) +{ + if (hbitmap) return X11DRV_PutImage( dev, hbitmap, clip, info, bits, src, dst, rop ); + dev = GET_NEXT_PHYSDEV( dev, pPutImage ); + return dev->funcs->pPutImage( dev, hbitmap, clip, info, bits, src, dst, rop ); +} + BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib) { const WineXRenderFormat *fmt; @@ -1295,37 +1349,6 @@ BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, return TRUE; } -/*********************************************************************** - * X11DRV_XRender_UpdateDrawable - * - * Deletes the pict and tile when the drawable changes. - */ -void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) -{ - struct xrender_info *info = physDev->xrender; - - if (info->pict || info->pict_src) - { - wine_tsx11_lock(); - XFlush( gdi_display ); - if (info->pict) - { - TRACE("freeing pict = %lx dc = %p\n", info->pict, physDev->dev.hdc); - pXRenderFreePicture(gdi_display, info->pict); - info->pict = 0; - } - if(info->pict_src) - { - TRACE("freeing pict = %lx dc = %p\n", info->pict_src, physDev->dev.hdc); - pXRenderFreePicture(gdi_display, info->pict_src); - info->pict_src = 0; - } - wine_tsx11_unlock(); - } - - info->format = NULL; -} - /************************************************************************ * UploadGlyph * @@ -2516,11 +2539,11 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ - NULL, /* pCreateBitmap */ + xrenderdrv_CreateBitmap, /* pCreateBitmap */ xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */ xrenderdrv_CreateDC, /* pCreateDC */ NULL, /* pCreateDIBSection */ - NULL, /* pDeleteBitmap */ + xrenderdrv_DeleteBitmap, /* pDeleteBitmap */ xrenderdrv_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ NULL, /* pDescribePixelFormat */ @@ -2546,7 +2569,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetICMProfile */ - NULL, /* pGetImage */ + xrenderdrv_GetImage, /* pGetImage */ NULL, /* pGetNearestColor */ NULL, /* pGetPixel */ NULL, /* pGetPixelFormat */ @@ -2572,7 +2595,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pPolygon */ NULL, /* pPolyline */ NULL, /* pPolylineTo */ - NULL, /* pPutImage */ + xrenderdrv_PutImage, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */ NULL, /* pRectangle */ @@ -2582,7 +2605,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pSaveDC */ NULL, /* pScaleViewportExt */ NULL, /* pScaleWindowExt */ - NULL, /* pSelectBitmap */ + xrenderdrv_SelectBitmap, /* pSelectBitmap */ NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ NULL, /* pSelectFont */ @@ -2659,12 +2682,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag return FALSE; } -void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) -{ - assert(0); - return; -} - BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, struct bitblt_coords *dst, X11DRV_PDEVICE *devSrc, struct bitblt_coords *src, BLENDFUNCTION blendfn ) {

1 0

Alexandre Julliard : winex11: Add a SelectFont entry point in the XRender driver.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: cbfcce1a3dd1de19cb7fade8455448ab24613e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbfcce1a3dd1de19cb7fade84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:50:42 2011 +0200 winex11: Add a SelectFont entry point in the XRender driver. --- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xfont.c | 6 ------ dlls/winex11.drv/xrender.c | 42 ++++++++++++++++++++---------------------- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e8cda91..e5010b4 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -303,7 +303,6 @@ extern int client_side_antialias_with_render DECLSPEC_HIDDEN; extern int using_client_side_fonts DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_XRender_Finalize(void) DECLSPEC_HIDDEN; -extern BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE*, HFONT) DECLSPEC_HIDDEN; extern void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data) DECLSPEC_HIDDEN; extern void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height) DECLSPEC_HIDDEN; extern BOOL X11DRV_XRender_ExtTextOut(X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 1e6e47c..35d23d6 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -3238,12 +3238,6 @@ HFONT X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) TRACE("gdiFont = %p\n", gdiFont); - if(gdiFont && using_client_side_fonts) { - X11DRV_XRender_SelectFont(physDev, hfont); - physDev->has_gdi_font = TRUE; - return FALSE; - } - EnterCriticalSection( &crtsc_fonts_X11 ); if(fontList == NULL) X11DRV_FONT_InitX11Metrics(); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e2a9858..7c70c30 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1091,24 +1091,30 @@ void X11DRV_XRender_Finalize(void) LeaveCriticalSection(&xrender_cs); } - -/*********************************************************************** - * X11DRV_XRender_SelectFont +/********************************************************************** + * xrenderdrv_SelectFont */ -BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE *physDev, HFONT hfont) +static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) { + struct xrender_physdev *physdev = get_xrender_dev( dev ); LFANDSIZE lfsz; - struct xrender_info *info; - GetObjectW(hfont, sizeof(lfsz.lf), &lfsz.lf); + if (!GetObjectW( hfont, sizeof(lfsz.lf), &lfsz.lf )) return HGDI_ERROR; + + if (!gdiFont) + { + dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); + return dev->funcs->pSelectFont( dev, hfont, gdiFont ); + } + TRACE("h=%d w=%d weight=%d it=%d charset=%d name=%s\n", lfsz.lf.lfHeight, lfsz.lf.lfWidth, lfsz.lf.lfWeight, lfsz.lf.lfItalic, lfsz.lf.lfCharSet, debugstr_w(lfsz.lf.lfFaceName)); lfsz.lf.lfWidth = abs( lfsz.lf.lfWidth ); - lfsz.devsize.cx = X11DRV_XWStoDS( physDev, lfsz.lf.lfWidth ); - lfsz.devsize.cy = X11DRV_YWStoDS( physDev, lfsz.lf.lfHeight ); + lfsz.devsize.cx = X11DRV_XWStoDS( physdev->x11dev, lfsz.lf.lfWidth ); + lfsz.devsize.cy = X11DRV_YWStoDS( physdev->x11dev, lfsz.lf.lfHeight ); - GetTransform( physDev->dev.hdc, 0x204, &lfsz.xform ); + GetTransform( dev->hdc, 0x204, &lfsz.xform ); TRACE("font transform %f %f %f %f\n", lfsz.xform.eM11, lfsz.xform.eM12, lfsz.xform.eM21, lfsz.xform.eM22); @@ -1117,14 +1123,12 @@ BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE *physDev, HFONT hfont) lfsz_calc_hash(&lfsz); - info = get_xrender_info(physDev); - if (!info) return 0; - EnterCriticalSection(&xrender_cs); - if(info->cache_index != -1) - dec_ref_cache(info->cache_index); - info->cache_index = GetCacheEntry(physDev, &lfsz); + if (physdev->info.cache_index != -1) + dec_ref_cache( physdev->info.cache_index ); + physdev->info.cache_index = GetCacheEntry( physdev->x11dev, &lfsz ); LeaveCriticalSection(&xrender_cs); + physdev->x11dev->has_gdi_font = TRUE; return 0; } @@ -2608,7 +2612,7 @@ static const struct gdi_dc_funcs xrender_funcs = xrenderdrv_SelectBitmap, /* pSelectBitmap */ NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ - NULL, /* pSelectFont */ + xrenderdrv_SelectFont, /* pSelectFont */ NULL, /* pSelectPalette */ NULL, /* pSelectPen */ NULL, /* pSetArcDirection */ @@ -2662,12 +2666,6 @@ void X11DRV_XRender_Finalize(void) { } -BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE *physDev, HFONT hfont) -{ - assert(0); - return FALSE; -} - void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data) { assert(0);

1 0

Alexandre Julliard : winex11: Add an ExtTextOut entry point in the XRender driver.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 5a2ab8364afe9104937939f5c79b6f15a81e82a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2ab8364afe9104937939f5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:57:22 2011 +0200 winex11: Add an ExtTextOut entry point in the XRender driver. --- dlls/winex11.drv/text.c | 3 - dlls/winex11.drv/x11drv.h | 3 - dlls/winex11.drv/xrender.c | 153 +++++++++++++++++++++---------------------- 3 files changed, 75 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a2ab8364afe910493793…

1 0