Ros-diffs

ros-diffs@reactos.org

81390 discussions

[osiejka] 56697: [TRANSLATION] - brasilian portugeese translation by Matheus Macabu (bug no. 7079); [AHK] - add scripts for including AHK tests into Reactos\Bin;
by osiejka＠svn.reactos.org 05 Jun '12

05 Jun '12

Author: osiejka Date: Tue Jun 5 14:37:58 2012 New Revision: 56697 URL: http://svn.reactos.org/svn/reactos?rev=56697&view=rev Log: [TRANSLATION] - brasilian portugeese translation by Matheus Macabu (bug no. 7079); [AHK] - add scripts for including AHK tests into Reactos\Bin; Added: trunk/reactos/base/applications/magnify/lang/pt-BR.rc (with props) trunk/reactos/base/applications/mscutils/devmgmt/lang/pt-BR.rc (with props) trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc (with props) trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc (with props) trunk/reactos/base/applications/notepad/lang/pt-BR.rc (with props) trunk/reactos/base/applications/screensavers/logon/lang/pt-BR.rc (with props) trunk/reactos/base/setup/vmwinst/lang/pt-BR.rc (with props) trunk/reactos/base/system/winlogon/lang/pt-BR.rc (with props) trunk/reactos/boot/bootdata/bootcdregtest/AHKAppTests.cmd (with props) trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc (with props) trunk/reactos/win32ss/user/user32/lang/pt-BR.rc (with props) trunk/reactos/win32ss/user/win32csr/lang/pt-BR.rc (with props) Modified: trunk/reactos/base/applications/magnify/rsrc.rc trunk/reactos/base/applications/mplay32/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc trunk/reactos/base/applications/notepad/lang/pt-PT.rc trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc trunk/reactos/base/setup/reactos/lang/pt-BR.rc trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc trunk/reactos/base/system/winlogon/rsrc.rc trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/dll/cpl/appwiz/rsrc.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/win32ss/user/user32/user32.rc trunk/reactos/win32ss/user/win32csr/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/magnify/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mplay32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Added: trunk/reactos/base/applications/mscutils/devmgmt/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/notepad/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Added: trunk/reactos/base/applications/screensavers/logon/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/setup/reactos/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pt… Added: trunk/reactos/base/setup/vmwinst/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/pt… Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… Modified: trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Added: trunk/reactos/base/system/winlogon/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rsrc.… Added: trunk/reactos/boot/bootdata/bootcdregtest/AHKAppTests.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… Modified: trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Added: trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pt-BR.… Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Added: trunk/reactos/win32ss/user/user32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/p… Modified: trunk/reactos/win32ss/user/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/user32… Added: trunk/reactos/win32ss/user/win32csr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/lang… Modified: trunk/reactos/win32ss/user/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/rsrc…

1 0

[akhaldi] 56695: [SERVICES] * Remove logically dead code. CID 513302.
by akhaldi＠svn.reactos.org 04 Jun '12

04 Jun '12

Author: akhaldi Date: Mon Jun 4 15:28:48 2012 New Revision: 56695 URL: http://svn.reactos.org/svn/reactos?rev=56695&view=rev Log: [SERVICES] * Remove logically dead code. CID 513302. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Mon Jun 4 15:28:48 2012 @@ -1237,9 +1237,6 @@ sizeof(SERVICE_STATUS)); } - if ((dwError == ERROR_SUCCESS) && (pcbBytesNeeded)) - dwError = ERROR_DEPENDENT_SERVICES_RUNNING; - return dwError; }

1 0

[akhaldi] 56693: [MSCOREE_WINETEST] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 04 Jun '12

04 Jun '12

Author: akhaldi Date: Mon Jun 4 10:47:09 2012 New Revision: 56693 URL: http://svn.reactos.org/svn/reactos?rev=56693&view=rev Log: [MSCOREE_WINETEST] * Sync to Wine 1.5.4. Modified: trunk/rostests/winetests/mscoree/mscoree.c Modified: trunk/rostests/winetests/mscoree/mscoree.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscoree/mscoree… ============================================================================== --- trunk/rostests/winetests/mscoree/mscoree.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mscoree/mscoree.c [iso-8859-1] Mon Jun 4 10:47:09 2012 @@ -60,8 +60,12 @@ static void test_versioninfo(void) { + const WCHAR v9_0[] = {'v','9','.','0','.','3','0','3','1','9',0}; + const WCHAR v2_0cap[] = {'V','2','.','0','.','5','0','7','2','7',0}; const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',0}; + const WCHAR v2_0_0[] = {'v','2','.','0','.','0',0}; const WCHAR v1_1[] = {'v','1','.','1','.','4','3','2','2',0}; + const WCHAR v1_1_0[] = {'v','1','.','1','.','0',0}; WCHAR version[MAX_PATH]; WCHAR path[MAX_PATH]; @@ -141,6 +145,45 @@ /* With NULL-pointer for bufferlength, the buffer itself still gets filled with correct string */ memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v2_0cap, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(!winetest_strcmpW(version, v2_0cap), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0cap)); + + /* Invalid Version and RUNTIME_INFO_UPGRADE_VERSION flag*/ + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v1_1, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == S_OK || hr == CLR_E_SHIM_RUNTIME , "GetRequestedRuntimeInfo returned %08x\n", hr); + if(hr == S_OK) + { + /* .NET 1.1 may not be installed. */ + ok(!winetest_strcmpW(version, v1_1) || !winetest_strcmpW(version, v2_0), + "version is %s , expected %s or %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v1_1), wine_dbgstr_w(v2_0)); + + } + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v9_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v1_1_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v1_1_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); }

1 0

[akhaldi] 56692: [MSCOREE] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 04 Jun '12

04 Jun '12

Author: akhaldi Date: Mon Jun 4 10:46:54 2012 New Revision: 56692 URL: http://svn.reactos.org/svn/reactos?rev=56692&view=rev Log: [MSCOREE] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/mscoree/CMakeLists.txt trunk/reactos/dll/win32/mscoree/assembly.c trunk/reactos/dll/win32/mscoree/config.c trunk/reactos/dll/win32/mscoree/corruntimehost.c trunk/reactos/dll/win32/mscoree/metahost.c trunk/reactos/dll/win32/mscoree/mscoree.spec trunk/reactos/dll/win32/mscoree/mscoree_main.c trunk/reactos/dll/win32/mscoree/mscoree_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mscoree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -2,7 +2,9 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + spec2def(mscoree.dll mscoree.spec) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/mscoree/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/assembly… ============================================================================== --- trunk/reactos/dll/win32/mscoree/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/assembly.c [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -63,10 +63,13 @@ struct tagASSEMBLY { + int is_mapped_file; + + /* mapped files */ LPWSTR path; - HANDLE hfile; HANDLE hmap; + BYTE *data; IMAGE_NT_HEADERS *nthdr; @@ -87,6 +90,29 @@ lstrcpyW(dest, src); return dest; +} + +static void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva) +{ + if (assembly->is_mapped_file) + return ImageRvaToVa(assembly->nthdr, assembly->data, rva, NULL); + else + return assembly->data + rva; +} + +static ULONG assembly_datadir_get_data(ASSEMBLY *assembly, + IMAGE_DATA_DIRECTORY *datadir, void **data) +{ + if (!datadir->VirtualAddress || !datadir->Size) + { + *data = NULL; + return 0; + } + else + { + *data = assembly_rva_to_va(assembly, datadir->VirtualAddress); + return datadir->Size; + } } static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) @@ -97,7 +123,7 @@ ULONG rva; rva = assembly->corhdr->MetaData.VirtualAddress; - ptr = ImageRvaToVa(assembly->nthdr, assembly->data, rva, NULL); + ptr = assembly_rva_to_va(assembly, rva); if (!ptr) return E_FAIL; @@ -158,18 +184,22 @@ if (!datadirs) return E_FAIL; - if (!datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress || - !datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size) - { + if (!assembly_datadir_get_data(assembly, &datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR], (void**)&assembly->corhdr)) return E_FAIL; - } - - assembly->corhdr = ImageRvaToVa(assembly->nthdr, assembly->data, - datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress, NULL); - if (!assembly->corhdr) - return E_FAIL; - - return S_OK; + + return S_OK; +} + +static HRESULT parse_headers(ASSEMBLY *assembly) +{ + HRESULT hr; + + hr = parse_pe_header(assembly); + + if (SUCCEEDED(hr)) + hr = parse_clr_metadata(assembly); + + return hr; } HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) @@ -183,6 +213,8 @@ if (!assembly) return E_OUTOFMEMORY; + assembly->is_mapped_file = 1; + assembly->path = strdupW(file); if (!assembly->path) { @@ -213,10 +245,7 @@ goto failed; } - hr = parse_pe_header(assembly); - if (FAILED(hr)) goto failed; - - hr = parse_clr_metadata(assembly); + hr = parse_headers(assembly); if (FAILED(hr)) goto failed; *out = assembly; @@ -227,16 +256,43 @@ return hr; } +HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule) +{ + ASSEMBLY *assembly; + HRESULT hr; + + *out = NULL; + + assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); + if (!assembly) + return E_OUTOFMEMORY; + + assembly->is_mapped_file = 0; + + assembly->data = (BYTE*)hmodule; + + hr = parse_headers(assembly); + if (SUCCEEDED(hr)) + *out = assembly; + else + assembly_release(assembly); + + return hr; +} + HRESULT assembly_release(ASSEMBLY *assembly) { if (!assembly) return S_OK; + if (assembly->is_mapped_file) + { + UnmapViewOfFile(assembly->data); + CloseHandle(assembly->hmap); + CloseHandle(assembly->hfile); + } HeapFree(GetProcessHeap(), 0, assembly->metadatahdr); HeapFree(GetProcessHeap(), 0, assembly->path); - UnmapViewOfFile(assembly->data); - CloseHandle(assembly->hmap); - CloseHandle(assembly->hfile); HeapFree(GetProcessHeap(), 0, assembly); return S_OK; @@ -248,3 +304,13 @@ return S_OK; } + +HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) +{ + ULONG size; + + size = assembly_datadir_get_data(assembly, &assembly->corhdr->VTableFixups, (void**)fixups); + *count = size / sizeof(VTableFixup); + + return S_OK; +} Modified: trunk/reactos/dll/win32/mscoree/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/config.c… ============================================================================== --- trunk/reactos/dll/win32/mscoree/config.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/config.c [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -425,7 +425,7 @@ ISAXXMLReader_Release(reader); } - IUnknown_Release((IUnknown*)handler); + ISAXContentHandler_Release(&handler->ISAXContentHandler_iface); return S_OK; } @@ -445,7 +445,7 @@ if (SUCCEEDED(hr)) { - V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; hr = parse_config(var, result); Modified: trunk/reactos/dll/win32/mscoree/corruntimehost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/corrunti… ============================================================================== --- trunk/reactos/dll/win32/mscoree/corruntimehost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/corruntimehost.c [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -19,6 +19,7 @@ #define COBJMACROS +#include <assert.h> #include <stdarg.h> #include "windef.h" @@ -38,6 +39,8 @@ #include "mscoree_private.h" #include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); @@ -49,6 +52,21 @@ { struct list entry; MonoDomain *domain; +}; + +static HANDLE dll_fixup_heap; /* using a separate heap so we can have execute permission */ + +static struct list dll_fixups; + +struct dll_fixup +{ + struct list entry; + int done; + HMODULE dll; + void *thunk_code; /* pointer into dll_fixup_heap */ + VTableFixup *fixup; + void *vtable; + void *tokens; /* pointer into process heap */ }; static HRESULT RuntimeHost_AddDomain(RuntimeHost *This, MonoDomain **result) @@ -146,6 +164,8 @@ MonoMethod *method; MonoObject *appdomain_object; IUnknown *unk; + + This->mono->mono_thread_attach(domain); assembly = This->mono->mono_domain_assembly_open(domain, "mscorlib"); if (!assembly) @@ -559,6 +579,8 @@ hr = E_FAIL; + This->mono->mono_thread_attach(domain); + filenameA = WtoA(pwzAssemblyPath); assembly = This->mono->mono_domain_assembly_open(domain, filenameA); if (!assembly) @@ -609,14 +631,10 @@ } cleanup: - if(filenameA) - HeapFree(GetProcessHeap(), 0, filenameA); - if(classA) - HeapFree(GetProcessHeap(), 0, classA); - if(argsA) - HeapFree(GetProcessHeap(), 0, argsA); - if(methodA) - HeapFree(GetProcessHeap(), 0, methodA); + HeapFree(GetProcessHeap(), 0, filenameA); + HeapFree(GetProcessHeap(), 0, classA); + HeapFree(GetProcessHeap(), 0, argsA); + HeapFree(GetProcessHeap(), 0, methodA); return hr; } @@ -661,6 +679,8 @@ if (SUCCEEDED(hr)) { + This->mono->mono_thread_attach(domain); + type = This->mono->mono_reflection_type_from_name(nameA, NULL); if (!type) { @@ -708,7 +728,9 @@ * * NOTE: The IUnknown* is created with a reference to the object. * Until they have a reference, objects must be in the stack to prevent the - * garbage collector from freeing them. */ + * garbage collector from freeing them. + * + * mono_thread_attach must have already been called for this thread. */ HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj, IUnknown **ppUnk) { @@ -798,13 +820,223 @@ HeapFree(GetProcessHeap(), 0, argvw); } +#if __i386__ + +# define CAN_FIXUP_VTABLE 1 + +#include "pshpack1.h" + +struct vtable_fixup_thunk +{ + /* sub $0x4,%esp */ + BYTE i1[3]; + /* mov fixup,(%esp) */ + BYTE i2[3]; + struct dll_fixup *fixup; + /* mov function,%eax */ + BYTE i3; + void (CDECL *function)(struct dll_fixup *); + /* call *%eax */ + BYTE i4[2]; + /* pop %eax */ + BYTE i5; + /* jmp *vtable_entry */ + BYTE i6[2]; + void *vtable_entry; +}; + +static const struct vtable_fixup_thunk thunk_template = { + {0x83,0xec,0x04}, + {0xc7,0x04,0x24}, + NULL, + 0xb8, + NULL, + {0xff,0xd0}, + 0x58, + {0xff,0x25}, + NULL +}; + +#include "poppack.h" + +#else /* !defined(__i386__) */ + +# define CAN_FIXUP_VTABLE 0 + +struct vtable_fixup_thunk +{ + struct dll_fixup *fixup; + void (CDECL *function)(struct dll_fixup *fixup); + void *vtable_entry; +}; + +static const struct vtable_fixup_thunk thunk_template = {0}; + +#endif + +static void CDECL ReallyFixupVTable(struct dll_fixup *fixup) +{ + HRESULT hr=S_OK; + WCHAR filename[MAX_PATH]; + ICLRRuntimeInfo *info=NULL; + RuntimeHost *host; + char *filenameA; + MonoImage *image=NULL; + MonoAssembly *assembly=NULL; + MonoImageOpenStatus status=0; + MonoDomain *domain; + + if (fixup->done) return; + + /* It's possible we'll have two threads doing this at once. This is + * considered preferable to the potential deadlock if we use a mutex. */ + + GetModuleFileNameW(fixup->dll, filename, MAX_PATH); + + TRACE("%p,%p,%s\n", fixup, fixup->dll, debugstr_w(filename)); + + filenameA = WtoA(filename); + if (!filenameA) + hr = E_OUTOFMEMORY; + + if (SUCCEEDED(hr)) + hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); + + if (SUCCEEDED(hr)) + hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); + + if (SUCCEEDED(hr)) + hr = RuntimeHost_GetDefaultDomain(host, &domain); + + if (SUCCEEDED(hr)) + { + host->mono->mono_thread_attach(domain); + + image = host->mono->mono_image_open_from_module_handle(fixup->dll, + filenameA, 1, &status); + } + + if (image) + assembly = host->mono->mono_assembly_load_from(image, filenameA, &status); + + if (assembly) + { + int i; + + /* Mono needs an image that belongs to an assembly. */ + image = host->mono->mono_assembly_get_image(assembly); + + if (fixup->fixup->type & COR_VTABLE_32BIT) + { + DWORD *vtable = fixup->vtable; + DWORD *tokens = fixup->tokens; + for (i=0; i<fixup->fixup->count; i++) + { + TRACE("%x\n", tokens[i]); + vtable[i] = PtrToUint(host->mono->mono_marshal_get_vtfixup_ftnptr( + image, tokens[i], fixup->fixup->type)); + } + } + + fixup->done = 1; + } + + if (info != NULL) + ICLRRuntimeHost_Release(info); + + HeapFree(GetProcessHeap(), 0, filenameA); + + if (!fixup->done) + { + ERR("unable to fixup vtable, hr=%x, status=%d\n", hr, status); + /* If we returned now, we'd get an infinite loop. */ + assert(0); + } +} + +static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup) +{ + /* We can't actually generate code for the functions without loading mono, + * and loading mono inside DllMain is a terrible idea. So we make thunks + * that call ReallyFixupVTable, which will load the runtime and fill in the + * vtable, then do an indirect jump using the (now filled in) vtable. Note + * that we have to keep the thunks around forever, as one of them may get + * called while we're filling in the table, and we can never be sure all + * threads are clear. */ + struct dll_fixup *fixup; + + fixup = HeapAlloc(GetProcessHeap(), 0, sizeof(*fixup)); + + fixup->dll = hmodule; + fixup->thunk_code = HeapAlloc(dll_fixup_heap, 0, sizeof(struct vtable_fixup_thunk) * vtable_fixup->count); + fixup->fixup = vtable_fixup; + fixup->vtable = (BYTE*)hmodule + vtable_fixup->rva; + fixup->done = 0; + + if (vtable_fixup->type & COR_VTABLE_32BIT) + { + DWORD *vtable = fixup->vtable; + DWORD *tokens; + int i; + struct vtable_fixup_thunk *thunks = fixup->thunk_code; + + if (sizeof(void*) > 4) + ERR("32-bit fixup in 64-bit mode; broken image?\n"); + + tokens = fixup->tokens = HeapAlloc(GetProcessHeap(), 0, sizeof(*tokens) * vtable_fixup->count); + memcpy(tokens, vtable, sizeof(*tokens) * vtable_fixup->count); + for (i=0; i<vtable_fixup->count; i++) + { + memcpy(&thunks[i], &thunk_template, sizeof(thunk_template)); + thunks[i].fixup = fixup; + thunks[i].function = ReallyFixupVTable; + thunks[i].vtable_entry = &vtable[i]; + vtable[i] = PtrToUint(&thunks[i]); + } + } + else + { + ERR("unsupported vtable fixup flags %x\n", vtable_fixup->type); + HeapFree(dll_fixup_heap, 0, fixup->thunk_code); + HeapFree(GetProcessHeap(), 0, fixup); + return; + } + + list_add_tail(&dll_fixups, &fixup->entry); +} + +static void FixupVTable(HMODULE hmodule) +{ + ASSEMBLY *assembly; + HRESULT hr; + VTableFixup *vtable_fixups; + ULONG vtable_fixup_count, i; + + hr = assembly_from_hmodule(&assembly, hmodule); + if (SUCCEEDED(hr)) + { + hr = assembly_get_vtable_fixups(assembly, &vtable_fixups, &vtable_fixup_count); + if (CAN_FIXUP_VTABLE) + for (i=0; i<vtable_fixup_count; i++) + FixupVTableEntry(hmodule, &vtable_fixups[i]); + else if (vtable_fixup_count) + FIXME("cannot fixup vtable; expect a crash\n"); + + assembly_release(assembly); + } + else + ERR("failed to read CLR headers, hr=%x\n", hr); +} + __int32 WINAPI _CorExeMain(void) { int exit_code; int argc; char **argv; MonoDomain *domain; - MonoAssembly *assembly; + MonoImage *image; + MonoImageOpenStatus status; + MonoAssembly *assembly=NULL; WCHAR filename[MAX_PATH]; char *filenameA; ICLRRuntimeInfo *info; @@ -825,6 +1057,8 @@ if (!filenameA) return -1; + FixupVTable(GetModuleHandleW(NULL)); + hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); if (SUCCEEDED(hr)) @@ -836,9 +1070,21 @@ if (SUCCEEDED(hr)) { - assembly = host->mono->mono_domain_assembly_open(domain, filenameA); - - exit_code = host->mono->mono_jit_exec(domain, assembly, argc, argv); + image = host->mono->mono_image_open_from_module_handle(GetModuleHandleW(NULL), + filenameA, 1, &status); + + if (image) + assembly = host->mono->mono_assembly_load_from(image, filenameA, &status); + + if (assembly) + { + exit_code = host->mono->mono_jit_exec(domain, assembly, argc, argv); + } + else + { + ERR("couldn't load %s, status=%d\n", debugstr_w(filename), status); + exit_code = -1; + } RuntimeHost_DeleteDomain(host, domain); } @@ -855,6 +1101,43 @@ unload_all_runtimes(); return exit_code; +} + +BOOL WINAPI _CorDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + FixupVTable(hinstDLL); + break; + case DLL_PROCESS_DETACH: + /* FIXME: clean up the vtables */ + break; + } + return TRUE; +} + +/* called from DLL_PROCESS_ATTACH */ +void runtimehost_init(void) +{ + dll_fixup_heap = HeapCreate(HEAP_CREATE_ENABLE_EXECUTE, 0, 0); + list_init(&dll_fixups); +} + +/* called from DLL_PROCESS_DETACH */ +void runtimehost_uninit(void) +{ + struct dll_fixup *fixup, *fixup2; + + HeapDestroy(dll_fixup_heap); + LIST_FOR_EACH_ENTRY_SAFE(fixup, fixup2, &dll_fixups, struct dll_fixup, entry) + { + HeapFree(GetProcessHeap(), 0, fixup->tokens); + HeapFree(GetProcessHeap(), 0, fixup); + } } HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, @@ -943,3 +1226,148 @@ HeapFree( GetProcessHeap(), 0, This ); return S_OK; } + +#define CHARS_IN_GUID 39 +#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) + +HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) +{ + static const WCHAR wszCodebase[] = {'C','o','d','e','B','a','s','e',0}; + static const WCHAR wszClass[] = {'C','l','a','s','s',0}; + static const WCHAR wszFileSlash[] = {'f','i','l','e',':','/','/','/',0}; + static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; + static const WCHAR wszInprocServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; + WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) + ARRAYSIZE(wszInprocServer32) - 1]; + MonoDomain *domain; + MonoAssembly *assembly; + ICLRRuntimeInfo *info; + RuntimeHost *host; + HRESULT hr; + HKEY key; + LONG res; + int offset = 0; + WCHAR codebase[MAX_PATH + 8]; + WCHAR classname[350]; + WCHAR filename[MAX_PATH]; + + DWORD dwBufLen = 350; + + lstrcpyW(path, wszCLSIDSlash); + StringFromGUID2(riid, path + lstrlenW(wszCLSIDSlash), CHARS_IN_GUID); + lstrcatW(path, wszInprocServer32); + + TRACE("Registry key: %s\n", debugstr_w(path)); + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, KEY_READ, &key); + if (res == ERROR_FILE_NOT_FOUND) + return CLASS_E_CLASSNOTAVAILABLE; + + res = RegGetValueW( key, NULL, wszClass, RRF_RT_REG_SZ, NULL, classname, &dwBufLen); + if(res != ERROR_SUCCESS) + { + WARN("Class value cannot be found.\n"); + hr = CLASS_E_CLASSNOTAVAILABLE; + goto cleanup; + } + + TRACE("classname (%s)\n", debugstr_w(classname)); + + dwBufLen = MAX_PATH + 8; + res = RegGetValueW( key, NULL, wszCodebase, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); + if(res != ERROR_SUCCESS) + { + WARN("CodeBase value cannot be found.\n"); + hr = CLASS_E_CLASSNOTAVAILABLE; + goto cleanup; + } + + /* Strip file:/// */ + if(strncmpW(codebase, wszFileSlash, strlenW(wszFileSlash)) == 0) + offset = strlenW(wszFileSlash); + + strcpyW(filename, codebase + offset); + + TRACE("codebase (%s)\n", debugstr_w(filename)); + + *ppObj = NULL; + + + hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); + if (SUCCEEDED(hr)) + { + hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); + + if (SUCCEEDED(hr)) + hr = RuntimeHost_GetDefaultDomain(host, &domain); + + if (SUCCEEDED(hr)) + { + MonoImage *image; + MonoClass *klass; + MonoObject *result; + IUnknown *unk = NULL; + char *filenameA, *ns; + char *classA; + + hr = CLASS_E_CLASSNOTAVAILABLE; + + host->mono->mono_thread_attach(domain); + + filenameA = WtoA(filename); + assembly = host->mono->mono_domain_assembly_open(domain, filenameA); + HeapFree(GetProcessHeap(), 0, filenameA); + if (!assembly) + { + ERR("Cannot open assembly %s\n", filenameA); + goto cleanup; + } + + image = host->mono->mono_assembly_get_image(assembly); + if (!image) + { + ERR("Couldn't get assembly image\n"); + goto cleanup; + } + + classA = WtoA(classname); + ns = strrchr(classA, '.'); + *ns = '\0'; + + klass = host->mono->mono_class_from_name(image, classA, ns+1); + HeapFree(GetProcessHeap(), 0, classA); + if (!klass) + { + ERR("Couldn't get class from image\n"); + goto cleanup; + } + + /* + * Use the default constructor for the .NET class. + */ + result = host->mono->mono_object_new(domain, klass); + host->mono->mono_runtime_object_init(result); + + hr = RuntimeHost_GetIUnknownForObject(host, result, &unk); + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, ppObj); + + IUnknown_Release(unk); + } + else + hr = CLASS_E_CLASSNOTAVAILABLE; + } + else + hr = CLASS_E_CLASSNOTAVAILABLE; + } + else + hr = CLASS_E_CLASSNOTAVAILABLE; + +cleanup: + if(info) + ICLRRuntimeInfo_Release(info); + + RegCloseKey(key); + + return hr; +} Modified: trunk/reactos/dll/win32/mscoree/metahost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/metahost… ============================================================================== --- trunk/reactos/dll/win32/mscoree/metahost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/metahost.c [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -165,16 +165,19 @@ } while (0); LOAD_MONO_FUNCTION(mono_assembly_get_image); + LOAD_MONO_FUNCTION(mono_assembly_load_from); LOAD_MONO_FUNCTION(mono_assembly_open); LOAD_MONO_FUNCTION(mono_config_parse); LOAD_MONO_FUNCTION(mono_class_from_mono_type); LOAD_MONO_FUNCTION(mono_class_from_name); LOAD_MONO_FUNCTION(mono_class_get_method_from_name); LOAD_MONO_FUNCTION(mono_domain_assembly_open); + LOAD_MONO_FUNCTION(mono_image_open_from_module_handle); LOAD_MONO_FUNCTION(mono_install_assembly_preload_hook); LOAD_MONO_FUNCTION(mono_jit_exec); LOAD_MONO_FUNCTION(mono_jit_init); LOAD_MONO_FUNCTION(mono_jit_set_trace_options); + LOAD_MONO_FUNCTION(mono_marshal_get_vtfixup_ftnptr); LOAD_MONO_FUNCTION(mono_object_get_domain); LOAD_MONO_FUNCTION(mono_object_new); LOAD_MONO_FUNCTION(mono_object_unbox); @@ -186,6 +189,7 @@ LOAD_MONO_FUNCTION(mono_set_dirs); LOAD_MONO_FUNCTION(mono_stringify_assembly_name); LOAD_MONO_FUNCTION(mono_string_new); + LOAD_MONO_FUNCTION(mono_thread_attach); /* GLib imports obsoleted by the 2.0 ABI */ if (This->mono_abi_version == 1) @@ -564,6 +568,14 @@ return CLRRuntimeInfo_GetRuntimeHost(This, result); } +#ifdef __i386__ +static const WCHAR libmono2_arch_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','-','x','8','6','.','d','l','l',0}; +#elif defined(__x86_64__) +static const WCHAR libmono2_arch_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','-','x','8','6','_','6','4','.','d','l','l',0}; +#else +static const WCHAR libmono2_arch_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','.','d','l','l',0}; +#endif + static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version) { static const WCHAR mono_dll[] = {'\\','b','i','n','\\','m','o','n','o','.','d','l','l',0}; @@ -588,8 +600,15 @@ else if (abi_version == 2) { strcpyW(dll_path, path); - strcatW(dll_path, mono2_dll); + strcatW(dll_path, libmono2_arch_dll); attributes = GetFileAttributesW(dll_path); + + if (attributes == INVALID_FILE_ATTRIBUTES) + { + strcpyW(dll_path, path); + strcatW(dll_path, mono2_dll); + attributes = GetFileAttributesW(dll_path); + } if (attributes == INVALID_FILE_ATTRIBUTES) { @@ -973,7 +992,7 @@ *minor = 0; *build = 0; - if (version[0] == 'v') + if (version[0] == 'v' || version[0] == 'V') { version++; if (!isdigit(*version)) @@ -1310,11 +1329,21 @@ if (version) { - return CLRMetaHost_GetRuntime(0, version, &IID_ICLRRuntimeInfo, (void**)result); + hr = CLRMetaHost_GetRuntime(0, version, &IID_ICLRRuntimeInfo, (void**)result); + if(SUCCEEDED(hr)) + return hr; } if (runtimeinfo_flags & RUNTIME_INFO_UPGRADE_VERSION) { + DWORD major, minor, build; + + if (version && !parse_runtime_version(version, &major, &minor, &build)) + { + ERR("Cannot parse %s\n", debugstr_w(version)); + return CLR_E_SHIM_RUNTIME; + } + find_runtimes(); if (legacy) @@ -1325,8 +1354,16 @@ while (i--) { if (runtimes[i].mono_abi_version) - return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface, - &IID_ICLRRuntimeInfo, (void **)result); + { + /* Must be greater or equal to the version passed in. */ + if (!version || ((runtimes[i].major >= major && runtimes[i].minor >= minor && runtimes[i].build >= build) || + (runtimes[i].major >= major && runtimes[i].minor > minor) || + (runtimes[i].major > major))) + { + return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface, + &IID_ICLRRuntimeInfo, (void **)result); + } + } } if (legacy) Modified: trunk/reactos/dll/win32/mscoree/mscoree.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree.… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree.spec [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -9,7 +9,7 @@ @ stub CloseCtrs @ stdcall CLRCreateInstance(ptr ptr ptr) @ stdcall ClrCreateManagedInstance(wstr ptr ptr) -@ stub CoEEShutDownCOM +@ stdcall CoEEShutDownCOM() @ stdcall CoInitializeCor(long) @ stub CoInitializeEE @ stub CoUninitializeCor Modified: trunk/reactos/dll/win32/mscoree/mscoree_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree_… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree_main.c [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -52,6 +52,8 @@ static HINSTANCE MSCOREE_hInstance; +typedef HRESULT (*fnCreateInstance)(REFIID riid, LPVOID *ppObj); + char *WtoA(LPCWSTR wstr) { int length; @@ -88,6 +90,105 @@ return TRUE; } + +typedef struct mscorecf +{ + IClassFactory IClassFactory_iface; + LONG ref; + + fnCreateInstance pfnCreateInstance; + + CLSID clsid; +} mscorecf; + +static inline mscorecf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return CONTAINING_RECORD(iface, mscorecf, IClassFactory_iface); +} + +static HRESULT WINAPI mscorecf_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + TRACE("%s %p\n", debugstr_guid(riid), ppobj); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + + ERR("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI mscorecf_AddRef(IClassFactory *iface ) +{ + mscorecf *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("%p ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mscorecf_Release(IClassFactory *iface ) +{ + mscorecf *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("%p ref=%u\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mscorecf_CreateInstance(IClassFactory *iface,LPUNKNOWN pOuter, + REFIID riid, LPVOID *ppobj ) +{ + mscorecf *This = impl_from_IClassFactory( iface ); + HRESULT hr; + IUnknown *punk; + + TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj ); + + *ppobj = NULL; + + if (pOuter) + return CLASS_E_NOAGGREGATION; + + hr = This->pfnCreateInstance( &This->clsid, (LPVOID*) &punk ); + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface( punk, riid, ppobj ); + + IUnknown_Release( punk ); + } + else + { + WARN("Cannot create an instance object. 0x%08x\n", hr); + } + return hr; +} + +static HRESULT WINAPI mscorecf_LockServer(IClassFactory *iface, BOOL dolock) +{ + FIXME("(%p)->(%d),stub!\n",iface,dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl mscorecf_vtbl = +{ + mscorecf_QueryInterface, + mscorecf_AddRef, + mscorecf_Release, + mscorecf_CreateInstance, + mscorecf_LockServer +}; HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor, LPCWSTR pwszHostConfigFile, VOID *pReserved, @@ -126,25 +227,13 @@ case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + runtimehost_init(); DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: expect_no_runtimes(); - break; - } - return TRUE; -} - -BOOL WINAPI _CorDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - FIXME("(%p, %d, %p): stub\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: + if (lpvReserved) break; /* process is terminating */ + runtimehost_uninit(); break; } return TRUE; @@ -246,6 +335,9 @@ if (SUCCEEDED(ret)) { + if(pwszVersion) + pVersion[0] = pwszVersion[0]; + *dwDirectoryLength = dwDirectory; ret = ICLRRuntimeInfo_GetRuntimeDirectory(info, pDirectory, dwDirectoryLength); } @@ -258,7 +350,7 @@ HRESULT WINAPI GetRequestedRuntimeVersion(LPWSTR pExe, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) { - TRACE("(%s, %p, %d, %p)\n", debugstr_w(pExe), debugstr_w(pExe), cchBuffer, dwlength); + TRACE("(%s, %p, %d, %p)\n", debugstr_w(pExe), pVersion, cchBuffer, dwlength); if(!dwlength) return E_POINTER; @@ -504,11 +596,25 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { - FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + mscorecf *This; + HRESULT hr; + + TRACE("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + if(!ppv) return E_INVALIDARG; - return E_NOTIMPL; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(mscorecf)); + + This->IClassFactory_iface.lpVtbl = &mscorecf_vtbl; + This->pfnCreateInstance = &create_monodata; + This->ref = 1; + This->clsid = *rclsid; + + hr = IClassFactory_QueryInterface( &This->IClassFactory_iface, riid, ppv ); + IClassFactory_Release(&This->IClassFactory_iface); + + return hr; } HRESULT WINAPI DllRegisterServer(void) @@ -526,6 +632,11 @@ return S_FALSE; } +void WINAPI CoEEShutDownCOM(void) +{ + FIXME("stub.\n"); +} + INT WINAPI ND_RU1( const void *ptr, INT offset ) { return *((const BYTE *)ptr + offset); Modified: trunk/reactos/dll/win32/mscoree/mscoree_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree_… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree_private.h [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -27,11 +27,19 @@ extern HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer) DECLSPEC_HIDDEN; +typedef struct _VTableFixup { + DWORD rva; + WORD count; + WORD type; +} VTableFixup; + typedef struct tagASSEMBLY ASSEMBLY; -HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) DECLSPEC_HIDDEN; -HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN; -HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN; +extern HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) DECLSPEC_HIDDEN; +extern HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule) DECLSPEC_HIDDEN; +extern HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN; +extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN; +extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; /* Mono embedding */ typedef struct _MonoDomain MonoDomain; @@ -44,6 +52,7 @@ typedef struct _MonoString MonoString; typedef struct _MonoMethod MonoMethod; typedef struct _MonoProfiler MonoProfiler; +typedef struct _MonoThread MonoThread; typedef struct loaded_mono loaded_mono; typedef struct RuntimeHost RuntimeHost; @@ -137,6 +146,7 @@ BOOL is_shutdown; MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); + MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status); MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name); @@ -144,10 +154,12 @@ void (CDECL *mono_config_parse)(const char *filename); MonoAssembly* (CDECL *mono_domain_assembly_open) (MonoDomain *domain, const char *name); void (CDECL *mono_free)(void *); + MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); void (CDECL *mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); MonoDomain* (CDECL *mono_jit_init)(const char *file); int (CDECL *mono_jit_set_trace_options)(const char* options); + void* (CDECL *mono_marshal_get_vtfixup_ftnptr)(MonoImage *image, DWORD token, WORD type); MonoDomain* (CDECL *mono_object_get_domain)(MonoObject *obj); MonoObject* (CDECL *mono_object_new)(MonoDomain *domain, MonoClass *klass); void* (CDECL *mono_object_unbox)(MonoObject *obj); @@ -163,6 +175,7 @@ void (CDECL *mono_thread_suspend_all_other_threads)(void); void (CDECL *mono_threads_set_shutting_down)(void); MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); + MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); }; /* loaded runtime interfaces */ @@ -186,4 +199,9 @@ extern HRESULT CorDebug_Create(ICLRRuntimeHost *runtimehost, IUnknown** ppUnk) DECLSPEC_HIDDEN; +extern HRESULT create_monodata(REFIID riid, LPVOID *ppObj) DECLSPEC_HIDDEN; + +extern void runtimehost_init(void); +extern void runtimehost_uninit(void); + #endif /* __MSCOREE_PRIVATE__ */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -95,7 +95,7 @@ reactos/dll/win32/msadp32.acm # Synced to Wine-1.3.37 reactos/dll/win32/mscat32 # Synced to Wine-1.3.37 reactos/dll/win32/mscms # Synced to Wine-1.5.4 -reactos/dll/win32/mscoree # Synced to Wine-1.3.37 +reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to Wine-1.3.37 reactos/dll/win32/msftedit # Synced to Wine-1.3.37 reactos/dll/win32/msg711.acm # Synced to Wine-1.3.37

1 0

[akhaldi] 56691: [KERNEL32_WINETEST] * Sync loader tests to Wine 1.5.4. Thanks to Arty for fixing the related issues. See issue #7071 for more details.
by akhaldi＠svn.reactos.org 04 Jun '12

04 Jun '12

Author: akhaldi Date: Mon Jun 4 10:45:54 2012 New Revision: 56691 URL: http://svn.reactos.org/svn/reactos?rev=56691&view=rev Log: [KERNEL32_WINETEST] * Sync loader tests to Wine 1.5.4. Thanks to Arty for fixing the related issues. See issue #7071 for more details. Modified: trunk/rostests/winetests/kernel32/loader.c Modified: trunk/rostests/winetests/kernel32/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/loader… ============================================================================== --- trunk/rostests/winetests/kernel32/loader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/loader.c [iso-8859-1] Mon Jun 4 10:45:54 2012 @@ -21,11 +21,17 @@ #include <stdarg.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/test.h" #define ALIGN_SIZE(size, alignment) (((size) + (alignment - 1)) & ~((alignment - 1))) + +static NTSTATUS (WINAPI *pNtMapViewOfSection)(HANDLE, HANDLE, PVOID *, ULONG, SIZE_T, const LARGE_INTEGER *, SIZE_T *, ULONG, ULONG, ULONG); +static NTSTATUS (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -57,7 +63,7 @@ #elif defined __sparc__ IMAGE_FILE_MACHINE_SPARC, /* Machine */ #elif defined __arm__ - IMAGE_FILE_MACHINE_ARM, /* Machine */ + IMAGE_FILE_MACHINE_ARMV7, /* Machine */ #else # error You must specify the machine type #endif @@ -553,42 +559,307 @@ } } +static void test_image_mapping(const char *dll_name, DWORD scn_page_access, BOOL is_dll) +{ + HANDLE hfile, hmap; + NTSTATUS status; + LARGE_INTEGER offset; + SIZE_T size; + void *addr1, *addr2; + MEMORY_BASIC_INFORMATION info; + SYSTEM_INFO si; + + if (!pNtMapViewOfSection) return; + + GetSystemInfo(&si); + + SetLastError(0xdeadbeef); + hfile = CreateFile(dll_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + hmap = CreateFileMapping(hfile, NULL, PAGE_READONLY | SEC_IMAGE, 0, 0, 0); + ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + + offset.u.LowPart = 0; + offset.u.HighPart = 0; + + addr1 = NULL; + size = 0; + status = pNtMapViewOfSection(hmap, GetCurrentProcess(), &addr1, 0, 0, &offset, + &size, 1 /* ViewShare */, 0, PAGE_READONLY); + ok(status == STATUS_SUCCESS, "NtMapViewOfSection error %x\n", status); + ok(addr1 != 0, "mapped address should be valid\n"); + + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)addr1 + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == (char *)addr1 + section.VirtualAddress, "got %p != expected %p\n", info.BaseAddress, (char *)addr1 + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "got %#lx != expected %#x\n", info.RegionSize, si.dwPageSize); + ok(info.Protect == scn_page_access, "got %#x != expected %#x\n", info.Protect, scn_page_access); + ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%#x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == SEC_IMAGE, "%#x != SEC_IMAGE\n", info.Type); + + addr2 = NULL; + size = 0; + status = pNtMapViewOfSection(hmap, GetCurrentProcess(), &addr2, 0, 0, &offset, + &size, 1 /* ViewShare */, 0, PAGE_READONLY); + /* FIXME: remove once Wine is fixed */ + if (status != STATUS_IMAGE_NOT_AT_BASE) + { + todo_wine { + ok(status == STATUS_IMAGE_NOT_AT_BASE, "expected STATUS_IMAGE_NOT_AT_BASE, got %x\n", status); + ok(addr2 != 0, "mapped address should be valid\n"); + } + goto wine_is_broken; + } + ok(status == STATUS_IMAGE_NOT_AT_BASE, "expected STATUS_IMAGE_NOT_AT_BASE, got %x\n", status); + ok(addr2 != 0, "mapped address should be valid\n"); + ok(addr2 != addr1, "mapped addresses should be different\n"); + + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)addr2 + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == (char *)addr2 + section.VirtualAddress, "got %p != expected %p\n", info.BaseAddress, (char *)addr2 + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "got %#lx != expected %#x\n", info.RegionSize, si.dwPageSize); + ok(info.Protect == scn_page_access, "got %#x != expected %#x\n", info.Protect, scn_page_access); + ok(info.AllocationBase == addr2, "%p != %p\n", info.AllocationBase, addr2); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%#x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == SEC_IMAGE, "%#x != SEC_IMAGE\n", info.Type); + + status = pNtUnmapViewOfSection(GetCurrentProcess(), addr2); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection error %x\n", status); + + addr2 = MapViewOfFile(hmap, 0, 0, 0, 0); + ok(addr2 != 0, "mapped address should be valid\n"); + ok(addr2 != addr1, "mapped addresses should be different\n"); + + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)addr2 + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == (char *)addr2 + section.VirtualAddress, "got %p != expected %p\n", info.BaseAddress, (char *)addr2 + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "got %#lx != expected %#x\n", info.RegionSize, si.dwPageSize); + ok(info.Protect == scn_page_access, "got %#x != expected %#x\n", info.Protect, scn_page_access); + ok(info.AllocationBase == addr2, "%p != %p\n", info.AllocationBase, addr2); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%#x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == SEC_IMAGE, "%#x != SEC_IMAGE\n", info.Type); + + UnmapViewOfFile(addr2); + + SetLastError(0xdeadbeef); + addr2 = LoadLibrary(dll_name); + if (is_dll) + { + ok(!addr2, "LoadLibrary should fail, is_dll %d\n", is_dll); + ok(GetLastError() == ERROR_INVALID_ADDRESS, "expected ERROR_INVALID_ADDRESS, got %d\n", GetLastError()); + } + else + { + BOOL ret; + ok(addr2 != 0, "LoadLibrary error %d, is_dll %d\n", GetLastError(), is_dll); + ok(addr2 != addr1, "mapped addresses should be different\n"); + + SetLastError(0xdeadbeef); + ret = FreeLibrary(addr2); + ok(ret, "FreeLibrary error %d\n", GetLastError()); + } + +wine_is_broken: + status = pNtUnmapViewOfSection(GetCurrentProcess(), addr1); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection error %x\n", status); + + CloseHandle(hmap); + CloseHandle(hfile); +} + +static BOOL is_mem_writable(DWORD prot) +{ + switch (prot & 0xff) + { + case PAGE_READWRITE: + case PAGE_WRITECOPY: + case PAGE_EXECUTE_READWRITE: + case PAGE_EXECUTE_WRITECOPY: + return TRUE; + + default: + return FALSE; + } +} + +static void test_VirtualProtect(void *base, void *section) +{ + static const struct test_data + { + DWORD prot_set, prot_get; + } td[] = + { + { 0, 0 }, /* 0x00 */ + { PAGE_NOACCESS, PAGE_NOACCESS }, /* 0x01 */ + { PAGE_READONLY, PAGE_READONLY }, /* 0x02 */ + { PAGE_READONLY | PAGE_NOACCESS, 0 }, /* 0x03 */ + { PAGE_READWRITE, PAGE_WRITECOPY }, /* 0x04 */ + { PAGE_READWRITE | PAGE_NOACCESS, 0 }, /* 0x05 */ + { PAGE_READWRITE | PAGE_READONLY, 0 }, /* 0x06 */ + { PAGE_READWRITE | PAGE_READONLY | PAGE_NOACCESS, 0 }, /* 0x07 */ + { PAGE_WRITECOPY, PAGE_WRITECOPY }, /* 0x08 */ + { PAGE_WRITECOPY | PAGE_NOACCESS, 0 }, /* 0x09 */ + { PAGE_WRITECOPY | PAGE_READONLY, 0 }, /* 0x0a */ + { PAGE_WRITECOPY | PAGE_NOACCESS | PAGE_READONLY, 0 }, /* 0x0b */ + { PAGE_WRITECOPY | PAGE_READWRITE, 0 }, /* 0x0c */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_NOACCESS, 0 }, /* 0x0d */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_READONLY, 0 }, /* 0x0e */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_READONLY | PAGE_NOACCESS, 0 }, /* 0x0f */ + + { PAGE_EXECUTE, PAGE_EXECUTE }, /* 0x10 */ + { PAGE_EXECUTE_READ, PAGE_EXECUTE_READ }, /* 0x20 */ + { PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 }, /* 0x30 */ + { PAGE_EXECUTE_READWRITE, PAGE_EXECUTE_WRITECOPY }, /* 0x40 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE, 0 }, /* 0x50 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, 0 }, /* 0x60 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 }, /* 0x70 */ + { PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_WRITECOPY }, /* 0x80 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE, 0 }, /* 0x90 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READ, 0 }, /* 0xa0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 }, /* 0xb0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE, 0 }, /* 0xc0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE, 0 }, /* 0xd0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, 0 }, /* 0xe0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 } /* 0xf0 */ + }; + DWORD ret, orig_prot, old_prot, rw_prot, exec_prot, i, j; + MEMORY_BASIC_INFORMATION info; + SYSTEM_INFO si; + + GetSystemInfo(&si); + trace("system page size %#x\n", si.dwPageSize); + + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(ret, "VirtualProtect error %d\n", GetLastError()); + + orig_prot = old_prot; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + SetLastError(0xdeadbeef); + ret = VirtualQuery(section, &info, sizeof(info)); + ok(ret, "VirtualQuery failed %d\n", GetLastError()); + ok(info.BaseAddress == section, "%d: got %p != expected %p\n", i, info.BaseAddress, section); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + ok(info.Protect == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, info.Protect); + ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == SEC_IMAGE, "%d: %#x != SEC_IMAGE\n", i, info.Type); + + old_prot = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, td[i].prot_set, &old_prot); + if (td[i].prot_get) + { + ok(ret, "%d: VirtualProtect error %d, requested prot %#x\n", i, GetLastError(), td[i].prot_set); + ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); + + SetLastError(0xdeadbeef); + ret = VirtualQuery(section, &info, sizeof(info)); + ok(ret, "VirtualQuery failed %d\n", GetLastError()); + ok(info.BaseAddress == section, "%d: got %p != expected %p\n", i, info.BaseAddress, section); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + ok(info.Protect == td[i].prot_get, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot_get); + ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == SEC_IMAGE, "%d: %#x != SEC_IMAGE\n", i, info.Type); + } + else + { + ok(!ret, "%d: VirtualProtect should fail\n", i); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); + } + + old_prot = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); + if (td[i].prot_get) + ok(old_prot == td[i].prot_get, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_get); + else + ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); + } + + exec_prot = 0; + + for (i = 0; i <= 4; i++) + { + rw_prot = 0; + + for (j = 0; j <= 4; j++) + { + DWORD prot = exec_prot | rw_prot; + + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, prot, &old_prot); + if ((rw_prot && exec_prot) || (!rw_prot && !exec_prot)) + { + ok(!ret, "VirtualProtect(%02x) should fail\n", prot); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + else + ok(ret, "VirtualProtect(%02x) error %d\n", prot, GetLastError()); + + rw_prot = 1 << j; + } + + exec_prot = 1 << (i + 4); + } + + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, orig_prot, &old_prot); + ok(ret, "VirtualProtect error %d\n", GetLastError()); +} + static void test_section_access(void) { static const struct test_data { - DWORD scn_file_access, scn_page_access; + DWORD scn_file_access, scn_page_access, scn_page_access_after_write; } td[] = { - { 0, PAGE_NOACCESS }, - { IMAGE_SCN_MEM_READ, PAGE_READONLY }, - { IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, - { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { 0, PAGE_NOACCESS, 0 }, + { IMAGE_SCN_MEM_READ, PAGE_READONLY, 0 }, + { IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE, 0 }, + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, - { IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - - { IMAGE_SCN_CNT_INITIALIZED_DATA, PAGE_NOACCESS }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - - { IMAGE_SCN_CNT_UNINITIALIZED_DATA, PAGE_NOACCESS }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY } + { IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + + { IMAGE_SCN_CNT_INITIALIZED_DATA, PAGE_NOACCESS, 0 }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY, 0 }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE, 0 }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ, 0 }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + + { IMAGE_SCN_CNT_UNINITIALIZED_DATA, PAGE_NOACCESS, 0 }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY, 0 }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE, 0 }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ, 0 }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE } }; static const char filler[0x1000]; static const char section_data[0x10] = "section data"; + char buf[256]; int i; DWORD dummy, file_align; HANDLE hfile; @@ -598,7 +869,9 @@ char dll_name[MAX_PATH]; SIZE_T size; MEMORY_BASIC_INFORMATION info; - BOOL ret; + STARTUPINFO sti; + PROCESS_INFORMATION pi; + DWORD ret; GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); @@ -626,6 +899,7 @@ nt_header.FileHeader.NumberOfSections = 1; nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_DLL | IMAGE_FILE_RELOCS_STRIPPED; nt_header.OptionalHeader.SectionAlignment = si.dwPageSize; nt_header.OptionalHeader.FileAlignment = 0x200; @@ -662,18 +936,14 @@ SetLastError(0xdeadbeef); hlib = LoadLibrary(dll_name); - ok(ret, "LoadLibrary error %d\n", GetLastError()); - + ok(hlib != 0, "LoadLibrary error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); size = VirtualQuery((char *)hlib + section.VirtualAddress, &info, sizeof(info)); ok(size == sizeof(info), "%d: VirtualQuery error %d\n", i, GetLastError()); ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "%d: got %p != expected %p\n", i, info.BaseAddress, (char *)hlib + section.VirtualAddress); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); - /* FIXME: remove the condition below once Wine is fixed */ - if ((td[i].scn_file_access & IMAGE_SCN_MEM_WRITE) && - (td[i].scn_file_access & IMAGE_SCN_CNT_UNINITIALIZED_DATA)) - todo_wine ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); - else ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); @@ -682,18 +952,96 @@ if (info.Protect != PAGE_NOACCESS) ok(!memcmp((const char *)info.BaseAddress, section_data, section.SizeOfRawData), "wrong section data\n"); + test_VirtualProtect(hlib, (char *)hlib + section.VirtualAddress); + + /* Windows changes the WRITECOPY to WRITE protection on an image section write (for a changed page only) */ + if (is_mem_writable(info.Protect)) + { + char *p = info.BaseAddress; + *p = 0xfe; + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)hlib + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "%d: VirtualQuery error %d\n", i, GetLastError()); + /* FIXME: remove the condition below once Wine is fixed */ + if (info.Protect == PAGE_WRITECOPY || info.Protect == PAGE_EXECUTE_WRITECOPY) + todo_wine ok(info.Protect == td[i].scn_page_access_after_write, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access_after_write); + else + ok(info.Protect == td[i].scn_page_access_after_write, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access_after_write); + } + SetLastError(0xdeadbeef); ret = FreeLibrary(hlib); ok(ret, "FreeLibrary error %d\n", GetLastError()); + test_image_mapping(dll_name, td[i].scn_page_access, TRUE); + + /* reset IMAGE_FILE_DLL otherwise CreateProcess fails */ + nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_RELOCS_STRIPPED; + SetLastError(0xdeadbeef); + hfile = CreateFile(dll_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + /* LoadLibrary called on an already memory-mapped file in + * test_image_mapping() above leads to a file handle leak + * under nt4, and inability to overwrite and delete the file + * due to sharing violation error. Ignore it and skip the test, + * but leave a not deletable temporary file. + */ + ok(hfile != INVALID_HANDLE_VALUE || broken(hfile == INVALID_HANDLE_VALUE) /* nt4 */, + "CreateFile error %d\n", GetLastError()); + if (hfile == INVALID_HANDLE_VALUE) goto nt4_is_broken; + SetFilePointer(hfile, sizeof(dos_header), NULL, FILE_BEGIN); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &nt_header, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + CloseHandle(hfile); + + memset(&sti, 0, sizeof(sti)); + sti.cb = sizeof(sti); + SetLastError(0xdeadbeef); + ret = CreateProcess(dll_name, NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &sti, &pi); + ok(ret, "CreateProcess() error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + size = VirtualQueryEx(pi.hProcess, (char *)hlib + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), + "%d: VirtualQuery error %d\n", i, GetLastError()); + ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "%d: got %p != expected %p\n", i, info.BaseAddress, (char *)hlib + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); + ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == SEC_IMAGE, "%d: %#x != SEC_IMAGE\n", i, info.Type); + if (info.Protect != PAGE_NOACCESS) + { + SetLastError(0xdeadbeef); + ret = ReadProcessMemory(pi.hProcess, info.BaseAddress, buf, section.SizeOfRawData, NULL); + ok(ret, "ReadProcessMemory() error %d\n", GetLastError()); + ok(!memcmp(buf, section_data, section.SizeOfRawData), "wrong section data\n"); + } + + SetLastError(0xdeadbeef); + ret = TerminateProcess(pi.hProcess, 0); + ok(ret, "TerminateProcess() error %d\n", GetLastError()); + ret = WaitForSingleObject(pi.hProcess, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed: %x\n", ret); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + test_image_mapping(dll_name, td[i].scn_page_access, FALSE); + +nt4_is_broken: SetLastError(0xdeadbeef); ret = DeleteFile(dll_name); - ok(ret, "DeleteFile error %d\n", GetLastError()); + ok(ret || broken(!ret) /* nt4 */, "DeleteFile error %d\n", GetLastError()); } } START_TEST(loader) { + pNtMapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtMapViewOfSection"); + pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtUnmapViewOfSection"); + test_Loader(); test_ImportDescriptors(); test_section_access();

1 0

[ekohl] 56690: [SAMLIB]: Implement SamAddMemberToAlias, SamCreateAliasInDomain, SamEnumerateDomainsInSamServer, SamOpenAlias, SamQueryInformationDomain and SamQueryInformationUser. [SAMSRV]: Implem...
by ekohl＠svn.reactos.org 03 Jun '12

03 Jun '12

Author: ekohl Date: Sun Jun 3 20:54:06 2012 New Revision: 56690 URL: http://svn.reactos.org/svn/reactos?rev=56690&view=rev Log: [SAMLIB]: Implement SamAddMemberToAlias, SamCreateAliasInDomain, SamEnumerateDomainsInSamServer, SamOpenAlias, SamQueryInformationDomain and SamQueryInformationUser. [SAMSRV]: Implement SamrEnumerateDomainsInSamServer (buggy, probably a bug in WIDL), SamrQueryInformationDomain.DomainNameInformation, SamrCreateAliasInDomain, SamrOpenAlias and SamrAddMemberToAlias. [SAMSRV]: Add more registry helper routines. [SAMSRV]: Create builtin aliases upon setup. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/registry.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/setup.c trunk/reactos/include/ddk/ntsam.h trunk/reactos/include/reactos/idl/sam.idl Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -105,6 +105,31 @@ NTSTATUS NTAPI +SamAddMemberToAlias(IN SAM_HANDLE AliasHandle, + IN PSID MemberId) +{ + NTSTATUS Status; + + TRACE("SamAddMemberToAlias(%p %p)\n", + AliasHandle, MemberId); + + RpcTryExcept + { + Status = SamrAddMemberToAlias((SAMPR_HANDLE)AliasHandle, + (PRPC_SID)MemberId); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamCloseHandle(IN SAM_HANDLE SamHandle) { NTSTATUS Status; @@ -142,6 +167,37 @@ Status = SamrConnect((PSAMPR_SERVER_NAME)ServerName, (SAMPR_HANDLE *)ServerHandle, DesiredAccess); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI +SamCreateAliasInDomain(IN SAM_HANDLE DomainHandle, + IN PUNICODE_STRING AccountName, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_HANDLE AliasHandle, + OUT PULONG RelativeId) +{ + NTSTATUS Status; + + TRACE("SamCreateAliasInDomain(%p,%p,0x%08x,%p,%p)\n", + DomainHandle, AccountName, DesiredAccess, AliasHandle, RelativeId); + + RpcTryExcept + { + Status = SamrCreateAliasInDomain((SAMPR_HANDLE)DomainHandle, + (PRPC_UNICODE_STRING)AccountName, + DesiredAccess, + (SAMPR_HANDLE *)AliasHandle, + RelativeId); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { @@ -186,9 +242,59 @@ NTSTATUS NTAPI +SamEnumerateDomainsInSamServer(IN SAM_HANDLE ServerHandle, + IN OUT PSAM_ENUMERATE_HANDLE EnumerationContext, + OUT PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned) +{ + PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; + NTSTATUS Status; + + TRACE("SamEnumerateDomainsInSamServer(%p,%p,%p,%lu,%p)\n", + ServerHandle, EnumerationContext, Buffer, PreferedMaximumLength, + CountReturned); + + if ((EnumerationContext == NULL) || + (Buffer == NULL) || + (CountReturned == NULL)) + return STATUS_INVALID_PARAMETER; + + *Buffer = NULL; + + RpcTryExcept + { + Status = SamrEnumerateDomainsInSamServer((SAMPR_HANDLE)ServerHandle, + EnumerationContext, + (PSAMPR_ENUMERATION_BUFFER *)&EnumBuffer, + PreferedMaximumLength, + CountReturned); + + if (EnumBuffer != NULL) + { + if (EnumBuffer->Buffer != NULL) + { + *Buffer = EnumBuffer->Buffer; + } + + midl_user_free(EnumBuffer); + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamFreeMemory(IN PVOID Buffer) { - if (Buffer!= NULL) + if (Buffer != NULL) midl_user_free(Buffer); return STATUS_SUCCESS; @@ -211,6 +317,35 @@ Status = SamrLookupDomainInSamServer((SAMPR_HANDLE)ServerHandle, (PRPC_UNICODE_STRING)Name, (PRPC_SID *)DomainId); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI +SamOpenAlias(IN SAM_HANDLE DomainHandle, + IN ACCESS_MASK DesiredAccess, + IN ULONG AliasId, + OUT PSAM_HANDLE AliasHandle) +{ + NTSTATUS Status; + + TRACE("SamOpenAlias(%p 0x%08x %lx %p)\n", + DomainHandle, DesiredAccess, AliasId, AliasHandle); + + RpcTryExcept + { + Status = SamrOpenAlias((SAMPR_HANDLE)DomainHandle, + DesiredAccess, + AliasId, + (SAMPR_HANDLE *)AliasHandle); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { @@ -282,12 +417,55 @@ NTSTATUS NTAPI +SamQueryInformationDomain(IN SAM_HANDLE DomainHandle, + IN DOMAIN_INFORMATION_CLASS DomainInformationClass, + OUT PVOID *Buffer) +{ + NTSTATUS Status; + + TRACE("SamQueryInformationDomain(%p %lu %p)\n", + DomainHandle, DomainInformationClass, Buffer); + + RpcTryExcept + { + Status = SamrQueryInformationDomain((SAMPR_HANDLE)DomainHandle, + DomainInformationClass, + (PSAMPR_DOMAIN_INFO_BUFFER *)Buffer); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamQueryInformationUser(IN SAM_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, OUT PVOID *Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + TRACE("SamQueryInformationUser(%p %lu %p)\n", + UserHandle, UserInformationClass, Buffer); + + RpcTryExcept + { + Status = SamrQueryInformationUser((SAMPR_HANDLE)UserHandle, + UserInformationClass, + (PSAMPR_USER_INFO_BUFFER *)Buffer); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } @@ -349,6 +527,7 @@ NTAPI SamShutdownSamServer(IN SAM_HANDLE ServerHandle) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -1,4 +1,4 @@ -@ stub SamAddMemberToAlias +@ stdcall SamAddMemberToAlias(ptr ptr) @ stub SamAddMemberToGroup @ stub SamAddMultipleMembersToAlias @ stub SamChangePasswordUser2 @@ -7,7 +7,7 @@ @ stdcall SamCloseHandle(ptr) @ stdcall SamConnect(ptr ptr long ptr) @ stub SamConnectWithCreds -@ stub SamCreateAliasInDomain +@ stdcall SamCreateAliasInDomain(ptr ptr long ptr ptr) @ stub SamCreateGroupInDomain @ stub SamCreateUser2InDomain @ stdcall SamCreateUserInDomain(ptr ptr long ptr ptr) @@ -15,7 +15,7 @@ @ stub SamDeleteGroup @ stub SamDeleteUser @ stub SamEnumerateAliasesInDomain -@ stub SamEnumerateDomainsInSamServer +@ stdcall SamEnumerateDomainsInSamServer(ptr ptr ptr long ptr) @ stub SamEnumerateGroupsInDomain @ stub SamEnumerateUsersInDomain @ stdcall SamFreeMemory(ptr) @@ -28,13 +28,13 @@ @ stdcall SamLookupDomainInSamServer(ptr ptr ptr) @ stub SamLookupIdsInDomain @ stub SamLookupNamesInDomain -@ stub SamOpenAlias +@ stdcall SamOpenAlias(ptr long long ptr) @ stdcall SamOpenDomain(ptr long ptr ptr) @ stub SamOpenGroup @ stdcall SamOpenUser(ptr long long ptr) @ stub SamQueryDisplayInformation @ stub SamQueryInformationAlias -@ stub SamQueryInformationDomain +@ stdcall SamQueryInformationDomain(ptr long ptr) @ stub SamQueryInformationGroup @ stdcall SamQueryInformationUser(ptr long ptr) @ stub SamQuerySecurityObject Modified: trunk/reactos/dll/win32/samsrv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/registry.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -16,7 +16,42 @@ /* FUNCTIONS ***************************************************************/ NTSTATUS -NTAPI +SampRegCloseKey(IN HANDLE KeyHandle) +{ + return NtClose(KeyHandle); +} + + +NTSTATUS +SampRegCreateKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE KeyHandle) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + ULONG Disposition; + + RtlInitUnicodeString(&Name, KeyName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + ParentKeyHandle, + NULL); + + /* Create the key */ + return ZwCreateKey(KeyHandle, + DesiredAccess, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); +} + + +NTSTATUS SampRegEnumerateSubKey(IN HANDLE KeyHandle, IN ULONG Index, IN ULONG Length, @@ -74,7 +109,6 @@ NTSTATUS -NTAPI SampRegOpenKey(IN HANDLE ParentKeyHandle, IN LPCWSTR KeyName, IN ACCESS_MASK DesiredAccess, @@ -171,5 +205,8 @@ /* Free the memory and return status */ RtlFreeHeap(RtlGetProcessHeap(), 0, ValueInfo); + if ((Data == NULL) && (Status == STATUS_BUFFER_OVERFLOW)) + Status = STATUS_SUCCESS; + return Status; } Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -269,11 +269,201 @@ SamrEnumerateDomainsInSamServer(IN SAMPR_HANDLE ServerHandle, IN OUT unsigned long *EnumerationContext, OUT PSAMPR_ENUMERATION_BUFFER *Buffer, - IN unsigned long PreferedMaximumLength, - OUT unsigned long *CountReturned) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned) +{ + PSAM_DB_OBJECT ServerObject; + WCHAR DomainKeyName[64]; + HANDLE DomainsKeyHandle; + HANDLE DomainKeyHandle; + ULONG EnumIndex; + ULONG EnumCount; + ULONG RequiredLength; + ULONG DataLength; + ULONG i; + PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; + NTSTATUS Status; + + TRACE("SamrEnumerateDomainsInSamServer(%p %p %p %lu %p)\n", + ServerHandle, EnumerationContext, Buffer, PreferedMaximumLength, + CountReturned); + + /* Validate the server handle */ + Status = SampValidateDbObject(ServerHandle, + SamDbServerObject, + SAM_SERVER_ENUMERATE_DOMAINS, + &ServerObject); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegOpenKey(ServerObject->KeyHandle, + L"Domains", + KEY_READ, + &DomainsKeyHandle); + if (!NT_SUCCESS(Status)) + return Status; + + EnumIndex = *EnumerationContext; + EnumCount = 0; + RequiredLength = 0; + + while (TRUE) + { + Status = SampRegEnumerateSubKey(DomainsKeyHandle, + EnumIndex, + 64 * sizeof(WCHAR), + DomainKeyName); + if (!NT_SUCCESS(Status)) + break; + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Domain key name: %S\n", DomainKeyName); + + Status = SampRegOpenKey(DomainsKeyHandle, + DomainKeyName, + KEY_READ, + &DomainKeyHandle); + TRACE("SampRegOpenKey returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + DataLength = 0; + Status = SampRegQueryValue(DomainKeyHandle, + L"Name", + NULL, + NULL, + &DataLength); + TRACE("SampRegQueryValue returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + TRACE("Data length: %lu\n", DataLength); + + if ((RequiredLength + DataLength + sizeof(UNICODE_STRING)) > PreferedMaximumLength) + break; + + RequiredLength += (DataLength + sizeof(UNICODE_STRING)); + EnumCount++; + } + + NtClose(DomainKeyHandle); + } + + EnumIndex++; + } + + TRACE("EnumCount: %lu\n", EnumCount); + TRACE("RequiredLength: %lu\n", RequiredLength); + + EnumBuffer = midl_user_allocate(sizeof(SAMPR_ENUMERATION_BUFFER)); + if (EnumBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + EnumBuffer->EntriesRead = EnumCount; + EnumBuffer->Buffer = midl_user_allocate(EnumCount * sizeof(SAMPR_RID_ENUMERATION)); + if (EnumBuffer->Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + EnumIndex = *EnumerationContext; + for (i = 0; i < EnumCount; i++, EnumIndex++) + { + Status = SampRegEnumerateSubKey(DomainsKeyHandle, + EnumIndex, + 64 * sizeof(WCHAR), + DomainKeyName); + if (!NT_SUCCESS(Status)) + break; + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Domain key name: %S\n", DomainKeyName); + + Status = SampRegOpenKey(DomainsKeyHandle, + DomainKeyName, + KEY_READ, + &DomainKeyHandle); + TRACE("SampRegOpenKey returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + DataLength = 0; + Status = SampRegQueryValue(DomainKeyHandle, + L"Name", + NULL, + NULL, + &DataLength); + TRACE("SampRegQueryValue returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + EnumBuffer->Buffer[i].RelativeId = 0; + EnumBuffer->Buffer[i].Name.Length = (USHORT)DataLength - sizeof(WCHAR); + EnumBuffer->Buffer[i].Name.MaximumLength = (USHORT)DataLength; + EnumBuffer->Buffer[i].Name.Buffer = midl_user_allocate(DataLength); + if (EnumBuffer->Buffer[i].Name.Buffer == NULL) + { + NtClose(DomainKeyHandle); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampRegQueryValue(DomainKeyHandle, + L"Name", + NULL, + EnumBuffer->Buffer[i].Name.Buffer, + &DataLength); + TRACE("SampRegQueryValue returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + TRACE("Domain name: %S\n", EnumBuffer->Buffer[i].Name.Buffer); + } + } + + NtClose(DomainKeyHandle); + + if (!NT_SUCCESS(Status)) + goto done; + } + } + + if (NT_SUCCESS(Status)) + { + *EnumerationContext += EnumCount; + *Buffer = EnumBuffer; + *CountReturned = EnumCount; + } + +done: + if (!NT_SUCCESS(Status)) + { + *EnumerationContext = 0; + *Buffer = NULL; + *CountReturned = 0; + + if (EnumBuffer != NULL) + { + if (EnumBuffer->Buffer != NULL) + { + if (EnumBuffer->EntriesRead != 0) + { + for (i = 0; i < EnumBuffer->EntriesRead; i++) + { + if (EnumBuffer->Buffer[i].Name.Buffer != NULL) + midl_user_free(EnumBuffer->Buffer[i].Name.Buffer); + } + } + + midl_user_free(EnumBuffer->Buffer); + } + + midl_user_free(EnumBuffer); + } + } + + NtClose(DomainsKeyHandle); + + return Status; } /* Function 7 */ @@ -348,6 +538,64 @@ return Status; } + +static NTSTATUS +SampQueryDomainName(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + PSAMPR_DOMAIN_INFO_BUFFER InfoBuffer = NULL; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_DOMAIN_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(DomainObject, + L"Name", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->Name.DomainName.Length = Length - sizeof(WCHAR); + InfoBuffer->Name.DomainName.MaximumLength = Length; + InfoBuffer->Name.DomainName.Buffer = midl_user_allocate(Length); + if (InfoBuffer->Name.DomainName.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(DomainObject, + L"Name", + NULL, + (PVOID)InfoBuffer->Name.DomainName.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + if (InfoBuffer->Name.DomainName.Buffer != NULL) + midl_user_free(InfoBuffer->Name.DomainName.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + /* Function 8 */ NTSTATUS NTAPI @@ -355,8 +603,32 @@ IN DOMAIN_INFORMATION_CLASS DomainInformationClass, OUT PSAMPR_DOMAIN_INFO_BUFFER *Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT DomainObject; + NTSTATUS Status; + + TRACE("SamrQueryInformationDomain(%p %lu %p)\n", + DomainHandle, DomainInformationClass, Buffer); + + /* Validate the server handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_READ_OTHER_PARAMETERS, + &DomainObject); + if (!NT_SUCCESS(Status)) + return Status; + + switch (DomainInformationClass) + { + case DomainNameInformation: + Status = SampQueryDomainName(DomainObject, + Buffer); + break; + + default: + Status = STATUS_NOT_IMPLEMENTED; + } + + return Status; } static NTSTATUS @@ -399,7 +671,7 @@ { case DomainNameInformation: Status = SampSetDomainName(DomainObject, - (PSAMPR_DOMAIN_NAME_INFORMATION)DomainInformation); + &DomainInformation->Name); break; default: @@ -579,8 +851,116 @@ OUT SAMPR_HANDLE *AliasHandle, OUT unsigned long *RelativeId) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT DomainObject; + PSAM_DB_OBJECT AliasObject; + ULONG ulSize; + ULONG ulRid; + WCHAR szRid[9]; + BOOL bAliasExists = FALSE; + NTSTATUS Status; + + TRACE("SamrCreateAliasInDomain(%p %p %lx %p %p)\n", + DomainHandle, AccountName, DesiredAccess, AliasHandle, RelativeId); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_CREATE_ALIAS, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Get the NextRID attribute */ + ulSize = sizeof(ULONG); + Status = SampGetObjectAttribute(DomainObject, + L"NextRID", + NULL, + (LPVOID)&ulRid, + &ulSize); + if (!NT_SUCCESS(Status)) + ulRid = DOMAIN_USER_RID_MAX + 1; + + TRACE("RID: %lx\n", ulRid); + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", ulRid); + + /* Check whether the user name is already in use */ + Status = SampCheckDbObjectNameAlias(DomainObject, + L"Aliases", + AccountName->Buffer, + &bAliasExists); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + if (bAliasExists) + { + TRACE("The alias account %S already exists!\n", AccountName->Buffer); + return STATUS_ALIAS_EXISTS; + } + + /* Create the user object */ + Status = SampCreateDbObject(DomainObject, + L"Aliases", + szRid, + SamDbAliasObject, + DesiredAccess, + &AliasObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Add the name alias for the user object */ + Status = SampSetDbObjectNameAlias(DomainObject, + L"Aliases", + AccountName->Buffer, + ulRid); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the name attribute */ + Status = SampSetObjectAttribute(AliasObject, + L"Name", + REG_SZ, + (LPVOID)AccountName->Buffer, + AccountName->MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* FIXME: Set default alias attributes */ + + if (NT_SUCCESS(Status)) + { + *AliasHandle = (SAMPR_HANDLE)AliasObject; + *RelativeId = ulRid; + } + + /* Increment the NextRID attribute */ + ulRid++; + ulSize = sizeof(ULONG); + SampSetObjectAttribute(DomainObject, + L"NextRID", + REG_DWORD, + (LPVOID)&ulRid, + ulSize); + + TRACE("returns with status 0x%08lx\n", Status); + + return Status; } /* Function 15 */ @@ -723,11 +1103,47 @@ NTAPI SamrOpenAlias(IN SAMPR_HANDLE DomainHandle, IN ACCESS_MASK DesiredAccess, - IN unsigned long AliasId, + IN ULONG AliasId, OUT SAMPR_HANDLE *AliasHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT DomainObject; + PSAM_DB_OBJECT AliasObject; + WCHAR szRid[9]; + NTSTATUS Status; + + TRACE("SamrOpenAlias(%p %lx %lx %p)\n", + DomainHandle, DesiredAccess, AliasId, AliasHandle); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_LOOKUP, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", AliasId); + + /* Create the alias object */ + Status = SampOpenDbObject(DomainObject, + L"Aliases", + szRid, + SamDbAliasObject, + DesiredAccess, + &AliasObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + *AliasHandle = (SAMPR_HANDLE)AliasObject; + + return STATUS_SUCCESS; } /* Function 28 */ @@ -767,8 +1183,52 @@ SamrAddMemberToAlias(IN SAMPR_HANDLE AliasHandle, IN PRPC_SID MemberId) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT AliasObject; + LPWSTR MemberIdString = NULL; + HANDLE MembersKeyHandle = NULL; + NTSTATUS Status; + + TRACE("SamrAddMemberToAlias(%p %p)\n", + AliasHandle, MemberId); + + /* Validate the domain handle */ + Status = SampValidateDbObject(AliasHandle, + SamDbAliasObject, + ALIAS_ADD_MEMBER, + &AliasObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + ConvertSidToStringSidW(MemberId, &MemberIdString); + TRACE("Member SID: %S\n", MemberIdString); + + Status = SampRegCreateKey(AliasObject->KeyHandle, + L"Members", + KEY_WRITE, + &MembersKeyHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegCreateKey failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegSetValue(MembersKeyHandle, + MemberIdString, + REG_BINARY, + NULL, + 0); + +done: + if (MembersKeyHandle != NULL) + SampRegCloseKey(MembersKeyHandle); + + if (MemberIdString != NULL) + LocalFree(MemberIdString); + + return Status; } /* Function 32 */ Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -17,6 +17,7 @@ #include <ndk/umtypes.h> #include <ddk/ntsam.h> #include <ntsecapi.h> +#include <sddl.h> #include <samsrv/samsrv.h> @@ -105,14 +106,21 @@ /* registry.h */ NTSTATUS -NTAPI +SampRegCloseKey(IN HANDLE KeyHandle); + +NTSTATUS +SampRegCreateKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE KeyHandle); + +NTSTATUS SampRegEnumerateSubKey(IN HANDLE KeyHandle, IN ULONG Index, IN ULONG Length, OUT LPWSTR Buffer); NTSTATUS -NTAPI SampRegOpenKey(IN HANDLE ParentKeyHandle, IN LPCWSTR KeyName, IN ACCESS_MASK DesiredAccess, Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -59,35 +59,87 @@ static BOOL +SampCreateAliasAccount(HKEY hDomainKey, + LPCWSTR lpAccountName, + ULONG ulRelativeId) +{ + DWORD dwDisposition; + WCHAR szAccountKeyName[32]; + HKEY hAccountKey = NULL; + HKEY hNamesKey = NULL; + + swprintf(szAccountKeyName, L"Aliases\\%08lX", ulRelativeId); + + if (!RegCreateKeyExW(hDomainKey, + szAccountKeyName, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hAccountKey, + &dwDisposition)) + { + RegSetValueEx(hAccountKey, + L"Name", + 0, + REG_SZ, + (LPVOID)lpAccountName, + (wcslen(lpAccountName) + 1) * sizeof(WCHAR)); + + RegCloseKey(hAccountKey); + } + + if (!RegOpenKeyExW(hDomainKey, + L"Aliases\\Names", + 0, + KEY_ALL_ACCESS, + &hNamesKey)) + { + RegSetValueEx(hNamesKey, + lpAccountName, + 0, + REG_DWORD, + (LPVOID)&ulRelativeId, + sizeof(ULONG)); + + RegCloseKey(hNamesKey); + } + + return TRUE; +} + + +static BOOL SampCreateUserAccount(HKEY hDomainKey, LPCWSTR lpAccountName, ULONG ulRelativeId) { DWORD dwDisposition; - WCHAR szUserKeyName[32]; - HKEY hUserKey = NULL; + WCHAR szAccountKeyName[32]; + HKEY hAccountKey = NULL; HKEY hNamesKey = NULL; - swprintf(szUserKeyName, L"Users\\%08lX", ulRelativeId); + swprintf(szAccountKeyName, L"Users\\%08lX", ulRelativeId); if (!RegCreateKeyExW(hDomainKey, - szUserKeyName, + szAccountKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, - &hUserKey, + &hAccountKey, &dwDisposition)) { - RegSetValueEx(hUserKey, + RegSetValueEx(hAccountKey, L"Name", 0, REG_SZ, (LPVOID)lpAccountName, (wcslen(lpAccountName) + 1) * sizeof(WCHAR)); - RegCloseKey(hUserKey); + RegCloseKey(hAccountKey); } if (!RegOpenKeyExW(hDomainKey, @@ -119,7 +171,7 @@ { DWORD dwDisposition; HKEY hDomainKey = NULL; - HKEY hAliasKey = NULL; + HKEY hAliasesKey = NULL; HKEY hGroupsKey = NULL; HKEY hUsersKey = NULL; HKEY hNamesKey = NULL; @@ -157,16 +209,16 @@ /* Create the Alias container */ if (!RegCreateKeyExW(hDomainKey, - L"Alias", + L"Aliases", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, - &hAliasKey, + &hAliasesKey, &dwDisposition)) { - if (!RegCreateKeyExW(hAliasKey, + if (!RegCreateKeyExW(hAliasesKey, L"Names", 0, NULL, @@ -177,7 +229,7 @@ &dwDisposition)) RegCloseKey(hNamesKey); - RegCloseKey(hAliasKey); + RegCloseKey(hAliasesKey); } /* Create the Groups container */ @@ -344,6 +396,21 @@ pBuiltinSid, &hDomainKey)) { + SampCreateAliasAccount(hDomainKey, + L"Administrators", + DOMAIN_ALIAS_RID_ADMINS); + + SampCreateAliasAccount(hDomainKey, + L"Users", + DOMAIN_ALIAS_RID_USERS); + + SampCreateAliasAccount(hDomainKey, + L"Guests", + DOMAIN_ALIAS_RID_GUESTS); + + SampCreateAliasAccount(hDomainKey, + L"Power Users", + DOMAIN_ALIAS_RID_POWER_USERS); RegCloseKey(hDomainKey); } Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=56… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -5,6 +5,12 @@ #ifdef __cplusplus extern "C" { #endif + +#define ALIAS_ADD_MEMBER 1 +#define ALIAS_REMOVE_MEMBER 2 +#define ALIAS_LIST_MEMBERS 4 +#define ALIAS_READ_INFORMATION 8 +#define ALIAS_WRITE_ACCOUNT 16 #define DOMAIN_READ_PASSWORD_PARAMETERS 1 #define DOMAIN_WRITE_PASSWORD_PARAMS 2 @@ -38,6 +44,19 @@ #define USER_WRITE_GROUP_INFORMATION 1024 typedef PVOID SAM_HANDLE, *PSAM_HANDLE; +typedef ULONG SAM_ENUMERATE_HANDLE, *PSAM_ENUMERATE_HANDLE; + +typedef struct _SAM_RID_ENUMERATION +{ + ULONG RelativeId; + UNICODE_STRING Name; +} SAM_RID_ENUMERATION, *PSAM_RID_ENUMERATION; + +typedef struct _SAM_SID_ENUMERATION +{ + PSID Sid; + UNICODE_STRING Name; +} SAM_SID_ENUMERATION, *PSAM_SID_ENUMERATION; typedef enum _DOMAIN_INFORMATION_CLASS { @@ -103,6 +122,11 @@ NTSTATUS NTAPI +SamAddMemberToAlias(IN SAM_HANDLE AliasHandle, + IN PSID MemberId); + +NTSTATUS +NTAPI SamCloseHandle(IN SAM_HANDLE SamHandle); NTSTATUS @@ -111,6 +135,14 @@ OUT PSAM_HANDLE ServerHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes); + +NTSTATUS +NTAPI +SamCreateAliasInDomain(IN SAM_HANDLE DomainHandle, + IN PUNICODE_STRING AccountName, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_HANDLE AliasHandle, + OUT PULONG RelativeId); NTSTATUS NTAPI @@ -122,6 +154,14 @@ NTSTATUS NTAPI +SamEnumerateDomainsInSamServer(IN SAM_HANDLE ServerHandle, + IN OUT PSAM_ENUMERATE_HANDLE EnumerationContext, + OUT PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned); + +NTSTATUS +NTAPI SamFreeMemory(IN PVOID Buffer); NTSTATUS @@ -129,6 +169,13 @@ SamLookupDomainInSamServer(IN SAM_HANDLE ServerHandle, IN PUNICODE_STRING Name, OUT PSID *DomainId); + +NTSTATUS +NTAPI +SamOpenAlias(IN SAM_HANDLE DomainHandle, + IN ACCESS_MASK DesiredAccess, + IN ULONG AliasId, + OUT PSAM_HANDLE AliasHandle); NTSTATUS NTAPI @@ -146,6 +193,12 @@ NTSTATUS NTAPI +SamQueryInformationDomain(IN SAM_HANDLE DomainHandle, + IN DOMAIN_INFORMATION_CLASS DomainInformationClass, + OUT PVOID *Buffer); + +NTSTATUS +NTAPI SamQueryInformationUser(IN SAM_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, OUT PVOID *Buffer); Modified: trunk/reactos/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id… ============================================================================== --- trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Sun Jun 3 20:54:06 2012 @@ -1036,7 +1036,7 @@ SamrOpenAlias( [in] SAMPR_HANDLE DomainHandle, [in] ACCESS_MASK DesiredAccess, - [in] unsigned long AliasId, + [in] ULONG AliasId, [out] SAMPR_HANDLE *AliasHandle); /* Function 28 */ @@ -1088,7 +1088,7 @@ SamrOpenUser( [in] SAMPR_HANDLE DomainHandle, [in] ACCESS_MASK DesiredAccess, - [in] unsigned long UserId, + [in] ULONG UserId, [out] SAMPR_HANDLE *UserHandle); /* Function 35 */

1 0

[jimtabor] 56689: - Fix a FIXME and fix the last test in wine Win test_ShowWindow.
by jimtabor＠svn.reactos.org 02 Jun '12

02 Jun '12

Author: jimtabor Date: Sat Jun 2 03:56:23 2012 New Revision: 56689 URL: http://svn.reactos.org/svn/reactos?rev=56689&view=rev Log: - Fix a FIXME and fix the last test in wine Win test_ShowWindow. Modified: trunk/reactos/win32ss/user/user32/windows/window.c Modified: trunk/reactos/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Sat Jun 2 03:56:23 2012 @@ -1501,7 +1501,9 @@ PWND Wnd = ValidateHwndNoErr(hWnd); if (Wnd != NULL) { - /* FIXME: If window is being destroyed return FALSE! */ + if (Wnd->state & WNDS_DESTROYED || + Wnd->state2 & WNDS2_INDESTROY) + return FALSE; return TRUE; }

1 0

[jimtabor] 56688: [Win32SS] - Minor fixups to SetParent. - Add utilities to check thread queue states and verify window object is still alive.
by jimtabor＠svn.reactos.org 02 Jun '12

02 Jun '12

Author: jimtabor Date: Sat Jun 2 03:34:04 2012 New Revision: 56688 URL: http://svn.reactos.org/svn/reactos?rev=56688&view=rev Log: [Win32SS] - Minor fixups to SetParent. - Add utilities to check thread queue states and verify window object is still alive. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/ntuser/object.h trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/window.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Jun 2 03:34:04 2012 @@ -794,6 +794,7 @@ #define SRVINFO_APIHOOK 0x0010 #define SRVINFO_METRICS 0x0020 +#define SRVINFO_KBDPREF 0x0080 #define NUM_SYSCOLORS 31 @@ -2182,7 +2183,8 @@ THREADSTATE_TASKMANWINDOW, THREADSTATE_GETMESSAGETIME, THREADSTATE_GETINPUTSTATE, - THREADSTATE_UPTIMELASTREAD + THREADSTATE_UPTIMELASTREAD, + THREADSTATE_FOREGROUNDTHREAD }; DWORD_PTR @@ -2522,6 +2524,7 @@ #define QUERY_WINDOW_FOCUS 0x03 #define QUERY_WINDOW_ISHUNG 0x04 #define QUERY_WINDOW_REAL_ID 0x05 +#define QUERY_WINDOW_FOREGROUND 0x06 DWORD NTAPI NtUserQueryWindow( Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Sat Jun 2 03:34:04 2012 @@ -221,6 +221,10 @@ case THREADSTATE_GETINPUTSTATE: ret = LOWORD(IntGetQueueStatus(QS_POSTMESSAGE|QS_TIMER|QS_PAINT|QS_SENDMESSAGE|QS_INPUT)) & (QS_KEY | QS_MOUSEBUTTON); break; + + case THREADSTATE_FOREGROUNDTHREAD: + ret = (gpqForeground == GetW32ThreadInfo()->MessageQueue); + break; } TRACE("Leave NtUserGetThreadState, ret=%i\n", ret); Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Sat Jun 2 03:34:04 2012 @@ -424,6 +424,20 @@ BOOL FASTCALL +UserObjectInDestroy(HANDLE h) +{ + PUSER_HANDLE_ENTRY entry; + + if (!(entry = handle_to_entry( gHandleTable, h ))) + { + SetLastNtError( STATUS_INVALID_HANDLE ); + return FALSE; + } + return (entry->flags & HANDLEENTRY_INDESTROY); +} + +BOOL +FASTCALL UserDeleteObject(HANDLE h, USER_OBJECT_TYPE type ) { PVOID body = UserGetObject(gHandleTable, h, type); Modified: trunk/reactos/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] Sat Jun 2 03:34:04 2012 @@ -37,6 +37,7 @@ BOOL FASTCALL UserDeleteObject(HANDLE h, USER_OBJECT_TYPE type ); PVOID UserGetObject(PUSER_HANDLE_TABLE ht, HANDLE handle, USER_OBJECT_TYPE type ); BOOL FASTCALL UserCreateHandleTable(VOID); +BOOL FASTCALL UserObjectInDestroy(HANDLE); static __inline VOID UserRefObjectCo(PVOID obj, PUSER_REFERENCE_ENTRY UserReferenceEntry) Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sat Jun 2 03:34:04 2012 @@ -57,6 +57,33 @@ Window->head.cLockObj++; return Window; +} + +PWND FASTCALL VerifyWnd(PWND pWnd) +{ + HWND hWnd; + UINT State, State2; + + if (!pWnd) return NULL; + + _SEH2_TRY + { + hWnd = UserHMGetHandle(pWnd); + State = pWnd->state; + State2 = pWnd->state2; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return NULL); + } + _SEH2_END + + if ( UserObjectInDestroy(hWnd) || + State & WNDS_DESTROYED || + State2 & WNDS2_INDESTROY ) + return NULL; + + return pWnd; } /* Temp HACK */ @@ -144,7 +171,7 @@ { if (Wnd->style & WS_POPUP) { - return Wnd->spwndOwner; + return Wnd->spwndOwner; } else if (Wnd->style & WS_CHILD) { @@ -1039,6 +1066,7 @@ PWND WndOldParent, pWndExam; BOOL WasVisible; POINT pt; + int swFlags = SWP_NOSIZE|SWP_NOZORDER; ASSERT(Wnd); ASSERT(WndNewParent); @@ -1080,10 +1108,14 @@ if (Wnd->head.pti->ppi != PsGetCurrentProcessWin32Process()) return NULL; - pt.x = Wnd->rcWindow.left; + WndOldParent = Wnd->spwndParent; + + if ( WndOldParent && + WndOldParent->ExStyle & WS_EX_LAYOUTRTL) + pt.x = Wnd->rcWindow.right; + else + pt.x = Wnd->rcWindow.left; pt.y = Wnd->rcWindow.top; - - WndOldParent = Wnd->spwndParent; if (WndOldParent) UserReferenceObject(WndOldParent); /* Caller must deref */ @@ -1095,10 +1127,23 @@ /* Set the new parent */ Wnd->spwndParent = WndNewParent; + if ( Wnd->style & WS_CHILD && + Wnd->spwndOwner && + Wnd->spwndOwner->ExStyle & WS_EX_TOPMOST ) + { + ERR("SetParent Top Most from Pop up!\n"); + Wnd->ExStyle |= WS_EX_TOPMOST; + } + /* Link the window with its new siblings */ - IntLinkHwnd(Wnd, HWND_TOP); - - } + IntLinkHwnd( Wnd, + ((0 == (Wnd->ExStyle & WS_EX_TOPMOST) && + WndNewParent == UserGetDesktopWindow() ) ? HWND_TOP : HWND_TOPMOST ) ); + + } + + if (WndOldParent == UserGetMessageWindow() || WndNewParent == UserGetMessageWindow()) + swFlags |= SWP_NOACTIVATE; IntNotifyWinEvent(EVENT_OBJECT_PARENTCHANGE, Wnd ,OBJID_WINDOW, CHILDID_SELF, WEF_SETBYWNDPTI); /* @@ -1108,7 +1153,7 @@ */ co_WinPosSetWindowPos( Wnd, (0 == (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOP : HWND_TOPMOST), - pt.x, pt.y, 0, 0, SWP_NOSIZE ); + pt.x, pt.y, 0, 0, swFlags); if (WasVisible) co_WinPosShowWindow(Wnd, SW_SHOWNORMAL); @@ -1156,9 +1201,9 @@ UserRefObjectCo(Wnd, &Ref); UserRefObjectCo(WndParent, &ParentRef); - + //ERR("Enter co_IntSetParent\n"); WndOldParent = co_IntSetParent(Wnd, WndParent); - + //ERR("Leave co_IntSetParent\n"); UserDerefObjectCo(WndParent); UserDerefObjectCo(Wnd); @@ -1526,7 +1571,7 @@ * Dialog boxes and message boxes do not inherit layout, so you must * set the layout explicitly. */ - if ( Class->fnid != FNID_DIALOG) + if ( Class->fnid != FNID_DIALOG ) { PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); if (ppi->dwLayout & LAYOUT_RTL) @@ -2077,16 +2122,11 @@ if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { RECTL NewPos; - UINT16 SwFlag; - - SwFlag = (style & WS_MINIMIZE) ? SW_MINIMIZE : SW_MAXIMIZE; - - co_WinPosMinMaximize(Window, SwFlag, &NewPos); - - SwFlag = ((Window->style & WS_CHILD) || UserGetActiveWindow()) ? - SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED : - SWP_NOZORDER | SWP_FRAMECHANGED; - + UINT SwFlag = (style & WS_MINIMIZE) ? SW_MINIMIZE : SW_MAXIMIZE; + + SwFlag = co_WinPosMinMaximize(Window, SwFlag, &NewPos); + SwFlag |= SWP_NOZORDER|SWP_FRAMECHANGED; /* Frame always gets changed */ + if (!(style & WS_VISIBLE) || (style & WS_CHILD) || UserGetActiveWindow()) SwFlag |= SWP_NOACTIVATE; co_WinPosSetWindowPos(Window, 0, NewPos.left, NewPos.top, NewPos.right, NewPos.bottom, SwFlag); } @@ -2339,6 +2379,7 @@ ASSERT_REFS_CO(Window); // FIXME: Temp HACK? hWnd = Window->head.h; + ti = PsGetCurrentThreadWin32Thread(); TRACE("co_UserDestroyWindow \n"); @@ -2370,9 +2411,9 @@ * be destroying. */ if (!co_WinPosShowWindow(Window, SW_HIDE)) - { - if (UserGetActiveWindow() == Window->head.h) - { + { // Rule #1. + if (ti->MessageQueue->spwndActive == Window && ti->MessageQueue == IntGetFocusMessageQueue()) + { ERR("DestroyWindow AOW\n"); co_WinPosActivateOtherWindow(Window); } } @@ -2381,14 +2422,14 @@ Window->head.pti->MessageQueue->spwndActive = NULL; if (Window->head.pti->MessageQueue->spwndFocus == Window) Window->head.pti->MessageQueue->spwndFocus = NULL; + if (Window->head.pti->MessageQueue->spwndActivePrev == Window) + Window->head.pti->MessageQueue->spwndActivePrev = NULL; if (Window->head.pti->MessageQueue->CaptureWindow == Window->head.h) Window->head.pti->MessageQueue->CaptureWindow = NULL; /* * Check if this window is the Shell's Desktop Window. If so set hShellWindow to NULL */ - - ti = PsGetCurrentThreadWin32Thread(); if ((ti != NULL) & (ti->pDeskInfo != NULL)) { @@ -3092,7 +3133,7 @@ * -- Filip, 01/nov/2003 */ #if 0 - co_WinPosSetWindowPos(hwndListView, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE); + co_WinPosSetWindowPos(WndListView, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE); #endif if (WndListView->ExStyle & WS_EX_TOPMOST) @@ -3518,6 +3559,10 @@ Result = (DWORD)pWnd->head.pti->pEThread->Cid.UniqueProcess; break; + case QUERY_WINDOW_FOREGROUND: + Result = (pWnd->head.pti->MessageQueue == gpqForeground); + break; + default: Result = (DWORD)NULL; break; Modified: trunk/reactos/win32ss/user/ntuser/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] Sat Jun 2 03:34:04 2012 @@ -51,5 +51,6 @@ BOOL FASTCALL IntEnableWindow(HWND,BOOL); DWORD FASTCALL GetNCHitEx(PWND,POINT); ULONG FASTCALL IntSetStyle(PWND,ULONG,ULONG); +PWND FASTCALL VerifyWnd(PWND); /* EOF */

1 0

[ekohl] 56687: [SAMLIB][SAMSRV][SYSSETUP] - Implement SamSetInformationDomain.DomainNameInformation and SamrSetInformationDomain.DomainNameInformation. - Set the account domain name for SAM too. - ...
by ekohl＠svn.reactos.org 01 Jun '12

01 Jun '12

Author: ekohl Date: Fri Jun 1 22:41:43 2012 New Revision: 56687 URL: http://svn.reactos.org/svn/reactos?rev=56687&view=rev Log: [SAMLIB][SAMSRV][SYSSETUP] - Implement SamSetInformationDomain.DomainNameInformation and SamrSetInformationDomain.DomainNameInformation. - Set the account domain name for SAM too. - Remove the old samlib.h file. Removed: trunk/reactos/include/reactos/libs/samlib/ Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/syssetup/precomp.h trunk/reactos/dll/win32/syssetup/security.c trunk/reactos/include/ddk/ntsam.h trunk/reactos/include/reactos/idl/sam.idl Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Fri Jun 1 22:41:43 2012 @@ -293,6 +293,33 @@ NTSTATUS NTAPI +SamSetInformationDomain(IN SAM_HANDLE DomainHandle, + IN DOMAIN_INFORMATION_CLASS DomainInformationClass, + IN PVOID DomainInformation) +{ + NTSTATUS Status; + + TRACE("SamSetInformationDomain(%p %lu %p)\n", + DomainHandle, DomainInformationClass, DomainInformation); + + RpcTryExcept + { + Status = SamrSetInformationDomain((SAMPR_HANDLE)DomainHandle, + DomainInformationClass, + DomainInformation); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamSetInformationUser(IN SAM_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, IN PVOID Buffer) Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Fri Jun 1 22:41:43 2012 @@ -44,7 +44,7 @@ @ stub SamRemoveMultipleMembersFromAlias @ stub SamRidToSid @ stub SamSetInformationAlias -@ stub SamSetInformationDomain +@ stdcall SamSetInformationDomain(ptr long ptr) @ stub SamSetInformationGroup @ stdcall SamSetInformationUser(ptr long ptr) @ stub SamSetMemberAttributesOfGroup Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Fri Jun 1 22:41:43 2012 @@ -359,6 +359,21 @@ return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS +SampSetDomainName(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_NAME_INFORMATION DomainNameInfo) +{ + NTSTATUS Status; + + Status = SampSetObjectAttribute(DomainObject, + L"Name", + REG_SZ, + DomainNameInfo->DomainName.Buffer, + DomainNameInfo->DomainName.Length + sizeof(WCHAR)); + + return Status; +} + /* Function 9 */ NTSTATUS NTAPI @@ -366,8 +381,32 @@ IN DOMAIN_INFORMATION_CLASS DomainInformationClass, IN PSAMPR_DOMAIN_INFO_BUFFER DomainInformation) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT DomainObject; + NTSTATUS Status; + + TRACE("SamrSetInformationDomain(%p %lu %p)\n", + DomainHandle, DomainInformationClass, DomainInformation); + + /* Validate the server handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_WRITE_OTHER_PARAMETERS, + &DomainObject); + if (!NT_SUCCESS(Status)) + return Status; + + switch (DomainInformationClass) + { + case DomainNameInformation: + Status = SampSetDomainName(DomainObject, + (PSAMPR_DOMAIN_NAME_INFORMATION)DomainInformation); + break; + + default: + Status = STATUS_NOT_IMPLEMENTED; + } + + return Status; } /* Function 10 */ Modified: trunk/reactos/dll/win32/syssetup/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/precomp… ============================================================================== --- trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] Fri Jun 1 22:41:43 2012 @@ -13,7 +13,6 @@ #include <io.h> #include <tchar.h> #include <stdlib.h> -#include <samlib/samlib.h> #include <syssetup/syssetup.h> #include <userenv.h> #include <shlobj.h> @@ -24,6 +23,7 @@ #include <time.h> #include <ntlsa.h> #include <ntsecapi.h> +#include <ntsam.h> #include <sddl.h> #include "globals.h" Modified: trunk/reactos/dll/win32/syssetup/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/securit… ============================================================================== --- trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] Fri Jun 1 22:41:43 2012 @@ -24,6 +24,11 @@ POLICY_ACCOUNT_DOMAIN_INFO Info; LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle; + + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + DOMAIN_NAME_INFORMATION DomainNameInfo; + NTSTATUS Status; DPRINT1("SYSSETUP: SetAccountDomain\n"); @@ -84,6 +89,40 @@ LsaFreeMemory(OrigInfo); LsaClose(PolicyHandle); + + DomainNameInfo.DomainName.Length = wcslen(DomainName) * sizeof(WCHAR); + DomainNameInfo.DomainName.MaximumLength = (wcslen(DomainName) + 1) * sizeof(WCHAR); + DomainNameInfo.DomainName.Buffer = (LPWSTR)DomainName; + + Status = SamConnect(NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (NT_SUCCESS(Status)) + { + Status = SamOpenDomain(ServerHandle, + DOMAIN_WRITE_OTHER_PARAMETERS, + Info.DomainSid, + &DomainHandle); + if (NT_SUCCESS(Status)) + { + Status = SamSetInformationDomain(DomainHandle, + DomainNameInformation, + (PVOID)&DomainNameInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamSetInformationDomain failed (Status: 0x%08lx)\n", Status); + } + + SamCloseHandle(DomainHandle); + } + else + { + DPRINT1("SamOpenDomain failed (Status: 0x%08lx)\n", Status); + } + + SamCloseHandle(ServerHandle); + } return Status; } Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=56… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Fri Jun 1 22:41:43 2012 @@ -38,6 +38,28 @@ #define USER_WRITE_GROUP_INFORMATION 1024 typedef PVOID SAM_HANDLE, *PSAM_HANDLE; + +typedef enum _DOMAIN_INFORMATION_CLASS +{ + DomainPasswordInformation = 1, + DomainGeneralInformation, + DomainLogoffInformation, + DomainOemInformation, + DomainNameInformation, + DomainReplicationInformation, + DomainServerRoleInformation, + DomainModifiedInformation, + DomainStateInformation, + DomainUasInformation, + DomainGeneralInformation2, + DomainLockoutInformation, + DomainModifiedInformation2 +} DOMAIN_INFORMATION_CLASS; + +typedef struct _DOMAIN_NAME_INFORMATION +{ + UNICODE_STRING DomainName; +} DOMAIN_NAME_INFORMATION, *PDOMAIN_NAME_INFORMATION; typedef enum _USER_INFORMATION_CLASS { @@ -130,6 +152,12 @@ NTSTATUS NTAPI +SamSetInformationDomain(IN SAM_HANDLE DomainHandle, + IN DOMAIN_INFORMATION_CLASS DomainInformationClass, + IN PVOID DomainInformation); + +NTSTATUS +NTAPI SamSetInformationUser(IN SAM_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, IN PVOID Buffer); Modified: trunk/reactos/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id… ============================================================================== --- trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Fri Jun 1 22:41:43 2012 @@ -233,6 +233,7 @@ unsigned short LockoutThreshold; } SAMPR_DOMAIN_LOCKOUT_INFORMATION, *PSAMPR_DOMAIN_LOCKOUT_INFORMATION; +cpp_quote("#ifndef _NTSAM_") typedef enum _DOMAIN_INFORMATION_CLASS { DomainPasswordInformation = 1, @@ -248,6 +249,7 @@ DomainLockoutInformation = 12, DomainModifiedInformation2 = 13 } DOMAIN_INFORMATION_CLASS; +cpp_quote("#endif") typedef [switch_type(DOMAIN_INFORMATION_CLASS)] union _SAMPR_DOMAIN_INFO_BUFFER {

1 0

[akhaldi] 56686: [USBCCGP] * Fix a thinko.
by akhaldi＠svn.reactos.org 01 Jun '12

01 Jun '12

Author: akhaldi Date: Fri Jun 1 18:59:22 2012 New Revision: 56686 URL: http://svn.reactos.org/svn/reactos?rev=56686&view=rev Log: [USBCCGP] * Fix a thinko. Modified: trunk/reactos/drivers/usb/usbccgp/function.c Modified: trunk/reactos/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/functi… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] Fri Jun 1 18:59:22 2012 @@ -331,7 +331,7 @@ // allocate array for interface count FunctionDescriptor->InterfaceDescriptorList = AllocateItem(NonPagedPool, sizeof(PUSB_INTERFACE_DESCRIPTOR) * Descriptor->bInterfaceCount); - if (FunctionDescriptor->InterfaceDescriptorList) + if (!FunctionDescriptor->InterfaceDescriptorList) { // // no memory

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs