February 2018 - Wine-commits

Michael Stefaniuc : riched20: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: f9016830a67ec9258a48b17d83e55d99c8068a99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9016830a67ec9258a48b17d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 23:59:45 2018 +0100 riched20: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 15 --------------- dlls/riched20/editstr.h | 1 + 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index aba3026..7d4a8ef 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -25,21 +25,6 @@ struct _RTF_Info; extern HANDLE me_heap DECLSPEC_HIDDEN; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( me_heap, 0, len ); -} - -static inline BOOL heap_free( void *ptr ) -{ - return HeapFree( me_heap, 0, ptr ); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc( void *ptr, size_t len ) -{ - return HeapReAlloc( me_heap, 0, ptr, len ); -} - #define ALLOC_OBJ(type) heap_alloc(sizeof(type)) #define ALLOC_N_OBJ(type, count) heap_alloc((count)*sizeof(type)) #define FREE_OBJ(ptr) heap_free(ptr) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 2bf680e..a37c4de 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -48,6 +48,7 @@ #include "usp10.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #ifdef __i386__

1 0

Michael Stefaniuc : riched20: Get rid of the FREE_OBJ() macro.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 7153b5593e9a4f7c35950672610f951df2c3753f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7153b5593e9a4f7c35950672… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 23:59:46 2018 +0100 riched20: Get rid of the FREE_OBJ() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 13 ++++++------- dlls/riched20/editor.h | 1 - dlls/riched20/list.c | 2 +- dlls/riched20/richole.c | 2 +- dlls/riched20/style.c | 2 +- dlls/riched20/writer.c | 7 +++---- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index daafe80..da7d62b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2147,7 +2147,7 @@ static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, nChars = ME_GetTextW(editor, p, nLen, start, nLen, FALSE, FALSE); WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, nLen+1, NULL, NULL); - FREE_OBJ(p); + heap_free(p); return nChars; } } @@ -3160,10 +3160,9 @@ void ME_DestroyEditor(ME_TextEditor *editor) } OleUninitialize(); - FREE_OBJ(editor->pBuffer); - FREE_OBJ(editor->pCursors); - - FREE_OBJ(editor); + heap_free(editor->pBuffer); + heap_free(editor->pCursors); + heap_free(editor); } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -4305,7 +4304,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, tmp, nChars); r = ME_FindText(editor, wParam, &ft->chrg, tmp, NULL); - FREE_OBJ( tmp ); + heap_free(tmp); }else{ FINDTEXTW *ft = (FINDTEXTW *)lParam; r = ME_FindText(editor, wParam, &ft->chrg, ft->lpstrText, NULL); @@ -4323,7 +4322,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, tmp, nChars); r = ME_FindText(editor, wParam, &ex->chrg, tmp, &ex->chrgText); - FREE_OBJ( tmp ); + heap_free(tmp); }else{ FINDTEXTEXW *ex = (FINDTEXTEXW *)lParam; r = ME_FindText(editor, wParam, &ex->chrg, ex->lpstrText, &ex->chrgText); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7d4a8ef..55e259a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -27,7 +27,6 @@ extern HANDLE me_heap DECLSPEC_HIDDEN; #define ALLOC_OBJ(type) heap_alloc(sizeof(type)) #define ALLOC_N_OBJ(type, count) heap_alloc((count)*sizeof(type)) -#define FREE_OBJ(ptr) heap_free(ptr) #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ && (run)->style->fmt.dwEffects & CFE_HIDDEN) diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index d321446..7cb9927 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -174,7 +174,7 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) heap_free( item->member.run.clusters ); ME_ReleaseStyle(item->member.run.style); } - FREE_OBJ(item); + heap_free(item); } ME_DisplayItem *ME_MakeDI(ME_DIType type) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 120bcf8..3033157 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5383,7 +5383,7 @@ void ME_DeleteReObject(REOBJECT* reo) if (reo->poleobj) IOleObject_Release(reo->poleobj); if (reo->pstg) IStorage_Release(reo->pstg); if (reo->polesite) IOleClientSite_Release(reo->polesite); - FREE_OBJ(reo); + heap_free(reo); } void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 4f08b3b..5462580 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -425,7 +425,7 @@ void ME_DestroyStyle(ME_Style *s) s->font_cache = NULL; } ScriptFreeCache( &s->script_cache ); - FREE_OBJ(s); + heap_free(s); } void ME_AddRefStyle(ME_Style *s) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 5494afe..de0bb8d 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -101,7 +101,7 @@ ME_StreamOutFree(ME_OutStream *pStream) LONG written = pStream->written; TRACE("total length = %u\n", written); - FREE_OBJ(pStream); + heap_free(pStream); return written; } @@ -1148,8 +1148,7 @@ static BOOL ME_StreamOutText(ME_TextEditor *editor, ME_OutStream *pStream, nSize = WideCharToMultiByte(nCodePage, 0, get_text( &cursor.pRun->member.run, cursor.nOffset ), nLen, NULL, 0, NULL, NULL); if (nSize > nBufLen) { - FREE_OBJ(buffer); - buffer = ALLOC_N_OBJ(char, nSize); + buffer = heap_realloc(buffer, nSize); nBufLen = nSize; } WideCharToMultiByte(nCodePage, 0, get_text( &cursor.pRun->member.run, cursor.nOffset ), @@ -1163,7 +1162,7 @@ static BOOL ME_StreamOutText(ME_TextEditor *editor, ME_OutStream *pStream, cursor.pRun = ME_FindItemFwd(cursor.pRun, diRun); } - FREE_OBJ(buffer); + heap_free(buffer); return success; }

1 0

Michael Stefaniuc : riched20: Get rid of the ALLOC_OBJ macro.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 965dc38175fdeef4a674b17977c5ad77d2e9d660 URL: https://source.winehq.org/git/wine.git/?a=commit;h=965dc38175fdeef4a674b179… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 23:59:47 2018 +0100 riched20: Get rid of the ALLOC_OBJ macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 14 ++++---------- dlls/riched20/editor.h | 1 - dlls/riched20/list.c | 4 ++-- dlls/riched20/style.c | 2 +- dlls/riched20/table.c | 4 ++-- dlls/riched20/writer.c | 8 ++------ 7 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 8a99394..d676a1b 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -484,7 +484,7 @@ void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCur di = ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, MERF_GRAPHICS); - di->member.run.ole_obj = ALLOC_OBJ(*reo); + di->member.run.ole_obj = heap_alloc(sizeof(*reo)); ME_CopyReObject(di->member.run.ole_obj, reo); ME_ReleaseStyle(pStyle); } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index da7d62b..53d0950 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -261,9 +261,7 @@ static inline BOOL is_version_nt(void) } static ME_TextBuffer *ME_MakeText(void) { - - ME_TextBuffer *buf = ALLOC_OBJ(ME_TextBuffer); - + ME_TextBuffer *buf = heap_alloc(sizeof(*buf)); ME_DisplayItem *p1 = ME_MakeDI(diTextStart); ME_DisplayItem *p2 = ME_MakeDI(diTextEnd); @@ -606,8 +604,7 @@ void ME_RTFParAttrHook(RTF_Info *info) if (!info->editor->bEmulateVersion10) /* v4.1 */ { while (info->rtfParam > info->nestingLevel) { - RTFTable *tableDef = ALLOC_OBJ(RTFTable); - ZeroMemory(tableDef, sizeof(RTFTable)); + RTFTable *tableDef = heap_alloc_zero(sizeof(*tableDef)); tableDef->parent = info->tableDef; info->tableDef = tableDef; @@ -641,10 +638,7 @@ void ME_RTFParAttrHook(RTF_Info *info) { RTFTable *tableDef; if (!info->tableDef) - { - info->tableDef = ALLOC_OBJ(RTFTable); - ZeroMemory(info->tableDef, sizeof(RTFTable)); - } + info->tableDef = heap_alloc_zero(sizeof(*info->tableDef)); tableDef = info->tableDef; RTFFlushOutputBuffer(info); if (tableDef->tableRowStart && @@ -2993,7 +2987,7 @@ static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) { - ME_TextEditor *ed = ALLOC_OBJ(ME_TextEditor); + ME_TextEditor *ed = heap_alloc(sizeof(*ed)); int i; DWORD props; LONG selbarwidth; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 55e259a..6215068 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -25,7 +25,6 @@ struct _RTF_Info; extern HANDLE me_heap DECLSPEC_HIDDEN; -#define ALLOC_OBJ(type) heap_alloc(sizeof(type)) #define ALLOC_N_OBJ(type, count) heap_alloc((count)*sizeof(type)) #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 7cb9927..58b64e8 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -179,8 +179,8 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) ME_DisplayItem *ME_MakeDI(ME_DIType type) { - ME_DisplayItem *item = ALLOC_OBJ(ME_DisplayItem); - ZeroMemory(item, sizeof(ME_DisplayItem)); + ME_DisplayItem *item = heap_alloc_zero(sizeof(*item)); + item->type = type; item->prev = item->next = NULL; return item; diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 5462580..48d57e8 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -113,7 +113,7 @@ void ME_CopyToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) ME_Style *ME_MakeStyle(CHARFORMAT2W *style) { - ME_Style *s = ALLOC_OBJ(ME_Style); + ME_Style *s = heap_alloc(sizeof(*s)); assert(style->cbSize == sizeof(CHARFORMAT2W)); s->fmt = *style; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index d2cab9a..4cd77eb 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -637,8 +637,8 @@ void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) { - RTFTable *tableDef = ALLOC_OBJ(RTFTable); - ZeroMemory(tableDef, sizeof(RTFTable)); + RTFTable *tableDef = heap_alloc_zero(sizeof(*tableDef)); + if (!editor->bEmulateVersion10) /* v4.1 */ tableDef->gapH = 10; return tableDef; diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index de0bb8d..aad2e44 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -57,15 +57,11 @@ ME_StreamOutRTFText(ME_OutStream *pStream, const WCHAR *text, LONG nChars); static ME_OutStream* ME_StreamOutInit(ME_TextEditor *editor, EDITSTREAM *stream) { - ME_OutStream *pStream = ALLOC_OBJ(ME_OutStream); + ME_OutStream *pStream = heap_alloc_zero(sizeof(*pStream)); + pStream->stream = stream; pStream->stream->dwError = 0; - pStream->pos = 0; - pStream->written = 0; - pStream->nFontTblLen = 0; pStream->nColorTblLen = 1; - pStream->nNestingLevel = 0; - memset(&pStream->cur_fmt, 0, sizeof(pStream->cur_fmt)); pStream->cur_fmt.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; pStream->cur_fmt.bUnderlineType = CFU_UNDERLINE; return pStream;

1 0

Michael Stefaniuc : riched20: Get rid of the ALLOC_N_OBJ macro.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: c03b41c8960335dbe4dfefb1118da872328c5b57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c03b41c8960335dbe4dfefb1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 23:59:48 2018 +0100 riched20: Get rid of the ALLOC_N_OBJ macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 8 ++++---- dlls/riched20/editor.h | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 53d0950..c442512 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2136,7 +2136,7 @@ static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, return ME_GetTextW(editor, strText, INT_MAX, start, nLen, FALSE, FALSE); } else { int nChars; - WCHAR *p = ALLOC_N_OBJ(WCHAR, nLen+1); + WCHAR *p = heap_alloc((nLen+1) * sizeof(*p)); if (!p) return 0; nChars = ME_GetTextW(editor, p, nLen, start, nLen, FALSE, FALSE); WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, @@ -3021,7 +3021,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) * or paragraph selection. */ ed->nCursors = 4; - ed->pCursors = ALLOC_N_OBJ(ME_Cursor, ed->nCursors); + ed->pCursors = heap_alloc(ed->nCursors * sizeof(*ed->pCursors)); ME_SetCursorToStart(ed, &ed->pCursors[0]); ed->pCursors[1] = ed->pCursors[0]; ed->pCursors[2] = ed->pCursors[0]; @@ -4295,7 +4295,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int nChars = MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, NULL, 0); WCHAR *tmp; - if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) + if ((tmp = heap_alloc(nChars * sizeof(*tmp))) != NULL) MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, tmp, nChars); r = ME_FindText(editor, wParam, &ft->chrg, tmp, NULL); heap_free(tmp); @@ -4313,7 +4313,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int nChars = MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, NULL, 0); WCHAR *tmp; - if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) + if ((tmp = heap_alloc(nChars * sizeof(*tmp))) != NULL) MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, tmp, nChars); r = ME_FindText(editor, wParam, &ex->chrg, tmp, &ex->chrgText); heap_free(tmp); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6215068..0db5326 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -25,8 +25,6 @@ struct _RTF_Info; extern HANDLE me_heap DECLSPEC_HIDDEN; -#define ALLOC_N_OBJ(type, count) heap_alloc((count)*sizeof(type)) - #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ && (run)->style->fmt.dwEffects & CFE_HIDDEN)

1 0

Dmitry Timoshkov : kerberos: Calling InitializeSecurityContext without a token buffer is not an error.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: b8f0649851f5ed59b7a333f0e915be1b786fc5c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f0649851f5ed59b7a333f0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 5 12:49:16 2018 +0800 kerberos: Calling InitializeSecurityContext without a token buffer is not an error. This patch makes Kerberos Authentication Tester work with https and dotnet40. Apparently that's a dotnet40 quirk that it passes not NULL input buffers but doesn't mark any of buffers as a token, dotnet20 passes NULL input. Note, that in order to make version 2.0 applications work (Kerberos Authentication Tester is such an application) with dotnet40+ one needs to add to the registry key [Software\\Microsoft\\.NETFramework] "OnlyUseLatestCLR"=dword:00000001 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 8b5b612..1bba926 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -913,9 +913,13 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, if (!input) input_token.length = 0; else { - if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - input_token.length = input->pBuffers[idx].cbBuffer; - input_token.value = input->pBuffers[idx].pvBuffer; + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) + input_token.length = 0; + else + { + input_token.length = input->pBuffers[idx].cbBuffer; + input_token.value = input->pBuffers[idx].pvBuffer; + } } if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN;

1 0

Alexandre Julliard : user32/tests: Fix pointer conversion warnings.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 2d0704f73a7cd1952b684b5920b2a34a71396ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d0704f73a7cd1952b684b59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 11:50:32 2018 +0100 user32/tests: Fix pointer conversion warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 19f220d..6b2b2bc 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1247,7 +1247,7 @@ enum defdlgproc_text static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { - int mode = (int)GetPropA(hdlg, "test_mode"); + int mode = HandleToULong(GetPropA(hdlg, "test_mode")); WCHAR *text = (WCHAR *)lparam; char *textA = (char *)lparam; @@ -1290,7 +1290,7 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { - int mode = (int)GetPropA(hdlg, "test_mode"); + int mode = HandleToULong(GetPropA(hdlg, "test_mode")); WCHAR *text = (WCHAR *)lparam; char *textA = (char *)lparam; @@ -1329,18 +1329,18 @@ static void dlg_test_aw_message(HWND hdlg, UINT msg) { LRESULT ret; - SetPropA(hdlg, "test_mode", DLGPROCTEXT_CONTEXT); + SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_CONTEXT)); ret = SendMessageA(hdlg, msg, 0, (LPARAM)"WndText"); ok(ret == 0, "Unexpected retval %ld.\n", ret); ret = SendMessageW(hdlg, msg, 0, (LPARAM)testtextW); ok(ret == 0, "Unexpected retval %ld.\n", ret); - SetPropA(hdlg, "test_mode", (void *)DLGPROCTEXT_A); + SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_A)); ret = DefDlgProcA(hdlg, msg, 0, (LPARAM)"WndText"); ok(ret == 0, "Unexpected retval %ld.\n", ret); - SetPropA(hdlg, "test_mode", (void *)DLGPROCTEXT_W); + SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_W)); ret = DefDlgProcW(hdlg, msg, 0, (LPARAM)testtextW); ok(ret == 0, "Unexpected retval %ld.\n", ret); }

1 0

Józef Kucia : wined3d: Add ARB_texture_multisample extension.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 416f8d2e864e96152b470d9bf6b0bc40d13fd1f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=416f8d2e864e96152b470d9b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 5 13:13:36 2018 +0100 wined3d: Add ARB_texture_multisample extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1586bdc..4a69b28 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -184,6 +184,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_gather", ARB_TEXTURE_GATHER }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, {"GL_ARB_texture_mirror_clamp_to_edge", ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE}, + {"GL_ARB_texture_multisample", ARB_TEXTURE_MULTISAMPLE }, {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO }, {"GL_ARB_texture_query_levels", ARB_TEXTURE_QUERY_LEVELS }, {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, @@ -2888,6 +2889,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glCompressedTexSubImage2DARB) USE_GL_FUNC(glCompressedTexSubImage3DARB) USE_GL_FUNC(glGetCompressedTexImageARB) + /* GL_ARB_texture_multisample */ + USE_GL_FUNC(glGetMultisamplefv); + USE_GL_FUNC(glSampleMaski); + USE_GL_FUNC(glTexImage2DMultisample); + USE_GL_FUNC(glTexImage3DMultisample); /* GL_ARB_texture_storage */ USE_GL_FUNC(glTexStorage1D) USE_GL_FUNC(glTexStorage2D) @@ -3868,6 +3874,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)}, {ARB_SEAMLESS_CUBE_MAP, MAKEDWORD_VERSION(3, 2)}, {ARB_SYNC, MAKEDWORD_VERSION(3, 2)}, + {ARB_TEXTURE_MULTISAMPLE, MAKEDWORD_VERSION(3, 2)}, {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, {ARB_BLEND_FUNC_EXTENDED, MAKEDWORD_VERSION(3, 3)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0894c94..1bbdaa2 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -117,6 +117,7 @@ enum wined3d_gl_extension ARB_TEXTURE_GATHER, ARB_TEXTURE_MIRRORED_REPEAT, ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, + ARB_TEXTURE_MULTISAMPLE, ARB_TEXTURE_NON_POWER_OF_TWO, ARB_TEXTURE_QUERY_LEVELS, ARB_TEXTURE_RECTANGLE,

1 0

Józef Kucia : wined3d: Add ARB_texture_storage_multisample extension.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: fea8cf8b36846fbf173f31fce2f82499f92f54a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fea8cf8b36846fbf173f31fc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 5 13:13:37 2018 +0100 wined3d: Add ARB_texture_storage_multisample extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4a69b28..000d0b7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -191,6 +191,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, {"GL_ARB_texture_rgb10_a2ui", ARB_TEXTURE_RGB10_A2UI }, {"GL_ARB_texture_storage", ARB_TEXTURE_STORAGE }, + {"GL_ARB_texture_storage_multisample", ARB_TEXTURE_STORAGE_MULTISAMPLE}, {"GL_ARB_texture_swizzle", ARB_TEXTURE_SWIZZLE }, {"GL_ARB_texture_view", ARB_TEXTURE_VIEW }, {"GL_ARB_timer_query", ARB_TIMER_QUERY }, @@ -2898,6 +2899,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glTexStorage1D) USE_GL_FUNC(glTexStorage2D) USE_GL_FUNC(glTexStorage3D) + /* GL_ARB_texture_storage_multisample */ + USE_GL_FUNC(glTexStorage2DMultisample); + USE_GL_FUNC(glTexStorage3DMultisample); /* GL_ARB_texture_view */ USE_GL_FUNC(glTextureView) /* GL_ARB_timer_query */ @@ -3921,6 +3925,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_BUFFER_RANGE, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, + {ARB_TEXTURE_STORAGE_MULTISAMPLE, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 1bbdaa2..a3dee24 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -124,6 +124,7 @@ enum wined3d_gl_extension ARB_TEXTURE_RG, ARB_TEXTURE_RGB10_A2UI, ARB_TEXTURE_STORAGE, + ARB_TEXTURE_STORAGE_MULTISAMPLE, ARB_TEXTURE_SWIZZLE, ARB_TEXTURE_VIEW, ARB_TIMER_QUERY,

1 0

Józef Kucia : wined3d: Add support for multisample samplers.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 780ec0c1f932476c9a33cac8aa6adf78b74c2b28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=780ec0c1f932476c9a33cac8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 5 13:13:38 2018 +0100 wined3d: Add support for multisample samplers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e18a99f..03684b6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2591,6 +2591,14 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont sampler_type = "samplerCubeArray"; break; + case WINED3D_SHADER_RESOURCE_TEXTURE_2DMS: + sampler_type = "sampler2DMS"; + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY: + sampler_type = "sampler2DMSArray"; + break; + default: sampler_type = "unsupported_sampler"; FIXME("Unhandled resource type %#x.\n", reg_maps->resource_info[entry->resource_idx].type); @@ -7446,6 +7454,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_texture_cube_map_array : enable\n"); if (gl_info->supported[ARB_TEXTURE_GATHER]) shader_addline(buffer, "#extension GL_ARB_texture_gather : enable\n"); + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + shader_addline(buffer, "#extension GL_ARB_texture_multisample : enable\n"); if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT])

1 0

Józef Kucia : wined3d: Implement ld2dms instruction.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: f2e614b1f898de74276bef8a612420b6fb2d5b5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e614b1f898de74276bef8a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 5 13:13:39 2018 +0100 wined3d: Implement ld2dms instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 27 +++++++++++++++++++-------- dlls/wined3d/shader.c | 1 + 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 03684b6..6f54b31 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5975,15 +5975,14 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, ")%s);\n", dst_swizzle); } -/* FIXME: The current implementation does not handle multisample textures correctly. */ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + struct glsl_src_param coord_param, lod_param, sample_param; unsigned int resource_idx, sampler_idx, sampler_bind_idx; - struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; DWORD flags = WINED3D_GLSL_SAMPLE_LOAD; - BOOL has_lod_param; + BOOL has_lod_param, multisample; if (wined3d_shader_instruction_has_texel_offset(ins)) flags |= WINED3D_GLSL_SAMPLE_OFFSET; @@ -5996,15 +5995,27 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) ERR("Invalid resource index %u.\n", resource_idx); return; } - has_lod_param = reg_maps->resource_info[resource_idx].type != WINED3D_SHADER_RESOURCE_BUFFER; + multisample = reg_maps->resource_info[resource_idx].type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMS + || reg_maps->resource_info[resource_idx].type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY; + has_lod_param = reg_maps->resource_info[resource_idx].type != WINED3D_SHADER_RESOURCE_BUFFER + && !multisample; shader_glsl_get_sample_function(ins->ctx, resource_idx, sampler_idx, flags, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); sampler_bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, sampler_idx); - shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, - NULL, NULL, has_lod_param ? lod_param.param_str : NULL, &ins->texel_offset, - "%s", coord_param.param_str); + if (multisample) + { + shader_glsl_add_src_param(ins, &ins->src[2], WINED3DSP_WRITEMASK_0, &sample_param); + shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, + NULL, NULL, NULL, &ins->texel_offset, "%s, %s", coord_param.param_str, sample_param.param_str); + } + else + { + shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, + NULL, NULL, has_lod_param ? lod_param.param_str : NULL, &ins->texel_offset, + "%s", coord_param.param_str); + } shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -11149,7 +11160,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, - /* WINED3DSIH_LD2DMS */ NULL, + /* WINED3DSIH_LD2DMS */ shader_glsl_ld, /* WINED3DSIH_LD_RAW */ shader_glsl_ld_raw_structured, /* WINED3DSIH_LD_STRUCTURED */ shader_glsl_ld_raw_structured, /* WINED3DSIH_LD_UAV_TYPED */ shader_glsl_ld_uav, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e59b9e5..c775df0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1676,6 +1676,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count); } else if (ins.handler_idx == WINED3DSIH_LD + || ins.handler_idx == WINED3DSIH_LD2DMS || (ins.handler_idx == WINED3DSIH_LD_RAW && ins.src[1].reg.type == WINED3DSPR_RESOURCE) || (ins.handler_idx == WINED3DSIH_RESINFO && ins.src[1].reg.type == WINED3DSPR_RESOURCE)) {

1 0