Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[akhaldi] 70134: [PROPSYS_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: akhaldi Date: Thu Nov 26 23:26:49 2015 New Revision: 70134 URL: http://svn.reactos.org/svn/reactos?rev=70134&view=rev Log: [PROPSYS_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/propsys/propsys.c Modified: trunk/rostests/winetests/propsys/propsys.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/propsys/propsys… ============================================================================== --- trunk/rostests/winetests/propsys/propsys.c [iso-8859-1] (original) +++ trunk/rostests/winetests/propsys/propsys.c [iso-8859-1] Thu Nov 26 23:26:49 2015 @@ -774,11 +774,11 @@ PropVariantClear(&propvar); propvar.vt = VT_I8; - propvar.u.hVal.QuadPart = (LONGLONG)1 << 63; + propvar.u.hVal.QuadPart = (ULONGLONG)1 << 63; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == (LONGLONG)1 << 63, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == (ULONGLONG)1 << 63, "got wrong value %s\n", debugstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);

1 0

[akhaldi] 70133: [OPENGL32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: akhaldi Date: Thu Nov 26 23:25:22 2015 New Revision: 70133 URL: http://svn.reactos.org/svn/reactos?rev=70133&view=rev Log: [OPENGL32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/opengl32/opengl.c Modified: trunk/rostests/winetests/opengl32/opengl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/opengl… ============================================================================== --- trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] Thu Nov 26 23:25:22 2015 @@ -715,6 +715,9 @@ struct wgl_thread_param *p = param; HDC hdc = GetDC( p->hwnd ); + ok(!glGetString(GL_RENDERER) && !glGetString(GL_VERSION) && !glGetString(GL_VENDOR), + "Expected NULL string when no active context is set\n"); + SetLastError(0xdeadbeef); p->make_current = wglMakeCurrent(hdc, p->hglrc); p->make_current_error = GetLastError(); @@ -1668,6 +1671,8 @@ test_message_window(); test_dc(hwnd, hdc); + ok(!glGetString(GL_RENDERER) && !glGetString(GL_VERSION) && !glGetString(GL_VENDOR), + "Expected NULL string when no active context is set\n"); hglrc = wglCreateContext(hdc); res = wglMakeCurrent(hdc, hglrc); ok(res, "wglMakeCurrent failed!\n");

1 0

[akhaldi] 70132: [NETAPI32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: akhaldi Date: Thu Nov 26 23:24:06 2015 New Revision: 70132 URL: http://svn.reactos.org/svn/reactos?rev=70132&view=rev Log: [NETAPI32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/netapi32/access.c Modified: trunk/rostests/winetests/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/access… ============================================================================== --- trunk/rostests/winetests/netapi32/access.c [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/access.c [iso-8859-1] Thu Nov 26 23:24:06 2015 @@ -56,15 +56,16 @@ static const WCHAR sInvalidName2[] = {'\\','\\',0}; static const WCHAR sEmptyStr[] = { 0 }; -static NET_API_STATUS (WINAPI *pNetApiBufferFree)(LPVOID)=NULL; -static NET_API_STATUS (WINAPI *pNetApiBufferSize)(LPVOID,LPDWORD)=NULL; -static NET_API_STATUS (WINAPI *pNetQueryDisplayInformation)(LPWSTR,DWORD,DWORD,DWORD,DWORD,LPDWORD,PVOID*)=NULL; -static NET_API_STATUS (WINAPI *pNetUserGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=NULL; -static NET_API_STATUS (WINAPI *pNetUserModalsGet)(LPCWSTR,DWORD,LPBYTE*)=NULL; -static NET_API_STATUS (WINAPI *pNetUserAdd)(LPCWSTR,DWORD,LPBYTE,LPDWORD)=NULL; -static NET_API_STATUS (WINAPI *pNetUserDel)(LPCWSTR,LPCWSTR)=NULL; -static NET_API_STATUS (WINAPI *pNetLocalGroupGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=NULL; -static NET_API_STATUS (WINAPI *pNetLocalGroupGetMembers)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,PDWORD_PTR)=NULL; +static NET_API_STATUS (WINAPI *pNetApiBufferFree)(LPVOID); +static NET_API_STATUS (WINAPI *pNetApiBufferSize)(LPVOID,LPDWORD); +static NET_API_STATUS (WINAPI *pNetQueryDisplayInformation)(LPWSTR,DWORD,DWORD,DWORD,DWORD,LPDWORD,PVOID*); +static NET_API_STATUS (WINAPI *pNetUserGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*); +static NET_API_STATUS (WINAPI *pNetUserModalsGet)(LPCWSTR,DWORD,LPBYTE*); +static NET_API_STATUS (WINAPI *pNetUserAdd)(LPCWSTR,DWORD,LPBYTE,LPDWORD); +static NET_API_STATUS (WINAPI *pNetUserDel)(LPCWSTR,LPCWSTR); +static NET_API_STATUS (WINAPI *pNetLocalGroupGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*); +static NET_API_STATUS (WINAPI *pNetLocalGroupGetMembers)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,PDWORD_PTR); +static DWORD (WINAPI *pDavGetHTTPFromUNCPath)(LPCWSTR,LPWSTR,LPDWORD); static BOOL init_access_tests(void) { @@ -352,6 +353,203 @@ pNetApiBufferFree(buffer); } +static void test_DavGetHTTPFromUNCPath(void) +{ + static const WCHAR path[] = + {0}; + static const WCHAR path2[] = + {'c',':','\\',0}; + static const WCHAR path3[] = + {'\\','\\','.','\\','c',':',0}; + static const WCHAR path4[] = + {'\\','\\','.','\\','c',':','\\',0}; + static const WCHAR path5[] = + {'\\','\\','.','\\','c',':','\\','n','o','s','u','c','h','p','a','t','h',0}; + static const WCHAR path6[] = + {'\\','\\','n','o','s','u','c','h','s','e','r','v','e','r','\\','c',':','\\',0}; + static const WCHAR path7[] = + {'\\','.','\\','c',':',0}; + static const WCHAR path8[] = + {'\\','\\','.','\\','c',':','\\','\\',0}; + static const WCHAR path9[] = + {'\\','\\','.','@','S','S','L','\\','c',':',0}; + static const WCHAR path10[] = + {'\\','\\','.','@','s','s','l','\\','c',':',0}; + static const WCHAR path11[] = + {'\\','\\','.','@','t','l','s','\\','c',':',0}; + static const WCHAR path12[] = + {'\\','\\','.','@','S','S','L','@','4','4','3','\\','c',':',0}; + static const WCHAR path13[] = + {'\\','\\','.','@','S','S','L','@','8','0','\\','c',':',0}; + static const WCHAR path14[] = + {'\\','\\','.','@','8','0','\\','c',':',0}; + static const WCHAR path15[] = + {'\\','\\','.','@','8','0','8','0','\\','c',':',0}; + static const WCHAR path16[] = + {'\\','\\','\\','c',':',0}; + static const WCHAR path17[] = + {'\\','\\',0}; + static const WCHAR path18[] = + {'/','/','.','/','c',':',0}; + static const WCHAR path19[] = + {'\\','\\','.','\\','c',':','/',0}; + static const WCHAR path20[] = + {'\\','\\','.','\\','c',':','\\','\\','\\',0}; + static const WCHAR path21[] = + {'\\','\\','.','\\','\\','c',':',0}; + static const WCHAR path22[] = + {'\\','\\','.','\\','c',':','d','i','r',0}; + static const WCHAR path23[] = + {'\\','\\','.',0}; + static const WCHAR path24[] = + {'\\','\\','.','\\','d','i','r',0}; + static const WCHAR path25[] = + {'\\','\\','.','\\','\\',0}; + static const WCHAR path26[] = + {'\\','\\','.','\\','c',':','d','i','r','/',0}; + static const WCHAR path27[] = + {'\\','\\','.','/','c',':',0}; + static const WCHAR path28[] = + {'\\','\\','.','@','8','0','@','S','S','L','\\','c',':',0}; + static const WCHAR result[] = + {'h','t','t','p',':','/','/','.','/','c',':',0}; + static const WCHAR result2[] = + {'h','t','t','p',':','/','/','.','/','c',':','/','n','o','s','u','c','h','p','a','t','h',0}; + static const WCHAR result3[] = + {'h','t','t','p',':','/','/','n','o','s','u','c','h','s','e','r','v','e','r','/','c',':',0}; + static const WCHAR result4[] = + {'h','t','t','p',':','/','/','.','/','c',':','/',0}; + static const WCHAR result5[] = + {'h','t','t','p','s',':','/','/','.','/','c',':',0}; + static const WCHAR result6[] = + {'h','t','t','p','s',':','/','/','.',':','8','0','/','c',':',0}; + static const WCHAR result7[] = + {'h','t','t','p',':','/','/','.',':','8','0','8','0','/','c',':',0}; + static const WCHAR result8[] = + {'h','t','t','p',':','/','/','/','c',':',0}; + static const WCHAR result9[] = + {'h','t','t','p',':','/','/','.','/','c',':','/','/',0}; + static const WCHAR result10[] = + {'h','t','t','p',':','/','/','.','/','/','c',':',0}; + static const WCHAR result11[] = + {'h','t','t','p',':','/','/','.','/','c',':','d','i','r',0}; + static const WCHAR result12[] = + {'h','t','t','p',':','/','/','.',0}; + static const WCHAR result13[] = + {'h','t','t','p',':','/','/','.','/','d','i','r',0}; + static const WCHAR result14[] = + {'h','t','t','p',':','/','/','.','/',0}; + static const struct + { + const WCHAR *path; + DWORD size; + DWORD ret; + const WCHAR *ret_path; + DWORD ret_size; + int todo; + } + tests[] = + { + { path, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, + { path2, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, + { path3, MAX_PATH, ERROR_SUCCESS, result, 12 }, + { path4, MAX_PATH, ERROR_SUCCESS, result, 12 }, + { path5, MAX_PATH, ERROR_SUCCESS, result2, 23 }, + { path6, MAX_PATH, ERROR_SUCCESS, result3, 23 }, + { path7, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, + { path8, MAX_PATH, ERROR_SUCCESS, result4, 13 }, + { path9, MAX_PATH, ERROR_SUCCESS, result5, 13 }, + { path10, MAX_PATH, ERROR_SUCCESS, result5, 13 }, + { path11, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, + { path12, MAX_PATH, ERROR_SUCCESS, result5, 13 }, + { path13, MAX_PATH, ERROR_SUCCESS, result6, 16 }, + { path14, MAX_PATH, ERROR_SUCCESS, result, 12 }, + { path15, MAX_PATH, ERROR_SUCCESS, result7, 17 }, + { path16, MAX_PATH, ERROR_SUCCESS, result8, 11 }, + { path17, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, + { path18, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, + { path19, MAX_PATH, ERROR_SUCCESS, result, 12 }, + { path20, MAX_PATH, ERROR_SUCCESS, result9, 14 }, + { path21, MAX_PATH, ERROR_SUCCESS, result10, 13 }, + { path22, MAX_PATH, ERROR_SUCCESS, result11, 15 }, + { path23, MAX_PATH, ERROR_SUCCESS, result12, 9 }, + { path24, MAX_PATH, ERROR_SUCCESS, result13, 13 }, + { path25, MAX_PATH, ERROR_SUCCESS, result14, 10, 1 }, + { path26, MAX_PATH, ERROR_SUCCESS, result11, 15 }, + { path27, MAX_PATH, ERROR_SUCCESS, result, 12 }, + { path28, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, + }; + WCHAR buf[MAX_PATH]; + DWORD i, ret, size; + + if (!pDavGetHTTPFromUNCPath) + { + win_skip( "DavGetHTTPFromUNCPath is missing\n" ); + return; + } + + if (0) { /* crash */ + ret = pDavGetHTTPFromUNCPath( NULL, NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + } + + ret = pDavGetHTTPFromUNCPath( path, buf, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + size = 0; + ret = pDavGetHTTPFromUNCPath( path, NULL, &size ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + if (0) { /* crash */ + buf[0] = 0; + size = 0; + ret = pDavGetHTTPFromUNCPath( path, buf, &size ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = pDavGetHTTPFromUNCPath( path3, buf, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + } + + size = 0; + ret = pDavGetHTTPFromUNCPath( path3, NULL, &size ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + buf[0] = 0; + size = 0; + ret = pDavGetHTTPFromUNCPath( path3, buf, &size ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + ok( size == 12, "got %u\n", size ); + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + buf[0] = 0; + size = tests[i].size; + ret = pDavGetHTTPFromUNCPath( tests[i].path, buf, &size ); + if (tests[i].todo) + { + ok( ret == tests[i].ret, "%u: expected %u got %u\n", i, tests[i].ret, ret ); + todo_wine { + if (tests[i].ret_path) + { + ok( !lstrcmpW( buf, tests[i].ret_path ), "%u: expected %s got %s\n", + i, wine_dbgstr_w(tests[i].ret_path), wine_dbgstr_w(buf) ); + } + ok( size == tests[i].ret_size, "%u: expected %u got %u\n", i, tests[i].ret_size, size ); + } + } + else + { + ok( ret == tests[i].ret, "%u: expected %u got %u\n", i, tests[i].ret, ret ); + if (tests[i].ret_path) + { + ok( !lstrcmpW( buf, tests[i].ret_path ), "%u: expected %s got %s\n", + i, wine_dbgstr_w(tests[i].ret_path), wine_dbgstr_w(buf) ); + } + ok( size == tests[i].ret_size, "%u: expected %u got %u\n", i, tests[i].ret_size, size ); + } + } +} + START_TEST(access) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); @@ -365,6 +563,7 @@ pNetUserDel=(void*)GetProcAddress(hnetapi32, "NetUserDel"); pNetLocalGroupGetInfo=(void*)GetProcAddress(hnetapi32, "NetLocalGroupGetInfo"); pNetLocalGroupGetMembers=(void*)GetProcAddress(hnetapi32, "NetLocalGroupGetMembers"); + pDavGetHTTPFromUNCPath = (void*)GetProcAddress(hnetapi32, "DavGetHTTPFromUNCPath"); /* These functions were introduced with NT. It's safe to assume that * if one is not available, none are. @@ -383,5 +582,6 @@ run_localgroupgetinfo_tests(); } + test_DavGetHTTPFromUNCPath(); FreeLibrary(hnetapi32); }

1 0

[akhaldi] 70131: [PSDK] Add missing FACILITY_DIRECT3D11.
by akhaldi＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: akhaldi Date: Thu Nov 26 23:20:04 2015 New Revision: 70131 URL: http://svn.reactos.org/svn/reactos?rev=70131&view=rev Log: [PSDK] Add missing FACILITY_DIRECT3D11. Modified: trunk/reactos/include/psdk/winerror.h Modified: trunk/reactos/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winerror.h?re… ============================================================================== --- trunk/reactos/include/psdk/winerror.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winerror.h [iso-8859-1] Thu Nov 26 23:20:04 2015 @@ -59,6 +59,7 @@ #define FACILITY_PLA 48 #define FACILITY_FVE 49 #define FACILITY_WINDOWS_DEFENDER 80 +#define FACILITY_DIRECT3D11 0x87c #define SEVERITY_SUCCESS 0 #define SEVERITY_ERROR 1

1 0

[akhaldi] 70130: [MLANG_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: akhaldi Date: Thu Nov 26 23:17:27 2015 New Revision: 70130 URL: http://svn.reactos.org/svn/reactos?rev=70130&view=rev Log: [MLANG_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/mlang/mlang.c Modified: trunk/rostests/winetests/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.c?r… ============================================================================== --- trunk/rostests/winetests/mlang/mlang.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mlang/mlang.c [iso-8859-1] Thu Nov 26 23:17:27 2015 @@ -2092,7 +2092,7 @@ return E_NOTIMPL; } -static IStreamVtbl stream_vtbl = +static /* const */ IStreamVtbl stream_vtbl = { stream_QueryInterface, stream_AddRef,

1 0

[akhaldi] 70129: [GDI32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: akhaldi Date: Thu Nov 26 23:16:17 2015 New Revision: 70129 URL: http://svn.reactos.org/svn/reactos?rev=70129&view=rev Log: [GDI32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/gdi32/font.c trunk/rostests/winetests/gdi32/metafile.c trunk/rostests/winetests/gdi32/palette.c Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Thu Nov 26 23:16:17 2015 @@ -55,6 +55,9 @@ static BOOL (WINAPI *pRemoveFontMemResourceEx)(HANDLE); static INT (WINAPI *pAddFontResourceExA)(LPCSTR, DWORD, PVOID); static BOOL (WINAPI *pRemoveFontResourceExA)(LPCSTR, DWORD, PVOID); +static BOOL (WINAPI *pGetFontRealizationInfo)(HDC hdc, DWORD *); +static BOOL (WINAPI *pGetFontFileInfo)(DWORD, DWORD, void *, DWORD, DWORD *); +static BOOL (WINAPI *pGetFontFileData)(DWORD, DWORD, ULONGLONG, void *, DWORD); static HMODULE hgdi32 = 0; static const MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; @@ -97,6 +100,9 @@ pRemoveFontMemResourceEx = (void *)GetProcAddress(hgdi32, "RemoveFontMemResourceEx"); pAddFontResourceExA = (void *)GetProcAddress(hgdi32, "AddFontResourceExA"); pRemoveFontResourceExA = (void *)GetProcAddress(hgdi32, "RemoveFontResourceExA"); + pGetFontRealizationInfo = (void *)GetProcAddress(hgdi32, "GetFontRealizationInfo"); + pGetFontFileInfo = (void *)GetProcAddress(hgdi32, "GetFontFileInfo"); + pGetFontFileData = (void *)GetProcAddress(hgdi32, "GetFontFileData"); system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); } @@ -747,6 +753,7 @@ #define FH_SCALE 0x80000000 static void test_bitmap_font_metrics(void) { + static const WORD skip_rtl[] = {LANG_ARABIC, LANG_HEBREW, 0}; static const struct font_data { const char face_name[LF_FACESIZE]; @@ -754,19 +761,19 @@ int ave_char_width, max_char_width, dpi; BYTE first_char, last_char, def_char, break_char; DWORD ansi_bitfield; - WORD skip_lang_id; + const WORD *skip_lang_id; int scaled_height; } fd[] = { - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 16 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 16 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 16 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 13, 3, 3, 0, 7, 14, 120, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 16 }, @@ -858,22 +865,22 @@ { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 2, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, skip_rtl}, { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 2, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 5, 4, 1, 0, 0, 3, 6, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, skip_rtl}, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 0, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, skip_rtl}, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 0, 0, 5, 10, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl}, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 5, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 9, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 0, 0, 6, 12, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC, skip_rtl}, { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 4, 10, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, @@ -1015,8 +1022,17 @@ if(fd[i].dpi == tm.tmDigitizedAspectX) { + int skipme = 0; trace("matched %s, height %d charset %x dpi %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet, fd[i].dpi); - if (fd[i].skip_lang_id == 0 || system_lang_id != fd[i].skip_lang_id) + if (fd[i].skip_lang_id) + { + int si = 0; + skipme = 0; + while(!skipme && fd[i].skip_lang_id[si]) + if (fd[i].skip_lang_id[si++] == system_lang_id) + skipme = 1; + } + if (!skipme) { ok(tm.tmWeight == fd[i].weight, "%s(%d): tm.tmWeight %d != %d\n", fd[i].face_name, height, tm.tmWeight, fd[i].weight); if (fd[i].height & FH_SCALE) @@ -1850,6 +1866,8 @@ } SelectObject(hdc, old_hfont); + /* force GDI to use new font, otherwise Windows leaks the font reference */ + GetTextMetricsA(hdc, &tm); DeleteObject(hfont); } } @@ -2002,6 +2020,7 @@ BYTE *ratio_rec; char ttf_name[MAX_PATH]; void *res, *copy; + BOOL ret; if (!pAddFontResourceExA) { @@ -2034,7 +2053,9 @@ test_height( hdc, data[i].fd ); pRemoveFontResourceExA( ttf_name, FR_PRIVATE, 0 ); } - DeleteFileA( ttf_name ); + ret = DeleteFileA( ttf_name ); + ok(ret || broken(!ret && GetLastError() == ERROR_ACCESS_DENIED), + "DeleteFile error %d\n", GetLastError()); } } @@ -2141,6 +2162,11 @@ ok(otm->otmpStyleName == NULL, "expected NULL got %p\n", otm->otmpStyleName); } ok(otm->otmpFullName == unset_ptr, "expected %p got %p\n", unset_ptr, otm->otmpFullName); + + /* check handling of NULL pointer */ + SetLastError(0xdeadbeef); + ret = GetOutlineTextMetricsA(hdc, otm_size, NULL); + ok(ret == otm_size, "expected %u, got %u, error %d\n", otm_size, ret, GetLastError()); HeapFree(GetProcessHeap(), 0, otm); @@ -2375,12 +2401,12 @@ if (charset == SYMBOL_CHARSET) { ok(strcmp("Arial", name), "face name should NOT be Arial\n"); - ok(fs.fsCsb[0] & (1 << 31), "symbol encoding should be available\n"); + ok(fs.fsCsb[0] & (1u << 31), "symbol encoding should be available\n"); } else { ok(!strcmp("Arial", name), "face name should be Arial, not %s\n", name); - ok(!(fs.fsCsb[0] & (1 << 31)), "symbol encoding should NOT be available\n"); + ok(!(fs.fsCsb[0] & (1u << 31)), "symbol encoding should NOT be available\n"); } if (!TranslateCharsetInfo((DWORD *)(INT_PTR)cs, &csi, TCI_SRCCHARSET)) @@ -3172,8 +3198,13 @@ USHORT usDefaultChar; USHORT usBreakChar; USHORT usMaxContext; -} TT_OS2_V2; + /* version 4 (OpenType 1.6) */ + USHORT usLowerOpticalPointSize; + USHORT usUpperOpticalPointSize; +} TT_OS2_V4; #include "poppack.h" + +#define TT_OS2_V0_SIZE (FIELD_OFFSET(TT_OS2_V4, ulCodePageRange1)) typedef struct { @@ -3226,7 +3257,7 @@ USHORT id_range_offset; } cmap_format_4_seg; -static void expect_ff(const TEXTMETRICA *tmA, const TT_OS2_V2 *os2, WORD family, const char *name) +static void expect_ff(const TEXTMETRICA *tmA, const TT_OS2_V4 *os2, WORD family, const char *name) { ok((tmA->tmPitchAndFamily & 0xf0) == family || broken(PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH), @@ -3646,7 +3677,7 @@ HDC hdc; HFONT hfont, hfont_old; TEXTMETRICA tmA; - TT_OS2_V2 tt_os2; + TT_OS2_V4 tt_os2; LONG size, ret; const char *font_name = lf->lfFaceName; DWORD cmap_first = 0, cmap_last = 0; @@ -3677,7 +3708,8 @@ memset(&tt_os2, 0, sizeof(tt_os2)); ret = GetFontData(hdc, MS_OS2_TAG, 0, &tt_os2, size); - ok(ret == size, "GetFontData should return %u not %u\n", size, ret); + ok(ret >= TT_OS2_V0_SIZE && ret <= size, "GetFontData should return size from [%u,%u] not %u\n", TT_OS2_V0_SIZE, + size, ret); SetLastError(0xdeadbeef); ret = GetTextMetricsA(hdc, &tmA); @@ -3696,7 +3728,7 @@ TEXTMETRICW tmW; ascent = GET_BE_WORD(tt_os2.usWinAscent); - descent = GET_BE_WORD(tt_os2.usWinDescent); + descent = abs((SHORT)GET_BE_WORD(tt_os2.usWinDescent)); cell_height = ascent + descent; ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u\n", font_name, ntm->ntmCellHeight, cell_height, ascent, descent); @@ -3917,30 +3949,76 @@ { "Times New Roman Greek", 161 }, { "Times New Roman TUR", 162 } }; + static const struct + { + const char *name; + int charset; + } shell_subst[] = + { + { "MS Shell Dlg", 186 }, + { "MS Shell Dlg", 238 }, + { "MS Shell Dlg", 204 }, + { "MS Shell Dlg", 161 }, + { "MS Shell Dlg", 162 } + }; LOGFONTA lf; HDC hdc; HFONT hfont; CHARSETINFO csi; - INT cs, expected_cs, i; + INT cs, expected_cs, i, ret; char buf[LF_FACESIZE]; + + expected_cs = GetACP(); + if (!TranslateCharsetInfo(ULongToPtr(expected_cs), &csi, TCI_SRCCODEPAGE)) + { + skip("TranslateCharsetInfo failed for code page %d\n", expected_cs); + return; + } + expected_cs = csi.ciCharset; + trace("ACP %d -> charset %d\n", GetACP(), expected_cs); + + hdc = CreateCompatibleDC(0); + + for (i = 0; i < sizeof(shell_subst)/sizeof(shell_subst[0]); i++) + { + ret = is_font_installed(shell_subst[i].name); + ok(ret || broken(!ret) /* win2000 */, "%s should be enumerated\n", shell_subst[i].name); + ret = is_truetype_font_installed(shell_subst[i].name); + ok(ret || broken(!ret) /* win2000 */, "%s should be enumerated\n", shell_subst[i].name); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -13; + lf.lfWeight = FW_REGULAR; + strcpy(lf.lfFaceName, shell_subst[i].name); + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + GetTextFaceA(hdc, sizeof(buf), buf); + ok(!lstrcmpiA(buf, shell_subst[i].name), "expected %s, got %s\n", shell_subst[i].name, buf); + cs = GetTextCharset(hdc); + ok(cs == ANSI_CHARSET, "expected ANSI_CHARSET, got %d for font %s\n", cs, shell_subst[i].name); + + DeleteObject(SelectObject(hdc, hfont)); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -13; + lf.lfWeight = FW_DONTCARE; + strcpy(lf.lfFaceName, shell_subst[i].name); + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + GetTextFaceA(hdc, sizeof(buf), buf); + ok(!lstrcmpiA(buf, shell_subst[i].name), "expected %s, got %s\n", shell_subst[i].name, buf); + cs = GetTextCharset(hdc); + ok(cs == expected_cs || cs == ANSI_CHARSET, "expected %d, got %d for font %s\n", expected_cs, cs, shell_subst[i].name); + DeleteObject(SelectObject(hdc, hfont)); + } if (!is_truetype_font_installed("Arial") || !is_truetype_font_installed("Times New Roman")) { + DeleteDC(hdc); skip("Arial or Times New Roman not installed\n"); return; } - - expected_cs = GetACP(); - if (!TranslateCharsetInfo(ULongToPtr(expected_cs), &csi, TCI_SRCCODEPAGE)) - { - skip("TranslateCharsetInfo failed for code page %d\n", expected_cs); - return; - } - expected_cs = csi.ciCharset; - trace("ACP %d -> charset %d\n", GetACP(), expected_cs); - - hdc = GetDC(0); memset(&lf, 0, sizeof(lf)); lf.lfHeight = 100; @@ -3999,6 +4077,15 @@ for (i = 0; i < sizeof(font_subst)/sizeof(font_subst[0]); i++) { + ret = is_font_installed(font_subst[i].name); +todo_wine + ok(ret || broken(!ret && !i) /* win2000 doesn't have Times New Roman Baltic substitution */, + "%s should be enumerated\n", font_subst[i].name); + ret = is_truetype_font_installed(font_subst[i].name); +todo_wine + ok(ret || broken(!ret && !i) /* win2000 doesn't have Times New Roman Baltic substitution */, + "%s should be enumerated\n", font_subst[i].name); + memset(&lf, 0, sizeof(lf)); lf.lfHeight = -13; lf.lfWeight = FW_REGULAR; @@ -4038,16 +4125,44 @@ DeleteObject(SelectObject(hdc, hfont)); } - ReleaseDC(0, hdc); -} - -static void test_GdiRealizationInfo(void) -{ + DeleteDC(hdc); +} + +static void test_RealizationInfo(void) +{ + struct font_realization_info { + DWORD size; + DWORD flags; + DWORD cache_num; + DWORD instance_id; + DWORD unk; + WORD face_index; + WORD simulations; + }; + + struct realization_info_t + { + DWORD flags; + DWORD cache_num; + DWORD instance_id; + }; + HDC hdc; - DWORD info[4]; - BOOL r; + DWORD info[4], info2[10]; + BOOL r, have_file = FALSE; HFONT hfont, hfont_old; LOGFONTA lf; + DWORD needed, read; + HANDLE h; + BYTE file[16], data[14]; + struct file_info + { + FILETIME time; + LARGE_INTEGER size; + WCHAR path[MAX_PATH]; + } file_info; + FILETIME time; + LARGE_INTEGER size; if(!pGdiRealizationInfo) { @@ -4063,16 +4178,17 @@ ok((info[0] & 0xf) == 1, "info[0] = %x for the system font\n", info[0]); ok(info[3] == 0xcccccccc, "structure longer than 3 dwords\n"); - if (!is_truetype_font_installed("Arial")) + if (!is_truetype_font_installed("Tahoma")) { skip("skipping GdiRealizationInfo with truetype font\n"); goto end; } memset(&lf, 0, sizeof(lf)); - strcpy(lf.lfFaceName, "Arial"); + strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = 20; - lf.lfWeight = FW_NORMAL; + lf.lfWeight = FW_BOLD; + lf.lfItalic = 1; hfont = CreateFontIndirectA(&lf); hfont_old = SelectObject(hdc, hfont); @@ -4081,6 +4197,93 @@ ok(r != 0, "ret 0\n"); ok((info[0] & 0xf) == 3, "info[0] = %x for arial\n", info[0]); ok(info[3] == 0xcccccccc, "structure longer than 3 dwords\n"); + + if (pGetFontRealizationInfo) + { + struct font_realization_info *fri = (struct font_realization_info*)info2; + struct realization_info_t *ri = (struct realization_info_t*)info; + + /* The first DWORD represents a struct size. On a + newly rebooted system setting this to < 16 results + in GetFontRealizationInfo failing. However there + appears to be some caching going on which results + in calls after a successful call also succeeding even + if the size < 16. This means we can't reliably test + this behaviour. */ + + memset(info2, 0xcc, sizeof(info2)); + info2[0] = 16; + r = pGetFontRealizationInfo(hdc, info2); + ok(r != 0, "ret 0\n"); + /* We may get the '24' version here if that has been previously + requested. */ + ok(fri->size == 16 || fri->size == 24, "got %d\n", info2[0]); + ok(fri->flags == ri->flags, "flags mismatch\n"); + ok(fri->cache_num == ri->cache_num, "cache_num mismatch\n"); + ok(fri->instance_id == ri->instance_id, "instance id mismatch\n"); + ok(info2[6] == 0xcccccccc, "got wrong dword 6, 0x%08x\n", info2[6]); + + memset(info2, 0xcc, sizeof(info2)); + info2[0] = 28; + r = pGetFontRealizationInfo(hdc, info2); + ok(r == FALSE, "got %d\n", r); + + memset(info2, 0xcc, sizeof(info2)); + info2[0] = 24; + r = pGetFontRealizationInfo(hdc, info2); + ok(r != 0, "ret 0\n"); + ok(fri->size == 24, "got %d\n", fri->size); + ok(fri->flags == ri->flags, "flags mismatch\n"); + ok(fri->cache_num == ri->cache_num, "cache_num mismatch\n"); + ok(fri->instance_id == ri->instance_id, "instance id mismatch\n"); + ok(fri->simulations == 0x2, "got simulations flags 0x%04x\n", fri->simulations); + ok(fri->face_index == 0, "got wrong face index %u\n", fri->face_index); + ok(info2[6] == 0xcccccccc, "structure longer than 6 dwords\n"); + + /* Test GetFontFileInfo() */ + /* invalid font id */ + SetLastError(0xdeadbeef); + r = pGetFontFileInfo(0xabababab, 0, &file_info, sizeof(file_info), &needed); + ok(r == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "ret %d gle %d\n", r, GetLastError()); + + needed = 0; + r = pGetFontFileInfo(fri->instance_id, 0, &file_info, sizeof(file_info), &needed); + ok(r != 0 || GetLastError() == ERROR_NOACCESS, "ret %d gle %d\n", r, GetLastError()); + + if (r) + { + ok(needed > 0 && needed < sizeof(file_info), "got needed size %u\n", needed); + + h = CreateFileW(file_info.path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "Unable to open file %d\n", GetLastError()); + + GetFileTime(h, NULL, NULL, &time); + ok(!CompareFileTime(&file_info.time, &time), "time mismatch\n"); + GetFileSizeEx(h, &size); + ok(file_info.size.QuadPart == size.QuadPart, "size mismatch\n"); + + /* Read first 16 bytes from the file */ + ReadFile(h, file, sizeof(file), &read, NULL); + CloseHandle(h); + have_file = TRUE; + + /* shorter buffer */ + SetLastError(0xdeadbeef); + r = pGetFontFileInfo(fri->instance_id, 0, &file_info, needed - 1, &needed); + ok(r == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "ret %d gle %d\n", r, GetLastError()); + } + + if (pGetFontFileData) { + /* Get bytes 2 - 16 using GetFontFileData */ + r = pGetFontFileData(fri->instance_id, 0, 2, data, sizeof(data)); + ok(r != 0, "ret 0 gle %d\n", GetLastError()); + + if (have_file) + ok(!memcmp(data, file + 2, sizeof(data)), "mismatch\n"); + else + win_skip("GetFontFileInfo() failed, skipping\n"); + } + } DeleteObject(SelectObject(hdc, hfont_old)); @@ -4868,7 +5071,6 @@ int ret; LOGFONTA lf; HDC hdc; - struct enum_fullname_data efnd; if (!is_truetype_font_installed("Arial")) { @@ -4929,26 +5131,89 @@ ret = EnumFontFamiliesA(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); ok(ret, "font Arial Italic Bold should not be enumerated\n"); - /* MS Shell Dlg and MS Shell Dlg 2 must exist */ + DeleteDC(hdc); +} + +static INT CALLBACK enum_ms_shell_dlg_proc(const LOGFONTA *lf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) +{ + struct enum_fullname_data *efnd = (struct enum_fullname_data *)lParam; + +if (0) /* Disabled to limit console spam */ + trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", + lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); + + if (type != TRUETYPE_FONTTYPE) return 1; + if (strcmp(lf->lfFaceName, "MS Shell Dlg") != 0) return 1; + + efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; + return 0; +} + +static INT CALLBACK enum_ms_shell_dlg2_proc(const LOGFONTA *lf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) +{ + struct enum_fullname_data *efnd = (struct enum_fullname_data *)lParam; + +if (0) /* Disabled to limit console spam */ + trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", + lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); + + if (type != TRUETYPE_FONTTYPE) return 1; + if (strcmp(lf->lfFaceName, "MS Shell Dlg 2") != 0) return 1; + + efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; + return 0; +} + +static void test_EnumFonts_subst(void) +{ + int ret; + LOGFONTA lf; + HDC hdc; + struct enum_fullname_data efnd; + + ret = is_font_installed("MS Shell Dlg"); + ok(ret, "MS Shell Dlg should be enumerated\n"); + ret = is_truetype_font_installed("MS Shell Dlg"); + ok(ret, "MS Shell Dlg should be enumerated as a TrueType font\n"); + + ret = is_font_installed("MS Shell Dlg 2"); + ok(ret, "MS Shell Dlg 2 should be enumerated\n"); + ret = is_truetype_font_installed("MS Shell Dlg 2"); + ok(ret, "MS Shell Dlg 2 should be enumerated as a TrueType font\n"); + + hdc = CreateCompatibleDC(0); + + memset(&efnd, 0, sizeof(efnd)); + ret = EnumFontFamiliesExA(hdc, NULL, enum_ms_shell_dlg_proc, (LPARAM)&efnd, 0); + ok(ret, "MS Shell Dlg should not be enumerated\n"); + ok(!efnd.total, "MS Shell Dlg should not be enumerated\n"); + memset(&lf, 0, sizeof(lf)); lf.lfCharSet = DEFAULT_CHARSET; memset(&efnd, 0, sizeof(efnd)); strcpy(lf.lfFaceName, "MS Shell Dlg"); - ret = EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); - ok(ret, "font MS Shell Dlg is not enumerated\n"); - ret = strcmp((char*)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg"); - todo_wine ok(!ret, "expected MS Shell Dlg got %s\n", efnd.elf[0].elfLogFont.lfFaceName); - ret = strcmp((char*)efnd.elf[0].elfFullName, "MS Shell Dlg"); + ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg_proc, (LPARAM)&efnd, 0); + ok(!ret, "MS Shell Dlg should be enumerated\n"); + ok(efnd.total > 0, "MS Shell Dlg should be enumerated\n"); + ret = strcmp((const char *)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg"); + ok(!ret, "expected MS Shell Dlg, got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg"); ok(ret, "did not expect MS Shell Dlg\n"); + + memset(&efnd, 0, sizeof(efnd)); + ret = EnumFontFamiliesExA(hdc, NULL, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); + ok(ret, "MS Shell Dlg 2 should not be enumerated\n"); + ok(!efnd.total, "MS Shell Dlg 2 should not be enumerated\n"); memset(&efnd, 0, sizeof(efnd)); strcpy(lf.lfFaceName, "MS Shell Dlg 2"); - ret = EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); - ok(ret, "font MS Shell Dlg 2 is not enumerated\n"); - ret = strcmp((char*)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg 2"); - todo_wine ok(!ret, "expected MS Shell Dlg 2 got %s\n", efnd.elf[0].elfLogFont.lfFaceName); - ret = strcmp((char*)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); + ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); + ok(!ret, "MS Shell Dlg 2 should be enumerated\n"); + ok(efnd.total > 0, "MS Shell Dlg 2 should be enumerated\n"); + ret = strcmp((const char *)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg 2"); + ok(!ret, "expected MS Shell Dlg 2, got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); ok(ret, "did not expect MS Shell Dlg 2\n"); DeleteDC(hdc); @@ -5704,9 +5969,12 @@ { int charset, weight, height, height_pixels, dpi; const char face_name[LF_FACESIZE]; - } td[][11] = + WORD lang_id; + } td[][12] = { { /* ANSI_FIXED_FONT */ + { ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_ARABIC }, + { ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_HEBREW}, { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 96, "Courier" }, { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 120, "Courier" }, { 0 } @@ -5735,6 +6003,7 @@ { 0 } }, { /* DEFAULT_GUI_FONT */ + { SHIFTJIS_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" }, { SHIFTJIS_CHARSET, FW_NORMAL, -12, 15, 96, "?MS UI Gothic" }, { SHIFTJIS_CHARSET, FW_NORMAL, -15, 18, 120, "?MS UI Gothic" }, { HANGEUL_CHARSET, FW_NORMAL, -12, 15, 96, "?Gulim" }, @@ -5769,7 +6038,9 @@ for (j = 0; td[i][j].face_name[0] != 0; j++) { - if (lf.lfCharSet != td[i][j].charset && td[i][j].charset != DEFAULT_CHARSET) + if ((lf.lfCharSet != td[i][j].charset && td[i][j].charset != DEFAULT_CHARSET) || + (system_lang_id != td[i][j].lang_id && td[i][j].lang_id != LANG_NEUTRAL) || + (td[i][j].face_name[0] != '?' && strcmp(lf.lfFaceName, td[i][j].face_name))) { continue; } @@ -6224,6 +6495,7 @@ test_height_selection(); test_AddFontMemResource(); test_EnumFonts(); + test_EnumFonts_subst(); /* On Windows Arial has a lot of default charset aliases such as Arial Cyr, * I'd like to avoid them in this test. @@ -6241,7 +6513,7 @@ skip("Arial Black or Symbol/Wingdings is not installed\n"); test_EnumFontFamiliesEx_default_charset(); test_GetTextMetrics(); - test_GdiRealizationInfo(); + test_RealizationInfo(); test_GetTextFace(); test_GetGlyphOutline(); test_GetTextMetrics2("Tahoma", -11); Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Thu Nov 26 23:16:17 2015 @@ -3361,6 +3361,39 @@ DeleteEnhMetaFile(hemf); } +static void test_emf_GetPath(void) +{ + HDC hdcMetafile; + HENHMETAFILE hemf; + BOOL ret; + int size; + + SetLastError(0xdeadbeef); + hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); + + BeginPath(hdcMetafile); + ret = MoveToEx(hdcMetafile, 50, 50, NULL); + ok( ret, "MoveToEx error %d.\n", GetLastError()); + ret = LineTo(hdcMetafile, 50, 150); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdcMetafile, 150, 150); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdcMetafile, 150, 50); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdcMetafile, 50, 50); + ok( ret, "LineTo error %d.\n", GetLastError()); + EndPath(hdcMetafile); + + size = GetPath(hdcMetafile, NULL, NULL, 0); + todo_wine ok( size == 5, "GetPath returned %d.\n", size); + + hemf = CloseEnhMetaFile(hdcMetafile); + ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + DeleteEnhMetaFile(hemf); +} + START_TEST(metafile) { init_function_pointers(); @@ -3374,6 +3407,7 @@ test_emf_ExtTextOut_on_path(); test_emf_clipping(); test_emf_polybezier(); + test_emf_GetPath(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC(); Modified: trunk/rostests/winetests/gdi32/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/palette.c… ============================================================================== --- trunk/rostests/winetests/gdi32/palette.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/palette.c [iso-8859-1] Thu Nov 26 23:16:17 2015 @@ -191,108 +191,115 @@ ReleaseDC( 0, hdc ); } -static void test_system_palette_entries(void) -{ - HDC hdc; +static void check_system_palette_entries(HDC hdc) +{ PALETTEENTRY entries[256]; PALETTEENTRY defpal[20]; int i, count; + memset( defpal, 0xaa, sizeof(defpal) ); + count = GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, 20, defpal ); + ok( count == 20, "wrong size %u\n", count ); + + memset( entries, 0x55, sizeof(entries) ); + count = GetSystemPaletteEntries( hdc, 0, 256, entries ); + ok( count == 0, "wrong size %u\n", count); + for (i = 0; i < 10; i++) + { + ok( entries[i].peRed == defpal[i].peRed && + entries[i].peGreen == defpal[i].peGreen && + entries[i].peBlue == defpal[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[i].peRed, defpal[i].peGreen, defpal[i].peBlue ); + } + for (i = 10; i < 246; ++i) + { + ok( !entries[i].peRed && + !entries[i].peGreen && + !entries[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of 0,0,0\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags); + } + for (i = 246; i < 256; i++) + { + int idx = i - 246 + 10; + ok( entries[i].peRed == defpal[idx].peRed && + entries[i].peGreen == defpal[idx].peGreen && + entries[i].peBlue == defpal[idx].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue ); + } + + memset( entries, 0x55, sizeof(entries) ); + count = GetSystemPaletteEntries( hdc, 0, 10, entries ); + ok( count == 0, "wrong size %u\n", count); + for (i = 0; i < 10; i++) + { + ok( entries[i].peRed == defpal[i].peRed && + entries[i].peGreen == defpal[i].peGreen && + entries[i].peBlue == defpal[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[i].peRed, defpal[i].peGreen, defpal[i].peBlue ); + } + + memset( entries, 0x55, sizeof(entries) ); + count = GetSystemPaletteEntries( hdc, 10, 246, entries ); + ok( count == 0, "wrong size %u\n", count); + for (i = 0; i < 236; ++i) + { + ok( !entries[i].peRed && + !entries[i].peGreen && + !entries[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of 0,0,0\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags); + } + for (i = 236; i < 246; i++) + { + int idx = i - 236 + 10; + ok( entries[i].peRed == defpal[idx].peRed && + entries[i].peGreen == defpal[idx].peGreen && + entries[i].peBlue == defpal[idx].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue ); + } + + memset( entries, 0x55, sizeof(entries) ); + count = GetSystemPaletteEntries( hdc, 246, 10, entries ); + ok( count == 0, "wrong size %u\n", count); + for (i = 0; i < 10; i++) + { + int idx = i + 10; + ok( entries[i].peRed == defpal[idx].peRed && + entries[i].peGreen == defpal[idx].peGreen && + entries[i].peBlue == defpal[idx].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue ); + } +} + +static void test_system_palette_entries(void) +{ + HDC hdc; + HDC metafile_dc; + HMETAFILE metafile; + hdc = GetDC(0); if (!(GetDeviceCaps( hdc, RASTERCAPS ) & RC_PALETTE)) { - memset( defpal, 0xaa, sizeof(defpal) ); - count = GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, 20, defpal ); - ok( count == 20, "wrong size %u\n", count ); - - memset( entries, 0x55, sizeof(entries) ); - count = GetSystemPaletteEntries( hdc, 0, 256, entries ); - ok( count == 0, "wrong size %u\n", count); - for (i = 0; i < 10; i++) - { - ok( entries[i].peRed == defpal[i].peRed && - entries[i].peGreen == defpal[i].peGreen && - entries[i].peBlue == defpal[i].peBlue && - !entries[i].peFlags, - "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, - entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, - defpal[i].peRed, defpal[i].peGreen, defpal[i].peBlue ); - } - for (i = 10; i < 246; ++i) - { - ok( !entries[i].peRed && - !entries[i].peGreen && - !entries[i].peBlue && - !entries[i].peFlags, - "%u: wrong color %02x,%02x,%02x,%02x instead of 0,0,0\n", i, - entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags); - } - for (i = 246; i < 256; i++) - { - int idx = i - 246 + 10; - ok( entries[i].peRed == defpal[idx].peRed && - entries[i].peGreen == defpal[idx].peGreen && - entries[i].peBlue == defpal[idx].peBlue && - !entries[i].peFlags, - "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, - entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, - defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue ); - } - - memset( entries, 0x55, sizeof(entries) ); - count = GetSystemPaletteEntries( hdc, 0, 10, entries ); - ok( count == 0, "wrong size %u\n", count); - for (i = 0; i < 10; i++) - { - ok( entries[i].peRed == defpal[i].peRed && - entries[i].peGreen == defpal[i].peGreen && - entries[i].peBlue == defpal[i].peBlue && - !entries[i].peFlags, - "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, - entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, - defpal[i].peRed, defpal[i].peGreen, defpal[i].peBlue ); - } - - memset( entries, 0x55, sizeof(entries) ); - count = GetSystemPaletteEntries( hdc, 10, 246, entries ); - ok( count == 0, "wrong size %u\n", count); - for (i = 0; i < 236; ++i) - { - ok( !entries[i].peRed && - !entries[i].peGreen && - !entries[i].peBlue && - !entries[i].peFlags, - "%u: wrong color %02x,%02x,%02x,%02x instead of 0,0,0\n", i, - entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags); - } - for (i = 236; i < 246; i++) - { - int idx = i - 236 + 10; - ok( entries[i].peRed == defpal[idx].peRed && - entries[i].peGreen == defpal[idx].peGreen && - entries[i].peBlue == defpal[idx].peBlue && - !entries[i].peFlags, - "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, - entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, - defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue ); - } - - memset( entries, 0x55, sizeof(entries) ); - count = GetSystemPaletteEntries( hdc, 246, 10, entries ); - ok( count == 0, "wrong size %u\n", count); - for (i = 0; i < 10; i++) - { - int idx = i + 10; - ok( entries[i].peRed == defpal[idx].peRed && - entries[i].peGreen == defpal[idx].peGreen && - entries[i].peBlue == defpal[idx].peBlue && - !entries[i].peFlags, - "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, - entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, - defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue ); - } - + check_system_palette_entries(hdc); } else { @@ -300,6 +307,13 @@ } ReleaseDC( 0, hdc ); + + metafile_dc = CreateMetaFileA(NULL); + + check_system_palette_entries(metafile_dc); + + metafile = CloseMetaFile(metafile_dc); + DeleteMetaFile(metafile); } START_TEST(palette)

1 0

[akhaldi] 70128: [CMD_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: akhaldi Date: Thu Nov 26 23:09:58 2015 New Revision: 70128 URL: http://svn.reactos.org/svn/reactos?rev=70128&view=rev Log: [CMD_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/cmd/batch.c trunk/rostests/winetests/cmd/test_builtins.cmd trunk/rostests/winetests/cmd/test_builtins.cmd.exp Modified: trunk/rostests/winetests/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/batch.c?rev… ============================================================================== --- trunk/rostests/winetests/cmd/batch.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/batch.c [iso-8859-1] Thu Nov 26 23:09:58 2015 @@ -321,13 +321,14 @@ /* If we rewind to the beginning of the line, don't increment line number */ line--; } - else if (!is_exp_resync || (is_exp_resync && !err)) + else if (!is_exp_resync || !err) { exp_ptr = exp_nl+1; if(exp_nl+1 < exp_data+exp_size && exp_nl[0] == '\r' && exp_nl[1] == '\n') exp_ptr++; } - if (!is_out_resync || (is_out_resync && !err)) + + if (!is_out_resync || !err) { out_ptr = out_nl+1; if(out_nl+1 < out_data+out_size && out_nl[0] == '\r' && out_nl[1] == '\n') Modified: trunk/rostests/winetests/cmd/test_builtins.cmd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_builti… ============================================================================== --- trunk/rostests/winetests/cmd/test_builtins.cmd [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/test_builtins.cmd [iso-8859-1] Thu Nov 26 23:09:58 2015 @@ -15,6 +15,10 @@ echo : echo:word echo :word +echo/ +echo / +echo/word +echo /word echo off now echo word@space@ echo word@space@@space@ @@ -47,6 +51,10 @@ echo : echo:word echo :word +echo/ +echo / +echo/word +echo /word echo on again echo word@space@ echo word@space@@space@ @@ -667,7 +675,45 @@ ) else ( echo parameter detection seems to be broken ) - +SET elseIF=0 +if 1 == 1 ( + SET /a elseIF=%elseIF%+1 +) else if 1 == 1 ( + SET /a elseIF=%elseIF%+2 +) else ( + SET /a elseIF=%elseIF%+2 +) +if %elseIF% == 1 ( + echo else if seems to work +) else ( + echo else if seems to be broken +) +SET elseIF=0 +if 1 == 2 ( + SET /a elseIF=%elseIF%+2 +) else if 1 == 1 ( + SET /a elseIF=%elseIF%+1 +) else ( + SET /a elseIF=%elseIF%+2 +) +if %elseIF% == 1 ( + echo else if seems to work +) else ( + echo else if seems to be broken +) +SET elseIF=0 +if 1 == 2 ( + SET /a elseIF=%elseIF%+2 +) else if 1 == 2 ( + SET /a elseIF=%elseIF%+2 +) else ( + SET /a elseIF=%elseIF%+1 +) +if %elseIF% == 1 ( + echo else if seems to work +) else ( + echo else if seems to be broken +) echo --- case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity Modified: trunk/rostests/winetests/cmd/test_builtins.cmd.exp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_builti… ============================================================================== --- trunk/rostests/winetests/cmd/test_builtins.cmd.exp [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/test_builtins.cmd.exp [iso-8859-1] Thu Nov 26 23:09:58 2015 @@ -41,6 +41,18 @@ @pwd@>echo :word@space@ :word + +@pwd@>echo/ + + +@pwd@>echo /@space@ +/ + +@pwd@>echo/word +word + +@pwd@>echo /word@space@ +/word @pwd@>echo off now@space@ off now @@ -93,6 +105,10 @@ : word :word + +/ +word +/word on again word@space@ word@space@@space@ @@ -438,6 +454,9 @@ if seems to work else seems to work if seems not to detect /c as parameter +else if seems to work +else if seems to work +else if seems to work --- case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work

1 0

[akhaldi] 70127: [PSDK] Update wincrypt.h. CORE-10536
by akhaldi＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: akhaldi Date: Thu Nov 26 22:58:04 2015 New Revision: 70127 URL: http://svn.reactos.org/svn/reactos?rev=70127&view=rev Log: [PSDK] Update wincrypt.h. CORE-10536 Modified: trunk/reactos/include/psdk/wincrypt.h Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re… ============================================================================== --- trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] Thu Nov 26 22:58:04 2015 @@ -1719,6 +1719,9 @@ #define ALG_SID_AES_192 15 #define ALG_SID_AES_256 16 #define ALG_SID_AES 17 +/* Fortezza */ +#define ALG_SID_SKIPJACK 10 +#define ALG_SID_TEK 11 /* Diffie-Hellman SIDs */ #define ALG_SID_DH_SANDF 1 #define ALG_SID_DH_EPHEM 2 @@ -1756,6 +1759,8 @@ #define ALG_SID_SCHANNEL_ENC_KEY 7 #define ALG_SID_EXAMPLE 80 +#define ALG_SID_ECMQV 1 + /* Algorithm Definitions */ #define CALG_MD2 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD2) #define CALG_MD4 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD4) @@ -1775,6 +1780,9 @@ #define CALG_NO_SIGN (ALG_CLASS_SIGNATURE | ALG_TYPE_ANY | ALG_SID_ANY) #define CALG_DH_SF (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_DH_SANDF) #define CALG_DH_EPHEM (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_DH_EPHEM) +#define CALG_AGREEDKEY_ANY (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_AGREED_KEY_ANY) +#define CALG_KEA_KEYX (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_KEA) +#define CALG_HUGHES_MD5 (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_ANY | ALG_SID_MD5) #define CALG_RSA_KEYX (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_RSA | ALG_SID_RSA_ANY) #define CALG_ECDH (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_ECDH) #define CALG_ECDH_EPHEM (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH_EPHEM | ALG_SID_ECDH_EPHEM) /* FIXME: find the original TYPE and SID names */ @@ -1783,6 +1791,7 @@ #define CALG_RC2 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_RC2) #define CALG_3DES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_3DES) #define CALG_3DES_112 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_3DES_112) +#define CALG_DESX (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DESX) #define CALG_AES_128 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_128) #define CALG_AES_192 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_192) #define CALG_AES_256 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_256) @@ -1790,6 +1799,9 @@ #define CALG_RC4 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_RC4) #define CALG_SEAL (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_SEAL) #define CALG_RC5 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_RC5) +#define CALG_SKIPJACK (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_SKIPJACK) +#define CALG_TEK (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_TEK) +#define CALG_CYLINK_MEK (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_CYLINK_MEK) #define CALG_SSL3_MASTER (ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL | ALG_SID_SSL3_MASTER) #define CALG_SCHANNEL_MASTER_HASH (ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL | ALG_SID_SCHANNEL_MASTER_HASH) #define CALG_SCHANNEL_MAC_KEY (ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL | ALG_SID_SCHANNEL_MAC_KEY)

1 0

[akhaldi] 70126: [STRMBASE] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: akhaldi Date: Thu Nov 26 22:53:27 2015 New Revision: 70126 URL: http://svn.reactos.org/svn/reactos?rev=70126&view=rev Log: [STRMBASE] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/lib/3rdparty/strmbase/CMakeLists.txt trunk/reactos/lib/3rdparty/strmbase/audio.c trunk/reactos/lib/3rdparty/strmbase/dispatch.c trunk/reactos/lib/3rdparty/strmbase/dllfunc.c trunk/reactos/lib/3rdparty/strmbase/filter.c trunk/reactos/lib/3rdparty/strmbase/outputqueue.c trunk/reactos/lib/3rdparty/strmbase/pin.c trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c trunk/reactos/lib/3rdparty/strmbase/renderer.c trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h trunk/reactos/lib/3rdparty/strmbase/transform.c trunk/reactos/lib/3rdparty/strmbase/video.c trunk/reactos/lib/3rdparty/strmbase/window.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/3rdparty/strmbase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/CMak… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/CMakeLists.txt [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -1,3 +1,6 @@ + +remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) +add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) Modified: trunk/reactos/lib/3rdparty/strmbase/audio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/audi… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/audio.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/audio.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -62,8 +62,8 @@ HRESULT WINAPI BasicAudioImpl_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) { BasicAudio *This = impl_from_IBasicAudio(iface); - HRESULT hr = S_OK; ITypeInfo *pTypeInfo; + HRESULT hr; hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); if (SUCCEEDED(hr)) Modified: trunk/reactos/lib/3rdparty/strmbase/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/disp… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/dispatch.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -24,16 +24,14 @@ HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid) { - HRESULT hr = E_FAIL; ITypeLib *pTypeLib; + HRESULT hr; This->pTypeInfo = NULL; hr = LoadRegTypeLib(&LIBID_QuartzTypeLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &pTypeLib); if (SUCCEEDED(hr)) { hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, riid, &This->pTypeInfo); - - if (pTypeLib) ITypeLib_Release(pTypeLib); } return hr; Modified: trunk/reactos/lib/3rdparty/strmbase/dllfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/dllf… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/dllfunc.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/dllfunc.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -36,7 +36,6 @@ /* * defines and constants */ -#define MAX_KEY_LEN 260 static const WCHAR clsid_keyname[] = {'C','L','S','I','D',0 }; static const WCHAR ips32_keyname[] = {'I','n','P','r','o','c','S','e','r','v','e','r','3','2',0}; @@ -110,7 +109,7 @@ pList->m_Name, szFileName, ips32_keyname, tmodel_both); else - hr = SHDeleteKeyW(hkey, szCLSID); + hr = RegDeleteTreeW(hkey, szCLSID); } } RegCloseKey(hkey); Modified: trunk/reactos/lib/3rdparty/strmbase/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/filt… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/filter.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/filter.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -149,7 +149,6 @@ HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName ) { - HRESULT hr = S_OK; BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p, %s)\n", This, pGraph, debugstr_w(pName)); @@ -164,7 +163,7 @@ } LeaveCriticalSection(&This->csFilter); - return hr; + return S_OK; } HRESULT WINAPI BaseFilterImpl_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo) Modified: trunk/reactos/lib/3rdparty/strmbase/outputqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/outp… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/outputqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/outputqueue.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -59,7 +59,6 @@ OutputQueue **ppOutputQueue ) { - HRESULT hr = S_OK; BOOL threaded = FALSE; DWORD tid; @@ -92,7 +91,7 @@ EnterCriticalSection(&This->csQueue); if (bAuto && pInputPin->pMemInputPin) - threaded = IMemInputPin_ReceiveCanBlock(pInputPin->pMemInputPin); + threaded = IMemInputPin_ReceiveCanBlock(pInputPin->pMemInputPin) == S_OK; else threaded = bQueue; @@ -107,7 +106,7 @@ } LeaveCriticalSection(&This->csQueue); - return hr; + return S_OK; } HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue) Modified: trunk/reactos/lib/3rdparty/strmbase/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/pin.… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/pin.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/pin.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -565,9 +565,9 @@ /* replaces OutputPin_SendSample */ HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin *This, IMediaSample * pSample) { - HRESULT hr = S_OK; IMemInputPin * pMemConnected = NULL; PIN_INFO pinInfo; + HRESULT hr; EnterCriticalSection(This->pin.pCritSec); { @@ -605,7 +605,7 @@ /* replaces OutputPin_CommitAllocator */ HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin *This) { - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p)->()\n", This); @@ -625,7 +625,7 @@ /* replaces OutputPin_DecommitAllocator */ HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This) { - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p)->()\n", This); @@ -865,12 +865,9 @@ TRACE("(%p)->() Release from %d\n", iface, refCount + 1); if (!refCount) - { BaseInputPin_Destroy(This); - return 0; - } - else - return refCount; + + return refCount; } HRESULT WINAPI BaseInputPinImpl_Connect(IPin * iface, IPin * pConnector, const AM_MEDIA_TYPE * pmt) Modified: trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/qual… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -38,9 +38,9 @@ return S_OK; } -HRESULT QualityControlImpl_Destroy(QualityControlImpl *This) +void QualityControlImpl_Destroy(QualityControlImpl *This) { - return HeapFree(GetProcessHeap(),0,This); + HeapFree(GetProcessHeap(),0,This); } HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { Modified: trunk/reactos/lib/3rdparty/strmbase/renderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/rend… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/renderer.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/renderer.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -50,7 +50,7 @@ { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *renderer = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p/%p)->(%p, %p)\n", This, renderer, pReceivePin, pmt); @@ -89,7 +89,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) { - HRESULT hr = S_OK; + HRESULT hr; BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *pFilter = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); @@ -116,7 +116,7 @@ { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *pFilter = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p/%p)->()\n", This, iface); @@ -141,7 +141,7 @@ { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *pFilter = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p/%p)->()\n", This, pFilter); Modified: trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/strm… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -63,7 +63,7 @@ } QualityControlImpl; HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv); -HRESULT QualityControlImpl_Destroy(QualityControlImpl *This); +void QualityControlImpl_Destroy(QualityControlImpl *This); HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv); ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface); ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface); Modified: trunk/reactos/lib/3rdparty/strmbase/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/tran… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -75,7 +75,7 @@ static HRESULT WINAPI TransformFilter_Input_Receive(BaseInputPin *This, IMediaSample *pInSample) { - HRESULT hr = S_FALSE; + HRESULT hr; TransformFilter * pTransform; TRACE("%p\n", This); pTransform = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); Modified: trunk/reactos/lib/3rdparty/strmbase/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/vide… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/video.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/video.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -67,8 +67,8 @@ HRESULT WINAPI BaseControlVideoImpl_Invoke(IBasicVideo *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) { BaseControlVideo *This = impl_from_IBasicVideo(iface); - HRESULT hr = S_OK; ITypeInfo *pTypeInfo; + HRESULT hr; hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); if (SUCCEEDED(hr)) Modified: trunk/reactos/lib/3rdparty/strmbase/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/wind… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/window.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/window.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -240,8 +240,8 @@ HRESULT WINAPI BaseControlWindowImpl_Invoke(IVideoWindow *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) { BaseControlWindow* This = impl_from_IVideoWindow(iface); - HRESULT hr = S_OK; ITypeInfo *pTypeInfo; + HRESULT hr; hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); if (SUCCEEDED(hr)) 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] Thu Nov 26 22:53:27 2015 @@ -250,7 +250,7 @@ from Winehq CVS. If you are looking to update something in these files check Wine current sources first as it may already be fixed. -reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.7.47 +reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.7.55 reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.37 reactos/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55

1 0

[akhaldi] 70125: [MSIEXEC] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 26 Nov '15

26 Nov '15

Author: akhaldi Date: Thu Nov 26 22:47:29 2015 New Revision: 70125 URL: http://svn.reactos.org/svn/reactos?rev=70125&view=rev Log: [MSIEXEC] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/base/system/msiexec/msiexec.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/system/msiexec/msiexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== --- trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] Thu Nov 26 22:47:29 2015 @@ -882,10 +882,6 @@ { InstallUILevel = INSTALLUILEVEL_NONE; } - else if(msi_strequal(argvW[i]+2, "b")) - { - InstallUILevel = INSTALLUILEVEL_BASIC; - } else if(msi_strequal(argvW[i]+2, "r")) { InstallUILevel = INSTALLUILEVEL_REDUCED; @@ -898,28 +894,25 @@ { InstallUILevel = INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG; } - else if(msi_strequal(argvW[i]+2, "b+")) - { - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; - } - else if(msi_strequal(argvW[i]+2, "b-")) - { - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY; - } - else if(msi_strequal(argvW[i]+2, "b+!")) - { - WINE_FIXME("Unhandled modifier: !\n"); - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG|INSTALLUILEVEL_HIDECANCEL; - } - else if(msi_strequal(argvW[i]+2, "b-!")) - { - WINE_FIXME("Unhandled modifier: !\n"); - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL; - } - else if(msi_strequal(argvW[i]+2, "b!")) - { - WINE_FIXME("Unhandled modifier: !\n"); - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_HIDECANCEL; + else if(msi_strprefix(argvW[i]+2, "b")) + { + const WCHAR *ptr = argvW[i] + 3; + + InstallUILevel = INSTALLUILEVEL_BASIC; + + while (*ptr) + { + if (msi_strprefix(ptr, "+")) + InstallUILevel |= INSTALLUILEVEL_ENDDIALOG; + if (msi_strprefix(ptr, "-")) + InstallUILevel |= INSTALLUILEVEL_PROGRESSONLY; + if (msi_strprefix(ptr, "!")) + { + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel |= INSTALLUILEVEL_HIDECANCEL; + } + ptr++; + } } else { @@ -927,6 +920,14 @@ wine_dbgstr_w(argvW[i]+2)); } } + else if(msi_option_equal(argvW[i], "passive")) + { + static const WCHAR rebootpromptW[] = + {'R','E','B','O','O','T','P','R','O','M','P','T','=','"','S','"',0}; + + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL; + StringListAppend(&property_list, rebootpromptW); + } else if(msi_option_equal(argvW[i], "y")) { FunctionDllRegisterServer = TRUE; 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] Thu Nov 26 22:47:29 2015 @@ -243,7 +243,7 @@ reactos/base/applications/wordpad # Synced to WineStaging-1.7.55 reactos/base/services/rpcss # Synced to WineStaging-1.7.55 reactos/base/system/expand # Synced to WineStaging-1.7.47 -reactos/base/system/msiexec # Synced to WineStaging-1.7.47 +reactos/base/system/msiexec # Synced to WineStaging-1.7.55 reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2015