March 2008 - Wine-Commits - list.winehq.org

Dan Hipschman : advapi32: Add a stub for CreateRestrictedToken.
by Alexandre Julliard March 22, 2008

March 22, 2008

Module: wine Branch: master Commit: 2904f543f4593c5101b32b1044794f36d62bd7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2904f543f4593c5101b32b104… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Mar 21 15:37:36 2008 -0700 advapi32: Add a stub for CreateRestrictedToken. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 1 + include/winnt.h | 2 +- 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 38ae793..d066f5c 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -97,7 +97,7 @@ # @ stub CreateProcessAsUserSecure @ stdcall CreateProcessAsUserW(long str str ptr ptr long long ptr str ptr ptr) @ stdcall CreateProcessWithLogonW(wstr wstr wstr long wstr wstr long ptr wstr ptr ptr) -# @ stub CreateRestrictedToken +@ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) @ stdcall CreateServiceA(long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) @ stdcall CreateServiceW (long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) # @ stub CreateTraceInstanceId diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index b8c0a31..333ad86 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -734,6 +734,46 @@ BOOL WINAPI SetThreadToken(PHANDLE thread, HANDLE token) ThreadImpersonationToken, &token, sizeof token )); } +/************************************************************************* + * CreateRestrictedToken [ADVAPI32.@] + * + * Create a new more restricted token from an existing token. + * + * PARAMS + * baseToken [I] Token to base the new restricted token on + * flags [I] Options + * nDisableSids [I] Length of disableSids array + * disableSids [I] Array of SIDs to disable in the new token + * nDeletePrivs [I] Length of deletePrivs array + * deletePrivs [I] Array of privileges to delete in the new token + * nRestrictSids [I] Length of restrictSids array + * restrictSids [I] Array of SIDs to restrict in the new token + * newToken [O] Address where the new token is stored + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI CreateRestrictedToken( + HANDLE baseToken, + DWORD flags, + DWORD nDisableSids, + PSID_AND_ATTRIBUTES disableSids, + DWORD nDeletePrivs, + PLUID_AND_ATTRIBUTES deletePrivs, + DWORD nRestrictSids, + PSID_AND_ATTRIBUTES restrictSids, + PHANDLE newToken) +{ + FIXME("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p): stub\n", + baseToken, flags, nDisableSids, disableSids, + nDeletePrivs, deletePrivs, + nRestrictSids, restrictSids, + newToken); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /* ############################## ###### SID FUNCTIONS ###### ############################## diff --git a/include/winbase.h b/include/winbase.h index 7a0cce0..03e3bbc 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1375,6 +1375,7 @@ WINADVAPI BOOL WINAPI CreateProcessAsUserA(HANDLE,LPCSTR,LPSTR,LPSECURIT WINADVAPI BOOL WINAPI CreateProcessAsUserW(HANDLE,LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); #define CreateProcessAsUser WINELIB_NAME_AW(CreateProcessAsUser) WINBASEAPI HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); +WINADVAPI BOOL WINAPI CreateRestrictedToken(HANDLE,DWORD,DWORD,PSID_AND_ATTRIBUTES,DWORD,PLUID_AND_ATTRIBUTES,DWORD,PSID_AND_ATTRIBUTES,PHANDLE); WINBASEAPI HANDLE WINAPI CreateSemaphoreA(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCSTR); WINBASEAPI HANDLE WINAPI CreateSemaphoreW(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCWSTR); #define CreateSemaphore WINELIB_NAME_AW(CreateSemaphore) diff --git a/include/winnt.h b/include/winnt.h index 78c44a5..96ed387 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3535,7 +3535,7 @@ typedef struct { typedef struct _SID_AND_ATTRIBUTES { PSID Sid; DWORD Attributes; -} SID_AND_ATTRIBUTES; +} SID_AND_ATTRIBUTES, *PSID_AND_ATTRIBUTES; /* security entities */ #define SECURITY_NULL_RID (0x00000000L)

1 0

Detlef Riekenberg : ntoskrnl.exe: Implement MmIsAddressValid.
by Alexandre Julliard March 22, 2008

March 22, 2008

Module: wine Branch: master Commit: f3380958bda9d53475ad5d14aa2ccf1ae7ab2e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3380958bda9d53475ad5d14a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 21 21:25:40 2008 +0100 ntoskrnl.exe: Implement MmIsAddressValid. --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 149cb51..6a3c9f3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -562,6 +562,25 @@ void WINAPI MmFreeNonCachedMemory( void *addr, SIZE_T size ) } /*********************************************************************** + * MmIsAddressValid (NTOSKRNL.EXE.@) + * + * Check if the process can access the virtual address without a pagefault + * + * PARAMS + * VirtualAddress [I] Address to check + * + * RETURNS + * Failure: FALSE + * Success: TRUE (Accessing the Address works without a Pagefault) + * + */ +BOOLEAN WINAPI MmIsAddressValid(PVOID VirtualAddress) +{ + TRACE("(%p)\n", VirtualAddress); + return !IsBadWritePtr(VirtualAddress, 1); +} + +/*********************************************************************** * MmPageEntireDriver (NTOSKRNL.EXE.@) */ PVOID WINAPI MmPageEntireDriver(PVOID AddrInSection) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index dbe2152..461bf28 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -679,7 +679,7 @@ @ stub MmGetVirtualForPhysical @ stub MmGrowKernelStack @ stub MmHighestUserAddress -@ stub MmIsAddressValid +@ stdcall MmIsAddressValid(ptr) @ stub MmIsDriverVerifying @ stub MmIsNonPagedSystemAddressValid @ stub MmIsRecursiveIoFault

1 0

Alexandre Julliard : wrc: parser_error must append a newline.
by Alexandre Julliard March 22, 2008

March 22, 2008

Module: wine Branch: master Commit: 0a16b6b81f065eab2b596b74135e07e5a998509b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a16b6b81f065eab2b596b741… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 21 21:12:15 2008 +0100 wrc: parser_error must append a newline. --- tools/wrc/newstruc.c | 28 +++++++++++++------------- tools/wrc/parser.l | 30 ++++++++++++++-------------- tools/wrc/parser.y | 52 +++++++++++++++++++++++++------------------------- tools/wrc/utils.c | 5 ++- 4 files changed, 58 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a16b6b81f065eab2b596…

1 0

Alexandre Julliard : notepad: Use the larger icon in the About dialog.
by Alexandre Julliard March 22, 2008

March 22, 2008

Module: wine Branch: master Commit: 247754fba21bf87ded04ccc038b0a69a125f0895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=247754fba21bf87ded04ccc03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 21 18:39:31 2008 +0100 notepad: Use the larger icon in the About dialog. --- programs/notepad/dialog.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index ea469c1..2e75076 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -783,9 +783,10 @@ VOID DIALOG_HelpNoWarranty(VOID) VOID DIALOG_HelpAboutWine(VOID) { - static const WCHAR notepadW[] = { 'N','o','t','e','p','a','d','\n',0 }; + static const WCHAR notepadW[] = { 'W','i','n','e',' ','N','o','t','e','p','a','d',0 }; WCHAR szNotepad[MAX_STRING_LEN]; - HICON icon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD)); + HICON icon = LoadImageW( Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD), + IMAGE_ICON, 48, 48, LR_SHARED ); LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); ShellAbout(Globals.hMainWnd, szNotepad, notepadW, icon);

1 0

Alexandre Julliard : shell32: Use the larger Wine logo icon in the About dialog.
by Alexandre Julliard March 22, 2008

March 22, 2008

Module: wine Branch: master Commit: 0dbeea527512b7105adb9dc1eb5f4f8db19ae6c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dbeea527512b7105adb9dc1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 21 18:39:11 2008 +0100 shell32: Use the larger Wine logo icon in the About dialog. --- dlls/shell32/shell32_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 870e5e6..4163168 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1088,9 +1088,10 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, return FALSE; if(!(template = LoadResource(shell32_hInstance, hRes))) return FALSE; + if (!hIcon) hIcon = LoadImageW( 0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, 48, 48, LR_SHARED ); info.szApp = szApp; info.szOtherStuff = szOtherStuff; - info.hIcon = hIcon ? hIcon : LoadIconW( 0, (LPWSTR)IDI_WINLOGO ); + info.hIcon = hIcon; SystemParametersInfoW( SPI_GETICONTITLELOGFONT, 0, &logFont, 0 ); info.hFont = CreateFontIndirectW( &logFont );

1 0

Alexandre Julliard : shell32: Make the icon space a bit larger in the About dialog.
by Alexandre Julliard March 22, 2008

March 22, 2008

Module: wine Branch: master Commit: 77a79c48b4d5f4c05f89ca5bf7bd40a137df27dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a79c48b4d5f4c05f89ca5bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 21 18:38:51 2008 +0100 shell32: Make the icon space a bit larger in the About dialog. Also replace numeric ids by appropriate constants. --- dlls/shell32/shell32_Bg.rc | 10 +++++----- dlls/shell32/shell32_Ca.rc | 10 +++++----- dlls/shell32/shell32_Cn.rc | 10 +++++----- dlls/shell32/shell32_Cs.rc | 10 +++++----- dlls/shell32/shell32_Da.rc | 10 +++++----- dlls/shell32/shell32_De.rc | 10 +++++----- dlls/shell32/shell32_En.rc | 10 +++++----- dlls/shell32/shell32_Eo.rc | 9 +++++---- dlls/shell32/shell32_Es.rc | 10 +++++----- dlls/shell32/shell32_Fi.rc | 10 +++++----- dlls/shell32/shell32_Fr.rc | 10 +++++----- dlls/shell32/shell32_Hu.rc | 10 +++++----- dlls/shell32/shell32_It.rc | 10 +++++----- dlls/shell32/shell32_Ja.rc | 10 +++++----- dlls/shell32/shell32_Ko.rc | 10 +++++----- dlls/shell32/shell32_Nl.rc | 10 +++++----- dlls/shell32/shell32_No.rc | 10 +++++----- dlls/shell32/shell32_Pl.rc | 10 +++++----- dlls/shell32/shell32_Pt.rc | 20 ++++++++++---------- dlls/shell32/shell32_Ru.rc | 10 +++++----- dlls/shell32/shell32_Si.rc | 10 +++++----- dlls/shell32/shell32_Sk.rc | 10 +++++----- dlls/shell32/shell32_Sv.rc | 10 +++++----- dlls/shell32/shell32_Tr.rc | 10 +++++----- dlls/shell32/shell32_Uk.rc | 10 +++++----- dlls/shell32/shell32_Wa.rc | 10 +++++----- dlls/shell32/shell32_Zh.rc | 9 +++++---- dlls/shell32/shell32_main.c | 13 ++++--------- dlls/shell32/shres.rc | 1 + dlls/shell32/shresdef.h | 6 ++++++ 30 files changed, 151 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77a79c48b4d5f4c05f89c…

1 0

Herve Chanal : user32: A nicer icon for oic_winlogo.
by Alexandre Julliard March 22, 2008

March 22, 2008

Module: wine Branch: master Commit: 9188302b70e1ab351d869b245ed293bab137c902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9188302b70e1ab351d869b245… Author: Herve Chanal <chanal_herve(a)yahoo.fr> Date: Fri Mar 21 18:45:55 2008 +0100 user32: A nicer icon for oic_winlogo. --- dlls/user32/Makefile.in | 2 + dlls/user32/resources/oic_winlogo.ico | Bin 766 -> 15086 bytes dlls/user32/resources/oic_winlogo.svg | 389 +++++++++++++++++++++++++++++++++ 3 files changed, 391 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9188302b70e1ab351d869…

1 0

Alexandre Julliard : wine_release: Add -f flag to git-clean.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: tools Branch: master Commit: 7a38bfee074e448a7d04984e4a153f5b8e22568f URL: http://source.winehq.org/git/tools.git/?a=commit;h=7a38bfee074e448a7d04984e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 21 17:18:30 2008 +0100 wine_release: Add -f flag to git-clean. --- wine_release | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/wine_release b/wine_release index ece534c..27043aa 100755 --- a/wine_release +++ b/wine_release @@ -88,7 +88,7 @@ echo "==== UPDATING WINE API STATS PAGE ====" $tools_dir/winapi_stats > winapi_stats.template && mv -f winapi_stats.template $templates_dir/en/winapi_stats.template # cleanup source tree -git clean -q -d -x +git clean -q -d -x -f rm -rf .git # end

1 0

Alexandre Julliard : Wine release 0.9.58
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: website Branch: master Commit: 0b47a813e178eb749681a5c5a724663647ddf199 URL: http://source.winehq.org/git/website.git/?a=commit;h=0b47a813e178eb749681a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 21 16:51:37 2008 +0100 Wine release 0.9.58 --- news/2008032101.xml | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/news/2008032101.xml b/news/2008032101.xml new file mode 100644 index 0000000..6472be9 --- /dev/null +++ b/news/2008032101.xml @@ -0,0 +1,26 @@ +<news> +<date>March 21, 2008</date> +<title>Wine 0.9.58 Released</title> +<body> +<p>Wine 0.9.58 was released today, with the following main changes:</p> + +<ul> +<li>The default version is now Windows XP.</li> +<li>Many Richedit improvements.</li> +<li>Beginning of jscript dll support.</li> +<li>Shell folders now respect XDG directory configuration.</li> +<li>Many translation updates.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.58.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.58">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.58.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: b821e839bb33ac8f56939cc582010ecf4d9c25d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b821e839bb33ac8f56939cc58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 21 16:41:33 2008 +0100 Release 0.9.58. --- ANNOUNCE | 1202 +++++++++++++++++++---------------------- ChangeLog | 1810 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2381 insertions(+), 651 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b821e839bb33ac8f56939…

1 0