Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 66631: [PSDK] Add missing MsiProvidedComponent{A, W} declarations. CORE-9246
by akhaldi＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: akhaldi Date: Mon Mar 9 20:26:03 2015 New Revision: 66631 URL: http://svn.reactos.org/svn/reactos?rev=66631&view=rev Log: [PSDK] Add missing MsiProvidedComponent{A,W} declarations. CORE-9246 Modified: trunk/reactos/include/psdk/msi.h Modified: trunk/reactos/include/psdk/msi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msi.h?rev=666… ============================================================================== --- trunk/reactos/include/psdk/msi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msi.h [iso-8859-1] Mon Mar 9 20:26:03 2015 @@ -1049,6 +1049,10 @@ #define MsiGetUserInfo WINELIB_NAME_AW(MsiGetUserInfo) +UINT WINAPI MsiProvidedComponentA(LPCSTR, LPCSTR, LPCSTR, DWORD, LPSTR, LPDWORD); +UINT WINAPI MsiProvideComponentW(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPWSTR, LPDWORD); +#define MsiProvideComponent WINELIB_NAME_AW(MsiProvideComponent) + UINT WINAPI MsiCollectUserInfoA(_In_ LPCSTR); UINT WINAPI MsiCollectUserInfoW(_In_ LPCWSTR); #define MsiCollectUserInfo WINELIB_NAME_AW(MsiCollectUserInfo)

1 0

[akhaldi] 66630: [MSIEXEC] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: akhaldi Date: Mon Mar 9 20:02:20 2015 New Revision: 66630 URL: http://svn.reactos.org/svn/reactos?rev=66630&view=rev Log: [MSIEXEC] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/base/system/msiexec/msiexec.c trunk/reactos/base/system/msiexec/rsrc.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/system/msiexec/msiexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== --- trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] Mon Mar 9 20:02:20 2015 @@ -866,7 +866,7 @@ ExitProcess(1); } } - else if(msi_option_equal(argvW[i], "p")) + else if(msi_option_equal(argvW[i], "p") || msi_option_equal(argvW[i], "update")) { FunctionPatch = TRUE; i++; Modified: trunk/reactos/base/system/msiexec/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/rsrc.r… ============================================================================== --- trunk/reactos/base/system/msiexec/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/rsrc.rc [iso-8859-1] Mon Mar 9 20:02:20 2015 @@ -21,10 +21,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine Installer" #define WINE_FILENAME_STR "msiexec.exe" #define WINE_FILETYPE VFT_APP -#define WINE_FILEVERSION 4,5,6001,22299 -#define WINE_FILEVERSION_STR "4.5.6001.22299" -#define WINE_PRODUCTVERSION 4,5,6001,22299 -#define WINE_PRODUCTVERSION_STR "4.5.6001.22299" +#define WINE_FILEVERSION 4,5,6001,22308 +#define WINE_FILEVERSION_STR "4.5.6001.22308" +#define WINE_PRODUCTVERSION 4,5,6001,22308 +#define WINE_PRODUCTVERSION_STR "4.5.6001.22308" #define WINE_PRODUCTNAME_STR "Wine Installer" #include "wine/wine_common_ver.rc" 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 Mar 9 20:02:20 2015 @@ -251,7 +251,7 @@ reactos/base/applications/wordpad # Synced to Wine-1.7.27 reactos/base/services/rpcss # Synced to Wine-1.7.27 reactos/base/system/expand # Synced to Wine-1.7.27 -reactos/base/system/msiexec # Synced to Wine-1.7.27 +reactos/base/system/msiexec # Synced to WineStaging-1.7.37 reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported

1 0

[akhaldi] 66629: [OLE32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: akhaldi Date: Mon Mar 9 19:58:31 2015 New Revision: 66629 URL: http://svn.reactos.org/svn/reactos?rev=66629&view=rev Log: [OLE32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/ole32/compobj.c trunk/rostests/winetests/ole32/moniker.c trunk/rostests/winetests/ole32/storage32.c trunk/rostests/winetests/ole32/usrmarshal.c Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… ============================================================================== --- trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] Mon Mar 9 19:58:31 2015 @@ -38,6 +38,7 @@ //#include "shlguid.h" #include <ole2.h> #include <urlmon.h> /* for CLSID_FileProtocol */ +#include <dde.h> #include <ctxtcall.h> @@ -390,6 +391,7 @@ clsid = CLSID_NULL; hr = CLSIDFromProgID(progidW, &clsid); + ok(hr == S_OK, "got 0x%08x\n", hr); /* it returns generated CLSID here */ ok(!IsEqualCLSID(&clsid, &CLSID_non_existent) && !IsEqualCLSID(&clsid, &CLSID_NULL), "got wrong clsid %s\n", wine_dbgstr_guid(&clsid)); @@ -1166,6 +1168,7 @@ ok(!res, "RegCreateKeyEx returned %d\n", res); res = RegCreateKeyExA(hkey, "ProxyStubClsid32", 0, NULL, 0, KEY_ALL_ACCESS | opposite, NULL, &hkey_psclsid, NULL); + ok(!res, "RegCreateKeyEx returned %d\n", res); res = RegSetValueExA(hkey_psclsid, NULL, 0, REG_SZ, (const BYTE *)clsidA, strlen(clsidA)+1); ok(!res, "RegSetValueEx returned %d\n", res); RegCloseKey(hkey_psclsid); @@ -1919,10 +1922,10 @@ ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); todo_wine ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); - refs = IUnknown_AddRef((IUnknown *)ctx); + refs = IObjContext_AddRef(ctx); todo_wine ok(refs == 3, "Expected 3, got %u\n", refs); - refs = IUnknown_Release((IUnknown *)ctx); + refs = IObjContext_Release(ctx); todo_wine ok(refs == 2, "Expected 2, got %u\n", refs); refs = IUnknown_Release((IUnknown *)token); @@ -1935,13 +1938,13 @@ ok(token, "Expected token != 0\n"); todo_wine ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); - refs = IUnknown_AddRef((IUnknown *)ctx); + refs = IObjContext_AddRef(ctx); ok(refs == 2, "Expected 1, got %u\n", refs); - refs = IUnknown_Release((IUnknown *)ctx); + refs = IObjContext_Release(ctx); ok(refs == 1, "Expected 0, got %u\n", refs); - refs = IUnknown_Release((IUnknown *)ctx); + refs = IObjContext_Release(ctx); ok(refs == 0, "Expected 0, got %u\n", refs); CoUninitialize(); @@ -2043,6 +2046,7 @@ /* Cleanup */ CoUninitialize(); OleUninitialize(); + OleUninitialize(); } static void test_OleRegGetMiscStatus(void) @@ -2095,6 +2099,350 @@ hr = CoCreateGuid(NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} + +static void CALLBACK apc_test_proc(ULONG_PTR param) +{ + /* nothing */ +} + +static DWORD CALLBACK release_semaphore_thread( LPVOID arg ) +{ + HANDLE handle = arg; + if (WaitForSingleObject(handle, 200) == WAIT_TIMEOUT) + ReleaseSemaphore(handle, 1, NULL); + return 0; +} + +static DWORD CALLBACK send_message_thread(LPVOID arg) +{ + HWND hWnd = arg; + Sleep(50); + SendMessageA(hWnd, WM_DDE_FIRST, 0, 0); + return 0; +} + +static DWORD CALLBACK post_message_thread(LPVOID arg) +{ + HWND hWnd = arg; + Sleep(50); + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + return 0; +} + +static void test_CoWaitForMultipleHandles(void) +{ + static const char cls_name[] = "cowait_test_class"; + HANDLE handles[2], thread; + DWORD index, tid; + WNDCLASSEXA wc; + BOOL success; + HRESULT hr; + HWND hWnd; + MSG msg; + + hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); + + memset(&wc, 0, sizeof(wc)); + wc.cbSize = sizeof(wc); + wc.style = CS_VREDRAW | CS_HREDRAW; + wc.hInstance = GetModuleHandleA(0); + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wc.hbrBackground = NULL; + wc.lpszClassName = cls_name; + wc.lpfnWndProc = DefWindowProcA; + success = RegisterClassExA(&wc) != 0; + ok(success, "RegisterClassExA failed %u\n", GetLastError()); + + hWnd = CreateWindowExA(0, cls_name, "Test", WS_TILEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); + ok(hWnd != 0, "CreateWindowExA failed %u\n", GetLastError()); + handles[0] = CreateSemaphoreA(NULL, 1, 1, NULL); + ok(handles[0] != 0, "CreateSemaphoreA failed %u\n", GetLastError()); + handles[1] = CreateSemaphoreA(NULL, 1, 1, NULL); + ok(handles[1] != 0, "CreateSemaphoreA failed %u\n", GetLastError()); + + /* test without flags */ + + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(0, 50, 0, handles, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(0, 50, 0, NULL, &index); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); + ok(index == 0, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(0, 50, 0, handles, &index); + ok(hr == RPC_E_NO_SYNC, "expected RPC_E_NO_SYNC, got 0x%08x\n", hr); + ok(index == 0, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(0, 50, 1, handles, &index); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(index == 0, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(index == 1, "expected index 1, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + + /* test PostMessageA/SendMessageA from a different thread */ + + index = 0xdeadbeef; + thread = CreateThread(NULL, 0, post_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + index = 0xdeadbeef; + thread = CreateThread(NULL, 0, send_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + ReleaseSemaphore(handles[0], 1, NULL); + ReleaseSemaphore(handles[1], 1, NULL); + + /* test with COWAIT_WAITALL */ + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(COWAIT_WAITALL, 50, 2, handles, &index); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(index == 0, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + + ReleaseSemaphore(handles[0], 1, NULL); + ReleaseSemaphore(handles[1], 1, NULL); + + /* test with COWAIT_ALERTABLE */ + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(COWAIT_ALERTABLE, 50, 1, handles, &index); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(index == 0, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(COWAIT_ALERTABLE, 50, 2, handles, &index); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(index == 1, "expected index 1, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(COWAIT_ALERTABLE, 50, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + success = QueueUserAPC(apc_test_proc, GetCurrentThread(), 0); + ok(success, "QueueUserAPC failed %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(COWAIT_ALERTABLE, 50, 2, handles, &index); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(index == WAIT_IO_COMPLETION, "expected index WAIT_IO_COMPLETION, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + + /* test with COWAIT_INPUTAVAILABLE (semaphores are still locked) */ + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_NOREMOVE); + ok(success, "PeekMessageA returned FALSE\n"); + hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_NOREMOVE); + ok(success, "PeekMessageA returned FALSE\n"); + thread = CreateThread(NULL, 0, release_semaphore_thread, handles[1], 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(COWAIT_INPUTAVAILABLE, 50, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING || broken(hr == E_INVALIDARG) || broken(hr == S_OK) /* Win 8 */, + "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + if (hr != S_OK) ReleaseSemaphore(handles[1], 1, NULL); + ok(index == 0 || broken(index == 1) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success || broken(success && hr == E_INVALIDARG), + "CoWaitForMultipleHandles didn't pump any messages\n"); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + /* test behaviour of WM_QUIT (semaphores are still locked) */ + + PostMessageA(hWnd, WM_QUIT, 40, 0); + memset(&msg, 0, sizeof(msg)); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(success, "PeekMessageA failed, error %u\n", GetLastError()); + ok(msg.message == WM_QUIT, "expected msg.message = WM_QUIT, got %u\n", msg.message); + ok(msg.wParam == 40, "expected msg.wParam = 40, got %lu\n", msg.wParam); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(!success, "PeekMessageA succeeded\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + PostMessageA(hWnd, WM_QUIT, 41, 0); + thread = CreateThread(NULL, 0, post_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + todo_wine + ok(success || broken(!success) /* Win 2000/XP/8 */, "PeekMessageA failed, error %u\n", GetLastError()); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "PeekMessageA succeeded\n"); + memset(&msg, 0, sizeof(msg)); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + todo_wine + ok(!success || broken(success) /* Win 2000/XP/8 */, "PeekMessageA succeeded\n"); + if (success) + { + ok(msg.message == WM_QUIT, "expected msg.message = WM_QUIT, got %u\n", msg.message); + ok(msg.wParam == 41, "expected msg.wParam = 41, got %lu\n", msg.wParam); + } + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + PostMessageA(hWnd, WM_QUIT, 42, 0); + thread = CreateThread(NULL, 0, send_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump all WM_DDE_FIRST messages\n"); + memset(&msg, 0, sizeof(msg)); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(success, "PeekMessageA failed, error %u\n", GetLastError()); + ok(msg.message == WM_QUIT, "expected msg.message = WM_QUIT, got %u\n", msg.message); + ok(msg.wParam == 42, "expected msg.wParam = 42, got %lu\n", msg.wParam); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + PostQuitMessage(43); + memset(&msg, 0, sizeof(msg)); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(success || broken(!success) /* Win 8 */, "PeekMessageA failed, error %u\n", GetLastError()); + if (!success) + win_skip("PostQuitMessage didn't queue a WM_QUIT message, skipping tests\n"); + else + { + ok(msg.message == WM_QUIT, "expected msg.message = WM_QUIT, got %u\n", msg.message); + ok(msg.wParam == 43, "expected msg.wParam = 43, got %lu\n", msg.wParam); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(!success, "PeekMessageA succeeded\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + PostQuitMessage(44); + thread = CreateThread(NULL, 0, post_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "PeekMessageA failed, error %u\n", GetLastError()); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + todo_wine + ok(!success, "PeekMessageA succeeded\n"); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + todo_wine + ok(!success, "CoWaitForMultipleHandles didn't remove WM_QUIT messages\n"); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + PostQuitMessage(45); + thread = CreateThread(NULL, 0, send_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "PeekMessageA failed, error %u\n", GetLastError()); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + todo_wine + ok(!success, "PeekMessageA succeeded\n"); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't remove WM_QUIT messages\n"); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + } + + CloseHandle(handles[0]); + CloseHandle(handles[1]); + DestroyWindow(hWnd); + + success = UnregisterClassA(cls_name, GetModuleHandleA(0)); + ok(success, "UnregisterClass failed %u\n", GetLastError()); + + CoUninitialize(); } static void init_funcs(void) @@ -2157,4 +2505,5 @@ test_CoInitializeEx(); test_OleRegGetMiscStatus(); test_CoCreateGuid(); -} + test_CoWaitForMultipleHandles(); +} Modified: trunk/rostests/winetests/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/moniker.c… ============================================================================== --- trunk/rostests/winetests/ole32/moniker.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/moniker.c [iso-8859-1] Mon Mar 9 19:58:31 2015 @@ -61,14 +61,6 @@ static char const * const *expected_method_list; static const WCHAR wszFileName1[] = {'c',':','\\','w','i','n','d','o','w','s','\\','t','e','s','t','1','.','d','o','c',0}; static const WCHAR wszFileName2[] = {'c',':','\\','w','i','n','d','o','w','s','\\','t','e','s','t','2','.','d','o','c',0}; - -static const CLSID CLSID_WineTest = -{ /* 9474ba1a-258b-490b-bc13-516e9239ace0 */ - 0x9474ba1a, - 0x258b, - 0x490b, - {0xbc, 0x13, 0x51, 0x6e, 0x92, 0x39, 0xac, 0xe0} -}; static const CLSID CLSID_TestMoniker = { /* b306bfbc-496e-4f53-b93e-2ff9c83223d7 */ @@ -2028,9 +2020,7 @@ hr = IMoniker_Save(pMk, pStm, TRUE); ok_ole_success(hr, "IMoniker_Save"); - - hr = IMoniker_Release(pMk); - ok_ole_success(hr, "IMoniker_Release"); + IMoniker_Release(pMk); /* overwrite the constants with various values */ hr = IStream_Seek(pStm, zero_pos, STREAM_SEEK_SET, NULL); @@ -2061,11 +2051,8 @@ hr = IMoniker_Load(pMk, pStm); ok_ole_success(hr, "IMoniker_Load"); - hr = IMoniker_Release(pMk); - ok_ole_success(hr, "IMoniker_Release"); - - hr = IStream_Release(pStm); - ok_ole_success(hr, "IStream_Release"); + IMoniker_Release(pMk); + IStream_Release(pStm); } START_TEST(moniker) Modified: trunk/rostests/winetests/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/storage32… ============================================================================== --- trunk/rostests/winetests/ole32/storage32.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/storage32.c [iso-8859-1] Mon Mar 9 19:58:31 2015 @@ -1052,7 +1052,7 @@ r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); - r = IStream_Release(stm); + IStream_Release(stm); /* first enum ... should be 1 stream */ r = IStorage_EnumElements(stg, 0, NULL, 0, &ee); Modified: trunk/rostests/winetests/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/usrmarsha… ============================================================================== --- trunk/rostests/winetests/ole32/usrmarshal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/usrmarshal.c [iso-8859-1] Mon Mar 9 19:58:31 2015 @@ -281,7 +281,6 @@ ok(*(DWORD *)wirehemf == (size - 0x10), "wirestgm + 0xc should be size - 0x10 instead of 0x%08x\n", *(DWORD *)wirehemf); wirehemf += sizeof(DWORD); ok(*(DWORD *)wirehemf == EMR_HEADER, "wirestgm + 0x10 should be EMR_HEADER instead of %d\n", *(DWORD *)wirehemf); - wirehemf += sizeof(DWORD); /* ... rest of data not tested - refer to tests for GetEnhMetaFileBits * at this point */ @@ -306,7 +305,6 @@ ok(*(DWORD *)wirehemf == WDT_REMOTE_CALL, "wirestgm + 0x0 should be WDT_REMOTE_CALL instead of 0x%08x\n", *(DWORD *)wirehemf); wirehemf += sizeof(DWORD); ok(*(DWORD *)wirehemf == (DWORD)(DWORD_PTR)hemf, "wirestgm + 0x4 should be hemf instead of 0x%08x\n", *(DWORD *)wirehemf); - wirehemf += sizeof(DWORD); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); HENHMETAFILE_UserUnmarshal(&umcb.Flags, buffer, &hemf2); @@ -442,7 +440,6 @@ ok(*(DWORD *)wirehmfp == (buffer_end - buffer - 0x28), "wirestgm + 0x24 should be size - 0x34 instead of 0x%08x\n", *(DWORD *)wirehmfp); wirehmfp += sizeof(DWORD); ok(*(WORD *)wirehmfp == 1, "wirehmfp + 0x28 should be 1 instead of 0x%08x\n", *(DWORD *)wirehmfp); - wirehmfp += sizeof(DWORD); /* ... rest of data not tested - refer to tests for GetMetaFileBits * at this point */ @@ -585,6 +582,7 @@ ok(size == 0, "size should be 0 bytes, not %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); + ok(buffer_end == buffer, "buffer_end %p buffer %p\n", buffer_end, buffer); HeapFree(GetProcessHeap(), 0, buffer); /* Now for a non-NULL pointer. The marshalled data are two size DWORDS and then

1 0

[akhaldi] 66628: [OLE32] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: akhaldi Date: Mon Mar 9 19:57:38 2015 New Revision: 66628 URL: http://svn.reactos.org/svn/reactos?rev=66628&view=rev Log: [OLE32] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/ole32/CMakeLists.txt trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/ole32_ros.diff trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/ole32/storage32.h trunk/reactos/dll/win32/ole32/usrmarshal.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Mon Mar 9 19:57:38 2015 @@ -80,7 +80,7 @@ set_module_type(ole32 win32dll) target_link_libraries(ole32 wine uuid ${PSEH_LIB}) -add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll) +add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 kernel32_vista ntdll) add_delay_importlibs(ole32 oleaut32) add_dependencies(ole32 ole32idl) add_pch(ole32 precomp.h SOURCE) Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… ============================================================================== --- trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] Mon Mar 9 19:57:38 2015 @@ -174,8 +174,6 @@ */ static const WCHAR clipbrd_wndclass[] = {'C','L','I','P','B','R','D','W','N','D','C','L','A','S','S',0}; -static const WCHAR wine_marshal_dataobject[] = {'W','i','n','e',' ','m','a','r','s','h','a','l',' ','d','a','t','a','o','b','j','e','c','t',0}; - UINT ownerlink_clipboard_format = 0; UINT filename_clipboard_format = 0; UINT filenameW_clipboard_format = 0; @@ -190,13 +188,11 @@ static UINT wine_marshal_clipboard_format; -static inline char *dump_fmtetc(FORMATETC *fmt) -{ - static char buf[100]; - - snprintf(buf, sizeof(buf), "cf %04x ptd %p aspect %x lindex %d tymed %x", - fmt->cfFormat, fmt->ptd, fmt->dwAspect, fmt->lindex, fmt->tymed); - return buf; +static inline const char *dump_fmtetc(FORMATETC *fmt) +{ + if (!fmt) return "(null)"; + return wine_dbg_sprintf("cf %04x ptd %p aspect %x lindex %d tymed %x", + fmt->cfFormat, fmt->ptd, fmt->dwAspect, fmt->lindex, fmt->tymed); } /*---------------------------------------------------------------------* @@ -1113,6 +1109,8 @@ return TYMED_ENHMF; case CF_METAFILEPICT: return TYMED_MFPICT; + case CF_BITMAP: + return TYMED_GDI; default: FIXME("returning TYMED_NULL for cf %04x\n", cf); return TYMED_NULL; @@ -1290,6 +1288,27 @@ return S_OK; } +/************************************************************************ + * get_stgmed_for_bitmap + * + * Returns a stg medium with a bitmap based on the handle + */ +static HRESULT get_stgmed_for_bitmap(HBITMAP hbmp, STGMEDIUM *med) +{ + HRESULT hr; + + med->pUnkForRelease = NULL; + med->tymed = TYMED_NULL; + + hr = dup_bitmap(hbmp, &med->u.hBitmap); + + if (FAILED(hr)) + return hr; + + med->tymed = TYMED_GDI; + return S_OK; +} + static inline BOOL string_off_equal(const DVTARGETDEVICE *t1, WORD off1, const DVTARGETDEVICE *t2, WORD off2) { const WCHAR *str1, *str2; @@ -1381,6 +1400,8 @@ hr = get_stgmed_for_stream(h, med); else if(mask & TYMED_ENHMF) hr = get_stgmed_for_emf((HENHMETAFILE)h, med); + else if(mask & TYMED_GDI) + hr = get_stgmed_for_bitmap((HBITMAP)h, med); else { FIXME("Unhandled tymed - mask %x req tymed %x\n", mask, fmt->tymed); Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] Mon Mar 9 19:57:38 2015 @@ -1628,7 +1628,6 @@ return hr; } -#ifndef __REACTOS__ static BOOL WINAPI register_class( INIT_ONCE *once, void *param, void **context ) { WNDCLASSW wclass; @@ -1649,33 +1648,24 @@ RegisterClassW(&wclass); return TRUE; } -#endif /* create a window for the apartment or return the current one if one has * already been created */ HRESULT apartment_createwindowifneeded(struct apartment *apt) { -#ifndef __REACTOS__ static INIT_ONCE class_init_once = INIT_ONCE_STATIC_INIT; -#endif if (apt->multi_threaded) return S_OK; if (!apt->win) { -#ifndef __REACTOS__ HWND hwnd; InitOnceExecuteOnce( &class_init_once, register_class, NULL, NULL ); hwnd = CreateWindowW(wszAptWinClass, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, hProxyDll, NULL); -#else - HWND hwnd = CreateWindowW(wszAptWinClass, NULL, 0, - 0, 0, 0, 0, - HWND_MESSAGE, 0, hProxyDll, NULL); -#endif if (!hwnd) { ERR("CreateWindow failed with error %d\n", GetLastError()); @@ -1701,35 +1691,6 @@ apartment_addref(MTA); COM_CurrentInfo()->apt = MTA; } - -#ifdef __REACTOS__ - -static void COMPOBJ_InitProcess( void ) -{ - WNDCLASSW wclass; - - /* Dispatching to the correct thread in an apartment is done through - * window messages rather than RPC transports. When an interface is - * marshalled into another apartment in the same process, a window of the - * following class is created. The *caller* of CoMarshalInterface (i.e., the - * application) is responsible for pumping the message loop in that thread. - * The WM_USER messages which point to the RPCs are then dispatched to - * apartment_wndproc by the user's code from the apartment in which the - * interface was unmarshalled. - */ - memset(&wclass, 0, sizeof(wclass)); - wclass.lpfnWndProc = apartment_wndproc; - wclass.hInstance = hProxyDll; - wclass.lpszClassName = wszAptWinClass; - RegisterClassW(&wclass); -} - -static void COMPOBJ_UninitProcess( void ) -{ - UnregisterClassW(wszAptWinClass, hProxyDll); -} - -#endif static void COM_TlsDestroy(void) { @@ -1964,7 +1925,7 @@ * SEE ALSO * CoInitializeEx */ -void WINAPI CoUninitialize(void) +void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) { struct oletls * info = COM_CurrentInfo(); LONG lCOMRefCnt; @@ -4443,10 +4404,22 @@ DWORD start_time = GetTickCount(); APARTMENT *apt = COM_CurrentApt(); BOOL message_loop = apt && !apt->multi_threaded; + BOOL check_apc = (dwFlags & COWAIT_ALERTABLE) != 0; TRACE("(0x%08x, 0x%08x, %d, %p, %p)\n", dwFlags, dwTimeout, cHandles, pHandles, lpdwindex); + if (!lpdwindex) + return E_INVALIDARG; + + *lpdwindex = 0; + + if (!pHandles) + return E_INVALIDARG; + + if (!cHandles) + return RPC_E_NO_SYNC; + while (TRUE) { DWORD now = GetTickCount(); @@ -4465,9 +4438,19 @@ TRACE("waiting for rpc completion or window message\n"); - res = MsgWaitForMultipleObjectsEx(cHandles, pHandles, - (dwTimeout == INFINITE) ? INFINITE : start_time + dwTimeout - now, - QS_SENDMESSAGE | QS_ALLPOSTMESSAGE | QS_PAINT, wait_flags); + res = WAIT_TIMEOUT; + + if (check_apc) + { + res = WaitForMultipleObjectsEx(cHandles, pHandles, + (dwFlags & COWAIT_WAITALL) != 0, 0, TRUE); + check_apc = FALSE; + } + + if (res == WAIT_TIMEOUT) + res = MsgWaitForMultipleObjectsEx(cHandles, pHandles, + (dwTimeout == INFINITE) ? INFINITE : start_time + dwTimeout - now, + QS_SENDMESSAGE | QS_ALLPOSTMESSAGE | QS_PAINT, wait_flags); if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { @@ -5047,19 +5030,12 @@ switch(fdwReason) { case DLL_PROCESS_ATTACH: hProxyDll = hinstDLL; -#ifdef __REACTOS__ - COMPOBJ_InitProcess(); -#endif break; case DLL_PROCESS_DETACH: if (reserved) break; release_std_git(); -#ifdef __REACTOS__ - COMPOBJ_UninitProcess(); -#else UnregisterClassW( wszAptWinClass, hProxyDll ); -#endif RPC_UnregisterAllChannelHooks(); COMPOBJ_DllList_Free(); DeleteCriticalSection(&csRegisteredClassList); Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole2.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole2.c [iso-8859-1] Mon Mar 9 19:57:38 2015 @@ -205,7 +205,7 @@ /****************************************************************************** * OleUninitialize [OLE32.@] */ -void WINAPI OleUninitialize(void) +void WINAPI DECLSPEC_HOTPATCH OleUninitialize(void) { TRACE("()\n"); @@ -2381,11 +2381,12 @@ */ case DRAGDROP_S_DROP: if (*trackerInfo->pdwEffect != DROPEFFECT_NONE) - trackerInfo->returnValue = IDropTarget_Drop(trackerInfo->curDragTarget, - trackerInfo->dataObject, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); + { + hr = IDropTarget_Drop(trackerInfo->curDragTarget, trackerInfo->dataObject, + trackerInfo->dwKeyState, trackerInfo->curMousePos, trackerInfo->pdwEffect); + if (FAILED(hr)) + trackerInfo->returnValue = hr; + } else IDropTarget_DragLeave(trackerInfo->curDragTarget); break; Modified: trunk/reactos/dll/win32/ole32/ole32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32_ros.… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32_ros.diff [iso-8859-1] Mon Mar 9 19:57:38 2015 @@ -1,7 +1,7 @@ -diff -prudN e:\Wine\dlls\ole32/compobj.c e:\reactos\dll\win32\ole32/compobj.c ---- e:\Wine\dlls\ole32/compobj.c 2014-04-04 14:12:42.091208400 +0100 -+++ e:\reactos\dll\win32\ole32/compobj.c 2014-04-24 12:30:07.466625200 +0100 -@@ -331,8 +303,12 @@ static NTSTATUS create_key( HKEY *retkey +diff -prudN e:\wine\dlls\ole32/compobj.c dll\win32\ole32/compobj.c +--- e:\wine\dlls\ole32/compobj.c 2015-02-21 17:13:09.561542200 +0100 ++++ dll\win32\ole32/compobj.c 2015-02-28 13:26:29.259662000 +0100 +@@ -331,8 +304,12 @@ static NTSTATUS create_key( HKEY *retkey return status; } @@ -14,135 +14,9 @@ static HKEY classes_root_hkey; -@@ -1635,6 +1611,7 @@ static HRESULT apartment_hostobject_in_h - return hr; - } - -+#ifndef __REACTOS__ - static BOOL WINAPI register_class( INIT_ONCE *once, void *param, void **context ) - { - WNDCLASSW wclass; -@@ -1655,24 +1632,20 @@ static BOOL WINAPI register_class( INIT_ - RegisterClassW(&wclass); - return TRUE; - } -+#endif - - /* create a window for the apartment or return the current one if one has - * already been created */ - HRESULT apartment_createwindowifneeded(struct apartment *apt) - { -- static INIT_ONCE class_init_once = INIT_ONCE_STATIC_INIT; -- - if (apt->multi_threaded) - return S_OK; - - if (!apt->win) - { -- HWND hwnd; -- -- InitOnceExecuteOnce( &class_init_once, register_class, NULL, NULL ); -- -- hwnd = CreateWindowW(wszAptWinClass, NULL, 0, 0, 0, 0, 0, -- HWND_MESSAGE, 0, hProxyDll, NULL); -+ HWND hwnd = CreateWindowW(wszAptWinClass, NULL, 0, -+ 0, 0, 0, 0, -+ HWND_MESSAGE, 0, hProxyDll, NULL); - if (!hwnd) - { - ERR("CreateWindow failed with error %d\n", GetLastError()); -@@ -1699,6 +1672,35 @@ void apartment_joinmta(void) - COM_CurrentInfo()->apt = MTA; - } - -+#ifdef __REACTOS__ -+ -+static void COMPOBJ_InitProcess( void ) -+{ -+ WNDCLASSW wclass; -+ -+ /* Dispatching to the correct thread in an apartment is done through -+ * window messages rather than RPC transports. When an interface is -+ * marshalled into another apartment in the same process, a window of the -+ * following class is created. The *caller* of CoMarshalInterface (i.e., the -+ * application) is responsible for pumping the message loop in that thread. -+ * The WM_USER messages which point to the RPCs are then dispatched to -+ * apartment_wndproc by the user's code from the apartment in which the -+ * interface was unmarshalled. -+ */ -+ memset(&wclass, 0, sizeof(wclass)); -+ wclass.lpfnWndProc = apartment_wndproc; -+ wclass.hInstance = hProxyDll; -+ wclass.lpszClassName = wszAptWinClass; -+ RegisterClassW(&wclass); -+} -+ -+static void COMPOBJ_UninitProcess( void ) -+{ -+ UnregisterClassW(wszAptWinClass, hProxyDll); -+} -+ -+#endif -+ - static void COM_TlsDestroy(void) - { - struct oletls *info = NtCurrentTeb()->ReservedForOle; -@@ -4984,12 +4986,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, - switch(fdwReason) { - case DLL_PROCESS_ATTACH: - hProxyDll = hinstDLL; -+ COMPOBJ_InitProcess(); - break; - - case DLL_PROCESS_DETACH: - if (reserved) break; - release_std_git(); -- UnregisterClassW( wszAptWinClass, hProxyDll ); -+ COMPOBJ_UninitProcess(); - RPC_UnregisterAllChannelHooks(); - COMPOBJ_DllList_Free(); - DeleteCriticalSection(&csRegisteredClassList); -diff -prudN e:\Wine\dlls\ole32/stg_prop.c e:\reactos\dll\win32\ole32/stg_prop.c ---- e:\Wine\dlls\ole32/stg_prop.c 2014-04-04 14:12:42.103216400 +0100 -+++ e:\reactos\dll\win32\ole32/stg_prop.c 2014-04-08 19:21:32.097336500 +0100 -@@ -36,32 +36,15 @@ - * PropertyStorage_ReadFromStream - */ - --#include "config.h" --#include "wine/port.h" -- --#include <assert.h> --#include <stdarg.h> --#include <stdio.h> --#include <stdlib.h> --#include <string.h> -- --#define COBJMACROS --#define NONAMELESSUNION --#define NONAMELESSSTRUCT -- --#include "windef.h" --#include "winbase.h" --#include "winnls.h" --#include "winuser.h" --#include "wine/unicode.h" --#include "wine/debug.h" --#include "dictionary.h" -+#include "precomp.h" - #include "storage32.h" --#include "enumx.h" --#include "oleauto.h" - - WINE_DEFAULT_DEBUG_CHANNEL(storage); - -+#ifdef _MSC_VER -+#define __ASM_STDCALL_FUNC(name,args,code) -+#endif -+ - static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *iface ) - { - return CONTAINING_RECORD(iface, StorageImpl, base.IPropertySetStorage_iface); +diff -prudN e:\wine\dlls\ole32/stg_prop.c dll\win32\ole32/stg_prop.c +--- e:\wine\dlls\ole32/stg_prop.c 2015-02-21 17:13:09.569542200 +0100 ++++ dll\win32\ole32/stg_prop.c 2014-04-08 19:21:32.097336500 +0100 @@ -1035,12 +1018,12 @@ static HRESULT PropertyStorage_ReadDicti } @@ -184,4 +58,3 @@ + void* (__cdecl *fn)(void*,ULONG) = **(void***)this; return fn(this, cbSize); } - Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… ============================================================================== --- trunk/reactos/dll/win32/ole32/storage32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/storage32.c [iso-8859-1] Mon Mar 9 19:57:38 2015 @@ -2950,7 +2950,7 @@ hr = S_OK; /* First check for any conflicting locks. */ - if (SUCCEEDED(hr) && (openFlags & STGM_PRIORITY) == STGM_PRIORITY) + if ((openFlags & STGM_PRIORITY) == STGM_PRIORITY) hr = StorageImpl_CheckLockRange(This, RANGELOCK_COMMIT, RANGELOCK_COMMIT, STG_E_LOCKVIOLATION); if (SUCCEEDED(hr) && (STGM_ACCESS_MODE(openFlags) != STGM_WRITE)) @@ -6976,10 +6976,8 @@ This->ownerDirEntry, &chainEntry); - if (SUCCEEDED(hr)) - { + if (SUCCEEDED(hr) && chainEntry.startingBlock < BLOCK_FIRST_SPECIAL) return chainEntry.startingBlock; - } } return BLOCK_END_OF_CHAIN; @@ -7501,11 +7499,8 @@ This->ownerDirEntry, &chainEntry); - if (SUCCEEDED(hr)) - { + if (SUCCEEDED(hr) && chainEntry.startingBlock < BLOCK_FIRST_SPECIAL) return chainEntry.startingBlock; - } - } return BLOCK_END_OF_CHAIN; Modified: trunk/reactos/dll/win32/ole32/storage32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… ============================================================================== --- trunk/reactos/dll/win32/ole32/storage32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/storage32.h [iso-8859-1] Mon Mar 9 19:57:38 2015 @@ -69,6 +69,7 @@ static const WORD DEF_SMALL_BLOCK_SIZE_BITS = 0x0006; static const WORD DEF_BIG_BLOCK_SIZE = 0x0200; static const WORD DEF_SMALL_BLOCK_SIZE = 0x0040; +static const ULONG BLOCK_FIRST_SPECIAL = 0xFFFFFFFB; static const ULONG BLOCK_EXTBBDEPOT = 0xFFFFFFFC; static const ULONG BLOCK_SPECIAL = 0xFFFFFFFD; static const ULONG BLOCK_END_OF_CHAIN = 0xFFFFFFFE; Modified: trunk/reactos/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/usrmarshal… ============================================================================== --- trunk/reactos/dll/win32/ole32/usrmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/usrmarshal.c [iso-8859-1] Mon Mar 9 19:57:38 2015 @@ -1622,7 +1622,7 @@ if(CoMarshalInterface(stm, riid, punk, LOWORD(RealFlags), NULL, MSHLFLAGS_NORMAL) != S_OK) { IStream_Release(stm); - return NULL; + return pBuffer; } ALIGN_POINTER(pBuffer, 3); 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 Mar 9 19:57:38 2015 @@ -151,7 +151,7 @@ reactos/dll/win32/objsel # Synced to Wine-1.7.27 reactos/dll/win32/odbc32 # Synced to Wine-1.7.27. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to Wine-1.7.27 -reactos/dll/win32/ole32 # Synced to Wine-1.7.27 +reactos/dll/win32/ole32 # Synced to WineStaging-1.7.37 reactos/dll/win32/oleacc # Synced to Wine-1.7.27 reactos/dll/win32/oleaut32 # Synced to Wine-1.7.27 reactos/dll/win32/olecli32 # Synced to Wine-1.7.27

1 0

[akhaldi] 66627: [ADVPACK_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: akhaldi Date: Mon Mar 9 19:20:13 2015 New Revision: 66627 URL: http://svn.reactos.org/svn/reactos?rev=66627&view=rev Log: [ADVPACK_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/advpack/advpack.c Modified: trunk/rostests/winetests/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/advpack… ============================================================================== --- trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] Mon Mar 9 19:20:13 2015 @@ -193,7 +193,6 @@ CloseHandle(hn); hr = pDelNode(lstrcatA(currDir, "\\DelNodeTestDir"), 0); ok (hr == S_OK, "DelNode failed deleting a directory containing multiple files\n"); - currDir[currDirLen] = '\0'; } static void append_str(char **str, const char *data, ...)

1 0

[akhaldi] 66626: [ADVPACK] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: akhaldi Date: Mon Mar 9 19:19:38 2015 New Revision: 66626 URL: http://svn.reactos.org/svn/reactos?rev=66626&view=rev Log: [ADVPACK] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/advpack/advpack.c trunk/reactos/dll/win32/advpack/files.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/advpack.c [iso-8859-1] Mon Mar 9 19:19:38 2015 @@ -665,7 +665,7 @@ dwBufferSize, NULL, NULL); } else - res = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + res = E_NOT_SUFFICIENT_BUFFER; } HeapFree(GetProcessHeap(), 0, bufferW); @@ -725,7 +725,7 @@ pszBuffer, dwBufferSize, pdwRequiredSize)) { if (dwBufferSize < *pdwRequiredSize) - hret = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + hret = E_NOT_SUFFICIENT_BUFFER; else hret = SPAPI_E_LINE_NOT_FOUND; } @@ -782,7 +782,7 @@ dwBufferSize, NULL, NULL); } else - res = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + res = E_NOT_SUFFICIENT_BUFFER; } HeapFree(GetProcessHeap(), 0, bufferW); @@ -840,7 +840,7 @@ pszBuffer, dwBufferSize, pdwRequiredSize)) { if (dwBufferSize < *pdwRequiredSize) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; return SPAPI_E_LINE_NOT_FOUND; } Modified: trunk/reactos/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?… ============================================================================== --- trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] Mon Mar 9 19:19:38 2015 @@ -554,7 +554,7 @@ szConvertedList[dwLen - 1] = '\0'; /* empty list */ - if (!lstrlenA(szConvertedList)) + if (!szConvertedList[0]) { HeapFree(GetProcessHeap(), 0, szConvertedList); return NULL; 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 Mar 9 19:19:38 2015 @@ -51,7 +51,7 @@ reactos/dll/win32/activeds # Synced to Wine-1.7.27 reactos/dll/win32/actxprxy # Synced to Wine-1.7.27 -reactos/dll/win32/advpack # Synced to Wine-1.7.27 +reactos/dll/win32/advpack # Synced to WineStaging-1.7.37 reactos/dll/win32/atl # Synced to Wine-1.7.27 reactos/dll/win32/atl80 # Synced to Wine-1.7.27 reactos/dll/win32/atl100 # Synced to Wine-1.7.27

1 0

[akhaldi] 66625: * Silence a debug print. Spotted by Aleksey.
by akhaldi＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: akhaldi Date: Mon Mar 9 19:08:16 2015 New Revision: 66625 URL: http://svn.reactos.org/svn/reactos?rev=66625&view=rev Log: * Silence a debug print. Spotted by Aleksey. Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=66625… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Mon Mar 9 19:08:16 2015 @@ -2975,8 +2975,8 @@ HANDLE file; DWORD len; - DPRINT1( "looking for name=%S version=%u.%u.%u.%u arch=%S\n", - ai->name, ai->version.major, ai->version.minor, ai->version.build, ai->version.revision, ai->arch ); + DPRINT( "looking for name=%S version=%u.%u.%u.%u arch=%S\n", + ai->name, ai->version.major, ai->version.minor, ai->version.build, ai->version.revision, ai->arch ); if ((status = lookup_winsxs(acl, ai)) != STATUS_NO_SUCH_FILE) return status;

1 0

[cwittich] 66624: [GDI32] fix gdi32 clipping winetest
by cwittich＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: cwittich Date: Mon Mar 9 19:05:58 2015 New Revision: 66624 URL: http://svn.reactos.org/svn/reactos?rev=66624&view=rev Log: [GDI32] fix gdi32 clipping winetest Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] Mon Mar 9 19:05:58 2015 @@ -837,7 +837,7 @@ { /* Last error code differs from what NtGdiGetRandomRgn returns */ SetLastError(ERROR_INVALID_PARAMETER); - return 0; + return -1; } Ret = NtGdiGetRandomRgn(hdc, hrgn, CLIPRGN);

1 0

[akhaldi] 66623: [RTL] Partly sync actctx.c with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: akhaldi Date: Mon Mar 9 18:08:15 2015 New Revision: 66623 URL: http://svn.reactos.org/svn/reactos?rev=66623&view=rev Log: [RTL] Partly sync actctx.c with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/lib/rtl/actctx.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=66623… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Mon Mar 9 18:08:15 2015 @@ -12,7 +12,7 @@ * Samuel Serapión */ -/* Based on Wine 1.7.17 */ +/* Based on Wine Staging 1.7.37 */ #include <rtl.h> @@ -78,6 +78,7 @@ WCHAR *type; struct assembly_version version; BOOL optional; + BOOL delayed; }; struct strsection_header @@ -582,13 +583,13 @@ static const WCHAR dependentAssemblyW[] = {'d','e','p','e','n','d','e','n','t','A','s','s','e','m','b','l','y',0}; static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR fileW[] = {'f','i','l','e',0}; +static const WCHAR hashW[] = {'h','a','s','h',0}; static const WCHAR noInheritW[] = {'n','o','I','n','h','e','r','i','t',0}; static const WCHAR noInheritableW[] = {'n','o','I','n','h','e','r','i','t','a','b','l','e',0}; static const WCHAR typelibW[] = {'t','y','p','e','l','i','b',0}; static const WCHAR windowClassW[] = {'w','i','n','d','o','w','C','l','a','s','s',0}; static const WCHAR clsidW[] = {'c','l','s','i','d',0}; -static const WCHAR hashW[] = {'h','a','s','h',0}; static const WCHAR hashalgW[] = {'h','a','s','h','a','l','g',0}; static const WCHAR helpdirW[] = {'h','e','l','p','d','i','r',0}; static const WCHAR iidW[] = {'i','i','d',0}; @@ -684,6 +685,7 @@ static const WCHAR g_xmlW[] = {'?','x','m','l',0}; static const WCHAR manifestv1W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','1',0}; +static const WCHAR manifestv2W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','2',0}; static const WCHAR manifestv3W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','3',0}; static const WCHAR dotManifestW[] = {'.','m','a','n','i','f','e','s','t',0}; @@ -879,6 +881,7 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, entity->u.ifaceps.base); RtlFreeHeap(RtlGetProcessHeap(), 0, entity->u.ifaceps.ps32); RtlFreeHeap(RtlGetProcessHeap(), 0, entity->u.ifaceps.name); + RtlFreeHeap(RtlGetProcessHeap(), 0, entity->u.ifaceps.tlib); break; case ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION: RtlFreeHeap(RtlGetProcessHeap(), 0, entity->u.typelib.tlbid); @@ -1060,6 +1063,7 @@ append_string( ret, versionW2, version ); return ret; } + static ACTIVATION_CONTEXT *check_actctx( HANDLE h ) { ACTIVATION_CONTEXT *ret = NULL, *actctx = h; @@ -1114,6 +1118,14 @@ RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->config.info ); RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->appdir.info ); RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->assemblies ); + RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->dllredirect_section ); + RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->wndclass_section ); + RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->tlib_section ); + RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->comserver_section ); + RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->ifaceps_section ); + RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->clrsurrogate_section ); + RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->progid_section ); + pActual = CONTAINING_RECORD(actctx, ACTIVATION_CONTEXT_WRAPPED, ActivationContext); pActual->MagicMarker = 0; RtlFreeHeap(RtlGetProcessHeap(), 0, pActual); @@ -1891,16 +1903,26 @@ static BOOL parse_description_elem(xmlbuf_t* xmlbuf) { - xmlstr_t elem, content; - UNICODE_STRING elemU; - BOOL end = FALSE, ret = TRUE; - - if (!parse_expect_no_attr(xmlbuf, &end) || end || - !parse_text_content(xmlbuf, &content)) + xmlstr_t elem, content, attr_name, attr_value; + BOOL end = FALSE, ret = TRUE, error = FALSE; + + UNICODE_STRING elem1U, elem2U; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + elem1U = xmlstr2unicode(&attr_name); + elem2U = xmlstr2unicode(&attr_value); + DPRINT1("unknown attr %s=%s\n", &elem1U, &elem2U); + } + + if (error) return FALSE; + if (end) return TRUE; + + if (!parse_text_content(xmlbuf, &content)) return FALSE; - elemU = xmlstr2unicode(&content); - DPRINT("Got description %wZ\n", &elemU); + elem1U = xmlstr2unicode(&content); + DPRINT("Got description %wZ\n", &elem1U); while (ret && (ret = next_xml_elem(xmlbuf, &elem))) { @@ -1911,8 +1933,8 @@ } else { - elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); + elem1U = xmlstr2unicode(&elem); + DPRINT1("unknown elem %wZ\n", &elem1U); ret = parse_unknown_elem(xmlbuf, &elem); } } @@ -2092,13 +2114,31 @@ static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, BOOL optional) { struct assembly_identity ai; - xmlstr_t elem; - BOOL end = FALSE, ret = TRUE; - - if (!parse_expect_no_attr(xmlbuf, &end) || end) return end; + xmlstr_t elem, attr_name, attr_value; + BOOL end = FALSE, error = FALSE, ret = TRUE, delayed = FALSE; + + UNICODE_STRING elem1U, elem2U; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + static const WCHAR allowDelayedBindingW[] = {'a','l','l','o','w','D','e','l','a','y','e','d','B','i','n','d','i','n','g',0}; + static const WCHAR trueW[] = {'t','r','u','e',0}; + + if (xmlstr_cmp(&attr_name, allowDelayedBindingW)) + delayed = xmlstr_cmp(&attr_value, trueW); + else + { + elem1U = xmlstr2unicode(&attr_name); + elem2U = xmlstr2unicode(&attr_value); + DPRINT1("unknown attr %s=%s\n", &elem1U, &elem2U); + } + } + + if (error || end) return end; memset(&ai, 0, sizeof(ai)); ai.optional = optional; + ai.delayed = delayed; if (!parse_expect_elem(xmlbuf, assemblyIdentityW, asmv1W) || !parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai)) @@ -2297,7 +2337,9 @@ } else if (xmlstr_cmp(&attr_name, xmlnsW)) { - if (!xmlstr_cmp(&attr_value, manifestv1W) && !xmlstr_cmp(&attr_value, manifestv3W)) + if (!xmlstr_cmp(&attr_value, manifestv1W) && + !xmlstr_cmp(&attr_value, manifestv2W) && + !xmlstr_cmp(&attr_value, manifestv3W)) { DPRINT1("wrong namespace %wZ\n", &attr_valueU); return FALSE; @@ -2537,7 +2579,7 @@ static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, USHORT extra_len ) { NTSTATUS status; - ULONG magic; + ULONG_PTR magic; LDR_DATA_TABLE_ENTRY *pldr; LdrLockLoaderLock(0, NULL, &magic); @@ -2763,8 +2805,8 @@ { static const WCHAR lookup_fmtW[] = {'%','s','_','%','s','_','%','s','_','%','u','.','%','u','.','*','.','*','_', - '*', /* FIXME */ - '.','m','a','n','i','f','e','s','t',0}; + '%','s','_','*','.','m','a','n','i','f','e','s','t',0}; + static const WCHAR wine_trailerW[] = {'d','e','a','d','b','e','e','f','.','m','a','n','i','f','e','s','t'}; WCHAR *lookup, *ret = NULL; UNICODE_STRING lookup_us; @@ -2788,6 +2830,7 @@ FileBothDirectoryInformation, FALSE, &lookup_us, TRUE ); if (io.Status == STATUS_SUCCESS) { + ULONG min_build = ai->version.build, min_revision = ai->version.revision; FILE_BOTH_DIR_INFORMATION *dir_info; WCHAR *tmp; ULONG build, revision; @@ -2811,20 +2854,32 @@ tmp = (WCHAR *)dir_info->FileName + (strchrW(lookup, '*') - lookup); build = atoiW(tmp); - if (build < ai->version.build) continue; + if (build < min_build) continue; tmp = strchrW(tmp, '.') + 1; revision = atoiW(tmp); - if (build == ai->version.build && revision < ai->version.revision) - continue; - ai->version.build = (USHORT)build; - ai->version.revision = (USHORT)revision; - - if ((ret = RtlAllocateHeap( RtlGetProcessHeap(), 0, dir_info->FileNameLength * sizeof(WCHAR) ))) + if (build == min_build && revision < min_revision) continue; + tmp = strchrW(tmp, '_') + 1; + tmp = strchrW(tmp, '_') + 1; + if (dir_info->FileNameLength - (tmp - dir_info->FileName) * sizeof(WCHAR) == sizeof(wine_trailerW) && + !memicmpW( tmp, wine_trailerW, sizeof(wine_trailerW) / sizeof(WCHAR) )) + { + /* prefer a non-Wine manifest if we already have one */ + /* we'll still load the builtin dll if specified through DllOverrides */ + if (ret) continue; + } + else + { + min_build = build; + min_revision = revision; + } + ai->version.build = build; + ai->version.revision = revision; + RtlFreeHeap( RtlGetProcessHeap(), 0, ret ); + if ((ret = RtlAllocateHeap( RtlGetProcessHeap(), 0, dir_info->FileNameLength + sizeof(WCHAR) ))) { memcpy( ret, dir_info->FileName, dir_info->FileNameLength ); ret[dir_info->FileNameLength/sizeof(WCHAR)] = 0; } - break; } } else DPRINT1("no matching file for %S\n", lookup); @@ -2920,7 +2975,7 @@ HANDLE file; DWORD len; - DPRINT( "looking for name=%S version=%u.%u.%u.%u arch=%S\n", + DPRINT1( "looking for name=%S version=%u.%u.%u.%u arch=%S\n", ai->name, ai->version.major, ai->version.minor, ai->version.build, ai->version.revision, ai->arch ); if ((status = lookup_winsxs(acl, ai)) != STATUS_NO_SUCH_FILE) return status; @@ -3006,7 +3061,7 @@ { if (lookup_assembly(acl, &acl->dependencies[i]) != STATUS_SUCCESS) { - if (!acl->dependencies[i].optional) + if (!acl->dependencies[i].optional && !acl->dependencies[i].delayed) { const struct assembly_version *ver = &acl->dependencies[i].version; DPRINT1( "Could not find dependent assembly %S (%u.%u.%u.%u)\n", @@ -3035,7 +3090,7 @@ } else if (flags & (RTL_QUERY_ACTIVATION_CONTEXT_FLAG_IS_ADDRESS | RTL_QUERY_ACTIVATION_CONTEXT_FLAG_IS_HMODULE)) { - ULONG magic; + ULONG_PTR magic; LDR_DATA_TABLE_ENTRY *pldr; if (!*handle) return STATUS_INVALID_PARAMETER; @@ -4584,6 +4639,11 @@ /* FUNCTIONS ***************************************************************/ +/*********************************************************************** + * RtlCreateActivationContext (NTDLL.@) + * + * Create an activation context. + */ NTSTATUS NTAPI RtlCreateActivationContext(IN ULONG Flags, @@ -4633,7 +4693,7 @@ if (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID) module = pActCtx->hModule; else module = NtCurrentTeb()->ProcessEnvironmentBlock->ImageBaseAddress; - status = get_module_filename(module, &dir, 0); + status = get_module_filename( module, &dir, 0 ); if (!NT_SUCCESS(status)) goto error; if ((p = strrchrW( dir.Buffer, '\\' ))) p[1] = 0; actctx->appdir.info = dir.Buffer; @@ -4782,24 +4842,43 @@ } } #else -VOID -NTAPI -RtlAddRefActivationContext( HANDLE handle ) + +/*********************************************************************** + * RtlAddRefActivationContext (NTDLL.@) + */ +VOID NTAPI RtlAddRefActivationContext( HANDLE handle ) { ACTIVATION_CONTEXT *actctx; - if ((actctx = check_actctx(handle))) actctx_addref(actctx); -} - -VOID -NTAPI -RtlReleaseActivationContext( HANDLE handle ) + if ((actctx = check_actctx( handle ))) actctx_addref( actctx ); +} + + +/****************************************************************** + * RtlReleaseActivationContext (NTDLL.@) + */ +VOID NTAPI RtlReleaseActivationContext( HANDLE handle ) { ACTIVATION_CONTEXT *actctx; - if ((actctx = check_actctx(handle))) actctx_release(actctx); -} + if ((actctx = check_actctx( handle ))) actctx_release( actctx ); +} + #endif + +/****************************************************************** + * RtlZombifyActivationContext (NTDLL.@) + * + */ +NTSTATUS NTAPI RtlZombifyActivationContext(PVOID Context) +{ + UNIMPLEMENTED; + + if (Context == ACTCTX_FAKE_HANDLE) + return STATUS_SUCCESS; + + return STATUS_NOT_IMPLEMENTED; +} NTSTATUS NTAPI RtlActivateActivationContextEx( ULONG flags, PTEB tebAddress, HANDLE handle, PULONG_PTR cookie ) @@ -4821,16 +4900,18 @@ return STATUS_SUCCESS; } - -NTSTATUS -NTAPI RtlActivateActivationContext( ULONG flags, HANDLE handle, PULONG_PTR cookie ) +/****************************************************************** + * RtlActivateActivationContext (NTDLL.@) + */ +NTSTATUS NTAPI RtlActivateActivationContext( ULONG flags, HANDLE handle, PULONG_PTR cookie ) { return RtlActivateActivationContextEx(flags, NtCurrentTeb(), handle, cookie); } -NTSTATUS -NTAPI -RtlDeactivateActivationContext( ULONG flags, ULONG_PTR cookie ) +/*********************************************************************** + * RtlDeactivateActivationContext (NTDLL.@) + */ +NTSTATUS NTAPI RtlDeactivateActivationContext( ULONG flags, ULONG_PTR cookie ) { RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame, *top; @@ -4892,16 +4973,20 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, Stack); } -VOID -NTAPI RtlFreeThreadActivationContextStack(VOID) +/****************************************************************** + * RtlFreeThreadActivationContextStack (NTDLL.@) + */ +VOID NTAPI RtlFreeThreadActivationContextStack(VOID) { RtlFreeActivationContextStack(NtCurrentTeb()->ActivationContextStackPointer); NtCurrentTeb()->ActivationContextStackPointer = NULL; } -NTSTATUS -NTAPI RtlGetActiveActivationContext( HANDLE *handle ) +/****************************************************************** + * RtlGetActiveActivationContext (NTDLL.@) + */ +NTSTATUS NTAPI RtlGetActiveActivationContext( HANDLE *handle ) { if (NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame) { @@ -4915,8 +5000,10 @@ } -BOOLEAN -NTAPI RtlIsActivationContextActive( HANDLE handle ) +/****************************************************************** + * RtlIsActivationContextActive (NTDLL.@) + */ +BOOLEAN NTAPI RtlIsActivationContextActive( HANDLE handle ) { RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame; @@ -4925,11 +5012,16 @@ return FALSE; } -NTSTATUS -NTAPI -RtlQueryInformationActivationContext( ULONG flags, HANDLE handle, PVOID subinst, - ULONG class, PVOID buffer, - SIZE_T bufsize, SIZE_T *retlen ) + +/*********************************************************************** + * RtlQueryInformationActivationContext (NTDLL.@) + * + * Get information about an activation context. + * FIXME: function signature/prototype may be wrong + */ +NTSTATUS NTAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle, PVOID subinst, + ULONG class, PVOID buffer, + SIZE_T bufsize, SIZE_T *retlen ) { ACTIVATION_CONTEXT *actctx; NTSTATUS status; @@ -5172,10 +5264,14 @@ return STATUS_SUCCESS; } -NTSTATUS -NTAPI -RtlFindActivationContextSectionString( ULONG flags, const GUID *guid, ULONG section_kind, - const UNICODE_STRING *section_name, PVOID ptr ) +/*********************************************************************** + * RtlFindActivationContextSectionString (NTDLL.@) + * + * Find information about a string in an activation context. + * FIXME: function signature/prototype may be wrong + */ +NTSTATUS NTAPI RtlFindActivationContextSectionString( ULONG flags, const GUID *guid, ULONG section_kind, + const UNICODE_STRING *section_name, PVOID ptr ) { PACTCTX_SECTION_KEYED_DATA data = ptr; NTSTATUS status; @@ -5204,13 +5300,19 @@ return status; } +/*********************************************************************** + * RtlFindActivationContextSectionGuid (NTDLL.@) + * + * Find information about a GUID in an activation context. + * FIXME: function signature/prototype may be wrong + */ NTSTATUS WINAPI RtlFindActivationContextSectionGuid( ULONG flags, const GUID *extguid, ULONG section_kind, const GUID *guid, void *ptr ) { - ACTCTX_SECTION_KEYED_DATA *data = ptr; - NTSTATUS status = STATUS_SXS_KEY_NOT_FOUND; - - if (extguid) + ACTCTX_SECTION_KEYED_DATA *data = ptr; + NTSTATUS status = STATUS_SXS_KEY_NOT_FOUND; + + if (extguid) { DPRINT1("expected extguid == NULL\n"); return STATUS_INVALID_PARAMETER; @@ -5224,7 +5326,7 @@ if (!data || data->cbSize < FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) || !guid) return STATUS_INVALID_PARAMETER; - + if (NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame) { ACTIVATION_CONTEXT *actctx = check_actctx(NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame->ActivationContext); @@ -5346,17 +5448,3 @@ return frame; } - - -NTSTATUS -NTAPI -RtlZombifyActivationContext(PVOID Context) -{ - UNIMPLEMENTED; - - if (Context == ACTCTX_FAKE_HANDLE) - return STATUS_SUCCESS; - - return STATUS_NOT_IMPLEMENTED; -} - 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 Mar 9 18:08:15 2015 @@ -260,6 +260,8 @@ reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.27 +reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.37 + advapi32 - reactos/dll/win32/advapi32/wine/cred.c # Synced to Wine-1.7.27 reactos/dll/win32/advapi32/wine/crypt.c # Synced to Wine-1.7.27

1 0

[akhaldi] 66622: [KERNEL32] Sync GetStringTypeW() with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: akhaldi Date: Mon Mar 9 17:53:20 2015 New Revision: 66622 URL: http://svn.reactos.org/svn/reactos?rev=66622&view=rev Log: [KERNEL32] Sync GetStringTypeW() with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Mon Mar 9 17:53:20 2015 @@ -1255,6 +1255,11 @@ C2_OTHERNEUTRAL /* LRE, LRO, RLE, RLO, PDF */ }; + if (!src) /* Abort and return FALSE when src is null */ + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } if (count == -1) count = strlenW(src) + 1; switch(type) {

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