Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[akhaldi] 68464: [MSTASK_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 23:06:14 2015 New Revision: 68464 URL: http://svn.reactos.org/svn/reactos?rev=68464&view=rev Log: [MSTASK_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/mstask/task_scheduler.c Modified: trunk/rostests/winetests/mstask/task_scheduler.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mstask/task_sch… ============================================================================== --- trunk/rostests/winetests/mstask/task_scheduler.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mstask/task_scheduler.c [iso-8859-1] Sun Jul 19 23:06:14 2015 @@ -203,6 +203,27 @@ return; } +static void test_Enum(void) +{ + ITaskScheduler *scheduler; + IEnumWorkItems *tasks; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **)&scheduler); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) { /* crashes on win2k */ + hr = ITaskScheduler_Enum(scheduler, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} + + hr = ITaskScheduler_Enum(scheduler, &tasks); + ok(hr == S_OK, "got 0x%08x\n", hr); + IEnumWorkItems_Release(tasks); + + ITaskScheduler_Release(scheduler); +} START_TEST(task_scheduler) { @@ -211,5 +232,6 @@ test_Activate(); test_GetTargetComputer(); test_SetTargetComputer(); + test_Enum(); CoUninitialize(); }

9 years, 5 months

[akhaldi] 68463: [MSTASK] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 23:05:56 2015 New Revision: 68463 URL: http://svn.reactos.org/svn/reactos?rev=68463&view=rev Log: [MSTASK] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/mstask/task_scheduler.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mstask/task_scheduler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/task_sche… ============================================================================== --- trunk/reactos/dll/win32/mstask/task_scheduler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/task_scheduler.c [iso-8859-1] Sun Jul 19 23:05:56 2015 @@ -26,9 +26,20 @@ LONG ref; } TaskSchedulerImpl; +typedef struct +{ + IEnumWorkItems IEnumWorkItems_iface; + LONG ref; +} EnumWorkItemsImpl; + static inline TaskSchedulerImpl *impl_from_ITaskScheduler(ITaskScheduler *iface) { return CONTAINING_RECORD(iface, TaskSchedulerImpl, ITaskScheduler_iface); +} + +static inline EnumWorkItemsImpl *impl_from_IEnumWorkItems(IEnumWorkItems *iface) +{ + return CONTAINING_RECORD(iface, EnumWorkItemsImpl, IEnumWorkItems_iface); } static void TaskSchedulerDestructor(TaskSchedulerImpl *This) @@ -36,6 +47,103 @@ TRACE("%p\n", This); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); +} + +static HRESULT WINAPI EnumWorkItems_QueryInterface(IEnumWorkItems *iface, REFIID riid, void **obj) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IEnumWorkItems) || IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = &This->IEnumWorkItems_iface; + IEnumWorkItems_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI EnumWorkItems_AddRef(IEnumWorkItems *iface) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI EnumWorkItems_Release(IEnumWorkItems *iface) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + InterlockedDecrement(&dll_ref); + } + + return ref; +} + +static HRESULT WINAPI EnumWorkItems_Next(IEnumWorkItems *iface, ULONG count, LPWSTR **names, ULONG *fetched) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + FIXME("(%p)->(%u %p %p): stub\n", This, count, names, fetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumWorkItems_Skip(IEnumWorkItems *iface, ULONG count) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + FIXME("(%p)->(%u): stub\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumWorkItems_Reset(IEnumWorkItems *iface) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumWorkItems_Clone(IEnumWorkItems *iface, IEnumWorkItems **cloned) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + FIXME("(%p)->(%p): stub\n", This, cloned); + return E_NOTIMPL; +} + +static const IEnumWorkItemsVtbl EnumWorkItemsVtbl = { + EnumWorkItems_QueryInterface, + EnumWorkItems_AddRef, + EnumWorkItems_Release, + EnumWorkItems_Next, + EnumWorkItems_Skip, + EnumWorkItems_Reset, + EnumWorkItems_Clone +}; + +static HRESULT create_task_enum(IEnumWorkItems **ret) +{ + EnumWorkItemsImpl *tasks; + + *ret = NULL; + + tasks = HeapAlloc(GetProcessHeap(), 0, sizeof(*tasks)); + if (!tasks) + return E_OUTOFMEMORY; + + tasks->IEnumWorkItems_iface.lpVtbl = &EnumWorkItemsVtbl; + tasks->ref = 1; + + *ret = &tasks->IEnumWorkItems_iface; + InterlockedIncrement(&dll_ref); + return S_OK; } static HRESULT WINAPI MSTASK_ITaskScheduler_QueryInterface( @@ -138,10 +246,16 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Enum( ITaskScheduler* iface, - IEnumWorkItems **ppEnumTasks) -{ - FIXME("%p, %p: stub\n", iface, ppEnumTasks); - return E_NOTIMPL; + IEnumWorkItems **tasks) +{ + TaskSchedulerImpl *This = impl_from_ITaskScheduler(iface); + + TRACE("(%p)->(%p)\n", This, tasks); + + if (!tasks) + return E_INVALIDARG; + + return create_task_enum(tasks); } static HRESULT WINAPI MSTASK_ITaskScheduler_Activate( 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] Sun Jul 19 23:05:56 2015 @@ -127,7 +127,7 @@ reactos/dll/win32/msrle32 # Synced to WineStaging-1.7.37 reactos/dll/win32/mssign32 # Synced to WineStaging-1.7.37 reactos/dll/win32/mssip32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mstask # Synced to WineStaging-1.7.37 +reactos/dll/win32/mstask # Synced to WineStaging-1.7.47 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvfw32 # Synced to WineStaging-1.7.37

9 years, 5 months

[akhaldi] 68462: [MSI_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 23:04:56 2015 New Revision: 68462 URL: http://svn.reactos.org/svn/reactos?rev=68462&view=rev Log: [MSI_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/patch.c trunk/rostests/winetests/msi/source.c Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=68… ============================================================================== --- trunk/rostests/winetests/msi/db.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/db.c [iso-8859-1] Sun Jul 19 23:04:56 2015 @@ -2771,7 +2771,7 @@ DeleteFileA(msifile); } -#define MY_NVIEWS 4000 /* Largest installer I've seen uses < 2k */ +#define MY_NVIEWS 4000 /* Largest installer I've seen uses < 2000 */ static void test_handle_limit(void) { int i; @@ -3190,7 +3190,8 @@ r = MsiDatabaseApplyTransformA( hdb, mstfile, 0 ); ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); - MsiDatabaseCommit( hdb ); + r = MsiDatabaseCommit( hdb ); + ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); /* check new values */ hrec = 0; Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… ============================================================================== --- trunk/rostests/winetests/msi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/install.c [iso-8859-1] Sun Jul 19 23:04:56 2015 @@ -2930,6 +2930,7 @@ if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); + goto error; } else { @@ -3012,6 +3013,7 @@ ok(delete_pf("msitest", FALSE), "Directory not created\n"); } +error: delete_cab_files(); DeleteFileA(msifile); } @@ -3155,7 +3157,7 @@ MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE), "Expected ERROR_SUCCESS, got %u\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); if (r == ERROR_SUCCESS) { ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); @@ -3177,7 +3179,7 @@ MsiSetInternalUI(INSTALLUILEVEL_NONE | INSTALLUILEVEL_SOURCERESONLY, NULL); r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE), "Expected ERROR_SUCCESS, got %u\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); if (r == ERROR_SUCCESS) { ok(!delete_pf("msitest\\maximus", TRUE), "UI install occurred, but execute-only was requested.\n"); @@ -4510,6 +4512,11 @@ skip("Not enough rights to perform tests\n"); goto error; } + else if (r == ERROR_INSTALL_FAILURE) + { + win_skip("broken result\n"); + goto error; + } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(pf_exists("msitest\\hydrogen"), "File not installed\n"); ok(pf_exists("msitest\\helium"), "File not installed\n"); @@ -5078,7 +5085,7 @@ else { fileret = DeleteFileA(src); - ok(fileret, "Failed to delete file %s (%u)\n", src, GetLastError()); + ok(fileret || broken(!fileret) /* win2k3 */, "Failed to delete file %s (%u)\n", src, GetLastError()); } } @@ -5888,7 +5895,8 @@ lstrcatA(log_file, "\\msitest.log"); MsiEnableLogA(INSTALLLOGMODE_FATALEXIT, log_file, 0); - test_MsiInstallProduct(); + if (pSRSetRestorePointA) /* test has side-effects on win2k3 that cause failures in following tests */ + test_MsiInstallProduct(); test_MsiSetComponentState(); test_packagecoltypes(); test_continuouscabs(); Modified: trunk/rostests/winetests/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/patch.c?rev… ============================================================================== --- trunk/rostests/winetests/msi/patch.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/patch.c [iso-8859-1] Sun Jul 19 23:04:56 2015 @@ -968,6 +968,29 @@ return r; } +static UINT find_entryW( MSIHANDLE hdb, const WCHAR *table, const WCHAR *entry ) +{ + static const WCHAR fmt[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','`','%','s','`',' ', + 'W','H','E','R','E',' ','`','N','a','m','e','`',' ','=',' ','\'','%','s','\'',0}; + WCHAR query[0x100]; + MSIHANDLE hview, hrec; + UINT r; + + wsprintfW( query, fmt, table, entry ); + r = MsiDatabaseOpenViewW( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + MsiCloseHandle( hrec ); + return r; +} + static INT get_integer( MSIHANDLE hdb, UINT field, const char *query) { UINT r; @@ -1031,11 +1054,13 @@ static void test_system_tables( void ) { + static const char patchsource[] = "MSPSRC0F96CDC04CDF4304B2837B9264889EF7"; + static const WCHAR streamsW[] = {'_','S','t','r','e','a','m','s',0}; + static const WCHAR CAB_msitest_encodedW[] = {0x3a8c,0x47cb,0x45b0,0x45ec,0x45a8,0x4837,0}; UINT r; char *cr; const char *query; MSIHANDLE hproduct, hdb, hview, hrec; - static const char patchsource[] = "MSPSRC0F96CDC04CDF4304B2837B9264889EF7"; if (!pMsiApplyPatchA) { @@ -1136,6 +1161,9 @@ r = find_entry( hdb, "_Streams", "\5SummaryInformation" ); ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entryW( hdb, streamsW, CAB_msitest_encodedW ); + ok( r == ERROR_NO_MORE_ITEMS, "failed to find entry %u\n", r ); query = "SELECT * FROM `_Storages`"; r = MsiDatabaseOpenViewA( hdb, query, &hview ); Modified: trunk/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/source.c?re… ============================================================================== --- trunk/rostests/winetests/msi/source.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/source.c [iso-8859-1] Sun Jul 19 23:04:56 2015 @@ -2887,6 +2887,24 @@ ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %d\n", labelsz); ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt); + /* pcchVolumeLabel, szDiskPrompt and pcchDiskPrompt are NULL */ + id = 0; + lstrcpyA(label, "aaa"); + r = pMsiSourceListEnumMediaDisksA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, 0, &id, label, NULL, + NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label); + ok(id == 1, "Expected 1, got %d\n", id); + + /* szVolumeLabel, pcchVolumeLabel, szDiskPrompt and pcchDiskPrompt are NULL */ + id = 0; + r = pMsiSourceListEnumMediaDisksA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, 0, &id, NULL, NULL, + NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(id == 1, "Expected 1, got %d\n", id); + /* pcchVolumeLabel is exactly 5 */ lstrcpyA(label, "aaa"); labelsz = 5;

9 years, 5 months

[akhaldi] 68461: [MSI] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 23:04:25 2015 New Revision: 68461 URL: http://svn.reactos.org/svn/reactos?rev=68461&view=rev Log: [MSI] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/assembly.c trunk/reactos/dll/win32/msi/automation.c trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/font.c trunk/reactos/dll/win32/msi/install.c trunk/reactos/dll/win32/msi/media.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/patch.c trunk/reactos/dll/win32/msi/source.c trunk/reactos/dll/win32/msi/streams.c trunk/reactos/dll/win32/msi/suminfo.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… Modified: trunk/reactos/dll/win32/msi/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/assembly.c?r… Modified: trunk/reactos/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c… Modified: trunk/reactos/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev… Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… Modified: trunk/reactos/dll/win32/msi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/font.c?rev=6… Modified: trunk/reactos/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?re… Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=68… Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… Modified: trunk/reactos/dll/win32/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/patch.c?rev=… Modified: trunk/reactos/dll/win32/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/source.c?rev… Modified: trunk/reactos/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re… Modified: trunk/reactos/dll/win32/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/suminfo.c?re… Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

9 years, 5 months

[akhaldi] 68460: [MSPATCHA] Add import lib.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 23:02:13 2015 New Revision: 68460 URL: http://svn.reactos.org/svn/reactos?rev=68460&view=rev Log: [MSPATCHA] Add import lib. Modified: trunk/reactos/dll/win32/mspatcha/CMakeLists.txt Modified: trunk/reactos/dll/win32/mspatcha/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mspatcha/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/mspatcha/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mspatcha/CMakeLists.txt [iso-8859-1] Sun Jul 19 23:02:13 2015 @@ -1,7 +1,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(mspatcha.dll mspatcha.spec) +spec2def(mspatcha.dll mspatcha.spec ADD_IMPORTLIB) list(APPEND SOURCE mspatcha_main.c

9 years, 5 months

[akhaldi] 68459: [MSGSM32.ACM] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 23:01:00 2015 New Revision: 68459 URL: http://svn.reactos.org/svn/reactos?rev=68459&view=rev Log: [MSGSM32.ACM] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgsm32.acm/msgs… ============================================================================== --- trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c [iso-8859-1] Sun Jul 19 23:01:00 2015 @@ -119,14 +119,14 @@ add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED; /* Details found from probing native msgsm32.acm */ add->wMid = MM_MICROSOFT; - add->wPid = 36; + add->wPid = MM_MSFT_ACM_GSM610; add->vdwACM = 0x3320000; add->vdwDriver = 0x4000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; add->cFormatTags = 2; add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "Wine GSM 6.10", -1, + MultiByteToWideChar( CP_ACP, 0, "Microsoft GSM 6.10", -1, add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, "Wine GSM 6.10 libgsm codec", -1, add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); 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] Sun Jul 19 23:01:00 2015 @@ -114,7 +114,7 @@ reactos/dll/win32/msctf # Synced to WineStaging-1.7.47 reactos/dll/win32/msftedit # Synced to WineStaging-1.7.37 reactos/dll/win32/msg711.acm # Synced to WineStaging-1.7.47 -reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.37 +reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.47 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.37 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.37 reactos/dll/win32/msi # Synced to WineStaging-1.7.37

9 years, 5 months

[akhaldi] 68458: [MSG711.ACM] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 22:56:28 2015 New Revision: 68458 URL: http://svn.reactos.org/svn/reactos?rev=68458&view=rev Log: [MSG711.ACM] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/msg711.acm/msg711.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msg711.acm/msg711.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/msg71… ============================================================================== --- trunk/reactos/dll/win32/msg711.acm/msg711.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msg711.acm/msg711.c [iso-8859-1] Sun Jul 19 22:56:28 2015 @@ -655,15 +655,15 @@ { add->fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC; add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED; - add->wMid = 0xFF; - add->wPid = 0x00; + add->wMid = MM_MICROSOFT; + add->wPid = MM_MSFT_ACM_G711; add->vdwACM = 0x01000000; add->vdwDriver = 0x01000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; add->cFormatTags = 3; /* PCM, G711 A-LAW & MU-LAW */ add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "WINE-G711", -1, + MultiByteToWideChar( CP_ACP, 0, "Microsoft CCITT G.711", -1, add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, "Wine G711 converter", -1, add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); 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] Sun Jul 19 22:56:28 2015 @@ -113,7 +113,7 @@ reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-1.7.47 reactos/dll/win32/msftedit # Synced to WineStaging-1.7.37 -reactos/dll/win32/msg711.acm # Synced to WineStaging-1.7.37 +reactos/dll/win32/msg711.acm # Synced to WineStaging-1.7.47 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.37 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.37 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.37

9 years, 5 months

[akhaldi] 68457: [MSCTF_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 22:55:02 2015 New Revision: 68457 URL: http://svn.reactos.org/svn/reactos?rev=68457&view=rev Log: [MSCTF_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/msctf/inputprocessor.c Modified: trunk/rostests/winetests/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/inputproc… ============================================================================== --- trunk/rostests/winetests/msctf/inputprocessor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msctf/inputprocessor.c [iso-8859-1] Sun Jul 19 22:55:02 2015 @@ -2174,7 +2174,6 @@ test_PrevFocus = FOCUS_IGNORE; DestroyWindow(wnd1); DestroyWindow(wnd2); - test_OnSetFocus = SINK_UNEXPECTED; test_OnPopContext = SINK_OPTIONAL; /* Vista and greater */ test_OnSetFocus = SINK_OPTIONAL; /* Vista and greater */ ITfThreadMgr_GetFocus(g_tm, &test_PrevFocus);

9 years, 5 months

[akhaldi] 68456: [MSCTF] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 22:54:48 2015 New Revision: 68456 URL: http://svn.reactos.org/svn/reactos?rev=68456&view=rev Log: [MSCTF] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/msctf/inputprocessor.c trunk/reactos/dll/win32/msctf/msctf.c trunk/reactos/dll/win32/msctf/msctf.spec trunk/reactos/dll/win32/msctf/msctf_internal.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/inputproce… ============================================================================== --- trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] Sun Jul 19 22:54:48 2015 @@ -527,10 +527,9 @@ LanguageProfile.clsid = *rclsid; LanguageProfile.langid = langid; LanguageProfile.guidProfile = *guidProfiles; - - hr = add_active_textservice(&LanguageProfile); - - return hr; + LanguageProfile.fActive = TRUE; + + return add_active_textservice(&LanguageProfile); } static HRESULT WINAPI InputProcessorProfiles_GetActiveLanguageProfile( Modified: trunk/reactos/dll/win32/msctf/msctf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.c?re… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] Sun Jul 19 22:54:48 2015 @@ -23,8 +23,6 @@ #include <rpcproxy.h> #include <inputscope.h> -static LONG MSCTF_refCount; - static HINSTANCE MSCTF_hinstance; typedef struct @@ -92,7 +90,6 @@ { TRACE("Destroying class factory %p\n", This); HeapFree(GetProcessHeap(),0,This); - MSCTF_refCount--; } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) @@ -145,11 +142,6 @@ TRACE("(%p)->(%x)\n", This, fLock); - if(fLock) - InterlockedIncrement(&MSCTF_refCount); - else - InterlockedDecrement(&MSCTF_refCount); - return S_OK; } @@ -172,7 +164,6 @@ This->ctor = ctor; *ppvOut = This; TRACE("Created class factory %p\n", This); - MSCTF_refCount++; return S_OK; } @@ -362,7 +353,6 @@ actsvr->pITfTextInputProcessor = NULL; actsvr->LanguageProfile = *lp; - actsvr->LanguageProfile.fActive = TRUE; actsvr->pITfKeyEventSink = NULL; /* get TIP category */ @@ -521,7 +511,7 @@ */ HRESULT WINAPI DllCanUnloadNow(void) { - return MSCTF_refCount ? S_FALSE : S_OK; + return S_FALSE; } /*********************************************************************** @@ -642,3 +632,12 @@ return E_NOTIMPL; } + +/*********************************************************************** + * TF_InitMlngInfo (MSCTF.@) + */ +HRESULT WINAPI TF_InitMlngInfo(void) +{ + FIXME("stub\n"); + return S_OK; +} Modified: trunk/reactos/dll/win32/msctf/msctf.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.spec… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.spec [iso-8859-1] Sun Jul 19 22:54:48 2015 @@ -24,7 +24,7 @@ @ stub TF_GetThreadFlags @ stdcall TF_GetThreadMgr(ptr) @ stub TF_InatExtractIcon -@ stub TF_InitMlngInfo +@ stdcall TF_InitMlngInfo() @ stub TF_InitSystem @ stub TF_InvalidAssemblyListCache @ stdcall TF_InvalidAssemblyListCacheIfExist() Modified: trunk/reactos/dll/win32/msctf/msctf_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_inte… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] Sun Jul 19 22:54:48 2015 @@ -89,7 +89,7 @@ extern HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown** sink) DECLSPEC_HIDDEN; extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink) DECLSPEC_HIDDEN; -extern const WCHAR szwSystemTIPKey[]; -extern const WCHAR szwSystemCTFKey[]; +extern const WCHAR szwSystemTIPKey[] DECLSPEC_HIDDEN; +extern const WCHAR szwSystemCTFKey[] DECLSPEC_HIDDEN; #endif /* __WINE_MSCTF_I_H */ 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] Sun Jul 19 22:54:48 2015 @@ -111,7 +111,7 @@ reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.37 reactos/dll/win32/mscms # Synced to WineStaging-1.7.37 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to WineStaging-1.7.37 +reactos/dll/win32/msctf # Synced to WineStaging-1.7.47 reactos/dll/win32/msftedit # Synced to WineStaging-1.7.37 reactos/dll/win32/msg711.acm # Synced to WineStaging-1.7.37 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.37

9 years, 5 months

[akhaldi] 68455: [MSADP32.ACM] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 22:49:34 2015 New Revision: 68455 URL: http://svn.reactos.org/svn/reactos?rev=68455&view=rev Log: [MSADP32.ACM] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/msad… ============================================================================== --- trunk/reactos/dll/win32/msadp32.acm/msadp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msadp32.acm/msadp32.c [iso-8859-1] Sun Jul 19 22:49:34 2015 @@ -374,8 +374,8 @@ { add->fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC; add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED; - add->wMid = 0xFF; - add->wPid = 0x00; + add->wMid = MM_MICROSOFT; + add->wPid = MM_MSFT_ACM_MSADPCM; add->vdwACM = 0x01000000; add->vdwDriver = 0x01000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; 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] Sun Jul 19 22:49:34 2015 @@ -107,7 +107,7 @@ reactos/dll/win32/mprapi # Synced to WineStaging-1.7.37 reactos/dll/win32/msacm32 # Synced to WineStaging-1.7.47 reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.37 -reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.37 +reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.47 reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.37 reactos/dll/win32/mscms # Synced to WineStaging-1.7.37 reactos/dll/win32/mscoree # Synced to Wine-1.5.4

9 years, 5 months

← Newer
1
...
10
11
12
13
14
15
16
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2015