- Wine-Devel - list.winehq.org

[PATCH 5/5] riched20: Handle EM_REPLACESEL's unicode conversion in the host.
by Huw Davies March 10, 2021

March 10, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 11 ++++------- dlls/riched20/txthost.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3d17d2d974f..217394eaafb 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3883,14 +3883,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_REPLACESEL: { - int len = 0; - LONG codepage = unicode ? CP_UNICODE : CP_ACP; - LPWSTR wszText = ME_ToUnicode(codepage, (void *)lParam, &len); + WCHAR *text = (WCHAR *)lParam; + int len = text ? lstrlenW( text ) : 0; - TRACE("EM_REPLACESEL - %s\n", debugstr_w(wszText)); - - ME_ReplaceSel(editor, !!wParam, wszText, len); - ME_EndToUnicode(codepage, wszText); + TRACE( "EM_REPLACESEL - %s\n", debugstr_w( text ) ); + ME_ReplaceSel( editor, !!wParam, text, len ); return len; } case EM_SCROLLCARET: diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 3cfb6b65ca7..07e266c0f87 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -847,6 +847,18 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, EndPaint( editor->hWnd, &ps ); return 0; } + case EM_REPLACESEL: + { + int len; + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + WCHAR *text = ME_ToUnicode( codepage, (void *)lparam, &len ); + + hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, (LPARAM)text, &res ); + ME_EndToUnicode( codepage, text ); + res = len; + break; + } + case EM_SETOPTIONS: { DWORD style; -- 2.23.0

1 0

[PATCH 4/5] riched20: Handle WM_CHAR's unicode conversion in the host.
by Huw Davies March 10, 2021

March 10, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 23 ++++++----------------- dlls/riched20/txthost.c | 8 ++++++++ 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index cacad463963..3d17d2d974f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2744,11 +2744,8 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) return FALSE; } -static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, - LPARAM flags, BOOL unicode) +static LRESULT handle_wm_char( ME_TextEditor *editor, WCHAR wstr, LPARAM flags ) { - WCHAR wstr; - if (editor->bMouseCaptured) return 0; @@ -2758,14 +2755,6 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, return 0; /* FIXME really 0 ? */ } - if (unicode) - wstr = (WCHAR)charCode; - else - { - CHAR charA = charCode; - MultiByteToWideChar(CP_ACP, 0, &charA, 1, &wstr, 1); - } - if (editor->bEmulateVersion10 && wstr == '\r') handle_enter(editor); @@ -4379,7 +4368,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if ((editor->nEventMask & ENM_KEYEVENTS) && !ME_FilterEvent(editor, msg, &wParam, &lParam)) return 0; - return ME_Char(editor, wParam, lParam, unicode); + return handle_wm_char( editor, wParam, lParam ); case WM_UNICHAR: if (unicode) { @@ -4389,11 +4378,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if(wParam > 0xffff) /* convert to surrogates */ { wParam -= 0x10000; - ME_Char(editor, (wParam >> 10) + 0xd800, 0, TRUE); - ME_Char(editor, (wParam & 0x03ff) + 0xdc00, 0, TRUE); - } else { - ME_Char(editor, wParam, 0, TRUE); + handle_wm_char( editor, (wParam >> 10) + 0xd800, 0 ); + handle_wm_char( editor, (wParam & 0x03ff) + 0xdc00, 0 ); } + else + handle_wm_char( editor, wParam, 0 ); } return 0; } diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 23c9962bb3a..3cfb6b65ca7 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -778,6 +778,14 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, editor = host->editor; switch (msg) { + case WM_CHAR: + { + WCHAR wc = wparam; + + if (!unicode) MultiByteToWideChar( CP_ACP, 0, (char *)&wparam, 1, &wc, 1 ); + hr = ITextServices_TxSendMessage( host->text_srv, msg, wc, lparam, &res ); + break; + } case WM_DESTROY: ITextHost_Release( &host->ITextHost_iface ); return 0; -- 2.23.0

1 0

[PATCH 2/5] riched20: Handle WM_DESTROY in the host.
by Huw Davies March 10, 2021

March 10, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 3 --- dlls/riched20/txthost.c | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 516cd104d31..9ac5d49a3db 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4277,9 +4277,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_CREATE: return ME_WmCreate(editor, lParam, unicode); - case WM_DESTROY: - ME_DestroyEditor(editor); - return 0; case WM_SETCURSOR: { POINT cursor_pos; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 291c9a3b677..14cb19e8f45 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -778,6 +778,10 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, editor = host->editor; switch (msg) { + case WM_DESTROY: + ITextHost_Release( &host->ITextHost_iface ); + return 0; + case WM_ERASEBKGND: { HDC hdc = (HDC)wparam; -- 2.23.0

1 0

[PATCH 1/5] riched20: Add ITextServices stdcall wrappers.
by Huw Davies March 10, 2021

March 10, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 23 ++++++++++++++ dlls/riched20/txtsrv.c | 69 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 38d99f4351a..5d4b360c1bb 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -379,6 +379,29 @@ void ME_EmptyUndoStack(ME_TextEditor *editor) DECLSPEC_HIDDEN; /* txtsrv.c */ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10, ME_TextEditor **editor ) DECLSPEC_HIDDEN; +#ifdef __ASM_USE_THISCALL_WRAPPER +#define TXTSERV_VTABLE(This) (&text_services_stdcall_vtbl) +#else +#define TXTSERV_VTABLE(This) (This)->lpVtbl +#endif +#define ITextServices_TxSendMessage(This,a,b,c,d) TXTSERV_VTABLE(This)->TxSendMessage(This,a,b,c,d) +#define ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) TXTSERV_VTABLE(This)->ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) +#define ITextServices_TxGetHScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetHScroll(This,a,b,c,d,e) +#define ITextServices_TxGetVScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetVScroll(This,a,b,c,d,e) +#define ITextServices_OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) TXTSERV_VTABLE(This)->OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) +#define ITextServices_TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) TXTSERV_VTABLE(This)->TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) +#define ITextServices_OnTxInplaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInplaceActivate(This,a) +#define ITextServices_OnTxInplaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInplaceDeactivate(This) +#define ITextServices_OnTxUIActivate(This) TXTSERV_VTABLE(This)->OnTxUIActivate(This) +#define ITextServices_OnTxUIDeactivate(This) TXTSERV_VTABLE(This)->OnTxUIDeactivate(This) +#define ITextServices_TxGetText(This,a) TXTSERV_VTABLE(This)->TxGetText(This,a) +#define ITextServices_TxSetText(This,a) TXTSERV_VTABLE(This)->TxSetText(This,a) +#define ITextServices_TxGetCurTargetX(This,a) TXTSERV_VTABLE(This)->TxGetCurTargetX(This,a) +#define ITextServices_TxGetBaseLinePos(This,a) TXTSERV_VTABLE(This)->TxGetBaseLinePos(This,a) +#define ITextServices_TxGetNaturalSize(This,a,b,c,d,e,f,g,h) TXTSERV_VTABLE(This)->TxGetNaturalSize(This,a,b,c,d,e,f,g,h) +#define ITextServices_TxGetDropTarget(This,a) TXTSERV_VTABLE(This)->TxGetDropTarget(This,a) +#define ITextServices_OnTxPropertyBitsChange(This,a,b) TXTSERV_VTABLE(This)->OnTxPropertyBitsChange(This,a,b) +#define ITextServices_TxGetCachedSize(This,a,b) TXTSERV_VTABLE(This)->TxGetCachedSize(This,a,b) /* writer.c */ LRESULT ME_StreamOutRange(ME_TextEditor *editor, DWORD dwFormat, const ME_Cursor *start, int nChars, EDITSTREAM *stream) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 49d1c706076..7893888af57 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -339,6 +339,75 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetCachedSize(ITextServices *ifac return E_NOTIMPL; } +#ifdef __ASM_USE_THISCALL_WRAPPER + +#define STDCALL(func) (void *) __stdcall_ ## func +#ifdef _MSC_VER +#define DEFINE_STDCALL_WRAPPER(num,func) \ + __declspec(naked) HRESULT __stdcall_##func(void) \ + { \ + __asm pop eax \ + __asm pop ecx \ + __asm push eax \ + __asm mov eax, [ecx] \ + __asm jmp dword ptr [eax + 4*num] \ + } +#else /* _MSC_VER */ +#define DEFINE_STDCALL_WRAPPER(num,func) \ + extern HRESULT __stdcall_ ## func(void); \ + __ASM_GLOBAL_FUNC(__stdcall_ ## func, \ + "popl %eax\n\t" \ + "popl %ecx\n\t" \ + "pushl %eax\n\t" \ + "movl (%ecx), %eax\n\t" \ + "jmp *(4*(" #num "))(%eax)" ) +#endif /* _MSC_VER */ + +DEFINE_STDCALL_WRAPPER(3, ITextServices_TxSendMessage) +DEFINE_STDCALL_WRAPPER(4, ITextServices_TxDraw) +DEFINE_STDCALL_WRAPPER(5, ITextServices_TxGetHScroll) +DEFINE_STDCALL_WRAPPER(6, ITextServices_TxGetVScroll) +DEFINE_STDCALL_WRAPPER(7, ITextServices_OnTxSetCursor) +DEFINE_STDCALL_WRAPPER(8, ITextServices_TxQueryHitPoint) +DEFINE_STDCALL_WRAPPER(9, ITextServices_OnTxInplaceActivate) +DEFINE_STDCALL_WRAPPER(10, ITextServices_OnTxInplaceDeactivate) +DEFINE_STDCALL_WRAPPER(11, ITextServices_OnTxUIActivate) +DEFINE_STDCALL_WRAPPER(12, ITextServices_OnTxUIDeactivate) +DEFINE_STDCALL_WRAPPER(13, ITextServices_TxGetText) +DEFINE_STDCALL_WRAPPER(14, ITextServices_TxSetText) +DEFINE_STDCALL_WRAPPER(15, ITextServices_TxGetCurTargetX) +DEFINE_STDCALL_WRAPPER(16, ITextServices_TxGetBaseLinePos) +DEFINE_STDCALL_WRAPPER(17, ITextServices_TxGetNaturalSize) +DEFINE_STDCALL_WRAPPER(18, ITextServices_TxGetDropTarget) +DEFINE_STDCALL_WRAPPER(19, ITextServices_OnTxPropertyBitsChange) +DEFINE_STDCALL_WRAPPER(20, ITextServices_TxGetCachedSize) + +const ITextServicesVtbl text_services_stdcall_vtbl = +{ + NULL, + NULL, + NULL, + STDCALL(ITextServices_TxSendMessage), + STDCALL(ITextServices_TxDraw), + STDCALL(ITextServices_TxGetHScroll), + STDCALL(ITextServices_TxGetVScroll), + STDCALL(ITextServices_OnTxSetCursor), + STDCALL(ITextServices_TxQueryHitPoint), + STDCALL(ITextServices_OnTxInplaceActivate), + STDCALL(ITextServices_OnTxInplaceDeactivate), + STDCALL(ITextServices_OnTxUIActivate), + STDCALL(ITextServices_OnTxUIDeactivate), + STDCALL(ITextServices_TxGetText), + STDCALL(ITextServices_TxSetText), + STDCALL(ITextServices_TxGetCurTargetX), + STDCALL(ITextServices_TxGetBaseLinePos), + STDCALL(ITextServices_TxGetNaturalSize), + STDCALL(ITextServices_TxGetDropTarget), + STDCALL(ITextServices_OnTxPropertyBitsChange), + STDCALL(ITextServices_TxGetCachedSize), +}; + +#endif /* __ASM_USE_THISCALL_WRAPPER */ static const ITextServicesVtbl textservices_vtbl = { -- 2.23.0

1 0

[PATCH 1/5] dwrite: Look for English name strings in mac platform records.
by Nikolay Sivov March 10, 2021

March 10, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/main.c | 10 ++++--- dlls/dwrite/opentype.c | 51 ++++++++++++++++++++++-------------- 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index a91b8f99d70..7f7c933e7e2 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -298,6 +298,7 @@ extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const W extern HRESULT clone_localizedstrings(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern void set_en_localizedstring(IDWriteLocalizedStrings*,const WCHAR*) DECLSPEC_HIDDEN; extern void sort_localizedstrings(IDWriteLocalizedStrings*) DECLSPEC_HIDDEN; +extern unsigned int get_localizedstrings_count(IDWriteLocalizedStrings *strings) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection1 **collection) DECLSPEC_HIDDEN; extern HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 **collection) DECLSPEC_HIDDEN; extern IDWriteTextAnalyzer2 *get_text_analyzer(void) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index d66a27d7f68..4e308485a01 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -323,11 +323,9 @@ static ULONG WINAPI localizedstrings_Release(IDWriteLocalizedStrings *iface) static UINT32 WINAPI localizedstrings_GetCount(IDWriteLocalizedStrings *iface) { - struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); - TRACE("%p.\n", iface); - return strings->count; + return get_localizedstrings_count(iface); } static HRESULT WINAPI localizedstrings_FindLocaleName(IDWriteLocalizedStrings *iface, @@ -559,6 +557,12 @@ void sort_localizedstrings(IDWriteLocalizedStrings *iface) qsort(strings->data, strings->count, sizeof(*strings->data), localizedstrings_sorting_compare); } +unsigned int get_localizedstrings_count(IDWriteLocalizedStrings *iface) +{ + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); + return strings->count; +} + struct collectionloader { struct list entry; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 717b1ea0351..a74c9712b6a 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2288,9 +2288,21 @@ static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT la } } +static BOOL opentype_is_english_namerecord(const struct dwrite_fonttable *table, unsigned int idx) +{ + const struct name_header *header = (const struct name_header *)table->data; + const struct name_record *record; + + record = &header->records[idx]; + + return GET_BE_WORD(record->platformID) == OPENTYPE_PLATFORM_MAC && + GET_BE_WORD(record->languageID) == TT_NAME_MAC_LANGID_ENGLISH; +} + static BOOL opentype_decode_namerecord(const struct dwrite_fonttable *table, unsigned int idx, IDWriteLocalizedStrings *strings) { + static const WCHAR enusW[] = {'e','n','-','U','S',0}; USHORT lang_id, length, offset, encoding, platform; const struct name_header *header = (const struct name_header *)table->data; const struct name_record *record; @@ -2338,7 +2350,8 @@ static BOOL opentype_decode_namerecord(const struct dwrite_fonttable *table, uns TRACE("string %s for locale %s found\n", debugstr_w(name_string), debugstr_w(locale)); add_localizedstring(strings, locale, name_string); heap_free(name_string); - ret = TRUE; + + ret = !lstrcmpW(locale, enusW); } else FIXME("handle NAME format 1\n"); @@ -2349,10 +2362,10 @@ static BOOL opentype_decode_namerecord(const struct dwrite_fonttable *table, uns static HRESULT opentype_get_font_strings_from_id(const struct dwrite_fonttable *table, enum OPENTYPE_STRING_ID id, IDWriteLocalizedStrings **strings) { - int i, count, candidate_mac, candidate_unicode; + int i, count, candidate_mac, candidate_mac_en, candidate_unicode; const struct name_record *records; + BOOL has_english; WORD format; - BOOL exists; HRESULT hr; if (!table->data) @@ -2374,8 +2387,8 @@ static HRESULT opentype_get_font_strings_from_id(const struct dwrite_fonttable * count = 0; } - exists = FALSE; - candidate_unicode = candidate_mac = -1; + has_english = FALSE; + candidate_unicode = candidate_mac = candidate_mac_en = -1; for (i = 0; i < count; i++) { @@ -2398,10 +2411,11 @@ static HRESULT opentype_get_font_strings_from_id(const struct dwrite_fonttable * case OPENTYPE_PLATFORM_MAC: if (candidate_mac == -1) candidate_mac = i; + if (candidate_mac_en == -1 && opentype_is_english_namerecord(table, i)) + candidate_mac_en = i; break; case OPENTYPE_PLATFORM_WIN: - if (opentype_decode_namerecord(table, i, *strings)) - exists = TRUE; + has_english |= opentype_decode_namerecord(table, i, *strings); break; default: FIXME("platform %i not supported\n", platform); @@ -2409,24 +2423,23 @@ static HRESULT opentype_get_font_strings_from_id(const struct dwrite_fonttable * } } - if (!exists) - { - if (candidate_mac != -1) - exists = opentype_decode_namerecord(table, candidate_mac, *strings); - if (!exists && candidate_unicode != -1) - exists = opentype_decode_namerecord(table, candidate_unicode, *strings); + if (!get_localizedstrings_count(*strings) && candidate_mac != -1) + has_english |= opentype_decode_namerecord(table, candidate_mac, *strings); + if (!get_localizedstrings_count(*strings) && candidate_unicode != -1) + has_english |= opentype_decode_namerecord(table, candidate_unicode, *strings); + if (!has_english && candidate_mac_en != -1) + opentype_decode_namerecord(table, candidate_mac_en, *strings); - if (!exists) - { - IDWriteLocalizedStrings_Release(*strings); - *strings = NULL; - } + if (!get_localizedstrings_count(*strings)) + { + IDWriteLocalizedStrings_Release(*strings); + *strings = NULL; } if (*strings) sort_localizedstrings(*strings); - return exists ? S_OK : E_FAIL; + return *strings ? S_OK : E_FAIL; } static WCHAR *meta_get_lng_name(WCHAR *str, WCHAR **ctx) -- 2.30.1

1 4

[PATCH] ole32/clipboard: Handle CF_HDROP format.
by Jactry Zeng March 10, 2021

March 10, 2021

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ole32/clipboard.c | 1 + dlls/ole32/tests/clipboard.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index a28dcef9eee..614d67b0f66 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1135,6 +1135,7 @@ static DWORD get_tymed_from_nonole_cf(UINT cf) switch(cf) { + case CF_HDROP: case CF_TEXT: case CF_OEMTEXT: case CF_UNICODETEXT: diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 0a087aff840..3c44fdec5b2 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -28,6 +28,8 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "shellapi.h" +#include "shlobj.h" #include "wine/test.h" @@ -1513,6 +1515,27 @@ static HENHMETAFILE create_emf(void) return CloseEnhMetaFile(hdc); } +static HDROP create_dropped_file(void) +{ + WCHAR path[] = L"C:\testfile1"; + DROPFILES *dropfiles; + DWORD size, offset; + HDROP hdrop; + + size = sizeof(DROPFILES) + (sizeof(path) + 1) * sizeof(WCHAR); + offset = sizeof(DROPFILES); + hdrop = GlobalAlloc(GHND, size); + dropfiles = GlobalLock(hdrop); + dropfiles->pFiles = offset; + dropfiles->fWide = TRUE; + lstrcpyW(((WCHAR *)dropfiles) + offset, path); + offset += lstrlenW(path) + 1; + ((WCHAR *)dropfiles)[offset] = 0; + GlobalUnlock(hdrop); + + return hdrop; +} + static void test_nonole_clipboard(void) { HRESULT hr; @@ -1524,6 +1547,7 @@ static void test_nonole_clipboard(void) HENHMETAFILE emf; STGMEDIUM med; DWORD obj_type; + HDROP hdrop; r = OpenClipboard(NULL); ok(r, "gle %d\n", GetLastError()); @@ -1552,6 +1576,7 @@ static void test_nonole_clipboard(void) hblob = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE|GMEM_ZEROINIT, 10); emf = create_emf(); hstorage = create_storage(); + hdrop = create_dropped_file(); r = OpenClipboard(NULL); ok(r, "gle %d\n", GetLastError()); @@ -1563,6 +1588,8 @@ static void test_nonole_clipboard(void) ok(h == emf, "got %p\n", h); h = SetClipboardData(cf_storage, hstorage); ok(h == hstorage, "got %p\n", h); + h = SetClipboardData(CF_HDROP, hdrop); + ok(h == hdrop, "got %p\n", h); r = CloseClipboard(); ok(r, "gle %d\n", GetLastError()); @@ -1608,6 +1635,14 @@ static void test_nonole_clipboard(void) ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(fmt.cfFormat == CF_HDROP, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); ok(hr == S_OK, "got %08x\n", hr); /* User32 adds some synthesised formats */ -- 2.30.1

2 2

[PATCH] api-ms-win-core-kernel32-legacy-l1-1-2: Add new dll.
by Myah Caron March 10, 2021

March 10, 2021

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Required by Forza Horizon 4: https://github.com/ValveSoftware/Proton/issues/4667#issuecomment-794364880 configure.ac | 1 + .../api-ms-win-core-kernel32-legacy-l1-1-2/Makefile.in | 1 + .../api-ms-win-core-kernel32-legacy-l1-1-2.spec | 10 ++++++++++ tools/make_specfiles | 1 + 4 files changed, 13 insertions(+) create mode 100644 dlls/api-ms-win-core-kernel32-legacy-l1-1-2/Makefile.in create mode 100644 dlls/api-ms-win-core-kernel32-legacy-l1-1-2/api-ms-win-core-kernel32-legacy-l1-1-2.spec diff --git a/configure.ac b/configure.ac index 8ed3b0c2669..5b7f09de924 100644 --- a/configure.ac +++ b/configure.ac @@ -2850,6 +2850,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-job-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-job-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-largeinteger-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-1-0) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-2/Makefile.in b/dlls/api-ms-win-core-kernel32-legacy-l1-1-2/Makefile.in new file mode 100644 index 00000000000..e713a0c3892 --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-kernel32-legacy-l1-1-2.dll diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-2/api-ms-win-core-kernel32-legacy-l1-1-2.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-2/api-ms-win-core-kernel32-legacy-l1-1-2.spec new file mode 100644 index 00000000000..aa5baafaded --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-2/api-ms-win-core-kernel32-legacy-l1-1-2.spec @@ -0,0 +1,10 @@ +@ stdcall CreateSemaphoreA(ptr long long str) kernel32.CreateSemaphoreA +@ stdcall GetBinaryTypeW(wstr ptr) kernel32.GetBinaryTypeW +@ stdcall Module32First(long ptr) kernel32.Module32First +@ stdcall Module32Next(long ptr) kernel32.Module32Next +@ stdcall OpenFileMappingA(long long str) kernel32.OpenFileMappingA +@ stdcall OpenMutexA(long long str) kernel32.OpenMutexA +@ stdcall Process32First(ptr ptr) kernel32.Process32First +@ stdcall Process32Next(ptr ptr) kernel32.Process32Next +@ stdcall SetTermsrvAppInstallMode(long) kernel32.SetTermsrvAppInstallMode +@ stdcall VerifyVersionInfoA(ptr long int64) kernel32.VerifyVersionInfoA diff --git a/tools/make_specfiles b/tools/make_specfiles index 11e806b8919..3689a856b9f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -251,6 +251,7 @@ my @dll_groups = "api-ms-win-core-job-l2-1-0", "api-ms-win-core-kernel32-legacy-l1-1-0", "api-ms-win-core-kernel32-legacy-l1-1-1", + "api-ms-win-core-kernel32-legacy-l1-1-2", "api-ms-win-core-kernel32-private-l1-1-1", "api-ms-win-core-largeinteger-l1-1-0", "api-ms-win-core-libraryloader-l1-2-1", -- 2.30.1

1 0

[PATCH] opencl: Generate the spec file and thunks from the official XML registry file.
by Zebediah Figura March 9, 2021

March 9, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/opencl/Makefile.in | 3 +- dlls/opencl/make_opencl | 299 ++++++++++++++++ dlls/opencl/opencl.c | 670 +---------------------------------- dlls/opencl/opencl.spec | 158 ++++----- dlls/opencl/opencl_private.h | 41 +++ dlls/opencl/opencl_thunks.c | 361 +++++++++++++++++++ 6 files changed, 769 insertions(+), 763 deletions(-) create mode 100755 dlls/opencl/make_opencl create mode 100644 dlls/opencl/opencl_private.h create mode 100644 dlls/opencl/opencl_thunks.c diff --git a/dlls/opencl/Makefile.in b/dlls/opencl/Makefile.in index 1f6e76c0b47..f9fa2dcaa96 100644 --- a/dlls/opencl/Makefile.in +++ b/dlls/opencl/Makefile.in @@ -2,4 +2,5 @@ MODULE = opencl.dll EXTRALIBS = $(OPENCL_LIBS) C_SRCS = \ - opencl.c + opencl.c \ + opencl_thunks.c diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl new file mode 100755 index 00000000000..6a8f562ee6d --- /dev/null +++ b/dlls/opencl/make_opencl @@ -0,0 +1,299 @@ +#!/usr/bin/perl -w +use strict; +use XML::LibXML; + +# Copyright 2021 Zebediah Figura +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +# Files to generate +my $spec_file = "opencl.spec"; +my $thunks_file = "opencl_thunks.c"; + +# If set to 1, generate TRACEs for each OpenGL function +my $gen_traces = 1; + +# List of categories to put in the 'opengl_core.c' file +my %cat_1_0 = ( "CL_VERSION_1_0" => 1 ); + +my %core_categories = (); + +my %arg_types = + ( + "cl_bitfield" => [ "int64", "wine_dbgstr_longlong(%s)" ], + "double" => [ "double", "%.16e" ], + "float" => [ "float", "%.8e" ], + "int" => [ "long", "%d" ], + "int8_t" => [ "long", "%d" ], + "int16_t" => [ "long", "%d" ], + "int32_t" => [ "long", "%d" ], + "int64_t" => [ "int64", "wine_dbgstr_longlong(%s)" ], + "intptr_t" => [ "long", "%ld" ], + "size_t" => [ "long", "%zu" ], + "uint8_t" => [ "long", "%u" ], + "uint16_t" => [ "long", "%u" ], + "uint32_t" => [ "long", "%u" ], + "uint64_t" => [ "int64", "wine_dbgstr_longlong(%s)" ], + "unsigned int" => [ "long", "%u" ], + ); + +sub generate_thunk($$) +{ + my ($name, $func_ref) = @_; + my $call_arg = ""; + my $trace_call_arg = ""; + my $trace_arg = ""; + + my $ret = get_func_proto( "%s WINAPI wine_%s(%s)", $name, $func_ref ); + foreach my $arg (@{$func_ref->[1]}) + { + my $ptype = get_arg_type( $arg ); + next unless $arg->findnodes("./name"); + my $pname = get_arg_name( $arg ); + my $param = $arg->textContent(); + $call_arg .= " " . $pname . ","; + if ($param =~ /\*/ || $param =~ /\[/) + { + $trace_arg .= ", %p"; + $trace_call_arg .= ", " . $pname; + } + elsif (defined $arg_types{$ptype}) + { + my $format = ${$arg_types{$ptype}}[1]; + $trace_arg .= ", " . ($format =~ /^%/ ? $format : "%s"); + $trace_call_arg .= ", " . sprintf $format =~ /^%/ ? "%s" : $format, $pname; + } + else + { + die "Unknown type %s in %s\n", $param, $name; + } + } + $call_arg =~ s/,$/ /; + $trace_arg =~ s/^, //; + $ret .= "\n{\n"; + $ret .= " TRACE( \"($trace_arg)\\n\"$trace_call_arg );\n" if $gen_traces; + $ret .= " "; + $ret .= "return " unless is_void_func( $func_ref ); + $ret .= "$name($call_arg);\n"; + $ret .= "}\n\n"; + return $ret; +} + +sub is_void_func($) +{ + my $func = shift; + return 0 if @{$func->[0]->findnodes("./type")}; + return $func->[0]->textContent() eq "void"; +} + +sub get_arg_type($) +{ + my $p = shift; + my @type = $p->findnodes("./type"); + return @type ? $type[0]->textContent() : "cl_int"; +} + +sub get_arg_name($) +{ + my $p = shift; + my @name = $p->findnodes("./name"); + return $name[0]->textContent(); +} + +sub get_func_proto($$$) +{ + my ($format, $name, $func) = @_; + die "unknown func $name" unless defined $func->[0]; + my $proto = $func->[0]->textContent(); + $proto =~ s/ +$//; + my $args = ""; + foreach my $arg (@{$func->[1]}) + { + (my $argtext = $arg->textContent()) =~ s/ +/ /g; + $args .= " " . $argtext . ","; + } + $args =~ s/,$/ /; + $args ||= "void"; + return sprintf $format, $proto, $name, $args; +} + +# extract and check the number of arguments +if (@ARGV > 1) +{ + my $name0 = $0; + $name0 =~ s%^.*/%%; + die "Usage: $name0 [version]\n"; +} +my $version = $ARGV[0] || "1.0"; +if ($version eq "1.0") +{ + %core_categories = %cat_1_0; +} +else +{ + die "Incorrect OpenCL version.\n"; +} + +my $url = "https://raw.githubusercontent.com/KhronosGroup/OpenCL-Docs"; +my $commit = "514965312a65e5d01ae17e23119dc95427b7149e"; +-f "cl-$commit.xml" || system "wget", "-O", "cl-$commit.xml", "$url/$commit/xml/cl.xml" || die "cannot download cl.xml"; + +sub generate_spec_entry($$) +{ + my ($name, $func) = @_; + my $args=" "; + foreach my $arg (@{$func->[1]}) + { + my $ptype = get_arg_type( $arg ); + my $param = $arg->textContent(); + if ($param =~ /[[*]/) + { + $args .= "ptr "; + } + elsif (defined($arg_types{$ptype})) + { + $args .= "$@$arg_types{$ptype}[0] "; + } + elsif ($ptype ne "void") + { + die "No conversion for func $name type $param\n"; + } + } + $args = substr($args,1,-1); + return "@ stdcall $_($args) wine_$_"; +} + +my %core_functions; +my %cl_enums; +my (%cl_types, @cl_types); # also use an array to preserve declaration order + +# some functions need a hand-written wrapper +sub needs_wrapper($) +{ + my %funcs = + ( + # need callback conversion + "clBuildProgram" => 1, + "clCreateContext" => 1, + "clCreateContextFromType" => 1, + "clEnqueueNativeKernel" => 1, + + # need extension filtering + "clGetDeviceInfo" => 1, + "clGetPlatformInfo" => 1, + + # needs function pointer conversion + "clGetExtensionFunctionAddress" => 1, + ); + my $name = shift; + + return defined $funcs{$name}; +} + +sub parse_file($) +{ + my $file = shift; + my $xml = XML::LibXML->load_xml( location => $file ); + my %functions; + my %enums; + + # save all functions + foreach my $command ($xml->findnodes("/registry/commands/command")) + { + my $proto = @{$command->findnodes("./proto")}[0]; + my $name = @{$command->findnodes("./proto/name")}[0]; + $proto->removeChild( $name ); + my @params = $command->findnodes("./param"); + $functions{$name->textContent()} = [ $proto, \@params ]; + } + + # save all enums + foreach my $enum ($xml->findnodes("/registry/enums/enum")) + { + $enums{$enum->{name}} = $enum->{value}; + } + + # save all types + foreach my $type ($xml->findnodes("/registry/types/type")) + { + my $name = @{$type->findnodes("./name")}[0]; + next unless $name; + $name = $name->textContent; + push @cl_types, $name unless $cl_types{$name}; + $cl_types{$name} = $type; + + if ($type->{category} eq "define" and not defined($arg_types{$name})) + { + my $basetype = @{$type->findnodes("./type")}[0]; + if ($type->textContent() =~ /[[*]/) + { + $arg_types{$name} = ["ptr", "%p"]; + } + elsif (defined($basetype) and defined($arg_types{$basetype->textContent})) + { + $arg_types{$name} = $arg_types{$basetype->textContent}; + } + elsif ($name ne "cl_icd_dispatch") + { + die "No conversion for type $name\n" + } + } + } + + # generate core functions + foreach my $feature ($xml->findnodes("/registry/feature")) + { + next unless defined $core_categories{$feature->{name}}; + foreach my $cmd ($feature->findnodes("./require/command")) + { + $core_functions{$cmd->{name}} = $functions{$cmd->{name}}; + } + foreach my $enum ($feature->findnodes("./require/enum")) + { + $cl_enums{$enum->{name}} = $enums{$enum->{name}}; + } + } +} + +parse_file( "cl-$commit.xml" ); + +# generate the spec file +open(SPEC, ">$spec_file") or die "cannot create $spec_file"; + +foreach (sort keys %core_functions) +{ + printf SPEC "%s\n", generate_spec_entry( $_, $core_functions{$_} ); +} + +close(SPEC); + +my $file_header = +"/* Automatically generated from OpenCL registry files; DO NOT EDIT! */\n\n" . +"#include \"config.h\"\n" . +"#include \"opencl_private.h\"\n\n"; + +$file_header .= "WINE_DEFAULT_DEBUG_CHANNEL(opencl);\n\n" if $gen_traces; + +# generate the thunks file +open(THUNKS, ">$thunks_file") or die "cannot create $thunks_file"; +print THUNKS $file_header; + +foreach (sort keys %core_functions) +{ + next if needs_wrapper( $_ ); + print THUNKS generate_thunk( $_, $core_functions{$_} ); +} + +close(THUNKS); diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index f79345a1888..f678ed8cca0 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -19,43 +19,10 @@ */ #include "config.h" -#include "wine/port.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -#include "wine/debug.h" +#include "opencl_private.h" WINE_DEFAULT_DEBUG_CHANNEL(opencl); -#define CL_SILENCE_DEPRECATION -#if defined(HAVE_CL_CL_H) -#define CL_USE_DEPRECATED_OPENCL_1_1_APIS -#define CL_USE_DEPRECATED_OPENCL_1_2_APIS -#define CL_USE_DEPRECATED_OPENCL_2_0_APIS -#define CL_TARGET_OPENCL_VERSION 220 -#include <CL/cl.h> -#elif defined(HAVE_OPENCL_OPENCL_H) -#include <OpenCL/opencl.h> -#endif - -/* TODO: Figure out how to provide GL context sharing before enabling OpenGL */ -#define OPENCL_WITH_GL 0 - - -/*---------------------------------------------------------------*/ -/* Platform API */ - -cl_int WINAPI wine_clGetPlatformIDs(cl_uint num_entries, cl_platform_id *platforms, cl_uint *num_platforms) -{ - cl_int ret; - TRACE("(%d, %p, %p)\n", num_entries, platforms, num_platforms); - ret = clGetPlatformIDs(num_entries, platforms, num_platforms); - TRACE("(%d, %p, %p)=%d\n", num_entries, platforms, num_platforms, ret); - return ret; -} - cl_int WINAPI wine_clGetPlatformInfo(cl_platform_id platform, cl_platform_info param_name, SIZE_T param_value_size, void * param_value, size_t * param_value_size_ret) { @@ -92,19 +59,6 @@ cl_int WINAPI wine_clGetPlatformInfo(cl_platform_id platform, cl_platform_info p } -/*---------------------------------------------------------------*/ -/* Device APIs */ - -cl_int WINAPI wine_clGetDeviceIDs(cl_platform_id platform, cl_device_type device_type, - cl_uint num_entries, cl_device_id * devices, cl_uint * num_devices) -{ - cl_int ret; - TRACE("(%p, 0x%lx, %d, %p, %p)\n", platform, (long unsigned int)device_type, num_entries, devices, num_devices); - ret = clGetDeviceIDs(platform, device_type, num_entries, devices, num_devices); - TRACE("(%p, 0x%lx, %d, %p, %p)=%d\n", platform, (long unsigned int)device_type, num_entries, devices, num_devices, ret); - return ret; -} - cl_int WINAPI wine_clGetDeviceInfo(cl_device_id device, cl_device_info param_name, SIZE_T param_value_size, void * param_value, size_t * param_value_size_ret) { @@ -148,9 +102,6 @@ cl_int WINAPI wine_clGetDeviceInfo(cl_device_id device, cl_device_info param_nam } -/*---------------------------------------------------------------*/ -/* Context APIs */ - typedef struct { void WINAPI (*pfn_notify)(const char *errinfo, const void *private_info, size_t cb, void *user_data); @@ -187,6 +138,7 @@ cl_context WINAPI wine_clCreateContext(const cl_context_properties * properties, return ret; } + cl_context WINAPI wine_clCreateContextFromType(const cl_context_properties * properties, cl_device_type device_type, void WINAPI (*pfn_notify)(const char *errinfo, const void *private_info, size_t cb, void *user_data), void * user_data, cl_int * errcode_ret) @@ -208,233 +160,6 @@ cl_context WINAPI wine_clCreateContextFromType(const cl_context_properties * pro return ret; } -cl_int WINAPI wine_clRetainContext(cl_context context) -{ - cl_int ret; - TRACE("(%p)\n", context); - ret = clRetainContext(context); - TRACE("(%p)=%d\n", context, ret); - return ret; -} - -cl_int WINAPI wine_clReleaseContext(cl_context context) -{ - cl_int ret; - TRACE("(%p)\n", context); - ret = clReleaseContext(context); - TRACE("(%p)=%d\n", context, ret); - return ret; -} - -cl_int WINAPI wine_clGetContextInfo(cl_context context, cl_context_info param_name, - SIZE_T param_value_size, void * param_value, size_t * param_value_size_ret) -{ - cl_int ret; - TRACE("(%p, 0x%x, %ld, %p, %p)\n", context, param_name, param_value_size, param_value, param_value_size_ret); - ret = clGetContextInfo(context, param_name, param_value_size, param_value, param_value_size_ret); - TRACE("(%p, 0x%x, %ld, %p, %p)=%d\n", context, param_name, param_value_size, param_value, param_value_size_ret, ret); - return ret; -} - - -/*---------------------------------------------------------------*/ -/* Command Queue APIs */ - -cl_command_queue WINAPI wine_clCreateCommandQueue(cl_context context, cl_device_id device, - cl_command_queue_properties properties, cl_int * errcode_ret) -{ - cl_command_queue ret; - TRACE("(%p, %p, 0x%lx, %p)\n", context, device, (long unsigned int)properties, errcode_ret); - ret = clCreateCommandQueue(context, device, properties, errcode_ret); - TRACE("(%p, %p, 0x%lx, %p)=%p\n", context, device, (long unsigned int)properties, errcode_ret, ret); - return ret; -} - -cl_int WINAPI wine_clRetainCommandQueue(cl_command_queue command_queue) -{ - cl_int ret; - TRACE("(%p)\n", command_queue); - ret = clRetainCommandQueue(command_queue); - TRACE("(%p)=%d\n", command_queue, ret); - return ret; -} - -cl_int WINAPI wine_clReleaseCommandQueue(cl_command_queue command_queue) -{ - cl_int ret; - TRACE("(%p)\n", command_queue); - ret = clReleaseCommandQueue(command_queue); - TRACE("(%p)=%d\n", command_queue, ret); - return ret; -} - -cl_int WINAPI wine_clGetCommandQueueInfo(cl_command_queue command_queue, cl_command_queue_info param_name, - SIZE_T param_value_size, void * param_value, size_t * param_value_size_ret) -{ - cl_int ret; - TRACE("%p, %d, %ld, %p, %p\n", command_queue, param_name, param_value_size, param_value, param_value_size_ret); - ret = clGetCommandQueueInfo(command_queue, param_name, param_value_size, param_value, param_value_size_ret); - return ret; -} - -cl_int WINAPI wine_clSetCommandQueueProperty(cl_command_queue command_queue, cl_command_queue_properties properties, cl_bool enable, - cl_command_queue_properties * old_properties) -{ - FIXME("(%p, 0x%lx, %d, %p): deprecated\n", command_queue, (long unsigned int)properties, enable, old_properties); - return CL_INVALID_QUEUE_PROPERTIES; -} - - -/*---------------------------------------------------------------*/ -/* Memory Object APIs */ - -cl_mem WINAPI wine_clCreateBuffer(cl_context context, cl_mem_flags flags, size_t size, void * host_ptr, cl_int * errcode_ret) -{ - cl_mem ret; - TRACE("\n"); - ret = clCreateBuffer(context, flags, size, host_ptr, errcode_ret); - return ret; -} - -cl_mem WINAPI wine_clCreateImage2D(cl_context context, cl_mem_flags flags, cl_image_format * image_format, - size_t image_width, size_t image_height, size_t image_row_pitch, void * host_ptr, cl_int * errcode_ret) -{ - cl_mem ret; - TRACE("\n"); - ret = clCreateImage2D(context, flags, image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret); - return ret; -} - -cl_mem WINAPI wine_clCreateImage3D(cl_context context, cl_mem_flags flags, cl_image_format * image_format, - size_t image_width, size_t image_height, size_t image_depth, size_t image_row_pitch, size_t image_slice_pitch, - void * host_ptr, cl_int * errcode_ret) -{ - cl_mem ret; - TRACE("\n"); - ret = clCreateImage3D(context, flags, image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret); - return ret; -} - -cl_int WINAPI wine_clRetainMemObject(cl_mem memobj) -{ - cl_int ret; - TRACE("(%p)\n", memobj); - ret = clRetainMemObject(memobj); - TRACE("(%p)=%d\n", memobj, ret); - return ret; -} - -cl_int WINAPI wine_clReleaseMemObject(cl_mem memobj) -{ - cl_int ret; - TRACE("(%p)\n", memobj); - ret = clReleaseMemObject(memobj); - TRACE("(%p)=%d\n", memobj, ret); - return ret; -} - -cl_int WINAPI wine_clGetSupportedImageFormats(cl_context context, cl_mem_flags flags, cl_mem_object_type image_type, cl_uint num_entries, - cl_image_format * image_formats, cl_uint * num_image_formats) -{ - cl_int ret; - TRACE("\n"); - ret = clGetSupportedImageFormats(context, flags, image_type, num_entries, image_formats, num_image_formats); - return ret; -} - -cl_int WINAPI wine_clGetMemObjectInfo(cl_mem memobj, cl_mem_info param_name, size_t param_value_size, void * param_value, size_t * param_value_size_ret) -{ - cl_int ret; - TRACE("\n"); - ret = clGetMemObjectInfo(memobj, param_name, param_value_size, param_value, param_value_size_ret); - return ret; -} - -cl_int WINAPI wine_clGetImageInfo(cl_mem image, cl_image_info param_name, size_t param_value_size, void * param_value, size_t * param_value_size_ret) -{ - cl_int ret; - TRACE("\n"); - ret = clGetImageInfo(image, param_name, param_value_size, param_value, param_value_size_ret); - return ret; -} - - -/*---------------------------------------------------------------*/ -/* Sampler APIs */ - -cl_sampler WINAPI wine_clCreateSampler(cl_context context, cl_bool normalized_coords, cl_addressing_mode addressing_mode, - cl_filter_mode filter_mode, cl_int * errcode_ret) -{ - cl_sampler ret; - TRACE("\n"); - ret = clCreateSampler(context, normalized_coords, addressing_mode, filter_mode, errcode_ret); - return ret; -} - -cl_int WINAPI wine_clRetainSampler(cl_sampler sampler) -{ - cl_int ret; - TRACE("\n"); - ret = clRetainSampler(sampler); - return ret; -} - -cl_int WINAPI wine_clReleaseSampler(cl_sampler sampler) -{ - cl_int ret; - TRACE("\n"); - ret = clReleaseSampler(sampler); - return ret; -} - -cl_int WINAPI wine_clGetSamplerInfo(cl_sampler sampler, cl_sampler_info param_name, size_t param_value_size, - void * param_value, size_t * param_value_size_ret) -{ - cl_int ret; - TRACE("\n"); - ret = clGetSamplerInfo(sampler, param_name, param_value_size, param_value, param_value_size_ret); - return ret; -} - - -/*---------------------------------------------------------------*/ -/* Program Object APIs */ - -cl_program WINAPI wine_clCreateProgramWithSource(cl_context context, cl_uint count, const char ** strings, - const size_t * lengths, cl_int * errcode_ret) -{ - cl_program ret; - TRACE("\n"); - ret = clCreateProgramWithSource(context, count, strings, lengths, errcode_ret); - return ret; -} - -cl_program WINAPI wine_clCreateProgramWithBinary(cl_context context, cl_uint num_devices, const cl_device_id * device_list, - const size_t * lengths, const unsigned char ** binaries, cl_int * binary_status, - cl_int * errcode_ret) -{ - cl_program ret; - TRACE("\n"); - ret = clCreateProgramWithBinary(context, num_devices, device_list, lengths, binaries, binary_status, errcode_ret); - return ret; -} - -cl_int WINAPI wine_clRetainProgram(cl_program program) -{ - cl_int ret; - TRACE("\n"); - ret = clRetainProgram(program); - return ret; -} - -cl_int WINAPI wine_clReleaseProgram(cl_program program) -{ - cl_int ret; - TRACE("\n"); - ret = clReleaseProgram(program); - return ret; -} - typedef struct { void WINAPI (*pfn_notify)(cl_program program, void * user_data); @@ -474,307 +199,6 @@ cl_int WINAPI wine_clBuildProgram(cl_program program, cl_uint num_devices, const return ret; } -cl_int WINAPI wine_clUnloadCompiler(void) -{ - cl_int ret; - TRACE("()\n"); - ret = clUnloadCompiler(); - TRACE("()=%d\n", ret); - return ret; -} - -cl_int WINAPI wine_clGetProgramInfo(cl_program program, cl_program_info param_name, - size_t param_value_size, void * param_value, size_t * param_value_size_ret) -{ - cl_int ret; - TRACE("\n"); - ret = clGetProgramInfo(program, param_name, param_value_size, param_value, param_value_size_ret); - return ret; -} - -cl_int WINAPI wine_clGetProgramBuildInfo(cl_program program, cl_device_id device, - cl_program_build_info param_name, size_t param_value_size, void * param_value, - size_t * param_value_size_ret) -{ - cl_int ret; - TRACE("\n"); - ret = clGetProgramBuildInfo(program, device, param_name, param_value_size, param_value, param_value_size_ret); - return ret; -} - - -/*---------------------------------------------------------------*/ -/* Kernel Object APIs */ - -cl_kernel WINAPI wine_clCreateKernel(cl_program program, char * kernel_name, cl_int * errcode_ret) -{ - cl_kernel ret; - TRACE("\n"); - ret = clCreateKernel(program, kernel_name, errcode_ret); - return ret; -} - -cl_int WINAPI wine_clCreateKernelsInProgram(cl_program program, cl_uint num_kernels, - cl_kernel * kernels, cl_uint * num_kernels_ret) -{ - cl_int ret; - TRACE("\n"); - ret = clCreateKernelsInProgram(program, num_kernels, kernels, num_kernels_ret); - return ret; -} - -cl_int WINAPI wine_clRetainKernel(cl_kernel kernel) -{ - cl_int ret; - TRACE("\n"); - ret = clRetainKernel(kernel); - return ret; -} - -cl_int WINAPI wine_clReleaseKernel(cl_kernel kernel) -{ - cl_int ret; - TRACE("\n"); - ret = clReleaseKernel(kernel); - return ret; -} - -cl_int WINAPI wine_clSetKernelArg(cl_kernel kernel, cl_uint arg_index, size_t arg_size, void * arg_value) -{ - cl_int ret; - TRACE("\n"); - ret = clSetKernelArg(kernel, arg_index, arg_size, arg_value); - return ret; -} - -cl_int WINAPI wine_clGetKernelInfo(cl_kernel kernel, cl_kernel_info param_name, - size_t param_value_size, void * param_value, size_t * param_value_size_ret) -{ - cl_int ret; - TRACE("\n"); - ret = clGetKernelInfo(kernel, param_name, param_value_size, param_value, param_value_size_ret); - return ret; -} - -cl_int WINAPI wine_clGetKernelWorkGroupInfo(cl_kernel kernel, cl_device_id device, - cl_kernel_work_group_info param_name, size_t param_value_size, - void * param_value, size_t * param_value_size_ret) -{ - cl_int ret; - TRACE("\n"); - ret = clGetKernelWorkGroupInfo(kernel, device, param_name, param_value_size, param_value, param_value_size_ret); - return ret; -} - - -/*---------------------------------------------------------------*/ -/* Event Object APIs */ - -cl_int WINAPI wine_clWaitForEvents(cl_uint num_events, cl_event * event_list) -{ - cl_int ret; - TRACE("\n"); - ret = clWaitForEvents(num_events, event_list); - return ret; -} - -cl_int WINAPI wine_clGetEventInfo(cl_event event, cl_event_info param_name, size_t param_value_size, - void * param_value, size_t * param_value_size_ret) -{ - cl_int ret; - TRACE("\n"); - ret = clGetEventInfo(event, param_name, param_value_size, param_value, param_value_size_ret); - return ret; -} - -cl_int WINAPI wine_clRetainEvent(cl_event event) -{ - cl_int ret; - TRACE("\n"); - ret = clRetainEvent(event); - return ret; -} - -cl_int WINAPI wine_clReleaseEvent(cl_event event) -{ - cl_int ret; - TRACE("\n"); - ret = clReleaseEvent(event); - return ret; -} - - -/*---------------------------------------------------------------*/ -/* Profiling APIs */ - -cl_int WINAPI wine_clGetEventProfilingInfo(cl_event event, cl_profiling_info param_name, size_t param_value_size, - void * param_value, size_t * param_value_size_ret) -{ - cl_int ret; - TRACE("\n"); - ret = clGetEventProfilingInfo(event, param_name, param_value_size, param_value, param_value_size_ret); - return ret; -} - - -/*---------------------------------------------------------------*/ -/* Flush and Finish APIs */ - -cl_int WINAPI wine_clFlush(cl_command_queue command_queue) -{ - cl_int ret; - TRACE("(%p)\n", command_queue); - ret = clFlush(command_queue); - TRACE("(%p)=%d\n", command_queue, ret); - return ret; -} - -cl_int WINAPI wine_clFinish(cl_command_queue command_queue) -{ - cl_int ret; - TRACE("(%p)\n", command_queue); - ret = clFinish(command_queue); - TRACE("(%p)=%d\n", command_queue, ret); - return ret; -} - - -/*---------------------------------------------------------------*/ -/* Enqueued Commands APIs */ - -cl_int WINAPI wine_clEnqueueReadBuffer(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, - size_t offset, size_t cb, void * ptr, - cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) -{ - cl_int ret; - TRACE("\n"); - ret = clEnqueueReadBuffer(command_queue, buffer, blocking_read, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); - return ret; -} - -cl_int WINAPI wine_clEnqueueWriteBuffer(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, - size_t offset, size_t cb, const void * ptr, - cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) -{ - cl_int ret; - TRACE("\n"); - ret = clEnqueueWriteBuffer(command_queue, buffer, blocking_write, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); - return ret; -} - -cl_int WINAPI wine_clEnqueueCopyBuffer(cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, - size_t src_offset, size_t dst_offset, size_t cb, - cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) -{ - cl_int ret; - TRACE("\n"); - ret = clEnqueueCopyBuffer(command_queue, src_buffer, dst_buffer, src_offset, dst_offset, cb, num_events_in_wait_list, event_wait_list, event); - return ret; -} - -cl_int WINAPI wine_clEnqueueReadImage(cl_command_queue command_queue, cl_mem image, cl_bool blocking_read, - const size_t * origin, const size_t * region, - SIZE_T row_pitch, SIZE_T slice_pitch, void * ptr, - cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) -{ - cl_int ret; - TRACE("(%p, %p, %d, %p, %p, %ld, %ld, %p, %d, %p, %p)\n", command_queue, image, blocking_read, - origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); - ret = clEnqueueReadImage(command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); - TRACE("(%p, %p, %d, %p, %p, %ld, %ld, %p, %d, %p, %p)=%d\n", command_queue, image, blocking_read, - origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event, ret); - return ret; -} - -cl_int WINAPI wine_clEnqueueWriteImage(cl_command_queue command_queue, cl_mem image, cl_bool blocking_write, - const size_t * origin, const size_t * region, - size_t input_row_pitch, size_t input_slice_pitch, const void * ptr, - cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) -{ - cl_int ret; - TRACE("\n"); - ret = clEnqueueWriteImage(command_queue, image, blocking_write, origin, region, input_row_pitch, input_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); - return ret; -} - -cl_int WINAPI wine_clEnqueueCopyImage(cl_command_queue command_queue, cl_mem src_image, cl_mem dst_image, - size_t * src_origin, size_t * dst_origin, size_t * region, - cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event) -{ - cl_int ret; - TRACE("\n"); - ret = clEnqueueCopyImage(command_queue, src_image, dst_image, src_origin, dst_origin, region, num_events_in_wait_list, event_wait_list, event); - return ret; -} - -cl_int WINAPI wine_clEnqueueCopyImageToBuffer(cl_command_queue command_queue, cl_mem src_image, cl_mem dst_buffer, - size_t * src_origin, size_t * region, size_t dst_offset, - cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event) -{ - cl_int ret; - TRACE("\n"); - ret = clEnqueueCopyImageToBuffer(command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event); - return ret; -} - -cl_int WINAPI wine_clEnqueueCopyBufferToImage(cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_image, - size_t src_offset, size_t * dst_origin, size_t * region, - cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event) -{ - cl_int ret; - TRACE("\n"); - ret = clEnqueueCopyBufferToImage(command_queue, src_buffer, dst_image, src_offset, dst_origin, region, num_events_in_wait_list, event_wait_list, event); - return ret; -} - -void * WINAPI wine_clEnqueueMapBuffer(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_map, - cl_map_flags map_flags, size_t offset, size_t cb, - cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event, cl_int * errcode_ret) -{ - void * ret; - TRACE("\n"); - ret = clEnqueueMapBuffer(command_queue, buffer, blocking_map, map_flags, offset, cb, num_events_in_wait_list, event_wait_list, event, errcode_ret); - return ret; -} - -void * WINAPI wine_clEnqueueMapImage(cl_command_queue command_queue, cl_mem image, cl_bool blocking_map, - cl_map_flags map_flags, size_t * origin, size_t * region, - size_t * image_row_pitch, size_t * image_slice_pitch, - cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event, cl_int * errcode_ret) -{ - void * ret; - TRACE("\n"); - ret = clEnqueueMapImage(command_queue, image, blocking_map, map_flags, origin, region, image_row_pitch, image_slice_pitch, num_events_in_wait_list, event_wait_list, event, errcode_ret); - return ret; -} - -cl_int WINAPI wine_clEnqueueUnmapMemObject(cl_command_queue command_queue, cl_mem memobj, void * mapped_ptr, - cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event) -{ - cl_int ret; - TRACE("\n"); - ret = clEnqueueUnmapMemObject(command_queue, memobj, mapped_ptr, num_events_in_wait_list, event_wait_list, event); - return ret; -} - -cl_int WINAPI wine_clEnqueueNDRangeKernel(cl_command_queue command_queue, cl_kernel kernel, cl_uint work_dim, - size_t * global_work_offset, size_t * global_work_size, size_t * local_work_size, - cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event) -{ - cl_int ret; - TRACE("\n"); - ret = clEnqueueNDRangeKernel(command_queue, kernel, work_dim, global_work_offset, global_work_size, local_work_size, num_events_in_wait_list, event_wait_list, event); - return ret; -} - -cl_int WINAPI wine_clEnqueueTask(cl_command_queue command_queue, cl_kernel kernel, - cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event) -{ - cl_int ret; - TRACE("\n"); - ret = clEnqueueTask(command_queue, kernel, num_events_in_wait_list, event_wait_list, event); - return ret; -} cl_int WINAPI wine_clEnqueueNativeKernel(cl_command_queue command_queue, void WINAPI (*user_func)(void *args), @@ -797,33 +221,6 @@ cl_int WINAPI wine_clEnqueueNativeKernel(cl_command_queue command_queue, return ret; } -cl_int WINAPI wine_clEnqueueMarker(cl_command_queue command_queue, cl_event * event) -{ - cl_int ret; - TRACE("\n"); - ret = clEnqueueMarker(command_queue, event); - return ret; -} - -cl_int WINAPI wine_clEnqueueWaitForEvents(cl_command_queue command_queue, cl_uint num_events, cl_event * event_list) -{ - cl_int ret; - TRACE("\n"); - ret = clEnqueueWaitForEvents(command_queue, num_events, event_list); - return ret; -} - -cl_int WINAPI wine_clEnqueueBarrier(cl_command_queue command_queue) -{ - cl_int ret; - TRACE("\n"); - ret = clEnqueueBarrier(command_queue); - return ret; -} - - -/*---------------------------------------------------------------*/ -/* Extension function access */ void * WINAPI wine_clGetExtensionFunctionAddress(const char * func_name) { @@ -837,66 +234,3 @@ void * WINAPI wine_clGetExtensionFunctionAddress(const char * func_name) TRACE("(%s)=%p\n",func_name, ret); return ret; } - - -#if OPENCL_WITH_GL -/*---------------------------------------------------------------*/ -/* Khronos-approved (KHR) OpenCL extensions which have OpenGL dependencies. */ - -cl_mem WINAPI wine_clCreateFromGLBuffer(cl_context context, cl_mem_flags flags, cl_GLuint bufobj, int * errcode_ret) -{ -} - -cl_mem WINAPI wine_clCreateFromGLTexture2D(cl_context context, cl_mem_flags flags, cl_GLenum target, - cl_GLint miplevel, cl_GLuint texture, cl_int * errcode_ret) -{ -} - -cl_mem WINAPI wine_clCreateFromGLTexture3D(cl_context context, cl_mem_flags flags, cl_GLenum target, - cl_GLint miplevel, cl_GLuint texture, cl_int * errcode_ret) -{ -} - -cl_mem WINAPI wine_clCreateFromGLRenderbuffer(cl_context context, cl_mem_flags flags, cl_GLuint renderbuffer, cl_int * errcode_ret) -{ -} - -cl_int WINAPI wine_clGetGLObjectInfo(cl_mem memobj, cl_gl_object_type * gl_object_type, cl_GLuint * gl_object_name) -{ -} - -cl_int WINAPI wine_clGetGLTextureInfo(cl_mem memobj, cl_gl_texture_info param_name, size_t param_value_size, - void * param_value, size_t * param_value_size_ret) -{ -} - -cl_int WINAPI wine_clEnqueueAcquireGLObjects(cl_command_queue command_queue, cl_uint num_objects, const cl_mem * mem_objects, - cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) -{ -} - -cl_int WINAPI wine_clEnqueueReleaseGLObjects(cl_command_queue command_queue, cl_uint num_objects, const cl_mem * mem_objects, - cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) -{ -} - - -/*---------------------------------------------------------------*/ -/* cl_khr_gl_sharing extension */ - -cl_int WINAPI wine_clGetGLContextInfoKHR(const cl_context_properties * properties, cl_gl_context_info param_name, - size_t param_value_size, void * param_value, size_t * param_value_size_ret) -{ -} - -#endif - - -#if 0 -/*---------------------------------------------------------------*/ -/* cl_khr_icd extension */ - -cl_int WINAPI wine_clIcdGetPlatformIDsKHR(cl_uint num_entries, cl_platform_id * platforms, cl_uint * num_platforms) -{ -} -#endif diff --git a/dlls/opencl/opencl.spec b/dlls/opencl/opencl.spec index ba8ce6e7cd5..34123885587 100644 --- a/dlls/opencl/opencl.spec +++ b/dlls/opencl/opencl.spec @@ -1,96 +1,66 @@ -# OpenCL 1.0 -@ stdcall clGetPlatformIDs( long ptr ptr ) wine_clGetPlatformIDs -@ stdcall clGetPlatformInfo( long long long ptr ptr ) wine_clGetPlatformInfo - -@ stdcall clGetDeviceIDs( long long long ptr ptr ) wine_clGetDeviceIDs -@ stdcall clGetDeviceInfo( long long long ptr ptr ) wine_clGetDeviceInfo - +@ stdcall clBuildProgram(ptr long ptr ptr ptr ptr) wine_clBuildProgram +@ stdcall clCreateBuffer(ptr int64 long ptr ptr) wine_clCreateBuffer +@ stdcall clCreateCommandQueue(ptr ptr int64 ptr) wine_clCreateCommandQueue @ stdcall clCreateContext(ptr long ptr ptr ptr ptr) wine_clCreateContext -@ stdcall clCreateContextFromType(ptr long ptr ptr ptr) wine_clCreateContextFromType -@ stdcall clRetainContext( long ) wine_clRetainContext -@ stdcall clReleaseContext( long ) wine_clReleaseContext -@ stdcall clGetContextInfo( long long long ptr ptr ) wine_clGetContextInfo - -@ stdcall clCreateCommandQueue( long long long ptr ) wine_clCreateCommandQueue -@ stdcall clRetainCommandQueue( long ) wine_clRetainCommandQueue -@ stdcall clReleaseCommandQueue( long ) wine_clReleaseCommandQueue -@ stdcall clGetCommandQueueInfo( long long long ptr ptr ) wine_clGetCommandQueueInfo -@ stdcall clSetCommandQueueProperty( long long long ptr ) wine_clSetCommandQueueProperty - -@ stdcall clCreateBuffer( long long long ptr ptr ) wine_clCreateBuffer -@ stdcall clCreateImage2D( long long ptr long long long ptr ptr ) wine_clCreateImage2D -@ stdcall clCreateImage3D( long long ptr long long long long long ptr ptr ) wine_clCreateImage3D -@ stdcall clRetainMemObject( long ) wine_clRetainMemObject -@ stdcall clReleaseMemObject( long ) wine_clReleaseMemObject -@ stdcall clGetSupportedImageFormats( long long long long ptr ptr ) wine_clGetSupportedImageFormats -@ stdcall clGetMemObjectInfo( long long long ptr ptr ) wine_clGetMemObjectInfo -@ stdcall clGetImageInfo( long long long ptr ptr ) wine_clGetImageInfo - -@ stdcall clCreateSampler( long long long long ptr ) wine_clCreateSampler -@ stdcall clRetainSampler( long ) wine_clRetainSampler -@ stdcall clReleaseSampler( long ) wine_clReleaseSampler -@ stdcall clGetSamplerInfo( long long long ptr ptr ) wine_clGetSamplerInfo - -@ stdcall clCreateProgramWithSource( long long ptr ptr ptr ) wine_clCreateProgramWithSource -@ stdcall clCreateProgramWithBinary( long long ptr ptr ptr ptr ptr ) wine_clCreateProgramWithBinary -@ stdcall clRetainProgram( long ) wine_clRetainProgram -@ stdcall clReleaseProgram( long ) wine_clReleaseProgram -@ stdcall clBuildProgram( long long ptr str ptr ptr ) wine_clBuildProgram +@ stdcall clCreateContextFromType(ptr int64 ptr ptr ptr) wine_clCreateContextFromType +@ stdcall clCreateImage2D(ptr int64 ptr long long long ptr ptr) wine_clCreateImage2D +@ stdcall clCreateImage3D(ptr int64 ptr long long long long long ptr ptr) wine_clCreateImage3D +@ stdcall clCreateKernel(ptr ptr ptr) wine_clCreateKernel +@ stdcall clCreateKernelsInProgram(ptr long ptr ptr) wine_clCreateKernelsInProgram +@ stdcall clCreateProgramWithBinary(ptr long ptr ptr ptr ptr ptr) wine_clCreateProgramWithBinary +@ stdcall clCreateProgramWithSource(ptr long ptr ptr ptr) wine_clCreateProgramWithSource +@ stdcall clCreateSampler(ptr long long long ptr) wine_clCreateSampler +@ stdcall clEnqueueBarrier(ptr) wine_clEnqueueBarrier +@ stdcall clEnqueueCopyBuffer(ptr ptr ptr long long long long ptr ptr) wine_clEnqueueCopyBuffer +@ stdcall clEnqueueCopyBufferToImage(ptr ptr ptr long ptr ptr long ptr ptr) wine_clEnqueueCopyBufferToImage +@ stdcall clEnqueueCopyImage(ptr ptr ptr ptr ptr ptr long ptr ptr) wine_clEnqueueCopyImage +@ stdcall clEnqueueCopyImageToBuffer(ptr ptr ptr ptr ptr long long ptr ptr) wine_clEnqueueCopyImageToBuffer +@ stdcall clEnqueueMapBuffer(ptr ptr long int64 long long long ptr ptr ptr) wine_clEnqueueMapBuffer +@ stdcall clEnqueueMapImage(ptr ptr long int64 ptr ptr ptr ptr long ptr ptr ptr) wine_clEnqueueMapImage +@ stdcall clEnqueueMarker(ptr ptr) wine_clEnqueueMarker +@ stdcall clEnqueueNDRangeKernel(ptr ptr long ptr ptr ptr long ptr ptr) wine_clEnqueueNDRangeKernel +@ stdcall clEnqueueNativeKernel(ptr ptr ptr long long ptr ptr long ptr ptr) wine_clEnqueueNativeKernel +@ stdcall clEnqueueReadBuffer(ptr ptr long long long ptr long ptr ptr) wine_clEnqueueReadBuffer +@ stdcall clEnqueueReadImage(ptr ptr long ptr ptr long long ptr long ptr ptr) wine_clEnqueueReadImage +@ stdcall clEnqueueTask(ptr ptr long ptr ptr) wine_clEnqueueTask +@ stdcall clEnqueueUnmapMemObject(ptr ptr ptr long ptr ptr) wine_clEnqueueUnmapMemObject +@ stdcall clEnqueueWaitForEvents(ptr long ptr) wine_clEnqueueWaitForEvents +@ stdcall clEnqueueWriteBuffer(ptr ptr long long long ptr long ptr ptr) wine_clEnqueueWriteBuffer +@ stdcall clEnqueueWriteImage(ptr ptr long ptr ptr long long ptr long ptr ptr) wine_clEnqueueWriteImage +@ stdcall clFinish(ptr) wine_clFinish +@ stdcall clFlush(ptr) wine_clFlush +@ stdcall clGetCommandQueueInfo(ptr long long ptr ptr) wine_clGetCommandQueueInfo +@ stdcall clGetContextInfo(ptr long long ptr ptr) wine_clGetContextInfo +@ stdcall clGetDeviceIDs(ptr int64 long ptr ptr) wine_clGetDeviceIDs +@ stdcall clGetDeviceInfo(ptr long long ptr ptr) wine_clGetDeviceInfo +@ stdcall clGetEventInfo(ptr long long ptr ptr) wine_clGetEventInfo +@ stdcall clGetEventProfilingInfo(ptr long long ptr ptr) wine_clGetEventProfilingInfo +@ stdcall clGetExtensionFunctionAddress(ptr) wine_clGetExtensionFunctionAddress +@ stdcall clGetImageInfo(ptr long long ptr ptr) wine_clGetImageInfo +@ stdcall clGetKernelInfo(ptr long long ptr ptr) wine_clGetKernelInfo +@ stdcall clGetKernelWorkGroupInfo(ptr ptr long long ptr ptr) wine_clGetKernelWorkGroupInfo +@ stdcall clGetMemObjectInfo(ptr long long ptr ptr) wine_clGetMemObjectInfo +@ stdcall clGetPlatformIDs(long ptr ptr) wine_clGetPlatformIDs +@ stdcall clGetPlatformInfo(ptr long long ptr ptr) wine_clGetPlatformInfo +@ stdcall clGetProgramBuildInfo(ptr ptr long long ptr ptr) wine_clGetProgramBuildInfo +@ stdcall clGetProgramInfo(ptr long long ptr ptr) wine_clGetProgramInfo +@ stdcall clGetSamplerInfo(ptr long long ptr ptr) wine_clGetSamplerInfo +@ stdcall clGetSupportedImageFormats(ptr int64 long long ptr ptr) wine_clGetSupportedImageFormats +@ stdcall clReleaseCommandQueue(ptr) wine_clReleaseCommandQueue +@ stdcall clReleaseContext(ptr) wine_clReleaseContext +@ stdcall clReleaseEvent(ptr) wine_clReleaseEvent +@ stdcall clReleaseKernel(ptr) wine_clReleaseKernel +@ stdcall clReleaseMemObject(ptr) wine_clReleaseMemObject +@ stdcall clReleaseProgram(ptr) wine_clReleaseProgram +@ stdcall clReleaseSampler(ptr) wine_clReleaseSampler +@ stdcall clRetainCommandQueue(ptr) wine_clRetainCommandQueue +@ stdcall clRetainContext(ptr) wine_clRetainContext +@ stdcall clRetainEvent(ptr) wine_clRetainEvent +@ stdcall clRetainKernel(ptr) wine_clRetainKernel +@ stdcall clRetainMemObject(ptr) wine_clRetainMemObject +@ stdcall clRetainProgram(ptr) wine_clRetainProgram +@ stdcall clRetainSampler(ptr) wine_clRetainSampler +@ stdcall clSetCommandQueueProperty(ptr int64 long ptr) wine_clSetCommandQueueProperty +@ stdcall clSetKernelArg(ptr long long ptr) wine_clSetKernelArg @ stdcall clUnloadCompiler() wine_clUnloadCompiler -@ stdcall clGetProgramInfo( long long long ptr ptr ) wine_clGetProgramInfo -@ stdcall clGetProgramBuildInfo( long long long long ptr ptr ) wine_clGetProgramBuildInfo - -@ stdcall clCreateKernel( long str ptr ) wine_clCreateKernel -@ stdcall clCreateKernelsInProgram( long long ptr ptr ) wine_clCreateKernelsInProgram -@ stdcall clRetainKernel( long ) wine_clRetainKernel -@ stdcall clReleaseKernel( long ) wine_clReleaseKernel -@ stdcall clSetKernelArg( long long long ptr ) wine_clSetKernelArg -@ stdcall clGetKernelInfo( long long long ptr ptr ) wine_clGetKernelInfo -@ stdcall clGetKernelWorkGroupInfo( long long long long ptr ptr ) wine_clGetKernelWorkGroupInfo - -@ stdcall clWaitForEvents( long ptr ) wine_clWaitForEvents -@ stdcall clGetEventInfo( long long long ptr ptr ) wine_clGetEventInfo -@ stdcall clReleaseEvent( long ) wine_clReleaseEvent -@ stdcall clRetainEvent( long ) wine_clRetainEvent - -@ stdcall clGetEventProfilingInfo( long long long ptr ptr ) wine_clGetEventProfilingInfo - -@ stdcall clFlush( long ) wine_clFlush -@ stdcall clFinish( long ) wine_clFinish - -@ stdcall clEnqueueReadBuffer( long long long long long ptr long ptr ptr ) wine_clEnqueueReadBuffer -@ stdcall clEnqueueWriteBuffer( long long long long long ptr long ptr ptr ) wine_clEnqueueWriteBuffer -@ stdcall clEnqueueCopyBuffer( long long long long long long long ptr ptr ) wine_clEnqueueCopyBuffer -@ stdcall clEnqueueReadImage( long long long ptr ptr long long ptr long ptr ptr ) wine_clEnqueueReadImage -@ stdcall clEnqueueWriteImage( long long long ptr ptr long long ptr long ptr ptr ) wine_clEnqueueWriteImage -@ stdcall clEnqueueCopyImage( long long long ptr ptr ptr long ptr ptr ) wine_clEnqueueCopyImage -@ stdcall clEnqueueCopyImageToBuffer( long long long ptr ptr long long ptr ptr ) wine_clEnqueueCopyImageToBuffer -@ stdcall clEnqueueCopyBufferToImage( long long long long ptr ptr long ptr ptr ) wine_clEnqueueCopyBufferToImage -@ stdcall clEnqueueMapBuffer( long long long long long long long ptr ptr ptr ) wine_clEnqueueMapBuffer -@ stdcall clEnqueueMapImage( long long long long ptr ptr ptr ptr long ptr ptr ptr ) wine_clEnqueueMapImage -@ stdcall clEnqueueUnmapMemObject( long long ptr long ptr ptr ) wine_clEnqueueUnmapMemObject -@ stdcall clEnqueueNDRangeKernel( long long long ptr ptr ptr long ptr ptr ) wine_clEnqueueNDRangeKernel -@ stdcall clEnqueueTask( long long long ptr ptr ) wine_clEnqueueTask -@ stdcall clEnqueueNativeKernel(long ptr ptr long long ptr ptr long ptr ptr) wine_clEnqueueNativeKernel -@ stdcall clEnqueueMarker( long ptr ) wine_clEnqueueMarker -@ stdcall clEnqueueWaitForEvents( long long ptr ) wine_clEnqueueWaitForEvents -@ stdcall clEnqueueBarrier( long ) wine_clEnqueueBarrier - -@ stdcall clGetExtensionFunctionAddress( str ) wine_clGetExtensionFunctionAddress - -@ stub clCreateFromGLBuffer -@ stub clCreateFromGLTexture2D -@ stub clCreateFromGLTexture3D -@ stub clCreateFromGLRenderbuffer -@ stub clGetGLObjectInfo -@ stub clGetGLTextureInfo -@ stub clEnqueueAcquireGLObjects -@ stub clEnqueueReleaseGLObjects -# @ stdcall clCreateFromGLBuffer( long long long ptr ) wine_clCreateFromGLBuffer -# @ stdcall clCreateFromGLTexture2D( long long long long long ptr ) wine_clCreateFromGLTexture2D -# @ stdcall clCreateFromGLTexture3D( long long long long long ptr ) wine_clCreateFromGLTexture3D -# @ stdcall clCreateFromGLRenderbuffer( long long long ptr ) wine_clCreateFromGLRenderbuffer -# @ stdcall clGetGLObjectInfo( long ptr ptr ) wine_clGetGLObjectInfo -# @ stdcall clGetGLTextureInfo( long long long ptr ptr ) wine_clGetGLTextureInfo -# @ stdcall clEnqueueAcquireGLObjects( long long ptr long ptr ptr ) wine_clEnqueueAcquireGLObjects -# @ stdcall clEnqueueReleaseGLObjects( long long ptr long ptr ptr ) wine_clEnqueueReleaseGLObjects +@ stdcall clWaitForEvents(long ptr) wine_clWaitForEvents diff --git a/dlls/opencl/opencl_private.h b/dlls/opencl/opencl_private.h new file mode 100644 index 00000000000..1859f756f70 --- /dev/null +++ b/dlls/opencl/opencl_private.h @@ -0,0 +1,41 @@ +/* + * Copyright 2021 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_OPENCL_PRIVATE_H +#define __WINE_OPENCL_PRIVATE_H + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +#define CL_SILENCE_DEPRECATION +#if defined(HAVE_CL_CL_H) +#define CL_USE_DEPRECATED_OPENCL_1_0_APIS +#define CL_USE_DEPRECATED_OPENCL_1_1_APIS +#define CL_USE_DEPRECATED_OPENCL_1_2_APIS +#define CL_USE_DEPRECATED_OPENCL_2_0_APIS +#define CL_TARGET_OPENCL_VERSION 220 +#include <CL/cl.h> +#elif defined(HAVE_OPENCL_OPENCL_H) +#include <OpenCL/opencl.h> +#endif + +#endif diff --git a/dlls/opencl/opencl_thunks.c b/dlls/opencl/opencl_thunks.c new file mode 100644 index 00000000000..e483e6b7f3e --- /dev/null +++ b/dlls/opencl/opencl_thunks.c @@ -0,0 +1,361 @@ +/* Automatically generated from OpenCL registry files; DO NOT EDIT! */ + +#include "config.h" +#include "opencl_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(opencl); + +cl_mem WINAPI wine_clCreateBuffer( cl_context context, cl_mem_flags flags, size_t size, void* host_ptr, cl_int* errcode_ret ) +{ + TRACE( "(%p, %s, %zu, %p, %p)\n", context, wine_dbgstr_longlong(flags), size, host_ptr, errcode_ret ); + return clCreateBuffer( context, flags, size, host_ptr, errcode_ret ); +} + +cl_command_queue WINAPI wine_clCreateCommandQueue( cl_context context, cl_device_id device, cl_command_queue_properties properties, cl_int* errcode_ret ) +{ + TRACE( "(%p, %p, %s, %p)\n", context, device, wine_dbgstr_longlong(properties), errcode_ret ); + return clCreateCommandQueue( context, device, properties, errcode_ret ); +} + +cl_mem WINAPI wine_clCreateImage2D( cl_context context, cl_mem_flags flags, const cl_image_format* image_format, size_t image_width, size_t image_height, size_t image_row_pitch, void* host_ptr, cl_int* errcode_ret ) +{ + TRACE( "(%p, %s, %p, %zu, %zu, %zu, %p, %p)\n", context, wine_dbgstr_longlong(flags), image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret ); + return clCreateImage2D( context, flags, image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret ); +} + +cl_mem WINAPI wine_clCreateImage3D( cl_context context, cl_mem_flags flags, const cl_image_format* image_format, size_t image_width, size_t image_height, size_t image_depth, size_t image_row_pitch, size_t image_slice_pitch, void* host_ptr, cl_int* errcode_ret ) +{ + TRACE( "(%p, %s, %p, %zu, %zu, %zu, %zu, %zu, %p, %p)\n", context, wine_dbgstr_longlong(flags), image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret ); + return clCreateImage3D( context, flags, image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret ); +} + +cl_kernel WINAPI wine_clCreateKernel( cl_program program, const char* kernel_name, cl_int* errcode_ret ) +{ + TRACE( "(%p, %p, %p)\n", program, kernel_name, errcode_ret ); + return clCreateKernel( program, kernel_name, errcode_ret ); +} + +cl_int WINAPI wine_clCreateKernelsInProgram( cl_program program, cl_uint num_kernels, cl_kernel* kernels, cl_uint* num_kernels_ret ) +{ + TRACE( "(%p, %u, %p, %p)\n", program, num_kernels, kernels, num_kernels_ret ); + return clCreateKernelsInProgram( program, num_kernels, kernels, num_kernels_ret ); +} + +cl_program WINAPI wine_clCreateProgramWithBinary( cl_context context, cl_uint num_devices, const cl_device_id* device_list, const size_t* lengths, const unsigned char** binaries, cl_int* binary_status, cl_int* errcode_ret ) +{ + TRACE( "(%p, %u, %p, %p, %p, %p, %p)\n", context, num_devices, device_list, lengths, binaries, binary_status, errcode_ret ); + return clCreateProgramWithBinary( context, num_devices, device_list, lengths, binaries, binary_status, errcode_ret ); +} + +cl_program WINAPI wine_clCreateProgramWithSource( cl_context context, cl_uint count, const char** strings, const size_t* lengths, cl_int* errcode_ret ) +{ + TRACE( "(%p, %u, %p, %p, %p)\n", context, count, strings, lengths, errcode_ret ); + return clCreateProgramWithSource( context, count, strings, lengths, errcode_ret ); +} + +cl_sampler WINAPI wine_clCreateSampler( cl_context context, cl_bool normalized_coords, cl_addressing_mode addressing_mode, cl_filter_mode filter_mode, cl_int* errcode_ret ) +{ + TRACE( "(%p, %u, %u, %u, %p)\n", context, normalized_coords, addressing_mode, filter_mode, errcode_ret ); + return clCreateSampler( context, normalized_coords, addressing_mode, filter_mode, errcode_ret ); +} + +cl_int WINAPI wine_clEnqueueBarrier( cl_command_queue command_queue ) +{ + TRACE( "(%p)\n", command_queue ); + return clEnqueueBarrier( command_queue ); +} + +cl_int WINAPI wine_clEnqueueCopyBuffer( cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, size_t src_offset, size_t dst_offset, size_t size, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event ) +{ + TRACE( "(%p, %p, %p, %zu, %zu, %zu, %u, %p, %p)\n", command_queue, src_buffer, dst_buffer, src_offset, dst_offset, size, num_events_in_wait_list, event_wait_list, event ); + return clEnqueueCopyBuffer( command_queue, src_buffer, dst_buffer, src_offset, dst_offset, size, num_events_in_wait_list, event_wait_list, event ); +} + +cl_int WINAPI wine_clEnqueueCopyBufferToImage( cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_image, size_t src_offset, const size_t* dst_origin, const size_t* region, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event ) +{ + TRACE( "(%p, %p, %p, %zu, %p, %p, %u, %p, %p)\n", command_queue, src_buffer, dst_image, src_offset, dst_origin, region, num_events_in_wait_list, event_wait_list, event ); + return clEnqueueCopyBufferToImage( command_queue, src_buffer, dst_image, src_offset, dst_origin, region, num_events_in_wait_list, event_wait_list, event ); +} + +cl_int WINAPI wine_clEnqueueCopyImage( cl_command_queue command_queue, cl_mem src_image, cl_mem dst_image, const size_t* src_origin, const size_t* dst_origin, const size_t* region, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event ) +{ + TRACE( "(%p, %p, %p, %p, %p, %p, %u, %p, %p)\n", command_queue, src_image, dst_image, src_origin, dst_origin, region, num_events_in_wait_list, event_wait_list, event ); + return clEnqueueCopyImage( command_queue, src_image, dst_image, src_origin, dst_origin, region, num_events_in_wait_list, event_wait_list, event ); +} + +cl_int WINAPI wine_clEnqueueCopyImageToBuffer( cl_command_queue command_queue, cl_mem src_image, cl_mem dst_buffer, const size_t* src_origin, const size_t* region, size_t dst_offset, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event ) +{ + TRACE( "(%p, %p, %p, %p, %p, %zu, %u, %p, %p)\n", command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event ); + return clEnqueueCopyImageToBuffer( command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event ); +} + +void* WINAPI wine_clEnqueueMapBuffer( cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_map, cl_map_flags map_flags, size_t offset, size_t size, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event, cl_int* errcode_ret ) +{ + TRACE( "(%p, %p, %u, %s, %zu, %zu, %u, %p, %p, %p)\n", command_queue, buffer, blocking_map, wine_dbgstr_longlong(map_flags), offset, size, num_events_in_wait_list, event_wait_list, event, errcode_ret ); + return clEnqueueMapBuffer( command_queue, buffer, blocking_map, map_flags, offset, size, num_events_in_wait_list, event_wait_list, event, errcode_ret ); +} + +void* WINAPI wine_clEnqueueMapImage( cl_command_queue command_queue, cl_mem image, cl_bool blocking_map, cl_map_flags map_flags, const size_t* origin, const size_t* region, size_t* image_row_pitch, size_t* image_slice_pitch, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event, cl_int* errcode_ret ) +{ + TRACE( "(%p, %p, %u, %s, %p, %p, %p, %p, %u, %p, %p, %p)\n", command_queue, image, blocking_map, wine_dbgstr_longlong(map_flags), origin, region, image_row_pitch, image_slice_pitch, num_events_in_wait_list, event_wait_list, event, errcode_ret ); + return clEnqueueMapImage( command_queue, image, blocking_map, map_flags, origin, region, image_row_pitch, image_slice_pitch, num_events_in_wait_list, event_wait_list, event, errcode_ret ); +} + +cl_int WINAPI wine_clEnqueueMarker( cl_command_queue command_queue, cl_event* event ) +{ + TRACE( "(%p, %p)\n", command_queue, event ); + return clEnqueueMarker( command_queue, event ); +} + +cl_int WINAPI wine_clEnqueueNDRangeKernel( cl_command_queue command_queue, cl_kernel kernel, cl_uint work_dim, const size_t* global_work_offset, const size_t* global_work_size, const size_t* local_work_size, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event ) +{ + TRACE( "(%p, %p, %u, %p, %p, %p, %u, %p, %p)\n", command_queue, kernel, work_dim, global_work_offset, global_work_size, local_work_size, num_events_in_wait_list, event_wait_list, event ); + return clEnqueueNDRangeKernel( command_queue, kernel, work_dim, global_work_offset, global_work_size, local_work_size, num_events_in_wait_list, event_wait_list, event ); +} + +cl_int WINAPI wine_clEnqueueReadBuffer( cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, size_t offset, size_t size, void* ptr, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event ) +{ + TRACE( "(%p, %p, %u, %zu, %zu, %p, %u, %p, %p)\n", command_queue, buffer, blocking_read, offset, size, ptr, num_events_in_wait_list, event_wait_list, event ); + return clEnqueueReadBuffer( command_queue, buffer, blocking_read, offset, size, ptr, num_events_in_wait_list, event_wait_list, event ); +} + +cl_int WINAPI wine_clEnqueueReadImage( cl_command_queue command_queue, cl_mem image, cl_bool blocking_read, const size_t* origin, const size_t* region, size_t row_pitch, size_t slice_pitch, void* ptr, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event ) +{ + TRACE( "(%p, %p, %u, %p, %p, %zu, %zu, %p, %u, %p, %p)\n", command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event ); + return clEnqueueReadImage( command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event ); +} + +cl_int WINAPI wine_clEnqueueTask( cl_command_queue command_queue, cl_kernel kernel, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event ) +{ + TRACE( "(%p, %p, %u, %p, %p)\n", command_queue, kernel, num_events_in_wait_list, event_wait_list, event ); + return clEnqueueTask( command_queue, kernel, num_events_in_wait_list, event_wait_list, event ); +} + +cl_int WINAPI wine_clEnqueueUnmapMemObject( cl_command_queue command_queue, cl_mem memobj, void* mapped_ptr, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event ) +{ + TRACE( "(%p, %p, %p, %u, %p, %p)\n", command_queue, memobj, mapped_ptr, num_events_in_wait_list, event_wait_list, event ); + return clEnqueueUnmapMemObject( command_queue, memobj, mapped_ptr, num_events_in_wait_list, event_wait_list, event ); +} + +cl_int WINAPI wine_clEnqueueWaitForEvents( cl_command_queue command_queue, cl_uint num_events, const cl_event* event_list ) +{ + TRACE( "(%p, %u, %p)\n", command_queue, num_events, event_list ); + return clEnqueueWaitForEvents( command_queue, num_events, event_list ); +} + +cl_int WINAPI wine_clEnqueueWriteBuffer( cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, size_t offset, size_t size, const void* ptr, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event ) +{ + TRACE( "(%p, %p, %u, %zu, %zu, %p, %u, %p, %p)\n", command_queue, buffer, blocking_write, offset, size, ptr, num_events_in_wait_list, event_wait_list, event ); + return clEnqueueWriteBuffer( command_queue, buffer, blocking_write, offset, size, ptr, num_events_in_wait_list, event_wait_list, event ); +} + +cl_int WINAPI wine_clEnqueueWriteImage( cl_command_queue command_queue, cl_mem image, cl_bool blocking_write, const size_t* origin, const size_t* region, size_t input_row_pitch, size_t input_slice_pitch, const void* ptr, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event ) +{ + TRACE( "(%p, %p, %u, %p, %p, %zu, %zu, %p, %u, %p, %p)\n", command_queue, image, blocking_write, origin, region, input_row_pitch, input_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event ); + return clEnqueueWriteImage( command_queue, image, blocking_write, origin, region, input_row_pitch, input_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event ); +} + +cl_int WINAPI wine_clFinish( cl_command_queue command_queue ) +{ + TRACE( "(%p)\n", command_queue ); + return clFinish( command_queue ); +} + +cl_int WINAPI wine_clFlush( cl_command_queue command_queue ) +{ + TRACE( "(%p)\n", command_queue ); + return clFlush( command_queue ); +} + +cl_int WINAPI wine_clGetCommandQueueInfo( cl_command_queue command_queue, cl_command_queue_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ) +{ + TRACE( "(%p, %u, %zu, %p, %p)\n", command_queue, param_name, param_value_size, param_value, param_value_size_ret ); + return clGetCommandQueueInfo( command_queue, param_name, param_value_size, param_value, param_value_size_ret ); +} + +cl_int WINAPI wine_clGetContextInfo( cl_context context, cl_context_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ) +{ + TRACE( "(%p, %u, %zu, %p, %p)\n", context, param_name, param_value_size, param_value, param_value_size_ret ); + return clGetContextInfo( context, param_name, param_value_size, param_value, param_value_size_ret ); +} + +cl_int WINAPI wine_clGetDeviceIDs( cl_platform_id platform, cl_device_type device_type, cl_uint num_entries, cl_device_id* devices, cl_uint* num_devices ) +{ + TRACE( "(%p, %s, %u, %p, %p)\n", platform, wine_dbgstr_longlong(device_type), num_entries, devices, num_devices ); + return clGetDeviceIDs( platform, device_type, num_entries, devices, num_devices ); +} + +cl_int WINAPI wine_clGetEventInfo( cl_event event, cl_event_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ) +{ + TRACE( "(%p, %u, %zu, %p, %p)\n", event, param_name, param_value_size, param_value, param_value_size_ret ); + return clGetEventInfo( event, param_name, param_value_size, param_value, param_value_size_ret ); +} + +cl_int WINAPI wine_clGetEventProfilingInfo( cl_event event, cl_profiling_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ) +{ + TRACE( "(%p, %u, %zu, %p, %p)\n", event, param_name, param_value_size, param_value, param_value_size_ret ); + return clGetEventProfilingInfo( event, param_name, param_value_size, param_value, param_value_size_ret ); +} + +cl_int WINAPI wine_clGetImageInfo( cl_mem image, cl_image_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ) +{ + TRACE( "(%p, %u, %zu, %p, %p)\n", image, param_name, param_value_size, param_value, param_value_size_ret ); + return clGetImageInfo( image, param_name, param_value_size, param_value, param_value_size_ret ); +} + +cl_int WINAPI wine_clGetKernelInfo( cl_kernel kernel, cl_kernel_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ) +{ + TRACE( "(%p, %u, %zu, %p, %p)\n", kernel, param_name, param_value_size, param_value, param_value_size_ret ); + return clGetKernelInfo( kernel, param_name, param_value_size, param_value, param_value_size_ret ); +} + +cl_int WINAPI wine_clGetKernelWorkGroupInfo( cl_kernel kernel, cl_device_id device, cl_kernel_work_group_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ) +{ + TRACE( "(%p, %p, %u, %zu, %p, %p)\n", kernel, device, param_name, param_value_size, param_value, param_value_size_ret ); + return clGetKernelWorkGroupInfo( kernel, device, param_name, param_value_size, param_value, param_value_size_ret ); +} + +cl_int WINAPI wine_clGetMemObjectInfo( cl_mem memobj, cl_mem_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ) +{ + TRACE( "(%p, %u, %zu, %p, %p)\n", memobj, param_name, param_value_size, param_value, param_value_size_ret ); + return clGetMemObjectInfo( memobj, param_name, param_value_size, param_value, param_value_size_ret ); +} + +cl_int WINAPI wine_clGetPlatformIDs( cl_uint num_entries, cl_platform_id* platforms, cl_uint* num_platforms ) +{ + TRACE( "(%u, %p, %p)\n", num_entries, platforms, num_platforms ); + return clGetPlatformIDs( num_entries, platforms, num_platforms ); +} + +cl_int WINAPI wine_clGetProgramBuildInfo( cl_program program, cl_device_id device, cl_program_build_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ) +{ + TRACE( "(%p, %p, %u, %zu, %p, %p)\n", program, device, param_name, param_value_size, param_value, param_value_size_ret ); + return clGetProgramBuildInfo( program, device, param_name, param_value_size, param_value, param_value_size_ret ); +} + +cl_int WINAPI wine_clGetProgramInfo( cl_program program, cl_program_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ) +{ + TRACE( "(%p, %u, %zu, %p, %p)\n", program, param_name, param_value_size, param_value, param_value_size_ret ); + return clGetProgramInfo( program, param_name, param_value_size, param_value, param_value_size_ret ); +} + +cl_int WINAPI wine_clGetSamplerInfo( cl_sampler sampler, cl_sampler_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ) +{ + TRACE( "(%p, %u, %zu, %p, %p)\n", sampler, param_name, param_value_size, param_value, param_value_size_ret ); + return clGetSamplerInfo( sampler, param_name, param_value_size, param_value, param_value_size_ret ); +} + +cl_int WINAPI wine_clGetSupportedImageFormats( cl_context context, cl_mem_flags flags, cl_mem_object_type image_type, cl_uint num_entries, cl_image_format* image_formats, cl_uint* num_image_formats ) +{ + TRACE( "(%p, %s, %u, %u, %p, %p)\n", context, wine_dbgstr_longlong(flags), image_type, num_entries, image_formats, num_image_formats ); + return clGetSupportedImageFormats( context, flags, image_type, num_entries, image_formats, num_image_formats ); +} + +cl_int WINAPI wine_clReleaseCommandQueue( cl_command_queue command_queue ) +{ + TRACE( "(%p)\n", command_queue ); + return clReleaseCommandQueue( command_queue ); +} + +cl_int WINAPI wine_clReleaseContext( cl_context context ) +{ + TRACE( "(%p)\n", context ); + return clReleaseContext( context ); +} + +cl_int WINAPI wine_clReleaseEvent( cl_event event ) +{ + TRACE( "(%p)\n", event ); + return clReleaseEvent( event ); +} + +cl_int WINAPI wine_clReleaseKernel( cl_kernel kernel ) +{ + TRACE( "(%p)\n", kernel ); + return clReleaseKernel( kernel ); +} + +cl_int WINAPI wine_clReleaseMemObject( cl_mem memobj ) +{ + TRACE( "(%p)\n", memobj ); + return clReleaseMemObject( memobj ); +} + +cl_int WINAPI wine_clReleaseProgram( cl_program program ) +{ + TRACE( "(%p)\n", program ); + return clReleaseProgram( program ); +} + +cl_int WINAPI wine_clReleaseSampler( cl_sampler sampler ) +{ + TRACE( "(%p)\n", sampler ); + return clReleaseSampler( sampler ); +} + +cl_int WINAPI wine_clRetainCommandQueue( cl_command_queue command_queue ) +{ + TRACE( "(%p)\n", command_queue ); + return clRetainCommandQueue( command_queue ); +} + +cl_int WINAPI wine_clRetainContext( cl_context context ) +{ + TRACE( "(%p)\n", context ); + return clRetainContext( context ); +} + +cl_int WINAPI wine_clRetainEvent( cl_event event ) +{ + TRACE( "(%p)\n", event ); + return clRetainEvent( event ); +} + +cl_int WINAPI wine_clRetainKernel( cl_kernel kernel ) +{ + TRACE( "(%p)\n", kernel ); + return clRetainKernel( kernel ); +} + +cl_int WINAPI wine_clRetainMemObject( cl_mem memobj ) +{ + TRACE( "(%p)\n", memobj ); + return clRetainMemObject( memobj ); +} + +cl_int WINAPI wine_clRetainProgram( cl_program program ) +{ + TRACE( "(%p)\n", program ); + return clRetainProgram( program ); +} + +cl_int WINAPI wine_clRetainSampler( cl_sampler sampler ) +{ + TRACE( "(%p)\n", sampler ); + return clRetainSampler( sampler ); +} + +cl_int WINAPI wine_clSetCommandQueueProperty( cl_command_queue command_queue, cl_command_queue_properties properties, cl_bool enable, cl_command_queue_properties* old_properties ) +{ + TRACE( "(%p, %s, %u, %p)\n", command_queue, wine_dbgstr_longlong(properties), enable, old_properties ); + return clSetCommandQueueProperty( command_queue, properties, enable, old_properties ); +} + +cl_int WINAPI wine_clSetKernelArg( cl_kernel kernel, cl_uint arg_index, size_t arg_size, const void* arg_value ) +{ + TRACE( "(%p, %u, %zu, %p)\n", kernel, arg_index, arg_size, arg_value ); + return clSetKernelArg( kernel, arg_index, arg_size, arg_value ); +} + +cl_int WINAPI wine_clUnloadCompiler( void ) +{ + TRACE( "()\n" ); + return clUnloadCompiler(); +} + +cl_int WINAPI wine_clWaitForEvents( cl_uint num_events, const cl_event* event_list ) +{ + TRACE( "(%u, %p)\n", num_events, event_list ); + return clWaitForEvents( num_events, event_list ); +} + -- 2.20.1

1 0

[PATCH] winedbg: Don't dereference possibly NULL thread pointer.
by Rémi Bernon March 9, 2021

March 9, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- programs/winedbg/gdbproxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 41aee55656b..bf96482042a 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -115,11 +115,11 @@ struct gdb_context static void gdbctx_delete_xpoint(struct gdb_context *gdbctx, struct dbg_thread *thread, dbg_ctx_t *ctx, struct gdb_xpoint *x) { - struct dbg_process *process = thread->process; + struct dbg_process *process = gdbctx->process; struct backend_cpu *cpu = process->be_cpu; if (!cpu->remove_Xpoint(process->handle, process->process_io, ctx, x->type, x->addr, x->value, x->size)) - ERR("%04x:%04x: Couldn't remove breakpoint at:%p/%x type:%d\n", process->pid, thread->tid, x->addr, x->size, x->type); + ERR("%04x:%04x: Couldn't remove breakpoint at:%p/%x type:%d\n", process->pid, thread ? thread->tid : ~0, x->addr, x->size, x->type); list_remove(&x->entry); HeapFree(GetProcessHeap(), 0, x); -- 2.30.0

2 2

[PATCH 1/4] strmbase: Do not pretend to drop samples.
by Zebediah Figura March 9, 2021

March 9, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/renderer.c | 38 +++----------------------------------- include/wine/strmbase.h | 3 +-- 2 files changed, 4 insertions(+), 37 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index ec915a95ef8..ed815097a0f 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -59,39 +59,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); static void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME tStart) { - This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; + This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; - This->is_dropped = FALSE; -} - -static BOOL QualityControlRender_IsLate(struct strmbase_qc *This, REFERENCE_TIME jitter, - REFERENCE_TIME start, REFERENCE_TIME stop) -{ - REFERENCE_TIME max_lateness = 200000; - - TRACE("jitter %s, start %s, stop %s.\n", debugstr_time(jitter), - debugstr_time(start), debugstr_time(stop)); - - /* we can add a valid stop time */ - if (stop >= start) - max_lateness += stop; - else - max_lateness += start; - - /* if the jitter bigger than duration and lateness we are too late */ - if (start + jitter > max_lateness) { - WARN("buffer is too late %i > %i\n", (int)((start + jitter)/10000), (int)(max_lateness/10000)); - /* !!emergency!!, if we did not receive anything valid for more than a - * second, render it anyway so the user sees something */ - if (This->last_in_time < 0 || - start - This->last_in_time < 10000000) - return TRUE; - FIXME("A lot of buffers are being dropped.\n"); - FIXME("There may be a timestamping problem, or this computer is too slow.\n"); - } - This->last_in_time = start; - return FALSE; } static void QualityControlRender_DoQOS(struct strmbase_qc *priv) @@ -170,7 +140,7 @@ static void QualityControlRender_DoQOS(struct strmbase_qc *priv) if (priv->last_left >= 0) { - if (priv->is_dropped || priv->avg_rate < 0.0) + if (priv->avg_rate < 0.0) { priv->avg_rate = rate; } @@ -231,9 +201,7 @@ static void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE This->current_jitter = 0; } - /* FIXME: This isn't correct; we don't drop samples, nor should. */ - This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); - TRACE("dropped %d, start %s, stop %s, jitter %s.\n", This->is_dropped, + TRACE("start %s, stop %s, jitter %s.\n", debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9df0437dd9a..c45e2a4513e 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -279,10 +279,9 @@ struct strmbase_qc IQualityControl *tonotify; /* Render stuff */ - REFERENCE_TIME last_in_time, last_left, avg_duration, avg_pt; + REFERENCE_TIME last_left, avg_duration, avg_pt; REFERENCE_TIME current_jitter, current_rstart, current_rstop, clockstart; double avg_rate; - BOOL is_dropped; }; struct strmbase_renderer -- 2.20.1

1 3