wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrix() test.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: 52e1409111a322233567d5acc010b88e7dcfea44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e1409111a322233567d5acc… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 26 11:40:54 2012 +0100 d3dx9/tests: Add effect parameter value SetMatrix() test. --- dlls/d3dx9_36/tests/effect.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index f3c5cf6..e3c6dde 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1898,6 +1898,39 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } + + /* SetMatrix */ + fvalue = 1.33; + for (l = 0; l < 16; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetMatrix(effect, parameter, (D3DXMATRIX *)input_value); + if (!res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) + { + for (l = 0; l < 4; ++l) + { + UINT m; + + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns, res_desc->Type, + input_value + l + m * 4, D3DXPT_FLOAT); + } + + } + ok(hr == D3D_OK, "%u - %s: SetMatrix failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrix failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetVectorArray() test.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: d0fbe7f5a501e08c2d7c551a8d84a9fc8fc29b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0fbe7f5a501e08c2d7c551a8… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 26 11:40:47 2012 +0100 d3dx9/tests: Add effect parameter value SetVectorArray() test. --- dlls/d3dx9_36/tests/effect.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 6db1942..f3c5cf6 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1640,7 +1640,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) FLOAT fvalue; DWORD input_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; DWORD expected_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; - UINT l; + UINT l, element; parameter = effect->lpVtbl->GetParameterByName(effect, NULL, res_full_name); ok(parameter != NULL, "%u - %s: GetParameterByName failed\n", i, res_full_name); @@ -1865,6 +1865,39 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) } test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + + /* SetVectorArray */ + for (element = 0; element < res_desc->Elements + 1; ++element) + { + fvalue = 1.33; + for (l = 0; l < element * 4; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetVectorArray(effect, parameter, (D3DXVECTOR4 *)input_value, element); + if (res_desc->Elements && res_desc->Class == D3DXPC_VECTOR && element <= res_desc->Elements) + { + UINT m; + + for (m = 0; m < element; ++m) + { + for (l = 0; l < res_desc->Columns; ++l) + { + set_number(expected_value + m * res_desc->Columns + l, res_desc->Type, input_value + m * 4 + l, D3DXPT_FLOAT); + } + } + ok(hr == D3D_OK, "%u - %s: SetVectorArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetVectorArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + } } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetVector() test.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: 9c63b11372aff8f1da8745a23a7ea47f1c231d3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c63b11372aff8f1da8745a23… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 26 11:40:37 2012 +0100 d3dx9/tests: Add effect parameter value SetVector() test. --- dlls/d3dx9_36/tests/effect.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index cd0423d..6db1942 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1827,6 +1827,44 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) } test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + + /* SetVector */ + fvalue = -1.33; + for (l = 0; l < 4; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetVector(effect, parameter, (D3DXVECTOR4 *)input_value); + if (!res_desc->Elements && + (res_desc->Class == D3DXPC_SCALAR + || res_desc->Class == D3DXPC_VECTOR)) + { + /* only values between 0 and INT_FLOAT_MULTI are valid */ + if (res_desc->Type == D3DXPT_INT && res_desc->Bytes == 4) + { + *expected_value = (DWORD)(max(min(*(FLOAT *)(input_value + 2), 1.0f), 0.0f) * INT_FLOAT_MULTI); + *expected_value += ((DWORD)(max(min(*(FLOAT *)(input_value + 1), 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 8; + *expected_value += ((DWORD)(max(min(*(FLOAT *)input_value, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 16; + *expected_value += ((DWORD)(max(min(*(FLOAT *)(input_value + 3), 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 24; + } + else + { + for (l = 0; l < 4; ++l) + { + set_number(expected_value + l, res_desc->Type, input_value + l, D3DXPT_FLOAT); + } + } + ok(hr == D3D_OK, "%u - %s: SetVector failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetVector failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Henri Verbeet : crypt32: Use a larger temporary buffer in CRYPT_AsnDecodeOidIgnoreTag().
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: db156752804b2a21280472b3ce092b73206451c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db156752804b2a21280472b3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 00:21:19 2012 +0100 crypt32: Use a larger temporary buffer in CRYPT_AsnDecodeOidIgnoreTag(). --- dlls/crypt32/decode.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 4a22533..bdcb744 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1310,22 +1310,17 @@ static BOOL CRYPT_AsnDecodeOidIgnoreTag(const BYTE *pbEncoded, DWORD cbEncoded, if (dataLen) { - /* The largest possible string for the first two components - * is 2.175 (= 2 * 40 + 175 = 255), so this is big enough. - */ - char firstTwo[6]; const BYTE *ptr; + char str[32]; - snprintf(firstTwo, sizeof(firstTwo), "%d.%d", + snprintf(str, sizeof(str), "%d.%d", pbEncoded[1 + lenBytes] / 40, pbEncoded[1 + lenBytes] - (pbEncoded[1 + lenBytes] / 40) * 40); - bytesNeeded += strlen(firstTwo) + 1; + bytesNeeded += strlen(str) + 1; for (ptr = pbEncoded + 2 + lenBytes; ret && ptr - pbEncoded - 1 - lenBytes < dataLen; ) { - /* large enough for ".4000000" */ - char str[9]; int val = 0; while (ptr - pbEncoded - 1 - lenBytes < dataLen &&

1 0

Henri Verbeet : winecfg: Get rid of some unused constants.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: f355f59345e28dfc78f66f3c1208581c238e18a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f355f59345e28dfc78f66f3c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 00:21:18 2012 +0100 winecfg: Get rid of some unused constants. --- programs/winecfg/resource.h | 28 ---------------------------- 1 files changed, 0 insertions(+), 28 deletions(-) diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 6d9c450..fffc4da 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -46,7 +46,6 @@ #define IDS_LINKS_TO 17 #define IDS_WINECFG_TITLE_APP 18 /* App specific title */ #define IDI_WINECFG 100 -#define IDD_MAINDLG 101 #define IDI_LOGO 102 #define IDD_ABOUTCFG 107 #define IDD_APPCFG 108 @@ -55,20 +54,11 @@ #define IDD_DLLCFG 111 #define IDD_DRIVECFG 112 #define IDD_DESKTOP_INTEGRATION 115 -#define IDB_WINE_LOGO 200 -#define IDC_TABABOUT 1001 -#define IDC_APPLYBTN 1002 #define IDC_WINVER 1012 -#define IDC_SYSCOLORS 1017 -#define IDC_PRIVATEMAP 1018 -#define IDC_PERFECTGRAPH 1019 -#define IDC_MANAGED 1022 #define IDC_DESKTOP_WIDTH 1023 #define IDC_DESKTOP_HEIGHT 1024 #define IDC_DESKTOP_SIZE 1025 #define IDC_DESKTOP_BY 1026 -#define IDC_XDGA 1027 -#define IDC_XSHM 1028 /* dll editing */ #define IDC_RAD_BUILTIN 1029 @@ -100,21 +90,7 @@ #define IDC_BUTTON_ADD 1043 #define IDC_BUTTON_REMOVE 1044 #define IDC_BUTTON_EDIT 1045 -#define IDC_BUTTON7 1046 #define IDC_BUTTON_AUTODETECT 1046 -#define IDC_DRIVE_ADD 1047 -#define IDC_DRIVE_REMOVE 1048 -#define IDC_DRIVE_EDIT 1049 -#define IDC_DRIVE_EDIT_NAME 1050 -#define IDC_DRIVE_EDIT_LABEL 1051 -#define IDC_DRIVE_EDIT_TYPE 1052 -#define IDC_DRIVE_EDIT_FS 1053 -#define IDC_DRIVE_EDIT_PATH 1054 -#define IDC_DRIVE_EDIT_DEVICE 1055 -#define ID_DRIVE_OK 1056 -#define ID_DRIVE_CANCEL 1057 -#define ID_BUTTON_CANCEL 1058 -#define ID_BUTTON_OK 1059 #define IDC_EDIT_LABEL 1060 #define IDC_EDIT_PATH 1061 #define IDC_EDIT_SERIAL 1062 @@ -132,8 +108,6 @@ #define IDC_STATIC_TYPE 1077 #define IDC_SHOW_DOT_FILES 1080 -#define IDC_DRIVE_LABEL 1078 - #define IDS_DRIVE_UNKNOWN 8200 #define IDS_DRIVE_FIXED 8201 #define IDS_DRIVE_REMOTE 8202 @@ -152,8 +126,6 @@ #define IDC_ENABLE_MANAGED 1100 #define IDC_ENABLE_DECORATED 1101 #define IDC_FULLSCREEN_GRAB 1102 -#define IDC_USE_TAKE_FOCUS 1103 -#define IDC_DOUBLE_BUFFER 1104 #define IDC_RES_TRACKBAR 1107 #define IDC_RES_DPIEDIT 1108

1 0

Henri Verbeet : wined3d: Clear the device if we' re not removing the entry from the table in wined3d_unregister_window().
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: faa040cd9e9f34a6abdf80833912bfdd581b9921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa040cd9e9f34a6abdf80833… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 00:21:17 2012 +0100 wined3d: Clear the device if we're not removing the entry from the table in wined3d_unregister_window(). The device may be destroyed after the window is unregistered, causing device_process_message() to access freed memory. --- dlls/wined3d/wined3d_main.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 1b7e493..ad7a5fc 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -444,7 +444,11 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam proc = entry->proc; wined3d_wndproc_mutex_unlock(); - return device_process_message(device, window, unicode, message, wparam, lparam, proc); + if (device) + return device_process_message(device, window, unicode, message, wparam, lparam, proc); + if (unicode) + return CallWindowProcW(proc, window, message, wparam, lparam); + return CallWindowProcA(proc, window, message, wparam, lparam); } BOOL wined3d_register_window(HWND window, struct wined3d_device *device) @@ -515,6 +519,7 @@ void wined3d_unregister_window(HWND window) proc = GetWindowLongPtrW(window, GWLP_WNDPROC); if (proc != (LONG_PTR)wined3d_wndproc) { + entry->device = NULL; wined3d_wndproc_mutex_unlock(); WARN("Not unregistering window %p, window proc %#lx doesn't match wined3d window proc %p.\n", window, proc, wined3d_wndproc); @@ -528,6 +533,7 @@ void wined3d_unregister_window(HWND window) proc = GetWindowLongPtrA(window, GWLP_WNDPROC); if (proc != (LONG_PTR)wined3d_wndproc) { + entry->device = NULL; wined3d_wndproc_mutex_unlock(); WARN("Not unregistering window %p, window proc %#lx doesn't match wined3d window proc %p.\n", window, proc, wined3d_wndproc);

1 0

Thomas Faber : mscoree: Fix build with MSVC.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: d3918683e6a59b4068f5d28f72a7ab6f78e2c526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3918683e6a59b4068f5d28f7… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Jan 25 23:27:44 2012 +0100 mscoree: Fix build with MSVC. --- dlls/mscoree/metahost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 454a653..49fb0ee 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1171,7 +1171,7 @@ static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char MonoImageOpenStatus stat; static WCHAR fusiondll[] = {'f','u','s','i','o','n',0}; HMODULE hfusion=NULL; - static HRESULT WINAPI (*pCreateAssemblyCache)(IAssemblyCache**,DWORD); + static HRESULT (WINAPI *pCreateAssemblyCache)(IAssemblyCache**,DWORD); stringname = mono->mono_stringify_assembly_name(aname);

1 0

Ken Thomases : winex11: Remove some more leftover X Shm code.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: f2174155417b0493df1e3b60caf3855bb2c6c902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2174155417b0493df1e3b60c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 25 15:53:50 2012 -0600 winex11: Remove some more leftover X Shm code. --- dlls/winex11.drv/x11drv.h | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 64129a7..8e3c4c3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -90,13 +90,6 @@ typedef struct Pixmap pixmap; } X_PHYSBRUSH; -enum x11drv_shm_mode -{ - X11DRV_SHM_NONE = 0, - X11DRV_SHM_PIXMAP, - X11DRV_SHM_IMAGE, -}; - typedef struct { int shift; int scale;

1 0

Alexandre Julliard : ddraw: AddRef the correct interface pointer in AddAttachedSurface.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 5f42f7d4fa5999add7f225c46580ba7335f9f26d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f42f7d4fa5999add7f225c46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 21:38:24 2012 +0100 ddraw: AddRef the correct interface pointer in AddAttachedSurface. --- dlls/ddraw/surface.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 46c28be..f4a4d56 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1605,7 +1605,7 @@ static HRESULT WINAPI ddraw_surface7_AddAttachedSurface(IDirectDrawSurface7 *ifa { return hr; } - ddraw_surface7_AddRef(attachment); + ddraw_surface7_AddRef(&attachment_impl->IDirectDrawSurface7_iface); attachment_impl->attached_iface = (IUnknown *)attachment; return hr; } @@ -1624,7 +1624,7 @@ static HRESULT WINAPI ddraw_surface4_AddAttachedSurface(IDirectDrawSurface4 *ifa { return hr; } - ddraw_surface4_AddRef(attachment); + ddraw_surface4_AddRef(&attachment_impl->IDirectDrawSurface4_iface); ddraw_surface7_Release(&attachment_impl->IDirectDrawSurface7_iface); attachment_impl->attached_iface = (IUnknown *)attachment; return hr; @@ -1670,7 +1670,7 @@ static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *ifa { return hr; } - ddraw_surface3_AddRef(attachment); + ddraw_surface3_AddRef(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; return hr; } @@ -1689,7 +1689,7 @@ static HRESULT WINAPI ddraw_surface2_AddAttachedSurface(IDirectDrawSurface2 *ifa { return hr; } - ddraw_surface2_AddRef(attachment); + ddraw_surface2_AddRef(&attachment_impl->IDirectDrawSurface2_iface); ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; return hr; @@ -1709,7 +1709,7 @@ static HRESULT WINAPI ddraw_surface1_AddAttachedSurface(IDirectDrawSurface *ifac { return hr; } - ddraw_surface1_AddRef(attachment); + ddraw_surface1_AddRef(&attachment_impl->IDirectDrawSurface_iface); ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; return hr;

1 0

Alexandre Julliard : tools: Assume that FreeType supports FT_Load_Sfnt_Table.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 67771c59213bb105d2174d03ce6ec9551b860611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67771c59213bb105d2174d03c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 13:53:40 2012 +0100 tools: Assume that FreeType supports FT_Load_Sfnt_Table. --- tools/sfnt2fnt.c | 36 ++---------------------------------- 1 files changed, 2 insertions(+), 34 deletions(-) diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index d83d2be..df43ec0 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -40,9 +40,6 @@ #include FT_SFNT_NAMES_H #include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TAGS_H -#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H -#include <freetype/internal/sfnt.h> -#endif #include "wine/unicode.h" #include "wingdi.h" @@ -332,35 +329,6 @@ static int get_char(const union cptable *cptable, int enc, int index) return cptable->sbcs.cp2uni[index]; } -/* from gdi32/freetype.c */ -static FT_Error load_sfnt_table(FT_Face ft_face, FT_ULong table, FT_Long offset, FT_Byte *buf, FT_ULong *len) -{ - - FT_Error err; - - /* If the FT_Load_Sfnt_Table function is there we'll use it */ -#ifdef HAVE_FT_LOAD_SFNT_TABLE - err = FT_Load_Sfnt_Table(ft_face, table, offset, buf, len); -#elif defined(HAVE_FREETYPE_INTERNAL_SFNT_H) - TT_Face tt_face = (TT_Face) ft_face; - SFNT_Interface *sfnt; - if (FT_Version.major==2 && FT_Version.minor==0) - { - /* 2.0.x */ - sfnt = *(SFNT_Interface**)((char*)tt_face + 528); - } - else - { - /* A field was added in the middle of the structure in 2.1.x */ - sfnt = *(SFNT_Interface**)((char*)tt_face + 532); - } - err = sfnt->load_any(tt_face, table, offset, buf, len); -#else - err = FT_Err_Unimplemented_Feature; -#endif - return err; -} - static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, int dpi, unsigned char def_char, int avg_width ) { @@ -398,12 +366,12 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, assert( face->size->metrics.y_ppem == ppem ); needed = 0; - if (load_sfnt_table(face, TTAG_EBLC, 0, NULL, &needed)) + if (FT_Load_Sfnt_Table(face, TTAG_EBLC, 0, NULL, &needed)) fprintf(stderr,"Can't find EBLC table\n"); else { eblc = malloc(needed); - load_sfnt_table(face, TTAG_EBLC, 0, (FT_Byte *)eblc, &needed); + FT_Load_Sfnt_Table(face, TTAG_EBLC, 0, (FT_Byte *)eblc, &needed); num_sizes = GET_BE_DWORD(&eblc->numSizes);

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
98
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 January 2012