March 2015 - Wine-Commits - list.winehq.org

Francois Gouget : msdaps: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: e7979679b17d0e98bd428c2cd6d14d08e2c76dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7979679b17d0e98bd428c2cd… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:06:27 2015 +0100 msdaps: Remove unneeded NONAMELESSXXX directives. --- dlls/msdaps/main.c | 2 -- dlls/msdaps/row_server.c | 2 -- dlls/msdaps/usrmarshal.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/dlls/msdaps/main.c b/dlls/msdaps/main.c index 14c6c01..403df3a 100644 --- a/dlls/msdaps/main.c +++ b/dlls/msdaps/main.c @@ -21,8 +21,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 9afe881..784ade8 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -21,8 +21,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index b70d3f4..1243e48 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -21,8 +21,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : secur32: Export SetContextAttributes[AW]().
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 360462936109c8b6188d2ac51d94839ba401cedd URL: http://source.winehq.org/git/wine.git/?a=commit;h=360462936109c8b6188d2ac51… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:05:19 2015 +0100 secur32: Export SetContextAttributes[AW](). --- dlls/secur32/secur32.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index b8da828..5118258 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -67,6 +67,8 @@ @ stub SecpFreeMemory @ stub SecpTranslateName @ stub SecpTranslateNameEx +@ stdcall SetContextAttributesA(ptr long ptr long) +@ stdcall SetContextAttributesW(ptr long ptr long) @ stdcall TranslateNameA(str long long ptr ptr) @ stdcall TranslateNameW(wstr long long ptr ptr) @ stdcall UnsealMessage(ptr ptr long ptr) DecryptMessage

1 0

Francois Gouget : dbghelp: pe_unmap_directory() is unused so remove it.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: ba6e4ff66eebb14d783b53d1537501ac2914035e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6e4ff66eebb14d783b53d15… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:04:15 2015 +0100 dbghelp: pe_unmap_directory() is unused so remove it. --- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/pe_module.c | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 74cba88..0d300f3 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -646,7 +646,6 @@ extern struct module* extern BOOL pe_load_debug_info(const struct process* pcs, struct module* module) DECLSPEC_HIDDEN; extern const char* pe_map_directory(struct module* module, int dirno, DWORD* size) DECLSPEC_HIDDEN; -extern void pe_unmap_directoy(struct module* module, int dirno) DECLSPEC_HIDDEN; /* source.c */ extern unsigned source_new(struct module* module, const char* basedir, const char* source) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index b793edb..b52d47e 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -322,16 +322,6 @@ const char* pe_map_directory(struct module* module, int dirno, DWORD* size) nth->OptionalHeader.DataDirectory[dirno].VirtualAddress, NULL); } -/****************************************************************** - * pe_unmap_directory - * - * Unmaps a directory content - */ -void pe_unmap_directory(struct image_file_map* fmap, int dirno) -{ - pe_unmap_full(fmap); -} - static void pe_module_remove(struct process* pcs, struct module_format* modfmt) { pe_unmap_file(&modfmt->u.pe_info->fmap);

1 0

Bruno Jesus : ws2_32/tests: Improve some helper functions.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 8042dbac55ef56ac47c9977a9ebe8199f76c3787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8042dbac55ef56ac47c9977a9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 15 16:13:12 2015 -0300 ws2_32/tests: Improve some helper functions. --- dlls/ws2_32/tests/sock.c | 49 ++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ca8e1a5..c596e85 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -301,32 +301,41 @@ static void read_zero_bytes ( SOCKET s ) ok ( n <= 0, "garbage data received: %d bytes\n", n ); } -static int do_synchronous_send ( SOCKET s, char *buf, int buflen, int sendlen, int flags ) +static int do_synchronous_send ( SOCKET s, char *buf, int buflen, int flags, int sendlen ) { char* last = buf + buflen, *p; int n = 1; - for ( p = buf; n > 0 && p < last; p += n ) + for ( p = buf; n > 0 && p < last; ) + { n = send ( s, p, min ( sendlen, last - p ), flags ); + if (n > 0) p += n; + } wsa_ok ( n, 0 <=, "do_synchronous_send (%x): error %d\n" ); return p - buf; } -static int do_synchronous_recv ( SOCKET s, char *buf, int buflen, int recvlen ) +static int do_synchronous_recv ( SOCKET s, char *buf, int buflen, int flags, int recvlen ) { char* last = buf + buflen, *p; int n = 1; - for ( p = buf; n > 0 && p < last; p += n ) - n = recv ( s, p, min ( recvlen, last - p ), 0 ); + for ( p = buf; n > 0 && p < last; ) + { + n = recv ( s, p, min ( recvlen, last - p ), flags ); + if (n > 0) p += n; + } wsa_ok ( n, 0 <=, "do_synchronous_recv (%x): error %d:\n" ); return p - buf; } -static int do_synchronous_recvfrom ( SOCKET s, char *buf, int buflen,int flags,struct sockaddr *from, int *fromlen, int recvlen ) +static int do_synchronous_recvfrom ( SOCKET s, char *buf, int buflen, int flags, struct sockaddr *from, int *fromlen, int recvlen ) { char* last = buf + buflen, *p; int n = 1; - for ( p = buf; n > 0 && p < last; p += n ) - n = recvfrom ( s, p, min ( recvlen, last - p ), 0, from, fromlen ); + for ( p = buf; n > 0 && p < last; ) + { + n = recvfrom ( s, p, min ( recvlen, last - p ), flags, from, fromlen ); + if (n > 0) p += n; + } wsa_ok ( n, 0 <=, "do_synchronous_recv (%x): error %d:\n" ); return p - buf; } @@ -538,14 +547,14 @@ static VOID WINAPI simple_server ( server_params *par ) "simple_server (%x): strange peer address\n", id ); /* Receive data & check it */ - n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, 0, par->buflen ); ok ( n_recvd == n_expected, "simple_server (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); pos = test_buffer ( mem->sock[0].buf, gen->chunk_size, gen->n_chunks ); ok ( pos == -1, "simple_server (%x): test pattern error: %d\n", id, pos); /* Echo data back */ - n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen, 0 ); + n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, 0, par->buflen ); ok ( n_sent == n_expected, "simple_server (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -597,14 +606,14 @@ static VOID WINAPI oob_server ( server_params *par ) ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); /* Receive normal data */ - n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, 0, par->buflen ); ok ( n_recvd == n_expected, "oob_server (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); pos = test_buffer ( mem->sock[0].buf, gen->chunk_size, gen->n_chunks ); ok ( pos == -1, "oob_server (%x): test pattern error: %d\n", id, pos); /* Echo data back */ - n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen, 0 ); + n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, 0, par->buflen ); ok ( n_sent == n_expected, "oob_server (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -613,7 +622,7 @@ static VOID WINAPI oob_server ( server_params *par ) ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); /* Receive a part of the out-of-band data and check atmark state */ - n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, 8, par->buflen ); + n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, 8, 0, par->buflen ); ok ( n_recvd == 8, "oob_server (%x): received less data than expected: %d of %d\n", id, n_recvd, 8 ); n_expected -= 8; @@ -622,7 +631,7 @@ static VOID WINAPI oob_server ( server_params *par ) todo_wine ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark ); /* Receive the rest of the out-of-band data and check atmark state */ - do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, 0, par->buflen ); ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); todo_wine ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark ); @@ -795,7 +804,7 @@ static VOID WINAPI simple_client ( client_params *par ) trace ( "simple_client (%x) connected\n", id ); /* send data to server */ - n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, 0 ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, 0, par->buflen ); ok ( n_sent == n_expected, "simple_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -803,7 +812,7 @@ static VOID WINAPI simple_client ( client_params *par ) wsa_ok ( shutdown ( mem->s, SD_SEND ), 0 ==, "simple_client (%x): shutdown failed: %d\n" ); /* Receive data echoed back & check it */ - n_recvd = do_synchronous_recv ( mem->s, mem->recv_buf, n_expected, par->buflen ); + n_recvd = do_synchronous_recv ( mem->s, mem->recv_buf, n_expected, 0, par->buflen ); ok ( n_recvd == n_expected, "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); @@ -845,19 +854,19 @@ static VOID WINAPI oob_client ( client_params *par ) trace ( "oob_client (%x) connected\n", id ); /* send data to server */ - n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, 0 ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, 0, par->buflen ); ok ( n_sent == n_expected, "oob_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); /* Receive data echoed back & check it */ - n_recvd = do_synchronous_recv ( mem->s, mem->recv_buf, n_expected, par->buflen ); + n_recvd = do_synchronous_recv ( mem->s, mem->recv_buf, n_expected, 0, par->buflen ); ok ( n_recvd == n_expected, "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); pos = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); ok ( pos == -1, "simple_client (%x): test pattern error: %d\n", id, pos); /* send out-of-band data to server */ - n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, MSG_OOB ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, MSG_OOB, par->buflen ); ok ( n_sent == n_expected, "oob_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -900,7 +909,7 @@ static VOID WINAPI simple_mixed_client ( client_params *par ) trace ( "simple_client (%x) connected\n", id ); /* send data to server */ - n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, 0 ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, 0, par->buflen ); ok ( n_sent == n_expected, "simple_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected );

1 0

Francois Gouget : crypt32: Mark internal symbols with hidden visibility.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 838ff1b244c6e03d2f1ef1f0194e366009eda408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=838ff1b244c6e03d2f1ef1f01… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:12:07 2015 +0100 crypt32: Mark internal symbols with hidden visibility. --- dlls/crypt32/crypt32_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index fb5c5c3..ad4a827 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -430,7 +430,7 @@ void ContextPropertyList_Copy(CONTEXT_PROPERTY_LIST *to, void ContextPropertyList_Free(CONTEXT_PROPERTY_LIST *list) DECLSPEC_HIDDEN; -extern WINECRYPT_CERTSTORE empty_store; +extern WINECRYPT_CERTSTORE empty_store DECLSPEC_HIDDEN; void init_empty_store(void) DECLSPEC_HIDDEN; /**

1 0

Francois Gouget : ntprint: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 17f425290eb63b84df819abaee63d0dcff2e8c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f425290eb63b84df819abae… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:09:20 2015 +0100 ntprint: Remove an uneeded NONAMELESSUNION directive. --- dlls/ntprint/ntprint.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index a5431b6..b6d77b3 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : msxml3: Remove unneeded NONAMELESSUNION directives.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: ce40bcf054aad6c8fcf07c5d7528d35aa1189df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce40bcf054aad6c8fcf07c5d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:07:07 2015 +0100 msxml3: Remove unneeded NONAMELESSUNION directives. --- dlls/msxml3/domdoc.c | 1 - dlls/msxml3/mxnamespace.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 71cf077..e081f1a 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -20,7 +20,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include "config.h" diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c index f114d97..dc6ff9c 100644 --- a/dlls/msxml3/mxnamespace.c +++ b/dlls/msxml3/mxnamespace.c @@ -19,7 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include "config.h"

1 0

Jacek Caban : wmsdkidl.idl: Added IWMWriterAdvanced* interfaces declarations.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: d6e2b5b1ffc79adf46eb3f196298ed5ca6416caa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e2b5b1ffc79adf46eb3f196… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 13 13:56:52 2015 +0100 wmsdkidl.idl: Added IWMWriterAdvanced* interfaces declarations. --- include/wmsdkidl.idl | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index da228e7..1618f86 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -35,6 +35,31 @@ typedef struct _WMMediaType [size_is(cbFormat)] BYTE *pbFormat; } WM_MEDIA_TYPE; +typedef struct _WMWriterStatistics +{ + QWORD qwSampleCount; + QWORD qwByteCount; + QWORD qwDroppedSampleCount; + QWORD qwDroppedByteCount; + DWORD dwCurrentBitrate; + DWORD dwAverageBitrate; + DWORD dwExpectedBitrate; + DWORD dwCurrentSampleRate; + DWORD dwAverageSampleRate; + DWORD dwExpectedSampleRate; +} WM_WRITER_STATISTICS; + +typedef struct _WMWriterStatisticsEx +{ + DWORD dwBitratePlusOverhead; + DWORD dwCurrentSampleDropRateInQueue; + DWORD dwCurrentSampleDropRateInCodec; + DWORD dwCurrentSampleDropRateInMultiplexer; + DWORD dwTotalSampleDropsInQueue; + DWORD dwTotalSampleDropsInCodec; + DWORD dwTotalSampleDropsInMultiplexer; +} WM_WRITER_STATISTICS_EX; + typedef enum WMT_ATTR_DATATYPE { WMT_TYPE_DWORD = 0, @@ -535,6 +560,30 @@ interface IWMInputMediaProps : IWMMediaProps [ object, + uuid(96406be4-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMWriterSink : IUnknown +{ + HRESULT OnHeader( + [in] INSSBuffer *pHeader); + + HRESULT IsRealTime( + [out] BOOL *pfRealTime); + + HRESULT AllocateDataUnit( + [in] DWORD cbDataUnit, + [out] INSSBuffer **ppDataUnit); + + HRESULT OnDataUnit( + [in] INSSBuffer *pDataUnit); + + HRESULT OnEndWriting(); +} + +[ + object, uuid(96406bd4-2b2b-11d3-b36b-00c04f6108ff), pointer_default(unique), local @@ -587,6 +636,93 @@ interface IWMWriter : IUnknown HRESULT Flush(); } +[ + object, + uuid(96406be3-2b2b-11d3-b36b-00C04f6108ff), + pointer_default(unique), + local +] +interface IWMWriterAdvanced : IUnknown +{ + HRESULT GetSinkCount( + [out] DWORD *pcSinks); + + HRESULT GetSink( + [in] DWORD dwSinkNum, + [out] IWMWriterSink **ppSink); + + HRESULT AddSink( + [in] IWMWriterSink *pSink); + + HRESULT RemoveSink( + [in] IWMWriterSink *pSink); + + HRESULT WriteStreamSample( + [in] WORD wStreamNum, + [in] QWORD cnsSampleTime, + [in] DWORD msSampleSendTime, + [in] QWORD cnsSampleDuration, + [in] DWORD dwFlags, + [in] INSSBuffer *pSample); + + HRESULT SetLiveSource( + BOOL fIsLiveSource); + + HRESULT IsRealTime( + [out] BOOL *pfRealTime); + + HRESULT GetWriterTime( + [out] QWORD *pCurrentTime); + + HRESULT GetStatistics( + [in] WORD wStreamNum, + [out] WM_WRITER_STATISTICS *pStats); + + HRESULT SetSyncTolerance( + [in] DWORD msWindow); + + HRESULT GetSyncTolerance( + [out] DWORD *pmsWindow); +} + +[ + object, + uuid(962dc1ec-c046-4db8-9cc7-26ceae500817), + pointer_default(unique), + local +] +interface IWMWriterAdvanced2 : IWMWriterAdvanced +{ + HRESULT GetInputSetting( + [in] DWORD dwInputNum, + [in] LPCWSTR pszName, + [out] WMT_ATTR_DATATYPE *pType, + [out, size_is(*pcbLength)] BYTE *pValue, + [in, out] WORD *pcbLength); + + HRESULT SetInputSetting( + [in] DWORD dwInputNum, + [in] LPCWSTR pszName, + [in] WMT_ATTR_DATATYPE Type, + [in, size_is(cbLength)] const BYTE *pValue, + [in] WORD cbLength); +} + +[ + object, + uuid(2cd6492d-7c37-4e76-9d3b-59261183a22e), + pointer_default(unique), + local +] +interface IWMWriterAdvanced3 : IWMWriterAdvanced2 +{ + HRESULT GetStatisticsEx( + [in] WORD wStreamNum, + [out] WM_WRITER_STATISTICS_EX *pStats); + + HRESULT SetNonBlocking(); +} + cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")

1 0

Jacek Caban : mshtml: Added IHTMLTextAreaElement:: defaultValue property implementation.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 14e62a0e2d2d410350b9eaeb877ef194a0927f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e62a0e2d2d410350b9eaeb8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 13 13:07:25 2015 +0100 mshtml: Added IHTMLTextAreaElement::defaultValue property implementation. --- dlls/mshtml/htmltextarea.c | 21 +++++++++++++++++---- dlls/mshtml/tests/dom.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 43086f9..6a2d1f0 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -229,15 +229,28 @@ static HRESULT WINAPI HTMLTextAreaElement_get_form(IHTMLTextAreaElement *iface, static HRESULT WINAPI HTMLTextAreaElement_put_defaultValue(IHTMLTextAreaElement *iface, BSTR v) { HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLTextAreaElement_SetDefaultValue(This->nstextarea, &nsstr); + nsAString_Finish(&nsstr); + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLTextAreaElement_get_defaultValue(IHTMLTextAreaElement *iface, BSTR *p) { HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLTextAreaElement_GetDefaultValue(This->nstextarea, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLTextAreaElement_select(IHTMLTextAreaElement *iface) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fca96a0..bcb97b9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1670,6 +1670,38 @@ static void _test_textarea_put_value(unsigned line, IUnknown *unk, const char *v _test_textarea_value(line, unk, value); } +#define test_textarea_defaultvalue(t,v) _test_textarea_defaultvalue(__LINE__,t,v) +static void _test_textarea_defaultvalue(unsigned line, IUnknown *unk, const char *exval) +{ + IHTMLTextAreaElement *textarea = _get_textarea_iface(line, unk); + BSTR value = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLTextAreaElement_get_defaultValue(textarea, &value); + IHTMLTextAreaElement_Release(textarea); + ok_(__FILE__,line)(hres == S_OK, "get_defaultValue failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(value, exval), "defaultValue = %s, expected %s\n", wine_dbgstr_w(value), exval); + else + ok_(__FILE__,line)(!value, "value = %p\n", value); + SysFreeString(value); +} + +#define test_textarea_put_defaultvalue(t,v) _test_textarea_put_defaultvalue(__LINE__,t,v) +static void _test_textarea_put_defaultvalue(unsigned line, IUnknown *unk, const char *value) +{ + IHTMLTextAreaElement *textarea = _get_textarea_iface(line, unk); + BSTR tmp = a2bstr(value); + HRESULT hres; + + hres = IHTMLTextAreaElement_put_defaultValue(textarea, tmp); + IHTMLTextAreaElement_Release(textarea); + ok_(__FILE__,line)(hres == S_OK, "put_defaultValue failed: %08x\n", hres); + SysFreeString(tmp); + + _test_textarea_defaultvalue(line, unk, value); +} + #define test_textarea_readonly(t,v) _test_textarea_readonly(__LINE__,t,v) static void _test_textarea_readonly(unsigned line, IUnknown *unk, VARIANT_BOOL ex) { @@ -8172,6 +8204,9 @@ static void test_elems2(IHTMLDocument2 *doc) test_textarea_value((IUnknown*)elem, NULL); test_textarea_put_value((IUnknown*)elem, "test"); + test_textarea_defaultvalue((IUnknown*)elem, NULL); + test_textarea_put_defaultvalue((IUnknown*)elem, "defval text"); + test_textarea_put_value((IUnknown*)elem, "test"); test_textarea_readonly((IUnknown*)elem, VARIANT_FALSE); test_textarea_put_readonly((IUnknown*)elem, VARIANT_TRUE); test_textarea_put_readonly((IUnknown*)elem, VARIANT_FALSE); @@ -8185,6 +8220,13 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + test_elem_set_innerhtml((IUnknown*)div, "<textarea id=\"ta\">default text</textarea>"); + elem = get_elem_by_id(doc, "ta", TRUE); + if(elem) { + test_textarea_defaultvalue((IUnknown*)elem, "default text"); + IHTMLElement_Release(elem); + } + test_elem_set_innerhtml((IUnknown*)div, "<form id=\"fid\"><textarea id=\"ta\"></textarea></form>"); elem = get_elem_by_id(doc, "ta", TRUE); if(elem) {

1 0

Nikolay Sivov : dwrite: Fix invalid parameter handling in GetGlyphIndices( ).
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 2933e8666f77cf92d4458514d345abb9851a95f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2933e8666f77cf92d4458514d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 21:57:50 2015 +0300 dwrite: Fix invalid parameter handling in GetGlyphIndices(). --- dlls/dwrite/font.c | 8 ++++++++ dlls/dwrite/tests/font.c | 23 ++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 32ed712..c4b8818 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -392,6 +392,14 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace2 *iface, UI TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyph_indices); + if (!glyph_indices) + return E_INVALIDARG; + + if (!codepoints) { + memset(glyph_indices, 0, count*sizeof(UINT16)); + return E_INVALIDARG; + } + for (i = 0; i < count; i++) glyph_indices[i] = freetype_get_glyphindex(iface, codepoints[i]); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d773c66..a9a6802 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1779,7 +1779,7 @@ static void test_CreateCustomFontFileReference(void) HRESULT hr; HRSRC fontrsrc; UINT32 codePoints[1] = {0xa8}; - UINT16 indices[1]; + UINT16 indices[2]; factory = create_factory(); factory2 = create_factory(); @@ -1876,6 +1876,27 @@ if (face2) IDWriteFontFace_Release(face2); IDWriteFontFile_Release(file2); + hr = IDWriteFontFace_GetGlyphIndices(face, NULL, 0, NULL); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* win8 */, "got 0x%08x\n", hr); + + hr = IDWriteFontFace_GetGlyphIndices(face, codePoints, 0, NULL); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* win8 */, "got 0x%08x\n", hr); + + hr = IDWriteFontFace_GetGlyphIndices(face, codePoints, 0, indices); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFace_GetGlyphIndices(face, NULL, 0, indices); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* win8 */, "got 0x%08x\n", hr); + + indices[0] = indices[1] = 11; + hr = IDWriteFontFace_GetGlyphIndices(face, NULL, 1, indices); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(indices[0] == 0, "got index %i\n", indices[0]); + ok(indices[1] == 11, "got index %i\n", indices[1]); + +if (0) /* crashes on native */ + hr = IDWriteFontFace_GetGlyphIndices(face, NULL, 1, NULL); + hr = IDWriteFontFace_GetGlyphIndices(face, codePoints, 1, indices); ok(hr == S_OK, "got 0x%08x\n", hr); ok(indices[0] == 6, "got index %i\n", indices[0]);

1 0