Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 68461: [MSI] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

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=…

1 0

[akhaldi] 68460: [MSPATCHA] Add import lib.
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

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

1 0

[akhaldi] 68459: [MSGSM32.ACM] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

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

1 0

[akhaldi] 68458: [MSG711.ACM] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

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

1 0

[akhaldi] 68457: [MSCTF_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

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);

1 0

[akhaldi] 68456: [MSCTF] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

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

1 0

[akhaldi] 68455: [MSADP32.ACM] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

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

1 0

[akhaldi] 68454: [MSACM32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 22:44:00 2015 New Revision: 68454 URL: http://svn.reactos.org/svn/reactos?rev=68454&view=rev Log: [MSACM32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/msacm32/msacm.c Modified: trunk/rostests/winetests/msacm32/msacm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/msacm.c… ============================================================================== --- trunk/rostests/winetests/msacm32/msacm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msacm32/msacm.c [iso-8859-1] Sun Jul 19 22:44:00 2015 @@ -127,8 +127,30 @@ TODO: should it be *exactly* sizeof(dd), as tested here? */ if (rc == MMSYSERR_NOERROR) { + struct { + const char *shortname; + const WORD mid; + const WORD pid; + } *iter, expected_ids[] = { + { "Microsoft IMA ADPCM", MM_MICROSOFT, MM_MSFT_ACM_IMAADPCM }, + { "MS-ADPCM", MM_MICROSOFT, MM_MSFT_ACM_MSADPCM }, + { "Microsoft CCITT G.711", MM_MICROSOFT, MM_MSFT_ACM_G711}, + { "MPEG Layer-3 Codec", MM_FRAUNHOFER_IIS, MM_FHGIIS_MPEGLAYER3_DECODE }, + { "MS-PCM", MM_MICROSOFT, MM_MSFT_ACM_PCM }, + { 0 } + }; + ok(dd.cbStruct == sizeof(dd), "acmDriverDetailsA(): cbStruct = %08x\n", dd.cbStruct); + + for (iter = expected_ids; iter->shortname; ++iter) { + if (dd.szShortName && !strcmp(iter->shortname, dd.szShortName)) { + ok(iter->mid == dd.wMid && iter->pid == dd.wPid, + "Got wrong manufacturer (0x%x vs 0x%x) or product (0x%x vs 0x%x)\n", + dd.wMid, iter->mid, + dd.wPid, iter->pid); + } + } } if (rc == MMSYSERR_NOERROR && winetest_interactive) { @@ -139,6 +161,8 @@ trace(" Features: %s\n", dd.szFeatures); trace(" Supports %u formats\n", dd.cFormatTags); trace(" Supports %u filter formats\n", dd.cFilterTags); + trace(" Mid: 0x%x\n", dd.wMid); + trace(" Pid: 0x%x\n", dd.wPid); } /* try bad pointer */

1 0

[akhaldi] 68453: [MSACM32] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 22:43:17 2015 New Revision: 68453 URL: http://svn.reactos.org/svn/reactos?rev=68453&view=rev Log: [MSACM32] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/msacm32/driver.c trunk/reactos/dll/win32/msacm32/pcmconverter.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msacm32/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/driver.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/driver.c [iso-8859-1] Sun Jul 19 22:43:17 2015 @@ -149,7 +149,7 @@ } break; default: - ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd & ACM_DRIVERADDF_TYPEMASK); + ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd); return MMSYSERR_INVALFLAG; } Modified: trunk/reactos/dll/win32/msacm32/pcmconverter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/pcmconve… ============================================================================== --- trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] Sun Jul 19 22:43:17 2015 @@ -704,15 +704,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_PCM; add->vdwACM = 0x01000000; add->vdwDriver = 0x01000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CONVERTER; add->cFormatTags = 1; add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "WINE-PCM", -1, + MultiByteToWideChar( CP_ACP, 0, "MS-PCM", -1, add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, "Wine PCM 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:43:17 2015 @@ -105,7 +105,7 @@ reactos/dll/win32/mmdevapi # Synced to WineStaging-1.7.47 reactos/dll/win32/mpr # Synced to WineStaging-1.7.47 reactos/dll/win32/mprapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/msacm32 # 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/mscat32 # Synced to WineStaging-1.7.37

1 0

[akhaldi] 68452: [MPR_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 22:42:18 2015 New Revision: 68452 URL: http://svn.reactos.org/svn/reactos?rev=68452&view=rev Log: [MPR_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/mpr/CMakeLists.txt trunk/rostests/winetests/mpr/mpr.c Modified: trunk/rostests/winetests/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mpr/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/mpr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mpr/CMakeLists.txt [iso-8859-1] Sun Jul 19 22:42:18 2015 @@ -1,5 +1,8 @@ -add_definitions(-DUSE_WINE_TODOS) +add_definitions( + -DUSE_WINE_TODOS + -D_WINE) + add_executable(mpr_winetest mpr.c testlist.c) set_module_type(mpr_winetest win32cui) add_importlibs(mpr_winetest mpr msvcrt kernel32) Modified: trunk/rostests/winetests/mpr/mpr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mpr/mpr.c?rev=6… ============================================================================== --- trunk/rostests/winetests/mpr/mpr.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mpr/mpr.c [iso-8859-1] Sun Jul 19 22:42:18 2015 @@ -160,8 +160,106 @@ } } +static DWORD (WINAPI *pWNetCachePassword)( LPSTR, WORD, LPSTR, WORD, BYTE, WORD ); +static DWORD (WINAPI *pWNetGetCachedPassword)( LPSTR, WORD, LPSTR, LPWORD, BYTE ); +static UINT (WINAPI *pWNetEnumCachedPasswords)( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD); +static UINT (WINAPI *pWNetRemoveCachedPassword)( LPSTR, WORD, BYTE ); + +#define MPR_GET_PROC(func) \ + p ## func = (void*)GetProcAddress(hmpr, #func) + +static void InitFunctionPtrs(void) +{ + HMODULE hmpr = GetModuleHandleA("mpr.dll"); + + MPR_GET_PROC(WNetCachePassword); + MPR_GET_PROC(WNetGetCachedPassword); + MPR_GET_PROC(WNetEnumCachedPasswords); + MPR_GET_PROC(WNetRemoveCachedPassword); +} + +static const char* m_resource = "wine-test-resource"; +static const char* m_password = "wine-test-password"; +static const BYTE m_type = 1; +static const DWORD m_param = 8; +static BOOL m_callback_reached; + +static BOOL CALLBACK enum_password_proc(PASSWORD_CACHE_ENTRY* pce, DWORD param) +{ + WORD size = 0; + char* buf; + + ok(param == m_param, "param, got %d, got %d\n", param, m_param); + + size = offsetof( PASSWORD_CACHE_ENTRY, abResource[pce->cbResource + pce->cbPassword] ); + ok(pce->cbEntry == size, "cbEntry, got %d, expected %d\n", pce->cbEntry, size); + ok(pce->cbResource == strlen(m_resource), "cbResource, got %d\n", pce->cbResource); + ok(pce->cbPassword == strlen(m_password), "cbPassword, got %d\n", pce->cbPassword); + ok(pce->iEntry == 0, "iEntry, got %d, got %d\n", pce->iEntry, 0); + ok(pce->nType == m_type, "nType, got %d, got %d\n", pce->nType, m_type); + + buf = (char*)pce->abResource; + ok(strncmp(buf, m_resource, pce->cbResource)==0, "enumerated ressource differs, got %.*s, expected %s\n", pce->cbResource, buf, m_resource); + + buf += pce->cbResource; + ok(strncmp(buf, m_password, pce->cbPassword)==0, "enumerated ressource differs, got %.*s, expected %s\n", pce->cbPassword, buf, m_password); + + m_callback_reached = 1; + return TRUE; +} + +static void test_WNetCachePassword(void) +{ + char resource_buf[32]; + char password_buf[32]; + char prefix_buf[32]; + WORD resource_len; + WORD password_len; + WORD prefix_len; + DWORD ret; + + InitFunctionPtrs(); + + if (pWNetCachePassword && + pWNetGetCachedPassword && + pWNetEnumCachedPasswords && + pWNetRemoveCachedPassword) + { + strcpy(resource_buf, m_resource); + resource_len = strlen(m_resource); + strcpy(password_buf, m_password); + password_len = strlen(m_password); + ret = pWNetCachePassword(resource_buf, resource_len, password_buf, password_len, m_type, 0); + ok(ret == WN_SUCCESS, "WNetCachePassword failed: got %d, expected %d\n", ret, WN_SUCCESS); + + strcpy(resource_buf, m_resource); + resource_len = strlen(m_resource); + strcpy(password_buf, "------"); + password_len = sizeof(password_buf); + ret = pWNetGetCachedPassword(resource_buf, resource_len, password_buf, &password_len, m_type); + ok(ret == WN_SUCCESS, "WNetGetCachedPassword failed: got %d, expected %d\n", ret, WN_SUCCESS); + ok(password_len == strlen(m_password), "password length different, got %d\n", password_len); + ok(strncmp(password_buf, m_password, password_len)==0, "passwords different, got %.*s, expected %s\n", password_len, password_buf, m_password); + + prefix_len = 9; + strcpy(prefix_buf, m_resource); + prefix_buf[prefix_len] = '0'; + ret = pWNetEnumCachedPasswords(prefix_buf, prefix_len, m_type, enum_password_proc, m_param); + ok(ret == WN_SUCCESS, "WNetEnumCachedPasswords failed: got %d, expected %d\n", ret, WN_SUCCESS); + ok(m_callback_reached == 1, "callback was not reached\n"); + + strcpy(resource_buf, m_resource); + resource_len = strlen(m_resource); + ret = pWNetRemoveCachedPassword(resource_buf, resource_len, m_type); + ok(ret == WN_SUCCESS, "WNetRemoveCachedPassword failed: got %d, expected %d\n", ret, WN_SUCCESS); + } else { + win_skip("WNetCachePassword() is not supported.\n"); + } +} + START_TEST(mpr) { test_WNetGetUniversalName(); test_WNetGetRemoteName(); -} + test_WNetCachePassword(); +}

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