wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Nikolay Sivov : dwrite: Partially implement GetSystemFontCollection().
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: b6bb4c1b92e129f5ecaefe32e10193d28cf009c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6bb4c1b92e129f5ecaefe32e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 7 21:30:08 2016 +0300 dwrite: Partially implement GetSystemFontCollection(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 12 ++++++------ dlls/dwrite/dwrite_private.h | 4 ++-- dlls/dwrite/font.c | 7 ++++--- dlls/dwrite/gdiinterop.c | 2 +- dlls/dwrite/layout.c | 2 +- dlls/dwrite/main.c | 44 ++++++++++++++++++++++---------------------- 6 files changed, 36 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6bb4c1b92e129f5ecaef…

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 3a5dd73b051c387f3577aba3b7eb61e6443fcf50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5dd73b051c387f3577aba3b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jul 7 17:24:42 2016 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 95 ++++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 38 deletions(-) diff --git a/po/uk.po b/po/uk.po index e0400a9..d86394a 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2991,11 +2991,11 @@ msgstr "%1!u!МБ використано, %2!u!МБ доступно" #: gdi32.rc:28 msgid "Western" -msgstr "Західне" +msgstr "Західноєвропейський" #: gdi32.rc:29 msgid "Central European" -msgstr "Центральна Європа" +msgstr "Центральноєвропейський" #: gdi32.rc:30 msgid "Cyrillic" @@ -3003,11 +3003,11 @@ msgstr "Кирилиця" #: gdi32.rc:31 msgid "Greek" -msgstr "Грецьке" +msgstr "Грецький" #: gdi32.rc:32 msgid "Turkish" -msgstr "Турецьке" +msgstr "Турецький" #: gdi32.rc:33 msgid "Hebrew" @@ -3015,27 +3015,27 @@ msgstr "Іврит" #: gdi32.rc:34 msgid "Arabic" -msgstr "Арабське" +msgstr "Арабський" #: gdi32.rc:35 msgid "Baltic" -msgstr "Балтійське" +msgstr "Балтійський" #: gdi32.rc:36 msgid "Vietnamese" -msgstr "В'єтнамське" +msgstr "В'єтнамський" #: gdi32.rc:37 msgid "Thai" -msgstr "Тайське" +msgstr "Тайський" #: gdi32.rc:38 msgid "Japanese" -msgstr "Японське" +msgstr "Японський" #: gdi32.rc:39 msgid "CHINESE_GB2312" -msgstr "" +msgstr "Китайський GB2312" #: gdi32.rc:40 msgid "Hangul" @@ -3043,7 +3043,7 @@ msgstr "Хангул" #: gdi32.rc:41 msgid "CHINESE_BIG5" -msgstr "" +msgstr "Китайський BIG5" #: gdi32.rc:42 msgid "Hangul(Johab)" @@ -11635,6 +11635,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"Використання:\n" +" REG [операція] [параметри]\n" +"\n" +"Підтримувані операції:\n" +" ADD | DELETE | QUERY\n" +"\n" +"Для довідки по конкретній операції, введіть:\n" +" REG [операція] /?\n" +"\n" #: reg.rc:36 msgid "" @@ -11739,24 +11748,20 @@ msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Пошук завершено. Знайдено збігів: %1!d!\n" #: reg.rc:61 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "reg: невірне ім'я ключа\n" +msgstr "reg: Невірний синтаксис. " #: reg.rc:62 -#, fuzzy -#| msgid "uninstaller: Invalid option [%1]\n" msgid "reg: Invalid option [%1]. " -msgstr "uninstaller: Невірний параметр [%1]\n" +msgstr "reg: Невірна опція [%1]. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "Введіть \"REG /?\" для довідки.\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "Введіть \"REG %1 /?\" для довідки.\n" #: regedit.rc:34 msgid "&Registry" @@ -12002,46 +12007,60 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgstr "" +"Використання:\n" +" regedit [опції] [ім'я файлу] [ключ реєстру]\n" +"\n" +"Опції:\n" +" [без опцій] Запуск програми з графічним інтерфейсом.\n" +" /L:system.dat Шлях до файла system.dat для редагування.\n" +" Сумісна з будь-якими іншими опціями. Ігнорується.\n" +" /R:user.dat Шлях до файла user.dat для редагування.\n" +" Сумісна з будь-якими іншими опціями. Ігнорується.\n" +" /C Імпортувати вміст файлу реєстру.\n" +" /D Видалення зазначеного ключа реєстру.\n" +" /E Експортувати вміст зазначеного ключа реєстру у файл.\n" +" Якщо параметр не заданий, експортується весь реєстр.\n" +" /S Тихий режим. Повідомлення не відображатимуться.\n" +" /V Запуск графічного інтерфейсу в розширеному режимі. " +"Ігнорується.\n" +" /? Показати цю інформацію і вийти.\n" +" [ім'я файлу] Шлях до файлу, який містить дані реєстру для імпорту.\n" +" Опція [/Е] вказує на шлях до файлу куди будуть експортовані " +"дані реєстру.\n" +" [ключ реєстру] Ключ реєстру для редагування.\n" +"\n" +"Приклади використання:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" #: regedit.rc:360 -#, fuzzy -#| msgid "" -#| "regsvr32: Invalid or unrecognized switch [%1]\n" -#| "\n" msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" -"regsvr32: Невірний або нерозпізнаний параметр [%1]\n" -"\n" +msgstr "regedit: Невірний або нерозпізнаний параметр [%1]\n" #: regedit.rc:361 msgid "Type \"regedit /?\" for help.\n" -msgstr "" +msgstr "Введіть \"regedit /?\" для довідки.\n" #: regedit.rc:362 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "Команда не вказана." +msgstr "regedit: Ім'я файлу не вказано.\n" #: regedit.rc:363 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: Не вказано ключ реєстру для видалення.\n" #: regedit.rc:364 -#, fuzzy -#| msgid "uninstaller: The application with GUID '%1' was not found\n" msgid "regedit: The file '%1' was not found.\n" -msgstr "uninstaller: Застосунок з ідентифікатором '%1' не знайдено\n" +msgstr "regedit: Файл '%1' не знайдено.\n" #: regedit.rc:365 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "reg: неможливо отримати доступ до віддаленої машини\n" +msgstr "regedit: Неможливо відкрити файл '%1'.\n" #: regedit.rc:366 msgid "regedit: Unhandled action.\n" -msgstr "" +msgstr "regedit: Непідтримувана операція.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Nikolay Sivov : crypt32: Use regular list iterator when there' s no need for safe one.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 94b6a885a880728f5e0a865fc17a82532723e756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b6a885a880728f5e0a865fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 6 23:34:20 2016 +0300 crypt32: Use regular list iterator when there's no need for safe one. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/collectionstore.c | 9 ++++----- dlls/crypt32/proplist.c | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index f565745..8b90270 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -114,10 +114,10 @@ static BOOL CRYPT_CollectionAddContext(WINE_COLLECTIONSTORE *store, } else { - WINE_STORE_LIST_ENTRY *entry, *next; + WINE_STORE_LIST_ENTRY *entry; EnterCriticalSection(&store->cs); - LIST_FOR_EACH_ENTRY_SAFE(entry, next, &store->stores, WINE_STORE_LIST_ENTRY, entry) + LIST_FOR_EACH_ENTRY(entry, &store->stores, WINE_STORE_LIST_ENTRY, entry) { if (entry->dwUpdateFlags & CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG) { @@ -559,7 +559,7 @@ void WINAPI CertRemoveStoreFromCollection(HCERTSTORE hCollectionStore, { WINE_COLLECTIONSTORE *collection = hCollectionStore; WINECRYPT_CERTSTORE *sibling = hSiblingStore; - WINE_STORE_LIST_ENTRY *store, *next; + WINE_STORE_LIST_ENTRY *store; TRACE("(%p, %p)\n", hCollectionStore, hSiblingStore); @@ -578,8 +578,7 @@ void WINAPI CertRemoveStoreFromCollection(HCERTSTORE hCollectionStore, return; } EnterCriticalSection(&collection->cs); - LIST_FOR_EACH_ENTRY_SAFE(store, next, &collection->stores, - WINE_STORE_LIST_ENTRY, entry) + LIST_FOR_EACH_ENTRY(store, &collection->stores, WINE_STORE_LIST_ENTRY, entry) { if (store->store == sibling) { diff --git a/dlls/crypt32/proplist.c b/dlls/crypt32/proplist.c index d849fd6..f5ae221 100644 --- a/dlls/crypt32/proplist.c +++ b/dlls/crypt32/proplist.c @@ -148,11 +148,10 @@ BOOL ContextPropertyList_SetProperty(CONTEXT_PROPERTY_LIST *list, DWORD id, void ContextPropertyList_RemoveProperty(CONTEXT_PROPERTY_LIST *list, DWORD id) { - CONTEXT_PROPERTY *prop, *next; + CONTEXT_PROPERTY *prop; EnterCriticalSection(&list->cs); - LIST_FOR_EACH_ENTRY_SAFE(prop, next, &list->properties, CONTEXT_PROPERTY, - entry) + LIST_FOR_EACH_ENTRY(prop, &list->properties, CONTEXT_PROPERTY, entry) { if (prop->propID == id) {

1 0

Nikolay Sivov : mmdevapi: Use regular list iterator.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: c5b6e31438df20b8ab6edb543a16e22ae4607522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b6e31438df20b8ab6edb543… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 6 23:42:42 2016 +0300 mmdevapi: Use regular list iterator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 1694bee..9e8d8a5 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1281,7 +1281,7 @@ static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEn static HRESULT WINAPI MMDevEnum_UnregisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); - struct NotificationClientWrapper *wrapper, *wrapper2; + struct NotificationClientWrapper *wrapper; TRACE("(%p)->(%p)\n", This, client); @@ -1290,8 +1290,7 @@ static HRESULT WINAPI MMDevEnum_UnregisterEndpointNotificationCallback(IMMDevice EnterCriticalSection(&g_notif_lock); - LIST_FOR_EACH_ENTRY_SAFE(wrapper, wrapper2, &g_notif_clients, - struct NotificationClientWrapper, entry){ + LIST_FOR_EACH_ENTRY(wrapper, &g_notif_clients, struct NotificationClientWrapper, entry){ if(wrapper->client == client){ list_remove(&wrapper->entry); HeapFree(GetProcessHeap(), 0, wrapper);

1 0

Hadrien Boizard : winex11.drv: Use wine_dbgstr_point in TRACES.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 81538ebb6dd4bed43006084a1514c1c96095a712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81538ebb6dd4bed43006084a1… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Wed Jul 6 00:54:09 2016 +0200 winex11.drv: Use wine_dbgstr_point in TRACES. Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 677acfa..7287753 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1388,7 +1388,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) { POINT old = *pos; *pos = root_to_virtual_screen( winX, winY ); - TRACE( "pointer at (%d,%d) server pos %d,%d\n", pos->x, pos->y, old.x, old.y ); + TRACE( "pointer at %s server pos %s\n", wine_dbgstr_point(pos), wine_dbgstr_point(&old) ); } return ret; } @@ -1458,7 +1458,7 @@ void move_resize_window( HWND hwnd, int dir ) else if (GetKeyState( VK_MBUTTON ) & 0x8000) button = 2; else if (GetKeyState( VK_RBUTTON ) & 0x8000) button = 3; - TRACE( "hwnd %p/%lx, x %d, y %d, dir %d, button %d\n", hwnd, win, pos.x, pos.y, dir, button ); + TRACE( "hwnd %p/%lx, pos %s, dir %d, button %d\n", hwnd, win, wine_dbgstr_point(&pos), dir, button ); xev.xclient.type = ClientMessage; xev.xclient.window = win;

1 0

Sebastian Lackner : kernel32/tests: Add a test for sorting of InMemoryOrderModuleList.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 648cbf63c003e0230352f91ddb7602c44d570706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=648cbf63c003e0230352f91dd… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 7 06:44:15 2016 +0200 kernel32/tests: Add a test for sorting of InMemoryOrderModuleList. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index c35cf25..921abb1 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2750,6 +2750,24 @@ static void test_ResolveDelayLoadedAPI(void) DeleteFileA(dll_name); } +static void test_InMemoryOrderModuleList(void) +{ + LIST_ENTRY *entry1, *mark1 = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; + LIST_ENTRY *entry2, *mark2 = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; + LDR_MODULE *module1, *module2; + + for (entry1 = mark1->Flink, entry2 = mark2->Flink; + entry1 != mark1 && entry2 != mark2; + entry1 = entry1->Flink, entry2 = entry2->Flink) + { + module1 = CONTAINING_RECORD(entry1, LDR_MODULE, InLoadOrderModuleList); + module2 = CONTAINING_RECORD(entry2, LDR_MODULE, InMemoryOrderModuleList); + ok(module1 == module2, "expected module1 == module2, got %p and %p\n", module1, module2); + } + ok(entry1 == mark1, "expected entry1 == mark1, got %p and %p\n", entry1, mark1); + ok(entry2 == mark2, "expected entry2 == mark2, got %p and %p\n", entry2, mark2); +} + START_TEST(loader) { int argc; @@ -2804,4 +2822,5 @@ START_TEST(loader) test_section_access(); test_import_resolution(); test_ExitProcess(); + test_InMemoryOrderModuleList(); }

1 0

Michael Müller : ntdll: Do not sort InMemoryOrderModuleList by memory address.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 77be592845591c05a574b720b15c49e7cd1720c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77be592845591c05a574b720b… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jul 7 06:43:25 2016 +0200 ntdll: Do not sort InMemoryOrderModuleList by memory address. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a0049fe..d9176d7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -355,7 +355,6 @@ static WINE_MODREF *get_modref( HMODULE hmod ) mod = CONTAINING_RECORD(entry, LDR_MODULE, InMemoryOrderModuleList); if (mod->BaseAddress == hmod) return cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr); - if (mod->BaseAddress > (void*)hmod) break; } return NULL; } @@ -932,7 +931,6 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) WINE_MODREF *wm; const WCHAR *p; const IMAGE_NT_HEADERS *nt = RtlImageNtHeader(hModule); - PLIST_ENTRY entry, mark; if (!(wm = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*wm) ))) return NULL; @@ -965,18 +963,8 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) InsertTailList(&NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList); - - /* insert module in MemoryList, sorted in increasing base addresses */ - mark = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; - for (entry = mark->Flink; entry != mark; entry = entry->Flink) - { - if (CONTAINING_RECORD(entry, LDR_MODULE, InMemoryOrderModuleList)->BaseAddress > wm->ldr.BaseAddress) - break; - } - entry->Blink->Flink = &wm->ldr.InMemoryOrderModuleList; - wm->ldr.InMemoryOrderModuleList.Blink = entry->Blink; - wm->ldr.InMemoryOrderModuleList.Flink = entry; - entry->Blink = &wm->ldr.InMemoryOrderModuleList; + InsertTailList(&NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, + &wm->ldr.InMemoryOrderModuleList); /* wait until init is called for inserting into this list */ wm->ldr.InInitializationOrderModuleList.Flink = NULL; @@ -1386,7 +1374,6 @@ NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* pmod) *pmod = mod; return STATUS_SUCCESS; } - if (mod->BaseAddress > addr) break; } return STATUS_NO_MORE_ENTRIES; } @@ -3088,6 +3075,8 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, /* the main exe needs to be the first in the load order list */ RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); + RemoveEntryList( &wm->ldr.InMemoryOrderModuleList ); + InsertHeadList( &peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0 )) != STATUS_SUCCESS) goto error; if ((status = server_init_process_done()) != STATUS_SUCCESS) goto error;

1 0

Józef Kucia : wined3d: Implement SM5 cut_stream instruction for stream 0.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 422f0a87c48f595ca512d5278c4f3631e0aa599c URL: http://source.winehq.org/git/wine.git/?a=commit;h=422f0a87c48f595ca512d5278… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:35 2016 +0200 wined3d: Implement SM5 cut_stream instruction for stream 0. 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9a2025f..7ad5acd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3437,7 +3437,12 @@ static void shader_glsl_cross(const struct wined3d_shader_instruction *ins) static void shader_glsl_cut(const struct wined3d_shader_instruction *ins) { - shader_addline(ins->ctx->buffer, "EndPrimitive();\n"); + unsigned int stream = ins->handler_idx == WINED3DSIH_CUT ? 0 : ins->src[0].reg.idx[0].offset; + + if (!stream) + shader_addline(ins->ctx->buffer, "EndPrimitive();\n"); + else + FIXME("Unhandled primitive stream %u.\n", stream); } /* Process the WINED3DSIO_POW instruction in GLSL (dst = |src0|^src1) @@ -8600,7 +8605,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CONTINUE */ shader_glsl_continue, /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ shader_glsl_cut, - /* WINED3DSIH_CUT_STREAM */ NULL, + /* WINED3DSIH_CUT_STREAM */ shader_glsl_cut, /* WINED3DSIH_DCL */ shader_glsl_nop, /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_glsl_nop, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop,

1 0

Józef Kucia : wined3d: Implement SM5 emit_stream instruction for stream 0.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: df557182be860eb3b323ff4b0233784a2300dfe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df557182be860eb3b323ff4b0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:34 2016 +0200 wined3d: Implement SM5 emit_stream instruction for stream 0. 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, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c9c0773..9a2025f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4307,9 +4307,15 @@ static void shader_glsl_else(const struct wined3d_shader_instruction *ins) static void shader_glsl_emit(const struct wined3d_shader_instruction *ins) { + unsigned int stream = ins->handler_idx == WINED3DSIH_EMIT ? 0 : ins->src[0].reg.idx[0].offset; + shader_addline(ins->ctx->buffer, "setup_gs_output(gs_out);\n"); shader_glsl_fixup_position(ins->ctx->buffer); - shader_addline(ins->ctx->buffer, "EmitVertex();\n"); + + if (!stream) + shader_addline(ins->ctx->buffer, "EmitVertex();\n"); + else + FIXME("Unhandled primitive stream %u.\n", stream); } static void shader_glsl_break(const struct wined3d_shader_instruction *ins) @@ -8644,7 +8650,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DSY_FINE */ NULL, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit, - /* WINED3DSIH_EMIT_STREAM */ NULL, + /* WINED3DSIH_EMIT_STREAM */ shader_glsl_emit, /* WINED3DSIH_ENDIF */ shader_glsl_end, /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end,

1 0

Józef Kucia : wined3d: Recognize SM5 bfrev opcode.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 0dc4c3afb2dc5ff8c917f006a1ab7d631f5ea22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc4c3afb2dc5ff8c917f006a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:33 2016 +0200 wined3d: Recognize SM5 bfrev opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index deae1cc..24c1194 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5215,6 +5215,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_AND */ NULL, /* WINED3DSIH_BEM */ pshader_hw_bem, /* WINED3DSIH_BFI */ NULL, + /* WINED3DSIH_BFREV */ NULL, /* WINED3DSIH_BREAK */ shader_hw_break, /* WINED3DSIH_BREAKC */ shader_hw_breakc, /* WINED3DSIH_BREAKP */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8b5af9e..c9c0773 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8581,6 +8581,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_AND */ shader_glsl_binop, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BFI */ NULL, + /* WINED3DSIH_BFREV */ NULL, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, /* WINED3DSIH_BREAKP */ shader_glsl_breakp, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9bf7164..6a9f7fc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -45,6 +45,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_AND */ "and", /* WINED3DSIH_BEM */ "bem", /* WINED3DSIH_BFI */ "bfi", + /* WINED3DSIH_BFREV */ "bfrev", /* WINED3DSIH_BREAK */ "break", /* WINED3DSIH_BREAKC */ "breakc", /* WINED3DSIH_BREAKP */ "breakp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index abfcf4f..72cd5fc 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -216,6 +216,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_GATHER4_C = 0x7e, WINED3D_SM5_OP_BFI = 0x8c, + WINED3D_SM5_OP_BFREV = 0x8d, WINED3D_SM5_OP_SWAPC = 0x8e, WINED3D_SM5_OP_DCL_STREAM = 0x8f, WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, @@ -811,6 +812,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "uuuu"}, + {WINED3D_SM5_OP_BFREV, WINED3DSIH_BFREV, "u", "u"}, {WINED3D_SM5_OP_SWAPC, WINED3DSIH_SWAPC, "ff", "uff"}, {WINED3D_SM5_OP_DCL_STREAM, WINED3DSIH_DCL_STREAM, "", "f"}, {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ec52b15..8d97d2e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -560,6 +560,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_AND, WINED3DSIH_BEM, WINED3DSIH_BFI, + WINED3DSIH_BFREV, WINED3DSIH_BREAK, WINED3DSIH_BREAKC, WINED3DSIH_BREAKP,

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2016