wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Nikolay Sivov : dwrite: Bitmap buffer is zeroed on allocation, no need to do it again.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 3f4a284f58036cc9e4dbc6765900ac9ca3a37e38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4a284f58036cc9e4dbc6765… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 27 08:39:25 2015 +0300 dwrite: Bitmap buffer is zeroed on allocation, no need to do it again. --- dlls/dwrite/freetype.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index dc6d701..1f7e6a9 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -539,7 +539,6 @@ void freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) ft_bitmap.buffer = bitmap->buf; /* Note: FreeType will only set 'black' bits for us. */ - memset(bitmap->buf, 0, height * bitmap->pitch); if (pFT_Outline_New(library, src->n_points, src->n_contours, &copy) == 0) { pFT_Outline_Copy(src, &copy); pFT_Outline_Translate(&copy, -bbox->left << 6, bbox->bottom << 6); @@ -553,8 +552,6 @@ void freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) int w = min(bitmap->pitch, (ft_bitmap->width + 7) >> 3); int h = min(height, ft_bitmap->rows); - memset(bitmap->buf, 0, height * bitmap->pitch); - while (h--) { memcpy(dst, src, w); src += ft_bitmap->pitch; @@ -680,8 +677,6 @@ void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) void freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) { - UINT32 size = (bitmap->bbox.right - bitmap->bbox.left)*(bitmap->bbox.bottom - bitmap->bbox.top); - memset(bitmap->buf, 0, size); } INT freetype_get_charmap_index(IDWriteFontFace2 *fontface, BOOL *is_symbol)

1 0

Nikolay Sivov : dwrite: Cleanup rendering interface with freetype.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 2c4ba8a0087d0145709cdf28692da879d47ecb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c4ba8a0087d0145709cdf286… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 27 08:38:50 2015 +0300 dwrite: Cleanup rendering interface with freetype. --- dlls/dwrite/dwrite_private.h | 14 +++++++-- dlls/dwrite/font.c | 71 +++++++++++++++++++++++++++----------------- dlls/dwrite/freetype.c | 58 ++++++++++++++++++------------------ 3 files changed, 84 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c4ba8a0087d0145709cd…

1 0

Martin Storsjo : ucrtbase: Hook up _crt_atexit.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 9303c6eeed57fc27b278f3e1399fd94ba29ddb0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9303c6eeed57fc27b278f3e13… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Aug 27 00:06:35 2015 +0300 ucrtbase: Hook up _crt_atexit. --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 11 insertions(+), 2 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 8e8fd08..77afe01 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 @@ -29,7 +29,7 @@ @ cdecl _controlfp(long long) ucrtbase._controlfp @ cdecl _controlfp_s(ptr long long) ucrtbase._controlfp_s @ stub _crt_at_quick_exit -@ stub _crt_atexit +@ cdecl _crt_atexit(ptr) ucrtbase._crt_atexit @ stub _crt_debugger_hook @ cdecl _endthread() ucrtbase._endthread @ cdecl _endthreadex(long) ucrtbase._endthreadex diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 3d79a4d..0f1343d 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -326,6 +326,15 @@ int CDECL MSVCRT_atexit(void (*func)(void)) } /********************************************************************* + * _crt_atexit (UCRTBASE.@) + */ +int CDECL MSVCRT__crt_atexit(void (*func)(void)) +{ + TRACE("(%p)\n", func); + return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; +} + +/********************************************************************* * _set_purecall_handler (MSVCR71.@) */ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler function) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index aacffb8..bb56408 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -241,7 +241,7 @@ @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale @ stub _crt_at_quick_exit -@ stub _crt_atexit +@ cdecl _crt_atexit(ptr) MSVCRT__crt_atexit @ stub _crt_debugger_hook @ cdecl _ctime32(ptr) MSVCRT__ctime32 @ cdecl _ctime32_s(str long ptr) MSVCRT__ctime32_s

1 0

Martin Storsjo : ucrtbase: Hook up the _set_app_type, _set_new_handler and _set_new_mode functions.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 8c5057f33467510032519bd90bb696a0fbc4cba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5057f33467510032519bd90… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 26 10:24:30 2015 +0300 ucrtbase: Hook up the _set_app_type, _set_new_handler and _set_new_mode functions. These have changed function signature since msvcr120. _set_app_type used to be called __set_app_type, and the _set_new_* functions used to have C++ signatures. --- dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 2 +- .../api-ms-win-crt-runtime-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec index 5ae19b4..18ca9d4 100644 --- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec +++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec @@ -20,7 +20,7 @@ @ stub _query_new_mode @ stub _realloc_base @ cdecl _recalloc(ptr long long) ucrtbase._recalloc -@ stub _set_new_mode +@ cdecl _set_new_mode(long) ucrtbase._set_new_mode @ cdecl calloc(long long) ucrtbase.calloc @ cdecl free(ptr) ucrtbase.free @ cdecl malloc(long) ucrtbase.malloc 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 561340d..8e8fd08 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 @@ -66,13 +66,13 @@ @ stub _seh_filter_dll @ stub _seh_filter_exe @ cdecl _set_abort_behavior(long long) ucrtbase._set_abort_behavior -@ stub _set_app_type +@ cdecl _set_app_type(long) ucrtbase._set_app_type @ cdecl _set_controlfp(long long) ucrtbase._set_controlfp @ cdecl _set_doserrno(long) ucrtbase._set_doserrno @ cdecl _set_errno(long) ucrtbase._set_errno @ cdecl _set_error_mode(long) ucrtbase._set_error_mode @ cdecl _set_invalid_parameter_handler(ptr) ucrtbase._set_invalid_parameter_handler -@ stub _set_new_handler +@ cdecl _set_new_handler(ptr) ucrtbase._set_new_handler @ stub _set_thread_local_invalid_parameter_handler @ cdecl _seterrormode(long) ucrtbase._seterrormode @ cdecl _sleep(long) ucrtbase._sleep diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d6516d7..aacffb8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1881,15 +1881,15 @@ @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior -@ stub _set_app_type +@ cdecl _set_app_type(long) MSVCRT___set_app_type @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long) @ cdecl _set_errno(long) @ cdecl _set_error_mode(long) @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) -@ stub _set_new_handler -@ stub _set_new_mode +@ cdecl _set_new_handler(ptr) MSVCRT_set_new_handler +@ cdecl _set_new_mode(long) MSVCRT__set_new_mode @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) @ stub _set_se_translator

1 0

Daniel Lehman : kernel32: Add Invariant string table.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 043c0c6c5a5f1ee51ca64be0498608cdfbe92979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=043c0c6c5a5f1ee51ca64be04… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Aug 25 23:08:04 2015 -0700 kernel32: Add Invariant string table. --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/ivl.nls | 160 +++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/locale.c | 2 +- 3 files changed, 163 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index 890c717..363e7ab 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -249,3 +249,5 @@ #include "nls/cor.nls" /* 0x0492 LANG_CORNISH, SUBLANG_DEFAULT */ #include "nls/gdv.nls" /* 0x0494 LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC */ + +#include "nls/ivl.nls" /* 0x047f LANG_INVARIANT, SUBLANG_NEUTRAL */ diff --git a/dlls/kernel32/nls/ivl.nls b/dlls/kernel32/nls/ivl.nls new file mode 100644 index 0000000..8f34a08 --- /dev/null +++ b/dlls/kernel32/nls/ivl.nls @@ -0,0 +1,160 @@ +/* + * Locale definitions for Invariant + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(1252) + +STRINGTABLE LANGUAGE LANG_INVARIANT, SUBLANG_NEUTRAL +{ + LOCALE_FONTSIGNATURE L"\x00af\x8000\x38cb\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x8000\x01ff\x003f\x8000\xffff" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "1" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "0" + LOCALE_IDATE "0" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "437" + LOCALE_IDEFAULTCOUNTRY "1" + LOCALE_IDEFAULTEBCDICCODEPAGE "037" + LOCALE_IDEFAULTLANGUAGE "0409" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28591" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "6" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "007f" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "0" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "0" + LOCALE_INEGSIGNPOSN "0" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_INEUTRAL "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "0" + LOCALE_IPOSSIGNPOSN "3" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "AM" + LOCALE_S2359 "PM" + LOCALE_SABBREVCTRYNAME "IVC" + LOCALE_SABBREVDAYNAME1 "Mon" + LOCALE_SABBREVDAYNAME2 "Tue" + LOCALE_SABBREVDAYNAME3 "Wed" + LOCALE_SABBREVDAYNAME4 "Thu" + LOCALE_SABBREVDAYNAME5 "Fri" + LOCALE_SABBREVDAYNAME6 "Sat" + LOCALE_SABBREVDAYNAME7 "Sun" + LOCALE_SABBREVLANGNAME "IVL" + LOCALE_SABBREVMONTHNAME1 "Jan" + LOCALE_SABBREVMONTHNAME2 "Feb" + LOCALE_SABBREVMONTHNAME3 "Mar" + LOCALE_SABBREVMONTHNAME4 "Apr" + LOCALE_SABBREVMONTHNAME5 "May" + LOCALE_SABBREVMONTHNAME6 "Jun" + LOCALE_SABBREVMONTHNAME7 "Jul" + LOCALE_SABBREVMONTHNAME8 "Aug" + LOCALE_SABBREVMONTHNAME9 "Sep" + LOCALE_SABBREVMONTHNAME10 "Oct" + LOCALE_SABBREVMONTHNAME11 "Nov" + LOCALE_SABBREVMONTHNAME12 "Dec" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Invariant Country" + LOCALE_SCURRENCY L"\x00a4" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "Monday" + LOCALE_SDAYNAME2 "Tuesday" + LOCALE_SDAYNAME3 "Wednesday" + LOCALE_SDAYNAME4 "Thursday" + LOCALE_SDAYNAME5 "Friday" + LOCALE_SDAYNAME6 "Saturday" + LOCALE_SDAYNAME7 "Sunday" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "Invariant Country" + LOCALE_SENGCURRNAME "International Monetary Fund" + LOCALE_SENGLANGUAGE "Invariant Language" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "XDR" + LOCALE_SISO3166CTRYNAME "IV" + LOCALE_SISO639LANGNAME "iv" + LOCALE_SLANGUAGE "Invariant Language (Invariant Country)" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dddd, dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "January" + LOCALE_SMONTHNAME2 "February" + LOCALE_SMONTHNAME3 "March" + LOCALE_SMONTHNAME4 "April" + LOCALE_SMONTHNAME5 "May" + LOCALE_SMONTHNAME6 "June" + LOCALE_SMONTHNAME7 "July" + LOCALE_SMONTHNAME8 "August" + LOCALE_SMONTHNAME9 "September" + LOCALE_SMONTHNAME10 "October" + LOCALE_SMONTHNAME11 "November" + LOCALE_SMONTHNAME12 "December" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "" + LOCALE_SNATIVECTRYNAME "Invariant Country" + LOCALE_SNATIVECURRNAME "International Monetary Fund" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "Invariant Language (Invariant Country)" + LOCALE_SNATIVELANGNAME "Invariant Language" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "dflt" + LOCALE_SPOSITIVESIGN "+" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SSHORTDATE "MM/dd/yyyy" + LOCALE_SSORTNAME "Math Alphanumerics" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "yyyy MMMM" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 51e2b07..c48a620 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2420,7 +2420,7 @@ static void test_LocaleNameToLCID(void) lcid = pLocaleNameToLCID(LOCALE_NAME_INVARIANT, 0); ok(lcid == 0x7F, "Expected lcid = 0x7F, got %08x, error %d\n", lcid, GetLastError()); ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); - todo_wine ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); + ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); trace("%08x, %s\n", lcid, wine_dbgstr_w(buffer)); /* bad name */

1 0

Philippe Groarke : crypt32: Add CERT_OCSP_RESPONSE_PROP_ID setter.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: dcc6868057605296a7dacd89211e0673396abe45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc6868057605296a7dacd892… Author: Philippe Groarke <philippe.groarke(a)gmail.com> Date: Wed Aug 26 01:36:29 2015 -0400 crypt32: Add CERT_OCSP_RESPONSE_PROP_ID setter. --- dlls/crypt32/cert.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 0cda2c4..a4b43ff 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -694,6 +694,7 @@ static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId, case CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID: case CERT_ENROLLMENT_PROP_ID: case CERT_CROSS_CERT_DIST_POINTS_PROP_ID: + case CERT_OCSP_RESPONSE_PROP_ID: case CERT_RENEWAL_PROP_ID: { if (pvData)

1 0

Henri Verbeet : wined3d: Use unsigned mask constants in shifts.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 2773b27bb14c47a07007b1f72b9167a6be79fcd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2773b27bb14c47a07007b1f72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 26 12:46:47 2015 +0200 wined3d: Use unsigned mask constants in shifts. --- dlls/wined3d/arb_program_shader.c | 66 ++++++++++++++----------- dlls/wined3d/buffer.c | 8 +-- dlls/wined3d/context.c | 40 +++++++-------- dlls/wined3d/device.c | 36 +++++++------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/drawprim.c | 24 ++++----- dlls/wined3d/glsl_shader.c | 96 ++++++++++++++++++------------------ dlls/wined3d/nvidia_texture_shader.c | 12 +++-- dlls/wined3d/shader.c | 70 +++++++++++++------------- dlls/wined3d/shader_sm1.c | 38 +++++++------- dlls/wined3d/shader_sm4.c | 28 +++++------ dlls/wined3d/state.c | 62 +++++++++++------------ dlls/wined3d/stateblock.c | 22 ++++----- dlls/wined3d/surface.c | 16 +++--- dlls/wined3d/utils.c | 62 +++++++++++------------ dlls/wined3d/wined3d_private.h | 64 ++++++++++++------------ include/wine/wined3d.h | 38 +++++++------- 17 files changed, 348 insertions(+), 336 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2773b27bb14c47a07007b…

1 0

Henri Verbeet : wined3d: Get rid of some powf() calls.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 9f530b579eeb538b28e38cd223894cd9374b72f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f530b579eeb538b28e38cd22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 26 12:46:46 2015 +0200 wined3d: Get rid of some powf() calls. --- dlls/wined3d/surface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 85ad4a4..fc00823 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1795,21 +1795,21 @@ static inline unsigned short float_32_to_16(const float *in) if (isinf(*in)) return (*in < 0.0f ? 0xfc00 : 0x7c00); - if (tmp < powf(2, 10)) + if (tmp < (float)(1u << 10)) { do { tmp = tmp * 2.0f; exp--; - } while (tmp < powf(2, 10)); + } while (tmp < (float)(1u << 10)); } - else if (tmp >= powf(2, 11)) + else if (tmp >= (float)(1u << 11)) { do { tmp /= 2.0f; exp++; - } while (tmp >= powf(2, 11)); + } while (tmp >= (float)(1u << 11)); } mantissa = (unsigned int)tmp;

1 0

Józef Kucia : d3d11: Implement d3d11_texture2d_GetDevice.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: c917a987dc3ae94c4c42047599fee79e64afcc97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c917a987dc3ae94c4c4204759… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 26 00:56:06 2015 +0200 d3d11: Implement d3d11_texture2d_GetDevice. --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/texture.c | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 93a957c..ebbbec9 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -95,7 +95,7 @@ struct d3d10_texture2d IUnknown *dxgi_surface; struct wined3d_texture *wined3d_texture; D3D10_TEXTURE2D_DESC desc; - ID3D10Device1 *device; + ID3D11Device *device; }; static inline struct d3d10_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 940567a..2fe0c50 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -76,7 +76,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface) if (refcount == 1) { - ID3D10Device1_AddRef(texture->device); + ID3D11Device_AddRef(texture->device); wined3d_mutex_lock(); wined3d_texture_incref(texture->wined3d_texture); wined3d_mutex_unlock(); @@ -94,14 +94,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface) if (!refcount) { - ID3D10Device1 *device = texture->device; + ID3D11Device *device = texture->device; wined3d_mutex_lock(); wined3d_texture_decref(texture->wined3d_texture); wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D10Device1_Release(device); + ID3D11Device_Release(device); } return refcount; @@ -109,7 +109,12 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface) static void STDMETHODCALLTYPE d3d11_texture2d_GetDevice(ID3D11Texture2D *iface, ID3D11Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_texture2d *texture = impl_from_ID3D11Texture2D(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = texture->device; + ID3D11Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d11_texture2d_GetPrivateData(ID3D11Texture2D *iface, @@ -262,8 +267,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_GetDevice(ID3D10Texture2D *iface, TRACE("iface %p, device %p.\n", iface, device); - *device = (ID3D10Device *)texture->device; - ID3D10Device_AddRef(*device); + ID3D11Device_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D *iface, @@ -494,8 +498,8 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device } wined3d_mutex_unlock(); - texture->device = &device->ID3D10Device1_iface; - ID3D10Device1_AddRef(texture->device); + texture->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(texture->device); return S_OK; }

1 0

Józef Kucia : d3d11: Implement private data methods in ID3D11Texture2D.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 3c74e223179ce80355962cf524c0321dee9fad4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c74e223179ce80355962cf52… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 26 00:56:05 2015 +0200 d3d11: Implement private data methods in ID3D11Texture2D. --- dlls/d3d11/texture.c | 90 +++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index d5137e7..940567a 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -115,25 +115,61 @@ static void STDMETHODCALLTYPE d3d11_texture2d_GetDevice(ID3D11Texture2D *iface, static HRESULT STDMETHODCALLTYPE d3d11_texture2d_GetPrivateData(ID3D11Texture2D *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d10_texture2d *texture = impl_from_ID3D11Texture2D(iface); + IDXGISurface *dxgi_surface; + HRESULT hr; + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + if (texture->dxgi_surface + && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) + { + hr = IDXGISurface_GetPrivateData(dxgi_surface, guid, data_size, data); + IDXGISurface_Release(dxgi_surface); + return hr; + } - return E_NOTIMPL; + return d3d10_get_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d11_texture2d_SetPrivateData(ID3D11Texture2D *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d10_texture2d *texture = impl_from_ID3D11Texture2D(iface); + IDXGISurface *dxgi_surface; + HRESULT hr; + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + if (texture->dxgi_surface + && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) + { + hr = IDXGISurface_SetPrivateData(dxgi_surface, guid, data_size, data); + IDXGISurface_Release(dxgi_surface); + return hr; + } + + return d3d10_set_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d11_texture2d_SetPrivateDataInterface(ID3D11Texture2D *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_texture2d *texture = impl_from_ID3D11Texture2D(iface); + IDXGISurface *dxgi_surface; + HRESULT hr; + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + if (texture->dxgi_surface + && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) + { + hr = IDXGISurface_SetPrivateDataInterface(dxgi_surface, guid, data); + IDXGISurface_Release(dxgi_surface); + return hr; + } - return E_NOTIMPL; + return d3d10_set_private_data_interface(&texture->private_store, guid, data); } static void STDMETHODCALLTYPE d3d11_texture2d_GetType(ID3D11Texture2D *iface, @@ -234,62 +270,30 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D REFGUID guid, UINT *data_size, void *data) { struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); - IDXGISurface *dxgi_surface; - HRESULT hr; - TRACE("iface %p, guid %s, data_size %p, data %p.\n", - iface, debugstr_guid(guid), data_size, data); + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - if (texture->dxgi_surface - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) - { - hr = IDXGISurface_GetPrivateData(dxgi_surface, guid, data_size, data); - IDXGISurface_Release(dxgi_surface); - return hr; - } - - return d3d10_get_private_data(&texture->private_store, guid, data_size, data); + return d3d11_texture2d_GetPrivateData(&texture->ID3D11Texture2D_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture2d_SetPrivateData(ID3D10Texture2D *iface, REFGUID guid, UINT data_size, const void *data) { struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); - IDXGISurface *dxgi_surface; - HRESULT hr; - - TRACE("iface %p, guid %s, data_size %u, data %p.\n", - iface, debugstr_guid(guid), data_size, data); - if (texture->dxgi_surface - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) - { - hr = IDXGISurface_SetPrivateData(dxgi_surface, guid, data_size, data); - IDXGISurface_Release(dxgi_surface); - return hr; - } + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&texture->private_store, guid, data_size, data); + return d3d11_texture2d_SetPrivateData(&texture->ID3D11Texture2D_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture2d_SetPrivateDataInterface(ID3D10Texture2D *iface, REFGUID guid, const IUnknown *data) { struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); - IDXGISurface *dxgi_surface; - HRESULT hr; TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - if (texture->dxgi_surface - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) - { - hr = IDXGISurface_SetPrivateDataInterface(dxgi_surface, guid, data); - IDXGISurface_Release(dxgi_surface); - return hr; - } - - return d3d10_set_private_data_interface(&texture->private_store, guid, data); + return d3d11_texture2d_SetPrivateDataInterface(&texture->ID3D11Texture2D_iface, guid, data); } /* ID3D10Resource methods */

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
51
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 August 2015