May 2011 - Wine-commits - list.winehq.org

Marcus Meissner : usp10: Mark internal symbols with hidden visibility.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: f9779bbee26f4d0640ebd44130e41301de3170fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9779bbee26f4d0640ebd4413… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:21:24 2011 +0200 usp10: Mark internal symbols with hidden visibility. --- dlls/usp10/usp10_internal.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index f6df10a..e68e247 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -77,12 +77,12 @@ typedef struct { #define odd(x) ((x) & 1) BOOL BIDI_DetermineLevels( LPCWSTR lpString, INT uCount, const SCRIPT_STATE *s, - const SCRIPT_CONTROL *c, WORD *lpOutLevels ); + const SCRIPT_CONTROL *c, WORD *lpOutLevels ) DECLSPEC_HIDDEN; BOOL BIDI_GetStrengths(LPCWSTR lpString, INT uCount, const SCRIPT_CONTROL *c, - WORD* lpStrength); -INT BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse); -INT BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse); -void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); -void SHAPE_ApplyDefaultOpentypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, INT cChars, WORD *pwLogClust); -HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa); -void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp); + WORD* lpStrength) DECLSPEC_HIDDEN; +INT BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse) DECLSPEC_HIDDEN; +INT BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse) DECLSPEC_HIDDEN; +void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) DECLSPEC_HIDDEN; +void SHAPE_ApplyDefaultOpentypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, INT cChars, WORD *pwLogClust) DECLSPEC_HIDDEN; +HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa) DECLSPEC_HIDDEN; +void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : spoolss: Mark internal symbols with hidden visibility.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 7f5e729453e3ea9fa639bc35a49a042e75e9de5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5e729453e3ea9fa639bc35a… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:20:22 2011 +0200 spoolss: Mark internal symbols with hidden visibility. --- dlls/spoolss/spoolss.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/spoolss/spoolss.h b/dlls/spoolss/spoolss.h index 6868913..67b3891 100644 --- a/dlls/spoolss/spoolss.h +++ b/dlls/spoolss/spoolss.h @@ -21,8 +21,8 @@ /* ################################ */ -BOOL backend_load_all(void); -void backend_unload_all(void); +BOOL backend_load_all(void) DECLSPEC_HIDDEN; +void backend_unload_all(void) DECLSPEC_HIDDEN; /* ## Memory allocation functions ## */

1 0

Nikolay Sivov : comctl32/treeview: TVM_EXPAND with TVE_TOGGLE action shouldn' t always notify as it does on user input.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: bcb98d11ba6702165bf80e0fbc2b3aaef7b43c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb98d11ba6702165bf80e0fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 24 13:25:47 2011 +0400 comctl32/treeview: TVM_EXPAND with TVE_TOGGLE action shouldn't always notify as it does on user input. --- dlls/comctl32/tests/treeview.c | 33 +++++++++++++++++++++++++-------- dlls/comctl32/treeview.c | 10 +++++----- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 0437d65..5fd26a0 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1302,12 +1302,12 @@ static void test_expandnotify(void) item.state = TVIS_EXPANDED; ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); ok((item.state & TVIS_EXPANDED) == 0, "expected collapsed\n"); /* preselect root node here */ ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); g_get_from_expand = TRUE; /* expand */ @@ -1315,7 +1315,7 @@ static void test_expandnotify(void) g_item_expanding.state = 0xdeadbeef; g_item_expanded.state = 0xdeadbeef; ret = SendMessageA(hTree, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); ok(g_item_expanding.state == TVIS_SELECTED, "got state on TVN_ITEMEXPANDING 0x%08x\n", g_item_expanding.state); ok(g_item_expanded.state == (TVIS_SELECTED|TVIS_EXPANDED), "got state on TVN_ITEMEXPANDED 0x%08x\n", @@ -1326,16 +1326,16 @@ static void test_expandnotify(void) /* check that it's expanded */ item.state = TVIS_EXPANDED; ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); ok((item.state & TVIS_EXPANDED) == TVIS_EXPANDED, "expected expanded\n"); /* collapse */ flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = SendMessageA(hTree, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)hRoot); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); item.state = TVIS_EXPANDED; ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); ok((item.state & TVIS_EXPANDED) == 0, "expected collapsed\n"); /* all next collapse/expand attempts won't produce any notifications, the only way is to reset with all children removed */ @@ -1345,7 +1345,7 @@ static void test_expandnotify(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = SendMessageA(hTree, TVM_EXPAND, TVE_TOGGLE, (LPARAM)hChild); expect(FALSE, ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "toggle node without children", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "toggle node without children", FALSE); DestroyWindow(hTree); @@ -1354,8 +1354,25 @@ static void test_expandnotify(void) fill_tree(hTree); g_get_rect_in_expand = TRUE; ret = TreeView_Select(hTree, hChild, TVGN_CARET); + expect(TRUE, ret); g_get_rect_in_expand = FALSE; - ok(ret, "got %d\n", ret); + + DestroyWindow(hTree); + + /* TVE_TOGGLE acts as any other TVM_EXPAND */ + hTree = create_treeview_control(0); + fill_tree(hTree); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, TVM_EXPAND, TVE_TOGGLE, (LPARAM)hRoot); + expect(TRUE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_seq, "toggle node (expand)", FALSE); + + /* toggle again - no notifications */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, TVM_EXPAND, TVE_TOGGLE, (LPARAM)hRoot); + expect(TRUE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "toggle node (collapse)", FALSE); DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 2388d3c..bd65fca 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3489,14 +3489,14 @@ static void TREEVIEW_SingleExpand(TREEVIEW_INFO *infoPtr, } static BOOL -TREEVIEW_Toggle(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, BOOL bUser) +TREEVIEW_Toggle(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, BOOL user) { - TRACE("\n"); + TRACE("item=%p, user=%d\n", item, user); if (item->state & TVIS_EXPANDED) - return TREEVIEW_Collapse(infoPtr, item, FALSE, bUser); + return TREEVIEW_Collapse(infoPtr, item, FALSE, user); else - return TREEVIEW_Expand(infoPtr, item, FALSE, bUser); + return TREEVIEW_Expand(infoPtr, item, FALSE, user); } static VOID @@ -3538,7 +3538,7 @@ TREEVIEW_ExpandMsg(TREEVIEW_INFO *infoPtr, UINT flag, HTREEITEM item) FALSE); case TVE_TOGGLE: - return TREEVIEW_Toggle(infoPtr, item, TRUE); + return TREEVIEW_Toggle(infoPtr, item, FALSE); default: return 0;

1 0

Aric Stewart : usp10/test: Make sure to only trace on _test_shape_ok number of glyphs if font is not valid .
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 850336d936dd50231247e395b0dd200340f9745f URL: http://source.winehq.org/git/wine.git/?a=commit;h=850336d936dd50231247e395b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 14:40:28 2011 -0500 usp10/test: Make sure to only trace on _test_shape_ok number of glyphs if font is not valid. --- dlls/usp10/tests/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index ac78514..742dbec 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -367,7 +367,7 @@ static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, winetest_trace("%i: invalid fCanGlyphAlone\n",x); } - if(valid) + if (valid > 0) winetest_ok(nGlyphs == outnGlyphs, "got incorrect number of glyphs (%i)\n",outnGlyphs); else if (nGlyphs != outnGlyphs) winetest_trace("got incorrect number of glyphs (%i)\n",outnGlyphs);

1 0

Aric Stewart : usp10: Determine glyph properties after shaping for Tibetan script.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 2b3da5389cb0ceb182070a14a2a6f8ba6df2f4de URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b3da5389cb0ceb182070a14a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 14:40:50 2011 -0500 usp10: Determine glyph properties after shaping for Tibetan script. --- dlls/usp10/shape.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 047acc5..24e91f8 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -51,6 +51,7 @@ static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYS static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); +static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); extern const unsigned short wine_shaping_table[]; extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4]; @@ -399,8 +400,8 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, NULL, "armn", NULL, NULL}, {{ standard_features, 2}, NULL, "geor", NULL, NULL}, {{ sinhala_features, 7}, NULL, "sinh", NULL, NULL}, - {{ tibetan_features, 2}, NULL, "tibt", NULL, ShapeCharGlyphProp_None}, - {{ tibetan_features, 2}, NULL, "tibt", NULL, ShapeCharGlyphProp_None}, + {{ tibetan_features, 2}, NULL, "tibt", NULL, ShapeCharGlyphProp_Tibet}, + {{ tibetan_features, 2}, NULL, "tibt", NULL, ShapeCharGlyphProp_Tibet}, {{ tibetan_features, 2}, NULL, "phag", ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, "thai", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, "thai", NULL, ShapeCharGlyphProp_Thai}, @@ -1740,6 +1741,52 @@ static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); } +static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD* pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP* pGlyphProp) +{ + int i,k; + + for (i = 0; i < cGlyphs; i++) + { + int char_index[20]; + int char_count = 0; + + for (k = 0; k < cChars; k++) + { + if (pwLogClust[k] == i) + { + char_index[char_count] = k; + char_count++; + } + } + + if (char_count == 0) + { + FIXME("No chars in this glyph? Must be an error\n"); + continue; + } + + if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */ + { + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_BLANK; + pCharProp[char_index[0]].fCanGlyphAlone = 1; + } + else + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; + } + GDEF_UpdateGlyphProps(hdc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); + + /* Tibeten script does not set sva.fDiacritic or sva.fZeroWidth */ + for (i = 0; i < cGlyphs; i++) + { + if (!pGlyphProp[i].sva.fClusterStart) + { + pGlyphProp[i].sva.fDiacritic = 0; + pGlyphProp[i].sva.fZeroWidth = 0; + } + } +} + void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp) { if (ShapingData[psa->eScript].charGlyphPropProc)

1 0

Henri Verbeet : wined3d: Get rid of an unintentional variable.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: b396886e5d28fcaa348487c7bcb232c0a3fc42da URL: http://source.winehq.org/git/wine.git/?a=commit;h=b396886e5d28fcaa348487c7b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 22:04:25 2011 +0200 wined3d: Get rid of an unintentional variable. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5ac7ee4..aaf1423 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1274,7 +1274,7 @@ struct wined3d_pixel_format BOOL doubleBuffer; int auxBuffers; int numSamples; -} wined3d_pixel_format; +}; /* The driver names reflect the lowest GPU supported * by a certain driver, so DRIVER_AMD_R300 supports

1 0

Marcus Meissner : winex11.drv: Mark internal symbols with hidden visibility .
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 5a9b623212e160d315290770f5f1c4f2afa5c901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9b623212e160d315290770f… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:52:35 2011 +0200 winex11.drv: Mark internal symbols with hidden visibility. --- dlls/winex11.drv/x11drv.h | 415 ++++++++++++++++++++-------------------- dlls/winex11.drv/x11drv_main.c | 2 +- dlls/winex11.drv/x11font.h | 6 +- dlls/winex11.drv/xcomposite.h | 2 +- dlls/winex11.drv/xrandr.h | 2 +- dlls/winex11.drv/xvidmode.h | 4 +- 6 files changed, 217 insertions(+), 214 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a9b623212e160d315290…

1 0

Marcus Meissner : wineps.drv: Mark internal symbols with hidden visibility.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 451a656f2f1563dfb311f6c4d6c6029825490254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451a656f2f1563dfb311f6c4d… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:41:29 2011 +0200 wineps.drv: Mark internal symbols with hidden visibility. --- dlls/wineps.drv/afm.c | 2 +- dlls/wineps.drv/data/agl.h | 70 +++++++++--------- dlls/wineps.drv/mkagl.c | 2 +- dlls/wineps.drv/psdrv.h | 180 ++++++++++++++++++++++---------------------- 4 files changed, 127 insertions(+), 127 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=451a656f2f1563dfb311f…

1 0

Piotr Caban : msvcr90/tests: Added _getptd tests.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 197826b12d0e1fb468e2ff3b897318caaf1e8d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=197826b12d0e1fb468e2ff3b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 24 17:23:57 2011 +0200 msvcr90/tests: Added _getptd tests. --- dlls/msvcr90/tests/msvcr90.c | 118 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 119 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 95cedd1..c3a837d 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -23,6 +23,8 @@ #include <fcntl.h> #include <share.h> #include <sys/stat.h> +#include <time.h> +#include <locale.h> #include <windef.h> #include <winbase.h> @@ -78,6 +80,25 @@ static int (__cdecl *p_wsopen_s)(int*, const wchar_t*, int, int, int); static void* (__cdecl *p_realloc_crt)(void*, size_t); static void* (__cdecl *p_malloc)(size_t); static void (__cdecl *p_free)(void*); +static void* (__cdecl *p_getptd)(void); +static int* (__cdecl *p_errno)(void); +static __msvcrt_ulong* (__cdecl *p_doserrno)(void); +static void (__cdecl *p_srand)(unsigned int); +static char* (__cdecl *p_strtok)(char*, const char*); +static wchar_t* (__cdecl *p_wcstok)(wchar_t*, const wchar_t*); +static char* (__cdecl *p_strerror)(int); +static wchar_t* (__cdecl *p_wcserror)(int); +static char* (__cdecl *p_tmpnam)(char*); +static wchar_t* (__cdecl *p_wtmpnam)(wchar_t*); +static char* (__cdecl *p_asctime)(struct tm*); +static wchar_t* (__cdecl *p_wasctime)(struct tm*); +static struct tm* (__cdecl *p_localtime64)(__time64_t*); +static char* (__cdecl *p_ecvt)(double, int, int*, int*); +static int* (__cdecl *p_fpecode)(void); +static int (__cdecl *p_configthreadlocale)(int); +static void* (__cdecl *p_get_terminate)(void); +static void* (__cdecl *p_get_unexpected)(void); + /* type info */ typedef struct __type_info @@ -225,6 +246,24 @@ static BOOL init(void) SET(p_realloc_crt, "_realloc_crt"); SET(p_malloc, "malloc"); SET(p_free, "free"); + SET(p_getptd, "_getptd"); + SET(p_errno, "_errno"); + SET(p_doserrno, "__doserrno"); + SET(p_srand, "srand"); + SET(p_strtok, "strtok"); + SET(p_wcstok, "wcstok"); + SET(p_strerror, "strerror"); + SET(p_wcserror, "_wcserror"); + SET(p_tmpnam, "tmpnam"); + SET(p_wtmpnam, "_wtmpnam"); + SET(p_asctime, "asctime"); + SET(p_wasctime, "_wasctime"); + SET(p_localtime64, "_localtime64"); + SET(p_ecvt, "_ecvt"); + SET(p_fpecode, "__fpecode"); + SET(p_configthreadlocale, "_configthreadlocale"); + SET(p_get_terminate, "_get_terminate"); + SET(p_get_unexpected, "_get_unexpected"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -864,6 +903,84 @@ static void test_typeinfo(void) call_func1(ptype_info_dtor, &t1); } +/* Keep in sync with msvcrt/msvcrt.h */ +struct __thread_data { + DWORD tid; + HANDLE handle; + int thread_errno; + __msvcrt_ulong thread_doserrno; + int unk1; + unsigned int random_seed; + char *strtok_next; + wchar_t *wcstok_next; + unsigned char *mbstok_next; + char *strerror_buffer; + wchar_t *wcserror_buffer; + char *tmpnam_buffer; + wchar_t *wtmpnam_buffer; + void *unk2[2]; + char *asctime_buffer; + wchar_t *wasctime_buffer; + struct tm *time_buffer; + char *efcvt_buffer; + int unk3[2]; + void *unk4[4]; + int fpecode; + pthreadmbcinfo mbcinfo; + pthreadlocinfo locinfo; + BOOL have_locale; + int unk5[1]; + void* terminate_handler; + void* unexpected_handler; + void* se_translator; + void *unk6[3]; + int unk7; + EXCEPTION_RECORD *exc_record; +}; + +static void test_getptd(void) +{ + struct __thread_data *ptd = p_getptd(); + DWORD tid = GetCurrentThreadId(); + wchar_t testW[] = {'t','e','s','t',0}, tW[] = {'t',0}, *wp; + char test[] = "test", *p; + struct tm time; + __time64_t secs = 0; + int dec, sign; + void *mbcinfo, *locinfo; + + ok(ptd->tid == tid, "ptd->tid = %x, expected %x\n", ptd->tid, tid); + ok(ptd->handle == INVALID_HANDLE_VALUE, "ptd->handle = %p\n", ptd->handle); + ok(p_errno() == &ptd->thread_errno, "ptd->thread_errno is different then _errno()\n"); + ok(p_doserrno() == &ptd->thread_doserrno, "ptd->thread_doserrno is different then __doserrno()\n"); + p_srand(1234); + ok(ptd->random_seed == 1234, "ptd->random_seed = %d\n", ptd->random_seed); + p = p_strtok(test, "t"); + ok(ptd->strtok_next == p+3, "ptd->strtok_next is incorrect\n"); + wp = p_wcstok(testW, tW); + ok(ptd->wcstok_next == wp+3, "ptd->wcstok_next is incorrect\n"); + ok(p_strerror(0) == ptd->strerror_buffer, "ptd->strerror_buffer is incorrect\n"); + ok(p_wcserror(0) == ptd->wcserror_buffer, "ptd->wcserror_buffer is incorrect\n"); + ok(p_tmpnam(NULL) == ptd->tmpnam_buffer, "ptd->tmpnam_buffer is incorrect\n"); + ok(p_wtmpnam(NULL) == ptd->wtmpnam_buffer, "ptd->wtmpnam_buffer is incorrect\n"); + memset(&time, 0, sizeof(time)); + time.tm_mday = 1; + ok(p_asctime(&time) == ptd->asctime_buffer, "ptd->asctime_buffer is incorrect\n"); + ok(p_wasctime(&time) == ptd->wasctime_buffer, "ptd->wasctime_buffer is incorrect\n"); + ok(p_localtime64(&secs) == ptd->time_buffer, "ptd->time_buffer is incorrect\n"); + ok(p_ecvt(3.12, 1, &dec, &sign) == ptd->efcvt_buffer, "ptd->efcvt_buffer is incorrect\n"); + ok(p_fpecode() == &ptd->fpecode, "ptd->fpecode is incorrect\n"); + mbcinfo = ptd->mbcinfo; + locinfo = ptd->locinfo; + todo_wine ok(ptd->have_locale == 1, "ptd->have_locale = %x\n", ptd->have_locale); + p_configthreadlocale(1); + todo_wine ok(mbcinfo == ptd->mbcinfo, "ptd->mbcinfo != mbcinfo\n"); + todo_wine ok(locinfo == ptd->locinfo, "ptd->locinfo != locinfo\n"); + todo_wine ok(ptd->have_locale == 3, "ptd->have_locale = %x\n", ptd->have_locale); + ok(p_get_terminate() == ptd->terminate_handler, "ptd->terminate_handler != _get_terminate()\n"); + ok(p_get_unexpected() == ptd->unexpected_handler, "ptd->unexpected_handler != _get_unexpected()\n"); +} + START_TEST(msvcr90) { if(!init()) @@ -883,4 +1000,5 @@ START_TEST(msvcr90) test__wsopen_s(); test__realloc_crt(); test_typeinfo(); + test_getptd(); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a0d3acb..48d200b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -157,6 +157,7 @@ typedef struct MSVCRT_localeinfo_struct /* TLS data */ extern DWORD msvcrt_tls_index; +/* Keep in sync with msvcr90/tests/msvcr90.c */ struct __thread_data { DWORD tid; HANDLE handle;

1 0

Henri Verbeet : d3d9/tests: Fix the depth clamping test.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 6d31824a6e2df9069440d49f1c037f3d901ba157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d31824a6e2df9069440d49f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 21:18:50 2011 +0200 d3d9/tests: Fix the depth clamping test. --- dlls/d3d9/tests/visual.c | 133 ++++++++++++++++++++++++++------------------- 1 files changed, 77 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d31824a6e2df9069440d…

1 0