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

Alexandre Julliard : kernel32/nls: Convert remaining files to UTF-8.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: e0b75040137c9fe3a86dc1051ece6d151907ce20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b75040137c9fe3a86dc1051… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 16 15:40:44 2016 +0900 kernel32/nls: Convert remaining files to UTF-8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d2fb19d6f7bdf39cd5685bb2a467acd1b1c6089f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/tha.nls | 104 +++++++++++++++++++++++----------------------- dlls/kernel32/nls/vit.nls | 64 ++++++++++++++-------------- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/dlls/kernel32/nls/tha.nls b/dlls/kernel32/nls/tha.nls index 8602b0f..7e2e6ad 100644 --- a/dlls/kernel32/nls/tha.nls +++ b/dlls/kernel32/nls/tha.nls @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(874) +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT { @@ -65,37 +65,37 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_S1159 "AM" LOCALE_S2359 "PM" LOCALE_SABBREVCTRYNAME "THA" - LOCALE_SABBREVDAYNAME1 "�." - LOCALE_SABBREVDAYNAME2 "�." - LOCALE_SABBREVDAYNAME3 "�." - LOCALE_SABBREVDAYNAME4 "��." - LOCALE_SABBREVDAYNAME5 "�." - LOCALE_SABBREVDAYNAME6 "�." - LOCALE_SABBREVDAYNAME7 "��." + LOCALE_SABBREVDAYNAME1 "จ." + LOCALE_SABBREVDAYNAME2 "อ." + LOCALE_SABBREVDAYNAME3 "พ." + LOCALE_SABBREVDAYNAME4 "พฤ." + LOCALE_SABBREVDAYNAME5 "ศ." + LOCALE_SABBREVDAYNAME6 "ส." + LOCALE_SABBREVDAYNAME7 "อา." LOCALE_SABBREVLANGNAME "THA" - LOCALE_SABBREVMONTHNAME1 "�.�." - LOCALE_SABBREVMONTHNAME2 "�.�." - LOCALE_SABBREVMONTHNAME3 "��.�." - LOCALE_SABBREVMONTHNAME4 "��.�." - LOCALE_SABBREVMONTHNAME5 "�.�." - LOCALE_SABBREVMONTHNAME6 "��.�." - LOCALE_SABBREVMONTHNAME7 "�.�." - LOCALE_SABBREVMONTHNAME8 "�.�." - LOCALE_SABBREVMONTHNAME9 "�.�." - LOCALE_SABBREVMONTHNAME10 "�.�." - LOCALE_SABBREVMONTHNAME11 "�.�." - LOCALE_SABBREVMONTHNAME12 "�.�." + LOCALE_SABBREVMONTHNAME1 "ม.ค." + LOCALE_SABBREVMONTHNAME2 "ก.พ." + LOCALE_SABBREVMONTHNAME3 "มี.ค." + LOCALE_SABBREVMONTHNAME4 "เม.ย." + LOCALE_SABBREVMONTHNAME5 "พ.ค." + LOCALE_SABBREVMONTHNAME6 "มิ.ย." + LOCALE_SABBREVMONTHNAME7 "ก.ค." + LOCALE_SABBREVMONTHNAME8 "ส.ค." + LOCALE_SABBREVMONTHNAME9 "ก.ย." + LOCALE_SABBREVMONTHNAME10 "ต.ค." + LOCALE_SABBREVMONTHNAME11 "พ.ย." + LOCALE_SABBREVMONTHNAME12 "ธ.ค." LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Thailand" - LOCALE_SCURRENCY "�" + LOCALE_SCURRENCY "฿" LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�ѹ��" - LOCALE_SDAYNAME2 "�ѧ��" - LOCALE_SDAYNAME3 "�ظ" - LOCALE_SDAYNAME4 "��ʺ��" - LOCALE_SDAYNAME5 "�ء��" - LOCALE_SDAYNAME6 "��" - LOCALE_SDAYNAME7 "�ҷԵ��" + LOCALE_SDAYNAME1 "จันทร์" + LOCALE_SDAYNAME2 "อังคาร" + LOCALE_SDAYNAME3 "พุธ" + LOCALE_SDAYNAME4 "พฤหัสบดี" + LOCALE_SDAYNAME5 "ศุกร์" + LOCALE_SDAYNAME6 "เสาร์" + LOCALE_SDAYNAME7 "อาทิตย์" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Thailand" LOCALE_SENGCURRNAME "Thai Baht" @@ -109,38 +109,38 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "��Ҥ�" - LOCALE_SMONTHNAME2 "��Ҿѹ��" - LOCALE_SMONTHNAME3 "�չҤ�" - LOCALE_SMONTHNAME4 "��¹" - LOCALE_SMONTHNAME5 "��Ҥ�" - LOCALE_SMONTHNAME6 "�Զع�¹" - LOCALE_SMONTHNAME7 "�á�Ҥ�" - LOCALE_SMONTHNAME8 "�ԧ�Ҥ�" - LOCALE_SMONTHNAME9 "�ѹ��¹" - LOCALE_SMONTHNAME10 "��Ҥ�" - LOCALE_SMONTHNAME11 "��Ȩԡ�¹" - LOCALE_SMONTHNAME12 "�ѹ�Ҥ�" + LOCALE_SMONTHNAME1 "มกราคม" + LOCALE_SMONTHNAME2 "กุมภาพันธ์" + LOCALE_SMONTHNAME3 "มีนาคม" + LOCALE_SMONTHNAME4 "เมษายน" + LOCALE_SMONTHNAME5 "พฤษภาคม" + LOCALE_SMONTHNAME6 "มิถุนายน" + LOCALE_SMONTHNAME7 "กรกฎาคม" + LOCALE_SMONTHNAME8 "สิงหาคม" + LOCALE_SMONTHNAME9 "กันยายน" + LOCALE_SMONTHNAME10 "ตุลาคม" + LOCALE_SMONTHNAME11 "พฤศจิกายน" + LOCALE_SMONTHNAME12 "ธันวาคม" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "th-TH" - LOCALE_SNATIVECTRYNAME "��" - LOCALE_SNATIVECURRNAME "�ҷ" - LOCALE_SNATIVEDIGITS "��" - LOCALE_SNATIVEDISPLAYNAME "�� (��)" - LOCALE_SNATIVELANGNAME "��" + LOCALE_SNATIVECTRYNAME "ไทย" + LOCALE_SNATIVECURRNAME "บาท" + LOCALE_SNATIVEDIGITS "๐๑๒๓๔๕๖๗๘๙" + LOCALE_SNATIVEDISPLAYNAME "ไทย (ไทย)" + LOCALE_SNATIVELANGNAME "ไทย" LOCALE_SNEGATIVESIGN "-" LOCALE_SOPENTYPELANGUAGETAG "THA " LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Thai;" LOCALE_SSHORTDATE "d/M/yyyy" - LOCALE_SSHORTESTDAYNAME1 "�." - LOCALE_SSHORTESTDAYNAME2 "�." - LOCALE_SSHORTESTDAYNAME3 "�." - LOCALE_SSHORTESTDAYNAME4 "��." - LOCALE_SSHORTESTDAYNAME5 "�." - LOCALE_SSHORTESTDAYNAME6 "�." - LOCALE_SSHORTESTDAYNAME7 "��." + LOCALE_SSHORTESTDAYNAME1 "จ." + LOCALE_SSHORTESTDAYNAME2 "อ." + LOCALE_SSHORTESTDAYNAME3 "พ." + LOCALE_SSHORTESTDAYNAME4 "พฤ." + LOCALE_SSHORTESTDAYNAME5 "ศ." + LOCALE_SSHORTESTDAYNAME6 "ส." + LOCALE_SSHORTESTDAYNAME7 "อา." LOCALE_SSHORTTIME "H:mm" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," diff --git a/dlls/kernel32/nls/vit.nls b/dlls/kernel32/nls/vit.nls index 182b230..89b030c 100644 --- a/dlls/kernel32/nls/vit.nls +++ b/dlls/kernel32/nls/vit.nls @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1258) +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT { @@ -67,10 +67,10 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SABBREVCTRYNAME "VNM" LOCALE_SABBREVDAYNAME1 "hai" LOCALE_SABBREVDAYNAME2 "ba" - LOCALE_SABBREVDAYNAME3 "t�" - LOCALE_SABBREVDAYNAME4 "n�m" - LOCALE_SABBREVDAYNAME5 "sa�u" - LOCALE_SABBREVDAYNAME6 "ba�y" + LOCALE_SABBREVDAYNAME3 "tư" + LOCALE_SABBREVDAYNAME4 "năm" + LOCALE_SABBREVDAYNAME5 "sáu" + LOCALE_SABBREVDAYNAME6 "bảy" LOCALE_SABBREVDAYNAME7 "cn" LOCALE_SABBREVLANGNAME "VIT" LOCALE_SABBREVMONTHNAME1 "th1" @@ -87,15 +87,15 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME12 "th12" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Viet Nam" - LOCALE_SCURRENCY "�" + LOCALE_SCURRENCY "₫" LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "th�� hai" - LOCALE_SDAYNAME2 "th�� ba" - LOCALE_SDAYNAME3 "th�� t�" - LOCALE_SDAYNAME4 "th�� n�m" - LOCALE_SDAYNAME5 "th�� sa�u" - LOCALE_SDAYNAME6 "th�� ba�y" - LOCALE_SDAYNAME7 "chu� nh��t" + LOCALE_SDAYNAME1 "thứ hai" + LOCALE_SDAYNAME2 "thứ ba" + LOCALE_SDAYNAME3 "thứ tư" + LOCALE_SDAYNAME4 "thứ năm" + LOCALE_SDAYNAME5 "thứ sáu" + LOCALE_SDAYNAME6 "thứ bảy" + LOCALE_SDAYNAME7 "chủ nhật" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Viet Nam" LOCALE_SENGCURRNAME "Vietnamese Dong" @@ -109,26 +109,26 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "tha�ng m��t" - LOCALE_SMONTHNAME2 "tha�ng hai" - LOCALE_SMONTHNAME3 "tha�ng ba" - LOCALE_SMONTHNAME4 "tha�ng t�" - LOCALE_SMONTHNAME5 "tha�ng n�m" - LOCALE_SMONTHNAME6 "tha�ng sa�u" - LOCALE_SMONTHNAME7 "tha�ng ba�y" - LOCALE_SMONTHNAME8 "tha�ng ta�m" - LOCALE_SMONTHNAME9 "tha�ng chi�n" - LOCALE_SMONTHNAME10 "tha�ng m��i" - LOCALE_SMONTHNAME11 "tha�ng m��i m��t" - LOCALE_SMONTHNAME12 "tha�ng m��i hai" + LOCALE_SMONTHNAME1 "tháng một" + LOCALE_SMONTHNAME2 "tháng hai" + LOCALE_SMONTHNAME3 "tháng ba" + LOCALE_SMONTHNAME4 "tháng tư" + LOCALE_SMONTHNAME5 "tháng năm" + LOCALE_SMONTHNAME6 "tháng sáu" + LOCALE_SMONTHNAME7 "tháng bảy" + LOCALE_SMONTHNAME8 "tháng tám" + LOCALE_SMONTHNAME9 "tháng chín" + LOCALE_SMONTHNAME10 "tháng mười" + LOCALE_SMONTHNAME11 "tháng mười một" + LOCALE_SMONTHNAME12 "tháng mười hai" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." LOCALE_SNAME "vi-VN" - LOCALE_SNATIVECTRYNAME "Vi��t Nam" + LOCALE_SNATIVECTRYNAME "Việt Nam" LOCALE_SNATIVECURRNAME L"Do\x0302\x0300ng" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVEDISPLAYNAME "Ti��ng Vi��t Nam (Vi��t Nam)" - LOCALE_SNATIVELANGNAME "Ti��ng Vi��t Nam" + LOCALE_SNATIVEDISPLAYNAME "Tiếng Việt Nam (Việt Nam)" + LOCALE_SNATIVELANGNAME "Tiếng Việt Nam" LOCALE_SNEGATIVESIGN "-" LOCALE_SOPENTYPELANGUAGETAG "VIT " LOCALE_SPOSITIVESIGN "" @@ -136,10 +136,10 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SSHORTDATE "dd/MM/yyyy" LOCALE_SSHORTESTDAYNAME1 "hai" LOCALE_SSHORTESTDAYNAME2 "ba" - LOCALE_SSHORTESTDAYNAME3 "t�" - LOCALE_SSHORTESTDAYNAME4 "n�m" - LOCALE_SSHORTESTDAYNAME5 "sa�u" - LOCALE_SSHORTESTDAYNAME6 "ba�y" + LOCALE_SSHORTESTDAYNAME3 "tư" + LOCALE_SSHORTESTDAYNAME4 "năm" + LOCALE_SSHORTESTDAYNAME5 "sáu" + LOCALE_SSHORTESTDAYNAME6 "bảy" LOCALE_SSHORTESTDAYNAME7 "cn" LOCALE_SSHORTTIME "h:mm tt" LOCALE_SSORTNAME "Default"

1 0

Sebastian Lackner : ntoskrnl.exe: Add missing linebreak to FIXME in KeDelayExecutionThread.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: eb5c60dc5a4678c0898dfc283563640c93d5fd14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5c60dc5a4678c0898dfc283… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 4 21:01:34 2016 +0200 ntoskrnl.exe: Add missing linebreak to FIXME in KeDelayExecutionThread. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6c8f398e485b83a0794d530e25f2fcc1027f7997) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 74dfae5..6b0ea0c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2423,6 +2423,6 @@ NTSTATUS WINAPI CmUnRegisterCallback(LARGE_INTEGER cookie) */ NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE waitmode, BOOLEAN alertable, PLARGE_INTEGER interval) { - FIXME("%u %u %p", waitmode, alertable, interval); + FIXME("(%u, %u, %p): stub\n", waitmode, alertable, interval); return STATUS_NOT_IMPLEMENTED; }

1 0

Austin English : ntoskrnl.exe: Add PsRemoveLoadImageNotifyRoutine stub.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: b269bf3716c8270343295c5bf6cb3ccf53dffe41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b269bf3716c8270343295c5bf… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Apr 3 19:56:30 2016 -0500 ntoskrnl.exe: Add PsRemoveLoadImageNotifyRoutine stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b1c02353dfa793bbd360f94f8319cfb9d1c65fec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 04f0198..a627492 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2077,6 +2077,16 @@ NTSTATUS WINAPI PsRemoveCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE /*********************************************************************** + * PsRemoveLoadImageNotifyRoutine (NTOSKRNL.EXE.@) + */ + NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) + { + FIXME( "stub: %p\n", NotifyRoutine ); + return STATUS_SUCCESS; + } + + +/*********************************************************************** * PsTerminateSystemThread (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS ExitStatus) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index db15265..d6d27fa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -899,7 +899,7 @@ @ stub PsReferenceImpersonationToken @ stub PsReferencePrimaryToken @ stdcall PsRemoveCreateThreadNotifyRoutine(ptr) -@ stub PsRemoveLoadImageNotifyRoutine +@ stdcall PsRemoveLoadImageNotifyRoutine(ptr) @ stub PsRestoreImpersonation @ stub PsReturnPoolQuota @ stub PsReturnProcessNonPagedPoolQuota

1 0

Austin English : kernel32: Add GetConsoleFontInfo stub.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 59bf117046c19a509388f552a3e1e7ac4e75027d URL: http://source.winehq.org/git/wine.git/?a=commit;h=59bf117046c19a509388f552a… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 18 20:20:50 2016 -0500 kernel32: Add GetConsoleFontInfo stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 77733651ad3b45a4eb0dbbeca4318714fa041116) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/console.c | 7 +++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 99f2061..179e14e 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3322,6 +3322,13 @@ COORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index) } #endif /* !defined(__i386__) */ +BOOL WINAPI GetConsoleFontInfo(HANDLE hConsole, BOOL maximize, DWORD numfonts, CONSOLE_FONT_INFO *info) +{ + FIXME("(%p %d %u %p): stub!\n", hConsole, maximize, numfonts, info); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + BOOL WINAPI GetConsoleScreenBufferInfoEx(HANDLE hConsole, CONSOLE_SCREEN_BUFFER_INFOEX *csbix) { FIXME("(%p %p): stub!\n", hConsole, csbix); diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 80f9be3..d29c5cb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -599,7 +599,7 @@ @ stdcall GetConsoleCursorInfo(long ptr) @ stub GetConsoleCursorMode @ stdcall GetConsoleDisplayMode(ptr) -@ stub GetConsoleFontInfo +@ stdcall GetConsoleFontInfo(ptr long long ptr) @ stdcall GetConsoleFontSize(long long) @ stub GetConsoleHardwareState # @ stub GetConsoleHistoryInfo

1 0

Sebastian Lackner : kernel32/tests: Disable Windows version dependent test for pcPriClassBase.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: cc4c22022c82408bc65f4c886cc6300e6bb45925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc4c22022c82408bc65f4c886… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 08:58:28 2016 +0100 kernel32/tests: Disable Windows version dependent test for pcPriClassBase. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 748103663c6ec160c302f220c16fd53532689020) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 1277af6..a9084f8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1131,7 +1131,7 @@ static void test_Toolhelp(void) okChildInt("Toolhelp", "th32DefaultHeapID", 0); okChildInt("Toolhelp", "th32ModuleID", 0); okChildInt("Toolhelp", "th32ParentProcessID", GetCurrentProcessId()); - todo_wine okChildInt("Toolhelp", "pcPriClassBase", 8); + /* pcPriClassBase differs between Windows versions (either 6 or 8) */ okChildInt("Toolhelp", "dwFlags", 0); release_memory(); @@ -1202,7 +1202,7 @@ static void test_Toolhelp(void) okChildInt("Toolhelp", "th32DefaultHeapID", 0); okChildInt("Toolhelp", "th32ModuleID", 0); okChildInt("Toolhelp", "th32ParentProcessID", info.dwProcessId); - todo_wine okChildInt("Toolhelp", "pcPriClassBase", 8); + /* pcPriClassBase differs between Windows versions (either 6 or 8) */ okChildInt("Toolhelp", "dwFlags", 0); release_memory();

1 0

Aurimas Fišeras : kernel32/nls: Update currency for Baltic states.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 04fdd6d9c72e43048b592447c6ef4506d9d8f46c URL: http://source.winehq.org/git/wine.git/?a=commit;h=04fdd6d9c72e43048b592447c… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Apr 27 19:10:22 2016 +0300 kernel32/nls: Update currency for Baltic states. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4eca454729bfb7764e461267f55915992bfa3773) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/eti.nls | 6 +++--- dlls/kernel32/nls/lth.nls | 6 +++--- dlls/kernel32/nls/lvi.nls | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/nls/eti.nls b/dlls/kernel32/nls/eti.nls index cd7b3b2..b9cf956 100644 --- a/dlls/kernel32/nls/eti.nls +++ b/dlls/kernel32/nls/eti.nls @@ -87,7 +87,7 @@ STRINGTABLE LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME12 "dets" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Estonia" - LOCALE_SCURRENCY "kr" + LOCALE_SCURRENCY "€" LOCALE_SDATE "." LOCALE_SDAYNAME1 "esmaspäev" LOCALE_SDAYNAME2 "teisipäev" @@ -98,7 +98,7 @@ STRINGTABLE LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT LOCALE_SDAYNAME7 "pühapäev" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Estonia" - LOCALE_SENGCURRNAME "Estonian Kroon" + LOCALE_SENGCURRNAME "Euro" LOCALE_SENGLANGUAGE "Estonian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "EEK" @@ -125,7 +125,7 @@ STRINGTABLE LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "et-EE" LOCALE_SNATIVECTRYNAME "Eesti" - LOCALE_SNATIVECURRNAME "Kroon" + LOCALE_SNATIVECURRNAME "Euro" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVEDISPLAYNAME "eesti (Eesti)" LOCALE_SNATIVELANGNAME "eesti" diff --git a/dlls/kernel32/nls/lth.nls b/dlls/kernel32/nls/lth.nls index 7b44d6a..46a766e 100644 --- a/dlls/kernel32/nls/lth.nls +++ b/dlls/kernel32/nls/lth.nls @@ -87,7 +87,7 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN LOCALE_SABBREVMONTHNAME12 "Grd" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Lithuania" - LOCALE_SCURRENCY "Lt" + LOCALE_SCURRENCY "€" LOCALE_SDATE "." LOCALE_SDAYNAME1 "pirmadienis" LOCALE_SDAYNAME2 "antradienis" @@ -98,7 +98,7 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN LOCALE_SDAYNAME7 "sekmadienis" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Lithuania" - LOCALE_SENGCURRNAME "Lithuanian Litas" + LOCALE_SENGCURRNAME "Euro" LOCALE_SENGLANGUAGE "Lithuanian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "LTL" @@ -125,7 +125,7 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN LOCALE_SMONTHOUSANDSEP "." LOCALE_SNAME "lt-LT" LOCALE_SNATIVECTRYNAME "Lietuva" - LOCALE_SNATIVECURRNAME "Litas" + LOCALE_SNATIVECURRNAME "Euras" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVEDISPLAYNAME "lietuvių (Lietuva)" LOCALE_SNATIVELANGNAME "lietuvių" diff --git a/dlls/kernel32/nls/lvi.nls b/dlls/kernel32/nls/lvi.nls index f1dcb2f..8a7a8e7 100644 --- a/dlls/kernel32/nls/lvi.nls +++ b/dlls/kernel32/nls/lvi.nls @@ -87,7 +87,7 @@ STRINGTABLE LANGUAGE LANG_LATVIAN, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME12 "Dec" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Latvia" - LOCALE_SCURRENCY "Ls" + LOCALE_SCURRENCY "€" LOCALE_SDATE "." LOCALE_SDAYNAME1 "pirmdiena" LOCALE_SDAYNAME2 "otrdiena" @@ -98,7 +98,7 @@ STRINGTABLE LANGUAGE LANG_LATVIAN, SUBLANG_DEFAULT LOCALE_SDAYNAME7 "svētdiena" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Latvia" - LOCALE_SENGCURRNAME "Latvian Lats" + LOCALE_SENGCURRNAME "Euro" LOCALE_SENGLANGUAGE "Latvian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "LVL" @@ -125,7 +125,7 @@ STRINGTABLE LANGUAGE LANG_LATVIAN, SUBLANG_DEFAULT LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "lv-LV" LOCALE_SNATIVECTRYNAME "Latvija" - LOCALE_SNATIVECURRNAME "Lats" + LOCALE_SNATIVECURRNAME "Eiro" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVEDISPLAYNAME "latviešu (Latvija)" LOCALE_SNATIVELANGNAME "latviešu"

1 0

Austin English : ntoskrnl.exe: Add KeDelayExecutionThread stub.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: bb2d1c725832e93e2c97b6f36cb61c0fd56911d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb2d1c725832e93e2c97b6f36… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Apr 3 19:57:36 2016 -0500 ntoskrnl.exe: Add KeDelayExecutionThread stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c6373260e03dc6a59428db6445f725bfb41ec9ce) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a627492..74dfae5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2417,3 +2417,12 @@ NTSTATUS WINAPI CmUnRegisterCallback(LARGE_INTEGER cookie) FIXME("(%s): stub\n", wine_dbgstr_longlong(cookie.QuadPart)); return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * KeDelayExecutionThread (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE waitmode, BOOLEAN alertable, PLARGE_INTEGER interval) +{ + FIXME("%u %u %p", waitmode, alertable, interval); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d6d27fa..b32c5e8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -518,7 +518,7 @@ @ stub KeClearEvent @ stub KeConnectInterrupt @ stub KeDcacheFlushCount -@ stub KeDelayExecutionThread +@ stdcall KeDelayExecutionThread(long long ptr) @ stub KeDeregisterBugCheckCallback @ stub KeDeregisterBugCheckReasonCallback @ stub KeDetachProcess

1 0

Austin English : winscard: Add stubs for SCardListReadersA/W.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 9b30a5ecc1414f7171565b77dda151d70d33bb51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b30a5ecc1414f7171565b77d… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Mar 20 22:58:27 2016 -0500 winscard: Add stubs for SCardListReadersA/W. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c1614094f4c1e6cbde0f357b9dd910b64db9d4f9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winscard/winscard.c | 12 ++++++++++++ dlls/winscard/winscard.spec | 4 ++-- include/winscard.h | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index bcf8129..a8a1735 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -129,3 +129,15 @@ void WINAPI SCardReleaseStartedEvent(void) { FIXME("stub\n"); } + +LONG WINAPI SCardListReadersA(SCARDCONTEXT context, const CHAR *groups, CHAR *readers, DWORD *buflen) +{ + FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_a(groups), readers, buflen); + return SCARD_E_NO_READERS_AVAILABLE; +} + +LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR *readers, DWORD *buflen) +{ + FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); + return SCARD_E_NO_READERS_AVAILABLE; +} diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index 8ecf988..5fd8903 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -40,8 +40,8 @@ @ stub SCardListInterfacesW @ stub SCardListReaderGroupsA @ stub SCardListReaderGroupsW -@ stub SCardListReadersA -@ stub SCardListReadersW +@ stdcall SCardListReadersA(long str ptr ptr) +@ stdcall SCardListReadersW(long wstr ptr ptr) @ stub SCardLocateCardsA @ stub SCardLocateCardsByATRA @ stub SCardLocateCardsByATRW diff --git a/include/winscard.h b/include/winscard.h index 884d350..fc729e2 100644 --- a/include/winscard.h +++ b/include/winscard.h @@ -120,8 +120,8 @@ LONG WINAPI SCardListCardsW(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPWSTR,LPD LONG WINAPI SCardListInterfacesA(SCARDCONTEXT,LPCSTR,LPGUID,LPDWORD); LONG WINAPI SCardListInterfacesW(SCARDCONTEXT,LPCWSTR,LPGUID,LPDWORD); #define SCardListInterfaces WINELIB_NAME_AW(SCardListInterfaces) -LONG WINAPI SCardListReadersA(SCARDCONTEXT,LPCSTR,LPSTR,LPDWORD); -LONG WINAPI SCardListReadersW(SCARDCONTEXT,LPCWSTR,LPWSTR,LPDWORD); +LONG WINAPI SCardListReadersA(SCARDCONTEXT,const CHAR *,CHAR *,DWORD *); +LONG WINAPI SCardListReadersW(SCARDCONTEXT,const WCHAR *,WCHAR *,DWORD *); #define SCardListReaders WINELIB_NAME_AW(SCardListReaders) LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT,LPSTR,LPDWORD); LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT,LPWSTR,LPDWORD);

1 0

Louis Lenders : ntdll: Add stub for RtlAddAccessDeniedObjectAce and forward to AddAccessDeniedObjectAce in advapi32.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: ae5af823b8b5a7f579e2fa203cf1add2a5b13b82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5af823b8b5a7f579e2fa203… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Mar 4 08:40:39 2016 +0100 ntdll: Add stub for RtlAddAccessDeniedObjectAce and forward to AddAccessDeniedObjectAce in advapi32. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit eee837e9314e8bb3eb2f8d27f280560996bf7714) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 16 ++++++++++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-2-0.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/sec.c | 17 +++++++++++++++++ include/winternl.h | 1 + 8 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index faae877..0d70bcc 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -19,7 +19,7 @@ @ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) @ stdcall AddAccessDeniedAce(ptr long long ptr) @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) -# @ stub AddAccessDeniedObjectAce +@ stdcall AddAccessDeniedObjectAce(ptr long long long ptr ptr ptr) @ stdcall AddAce(ptr long long ptr long) @ stdcall AddAuditAccessAce(ptr long long ptr long long) @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index b74b1a1..c8a6579 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1683,6 +1683,22 @@ BOOL WINAPI AddAccessDeniedAceEx( } /****************************************************************************** + * AddAccessDeniedObjectAce [ADVAPI32.@] + */ +BOOL WINAPI AddAccessDeniedObjectAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwAccessMask, + IN GUID* pObjectTypeGuid, + IN GUID* pInheritedObjectTypeGuid, + IN PSID pSid) +{ + return set_ntstatus( RtlAddAccessDeniedObjectAce(pAcl, dwAceRevision, dwAceFlags, dwAccessMask, + pObjectTypeGuid, pInheritedObjectTypeGuid, pSid) ); +} + +/****************************************************************************** * AddAce [ADVAPI32.@] */ BOOL WINAPI AddAce( diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 6c8a5e7..9cc4d82 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -10,7 +10,7 @@ @ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessAllowedObjectAce @ stdcall AddAccessDeniedAce(ptr long long ptr) advapi32.AddAccessDeniedAce @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) advapi32.AddAccessDeniedAceEx -@ stub AddAccessDeniedObjectAce +@ stdcall AddAccessDeniedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessDeniedObjectAce @ stdcall AddAce(ptr long long ptr long) advapi32.AddAce @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index 1cc6206..083c921 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -10,7 +10,7 @@ @ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessAllowedObjectAce @ stdcall AddAccessDeniedAce(ptr long long ptr) advapi32.AddAccessDeniedAce @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) advapi32.AddAccessDeniedAceEx -@ stub AddAccessDeniedObjectAce +@ stdcall AddAccessDeniedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessDeniedObjectAce @ stdcall AddAce(ptr long long ptr long) advapi32.AddAce @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index 83ecd50..fc3e5f4 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -10,7 +10,7 @@ @ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessAllowedObjectAce @ stdcall AddAccessDeniedAce(ptr long long ptr) advapi32.AddAccessDeniedAce @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) advapi32.AddAccessDeniedAceEx -@ stub AddAccessDeniedObjectAce +@ stdcall AddAccessDeniedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessDeniedObjectAce @ stdcall AddAce(ptr long long ptr long) advapi32.AddAce @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9910043..2c1be0e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -410,7 +410,7 @@ @ stdcall RtlAddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) @ stdcall RtlAddAccessDeniedAce(ptr long long ptr) @ stdcall RtlAddAccessDeniedAceEx(ptr long long long ptr) -# @ stub RtlAddAccessDeniedObjectAce +@ stdcall RtlAddAccessDeniedObjectAce(ptr long long long ptr ptr ptr) @ stdcall RtlAddAce(ptr long long ptr long) @ stub RtlAddActionToRXact @ stdcall RtlAddAtomToAtomTable(ptr wstr ptr) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index d4739d5..3bc52ac 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1304,6 +1304,23 @@ NTSTATUS WINAPI RtlAddAccessDeniedAceEx( AccessMask, pSid, ACCESS_DENIED_ACE_TYPE); } +/****************************************************************************** + * RtlAddAccessDeniedObjectAce [NTDLL.@] + */ +NTSTATUS WINAPI RtlAddAccessDeniedObjectAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwAccessMask, + IN GUID* pObjectTypeGuid, + IN GUID* pInheritedObjectTypeGuid, + IN PSID pSid) +{ + FIXME("%p %x %x %x %p %p %p - stub\n", pAcl, dwAceRevision, dwAceFlags, dwAccessMask, + pObjectTypeGuid, pInheritedObjectTypeGuid, pSid); + return STATUS_NOT_IMPLEMENTED; +} + /************************************************************************** * RtlAddAuditAccessAce [NTDLL.@] */ diff --git a/include/winternl.h b/include/winternl.h index 179a84a..e86faba 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2346,6 +2346,7 @@ NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedAce(PACL,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedAceEx(PACL,DWORD,DWORD,DWORD,PSID); +NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAtomToAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_ATOM*); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL);

1 0

Louis Lenders : ntdll: Add stub for RtlAddAccessAllowedObjectAce and forward to AddAccessAllowedObjectAce in advapi32.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 62c627a6334aa19d848cbfaeb333b65969dedeea URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c627a6334aa19d848cbfaeb… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Mar 1 22:34:05 2016 +0100 ntdll: Add stub for RtlAddAccessAllowedObjectAce and forward to AddAccessAllowedObjectAce in advapi32. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c63d417222fd9093c3162469ca64feb6c41b6cb1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 16 ++++++++++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-2-0.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/sec.c | 17 +++++++++++++++++ include/winternl.h | 1 + 8 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index ddde272..faae877 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -16,7 +16,7 @@ # @ stub AccessCheckByTypeResultListAndAuditAlarmW @ stdcall AddAccessAllowedAce (ptr long long ptr) @ stdcall AddAccessAllowedAceEx (ptr long long long ptr) -# @ stub AddAccessAllowedObjectAce +@ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) @ stdcall AddAccessDeniedAce(ptr long long ptr) @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) # @ stub AddAccessDeniedObjectAce diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 5746218..b74b1a1 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1642,6 +1642,22 @@ BOOL WINAPI AddAccessAllowedAceEx( } /****************************************************************************** + * AddAccessAllowedObjectAce [ADVAPI32.@] + */ +BOOL WINAPI AddAccessAllowedObjectAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwAccessMask, + IN GUID* pObjectTypeGuid, + IN GUID* pInheritedObjectTypeGuid, + IN PSID pSid) +{ + return set_ntstatus(RtlAddAccessAllowedObjectAce(pAcl, dwAceRevision, dwAceFlags, dwAccessMask, + pObjectTypeGuid, pInheritedObjectTypeGuid, pSid)); +} + +/****************************************************************************** * AddAccessDeniedAce [ADVAPI32.@] */ BOOL WINAPI AddAccessDeniedAce( diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index bd6b1f9..6c8a5e7 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -7,7 +7,7 @@ @ stub AccessCheckByTypeResultListAndAuditAlarmW @ stdcall AddAccessAllowedAce(ptr long long ptr) advapi32.AddAccessAllowedAce @ stdcall AddAccessAllowedAceEx(ptr long long long ptr) advapi32.AddAccessAllowedAceEx -@ stub AddAccessAllowedObjectAce +@ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessAllowedObjectAce @ stdcall AddAccessDeniedAce(ptr long long ptr) advapi32.AddAccessDeniedAce @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) advapi32.AddAccessDeniedAceEx @ stub AddAccessDeniedObjectAce diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index d1fdff4..1cc6206 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -7,7 +7,7 @@ @ stub AccessCheckByTypeResultListandAuditAlarmW @ stdcall AddAccessAllowedAce(ptr long long ptr) advapi32.AddAccessAllowedAce @ stdcall AddAccessAllowedAceEx(ptr long long long ptr) advapi32.AddAccessAllowedAceEx -@ stub AddAccessAllowedObjectAce +@ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessAllowedObjectAce @ stdcall AddAccessDeniedAce(ptr long long ptr) advapi32.AddAccessDeniedAce @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) advapi32.AddAccessDeniedAceEx @ stub AddAccessDeniedObjectAce diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index 01c7c01..83ecd50 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -7,7 +7,7 @@ @ stub AccessCheckByTypeResultListAndAuditAlarmW @ stdcall AddAccessAllowedAce(ptr long long ptr) advapi32.AddAccessAllowedAce @ stdcall AddAccessAllowedAceEx(ptr long long long ptr) advapi32.AddAccessAllowedAceEx -@ stub AddAccessAllowedObjectAce +@ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessAllowedObjectAce @ stdcall AddAccessDeniedAce(ptr long long ptr) advapi32.AddAccessDeniedAce @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) advapi32.AddAccessDeniedAceEx @ stub AddAccessDeniedObjectAce diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 631c568..9910043 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -407,7 +407,7 @@ @ stub RtlActivateActivationContextUnsafeFast @ stdcall RtlAddAccessAllowedAce(ptr long long ptr) @ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr) -# @ stub RtlAddAccessAllowedObjectAce +@ stdcall RtlAddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) @ stdcall RtlAddAccessDeniedAce(ptr long long ptr) @ stdcall RtlAddAccessDeniedAceEx(ptr long long long ptr) # @ stub RtlAddAccessDeniedObjectAce diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 34de33b..d4739d5 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1260,6 +1260,23 @@ NTSTATUS WINAPI RtlAddAccessAllowedAceEx( } /****************************************************************************** + * RtlAddAccessAllowedObjectAce [NTDLL.@] + */ +NTSTATUS WINAPI RtlAddAccessAllowedObjectAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwAccessMask, + IN GUID* pObjectTypeGuid, + IN GUID* pInheritedObjectTypeGuid, + IN PSID pSid) +{ + FIXME("%p %x %x %x %p %p %p - stub\n", pAcl, dwAceRevision, dwAceFlags, dwAccessMask, + pObjectTypeGuid, pInheritedObjectTypeGuid, pSid); + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** * RtlAddAccessDeniedAce [NTDLL.@] */ NTSTATUS WINAPI RtlAddAccessDeniedAce( diff --git a/include/winternl.h b/include/winternl.h index d5c8259..179a84a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2343,6 +2343,7 @@ NTSYSAPI NTSTATUS WINAPI RtlActivateActivationContext(DWORD,HANDLE,ULONG_PTR*); NTSYSAPI NTSTATUS WINAPI RtlAddAce(PACL,DWORD,DWORD,PACE_HEADER,DWORD); NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedAce(PACL,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); +NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedAce(PACL,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedAceEx(PACL,DWORD,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAtomToAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_ATOM*);

1 0