April 2011 - Wine-Commits - list.winehq.org

Marcus Meissner : gdi32: Mark internal symbols as hidden.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: 3d80a798cf2474e63b9848d371001950337f9e2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d80a798cf2474e63b9848d37… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Apr 21 10:25:40 2011 +0200 gdi32: Mark internal symbols as hidden. --- dlls/gdi32/gdi_private.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c0d57d9..d61e4c8 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -545,8 +545,8 @@ extern BOOL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) DECLSPEC_HIDDEN; /* palette.c */ -extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg); -extern UINT WINAPI GDIRealizePalette( HDC hdc ); +extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) DECLSPEC_HIDDEN; +extern UINT WINAPI GDIRealizePalette( HDC hdc ) DECLSPEC_HIDDEN; extern HPALETTE PALETTE_Init(void) DECLSPEC_HIDDEN; /* region.c */

1 0

Marcus Meissner : ole32: Mark internal symbols has hidden visibility.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: 14c4ef3fdd304527dd97c35869d28d7d05029e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14c4ef3fdd304527dd97c3586… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Apr 21 10:45:36 2011 +0200 ole32: Mark internal symbols has hidden visibility. --- dlls/ole32/compobj_private.h | 118 +++++++++++++++++++++--------------------- dlls/ole32/dictionary.h | 14 +++--- dlls/ole32/enumx.h | 18 +++--- dlls/ole32/moniker.h | 22 ++++---- dlls/ole32/storage32.h | 66 ++++++++++++------------ 5 files changed, 119 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14c4ef3fdd304527dd97c…

1 0

Vincent Povirk : windowscodecs: Treat samples as unspecified if there' s no ExtraSamples tag.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: 9483b3ba86c41175b52dd87e9c15478c99ffda97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9483b3ba86c41175b52dd87e9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 25 04:02:48 2011 -0500 windowscodecs: Treat samples as unspecified if there's no ExtraSamples tag. --- dlls/windowscodecs/tiffformat.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 88dbc79..1175a77 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -254,7 +254,7 @@ static inline TiffFrameDecode *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDe static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { uint16 photometric, bps, samples, planar; - uint16 extra_sample_count, *extra_samples; + uint16 extra_sample_count, extra_sample, *extra_samples; int ret; decode_info->indexed = 0; @@ -327,8 +327,9 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) ret = pTIFFGetField(tiff, TIFFTAG_EXTRASAMPLES, &extra_sample_count, &extra_samples); if (!ret) { - WARN("Cannot get extra sample type for RGB data, ret=%i count=%i\n", ret, extra_sample_count); - return E_FAIL; + extra_sample_count = 1; + extra_sample = 0; + extra_samples = &extra_sample; } } else if (samples != 3)

1 0

Marcus Meissner : winmm: Mark internal symbols with visibility hidden.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: b4af43db7b859ed1803e82afe00b6af7d72f3c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4af43db7b859ed1803e82afe… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Apr 21 11:06:33 2011 +0200 winmm: Mark internal symbols with visibility hidden. --- dlls/winmm/winemm.h | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 6d170de..d9069e2 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -127,34 +127,34 @@ typedef struct tagWINE_MMIO { /* function prototypes */ -LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr); -BOOL DRIVER_GetLibName(LPCWSTR keyName, LPCWSTR sectName, LPWSTR buf, int sz); -LPWINE_DRIVER DRIVER_TryOpenDriver32(LPCWSTR fn, LPARAM lParam2); -void DRIVER_UnloadAll(void); +LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr) DECLSPEC_HIDDEN; +BOOL DRIVER_GetLibName(LPCWSTR keyName, LPCWSTR sectName, LPWSTR buf, int sz) DECLSPEC_HIDDEN; +LPWINE_DRIVER DRIVER_TryOpenDriver32(LPCWSTR fn, LPARAM lParam2) DECLSPEC_HIDDEN; +void DRIVER_UnloadAll(void) DECLSPEC_HIDDEN; -void MMDRV_Exit(void); -UINT MMDRV_GetNum(UINT); +void MMDRV_Exit(void) DECLSPEC_HIDDEN; +UINT MMDRV_GetNum(UINT) DECLSPEC_HIDDEN; LPWINE_MLD MMDRV_Alloc(UINT size, UINT type, LPHANDLE hndl, DWORD* dwFlags, - DWORD_PTR* dwCallback, DWORD_PTR* dwInstance); -void MMDRV_Free(HANDLE hndl, LPWINE_MLD mld); -DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwParam2); -DWORD MMDRV_Close(LPWINE_MLD mld, UINT wMsg); -LPWINE_MLD MMDRV_Get(HANDLE hndl, UINT type, BOOL bCanBeID); -LPWINE_MLD MMDRV_GetRelated(HANDLE hndl, UINT srcType, BOOL bSrcCanBeID, UINT dstTyped); -DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); -UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); + DWORD_PTR* dwCallback, DWORD_PTR* dwInstance) DECLSPEC_HIDDEN; +void MMDRV_Free(HANDLE hndl, LPWINE_MLD mld) DECLSPEC_HIDDEN; +DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwParam2) DECLSPEC_HIDDEN; +DWORD MMDRV_Close(LPWINE_MLD mld, UINT wMsg) DECLSPEC_HIDDEN; +LPWINE_MLD MMDRV_Get(HANDLE hndl, UINT type, BOOL bCanBeID) DECLSPEC_HIDDEN; +LPWINE_MLD MMDRV_GetRelated(HANDLE hndl, UINT srcType, BOOL bSrcCanBeID, UINT dstTyped) DECLSPEC_HIDDEN; +DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN; +UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN; -DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); +DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN; -const char* WINMM_ErrorToString(MMRESULT error); +const char* WINMM_ErrorToString(MMRESULT error) DECLSPEC_HIDDEN; -void TIME_MMTimeStop(void); +void TIME_MMTimeStop(void) DECLSPEC_HIDDEN; /* Global variables */ -extern CRITICAL_SECTION WINMM_cs; -extern HINSTANCE hWinMM32Instance; -extern HANDLE psLastEvent; -extern HANDLE psStopEvent; +extern CRITICAL_SECTION WINMM_cs DECLSPEC_HIDDEN; +extern HINSTANCE hWinMM32Instance DECLSPEC_HIDDEN; +extern HANDLE psLastEvent DECLSPEC_HIDDEN; +extern HANDLE psStopEvent DECLSPEC_HIDDEN; /* GetDriverFlags() returned bits is not documented (nor the call itself) * Here are Wine only definitions of the bits

1 0

Marcus Meissner : msi: Mark internal symbols as visibility hidden.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: eb97e6179fe0bad0adc25f04b8cde8cf2e46c9d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb97e6179fe0bad0adc25f04b… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Apr 21 11:03:25 2011 +0200 msi: Mark internal symbols as visibility hidden. --- dlls/msi/msipriv.h | 490 ++++++++++++++++++++++++++-------------------------- dlls/msi/query.h | 36 ++-- 2 files changed, 263 insertions(+), 263 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb97e6179fe0bad0adc25…

1 0

Marcus Meissner : crypt32: Mark internal symbols as hidden visibility.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: b5cbe08b56a639f3ec1c76db3d469fae865c8f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5cbe08b56a639f3ec1c76db3… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Apr 21 10:52:29 2011 +0200 crypt32: Mark internal symbols as hidden visibility. --- dlls/crypt32/crypt32_private.h | 122 ++++++++++++++++++++-------------------- 1 files changed, 61 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5cbe08b56a639f3ec1c7…

1 0

Marcus Meissner : ntdll: Mark internal functions as hidden.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: 2802d3344de481a90e251e5e21a1b8ad04c498ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=2802d3344de481a90e251e5e2… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Apr 21 10:32:31 2011 +0200 ntdll: Mark internal functions as hidden. --- dlls/ntdll/ntdll_misc.h | 166 +++++++++++++++++++++++----------------------- 1 files changed, 83 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2802d3344de481a90e251…

1 0

Austin English : kernel32: Add a stub for SetThreadPreferredUILanguages.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: cad8afb8eebdb354e34be392b375dc8453f2f1b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad8afb8eebdb354e34be392b… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Apr 23 17:40:56 2011 -0500 kernel32: Add a stub for SetThreadPreferredUILanguages. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/thread.c | 9 +++++++++ include/winnt.h | 2 ++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 21e8210..946bce0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1079,6 +1079,7 @@ @ stdcall SetThreadExecutionState(long) @ stdcall SetThreadIdealProcessor(long long) @ stdcall SetThreadLocale(long) +@ stdcall SetThreadPreferredUILanguages(long ptr ptr) @ stdcall SetThreadPriority(long long) @ stdcall SetThreadPriorityBoost(long long) @ stdcall SetThreadUILanguage(long) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index bddf37d..f061169 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -806,3 +806,12 @@ BOOL WINAPI GetThreadIOPendingFlag( HANDLE thread, PBOOL io_pending ) *io_pending = FALSE; return TRUE; } + +/*********************************************************************** + * SetThreadPreferredUILanguages (KERNEL32.@) + */ +BOOL WINAPI SetThreadPreferredUILanguages( DWORD flags, PCZZWSTR buffer, PULONG count ) +{ + FIXME( "%u, %p, %p\n", flags, buffer, count ); + return TRUE; +} diff --git a/include/winnt.h b/include/winnt.h index d3df022..62d5f80 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -422,6 +422,8 @@ typedef WCHAR *PWCH, *LPWCH; typedef const WCHAR *PCWCH, *LPCWCH; typedef WCHAR *PWSTR, *LPWSTR, *NWPSTR; typedef const WCHAR *PCWSTR, *LPCWSTR; +typedef WCHAR *PZZWSTR; +typedef const WCHAR *PCZZWSTR; /* Neutral character and string types */ /* These are only defined for Winelib, i.e. _not_ defined for

1 0

Frédéric Delanoy : po: Add message contexts ( and French translations) for some polysemic English translation entries.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: 0ad90ee9ed8f28fc5ed5fc37def02be4792a67d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad90ee9ed8f28fc5ed5fc37d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Apr 24 04:33:09 2011 +0200 po: Add message contexts (and French translations) for some polysemic English translation entries. --- dlls/comctl32/comctl32.rc | 2 +- dlls/crypt32/crypt32.rc | 2 +- dlls/hhctrl.ocx/hhctrl.rc | 4 ++-- dlls/shdocvw/shdocvw.rc | 2 +- po/ar.po | 22 ++++++++++++++++++++-- po/bg.po | 25 +++++++++++++++++++++++-- po/ca.po | 22 ++++++++++++++++++++-- po/cs.po | 34 ++++++++++++++++++++++++++++++++-- po/da.po | 27 +++++++++++++++++++++++++-- po/de.po | 34 ++++++++++++++++++++++++++++++++-- po/el.po | 27 +++++++++++++++++++++++++-- po/en.po | 22 ++++++++++++++++++++-- po/en_US.po | 22 ++++++++++++++++++++-- po/eo.po | 25 +++++++++++++++++++++++-- po/es.po | 34 ++++++++++++++++++++++++++++++++-- po/fa.po | 22 ++++++++++++++++++++-- po/fi.po | 24 ++++++++++++++++++++++-- po/fr.po | 38 +++++++++++++++++++++++--------------- po/he.po | 28 ++++++++++++++++++++++++++-- po/hi.po | 22 ++++++++++++++++++++-- po/hu.po | 34 ++++++++++++++++++++++++++++++++-- po/it.po | 27 +++++++++++++++++++++++++-- po/ja.po | 28 ++++++++++++++++++++++++++-- po/ko.po | 28 ++++++++++++++++++++++++++-- po/lt.po | 28 ++++++++++++++++++++++++++-- po/ml.po | 22 ++++++++++++++++++++-- po/nb_NO.po | 27 +++++++++++++++++++++++++-- po/nl.po | 28 ++++++++++++++++++++++++++-- po/or.po | 22 ++++++++++++++++++++-- po/pa.po | 22 ++++++++++++++++++++-- po/pl.po | 28 ++++++++++++++++++++++++++-- po/pt_BR.po | 34 ++++++++++++++++++++++++++++++++-- po/pt_PT.po | 34 ++++++++++++++++++++++++++++++++-- po/rm.po | 22 ++++++++++++++++++++-- po/ro.po | 34 ++++++++++++++++++++++++++++++++-- po/ru.po | 28 ++++++++++++++++++++++++++-- po/sk.po | 25 +++++++++++++++++++++++-- po/sl.po | 27 +++++++++++++++++++++++++-- po/sr_RS(a)cyrillic.po | 27 +++++++++++++++++++++++++-- po/sr_RS(a)latin.po | 34 ++++++++++++++++++++++++++++++++-- po/sv.po | 28 ++++++++++++++++++++++++++-- po/te.po | 22 ++++++++++++++++++++-- po/th.po | 25 +++++++++++++++++++++++-- po/tr.po | 27 +++++++++++++++++++++++++-- po/uk.po | 28 ++++++++++++++++++++++++++-- po/wa.po | 22 ++++++++++++++++++++-- po/wine.pot | 22 ++++++++++++++++++++-- po/zh_CN.po | 34 ++++++++++++++++++++++++++++++++-- po/zh_TW.po | 34 ++++++++++++++++++++++++++++++++-- programs/progman/progman.rc | 2 +- programs/winecfg/winecfg.rc | 2 +- 51 files changed, 1133 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ad90ee9ed8f28fc5ed5f…

1 0

Eric Pouech : msvcrt: Added tests in fileops with different buffer management modes.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: dc9904a3385223ffaac09fb6aa09deeb62926e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc9904a3385223ffaac09fb6a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Apr 24 11:01:48 2011 +0200 msvcrt: Added tests in fileops with different buffer management modes. --- dlls/msvcrt/tests/file.c | 98 ++++++++++++++++++++++++++------------------- 1 files changed, 57 insertions(+), 41 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index f70285b..5aaaaf7 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -106,54 +106,70 @@ static void test_fileops( void ) int fd; FILE *file; fpos_t pos; - int i, c; + int i, c, bufmode; + static const int bufmodes[] = {_IOFBF,_IONBF}; fd = open ("fdopen.tst", O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE); write (fd, outbuffer, sizeof (outbuffer)); close (fd); - fd = open ("fdopen.tst", O_RDONLY | O_BINARY); - file = fdopen (fd, "rb"); - ok(strlen(outbuffer) == (sizeof(outbuffer)-1),"strlen/sizeof error\n"); - ok(fgets(buffer,sizeof(buffer),file) !=0,"fgets failed unexpected\n"); - ok(fgets(buffer,sizeof(buffer),file) ==0,"fgets didn't signal EOF\n"); - ok(feof(file) !=0,"feof doesn't signal EOF\n"); - rewind(file); - ok(fgets(buffer,strlen(outbuffer),file) !=0,"fgets failed unexpected\n"); - ok(lstrlenA(buffer) == lstrlenA(outbuffer) -1,"fgets didn't read right size\n"); - ok(fgets(buffer,sizeof(outbuffer),file) !=0,"fgets failed unexpected\n"); - ok(strlen(buffer) == 1,"fgets dropped chars\n"); - ok(buffer[0] == outbuffer[strlen(outbuffer)-1],"fgets exchanged chars\n"); - - rewind(file); - for (i = 0, c = EOF; i < sizeof(outbuffer); i++) + for (bufmode=0; bufmode < sizeof(bufmodes)/sizeof(bufmodes[0]); bufmode++) { - ok((c = fgetc(file)) == outbuffer[i], "fgetc returned wrong data\n"); + fd = open ("fdopen.tst", O_RDONLY | O_BINARY); + file = fdopen (fd, "rb"); + setvbuf(file,NULL,bufmodes[bufmode],2048); + ok(strlen(outbuffer) == (sizeof(outbuffer)-1),"strlen/sizeof error for bufmode=%x\n", bufmodes[bufmode]); + ok(fgets(buffer,sizeof(buffer),file) !=0,"fgets failed unexpected for bufmode=%x\n", bufmodes[bufmode]); + ok(fgets(buffer,sizeof(buffer),file) ==0,"fgets didn't signal EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(feof(file) !=0,"feof doesn't signal EOF for bufmode=%x\n", bufmodes[bufmode]); + rewind(file); + ok(fgets(buffer,strlen(outbuffer),file) !=0,"fgets failed unexpected for bufmode=%x\n", bufmodes[bufmode]); + ok(lstrlenA(buffer) == lstrlenA(outbuffer) -1,"fgets didn't read right size for bufmode=%x\n", bufmodes[bufmode]); + ok(fgets(buffer,sizeof(outbuffer),file) !=0,"fgets failed unexpected for bufmode=%x\n", bufmodes[bufmode]); + ok(strlen(buffer) == 1,"fgets dropped chars for bufmode=%x\n", bufmodes[bufmode]); + ok(buffer[0] == outbuffer[strlen(outbuffer)-1],"fgets exchanged chars for bufmode=%x\n", bufmodes[bufmode]); + + rewind(file); + for (i = 0, c = EOF; i < sizeof(outbuffer); i++) + { + ok((c = fgetc(file)) == outbuffer[i], "fgetc returned wrong data for bufmode=%x\n", bufmodes[bufmode]); + } + ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(feof(file), "feof did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(ungetc(c, file) == EOF, "ungetc(EOF) did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(feof(file), "feof after ungetc(EOF) did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + c = outbuffer[sizeof(outbuffer) - 1]; + if (bufmodes[bufmode] == _IONBF) todo_wine { + ok(ungetc(c, file) == c, "ungetc did not return its input for bufmode=%x\n", bufmodes[bufmode]); + ok(!feof(file), "feof after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); + ok((c = fgetc(file)) != EOF, "getc after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(c == outbuffer[sizeof(outbuffer) - 1], + "getc did not return ungetc'd data for bufmode=%x\n", bufmodes[bufmode]); + ok(!feof(file), "feof after getc returned EOF prematurely for bufmode=%x\n", bufmodes[bufmode]); + } + else + { + ok(ungetc(c, file) == c, "ungetc did not return its input for bufmode=%x\n", bufmodes[bufmode]); + ok(!feof(file), "feof after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); + ok((c = fgetc(file)) != EOF, "getc after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(c == outbuffer[sizeof(outbuffer) - 1], + "getc did not return ungetc'd data for bufmode=%x\n", bufmodes[bufmode]); + ok(!feof(file), "feof after getc returned EOF prematurely for bufmode=%x\n", bufmodes[bufmode]); + } + ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(feof(file), "feof after getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + + rewind(file); + ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); + ok(pos == 0, "Unexpected result of fgetpos %x%08x for bufmode=%x\n", (DWORD)(pos >> 32), (DWORD)pos, bufmodes[bufmode]); + pos = sizeof (outbuffer); + ok(fsetpos(file, &pos) == 0, "fsetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); + ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); + ok(pos == sizeof (outbuffer), "Unexpected result of fgetpos %x%08x for bufmode=%x\n", (DWORD)(pos >> 32), (DWORD)pos, bufmodes[bufmode]); + + fclose (file); } - ok((c = fgetc(file)) == EOF, "getc did not return EOF\n"); - ok(feof(file), "feof did not return EOF\n"); - ok(ungetc(c, file) == EOF, "ungetc(EOF) did not return EOF\n"); - ok(feof(file), "feof after ungetc(EOF) did not return EOF\n"); - ok((c = fgetc(file)) == EOF, "getc did not return EOF\n"); - c = outbuffer[sizeof(outbuffer) - 1]; - ok(ungetc(c, file) == c, "ungetc did not return its input\n"); - ok(!feof(file), "feof after ungetc returned EOF\n"); - ok((c = fgetc(file)) != EOF, "getc after ungetc returned EOF\n"); - ok(c == outbuffer[sizeof(outbuffer) - 1], - "getc did not return ungetc'd data\n"); - ok(!feof(file), "feof after getc returned EOF prematurely\n"); - ok((c = fgetc(file)) == EOF, "getc did not return EOF\n"); - ok(feof(file), "feof after getc did not return EOF\n"); - - rewind(file); - ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected\n"); - ok(pos == 0, "Unexpected result of fgetpos %x%08x\n", (DWORD)(pos >> 32), (DWORD)pos); - pos = sizeof (outbuffer); - ok(fsetpos(file, &pos) == 0, "fsetpos failed unexpected\n"); - ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected\n"); - ok(pos == sizeof (outbuffer), "Unexpected result of fgetpos %x%08x\n", (DWORD)(pos >> 32), (DWORD)pos); - - fclose (file); fd = open ("fdopen.tst", O_RDONLY | O_TEXT); file = fdopen (fd, "rt"); /* open in TEXT mode */ ok(fgetws(wbuffer,sizeof(wbuffer)/sizeof(wbuffer[0]),file) !=0,"fgetws failed unexpected\n");

1 0