Wine-Commits

wine-commits@list.winehq.org

August 2020

2 participants
692 discussions

Nikolay Sivov : combase: Move HDC marshalling functions.
by Alexandre Julliard Aug. 1, 2020

Aug. 1, 2020

Module: wine Branch: master Commit: 63ee3fd52d8f580bd0a10466278ca57137d88e6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ee3fd52d8f580bd0a10466… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 28 13:42:24 2020 +0300 combase: Move HDC marshalling functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 4 ++++ dlls/combase/usrmarshal.c | 1 + dlls/ole32/ole32.spec | 8 ++++---- dlls/ole32/usrmarshal.c | 1 - 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 480f29d1d2..6c6441b307 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -181,6 +181,10 @@ @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream @ stub GetHookInterface @ stdcall GetRestrictedErrorInfo(ptr) +@ stdcall HDC_UserFree(ptr ptr) +@ stdcall HDC_UserMarshal(ptr ptr ptr) +@ stdcall HDC_UserSize(ptr long ptr) +@ stdcall HDC_UserUnmarshal(ptr ptr ptr) @ stub HSTRING_UserFree @ stub HSTRING_UserFree64 @ stub HSTRING_UserMarshal diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 91f389916f..632c06a5b2 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -134,6 +134,7 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) handle_UserFree(pFlags, (HANDLE *)handle); \ } +IMPL_WIREM_HANDLE(HDC) IMPL_WIREM_HANDLE(HWND) /****************************************************************************** diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index f41f010fdd..31be1c3e13 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -135,10 +135,10 @@ @ stdcall HBRUSH_UserMarshal(ptr ptr ptr) @ stdcall HBRUSH_UserSize(ptr long ptr) @ stdcall HBRUSH_UserUnmarshal(ptr ptr ptr) -@ stdcall HDC_UserFree(ptr ptr) -@ stdcall HDC_UserMarshal(ptr ptr ptr) -@ stdcall HDC_UserSize(ptr long ptr) -@ stdcall HDC_UserUnmarshal(ptr ptr ptr) +@ stdcall HDC_UserFree(ptr ptr) combase.HDC_UserFree +@ stdcall HDC_UserMarshal(ptr ptr ptr) combase.HDC_UserMarshal +@ stdcall HDC_UserSize(ptr long ptr) combase.HDC_UserSize +@ stdcall HDC_UserUnmarshal(ptr ptr ptr) combase.HDC_UserUnmarshal @ stdcall HENHMETAFILE_UserFree(ptr ptr) @ stdcall HENHMETAFILE_UserMarshal(ptr ptr ptr) @ stdcall HENHMETAFILE_UserSize(ptr long ptr) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index add6ba759e..826c9b7cf7 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -356,7 +356,6 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) IMPL_WIREM_HANDLE(HACCEL) IMPL_WIREM_HANDLE(HMENU) -IMPL_WIREM_HANDLE(HDC) IMPL_WIREM_HANDLE(HICON) IMPL_WIREM_HANDLE(HBRUSH)

1 0

Zebediah Figura : include: Correct the case of rbtree macros.
by Alexandre Julliard Aug. 1, 2020

Aug. 1, 2020

Module: vkd3d Branch: master Commit: 04598b1316be38c34890ef629ba3bafe163bd504 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=04598b1316be38c34890ef6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 31 10:59:54 2020 -0500 include: Correct the case of rbtree macros. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/rbtree.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/private/rbtree.h b/include/private/rbtree.h index 7f44a0e..b4993da 100644 --- a/include/private/rbtree.h +++ b/include/private/rbtree.h @@ -127,33 +127,33 @@ static inline struct rb_entry *rb_postorder_next(struct rb_entry *iter) } /* iterate through the tree */ -#define rb_FOR_EACH(cursor, tree) \ +#define RB_FOR_EACH(cursor, tree) \ for ((cursor) = rb_head((tree)->root); (cursor); (cursor) = rb_next(cursor)) /* iterate through the tree using a tree entry */ -#define rb_FOR_EACH_ENTRY(elem, tree, type, field) \ - for ((elem) = rb_ENTRY_VALUE(rb_head((tree)->root), type, field); \ +#define RB_FOR_EACH_ENTRY(elem, tree, type, field) \ + for ((elem) = RB_ENTRY_VALUE(rb_head((tree)->root), type, field); \ &(elem)->field; \ - (elem) = rb_ENTRY_VALUE(rb_next(&elem->field), type, field)) + (elem) = RB_ENTRY_VALUE(rb_next(&elem->field), type, field)) /* iterate through the tree using using postorder, making it safe to free the entry */ -#define rb_FOR_EACH_DESTRUCTOR(cursor, cursor2, tree) \ +#define RB_FOR_EACH_DESTRUCTOR(cursor, cursor2, tree) \ for ((cursor) = rb_postorder_head((tree)->root); \ (cursor) && (((cursor2) = rb_postorder_next(cursor)) || 1); \ (cursor) = (cursor2)) /* iterate through the tree using a tree entry and postorder, making it safe to free the entry */ -#define rb_FOR_EACH_ENTRY_DESTRUCTOR(elem, elem2, tree, type, field) \ - for ((elem) = rb_ENTRY_VALUE(rb_postorder_head((tree)->root), type, field); \ +#define RB_FOR_EACH_ENTRY_DESTRUCTOR(elem, elem2, tree, type, field) \ + for ((elem) = RB_ENTRY_VALUE(rb_postorder_head((tree)->root), type, field); \ &(elem)->field \ - && (((elem2) = rb_ENTRY_VALUE(rb_postorder_next(&(elem)->field), type, field)) || 1); \ + && (((elem2) = RB_ENTRY_VALUE(rb_postorder_next(&(elem)->field), type, field)) || 1); \ (elem) = (elem2)) static inline void rb_postorder(struct rb_tree *tree, rb_traverse_func *callback, void *context) { struct rb_entry *iter, *next; - rb_FOR_EACH_DESTRUCTOR(iter, next, tree) callback(iter, context); + RB_FOR_EACH_DESTRUCTOR(iter, next, tree) callback(iter, context); } static inline void rb_init(struct rb_tree *tree, rb_compare_func compare) @@ -165,7 +165,7 @@ static inline void rb_init(struct rb_tree *tree, rb_compare_func compare) static inline void rb_for_each_entry(struct rb_tree *tree, rb_traverse_func *callback, void *context) { struct rb_entry *iter; - rb_FOR_EACH(iter, tree) callback(iter, context); + RB_FOR_EACH(iter, tree) callback(iter, context); } static inline void rb_clear(struct rb_tree *tree, rb_traverse_func *callback, void *context)

1 0

Jump to page: