wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

Nikolay Sivov : resend patch 1/2: Gdiplus: Implement GdipBitmapGetHistogramSize.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: 8de0275e48d9b64adc6c29f2df347b94e2cb1ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de0275e48d9b64adc6c29f2d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 2 12:56:30 2016 +0300 resend patch 1/2: Gdiplus: Implement GdipBitmapGetHistogramSize. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 14 +++++++++++++ dlls/gdiplus/tests/image.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ include/gdipluscolormatrix.h | 13 ++++++++++++ include/gdiplusflat.h | 1 + 5 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index db0a49a..92251a7 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -619,7 +619,7 @@ 619 stdcall GdipBitmapCreateApplyEffect(ptr long ptr ptr ptr ptr long ptr ptr) 620 stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr) 621 stub GdipBitmapGetHistogram -622 stub GdipBitmapGetHistogramSize +622 stdcall GdipBitmapGetHistogramSize(long ptr) 623 stdcall GdipBitmapConvertFormat(ptr long long long ptr float) 624 stdcall GdipImageSetAbort(ptr ptr) 625 stub GdipGraphicsSetAbort diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 74fad29..672b2e5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5386,3 +5386,17 @@ GpStatus WINGDIPAPI GdipBitmapConvertFormat(GpBitmap *bitmap, PixelFormat format FIXME("(%p, 0x%08x, %d, %d, %p, %f): stub\n", bitmap, format, dithertype, palettetype, palette, alphathreshold); return NotImplemented; } + +/***************************************************************************** + * GdipBitmapGetHistogramSize [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipBitmapGetHistogramSize(HistogramFormat format, UINT *num_of_entries) +{ + TRACE("(%d, %p)\n", format, num_of_entries); + + if (!num_of_entries) + return InvalidParameter; + + *num_of_entries = 256; + return Ok; +} diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 8c123b9..baf5c3b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -30,6 +30,8 @@ #include "gdiplus.h" #include "wine/test.h" +static GpStatus (WINAPI *pGdipBitmapGetHistogramSize)(HistogramFormat,UINT*); + #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) @@ -4785,8 +4787,51 @@ static void test_getadjustedpalette(void) GdipDisposeImageAttributes(imageattributes); } +static void test_histogramsize(void) +{ + HistogramFormat test_formats[] = + { + HistogramFormatARGB, + HistogramFormatPARGB, + HistogramFormatRGB, + HistogramFormatGray, + HistogramFormatB, + HistogramFormatG, + HistogramFormatR, + HistogramFormatA, + }; + GpStatus stat; + UINT num, i; + + if (!pGdipBitmapGetHistogramSize) + { + win_skip("GdipBitmapGetHistogramSize is not supported\n"); + return; + } + + stat = pGdipBitmapGetHistogramSize(HistogramFormatARGB, NULL); + expect(InvalidParameter, stat); + + stat = pGdipBitmapGetHistogramSize(0xff, NULL); + expect(InvalidParameter, stat); + + num = 123; + stat = pGdipBitmapGetHistogramSize(10, &num); + expect(Ok, stat); + expect(256, num); + + for (i = 0; i < sizeof(test_formats)/sizeof(test_formats[0]); i++) + { + num = 0; + stat = pGdipBitmapGetHistogramSize(test_formats[i], &num); + expect(Ok, stat); + expect(256, num); + } +} + START_TEST(image) { + HMODULE mod = GetModuleHandleA("gdiplus.dll"); struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; @@ -4797,6 +4842,8 @@ START_TEST(image) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + pGdipBitmapGetHistogramSize = (void*)GetProcAddress(mod, "GdipBitmapGetHistogramSize"); + test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion(); @@ -4843,6 +4890,7 @@ START_TEST(image) test_dispose(); test_createeffect(); test_getadjustedpalette(); + test_histogramsize(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdipluscolormatrix.h b/include/gdipluscolormatrix.h index fbf1b2a..44016ff 100644 --- a/include/gdipluscolormatrix.h +++ b/include/gdipluscolormatrix.h @@ -48,10 +48,23 @@ struct ColorMap Color newColor; }; +enum HistogramFormat +{ + HistogramFormatARGB, + HistogramFormatPARGB, + HistogramFormatRGB, + HistogramFormatGray, + HistogramFormatB, + HistogramFormatG, + HistogramFormatR, + HistogramFormatA, +}; + #ifndef __cplusplus typedef enum ColorAdjustType ColorAdjustType; typedef enum ColorMatrixFlags ColorMatrixFlags; +typedef enum HistogramFormat HistogramFormat; typedef struct ColorMatrix ColorMatrix; typedef struct ColorMap ColorMap; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c6f16c4..824b460 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -41,6 +41,7 @@ GpStatus WINGDIPAPI GdipSetAdjustableArrowCapWidth(GpAdjustableArrowCap*,REAL); /* Bitmap */ GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap*,CGpEffect*,RECT*,BOOL,VOID**,INT*); GpStatus WINGDIPAPI GdipBitmapCreateApplyEffect(GpBitmap**,INT,CGpEffect*,RECT*,RECT*,GpBitmap**,BOOL,VOID**,INT*); +GpStatus WINGDIPAPI GdipBitmapGetHistogramSize(HistogramFormat,UINT*); GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT, PixelFormat,BitmapData*);

1 0

Alexandre Julliard : server: Get rid of the clipboard owner thread field.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: 86ec16971234d66b94790d32c88219687e058702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ec16971234d66b94790d32c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 17:09:15 2016 +0100 server: Get rid of the clipboard owner thread field. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/clipboard.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index a04bbff..a93319a 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -52,8 +52,7 @@ struct clipboard struct object obj; /* object header */ struct thread *open_thread; /* thread id that has clipboard open */ user_handle_t open_win; /* window that has clipboard open */ - struct thread *owner_thread; /* thread id that owns the clipboard */ - user_handle_t owner_win; /* window that owns the clipboard data */ + user_handle_t owner; /* window that owns the clipboard */ user_handle_t viewer; /* first window in clipboard viewer list */ unsigned int lcid; /* locale id to use for synthesizing text formats */ unsigned int seqno; /* clipboard change sequence number */ @@ -141,9 +140,9 @@ static void clipboard_dump( struct object *obj, int verbose ) { struct clipboard *clipboard = (struct clipboard *)obj; - fprintf( stderr, "Clipboard open_thread=%p open_win=%08x owner_thread=%p owner_win=%08x viewer=%08x seq=%u\n", - clipboard->open_thread, clipboard->open_win, clipboard->owner_thread, - clipboard->owner_win, clipboard->viewer, clipboard->seqno ); + fprintf( stderr, "Clipboard open_thread=%p open_win=%08x owner=%08x viewer=%08x seq=%u\n", + clipboard->open_thread, clipboard->open_win, + clipboard->owner, clipboard->viewer, clipboard->seqno ); } static void clipboard_destroy( struct object *obj ) @@ -168,8 +167,7 @@ static struct clipboard *get_process_clipboard(void) { clipboard->open_thread = NULL; clipboard->open_win = 0; - clipboard->owner_thread = NULL; - clipboard->owner_win = 0; + clipboard->owner = 0; clipboard->viewer = 0; clipboard->seqno = 0; clipboard->format_count = 0; @@ -297,8 +295,7 @@ static user_handle_t release_clipboard( struct clipboard *clipboard ) struct clip_format *format, *next; int changed = 0; - clipboard->owner_win = 0; - clipboard->owner_thread = NULL; + clipboard->owner = 0; /* free the delayed-rendered formats, since we no longer have an owner to render them */ LIST_FOR_EACH_ENTRY_SAFE( format, next, &clipboard->formats, struct clip_format, entry ) @@ -325,11 +322,11 @@ void cleanup_clipboard_window( struct desktop *desktop, user_handle_t window ) remove_listener( clipboard, window ); if (clipboard->viewer == window) clipboard->viewer = 0; - if (clipboard->owner_win == window) release_clipboard( clipboard ); + if (clipboard->owner == window) release_clipboard( clipboard ); if (clipboard->open_win == window) { user_handle_t viewer = close_clipboard( clipboard ); - if (viewer) send_notify_message( viewer, WM_DRAWCLIPBOARD, clipboard->owner_win, 0 ); + if (viewer) send_notify_message( viewer, WM_DRAWCLIPBOARD, clipboard->owner, 0 ); } } @@ -344,11 +341,10 @@ void cleanup_clipboard_thread(struct thread *thread) if ((clipboard = winstation->clipboard)) { - if (thread == clipboard->owner_thread) clipboard->owner_thread = NULL; if (thread == clipboard->open_thread) { user_handle_t viewer = close_clipboard( clipboard ); - if (viewer) send_notify_message( viewer, WM_DRAWCLIPBOARD, clipboard->owner_win, 0 ); + if (viewer) send_notify_message( viewer, WM_DRAWCLIPBOARD, clipboard->owner, 0 ); } } release_object( winstation ); @@ -373,7 +369,7 @@ DECL_HANDLER(open_clipboard) clipboard->open_win = win; clipboard->open_thread = current; - reply->owner = clipboard->owner_win; + reply->owner = clipboard->owner; } @@ -390,7 +386,7 @@ DECL_HANDLER(close_clipboard) return; } reply->viewer = close_clipboard( clipboard ); - reply->owner = clipboard->owner_win; + reply->owner = clipboard->owner; } @@ -454,7 +450,7 @@ DECL_HANDLER(get_clipboard_data) reply->from = format->from; reply->total = format->size; reply->seqno = format->seqno; - if (!format->data && !format->from) reply->owner = clipboard->owner_win; + if (!format->data && !format->from) reply->owner = clipboard->owner; if (req->cached && req->seqno == format->seqno) return; /* client-side cache still valid */ if (format->size <= get_reply_max_size()) set_reply_data( format->data, format->size ); else set_error( STATUS_BUFFER_OVERFLOW ); @@ -530,8 +526,7 @@ DECL_HANDLER(empty_clipboard) } free_clipboard_formats( clipboard ); - clipboard->owner_win = clipboard->open_win; - clipboard->owner_thread = clipboard->open_thread; + clipboard->owner = clipboard->open_win; clipboard->seqno++; } @@ -546,10 +541,10 @@ DECL_HANDLER(release_clipboard) if (!(owner = get_valid_window_handle( req->owner ))) return; - if (clipboard->owner_win == owner) + if (clipboard->owner == owner) { reply->viewer = release_clipboard( clipboard ); - reply->owner = clipboard->owner_win; + reply->owner = clipboard->owner; } else set_error( STATUS_INVALID_OWNER ); } @@ -563,7 +558,7 @@ DECL_HANDLER(get_clipboard_info) if (!clipboard) return; reply->window = clipboard->open_win; - reply->owner = clipboard->owner_win; + reply->owner = clipboard->owner; reply->viewer = clipboard->viewer; reply->seqno = clipboard->seqno; } @@ -580,7 +575,7 @@ DECL_HANDLER(set_clipboard_viewer) if (req->previous && !(previous = get_valid_window_handle( req->previous ))) return; reply->old_viewer = clipboard->viewer; - reply->owner = clipboard->owner_win; + reply->owner = clipboard->owner; if (!previous || clipboard->viewer == previous) clipboard->viewer = viewer;

1 0

Alexandre Julliard : server: Get rid of the set_clipboard_info request.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: a5f42fcd6ee7904d67594f5965937788e27a2c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f42fcd6ee7904d67594f596… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 17:06:23 2016 +0100 server: Get rid of the set_clipboard_info request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 32 +------------------------------- server/clipboard.c | 41 ----------------------------------------- server/protocol.def | 20 -------------------- server/request.h | 11 ----------- server/trace.c | 19 ------------------- 5 files changed, 1 insertion(+), 122 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 29f5146..8fec67f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4488,33 +4488,6 @@ struct close_clipboard_reply -struct set_clipboard_info_request -{ - struct request_header __header; - unsigned int flags; - user_handle_t owner; - char __pad_20[4]; -}; -struct set_clipboard_info_reply -{ - struct reply_header __header; - unsigned int flags; - user_handle_t old_clipboard; - user_handle_t old_owner; - user_handle_t old_viewer; - unsigned int seqno; - char __pad_28[4]; -}; - -#define SET_CB_SEQNO 0x008 -#define SET_CB_RELOWNER 0x010 -#define CB_OPEN_ANY 0x020 -#define CB_OPEN 0x040 -#define CB_OWNER 0x080 -#define CB_PROCESS 0x100 - - - struct empty_clipboard_request { struct request_header __header; @@ -5792,7 +5765,6 @@ enum request REQ_set_class_info, REQ_open_clipboard, REQ_close_clipboard, - REQ_set_clipboard_info, REQ_empty_clipboard, REQ_set_clipboard_data, REQ_get_clipboard_data, @@ -6083,7 +6055,6 @@ union generic_request struct set_class_info_request set_class_info_request; struct open_clipboard_request open_clipboard_request; struct close_clipboard_request close_clipboard_request; - struct set_clipboard_info_request set_clipboard_info_request; struct empty_clipboard_request empty_clipboard_request; struct set_clipboard_data_request set_clipboard_data_request; struct get_clipboard_data_request get_clipboard_data_request; @@ -6372,7 +6343,6 @@ union generic_reply struct set_class_info_reply set_class_info_reply; struct open_clipboard_reply open_clipboard_reply; struct close_clipboard_reply close_clipboard_reply; - struct set_clipboard_info_reply set_clipboard_info_reply; struct empty_clipboard_reply empty_clipboard_reply; struct set_clipboard_data_reply set_clipboard_data_reply; struct get_clipboard_data_reply get_clipboard_data_reply; @@ -6442,6 +6412,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 522 +#define SERVER_PROTOCOL_VERSION 523 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/clipboard.c b/server/clipboard.c index 89ce835..a04bbff 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -354,20 +354,6 @@ void cleanup_clipboard_thread(struct thread *thread) release_object( winstation ); } -static int release_clipboard_owner( struct clipboard *clipboard, user_handle_t win ) -{ - if ((clipboard->open_thread && clipboard->open_thread->process != current->process) || - (win && clipboard->owner_win != get_user_full_handle( win ))) - { - set_win32_error( ERROR_CLIPBOARD_NOT_OPEN ); - return 0; - } - clipboard->owner_win = 0; - clipboard->owner_thread = NULL; - return 1; -} - - /* open the clipboard */ DECL_HANDLER(open_clipboard) { @@ -408,33 +394,6 @@ DECL_HANDLER(close_clipboard) } -DECL_HANDLER(set_clipboard_info) -{ - struct clipboard *clipboard = get_process_clipboard(); - - if (!clipboard) return; - - reply->old_clipboard = clipboard->open_win; - reply->old_owner = clipboard->owner_win; - reply->old_viewer = clipboard->viewer; - - if (req->flags & SET_CB_RELOWNER) - { - if (!release_clipboard_owner( clipboard, req->owner )) return; - } - - if (req->flags & SET_CB_SEQNO) clipboard->seqno++; - - reply->seqno = clipboard->seqno; - - if (clipboard->open_thread) reply->flags |= CB_OPEN_ANY; - if (clipboard->open_thread == current) reply->flags |= CB_OPEN; - if (clipboard->owner_thread == current) reply->flags |= CB_OWNER; - if (clipboard->owner_thread && clipboard->owner_thread->process == current->process) - reply->flags |= CB_PROCESS; -} - - /* add a data format to the clipboard */ DECL_HANDLER(set_clipboard_data) { diff --git a/server/protocol.def b/server/protocol.def index 8d86737..9344da2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3174,26 +3174,6 @@ enum caret_state @END -/* Set/get clipboard information */ -@REQ(set_clipboard_info) - unsigned int flags; /* flags for fields to set (see below) */ - user_handle_t owner; /* clipboard owner */ -@REPLY - unsigned int flags; /* status flags (see below) */ - user_handle_t old_clipboard; /* old clipboard window */ - user_handle_t old_owner; /* old clipboard owner */ - user_handle_t old_viewer; /* old clipboard viewer */ - unsigned int seqno; /* current sequence number */ -@END - -#define SET_CB_SEQNO 0x008 -#define SET_CB_RELOWNER 0x010 -#define CB_OPEN_ANY 0x020 -#define CB_OPEN 0x040 -#define CB_OWNER 0x080 -#define CB_PROCESS 0x100 - - /* Empty the clipboard and grab ownership */ @REQ(empty_clipboard) @END diff --git a/server/request.h b/server/request.h index f3592de..43752e8 100644 --- a/server/request.h +++ b/server/request.h @@ -328,7 +328,6 @@ DECL_HANDLER(destroy_class); DECL_HANDLER(set_class_info); DECL_HANDLER(open_clipboard); DECL_HANDLER(close_clipboard); -DECL_HANDLER(set_clipboard_info); DECL_HANDLER(empty_clipboard); DECL_HANDLER(set_clipboard_data); DECL_HANDLER(get_clipboard_data); @@ -618,7 +617,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_set_class_info, (req_handler)req_open_clipboard, (req_handler)req_close_clipboard, - (req_handler)req_set_clipboard_info, (req_handler)req_empty_clipboard, (req_handler)req_set_clipboard_data, (req_handler)req_get_clipboard_data, @@ -2040,15 +2038,6 @@ C_ASSERT( sizeof(struct close_clipboard_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct close_clipboard_reply, viewer) == 8 ); C_ASSERT( FIELD_OFFSET(struct close_clipboard_reply, owner) == 12 ); C_ASSERT( sizeof(struct close_clipboard_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_request, flags) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_request, owner) == 16 ); -C_ASSERT( sizeof(struct set_clipboard_info_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_reply, flags) == 8 ); -C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_reply, old_clipboard) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_reply, old_owner) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_reply, old_viewer) == 20 ); -C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_reply, seqno) == 24 ); -C_ASSERT( sizeof(struct set_clipboard_info_reply) == 32 ); C_ASSERT( sizeof(struct empty_clipboard_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_clipboard_data_request, format) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_clipboard_data_request, lcid) == 16 ); diff --git a/server/trace.c b/server/trace.c index 791641d..f7e114b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3754,21 +3754,6 @@ static void dump_close_clipboard_reply( const struct close_clipboard_reply *req fprintf( stderr, ", owner=%08x", req->owner ); } -static void dump_set_clipboard_info_request( const struct set_clipboard_info_request *req ) -{ - fprintf( stderr, " flags=%08x", req->flags ); - fprintf( stderr, ", owner=%08x", req->owner ); -} - -static void dump_set_clipboard_info_reply( const struct set_clipboard_info_reply *req ) -{ - fprintf( stderr, " flags=%08x", req->flags ); - fprintf( stderr, ", old_clipboard=%08x", req->old_clipboard ); - fprintf( stderr, ", old_owner=%08x", req->old_owner ); - fprintf( stderr, ", old_viewer=%08x", req->old_viewer ); - fprintf( stderr, ", seqno=%08x", req->seqno ); -} - static void dump_empty_clipboard_request( const struct empty_clipboard_request *req ) { } @@ -4692,7 +4677,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_class_info_request, (dump_func)dump_open_clipboard_request, (dump_func)dump_close_clipboard_request, - (dump_func)dump_set_clipboard_info_request, (dump_func)dump_empty_clipboard_request, (dump_func)dump_set_clipboard_data_request, (dump_func)dump_get_clipboard_data_request, @@ -4979,7 +4963,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_class_info_reply, (dump_func)dump_open_clipboard_reply, (dump_func)dump_close_clipboard_reply, - (dump_func)dump_set_clipboard_info_reply, NULL, (dump_func)dump_set_clipboard_data_reply, (dump_func)dump_get_clipboard_data_reply, @@ -5266,7 +5249,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_class_info", "open_clipboard", "close_clipboard", - "set_clipboard_info", "empty_clipboard", "set_clipboard_data", "get_clipboard_data", @@ -5432,7 +5414,6 @@ static const struct { "OBJECT_PATH_SYNTAX_BAD", STATUS_OBJECT_PATH_SYNTAX_BAD }, { "OBJECT_TYPE_MISMATCH", STATUS_OBJECT_TYPE_MISMATCH }, { "PENDING", STATUS_PENDING }, - { "PIPE_BUSY", STATUS_PIPE_BUSY }, { "PIPE_CONNECTED", STATUS_PIPE_CONNECTED }, { "PIPE_DISCONNECTED", STATUS_PIPE_DISCONNECTED }, { "PIPE_LISTENING", STATUS_PIPE_LISTENING },

1 0

Michael Müller : ntdll: Move EventRegister/ Unregister from advapi32 to ntdll.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: 900366fd074a4ffab4cc9b6cbc27960bec7ba251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=900366fd074a4ffab4cc9b6cb… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Oct 27 16:17:31 2016 +0300 ntdll: Move EventRegister/Unregister from advapi32 to ntdll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/eventlog.c | 20 -------------------- dlls/ntdll/misc.c | 22 ++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 ++ 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index b1a051c..4868841 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -272,9 +272,9 @@ @ stdcall EventActivityIdControl(long ptr) @ stdcall EventEnabled(int64 ptr) @ stdcall EventProviderEnabled(int64 long int64) -@ stdcall EventRegister(ptr ptr ptr ptr) +@ stdcall EventRegister(ptr ptr ptr ptr) ntdll.EtwEventRegister @ stdcall EventSetInformation(int64 long ptr long) -@ stdcall EventUnregister(int64) +@ stdcall EventUnregister(int64) ntdll.EtwEventUnregister @ stdcall EventWrite(int64 ptr long ptr) # @ stub EventWriteEndScenario # @ stub EventWriteEx diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index e97ddc7..9bd75e8 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -829,26 +829,6 @@ ULONG WINAPI UnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) } /****************************************************************************** - * EventRegister [ADVAPI32.@] - */ -ULONG WINAPI EventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle ) -{ - FIXME("%s, %p, %p, %p\n", debugstr_guid(provider), callback, context, handle); - - *handle = 0xdeadbeef; - return ERROR_SUCCESS; -} - -/****************************************************************************** - * EventUnregister [ADVAPI32.@] - */ -ULONG WINAPI EventUnregister( REGHANDLE handle ) -{ - FIXME("%s: stub\n", wine_dbgstr_longlong(handle)); - return ERROR_SUCCESS; -} - -/****************************************************************************** * EventEnabled [ADVAPI32.@] * */ diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index f540c4b..687fff5 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -34,6 +34,7 @@ #include "ntdll_misc.h" #include "wmistr.h" #include "evntrace.h" +#include "evntprov.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -359,6 +360,27 @@ HANDLE WINAPI WinSqmStartSession(GUID *sessionguid, DWORD sessionid, DWORD unkno } /****************************************************************************** + * EtwEventRegister (NTDLL.@) + */ +ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, + PREGHANDLE handle ) +{ + FIXME("(%s, %p, %p, %p) stub.\n", debugstr_guid(provider), callback, context, handle); + + *handle = 0xdeadbeef; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * EtwEventUnregister (NTDLL.@) + */ +ULONG WINAPI EtwEventUnregister( REGHANDLE handle ) +{ + FIXME("(%s) stub.\n", wine_dbgstr_longlong(handle)); + return ERROR_SUCCESS; +} + +/****************************************************************************** * EtwRegisterTraceGuidsW (NTDLL.@) * * Register an event trace provider and the event trace classes that it uses diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d138ac1..4fd944e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -41,6 +41,8 @@ # @ stub DbgUiStopDebugging @ stub DbgUiWaitStateChange @ stdcall DbgUserBreakPoint() +@ stdcall EtwEventRegister(ptr ptr ptr ptr) +@ stdcall EtwEventUnregister(int64) @ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) # @ stub KiFastSystemCall

1 0

Detlef Riekenberg : winspool/tests: Add tests for ClosePrinter.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: 4814aad7fe89e78b54b765c19145a478b9c7a874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4814aad7fe89e78b54b765c19… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 1 23:21:42 2016 +0100 winspool/tests: Add tests for ClosePrinter. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 49 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index ffa31ed..f6527c5 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -672,6 +672,50 @@ static void test_ConfigurePort(void) /* ########################### */ +static void test_ClosePrinter(void) +{ + HANDLE printer = 0; + BOOL res; + + /* NULL is handled */ + SetLastError(0xdeadbeef); + res = ClosePrinter(NULL); + ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), + "got %d with %d (expected FALSE with ERROR_INVALID_HANDLE)\n", + res, GetLastError()); + + /* A random value as HANDLE is handled */ + SetLastError(0xdeadbeef); + res = ClosePrinter( (void *) -1); + if (is_spooler_deactivated(res, GetLastError())) return; + ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), + "got %d with %d (expected FALSE with ERROR_INVALID_HANDLE)\n", + res, GetLastError()); + + + /* Normal use (The Spooler service is needed) */ + SetLastError(0xdeadbeef); + res = OpenPrinterA(default_printer, &printer, NULL); + if (is_spooler_deactivated(res, GetLastError())) return; + if (res) + { + SetLastError(0xdeadbeef); + res = ClosePrinter(printer); + ok(res, "got %d with %d (expected TRUE)\n", res, GetLastError()); + + + /* double free is handled */ + SetLastError(0xdeadbeef); + res = ClosePrinter(printer); + ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), + "got %d with %d (expected FALSE with ERROR_INVALID_HANDLE)\n", + res, GetLastError()); + + } +} + +/* ########################### */ + static void test_DeleteMonitor(void) { MONITOR_INFO_2A mi2a; @@ -3023,6 +3067,7 @@ START_TEST(info) test_AddPort(); test_AddPortEx(); test_ConfigurePort(); + test_ClosePrinter(); test_DeleteMonitor(); test_DeletePort(); test_DeviceCapabilities(); @@ -3037,7 +3082,9 @@ START_TEST(info) test_GetDefaultPrinter(); test_GetPrinterDriverDirectory(); test_GetPrintProcessorDirectory(); + test_IsValidDevmodeW(); test_OpenPrinter(); + test_OpenPrinter_defaults(); test_GetPrinter(); test_GetPrinterData(); test_GetPrinterDataEx(); @@ -3045,8 +3092,6 @@ START_TEST(info) test_SetDefaultPrinter(); test_XcvDataW_MonitorUI(); test_XcvDataW_PortIsValid(); - test_IsValidDevmodeW(); - test_OpenPrinter_defaults(); /* Cleanup our temporary file */ DeleteFileA(tempfileA);

1 0

Detlef Riekenberg : winspool: Return a failure code in ClosePrinter.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: b611acc7369f4a260ec7d4b260b221524f04d440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b611acc7369f4a260ec7d4b26… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 1 23:21:41 2016 +0100 winspool: Return a failure code in ClosePrinter. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2f0ff3d..2b2e0fc 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3315,7 +3315,6 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) { UINT_PTR i = (UINT_PTR)hPrinter; opened_printer_t *printer = NULL; - BOOL ret = FALSE; TRACE("(%p)\n", hPrinter); @@ -3331,10 +3330,6 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) TRACE("closing %s (doc: %p)\n", debugstr_w(printer->name), printer->doc); - if (printer->backend_printer) { - backend->fpClosePrinter(printer->backend_printer); - } - if(printer->doc) EndDocPrinter(hPrinter); @@ -3348,12 +3343,19 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) HeapFree(GetProcessHeap(), 0, printer->queue); } + if (printer->backend_printer) { + backend->fpClosePrinter(printer->backend_printer); + } + free_printer_entry( printer ); printer_handles[i - 1] = NULL; - ret = TRUE; + LeaveCriticalSection(&printer_handles_cs); + return TRUE; } + LeaveCriticalSection(&printer_handles_cs); - return ret; + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; } /*****************************************************************************

1 0

Aric Stewart : winebus.sys: Implement IOCTL_HID_GET(SET) _FEATURE for hidraw.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: 72dd8bafccc7ca26e89acccf1915eb175e53e6f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72dd8bafccc7ca26e89acccf1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Nov 2 08:12:24 2016 -0500 winebus.sys: Implement IOCTL_HID_GET(SET)_FEATURE for hidraw. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 2 ++ dlls/winebus.sys/bus_udev.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/main.c | 19 ++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 18bebcf..45a65e2 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -27,6 +27,8 @@ typedef struct NTSTATUS (*get_string)(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length); NTSTATUS (*begin_report_processing)(DEVICE_OBJECT *device); NTSTATUS (*set_output_report)(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written); + NTSTATUS (*get_feature_report)(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *read); + NTSTATUS (*set_feature_report)(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written); } platform_vtbl; void *get_platform_private(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index be8e93f..6cfbdb8 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -301,6 +301,52 @@ static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE * } } +static NTSTATUS hidraw_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *read) +{ +#ifdef HAVE_LINUX_HIDRAW_H + int rc; + struct platform_private* ext = impl_from_DEVICE_OBJECT(device); + length = min(length, 0x1fff); + rc = ioctl(ext->device_fd, HIDIOCGFEATURE(length), report); + if (rc >= 0) + { + *read = rc; + return STATUS_SUCCESS; + } + else + { + *read = 0; + return STATUS_UNSUCCESSFUL; + } +#else + *read = 0; + return STATUS_NOT_IMPLEMENTED; +#endif +} + +static NTSTATUS hidraw_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) +{ +#ifdef HAVE_LINUX_HIDRAW_H + int rc; + struct platform_private* ext = impl_from_DEVICE_OBJECT(device); + length = min(length, 0x1fff); + rc = ioctl(ext->device_fd, HIDIOCSFEATURE(length), report); + if (rc >= 0) + { + *written = rc; + return STATUS_SUCCESS; + } + else + { + *written = 0; + return STATUS_UNSUCCESSFUL; + } +#else + *written = 0; + return STATUS_NOT_IMPLEMENTED; +#endif +} + static const platform_vtbl hidraw_vtbl = { compare_platform_device, @@ -308,6 +354,8 @@ static const platform_vtbl hidraw_vtbl = hidraw_get_string, begin_report_processing, hidraw_set_output_report, + hidraw_get_feature_report, + hidraw_set_feature_report, }; static void try_add_device(struct udev_device *dev) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 802122f..791ccbb 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -541,6 +541,25 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) packet->reportBufferLen, &irp->IoStatus.Information); break; } + case IOCTL_HID_GET_FEATURE: + { + HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); + TRACE_(hid_report)("IOCTL_HID_GET_FEATURE\n"); + irp->IoStatus.u.Status = status = ext->vtbl->get_feature_report( + device, packet->reportId, packet->reportBuffer, + packet->reportBufferLen, &irp->IoStatus.Information); + packet->reportBufferLen = irp->IoStatus.Information; + break; + } + case IOCTL_HID_SET_FEATURE: + { + HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); + TRACE_(hid_report)("IOCTL_HID_SET_FEATURE\n"); + irp->IoStatus.u.Status = status = ext->vtbl->set_feature_report( + device, packet->reportId, packet->reportBuffer, + packet->reportBufferLen, &irp->IoStatus.Information); + break; + } default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode;

1 0

Józef Kucia : wined3d: Use wined3d_vec4 in fixup_transformed_pos().
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: 07cfeac3dd7ca41d9d9fde3a490425451c4b26b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cfeac3dd7ca41d9d9fde3a4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 2 10:55:37 2016 +0100 wined3d: Use wined3d_vec4 in fixup_transformed_pos(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 72c45ee..25c1853 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -509,19 +509,19 @@ static inline unsigned int fixup_d3dcolor(DWORD *dst_color) return sizeof(*dst_color); } -static inline unsigned int fixup_transformed_pos(float *p) +static inline unsigned int fixup_transformed_pos(struct wined3d_vec4 *p) { /* rhw conversion like in position_float4(). */ - if (p[3] != 1.0f && p[3] != 0.0f) + if (p->w != 1.0f && p->w != 0.0f) { - float w = 1.0f / p[3]; - p[0] *= w; - p[1] *= w; - p[2] *= w; - p[3] = w; + float w = 1.0f / p->w; + p->x *= w; + p->y *= w; + p->z *= w; + p->w = w; } - return 4 * sizeof(*p); + return sizeof(*p); } ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) @@ -909,7 +909,7 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined j += fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); break; case CONV_POSITIONT: - j += fixup_transformed_pos((float *) (data + i * buffer->stride + j)); + j += fixup_transformed_pos((struct wined3d_vec4 *) (data + i * buffer->stride + j)); break; default: FIXME("Unimplemented conversion %d in shifted conversion.\n", buffer->conversion_map[j]);

1 0

Józef Kucia : wined3d: Invalidate STATE_CONSTANT_BUFFER(*) device state in buffer_destroy_buffer_object() when needed.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: de19ba7c23b3fd3c80ce7221bdb3ce138b3d4400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de19ba7c23b3fd3c80ce7221b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 2 10:55:36 2016 +0100 wined3d: Invalidate STATE_CONSTANT_BUFFER(*) device state in buffer_destroy_buffer_object() when needed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d2b54be..72c45ee 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -162,6 +162,15 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, const st device_invalidate_state(resource->device, STATE_STREAMSRC); if (buffer->bind_flags & WINED3D_BIND_INDEX_BUFFER) device_invalidate_state(resource->device, STATE_INDEXBUFFER); + if (buffer->bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + { + device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX)); + device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_HULL)); + device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_DOMAIN)); + device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY)); + device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL)); + device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE)); + } } if (buffer->query)

1 0

Józef Kucia : wined3d: Fix style issues in delete_gl_buffer().
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: 01b8bea329a34d946aa2efbeabae9ad00a5e9868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01b8bea329a34d946aa2efbea… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 2 10:55:35 2016 +0100 wined3d: Fix style issues in delete_gl_buffer(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 179f66c..d2b54be 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -139,16 +139,17 @@ static void buffer_bind(struct wined3d_buffer *buffer, struct wined3d_context *c } /* Context activation is done by the caller. */ -static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_context *context) +static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, const struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_resource *resource = &This->resource; + struct wined3d_resource *resource = &buffer->resource; - if(!This->buffer_object) return; + if (!buffer->buffer_object) + return; - GL_EXTCALL(glDeleteBuffers(1, &This->buffer_object)); + GL_EXTCALL(glDeleteBuffers(1, &buffer->buffer_object)); checkGLcall("glDeleteBuffers"); - This->buffer_object = 0; + buffer->buffer_object = 0; /* The stream source state handler might have read the memory of the * vertex buffer already and got the memory in the vbo which is not @@ -157,18 +158,18 @@ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_c * rarely. */ if (resource->bind_count) { - if (This->bind_flags & WINED3D_BIND_VERTEX_BUFFER) + if (buffer->bind_flags & WINED3D_BIND_VERTEX_BUFFER) device_invalidate_state(resource->device, STATE_STREAMSRC); - if (This->bind_flags & WINED3D_BIND_INDEX_BUFFER) + if (buffer->bind_flags & WINED3D_BIND_INDEX_BUFFER) device_invalidate_state(resource->device, STATE_INDEXBUFFER); } - if(This->query) + if (buffer->query) { - wined3d_event_query_destroy(This->query); - This->query = NULL; + wined3d_event_query_destroy(buffer->query); + buffer->query = NULL; } - This->flags &= ~WINED3D_BUFFER_APPLESYNC; + buffer->flags &= ~WINED3D_BUFFER_APPLESYNC; } /* Context activation is done by the caller. */ @@ -257,7 +258,7 @@ fail: /* Clean up all BO init, but continue because we can work without a BO :-) */ ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); buffer->flags &= ~WINED3D_BUFFER_USE_BO; - delete_gl_buffer(buffer, context); + buffer_destroy_buffer_object(buffer, context); buffer_clear_dirty_areas(buffer); return FALSE; } @@ -663,7 +664,7 @@ static void buffer_unload(struct wined3d_resource *resource) buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); - delete_gl_buffer(buffer, context); + buffer_destroy_buffer_object(buffer, context); buffer_clear_dirty_areas(buffer); context_release(context); @@ -692,7 +693,7 @@ static void wined3d_buffer_destroy_object(void *object) if (buffer->buffer_object) { context = context_acquire(buffer->resource.device, NULL); - delete_gl_buffer(buffer, context); + buffer_destroy_buffer_object(buffer, context); context_release(context); HeapFree(GetProcessHeap(), 0, buffer->conversion_map);

1 0

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 November 2016