April 2016 - Wine-commits - list.winehq.org

Nikolay Sivov : t2embed: Implement TTIsEmbeddingEnabledForFacename().
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 847da79cf80b565a79933d92e0218b230b933a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=847da79cf80b565a79933d92e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 2 12:19:17 2016 +0300 t2embed: Implement TTIsEmbeddingEnabledForFacename(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/Makefile.in | 2 +- dlls/t2embed/main.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ dlls/t2embed/t2embed.spec | 4 ++-- dlls/t2embed/tests/t2embed.c | 23 ++++++++++++++++++++++ include/t2embapi.h | 3 +++ 5 files changed, 75 insertions(+), 3 deletions(-) diff --git a/dlls/t2embed/Makefile.in b/dlls/t2embed/Makefile.in index e585fe2..baa4757 100644 --- a/dlls/t2embed/Makefile.in +++ b/dlls/t2embed/Makefile.in @@ -1,6 +1,6 @@ MODULE = t2embed.dll IMPORTLIB = t2embed -IMPORTS = gdi32 +IMPORTS = gdi32 advapi32 C_SRCS = \ main.c diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 2794f0f..9c807c7 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winreg.h" #include "t2embapi.h" #include "wine/debug.h" @@ -100,6 +101,51 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) 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); diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec index e3be15c..5375fee 100644 --- a/dlls/t2embed/t2embed.spec +++ b/dlls/t2embed/t2embed.spec @@ -6,7 +6,7 @@ @ stub TTGetEmbeddedFontInfo @ stdcall TTGetEmbeddingType(long ptr) @ stdcall TTIsEmbeddingEnabled(long ptr) -@ stub TTIsEmbeddingEnabledForFacename +@ stdcall TTIsEmbeddingEnabledForFacename(str ptr) @ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) @ stub TTRunValidationTests @ stub _TTCharToUnicode(a)24 @@ -17,7 +17,7 @@ @ stub _TTGetEmbeddedFontInfo(a)28 @ stdcall _TTGetEmbeddingType(a)8(long ptr) TTGetEmbeddingType @ stdcall _TTIsEmbeddingEnabled(a)8(long ptr) TTIsEmbeddingEnabled -@ stub _TTIsEmbeddingEnabledForFacename(a)8 +@ stdcall _TTIsEmbeddingEnabledForFacename(a)8(str ptr) TTIsEmbeddingEnabledForFacename @ stdcall _TTLoadEmbeddedFont(a)40(ptr long ptr long ptr ptr ptr wstr str ptr) TTLoadEmbeddedFont @ stub _TTRunValidationTests(a)8 @ stub TTEmbedFontEx diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index cdc2f49..6efb231 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -76,7 +76,30 @@ static void test_TTGetEmbeddingType(void) DeleteDC(hdc); } +static void test_TTIsEmbeddingEnabledForFacename(void) +{ + BOOL status; + LONG ret; + + ret = TTIsEmbeddingEnabledForFacename(NULL, NULL); + ok(ret == E_FACENAMEINVALID, "got %#x\n", ret); + + status = 123; + ret = TTIsEmbeddingEnabledForFacename(NULL, &status); + ok(ret == E_FACENAMEINVALID, "got %#x\n", ret); + ok(status == 123, "got %d\n", status); + + ret = TTIsEmbeddingEnabledForFacename("Arial", NULL); + ok(ret == E_PBENABLEDINVALID, "got %#x\n", ret); + + status = 123; + ret = TTIsEmbeddingEnabledForFacename("Arial", &status); + ok(ret == E_NONE, "got %#x\n", ret); + ok(status != 123, "got %d\n", status); +} + START_TEST(t2embed) { test_TTGetEmbeddingType(); + test_TTIsEmbeddingEnabledForFacename(); } diff --git a/include/t2embapi.h b/include/t2embapi.h index 60fda64..09067bd 100644 --- a/include/t2embapi.h +++ b/include/t2embapi.h @@ -42,7 +42,9 @@ extern "C" { #define E_HDCINVALID __MSABI_LONG(0x0006) #define E_NOTATRUETYPEFONT __MSABI_LONG(0x000a) #define E_ERRORACCESSINGFONTDATA __MSABI_LONG(0x000c) +#define E_FACENAMEINVALID __MSABI_LONG(0x0113) #define E_PERMISSIONSINVALID __MSABI_LONG(0x0117) +#define E_PBENABLEDINVALID __MSABI_LONG(0x0118) typedef ULONG (WINAPIV * READEMBEDPROC)(void*,void*,ULONG); typedef ULONG (WINAPIV * WRITEEMBEDPROC)(void*,void*,ULONG); @@ -72,6 +74,7 @@ LONG WINAPI TTDeleteEmbeddedFont(HANDLE,ULONG,ULONG*); #define EMBED_NOEMBEDDING 4 LONG WINAPI TTGetEmbeddingType(HDC, ULONG*); +LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled); #ifdef __cplusplus }

1 0

Nikolay Sivov : t2embed: Implement TTIsEmbeddingEnabled().
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 0ea8c1d62e4993567e451ddcc25f4f0958e17266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea8c1d62e4993567e451ddcc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 2 12:19:18 2016 +0300 t2embed: Implement TTIsEmbeddingEnabled(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/main.c | 24 ++++++++++++++++++++--- dlls/t2embed/tests/t2embed.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ include/t2embapi.h | 3 +++ 3 files changed, 69 insertions(+), 3 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 9c807c7..9fae0a8 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -148,9 +148,27 @@ LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) 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) diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index 6efb231..79102a6 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -98,8 +98,53 @@ static void test_TTIsEmbeddingEnabledForFacename(void) ok(status != 123, "got %d\n", status); } +static void test_TTIsEmbeddingEnabled(void) +{ + HFONT old_font, hfont; + LONG ret, status; + LOGFONTA logfont; + HDC hdc; + + ret = TTIsEmbeddingEnabled(NULL, NULL); + ok(ret == E_HDCINVALID, "got %#x\n", ret); + + status = 123; + ret = TTIsEmbeddingEnabled(NULL, &status); + ok(ret == E_HDCINVALID, "got %#x\n", ret); + ok(status == 123, "got %d\n", status); + + hdc = CreateCompatibleDC(0); + + ret = TTIsEmbeddingEnabled(hdc, NULL); + ok(ret == E_ERRORACCESSINGFACENAME, "got %#x\n", ret); + + status = 123; + ret = TTIsEmbeddingEnabled(hdc, &status); + ok(ret == E_ERRORACCESSINGFACENAME, "got %#x\n", ret); + ok(status == 123, "got %u\n", status); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWeight = FW_NORMAL; + strcpy(logfont.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&logfont); + ok(hfont != NULL, "got %p\n", hfont); + + old_font = SelectObject(hdc, hfont); + + status = 123; + ret = TTIsEmbeddingEnabled(hdc, &status); + ok(ret == E_NONE, "got %#x\n", ret); + ok(status != 123, "got %u\n", status); + + SelectObject(hdc, old_font); + DeleteObject(hfont); + DeleteDC(hdc); +} + START_TEST(t2embed) { test_TTGetEmbeddingType(); test_TTIsEmbeddingEnabledForFacename(); + test_TTIsEmbeddingEnabled(); } diff --git a/include/t2embapi.h b/include/t2embapi.h index 09067bd..38d6900 100644 --- a/include/t2embapi.h +++ b/include/t2embapi.h @@ -40,8 +40,10 @@ extern "C" { #define E_NONE __MSABI_LONG(0x0000) #define E_API_NOTIMPL __MSABI_LONG(0x0001) #define E_HDCINVALID __MSABI_LONG(0x0006) +#define E_NOFREEMEMORY __MSABI_LONG(0x0007) #define E_NOTATRUETYPEFONT __MSABI_LONG(0x000a) #define E_ERRORACCESSINGFONTDATA __MSABI_LONG(0x000c) +#define E_ERRORACCESSINGFACENAME __MSABI_LONG(0x000d) #define E_FACENAMEINVALID __MSABI_LONG(0x0113) #define E_PERMISSIONSINVALID __MSABI_LONG(0x0117) #define E_PBENABLEDINVALID __MSABI_LONG(0x0118) @@ -75,6 +77,7 @@ LONG WINAPI TTDeleteEmbeddedFont(HANDLE,ULONG,ULONG*); LONG WINAPI TTGetEmbeddingType(HDC, ULONG*); LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled); +LONG WINAPI TTIsEmbeddingEnabled(HDC hdc, BOOL *enabled); #ifdef __cplusplus }

1 0

Nikolay Sivov : msxml3/mxwriter: Implement notation declaration output.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: ea0d29184c3ac433324e5fc102b00fdae4e63576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea0d29184c3ac433324e5fc10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 3 11:50:24 2016 +0300 msxml3/mxwriter: Implement notation declaration output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 51 +++++++++++++++++++++++++++++++++---------- dlls/msxml3/tests/saxreader.c | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index c1215bf..585abac 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -46,6 +46,8 @@ static const WCHAR quotW[] = {'\"'}; static const WCHAR closetagW[] = {'>','\r','\n'}; static const WCHAR crlfW[] = {'\r','\n'}; static const WCHAR entityW[] = {'<','!','E','N','T','I','T','Y',' '}; +static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; +static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '}; /* should be ordered as encoding names are sorted */ typedef enum @@ -1532,8 +1534,6 @@ static HRESULT WINAPI SAXLexicalHandler_startDTD(ISAXLexicalHandler *iface, if (publicId) { - static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; - write_output_buffer(This, publicW, sizeof(publicW)/sizeof(WCHAR)); write_output_buffer_quoted(This, publicId, publicId_len); @@ -1549,8 +1549,6 @@ static HRESULT WINAPI SAXLexicalHandler_startDTD(ISAXLexicalHandler *iface, } else if (systemId) { - static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '}; - write_output_buffer(This, systemW, sizeof(systemW)/sizeof(WCHAR)); write_output_buffer_quoted(This, systemId, systemId_len); if (*systemId) @@ -1763,8 +1761,6 @@ static HRESULT WINAPI SAXDeclHandler_externalEntityDecl(ISAXDeclHandler *iface, const WCHAR *name, int n_name, const WCHAR *publicId, int n_publicId, const WCHAR *systemId, int n_systemId) { - static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; - static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '}; mxwriter *This = impl_from_ISAXDeclHandler( iface ); TRACE("(%p)->(%s:%d %s:%d %s:%d)\n", This, debugstr_wn(name, n_name), n_name, @@ -2290,14 +2286,45 @@ static ULONG WINAPI SAXDTDHandler_Release(ISAXDTDHandler *iface) } static HRESULT WINAPI SAXDTDHandler_notationDecl(ISAXDTDHandler *iface, - const WCHAR *name, INT nname, - const WCHAR *publicid, INT npublicid, - const WCHAR *systemid, INT nsystemid) + const WCHAR *name, INT n_name, + const WCHAR *publicid, INT n_publicid, + const WCHAR *systemid, INT n_systemid) { + static const WCHAR notationW[] = {'<','!','N','O','T','A','T','I','O','N',' '}; mxwriter *This = impl_from_ISAXDTDHandler( iface ); - FIXME("(%p)->(%s:%d, %s:%d, %s:%d): stub\n", This, debugstr_wn(name, nname), nname, - debugstr_wn(publicid, npublicid), npublicid, debugstr_wn(systemid, nsystemid), nsystemid); - return E_NOTIMPL; + + TRACE("(%p)->(%s:%d, %s:%d, %s:%d)\n", This, debugstr_wn(name, n_name), n_name, + debugstr_wn(publicid, n_publicid), n_publicid, debugstr_wn(systemid, n_systemid), n_systemid); + + if (!name || !n_name) + return E_INVALIDARG; + + write_output_buffer(This, notationW, sizeof(notationW)/sizeof(WCHAR)); + write_output_buffer(This, name, n_name); + + if (!publicid && !systemid) + return E_INVALIDARG; + + write_output_buffer(This, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + if (publicid) + { + write_output_buffer(This, publicW, sizeof(publicW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, publicid, n_publicid); + if (systemid) + { + write_output_buffer(This, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, systemid, n_systemid); + } + } + else + { + write_output_buffer(This, systemW, sizeof(systemW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, systemid, n_systemid); + } + + write_output_buffer(This, closetagW, sizeof(closetagW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXDTDHandler_unparsedEntityDecl(ISAXDTDHandler *iface, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 27a6f99..3a93ea7 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4789,6 +4789,7 @@ static void test_mxwriter_dtd(void) ISAXLexicalHandler *lexical; IVBSAXDeclHandler *vbdecl; ISAXDeclHandler *decl; + ISAXDTDHandler *dtd; IMXWriter *writer; VARIANT dest; HRESULT hr; @@ -4987,6 +4988,9 @@ static void test_mxwriter_dtd(void) hr = IVBSAXDeclHandler_externalEntityDecl(vbdecl, NULL, NULL, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), 0, NULL, 0, NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), -1, NULL, 0, NULL, 0); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -5012,6 +5016,43 @@ static void test_mxwriter_dtd(void) VariantClear(&dest); + /* notation declaration */ + hr = IMXWriter_QueryInterface(writer, &IID_ISAXDTDHandler, (void**)&dtd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, NULL, 0, NULL, 0, NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, _bstr_("name"), strlen("name"), NULL, 0, NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, _bstr_("name"), strlen("name"), _bstr_("pubid"), strlen("pubid"), NULL, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, _bstr_("name"), strlen("name"), _bstr_("pubid"), strlen("pubid"), _bstr_("sysid"), strlen("sysid")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, _bstr_("name"), strlen("name"), NULL, 0, _bstr_("sysid"), strlen("sysid")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_( + "<!NOTATION name" + "<!NOTATION name PUBLIC \"pubid\">\r\n" + "<!NOTATION name PUBLIC \"pubid\" \"sysid\">\r\n" + "<!NOTATION name SYSTEM \"sysid\">\r\n"), + V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + + VariantClear(&dest); + + ISAXDTDHandler_Release(dtd); + ISAXContentHandler_Release(content); ISAXLexicalHandler_Release(lexical); IVBSAXLexicalHandler_Release(vblexical);

1 0

Nikolay Sivov : msxml3/tests: Remove duplicated test check.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 3e96f98cdab512e0e4cdabb2dcddf5ae75a0ff84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e96f98cdab512e0e4cdabb2d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 3 23:07:40 2016 +0300 msxml3/tests: Remove duplicated test check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/saxreader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 3a93ea7..a2dc3fb 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2927,7 +2927,6 @@ static void test_mxwriter_handlers(void) ok(hr == S_OK, "%s, expected S_OK, got %08x\n", wine_dbgstr_guid(riids[i]), hr); ok(writer2 == writer, "got %p, expected %p\n", writer2, writer); EXPECT_REF(writer, 3); - EXPECT_REF(writer2, 3); IMXWriter_Release(writer2); IUnknown_Release(handler); }

1 0

Austin English : sfc_os: Add SRSetRestorePointA/W stubs.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 89eb67dbc8c6a7dc93fd76e2ad3ac1e4266f1f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89eb67dbc8c6a7dc93fd76e2a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 1 18:36:45 2016 -0500 sfc_os: Add SRSetRestorePointA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sfc/sfc.spec | 6 +++--- dlls/sfc_os/sfc_os.c | 15 +++++++++++++++ dlls/sfc_os/sfc_os.spec | 4 ++-- include/srrestoreptapi.h | 21 ++++++++++++++++++++- tools/make_specfiles | 4 ++++ 5 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/sfc/sfc.spec b/dlls/sfc/sfc.spec index 148f3db..77a8273 100644 --- a/dlls/sfc/sfc.spec +++ b/dlls/sfc/sfc.spec @@ -7,9 +7,9 @@ 7 stub @ # sfc_os.SfcInstallProtectedFiles 8 stub @ # sfc_os.SfpInstallCatalog 9 stub @ # SfpDeleteCatalog -@ stub SRSetRestorePoint -@ stub SRSetRestorePointA -@ stub SRSetRestorePointW +@ stdcall SRSetRestorePoint(ptr ptr) sfc_os.SRSetRestorePointA +@ stdcall SRSetRestorePointA(ptr ptr) sfc_os.SRSetRestorePointA +@ stdcall SRSetRestorePointW(ptr ptr) sfc_os.SRSetRestorePointW @ stdcall SfcGetNextProtectedFile(long ptr) sfc_os.SfcGetNextProtectedFile @ stdcall SfcIsFileProtected(ptr wstr) sfc_os.SfcIsFileProtected @ stdcall SfcIsKeyProtected(long wstr long) sfc_os.SfcIsKeyProtected diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index 9e45762..c124b90 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -25,6 +25,7 @@ #include "winerror.h" #include "winreg.h" #include "sfc.h" +#include "srrestoreptapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(sfc); @@ -138,3 +139,17 @@ DWORD WINAPI SfcConnectToServer(DWORD unknown) FIXME("%x\n", unknown); return 0; } + +BOOL WINAPI SRSetRestorePointA(RESTOREPOINTINFOA *restorepoint, STATEMGRSTATUS *status) +{ + FIXME("%p %p\n", restorepoint, status); + status->nStatus = ERROR_SERVICE_DISABLED; + return FALSE; +} + +BOOL WINAPI SRSetRestorePointW(RESTOREPOINTINFOW *restorepoint, STATEMGRSTATUS *status) +{ + FIXME("%p %p\n", restorepoint, status); + status->nStatus = ERROR_SERVICE_DISABLED; + return FALSE; +} diff --git a/dlls/sfc_os/sfc_os.spec b/dlls/sfc_os/sfc_os.spec index 4c7405d..271043e 100644 --- a/dlls/sfc_os/sfc_os.spec +++ b/dlls/sfc_os/sfc_os.spec @@ -1,8 +1,8 @@ @ stub BeginFileMapEnumeration @ stub CloseFileMapEnumeration @ stub GetNextFileMapContent -@ stub SRSetRestorePointA -@ stub SRSetRestorePointW +@ stdcall SRSetRestorePointA(ptr ptr) +@ stdcall SRSetRestorePointW(ptr ptr) @ stub SfcClose @ stdcall SfcConnectToServer(long) @ stub SfcFileException diff --git a/include/srrestoreptapi.h b/include/srrestoreptapi.h index 6e62934..45a027c 100644 --- a/include/srrestoreptapi.h +++ b/include/srrestoreptapi.h @@ -29,6 +29,7 @@ #define APPLICATION_INSTALL 0 #define MAX_DESC 64 +#define MAX_DESC_W 256 #pragma pack(1) @@ -39,6 +40,21 @@ typedef struct _RESTOREPTINFOA { CHAR szDescription[MAX_DESC]; } RESTOREPOINTINFOA, *PRESTOREPOINTINFOA; +typedef struct _RESTOREPTINFOW { + DWORD dwEventType; + DWORD dwRestorePtType; + INT64 llSequenceNumber; + WCHAR szDescription[MAX_DESC_W]; +} RESTOREPOINTINFOW, *PRESTOREPOINTINFOW; + +typedef struct _RESTOREPTINFOEX { + FILETIME ftCreation; + DWORD dwEventType; + DWORD dwRestorePtType; + DWORD dwRPNum; + WCHAR szDescription[MAX_DESC_W]; +} RESTOREPOINTINFOEX, *PRESTOREPOINTINFOEX; + typedef struct _SMGRSTATUS { DWORD nStatus; INT64 llSequenceNumber; @@ -48,7 +64,10 @@ typedef struct _SMGRSTATUS { extern "C" { #endif -BOOL WINAPI SRSetRestorePointA(PRESTOREPOINTINFOA, PSTATEMGRSTATUS); +BOOL WINAPI SRSetRestorePointA(RESTOREPOINTINFOA *, STATEMGRSTATUS *); +BOOL WINAPI SRSetRestorePointW(RESTOREPOINTINFOW *, STATEMGRSTATUS *); +#define SRSetRestorePoint WINELIB_NAME_AW(SRSetRestorePoint) + DWORD WINAPI SRRemoveRestorePoint(DWORD); #ifdef __cplusplus diff --git a/tools/make_specfiles b/tools/make_specfiles index b0a7b0a..a779628 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -280,6 +280,10 @@ my @dll_groups = "bthprops.cpl", "irprops.cpl", ], + [ + "sfc_os", + "sfc", + ], ); my $update_flags = 0;

1 0

Austin English : ntoskrnl.exe: Add PsRemoveLoadImageNotifyRoutine stub.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: b1c02353dfa793bbd360f94f8319cfb9d1c65fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c02353dfa793bbd360f94f8… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Apr 3 19:56:30 2016 -0500 ntoskrnl.exe: Add PsRemoveLoadImageNotifyRoutine stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3bee2bf..4b07a2e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2148,6 +2148,16 @@ NTSTATUS WINAPI PsRemoveCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE /*********************************************************************** + * PsRemoveLoadImageNotifyRoutine (NTOSKRNL.EXE.@) + */ + NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) + { + FIXME( "stub: %p\n", NotifyRoutine ); + return STATUS_SUCCESS; + } + + +/*********************************************************************** * PsTerminateSystemThread (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS ExitStatus) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 1414c53..c4a0039 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -899,7 +899,7 @@ @ stub PsReferenceImpersonationToken @ stub PsReferencePrimaryToken @ stdcall PsRemoveCreateThreadNotifyRoutine(ptr) -@ stub PsRemoveLoadImageNotifyRoutine +@ stdcall PsRemoveLoadImageNotifyRoutine(ptr) @ stub PsRestoreImpersonation @ stub PsReturnPoolQuota @ stub PsReturnProcessNonPagedPoolQuota

1 0

Austin English : ntoskrnl.exe: Add KeDelayExecutionThread stub.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: c6373260e03dc6a59428db6445f725bfb41ec9ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6373260e03dc6a59428db644… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Apr 3 19:57:36 2016 -0500 ntoskrnl.exe: Add KeDelayExecutionThread stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4b07a2e..c416b0e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2488,3 +2488,12 @@ NTSTATUS WINAPI CmUnRegisterCallback(LARGE_INTEGER cookie) FIXME("(%s): stub\n", wine_dbgstr_longlong(cookie.QuadPart)); return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * KeDelayExecutionThread (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE waitmode, BOOLEAN alertable, PLARGE_INTEGER interval) +{ + FIXME("%u %u %p", waitmode, alertable, interval); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c4a0039..b688a3f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -518,7 +518,7 @@ @ stub KeClearEvent @ stub KeConnectInterrupt @ stub KeDcacheFlushCount -@ stub KeDelayExecutionThread +@ stdcall KeDelayExecutionThread(long long ptr) @ stub KeDeregisterBugCheckCallback @ stub KeDeregisterBugCheckReasonCallback @ stub KeDetachProcess

1 0

Austin English : kernel32: Add GetConsoleAliasExesLengthA/W stubs.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 43637ce9f7b8654934b8bea65cf5de68c182d4f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43637ce9f7b8654934b8bea65… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 31 21:38:36 2016 -0500 kernel32: Add GetConsoleAliasExesLengthA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 14 ++++++++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 57c0b36..60e38bc 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3207,6 +3207,20 @@ DWORD WINAPI GetConsoleAliasesLengthW(LPWSTR unknown) return 0; } +DWORD WINAPI GetConsoleAliasExesLengthA(void) +{ + FIXME(": stub!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +DWORD WINAPI GetConsoleAliasExesLengthW(void) +{ + FIXME(": stub!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + VOID WINAPI ExpungeConsoleCommandHistoryA(LPCSTR unknown) { FIXME(": (%s) stub!\n", debugstr_a(unknown)); diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d606d9b..3452360 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -582,8 +582,8 @@ @ stdcall GetComputerNameW(ptr ptr) @ stub GetConsoleAliasA @ stub GetConsoleAliasExesA -@ stub GetConsoleAliasExesLengthA -@ stub GetConsoleAliasExesLengthW +@ stdcall GetConsoleAliasExesLengthA() +@ stdcall GetConsoleAliasExesLengthW() @ stub GetConsoleAliasExesW @ stdcall GetConsoleAliasW(wstr ptr long wstr) @ stub GetConsoleAliasesA

1 0

Alexandre Julliard : makefiles: Support installing scripts from the tools directory.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 2f956a4e06fd36366fd97aba9ddb4b3b99620cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f956a4e06fd36366fd97aba9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 13:59:54 2016 +0900 makefiles: Support installing scripts from the tools directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 56 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 47efda3..c0cfed0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2140,52 +2140,66 @@ static struct strarray output_install_rules( const struct makefile *make, struct if (!files.count) return uninstall; for (i = 0; i < files.count; i += 2) - if (strchr( "dps", files.str[i + 1][0] )) /* only for files copied from object dir */ - strarray_add_uniq( &targets, files.str[i] ); + { + const char *file = files.str[i]; + switch (*files.str[i + 1]) + { + case 'd': /* data file */ + case 'p': /* program file */ + case 's': /* script */ + strarray_add_uniq( &targets, obj_dir_path( make, file )); + break; + case 't': /* script in tools dir */ + strarray_add_uniq( &targets, tools_dir_path( make, file )); + break; + } + } output( "install %s::", target ); - output_filenames_obj_dir( make, targets ); + output_filenames( targets ); output( "\n" ); install_sh = top_src_dir_path( make, "tools/install-sh" ); for (i = 0; i < files.count; i += 2) { const char *file = files.str[i]; - const char *dest = files.str[i + 1]; + const char *dest = strmake( "$(DESTDIR)%s", files.str[i + 1] + 1 ); - switch (*dest) + switch (*files.str[i + 1]) { case 'd': /* data file */ - output( "\t%s -m 644 $(INSTALL_DATA_FLAGS) %s $(DESTDIR)%s\n", - install_sh, obj_dir_path( make, file ), dest + 1 ); + output( "\t%s -m 644 $(INSTALL_DATA_FLAGS) %s %s\n", + install_sh, obj_dir_path( make, file ), dest ); break; case 'D': /* data file in source dir */ - output( "\t%s -m 644 $(INSTALL_DATA_FLAGS) %s $(DESTDIR)%s\n", - install_sh, src_dir_path( make, file ), dest + 1 ); + output( "\t%s -m 644 $(INSTALL_DATA_FLAGS) %s %s\n", + install_sh, src_dir_path( make, file ), dest ); break; case 'p': /* program file */ - output( "\tSTRIPPROG=\"$(STRIP)\" %s $(INSTALL_PROGRAM_FLAGS) %s $(DESTDIR)%s\n", - install_sh, obj_dir_path( make, file ), dest + 1 ); + output( "\tSTRIPPROG=\"$(STRIP)\" %s $(INSTALL_PROGRAM_FLAGS) %s %s\n", + install_sh, obj_dir_path( make, file ), dest ); break; case 's': /* script */ - output( "\t%s $(INSTALL_SCRIPT_FLAGS) %s $(DESTDIR)%s\n", - install_sh, obj_dir_path( make, file ), dest + 1 ); + output( "\t%s $(INSTALL_SCRIPT_FLAGS) %s %s\n", + install_sh, obj_dir_path( make, file ), dest ); break; case 'S': /* script in source dir */ - output( "\t%s $(INSTALL_SCRIPT_FLAGS) %s $(DESTDIR)%s\n", - install_sh, src_dir_path( make, file ), dest + 1 ); + output( "\t%s $(INSTALL_SCRIPT_FLAGS) %s %s\n", + install_sh, src_dir_path( make, file ), dest ); + break; + case 't': /* script in tools dir */ + output( "\t%s $(INSTALL_SCRIPT_FLAGS) %s %s\n", + install_sh, tools_dir_path( make, file ), dest ); break; case 'y': /* symlink */ - output( "\trm -f $(DESTDIR)%s && %s %s $(DESTDIR)%s\n", dest + 1, ln_s, file, dest + 1 ); + output( "\trm -f %s && %s %s %s\n", dest, ln_s, file, dest ); break; default: assert(0); } + strarray_add( &uninstall, dest ); } - for (i = 0; i < files.count; i += 2) - strarray_add( &uninstall, strmake( "$(DESTDIR)%s", files.str[i + 1] + 1 )); - strarray_add_uniq( phony_targets, "install" ); strarray_add_uniq( phony_targets, target ); return uninstall; @@ -2808,8 +2822,8 @@ static struct strarray output_sources( const struct makefile *make ) else if (*dll_ext) { char *binary = replace_extension( make->module, ".exe", "" ); - add_install_rule( make, install_rules, binary, tools_dir_path( make, "wineapploader" ), - strmake( "s$(bindir)/%s", binary )); + add_install_rule( make, install_rules, binary, "wineapploader", + strmake( "t$(bindir)/%s", binary )); } }

1 0

Alexandre Julliard : makefiles: Generate installation rules for static and import libraries.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: e0d89a495429a65ef9a277bba9299c89464b999c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d89a495429a65ef9a277bba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 14:06:10 2016 +0900 makefiles: Generate installation rules for static and import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index c0cfed0..334740e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2836,6 +2836,8 @@ static struct strarray output_sources( const struct makefile *make ) output( "\t$(AR) $(ARFLAGS) $@" ); output_filenames_obj_dir( make, object_files ); output( "\n\t$(RANLIB) $@\n" ); + add_install_rule( make, install_rules, make->staticlib, make->staticlib, + strmake( "d$(dlldir)/%s", make->staticlib )); if (crosstarget && make->module) { char *name = replace_extension( make->staticlib, ".a", ".cross.a" ); @@ -3461,7 +3463,12 @@ static void load_sources( struct makefile *make ) make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ) || !strcmp( make->imports.str[i], "ucrtbase" ); - if (make->module && !make->install_lib.count) strarray_add( &make->install_lib, make->module ); + if (make->module && !make->install_lib.count && !make->install_dev.count) + { + if (make->importlib) strarray_add( &make->install_dev, make->importlib ); + if (make->staticlib) strarray_add( &make->install_dev, make->staticlib ); + else strarray_add( &make->install_lib, make->module ); + } make->include_paths = empty_strarray; make->define_args = empty_strarray;

1 0