wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Seong-ho Cho : configure: Add AC_HEADER_MAJOR to find where major() is defined.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: ca8a08606d3f0900b3f4aa8f2e6547882a22dba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8a08606d3f0900b3f4aa8f2… Author: Seong-ho Cho <darkcircle.0426(a)gmail.com> Date: Mon Apr 18 04:25:38 2016 +0900 configure: Add AC_HEADER_MAJOR to find where major() is defined. Signed-off-by: Seong-ho Cho <darkcircle.0426(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + dlls/ntdll/cdrom.c | 5 +++++ dlls/ntdll/directory.c | 5 +++++ dlls/ntdll/file.c | 5 +++++ include/config.h.in | 8 ++++++++ server/fd.c | 5 +++++ 7 files changed, 79 insertions(+) diff --git a/configure b/configure index 1cb0e59..ffb1825 100755 --- a/configure +++ b/configure @@ -6836,6 +6836,56 @@ fi done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 +$as_echo_n "checking whether sys/types.h defines makedev... " >&6; } +if ${ac_cv_header_sys_types_h_makedev+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> +int +main () +{ +return makedev(0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_header_sys_types_h_makedev=yes +else + ac_cv_header_sys_types_h_makedev=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5 +$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; } + +if test $ac_cv_header_sys_types_h_makedev = no; then +ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_mkdev_h" = xyes; then : + +$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h + +fi + + + + if test $ac_cv_header_sys_mkdev_h = no; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then : + +$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h + +fi + + + fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 $as_echo_n "checking whether stat file-mode macros are broken... " >&6; } if ${ac_cv_header_stat_broken+:} false; then : diff --git a/configure.ac b/configure.ac index 6189aa9..201bc77 100644 --- a/configure.ac +++ b/configure.ac @@ -512,6 +512,7 @@ AC_CHECK_HEADERS(\ valgrind/valgrind.h \ zlib.h ) +AC_HEADER_MAJOR() AC_HEADER_STAT() dnl **** Checks for headers that depend on other ones **** diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index ee36045..2c64106 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -38,6 +38,11 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +# include <sys/sysmacros.h> +#endif #include <sys/types.h> #ifdef HAVE_SYS_IOCTL_H diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 93fe594..4d431c0 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -47,6 +47,11 @@ #ifdef HAVE_SYS_ATTR_H #include <sys/attr.h> #endif +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +# include <sys/sysmacros.h> +#endif #ifdef HAVE_SYS_VNODE_H /* Work around a conflict with Solaris' system list defined in sys/list.h. */ #define list SYSLIST diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 7e5da59..b3bd9d6 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -57,6 +57,11 @@ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +# include <sys/sysmacros.h> +#endif #ifdef HAVE_UTIME_H # include <utime.h> #endif diff --git a/include/config.h.in b/include/config.h.in index 0650f31..06b192f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1335,6 +1335,14 @@ /* Define to 1 if you have the `__res_get_state' function. */ #undef HAVE___RES_GET_STATE +/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>. + */ +#undef MAJOR_IN_MKDEV + +/* Define to 1 if `major', `minor', and `makedev' are declared in + <sysmacros.h>. */ +#undef MAJOR_IN_SYSMACROS + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/server/fd.c b/server/fd.c index 1fd1ce7..17b1b66 100644 --- a/server/fd.c +++ b/server/fd.c @@ -83,6 +83,11 @@ #endif #include <sys/stat.h> #include <sys/time.h> +#ifdef MAJOR_IN_MKDEV +#include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +#include <sys/sysmacros.h> +#endif #include <sys/types.h> #include <unistd.h> #ifdef HAVE_SYS_SYSCALL_H

1 0

Alex Henrie : ole32: Fix memory leaks in CompositeMonikerImpl_Construct.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: dddfd4693465740e231d7c8289473bd591db011b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dddfd4693465740e231d7c828… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 13 22:56:49 2016 -0600 ole32: Fix memory leaks in CompositeMonikerImpl_Construct. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 82899f0..6c92771 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1755,6 +1755,7 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike IMoniker *tempMk; HRESULT res; CompositeMonikerImpl *This; + int i; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); @@ -1800,12 +1801,14 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike if (++This->tabLastIndex==This->tabSize){ - LPVOID tab_moniker = This->tabMoniker; + IMoniker **tab_moniker = This->tabMoniker; This->tabSize+=BLOCK_TAB_SIZE; This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0])); if (This->tabMoniker==NULL){ + for (i = 0; i < This->tabLastIndex; i++) + IMoniker_Release(tab_moniker[i]); HeapFree(GetProcessHeap(), 0, tab_moniker); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; @@ -1848,18 +1851,25 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike IMoniker_Release(This->tabMoniker[This->tabLastIndex-1]); This->tabMoniker[This->tabLastIndex-1]=tempMk; - } else + } else{ + for (i = 0; i < This->tabLastIndex; i++) + IMoniker_Release(This->tabMoniker[i]); + HeapFree(GetProcessHeap(), 0, This->tabMoniker); + HeapFree(GetProcessHeap(), 0, This); return res; + } /* resize tabMoniker if needed */ if (This->tabLastIndex==This->tabSize){ - LPVOID tab_moniker = This->tabMoniker; + IMoniker **tab_moniker = This->tabMoniker; This->tabSize+=BLOCK_TAB_SIZE; This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); if (This->tabMoniker==NULL){ + for (i = 0; i < This->tabLastIndex; i++) + IMoniker_Release(tab_moniker[i]); HeapFree(GetProcessHeap(), 0, tab_moniker); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; @@ -1896,13 +1906,15 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike } if (This->tabLastIndex==This->tabSize){ - LPVOID tab_moniker = This->tabMoniker; + IMoniker **tab_moniker = This->tabMoniker; This->tabSize+=BLOCK_TAB_SIZE; This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0])); if (This->tabMoniker==NULL){ + for (i = 0; i < This->tabLastIndex; i++) + IMoniker_Release(tab_moniker[i]); HeapFree(GetProcessHeap(), 0, tab_moniker); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY;

1 0

Nikolay Sivov : comctl32/tests: Simplify static text data initialization.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: b7f1839583b33397a0fbcd3784968087c4ab776f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f1839583b33397a0fbcd378… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 16 11:36:09 2016 +0300 comctl32/tests: Simplify static text data initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/header.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 8245711..43fd175 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1080,15 +1080,13 @@ static void test_hdm_index_messages(HWND hParent) HWND hChild; int retVal, i, iSize; static const int lpiarray[2] = {1, 0}; - static int lpiarrayReceived[2]; - static char firstHeaderItem[] = "Name"; - static char secondHeaderItem[] = "Size"; - static char thirdHeaderItem[] = "Type"; - static char fourthHeaderItem[] = "Date Modified"; - static char *items[] = {firstHeaderItem, secondHeaderItem, thirdHeaderItem, fourthHeaderItem}; + static const char *item_texts[] = { + "Name", "Size", "Type", "Date Modified" + }; RECT rect; HDITEMA hdItem; char buffA[32]; + int array[2]; flush_sequences(sequences, NUM_MSG_SEQUENCES); hChild = create_custom_header_control(hParent, FALSE); @@ -1099,10 +1097,10 @@ static void test_hdm_index_messages(HWND hParent) ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); - for (i = 0; i < sizeof(items)/sizeof(items[0]); i++) + for (i = 0; i < sizeof(item_texts)/sizeof(item_texts[0]); i++) { hdItem.mask = HDI_TEXT | HDI_WIDTH | HDI_FORMAT; - hdItem.pszText = items[i]; + hdItem.pszText = (char*)item_texts[i]; hdItem.fmt = HDF_LEFT; hdItem.cxy = 80; @@ -1146,8 +1144,8 @@ static void test_hdm_index_messages(HWND hParent) ok_sequence(sequences, HEADER_SEQ_INDEX, getItem_seq, "getItem sequence testing", FALSE); /* check if the item is the right one */ - ok(!strcmp(hdItem.pszText, firstHeaderItem), "got wrong item %s, expected %s\n", - hdItem.pszText, firstHeaderItem); + ok(!strcmp(hdItem.pszText, item_texts[0]), "got wrong item %s, expected %s\n", + hdItem.pszText, item_texts[0]); expect(80, hdItem.cxy); iSize = SendMessageA(hChild, HDM_GETITEMCOUNT, 0, 0); @@ -1166,15 +1164,15 @@ static void test_hdm_index_messages(HWND hParent) retVal = SendMessageA(hChild, HDM_SETORDERARRAY, iSize, (LPARAM) lpiarray); ok(retVal == TRUE, "Setting header items order should return TRUE, got %d\n", retVal); - retVal = SendMessageA(hChild, HDM_GETORDERARRAY, iSize, (LPARAM) lpiarrayReceived); + retVal = SendMessageA(hChild, HDM_GETORDERARRAY, 2, (LPARAM) array); ok(retVal == TRUE, "Getting header items order should return TRUE, got %d\n", retVal); ok_sequence(sequences, HEADER_SEQ_INDEX, orderArray_seq, "set_get_orderArray sequence testing", FALSE); /* check if the array order is set correctly and the size of the array is correct. */ expect(2, iSize); - expect(lpiarray[0], lpiarrayReceived[0]); - expect(lpiarray[1], lpiarrayReceived[1]); + ok(lpiarray[0] == array[0], "got %d, expected %d\n", array[0], lpiarray[0]); + ok(lpiarray[1] == array[1], "got %d, expected %d\n", array[1], lpiarray[1]); hdItem.mask = HDI_FORMAT; hdItem.fmt = HDF_CENTER | HDF_STRING;

1 0

Nikolay Sivov : comctl32/tests: Fix wrong use of HDM_GETITEM when getting item text.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 025508f75534eb9b6f60d5e2f3567a6d47d9a062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=025508f75534eb9b6f60d5e2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 16 11:36:08 2016 +0300 comctl32/tests: Fix wrong use of HDM_GETITEM when getting item text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/header.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index f37b72b..8245711 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1078,10 +1078,7 @@ static void test_hdm_bitmapmarginMessages(HWND hParent) static void test_hdm_index_messages(HWND hParent) { HWND hChild; - int retVal; - int loopcnt; - int strcmpResult; - int iSize; + int retVal, i, iSize; static const int lpiarray[2] = {1, 0}; static int lpiarrayReceived[2]; static char firstHeaderItem[] = "Name"; @@ -1091,10 +1088,7 @@ static void test_hdm_index_messages(HWND hParent) static char *items[] = {firstHeaderItem, secondHeaderItem, thirdHeaderItem, fourthHeaderItem}; RECT rect; HDITEMA hdItem; - hdItem.mask = HDI_TEXT | HDI_WIDTH | HDI_FORMAT; - hdItem.fmt = HDF_LEFT; - hdItem.cxy = 80; - hdItem.cchTextMax = 260; + char buffA[32]; flush_sequences(sequences, NUM_MSG_SEQUENCES); hChild = create_custom_header_control(hParent, FALSE); @@ -1105,11 +1099,15 @@ static void test_hdm_index_messages(HWND hParent) ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); - for ( loopcnt = 0 ; loopcnt < 4 ; loopcnt++ ) + for (i = 0; i < sizeof(items)/sizeof(items[0]); i++) { - hdItem.pszText = items[loopcnt]; - retVal = SendMessageA(hChild, HDM_INSERTITEMA, loopcnt, (LPARAM) &hdItem); - ok(retVal == loopcnt, "Adding item %d failed with return value %d\n", ( loopcnt + 1 ), retVal); + hdItem.mask = HDI_TEXT | HDI_WIDTH | HDI_FORMAT; + hdItem.pszText = items[i]; + hdItem.fmt = HDF_LEFT; + hdItem.cxy = 80; + + retVal = SendMessageA(hChild, HDM_INSERTITEMA, i, (LPARAM) &hdItem); + ok(retVal == i, "Adding item %d failed with return value %d\n", i, retVal); } ok_sequence(sequences, HEADER_SEQ_INDEX, insertItem_seq, "insertItem sequence testing", FALSE); @@ -1135,17 +1133,21 @@ static void test_hdm_index_messages(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); + hdItem.mask = HDI_WIDTH; retVal = SendMessageA(hChild, HDM_GETITEMA, 3, (LPARAM) &hdItem); ok(retVal == FALSE, "Getting already-deleted item should return FALSE, got %d\n", retVal); + hdItem.mask = HDI_TEXT | HDI_WIDTH; + hdItem.pszText = buffA; + hdItem.cchTextMax = sizeof(buffA)/sizeof(buffA[0]); retVal = SendMessageA(hChild, HDM_GETITEMA, 0, (LPARAM) &hdItem); ok(retVal == TRUE, "Getting the 1st header item should return TRUE, got %d\n", retVal); ok_sequence(sequences, HEADER_SEQ_INDEX, getItem_seq, "getItem sequence testing", FALSE); /* check if the item is the right one */ - strcmpResult = strcmp(hdItem.pszText, firstHeaderItem); - expect(0, strcmpResult); + ok(!strcmp(hdItem.pszText, firstHeaderItem), "got wrong item %s, expected %s\n", + hdItem.pszText, firstHeaderItem); expect(80, hdItem.cxy); iSize = SendMessageA(hChild, HDM_GETITEMCOUNT, 0, 0);

1 0

Francois Gouget : crypt32/tests: Fix a spelling error in a comment.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 7f9a3a9af11ad5d98040189e2c639044a5b43315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9a3a9af11ad5d98040189e2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 16 02:24:41 2016 +0200 crypt32/tests: Fix a spelling error in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index be2ec54..5635a15 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4670,7 +4670,7 @@ static void check_ssl_policy(void) CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, fooPolicyCheckWithoutMatchingName, &oct2007, &policyPara); /* The Battle.Net chain checks a certificate with a domain component - * containg a terminating NULL. + * containing a terminating NULL. */ sslPolicyPara.pwszServerName = battle_dot_net; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL,

1 0

Andrew Eikum : user32: Grammar fix.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 76f1c254a2f81cc25d81dc0c0bc9acf9c7f2c083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76f1c254a2f81cc25d81dc0c0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 15 12:30:47 2016 -0500 user32: Grammar fix. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index bda2b00..5d1117f 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -400,7 +400,7 @@ static LRESULT MDI_RefreshMenu(MDICLIENTINFO *ci) if (!IsMenu(ci->hWindowMenu)) { - WARN("Window menu handle %p is no more valid\n", ci->hWindowMenu); + WARN("Window menu handle %p is no longer valid\n", ci->hWindowMenu); return 0; }

1 0

Francois Gouget : windowscodecs: Fix spelling of a few private struct names.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: a2f285bf7e557c42badd41dd78cc1ef21adb2c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f285bf7e557c42badd41dd7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 15 14:25:54 2016 +0200 windowscodecs: Fix spelling of a few private struct names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/gifformat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 9ba29f5..ddff88b 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -249,7 +249,7 @@ static HRESULT load_GCE_metadata(IStream *stream, const GUID *vendor, DWORD opti MetadataItem **items, DWORD *count) { #include "pshpack1.h" - struct graphic_control_extenstion + struct graphic_control_extension { BYTE packed; /* reservred: 3; @@ -327,7 +327,7 @@ static HRESULT load_APE_metadata(IStream *stream, const GUID *vendor, DWORD opti MetadataItem **items, DWORD *count) { #include "pshpack1.h" - struct application_extenstion + struct application_extension { BYTE extension_introducer; BYTE extension_label; @@ -434,7 +434,7 @@ static HRESULT load_GifComment_metadata(IStream *stream, const GUID *vendor, DWO MetadataItem **items, DWORD *count) { #include "pshpack1.h" - struct gif_extenstion + struct gif_extension { BYTE extension_introducer; BYTE extension_label;

1 0

Jacek Caban : rpcrt4: Added RpcServerRegisterIf3 implementation.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 6141cc800c05246c7267c2734e7579545dc623d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6141cc800c05246c7267c2734… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 15:35:13 2016 +0200 rpcrt4: Added RpcServerRegisterIf3 implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 21 +++++++++++++++++---- dlls/rpcrt4/rpcrt4.spec | 1 + include/rpcdce.h | 5 +++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 9c3dea7..809ecef 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1101,7 +1101,7 @@ void RPCRT4_destroy_all_protseqs(void) RPC_STATUS WINAPI RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv ) { TRACE("(%p,%s,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv); - return RpcServerRegisterIf2( IfSpec, MgrTypeUuid, MgrEpv, 0, RPC_C_LISTEN_MAX_CALLS_DEFAULT, (UINT)-1, NULL ); + return RpcServerRegisterIf3( IfSpec, MgrTypeUuid, MgrEpv, 0, RPC_C_LISTEN_MAX_CALLS_DEFAULT, (UINT)-1, NULL, NULL ); } /*********************************************************************** @@ -1111,7 +1111,7 @@ RPC_STATUS WINAPI RpcServerRegisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid UINT Flags, UINT MaxCalls, RPC_IF_CALLBACK_FN* IfCallbackFn ) { TRACE("(%p,%s,%p,%u,%u,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv, Flags, MaxCalls, IfCallbackFn); - return RpcServerRegisterIf2( IfSpec, MgrTypeUuid, MgrEpv, Flags, MaxCalls, (UINT)-1, IfCallbackFn ); + return RpcServerRegisterIf3( IfSpec, MgrTypeUuid, MgrEpv, Flags, MaxCalls, (UINT)-1, IfCallbackFn, NULL ); } /*********************************************************************** @@ -1120,12 +1120,25 @@ RPC_STATUS WINAPI RpcServerRegisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid RPC_STATUS WINAPI RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, UINT Flags, UINT MaxCalls, UINT MaxRpcSize, RPC_IF_CALLBACK_FN* IfCallbackFn ) { + return RpcServerRegisterIf3( IfSpec, MgrTypeUuid, MgrEpv, Flags, MaxCalls, MaxRpcSize, IfCallbackFn, NULL ); +} + +/*********************************************************************** + * RpcServerRegisterIf3 (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcServerRegisterIf3( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, + UINT Flags, UINT MaxCalls, UINT MaxRpcSize, RPC_IF_CALLBACK_FN* IfCallbackFn, void* SecurityDescriptor) +{ PRPC_SERVER_INTERFACE If = IfSpec; RpcServerInterface* sif; unsigned int i; - TRACE("(%p,%s,%p,%u,%u,%u,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv, Flags, MaxCalls, - MaxRpcSize, IfCallbackFn); + TRACE("(%p,%s,%p,%u,%u,%u,%p,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv, Flags, MaxCalls, + MaxRpcSize, IfCallbackFn, SecurityDescriptor); + + if (SecurityDescriptor) + FIXME("Unsupported SecurityDescriptor argument.\n"); + TRACE(" interface id: %s %d.%d\n", debugstr_guid(&If->InterfaceId.SyntaxGUID), If->InterfaceId.SyntaxVersion.MajorVersion, If->InterfaceId.SyntaxVersion.MinorVersion); diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index af8d639..f85d263 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -434,6 +434,7 @@ @ stdcall RpcServerRegisterAuthInfoA(str long ptr ptr) @ stdcall RpcServerRegisterAuthInfoW(wstr long ptr ptr) @ stdcall RpcServerRegisterIf2(ptr ptr ptr long long long ptr) +@ stdcall RpcServerRegisterIf3(ptr ptr ptr long long long ptr ptr) @ stdcall RpcServerRegisterIf(ptr ptr ptr) @ stdcall RpcServerRegisterIfEx(ptr ptr ptr long long ptr) @ stub RpcServerTestCancel diff --git a/include/rpcdce.h b/include/rpcdce.h index 84f6330..f5f031c 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -453,6 +453,11 @@ RPCRTAPI RPC_STATUS RPC_ENTRY unsigned int Flags, unsigned int MaxCalls, unsigned int MaxRpcSize, RPC_IF_CALLBACK_FN* IfCallbackFn ); RPCRTAPI RPC_STATUS RPC_ENTRY + RpcServerRegisterIf3( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, + unsigned int Flags, unsigned int MaxCalls, unsigned int MaxRpcSize, + RPC_IF_CALLBACK_FN* IfCallbackFn, void* SecurityDescriptor ); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerUnregisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, unsigned int WaitForCallsToComplete ); RPCRTAPI RPC_STATUS RPC_ENTRY

1 0

Jean-Christophe Cardot : winhlp32: Fix some images not shown in certain 16-bit help files.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 91f89b4f96674024b3436423ddb188e838d1ca54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f89b4f96674024b3436423d… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Fri Apr 15 12:08:03 2016 +0200 winhlp32: Fix some images not shown in certain 16-bit help files. Subfiles with bitmap images are usually prefixed with '|', but sometimes not. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/hlpfile.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 10484a9..2748e5c 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -507,6 +507,18 @@ static BOOL HLPFILE_FindSubFile(HLPFILE* hlpfile, LPCSTR name, BYTE **subbuf, BY WINE_TRACE("looking for file '%s'\n", name); ptr = HLPFILE_BPTreeSearch(hlpfile->file_buffer + GET_UINT(hlpfile->file_buffer, 4), name, comp_FindSubFile); + if (!ptr) + { /* Subfiles with bitmap images are usually prefixed with '|', but sometimes not. + Unfortunately, there is no consensus among different pieces of unofficial + documentation. So remove leading '|' and try again. */ + CHAR c = *name++; + if (c == '|') + { + WINE_TRACE("not found. try '%s'\n", name); + ptr = HLPFILE_BPTreeSearch(hlpfile->file_buffer + GET_UINT(hlpfile->file_buffer, 4), + name, comp_FindSubFile); + } + } if (!ptr) return FALSE; *subbuf = hlpfile->file_buffer + GET_UINT(ptr, strlen(name)+1); if (*subbuf >= hlpfile->file_buffer + hlpfile->file_buffer_size)

1 0

Nikolay Sivov : dwrite/tests: Use existing macro to define font table tags.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 886875f01e2f1e610cbc49b5617d9aaa71022976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=886875f01e2f1e610cbc49b56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 18 06:47:14 2016 +0300 dwrite/tests: Use existing macro to define font table tags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index dc9f64e..8ddc0d2 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -32,18 +32,14 @@ #include "wine/test.h" -#define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ - ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) - -#define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') -#define MS_VDMX_TAG MS_MAKE_TAG('V','D','M','X') -#define MS_GASP_TAG MS_MAKE_TAG('g','a','s','p') -#define MS_CPAL_TAG MS_MAKE_TAG('C','P','A','L') -#define MS_0S2_TAG MS_MAKE_TAG('O','S','/','2') -#define MS_HEAD_TAG MS_MAKE_TAG('h','e','a','d') -#define MS_HHEA_TAG MS_MAKE_TAG('h','h','e','a') -#define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') +#define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') +#define MS_VDMX_TAG DWRITE_MAKE_OPENTYPE_TAG('V','D','M','X') +#define MS_GASP_TAG DWRITE_MAKE_OPENTYPE_TAG('g','a','s','p') +#define MS_CPAL_TAG DWRITE_MAKE_OPENTYPE_TAG('C','P','A','L') +#define MS_0S2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') +#define MS_HEAD_TAG DWRITE_MAKE_OPENTYPE_TAG('h','e','a','d') +#define MS_HHEA_TAG DWRITE_MAKE_OPENTYPE_TAG('h','h','e','a') +#define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x)

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
75
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 April 2016