August 2016 - Wine-Commits - list.winehq.org

Alexander Morozov : ntoskrnl.exe: Add stub for ObDereferenceObject.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: 2898df50e64ec73be954cba0c0b06d35af01de6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2898df50e64ec73be954cba0c… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Aug 8 15:35:18 2016 +0200 ntoskrnl.exe: Add stub for ObDereferenceObject. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d812692..d9ebc40 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2141,6 +2141,15 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, /*********************************************************************** + * ObDereferenceObject (NTOSKRNL.EXE.@) + */ +void WINAPI ObDereferenceObject( void *obj ) +{ + TRACE( "(%p): stub\n", obj ); +} + + +/*********************************************************************** * ObfReferenceObject (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL1_ENTRYPOINT @@ -2164,7 +2173,7 @@ void WINAPI __regs_ObfDereferenceObject( void *obj ) void WINAPI ObfDereferenceObject( void *obj ) #endif { - FIXME( "(%p): stub\n", obj ); + ObDereferenceObject( obj ); } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 40fff1b..fd820a7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -798,7 +798,7 @@ @ stub ObCloseHandle @ stub ObCreateObject @ stub ObCreateObjectType -@ stub ObDereferenceObject +@ stdcall ObDereferenceObject(ptr) @ stub ObDereferenceSecurityDescriptor @ stub ObFindHandleForObject @ stub ObGetObjectSecurity diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 242eb70..5eda82d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1251,6 +1251,7 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICA void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); +void WINAPI ObDereferenceObject(void*); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**);

1 0

Frédéric Delanoy : French translation for release 1.9.16
by Jeremy Newman Aug. 8, 2016

Aug. 8, 2016

Module: website Branch: master Commit: db8b61c324492e8bf8a6e90a6cadcd51961baf4e URL: http://source.winehq.org/git/website.git/?a=commit;h=db8b61c324492e8bf8a6e9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 8 23:13:08 2016 +0200 French translation for release 1.9.16 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016080501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2016080501.xml b/news/fr/2016080501.xml new file mode 100644 index 0000000..e2a9004 --- /dev/null +++ b/news/fr/2016080501.xml @@ -0,0 +1,16 @@ +<news> +<date>5 août 2016</date> +<title>Sortie de Wine 1.9.16</title> +<body> +La version de développement 1.9.16 de Wine est disponible. +<a href="{$root}/announce/1.9.16">Nouveautés</a> de cette version : +<ul> + <li>Meilleure compatibilité 64 bits sous MacOS.</li> + <li>Améliorations de performances dans JavaScript.</li> + <li>Progrès supplémentaires en vue du flux de commandes Direct3D.</li> + <li>Plus d'instructions de shaders dans Direct3D.</li> + <li>Améliorations de performances dans GDI.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.16.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Stefan Dösinger : ddraw/tests: Skip overlay tests if DWM is on.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: 426a9efc3a696b4fa2765988e4b96ced1138699a URL: http://source.winehq.org/git/wine.git/?a=commit;h=426a9efc3a696b4fa2765988e… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Aug 7 20:22:50 2016 +0100 ddraw/tests: Skip overlay tests if DWM is on. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 34 +++++++++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw2.c | 34 +++++++++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw4.c | 34 +++++++++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw7.c | 34 +++++++++++++++++++++++++++++++--- 4 files changed, 124 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=426a9efc3a696b4fa2765…

1 0

Nikolay Sivov : comctl32/tests: Basic test for TVS_FULLROWSELECT style bit.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: 2728909e6ce18e7a149a2dda8c0a787ca13ac06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2728909e6ce18e7a149a2dda8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 8 10:57:15 2016 +0300 comctl32/tests: Basic test for TVS_FULLROWSELECT style bit. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 25 +++++++++++++++++++++++++ include/commctrl.h | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 7e6c731..e2fb443 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2369,6 +2369,30 @@ static void test_WM_KEYDOWN(void) DestroyWindow(hwnd); } +static void test_TVS_FULLROWSELECT(void) +{ + DWORD style; + HWND hwnd; + + /* try to create both with TVS_HASLINES and TVS_FULLROWSELECT */ + hwnd = create_treeview_control(TVS_FULLROWSELECT); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & (TVS_FULLROWSELECT | TVS_HASLINES)) == (TVS_FULLROWSELECT | TVS_HASLINES), "got style 0x%08x\n", style); + + DestroyWindow(hwnd); + + /* create just with TVS_HASLINES, try to enable TVS_FULLROWSELECT later */ + hwnd = create_treeview_control(0); + + style = GetWindowLongA(hwnd, GWL_STYLE); + SetWindowLongA(hwnd, GWL_STYLE, style | TVS_FULLROWSELECT); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(style & TVS_FULLROWSELECT, "got style 0x%08x\n", style); + + DestroyWindow(hwnd); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -2444,6 +2468,7 @@ START_TEST(treeview) test_WM_GETDLGCODE(); test_customdraw(); test_WM_KEYDOWN(); + test_TVS_FULLROWSELECT(); if (!load_v6_module(&ctx_cookie, &hCtx)) { diff --git a/include/commctrl.h b/include/commctrl.h index 7d6f5c5..dde038b 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2400,7 +2400,7 @@ static const WCHAR WC_TREEVIEWW[] = { 'S','y','s', #define TVHT_ONITEMBUTTON 0x0010 #define TVHT_ONITEMRIGHT 0x0020 #define TVHT_ONITEMSTATEICON 0x0040 -#define TVHT_ONITEM 0x0046 +#define TVHT_ONITEM (TVHT_ONITEMICON | TVHT_ONITEMLABEL | TVHT_ONITEMSTATEICON) #define TVHT_ABOVE 0x0100 #define TVHT_BELOW 0x0200 #define TVHT_TORIGHT 0x0400

1 0

Jeremy Audiger : winhttp: Prevent console spamming in get_system_proxy_autoconfig_url.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: 6c0fdc05167a5a41b2a7f2f3748e97d17eb6a0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0fdc05167a5a41b2a7f2f37… Author: Jeremy Audiger <audiger(a)live.fr> Date: Sat Jul 30 16:13:59 2016 +0000 winhttp: Prevent console spamming in get_system_proxy_autoconfig_url. Signed-off-by: Jérémy Audiger <audiger(a)live.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 28587f5..30909ff 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1351,7 +1351,14 @@ static BOOL get_system_proxy_autoconfig_url( char *buf, DWORD buflen ) CFRelease( settings ); return ret; #else - FIXME( "no support on this platform\n" ); + static BOOL first = TRUE; + if (first) + { + FIXME( "no support on this platform\n" ); + first = FALSE; + } + else + TRACE( "no support on this platform\n" ); return FALSE; #endif }

1 0

Hugh McMaster : reg/tests: Add more tests for 'reg import'.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: e4da2c59cfdef875bd7996faef690fe10d993dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4da2c59cfdef875bd7996fae… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 8 03:17:52 2016 +0000 reg/tests: Add more tests for 'reg import'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index b163cf0..bd5695f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -699,6 +699,66 @@ static BOOL write_reg_file(const char *value, char *tmp_name) return ret; } +#define test_import_str(c,r) test_import_str_(__LINE__,c,r) +static BOOL test_import_str_(unsigned line, const char *file_contents, DWORD *rc) +{ + HANDLE regfile; + DWORD written; + BOOL ret; + + regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); + if(regfile == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(regfile, file_contents, strlen(file_contents), &written, NULL); + lok(ret, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(regfile); + + run_reg_exe("reg import test.reg", rc); + + ret = DeleteFileA("test.reg"); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); + + return ret; +} + +#define test_import_wstr(c,r) test_import_wstr_(__LINE__,c,r) +static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *rc) +{ + int len, memsize; + WCHAR *wstr; + HANDLE regfile; + DWORD written; + BOOL ret; + + len = MultiByteToWideChar(CP_UTF8, 0, file_contents, -1, NULL, 0); + memsize = len * sizeof(WCHAR); + wstr = HeapAlloc(GetProcessHeap(), 0, memsize); + if (!wstr) return FALSE; + MultiByteToWideChar(CP_UTF8, 0, file_contents, -1, wstr, memsize); + + regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); + if(regfile == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(regfile, wstr, memsize, &written, NULL); + lok(ret, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(regfile); + + HeapFree(GetProcessHeap(), 0, wstr); + + run_reg_exe("reg import test.reg", rc); + + ret = DeleteFileA("test.reg"); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); + + return ret; +} + static void test_import(void) { DWORD r, dword = 0x123; @@ -747,6 +807,103 @@ static void test_import(void) DeleteFileA(test1_reg); DeleteFileA(test2_reg); + + /* Test file contents */ + test_import_str("regedit\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("regedit4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("REGEDIT\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str(" REGEDIT4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("\tREGEDIT4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("\nREGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("AREGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("1REGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("REGEDIT3\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT5\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT9\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT 4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT4 FOO\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("Windows Registry Editor Version 4.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("Windows Registry Editor Version 5.00\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + /* Test file contents - Unicode */ + test_import_wstr("Windows Registry Editor Version 4.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("Windows Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\uFEFFWindows Registry Editor Version 5\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\uFEFFWindows Registry Editor Version 5.00\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\uFEFFWINDOWS Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr(" \uFEFFWindows Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\t\uFEFFWindows Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\n\uFEFFWindows Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\uFEFF Windows Registry Editor Version 5.00\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\uFEFF\tWindows Registry Editor Version 5.00\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\uFEFF\nWindows Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); } START_TEST(reg)

1 0

Piotr Caban : ntdll: Fix KNONVOLATILE_CONTEXT_POINTERS parameter handling in RtlVirtualUnwind.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: 978ee87a25f5717df25ed033ff7d365a8ed20278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978ee87a25f5717df25ed033f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Aug 6 13:58:19 2016 +0200 ntdll: Fix KNONVOLATILE_CONTEXT_POINTERS parameter handling in RtlVirtualUnwind. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index decae5c..009505f 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3099,16 +3099,16 @@ static ULONG64 get_int_reg( CONTEXT *context, int reg ) return *(&context->Rax + reg); } -static void set_int_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, ULONG64 val ) +static void set_int_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, ULONG64 *val ) { - *(&context->Rax + reg) = val; - if (ctx_ptr) ctx_ptr->u2.IntegerContext[reg] = &context->Rax + reg; + *(&context->Rax + reg) = *val; + if (ctx_ptr) ctx_ptr->u2.IntegerContext[reg] = val; } -static void set_float_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, M128A val ) +static void set_float_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, M128A *val ) { - *(&context->u.s.Xmm0 + reg) = val; - if (ctx_ptr) ctx_ptr->u.FloatingContext[reg] = &context->u.s.Xmm0 + reg; + *(&context->u.s.Xmm0 + reg) = *val; + if (ctx_ptr) ctx_ptr->u.FloatingContext[reg] = val; } static int get_opcode_size( struct opcode op ) @@ -3224,7 +3224,7 @@ static void interpret_epilog( BYTE *pc, CONTEXT *context, KNONVOLATILE_CONTEXT_P case 0x5d: /* pop %rbp/r13 */ case 0x5e: /* pop %rsi/r14 */ case 0x5f: /* pop %rdi/r15 */ - set_int_reg( context, ctx_ptr, *pc - 0x58 + (rex & 1) * 8, *(ULONG64 *)context->Rsp ); + set_int_reg( context, ctx_ptr, *pc - 0x58 + (rex & 1) * 8, (ULONG64 *)context->Rsp ); context->Rsp += sizeof(ULONG64); pc++; continue; @@ -3322,7 +3322,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, switch (info->opcodes[i].code) { case UWOP_PUSH_NONVOL: /* pushq %reg */ - set_int_reg( context, ctx_ptr, info->opcodes[i].info, *(ULONG64 *)context->Rsp ); + set_int_reg( context, ctx_ptr, info->opcodes[i].info, (ULONG64 *)context->Rsp ); context->Rsp += sizeof(ULONG64); break; case UWOP_ALLOC_LARGE: /* subq $nn,%rsp */ @@ -3337,19 +3337,19 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, break; case UWOP_SAVE_NONVOL: /* movq %reg,n(%rsp) */ off = frame + *(USHORT *)&info->opcodes[i+1] * 8; - set_int_reg( context, ctx_ptr, info->opcodes[i].info, *(ULONG64 *)off ); + set_int_reg( context, ctx_ptr, info->opcodes[i].info, (ULONG64 *)off ); break; case UWOP_SAVE_NONVOL_FAR: /* movq %reg,nn(%rsp) */ off = frame + *(DWORD *)&info->opcodes[i+1]; - set_int_reg( context, ctx_ptr, info->opcodes[i].info, *(ULONG64 *)off ); + set_int_reg( context, ctx_ptr, info->opcodes[i].info, (ULONG64 *)off ); break; case UWOP_SAVE_XMM128: /* movaps %xmmreg,n(%rsp) */ off = frame + *(USHORT *)&info->opcodes[i+1] * 16; - set_float_reg( context, ctx_ptr, info->opcodes[i].info, *(M128A *)off ); + set_float_reg( context, ctx_ptr, info->opcodes[i].info, (M128A *)off ); break; case UWOP_SAVE_XMM128_FAR: /* movaps %xmmreg,nn(%rsp) */ off = frame + *(DWORD *)&info->opcodes[i+1]; - set_float_reg( context, ctx_ptr, info->opcodes[i].info, *(M128A *)off ); + set_float_reg( context, ctx_ptr, info->opcodes[i].info, (M128A *)off ); break; case UWOP_PUSH_MACHFRAME: FIXME( "PUSH_MACHFRAME %u\n", info->opcodes[i].info );

1 0

Michael Stefaniuc : winecoreaudio.drv: Use debugstr_guid() to trace a guid.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: 5e7c8928115bab45b22054766e6efccefb060d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7c8928115bab45b22054766… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Aug 7 22:13:46 2016 +0200 winecoreaudio.drv: Use debugstr_guid() to trace a guid. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 8316d65..c362a51 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2956,7 +2956,7 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; - TRACE("(%p)->(%u, %p)\n", session, mute, context); + TRACE("(%p)->(%u, %s)\n", session, mute, debugstr_guid(context)); if(context) FIXME("Notifications not supported yet\n");

1 0

Bernhard Übelacker : kernel32/tests: Convert fiber back to thread even when IsThreadAFiber is not available.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: e2253d439fb8774cc3fbabdc371edc3ea5792110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2253d439fb8774cc3fbabdc3… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sat Aug 6 14:40:10 2016 +0200 kernel32/tests: Convert fiber back to thread even when IsThreadAFiber is not available. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 9ff9366..7501165 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -155,28 +155,20 @@ static void test_FiberHandling(void) ok(fiberCount == 1, "Wrong fiber count: %d\n", fiberCount); pDeleteFiber(fibers[1]); - if (!pCreateFiberEx) + if (pCreateFiberEx) { - win_skip( "CreateFiberEx not present\n" ); - return; - } - - fibers[1] = pCreateFiberEx(0,0,0,FiberMainProc,&testparam); - ok(fibers[1] != NULL, "CreateFiberEx failed with error %u\n", GetLastError()); - - pSwitchToFiber(fibers[1]); - ok(fiberCount == 2, "Wrong fiber count: %d\n", fiberCount); - pDeleteFiber(fibers[1]); + fibers[1] = pCreateFiberEx(0,0,0,FiberMainProc,&testparam); + ok(fibers[1] != NULL, "CreateFiberEx failed with error %u\n", GetLastError()); - if (!pIsThreadAFiber) - { - win_skip( "IsThreadAFiber not present\n" ); - return; + pSwitchToFiber(fibers[1]); + ok(fiberCount == 2, "Wrong fiber count: %d\n", fiberCount); + pDeleteFiber(fibers[1]); } + else win_skip( "CreateFiberEx not present\n" ); - ok(pIsThreadAFiber(), "IsThreadAFiber reported FALSE\n"); + if (pIsThreadAFiber) ok(pIsThreadAFiber(), "IsThreadAFiber reported FALSE\n"); test_ConvertFiberToThread(); - ok(!pIsThreadAFiber(), "IsThreadAFiber reported TRUE\n"); + if (pIsThreadAFiber) ok(!pIsThreadAFiber(), "IsThreadAFiber reported TRUE\n"); } static void test_FiberLocalStorage(void)

1 0

Józef Kucia : wined3d: Silence false FIXME message.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: eb5ed66aec7a7ccdd55f5dd402cc1bfc2b1ead60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5ed66aec7a7ccdd55f5dd40… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 5 19:41:41 2016 +0200 wined3d: Silence false FIXME message. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 626432b..5ccb027 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1784,7 +1784,7 @@ static void shader_glsl_declare_generic_vertex_attribute(struct wined3d_string_b index); return; } - if (e->sysval_semantic) + if (e->sysval_semantic && e->sysval_semantic != WINED3D_SV_POSITION) FIXME("Unhandled sysval semantic %#x.\n", e->sysval_semantic); if (shader_glsl_use_explicit_attrib_location(gl_info))

1 0