Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 71742: [SETUPAPI] Properly stub SetupAddSectionToDiskSpaceListA, SetupAddToDiskSpaceListA and SetupQueryDrivesInDiskSpaceListA.
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 13:17:44 2016 New Revision: 71742 URL: http://svn.reactos.org/svn/reactos?rev=71742&view=rev Log: [SETUPAPI] Properly stub SetupAddSectionToDiskSpaceListA, SetupAddToDiskSpaceListA and SetupQueryDrivesInDiskSpaceListA. Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sat Jul 2 13:17:44 2016 @@ -219,9 +219,9 @@ @ stdcall MyRealloc(ptr long) @ stdcall SetupAddInstallSectionToDiskSpaceListA(long long long str ptr long) @ stub SetupAddInstallSectionToDiskSpaceListW -@ stub SetupAddSectionToDiskSpaceListA +@ stdcall -stub SetupAddSectionToDiskSpaceListA(long long long str long ptr long) @ stub SetupAddSectionToDiskSpaceListW -@ stub SetupAddToDiskSpaceListA +@ stdcall -stub SetupAddToDiskSpaceListA(long str double long ptr long) @ stub SetupAddToDiskSpaceListW @ stub SetupAddToSourceListA @ stub SetupAddToSourceListW @@ -468,7 +468,7 @@ @ stdcall SetupPromptForDiskA(ptr str str str str str long ptr long ptr) @ stdcall SetupPromptForDiskW(ptr wstr wstr wstr wstr wstr long ptr long ptr) @ stdcall SetupPromptReboot(ptr ptr long) -@ stub SetupQueryDrivesInDiskSpaceListA +@ stdcall -stub SetupQueryDrivesInDiskSpaceListA(ptr ptr long ptr) @ stub SetupQueryDrivesInDiskSpaceListW @ stub SetupQueryFileLogA @ stub SetupQueryFileLogW

1 0

[akhaldi] 71741: [SHLWAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 13:17:08 2016 New Revision: 71741 URL: http://svn.reactos.org/svn/reactos?rev=71741&view=rev Log: [SHLWAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/shlwapi/assoc.c trunk/rostests/winetests/shlwapi/istream.c trunk/rostests/winetests/shlwapi/path.c trunk/rostests/winetests/shlwapi/url.c Modified: trunk/rostests/winetests/shlwapi/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/assoc.c… ============================================================================== --- trunk/rostests/winetests/shlwapi/assoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/assoc.c [iso-8859-1] Sat Jul 2 13:17:08 2016 @@ -108,9 +108,11 @@ hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || - hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */ - "Unexpected result : %08x\n", hr); - ok(len == 0xdeadbeef, "got %u\n", len); + hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND) /* Win8 */ || + hr == S_FALSE, /* Win10 */ + "Unexpected result : %08x\n", hr); + ok((hr == S_FALSE && len < sizeof(buf)/sizeof(buf[0])) || len == 0xdeadbeef, + "got hr=%08x and len=%u\n", hr, len); len = 0xdeadbeef; hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len); Modified: trunk/rostests/winetests/shlwapi/istream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/istream… ============================================================================== --- trunk/rostests/winetests/shlwapi/istream.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/istream.c [iso-8859-1] Sat Jul 2 13:17:08 2016 @@ -253,11 +253,24 @@ } else { -todo_wine ok(ret == S_FALSE, "expected S_FALSE, got %#x (access %#x, written %u)\n", ret, mode, written); ok(count == 0, "expected 0, got %u\n", count); } + ret = stream->lpVtbl->Seek(stream, start, STREAM_SEEK_SET, NULL); + ok(ret == S_OK, "Seek error %#x\n", ret); + + count = 0xdeadbeaf; + ret = stream->lpVtbl->Read(stream, buf, 0, &count); + ok(ret == S_OK, "IStream_Read error %#x (access %#x, written %u)\n", ret, mode, written); + ok(count == 0, "expected 0, got %u\n", count); + + count = 0xdeadbeaf; + ret = stream->lpVtbl->Read(stream, buf, sizeof(buf), &count); + ok(ret == S_FALSE, "expected S_FALSE, got %#x (access %#x, written %u)\n", ret, mode, written); + ok(count == written, "expected %u, got %u\n", written, count); + if (count) + ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]); } static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) Modified: trunk/rostests/winetests/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/path.c?… ============================================================================== --- trunk/rostests/winetests/shlwapi/path.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/path.c [iso-8859-1] Sat Jul 2 13:17:08 2016 @@ -291,9 +291,7 @@ for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) { len = INTERNET_MAX_URL_LENGTH; ret = pPathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0); - if (!(TEST_PATHFROMURL[i].todo & 0x1)) - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); - else todo_wine + todo_wine_if (TEST_PATHFROMURL[i].todo & 0x1) ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) { if(!(TEST_PATHFROMURL[i].todo & 0x2)) { @@ -310,9 +308,7 @@ urlW = GetWideString(TEST_PATHFROMURL[i].url); ret = pPathCreateFromUrlW(urlW, ret_pathW, &len, 0); WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),NULL,NULL); - if (!(TEST_PATHFROMURL[i].todo & 0x1)) - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); - else todo_wine + todo_wine_if (TEST_PATHFROMURL[i].todo & 0x1) ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) { if(!(TEST_PATHFROMURL[i].todo & 0x2)) { @@ -331,9 +327,7 @@ len2 = 2; ret = pPathCreateFromUrlW(urlW, ret_pathW, &len2, 0); ok(ret == E_POINTER, "ret %08x, expected E_POINTER from url %s\n", ret, TEST_PATHFROMURL[i].url); - if(!(TEST_PATHFROMURL[i].todo & 0x4)) - ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); - else todo_wine + todo_wine_if (TEST_PATHFROMURL[i].todo & 0x4) ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); } Modified: trunk/rostests/winetests/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/url.c?r… ============================================================================== --- trunk/rostests/winetests/shlwapi/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/url.c [iso-8859-1] Sat Jul 2 13:17:08 2016 @@ -861,10 +861,7 @@ ok(ret == dwExpectReturn || ret == dwExpectReturnAlt, "UrlCanonicalizeA failed: expected=0x%08x or 0x%08x, got=0x%08x, index %d\n", dwExpectReturn, dwExpectReturnAlt, ret, index); - if (todo) - todo_wine - ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url '%s' Expected \"%s\", but got \"%s\", index %d\n", dwFlags, szUrl, szExpectUrl, szReturnUrl, index); - else + todo_wine_if (todo) ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url '%s' Expected \"%s\", but got \"%s\", index %d\n", dwFlags, szUrl, szExpectUrl, szReturnUrl, index); if (pUrlCanonicalizeW) {

1 0

[akhaldi] 71740: [SHLWAPI] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 13:15:50 2016 New Revision: 71740 URL: http://svn.reactos.org/svn/reactos?rev=71740&view=rev Log: [SHLWAPI] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/shlwapi/istream.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/shlwapi/istream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/istream.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/istream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/istream.c [iso-8859-1] Sat Jul 2 13:15:50 2016 @@ -116,7 +116,7 @@ } if (pcbRead) *pcbRead = dwRead; - return S_OK; + return dwRead == cb ? S_OK : S_FALSE; } /************************************************************************** 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] Sat Jul 2 13:15:50 2016 @@ -177,7 +177,7 @@ reactos/dll/win32/shdocvw # Synced to WineStaging-1.9.4 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-1.9.4 -reactos/dll/win32/shlwapi # Synced to WineStaging-1.9.4 +reactos/dll/win32/shlwapi # Synced to WineStaging-1.9.11 reactos/dll/win32/slbcsp # Synced to WineStaging-1.9.4 reactos/dll/win32/snmpapi # Synced to WineStaging-1.9.4 reactos/dll/win32/softpub # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71739: [T2EMBED] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 13:14:52 2016 New Revision: 71739 URL: http://svn.reactos.org/svn/reactos?rev=71739&view=rev Log: [T2EMBED] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/t2embed/main.c trunk/reactos/dll/win32/t2embed/stubs.c trunk/reactos/dll/win32/t2embed/t2embed.spec trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/include/psdk/t2embapi.h Modified: trunk/reactos/dll/win32/t2embed/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/t2embed/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/t2embed/main.c [iso-8859-1] Sat Jul 2 13:14:52 2016 @@ -19,9 +19,13 @@ #define WIN32_NO_STATUS #include <stdarg.h> + #include <windef.h> #include <winbase.h> +#include <wingdi.h> +#include <winreg.h> #include <t2embapi.h> + #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(t2embed); @@ -70,16 +74,100 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) { - FIXME("(%p %p) stub\n", hDC, status); - if (status) *status = EMBED_NOEMBEDDING; - return E_API_NOTIMPL; + OUTLINETEXTMETRICW otm; + + TRACE("(%p %p)\n", hDC, status); + + if (!hDC) + return E_HDCINVALID; + + otm.otmSize = sizeof(otm); + if (!GetOutlineTextMetricsW(hDC, otm.otmSize, &otm)) + return E_NOTATRUETYPEFONT; + + if (!status) + return E_PERMISSIONSINVALID; + + if (otm.otmfsType == LICENSE_INSTALLABLE) + *status = EMBED_INSTALLABLE; + else if (otm.otmfsType & LICENSE_NOEMBEDDING) + *status = EMBED_NOEMBEDDING; + else if (otm.otmfsType & LICENSE_PREVIEWPRINT) + *status = EMBED_PREVIEWPRINT; + else if (otm.otmfsType & LICENSE_EDITABLE) + *status = EMBED_EDITABLE; + + return E_NONE; +} + +LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) +{ + static const WCHAR exclusionlistW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'S','h','a','r','e','d',' ','T','o','o','l','s','\\','t','2','e','m','b','e','d',0}; + DWORD index; + HKEY hkey; + LONG ret; + + TRACE("(%s %p)\n", debugstr_a(facename), enabled); + + if (!facename) + return E_FACENAMEINVALID; + + if (!enabled) + return E_PBENABLEDINVALID; + + *enabled = TRUE; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, exclusionlistW, 0, GENERIC_READ, &hkey)) + return E_NONE; + + *enabled = TRUE; + ret = ERROR_SUCCESS; + index = 0; + while (ret != ERROR_NO_MORE_ITEMS) + { + DWORD name_len, value_len, value, type; + CHAR name[LF_FACESIZE]; + + name_len = sizeof(name)/sizeof(*name); + value_len = sizeof(value); + ret = RegEnumValueA(hkey, index++, name, &name_len, NULL, &type, (BYTE*)&value, &value_len); + if (ret || type != REG_DWORD) + continue; + + if (!lstrcmpiA(name, facename)) + { + *enabled = !!value; + break; + } + } + RegCloseKey(hkey); + + return E_NONE; } LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) { - FIXME("(%p %p) stub\n", hDC, enabled); - if (enabled) *enabled = FALSE; - return E_API_NOTIMPL; + OUTLINETEXTMETRICA *otm; + LONG ret; + UINT len; + + TRACE("(%p %p)\n", hDC, enabled); + + if (!hDC) + return E_HDCINVALID; + + len = GetOutlineTextMetricsA(hDC, 0, NULL); + if (!len) + return E_ERRORACCESSINGFACENAME; + + otm = HeapAlloc(GetProcessHeap(), 0, len); + if (!otm) + return E_NOFREEMEMORY; + + GetOutlineTextMetricsA(hDC, len, otm); + ret = TTIsEmbeddingEnabledForFacename(otm->otmpFaceName, enabled); + HeapFree(GetProcessHeap(), 0, otm); + return ret; } LONG WINAPI TTDeleteEmbeddedFont(HANDLE hFontReference, ULONG flags, ULONG *status) Modified: trunk/reactos/dll/win32/t2embed/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/t2embed/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/t2embed/stubs.c [iso-8859-1] Sat Jul 2 13:14:52 2016 @@ -68,15 +68,6 @@ LONG WINAPI -TTIsEmbeddingEnabledForFacename(LPSTR lpszFacename, - BOOL* pbEnabled) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI TTRunValidationTests(HDC hDC, TTVALIDATIONTESTPARAMS* pTestParam) { Modified: trunk/reactos/dll/win32/t2embed/t2embed.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.… ============================================================================== --- trunk/reactos/dll/win32/t2embed/t2embed.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/t2embed/t2embed.spec [iso-8859-1] Sat Jul 2 13:14:52 2016 @@ -1,11 +1,11 @@ @ stdcall TTCharToUnicode(ptr ptr long ptr long long) -@ stdcall TTDeleteEmbeddedFont(ptr long ptr) -@ stdcall TTEmbedFont(ptr long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall TTDeleteEmbeddedFont(long long ptr) +@ stdcall TTEmbedFont(long long long ptr ptr ptr ptr ptr long long ptr) @ stdcall TTEmbedFontFromFileA(ptr str long long long ptr ptr ptr ptr ptr long long ptr) @ stdcall TTEnableEmbeddingForFacename(str long) @ stdcall TTGetEmbeddedFontInfo(long ptr long ptr ptr ptr ptr) -@ stdcall TTGetEmbeddingType(ptr ptr) -@ stdcall TTIsEmbeddingEnabled(ptr ptr) +@ stdcall TTGetEmbeddingType(long ptr) +@ stdcall TTIsEmbeddingEnabled(long ptr) @ stdcall TTIsEmbeddingEnabledForFacename(str ptr) @ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) @ stdcall TTRunValidationTests(ptr ptr) @@ -17,7 +17,7 @@ @ stub _TTGetEmbeddedFontInfo@28 @ stdcall _TTGetEmbeddingType@8(long ptr) TTGetEmbeddingType @ stdcall _TTIsEmbeddingEnabled@8(long ptr) TTIsEmbeddingEnabled -@ stub _TTIsEmbeddingEnabledForFacename@8 +@ stdcall _TTIsEmbeddingEnabledForFacename@8(str ptr) TTIsEmbeddingEnabledForFacename @ stdcall _TTLoadEmbeddedFont@40(ptr long ptr long ptr ptr ptr wstr str ptr) TTLoadEmbeddedFont @ stub _TTRunValidationTests@8 @ stdcall TTEmbedFontEx(ptr long long ptr ptr ptr ptr ptr long long ptr) 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] Sat Jul 2 13:14:52 2016 @@ -186,7 +186,7 @@ reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.9.4 reactos/dll/win32/sti # Synced to WineStaging-1.9.4 reactos/dll/win32/sxs # Synced to WineStaging-1.9.4 -reactos/dll/win32/t2embed # Synced to WineStaging-1.9.4 +reactos/dll/win32/t2embed # Synced to WineStaging-1.9.11 reactos/dll/win32/tapi32 # Synced to WineStaging-1.9.4 reactos/dll/win32/traffic # Synced to WineStaging-1.9.4 reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.4 Modified: trunk/reactos/sdk/include/psdk/t2embapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/t2embapi.… ============================================================================== --- trunk/reactos/sdk/include/psdk/t2embapi.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/t2embapi.h [iso-8859-1] Sat Jul 2 13:14:52 2016 @@ -233,7 +233,7 @@ LONG WINAPI -TTIsEmbeddingEnabledForFacename(LPSTR lpszFacename, +TTIsEmbeddingEnabledForFacename(LPCSTR lpszFacename, BOOL* pbEnabled); LONG

1 0

[akhaldi] 71738: [URLMON_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 13:12:56 2016 New Revision: 71738 URL: http://svn.reactos.org/svn/reactos?rev=71738&view=rev Log: [URLMON_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/urlmon/misc.c trunk/rostests/winetests/urlmon/sec_mgr.c trunk/rostests/winetests/urlmon/uri.c Modified: trunk/rostests/winetests/urlmon/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/misc.c?r… ============================================================================== --- trunk/rostests/winetests/urlmon/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/misc.c [iso-8859-1] Sat Jul 2 13:12:56 2016 @@ -1730,14 +1730,9 @@ for(i = 0; i < sizeof(default_feature_tests)/sizeof(default_feature_tests[0]); ++i) { hres = pCoInternetIsFeatureEnabled(default_feature_tests[i].feature, default_feature_tests[i].get_flags); - if(default_feature_tests[i].todo) { - todo_wine + todo_wine_if (default_feature_tests[i].todo) ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", hres, default_feature_tests[i].expected, i); - } else { - ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", - hres, default_feature_tests[i].expected, i); - } } } @@ -1883,24 +1878,15 @@ for(i = 0; i < sizeof(internet_feature_tests)/sizeof(internet_feature_tests[0]); ++i) { hres = pCoInternetSetFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags, internet_feature_tests[i].enable); - if(internet_feature_tests[i].set_todo) { - todo_wine + todo_wine_if (internet_feature_tests[i].set_todo) ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n", hres, internet_feature_tests[i].set_expected, i); - } else { - ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n", - hres, internet_feature_tests[i].set_expected, i); - } hres = pCoInternetIsFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags); - if(internet_feature_tests[i].get_todo) { - todo_wine + todo_wine_if (internet_feature_tests[i].get_todo) ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", hres, internet_feature_tests[i].get_expected, i); - } else { - ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", - hres, internet_feature_tests[i].get_expected, i); - } + } } Modified: trunk/rostests/winetests/urlmon/sec_mgr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/sec_mgr.… ============================================================================== --- trunk/rostests/winetests/urlmon/sec_mgr.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/sec_mgr.c [iso-8859-1] Sat Jul 2 13:12:56 2016 @@ -948,11 +948,7 @@ hres = IInternetSecurityManager_MapUrlToZone(secmgr, urlW, &zone, 0); ok(hres == S_OK, "MapUrlToZone failed: %08x\n", hres); - if(test->todo) - todo_wine - ok(zone == test->zone || broken(test->broken_zone == zone), - "Expected %d, but got %d on test %d\n", test->zone, zone, i); - else + todo_wine_if (test->todo) ok(zone == test->zone || broken(test->broken_zone == zone), "Expected %d, but got %d on test %d\n", test->zone, zone, i); @@ -1644,12 +1640,7 @@ result = NULL; hr = pCoInternetGetSecurityUrlEx(uri, &result, PSU_DEFAULT, 0); - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(hr == sec_url_ex_tests[i].default_hres, - "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", - hr, sec_url_ex_tests[i].default_hres, i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(hr == sec_url_ex_tests[i].default_hres, "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", hr, sec_url_ex_tests[i].default_hres, i); @@ -1660,12 +1651,7 @@ hr = IUri_GetDisplayUri(result, &received); ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, wine_dbgstr_w(received), i); @@ -1677,12 +1663,7 @@ result = NULL; hr = pCoInternetGetSecurityUrlEx(uri, &result, PSU_SECURITY_URL_ONLY, 0); - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(hr == sec_url_ex_tests[i].default_hres, - "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", - hr, sec_url_ex_tests[i].default_hres, i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(hr == sec_url_ex_tests[i].default_hres, "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", hr, sec_url_ex_tests[i].default_hres, i); @@ -1693,12 +1674,7 @@ hr = IUri_GetDisplayUri(result, &received); ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, wine_dbgstr_w(received), i); @@ -1866,14 +1842,7 @@ ok(hres == S_OK, "CreateUri returned %08x for '%s'\n", hres, sec_mgr_ex2_tests[i].uri); hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, &zone, 0, NULL, NULL); - if(sec_mgr_ex2_tests[i].map_todo) { - todo_wine - ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlZoneToEx2 returned %08x, expected %08x for '%s'\n", - hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri); - todo_wine - ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone, - zone, sec_mgr_ex2_tests[i].uri); - } else { + todo_wine_if (sec_mgr_ex2_tests[i].map_todo) { ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlToZoneEx2 returned %08x, expected %08x for '%s'\n", hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri); ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone, @@ -1884,19 +1853,7 @@ memset(buf, 0xf0, buf_size); hres = IInternetSecurityManagerEx2_GetSecurityIdEx2(sec_mgr2, uri, buf, &buf_size, 0); - if(sec_mgr_ex2_tests[i].secid_todo) { - todo_wine - ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2 returned %08x, expected %08x on test '%s'\n", - hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri); - if(sec_mgr_ex2_tests[i].secid) { - todo_wine { - ok(buf_size == sec_mgr_ex2_tests[i].secid_size, "Got wrong security id size=%d, expected %d on test '%s'\n", - buf_size, sec_mgr_ex2_tests[i].secid_size, sec_mgr_ex2_tests[i].uri); - ok(!memcmp(buf, sec_mgr_ex2_tests[i].secid, sec_mgr_ex2_tests[i].secid_size), "Got wrong security id on test '%s'\n", - sec_mgr_ex2_tests[i].uri); - } - } - } else { + todo_wine_if (sec_mgr_ex2_tests[i].secid_todo) { ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2 returned %08x, expected %08x on test '%s'\n", hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri); if(sec_mgr_ex2_tests[i].secid) { Modified: trunk/rostests/winetests/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/uri.c?re… ============================================================================== --- trunk/rostests/winetests/urlmon/uri.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/uri.c [iso-8859-1] Sat Jul 2 13:12:56 2016 @@ -5775,7 +5775,7 @@ 0,INET_E_INVALID_URL,FALSE, 0,0,0,INET_E_INVALID_URL,FALSE }, - /* UserName can't contain any character that is a delimeter for another + /* UserName can't contain any character that is a delimiter for another * component that appears after it in a normal URI. */ { "http://google.com/",0,S_OK,FALSE,

1 0

[akhaldi] 71737: [URLMON] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 13:11:50 2016 New Revision: 71737 URL: http://svn.reactos.org/svn/reactos?rev=71737&view=rev Log: [URLMON] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/urlmon/mimefilter.c trunk/reactos/dll/win32/urlmon/mk.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/urlmon/mimefilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mimefilte… ============================================================================== --- trunk/reactos/dll/win32/urlmon/mimefilter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/mimefilter.c [iso-8859-1] Sat Jul 2 13:11:50 2016 @@ -686,7 +686,7 @@ if(dwReserved) WARN("dwReserved=%d\n", dwReserved); - /* pBC seams to not be used */ + /* pBC seems to not be used */ if(!ppwzMimeOut || (!pwzUrl && !pBuffer)) return E_INVALIDARG; Modified: trunk/reactos/dll/win32/urlmon/mk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mk.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/urlmon/mk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/mk.c [iso-8859-1] Sat Jul 2 13:11:50 2016 @@ -197,9 +197,8 @@ { MkProtocol *This = impl_from_IInternetProtocolEx(iface); LPWSTR mime, progid, display_name, colon_ptr; - DWORD path_size = INTERNET_MAX_URL_LENGTH; DWORD bindf=0, eaten=0, scheme=0, len; - BSTR url, path_tmp, path = NULL; + BSTR url, path = NULL; IParseDisplayName *pdn; BINDINFO bindinfo; STATSTG statstg; @@ -238,22 +237,20 @@ CoTaskMemFree(mime); } - hres = IUri_GetPath(pUri, &path_tmp); - if(FAILED(hres)) - return hres; - path = heap_alloc(path_size); - hres = UrlUnescapeW((LPWSTR)path_tmp, path, &path_size, 0); - SysFreeString(path_tmp); - if (FAILED(hres)) - { - heap_free(path); + hres = IUri_GetPath(pUri, &path); + if(FAILED(hres)) + return hres; + len = SysStringLen(path)+1; + hres = UrlUnescapeW(path, NULL, &len, URL_UNESCAPE_INPLACE); + if (FAILED(hres)) { + SysFreeString(path); return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); } + progid = path+1; /* skip '@' symbol */ colon_ptr = strchrW(path, ':'); - if(!colon_ptr) - { - heap_free(path); + if(!colon_ptr) { + SysFreeString(path); return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); } @@ -263,7 +260,7 @@ progid[colon_ptr-progid] = 0; /* overwrite ':' with NULL terminator */ hres = CLSIDFromProgID(progid, &clsid); - heap_free(path); + SysFreeString(path); if(FAILED(hres)) { heap_free(display_name); 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] Sat Jul 2 13:11:50 2016 @@ -192,7 +192,7 @@ reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.4 reactos/dll/win32/updspapi # Synced to WineStaging-1.9.4 reactos/dll/win32/url # Synced to WineStaging-1.9.4 -reactos/dll/win32/urlmon # Synced to WineStaging-1.9.4 +reactos/dll/win32/urlmon # Synced to WineStaging-1.9.11 reactos/dll/win32/usp10 # Synced to WineStaging-1.9.11 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11

1 0

[akhaldi] 71736: [VBSCRIPT] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 13:09:58 2016 New Revision: 71736 URL: http://svn.reactos.org/svn/reactos?rev=71736&view=rev Log: [VBSCRIPT] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/vbscript/global.c trunk/reactos/dll/win32/vbscript/vbdisp.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/vbscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/global.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/global.c [iso-8859-1] Sat Jul 2 13:09:58 2016 @@ -21,8 +21,6 @@ #include <math.h> #include <wingdi.h> #include <mshtmhst.h> - -#define round(x) (((x) < 0) ? (int)((x) - 0.5) : (int)((x) + 0.5)) #define VB_E_CANNOT_CREATE_OBJ 0x800a01ad #define VB_E_MK_PARSE_ERROR 0x800a01b0 Modified: trunk/reactos/dll/win32/vbscript/vbdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbdisp.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbdisp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbdisp.c [iso-8859-1] Sat Jul 2 13:09:58 2016 @@ -549,7 +549,7 @@ static inline vbdisp_t *unsafe_impl_from_IDispatch(IDispatch *iface) { return iface->lpVtbl == (IDispatchVtbl*)&DispatchExVtbl - ? CONTAINING_RECORD(iface, vbdisp_t, IDispatchEx_iface) + ? CONTAINING_RECORD((IDispatchEx *)iface, vbdisp_t, IDispatchEx_iface) : 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] Sat Jul 2 13:09:58 2016 @@ -195,7 +195,7 @@ reactos/dll/win32/urlmon # Synced to WineStaging-1.9.4 reactos/dll/win32/usp10 # Synced to WineStaging-1.9.11 reactos/dll/win32/uxtheme # Forked -reactos/dll/win32/vbscript # Synced to WineStaging-1.9.4 +reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11 reactos/dll/win32/version # Synced to WineStaging-1.9.11 reactos/dll/win32/vssapi # Synced to WineStaging-1.9.4 reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71735: [WBEMPROX_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 13:07:46 2016 New Revision: 71735 URL: http://svn.reactos.org/svn/reactos?rev=71735&view=rev Log: [WBEMPROX_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/wbemprox/query.c trunk/rostests/winetests/wbemprox/services.c Modified: trunk/rostests/winetests/wbemprox/query.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wbemprox/query.… ============================================================================== --- trunk/rostests/winetests/wbemprox/query.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wbemprox/query.c [iso-8859-1] Sat Jul 2 13:07:46 2016 @@ -147,6 +147,29 @@ SysFreeString( query ); } +static void test_associators( IWbemServices *services ) +{ + static const WCHAR query1[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',0}; + static const WCHAR query2[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s',' ','=',' ','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; + static const WCHAR *test[] = { query1, query2 }; + HRESULT hr; + IEnumWbemClassObject *result; + UINT i; + + for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + { + hr = exec_query( services, test[i], &result ); + todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); + if (result) IEnumWbemClassObject_Release( result ); + } +} + static void test_Win32_Service( IWbemServices *services ) { static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; @@ -1054,6 +1077,7 @@ ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_select( services ); + test_associators( services ); test_Win32_Bios( services ); test_Win32_Process( services ); test_Win32_Service( services ); Modified: trunk/rostests/winetests/wbemprox/services.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wbemprox/servic… ============================================================================== --- trunk/rostests/winetests/wbemprox/services.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wbemprox/services.c [iso-8859-1] Sat Jul 2 13:07:46 2016 @@ -168,10 +168,7 @@ { resource = SysAllocString( test[i].path ); hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, NULL, &services ); - if (test[i].todo) todo_wine - ok( hr == test[i].result || broken(hr == test[i].result_broken), - "%u: expected %08x got %08x\n", i, test[i].result, hr ); - else + todo_wine_if (test[i].todo) ok( hr == test[i].result || broken(hr == test[i].result_broken), "%u: expected %08x got %08x\n", i, test[i].result, hr ); SysFreeString( resource );

1 0

[akhaldi] 71734: [WBEMPROX] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 13:06:47 2016 New Revision: 71734 URL: http://svn.reactos.org/svn/reactos?rev=71734&view=rev Log: [WBEMPROX] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/wbemprox/builtin.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wbemprox/builtin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/builtin… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] Sat Jul 2 13:06:47 2016 @@ -220,6 +220,8 @@ {'L','o','c','a','l','D','a','t','e','T','i','m','e',0}; static const WCHAR prop_localeW[] = {'L','o','c','a','l','e',0}; +static const WCHAR prop_locationW[] = + {'L','o','c','a','t','i','o','n',0}; static const WCHAR prop_lockpresentW[] = {'L','o','c','k','P','r','e','s','e','n','t',0}; static const WCHAR prop_macaddressW[] = @@ -262,6 +264,8 @@ {'P','i','x','e','l','s','P','e','r','X','L','o','g','i','c','a','l','I','n','c','h',0}; static const WCHAR prop_pnpdeviceidW[] = {'P','N','P','D','e','v','i','c','e','I','D',0}; +static const WCHAR prop_portnameW[] = + {'P','o','r','t','N','a','m','e',0}; static const WCHAR prop_pprocessidW[] = {'P','a','r','e','n','t','P','r','o','c','e','s','s','I','D',0}; static const WCHAR prop_primaryW[] = @@ -526,7 +530,10 @@ { prop_horizontalresolutionW, CIM_UINT32 }, { prop_localW, CIM_BOOLEAN }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_networkW, CIM_BOOLEAN } + { prop_networkW, CIM_BOOLEAN }, + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_portnameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_locationW, CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_process[] = { @@ -923,6 +930,9 @@ int local; const WCHAR *name; int network; + const WCHAR *device_id; + const WCHAR *portname; + const WCHAR *location; }; struct record_process { @@ -2268,10 +2278,12 @@ static enum fill_status fill_printer( struct table *table, const struct expr *cond ) { + static const WCHAR fmtW[] = {'P','r','i','n','t','e','r','%','d',0}; struct record_printer *rec; enum fill_status status = FILL_STATUS_UNFILTERED; PRINTER_INFO_2W *info; DWORD i, offset = 0, count = 0, size = 0; + WCHAR id[20]; EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FILL_STATUS_FAILED; @@ -2297,6 +2309,10 @@ rec->local = -1; rec->name = heap_strdupW( info[i].pPrinterName ); rec->network = 0; + sprintfW( id, fmtW, i ); + rec->device_id = heap_strdupW( id ); + rec->portname = heap_strdupW( info[i].pPortName ); + rec->location = heap_strdupW( info[i].pLocation ); if (!match_row( table, i, cond, &status )) { free_row_values( table, i ); 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] Sat Jul 2 13:06:47 2016 @@ -199,7 +199,7 @@ reactos/dll/win32/version # Synced to WineStaging-1.9.11 reactos/dll/win32/vssapi # Synced to WineStaging-1.9.4 reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.4 -reactos/dll/win32/wbemprox # Synced to WineStaging-1.9.4 +reactos/dll/win32/wbemprox # Synced to WineStaging-1.9.11 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.9.4 reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.4 reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71733: [WINSCARD] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 13:05:27 2016 New Revision: 71733 URL: http://svn.reactos.org/svn/reactos?rev=71733&view=rev Log: [WINSCARD] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/winscard/winscard.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/winscard/winscard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winscard/winscar… ============================================================================== --- trunk/reactos/dll/win32/winscard/winscard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winscard/winscard.c [iso-8859-1] Sat Jul 2 13:05:27 2016 @@ -124,14 +124,14 @@ FIXME("stub\n"); } -LONG WINAPI SCardListReadersA(SCARDCONTEXT context, LPCSTR groups, LPSTR readers, LPDWORD buflen) +LONG WINAPI SCardListReadersA(SCARDCONTEXT context, const CHAR *groups, CHAR *readers, DWORD *buflen) { FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_a(groups), readers, buflen); - return SCARD_F_INTERNAL_ERROR; + return SCARD_E_NO_READERS_AVAILABLE; } -LONG WINAPI SCardListReadersW(SCARDCONTEXT context, LPCWSTR groups, LPWSTR readers, LPDWORD buflen) +LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR *readers, DWORD *buflen) { FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); - return SCARD_F_INTERNAL_ERROR; + return SCARD_E_NO_READERS_AVAILABLE; } 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] Sat Jul 2 13:05:27 2016 @@ -209,7 +209,7 @@ reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/winscard # Synced to WineStaging-1.9.4 +reactos/dll/win32/winscard # Synced to WineStaging-1.9.11 reactos/dll/win32/wintrust # Synced to WineStaging-1.9.11 reactos/dll/win32/wldap32 # Synced to WineStaging-1.9.11 reactos/dll/win32/wmi # Synced to WineStaging-1.9.4

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