September 2013 - Wine-commits

Nikolay Sivov : ntdll: Store clrSurrogate version value, added some tests.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 5b38a1316757730b818d0f70b52f00a2a58123e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b38a1316757730b818d0f70b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 11:04:17 2013 +0400 ntdll: Store clrSurrogate version value, added some tests. --- dlls/kernel32/tests/actctx.c | 82 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/actctx.c | 7 ++++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index def61da..37676d2 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -93,6 +93,7 @@ DEFINE_GUID(IID_Iifaceps, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0 DEFINE_GUID(IID_Ibifaceps, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57); DEFINE_GUID(IID_Iifaceps2, 0x76666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); DEFINE_GUID(IID_Iifaceps3, 0x86666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); +DEFINE_GUID(IID_Iiface, 0x96666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); DEFINE_GUID(IID_PS32, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x56); static const char manifest3[] = @@ -137,6 +138,11 @@ static const char manifest3[] = " numMethods=\"10\"" " baseInterface=\"{66666666-8888-7777-6666-555555555557}\"" " />" +" <clrSurrogate " +" clsid=\"{96666666-8888-7777-6666-555555555555}\"" +" name=\"testsurrogate\"" +" runtimeVersion=\"v2.0.50727\"" +" />" "</assembly>"; static const char manifest_wndcls1[] = @@ -1311,6 +1317,78 @@ static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const data.ulAssemblyRosterIndex, exid); } +struct clrsurrogate_data +{ + ULONG size; + DWORD res; + GUID clsid; + ULONG version_offset; + ULONG version_len; + ULONG name_offset; + ULONG name_len; +}; + +static void test_find_surrogate(HANDLE handle, const GUID *clsid, const WCHAR *name, const WCHAR *version, + ULONG exid, int line) +{ + struct clrsurrogate_data *surrogate; + ACTCTX_SECTION_KEYED_DATA data; + BOOL ret; + + memset(&data, 0xfe, sizeof(data)); + data.cbSize = sizeof(data); + + ret = pFindActCtxSectionGuid(0, NULL, + ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, + clsid, &data); + if (!ret) + { + skip("surrogate sections are not supported\n"); + return; + } + ok_(__FILE__, line)(ret, "FindActCtxSectionGuid failed: %u\n", GetLastError()); + + surrogate = (struct clrsurrogate_data*)data.lpData; + + ok_(__FILE__, line)(data.cbSize == sizeof(data), "data.cbSize=%u\n", data.cbSize); + ok_(__FILE__, line)(data.ulDataFormatVersion == 1, "data.ulDataFormatVersion=%u\n", data.ulDataFormatVersion); + ok_(__FILE__, line)(data.lpData != NULL, "data.lpData == NULL\n"); + ok_(__FILE__, line)(surrogate->size == sizeof(*surrogate), "got %d for header size\n", surrogate->size); + if (data.lpData && surrogate->size == sizeof(*surrogate)) + { + WCHAR *ptrW; + ULONG len; + + ok_(__FILE__, line)(surrogate->res == 0, "invalid res value %d\n", surrogate->res); + ok_(__FILE__, line)(IsEqualGUID(&surrogate->clsid, clsid), "got wrong clsid %s\n", debugstr_guid(&surrogate->clsid)); + + ok_(__FILE__, line)(surrogate->version_len == lstrlenW(version)*sizeof(WCHAR), "got version len %d\n", surrogate->version_len); + ok_(__FILE__, line)(surrogate->version_offset == surrogate->size, "got version offset %d\n", surrogate->version_offset); + + ok_(__FILE__, line)(surrogate->name_len == lstrlenW(name)*sizeof(WCHAR), "got name len %d\n", surrogate->name_len); + ok_(__FILE__, line)(surrogate->name_offset > 0, "got name offset %d\n", surrogate->name_offset); + + len = surrogate->size + surrogate->name_len + surrogate->version_len + 2*sizeof(WCHAR); + ok_(__FILE__, line)(data.ulLength == len, "got wrong data length %d, expected %d\n", data.ulLength, len); + + ptrW = (WCHAR*)((BYTE*)surrogate + surrogate->name_offset); + ok(!lstrcmpW(ptrW, name), "got wrong name %s\n", wine_dbgstr_w(ptrW)); + + ptrW = (WCHAR*)((BYTE*)surrogate + surrogate->version_offset); + ok(!lstrcmpW(ptrW, version), "got wrong name %s\n", wine_dbgstr_w(ptrW)); + } + + ok_(__FILE__, line)(data.lpSectionGlobalData == NULL, "data.lpSectionGlobalData != NULL\n"); + ok_(__FILE__, line)(data.ulSectionGlobalDataLength == 0, "data.ulSectionGlobalDataLength=%u\n", + data.ulSectionGlobalDataLength); + ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); + ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "data.ulSectionTotalLength=%u\n", + data.ulSectionTotalLength); + ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); + ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%u, expected %u\n", + data.ulAssemblyRosterIndex, exid); +} + static void test_wndclass_section(void) { static const WCHAR cls1W[] = {'1','.','2','.','3','.','4','!','w','n','d','C','l','a','s','s','1',0}; @@ -1624,6 +1702,9 @@ static void test_actctx(void) handle = test_create("test3.manifest"); DeleteFileA("test3.manifest"); if(handle != INVALID_HANDLE_VALUE) { + static const WCHAR nameW[] = {'t','e','s','t','s','u','r','r','o','g','a','t','e',0}; + static const WCHAR versionW[] = {'v','2','.','0','.','5','0','7','2','7',0}; + test_basic_info(handle, __LINE__); test_detailed_info(handle, &detailed_info1, __LINE__); test_info_in_assembly(handle, 1, &manifest3_info, __LINE__); @@ -1634,6 +1715,7 @@ static void test_actctx(void) test_find_dll_redirection(handle, testlib_dll, 1, __LINE__); test_find_dll_redirection(handle, testlib_dll, 1, __LINE__); test_find_com_redirection(handle, &IID_CoTest, &IID_TlibTest, 1, __LINE__); + test_find_surrogate(handle, &IID_Iiface, nameW, versionW, 1, __LINE__); test_find_ifaceps_redirection(handle, &IID_Iifaceps, &IID_TlibTest4, &IID_Ibifaceps, NULL, 1, __LINE__); test_find_ifaceps_redirection(handle, &IID_Iifaceps2, &IID_TlibTest4, &IID_Ibifaceps, &IID_PS32, 1, __LINE__); test_find_ifaceps_redirection(handle, &IID_Iifaceps3, &IID_TlibTest4, &IID_Ibifaceps, NULL, 1, __LINE__); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 6458b06..750ca50 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -393,6 +393,7 @@ struct entity { WCHAR *name; WCHAR *clsid; + WCHAR *version; } clrsurrogate; } u; }; @@ -521,6 +522,7 @@ static const WCHAR miscstatusdocprintW[] = {'m','i','s','c','S','t','a','t','u', static const WCHAR baseInterfaceW[] = {'b','a','s','e','I','n','t','e','r','f','a','c','e',0}; static const WCHAR nummethodsW[] = {'n','u','m','M','e','t','h','o','d','s',0}; static const WCHAR proxyStubClsid32W[] = {'p','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; +static const WCHAR runtimeVersionW[] = {'r','u','n','t','i','m','e','V','e','r','s','i','o','n',0}; static const WCHAR activatewhenvisibleW[] = {'a','c','t','i','v','a','t','e','w','h','e','n','v','i','s','i','b','l','e',0}; static const WCHAR actslikebuttonW[] = {'a','c','t','s','l','i','k','e','b','u','t','t','o','n',0}; @@ -784,6 +786,7 @@ static void free_entity_array(struct entity_array *array) case ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES: RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.name); RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.clsid); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.version); break; default: FIXME("Unknown entity kind %d\n", entity->kind); @@ -1819,6 +1822,10 @@ static BOOL parse_clr_surrogate_elem(xmlbuf_t* xmlbuf, struct assembly* assembly { if (!(entity->u.clrsurrogate.clsid = xmlstrdupW(&attr_value))) return FALSE; } + else if (xmlstr_cmp(&attr_name, runtimeVersionW)) + { + if (!(entity->u.clrsurrogate.version = xmlstrdupW(&attr_value))) return FALSE; + } else { WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value));

1 0

Nikolay Sivov : ntdll: Implement compatible section for 'clrSurrogate'.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: f0e5fd737d87286e5eb566db043501b550619b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e5fd737d87286e5eb566db0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 11:07:16 2013 +0400 ntdll: Implement compatible section for 'clrSurrogate'. --- dlls/kernel32/tests/actctx.c | 2 +- dlls/ntdll/actctx.c | 192 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 187 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0e5fd737d87286e5eb56…

1 0

Nikolay Sivov : kernel32/tests: Some tests for clrClass data.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: d0deaaa8ce7e1bd7044371350ed228e36d12741c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0deaaa8ce7e1bd7044371350… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 11:08:09 2013 +0400 kernel32/tests: Some tests for clrClass data. --- dlls/kernel32/tests/actctx.c | 81 +++++++++++++++++++++++++++++++++++++---- dlls/ntdll/actctx.c | 7 ++-- 2 files changed, 77 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0deaaa8ce7e1bd704437…

1 0

Nikolay Sivov : ntdll: Store 'clrClass' as COM class.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 8e211065a8738015e9fb7a9f3804840d59542352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e211065a8738015e9fb7a9f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 11:09:08 2013 +0400 ntdll: Store 'clrClass' as COM class. --- dlls/ntdll/actctx.c | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 8618960..369e928 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -386,6 +386,8 @@ struct entity WCHAR *clsid; WCHAR *tlbid; WCHAR *progid; + WCHAR *name; /* not NULL for clrClass */ + WCHAR *version; DWORD model; DWORD miscstatus; DWORD miscstatuscontent; @@ -411,11 +413,6 @@ struct entity { WCHAR *name; WCHAR *clsid; - } clrclass; - struct - { - WCHAR *name; - WCHAR *clsid; WCHAR *version; } clrsurrogate; } u; @@ -790,6 +787,8 @@ static void free_entity_array(struct entity_array *array) RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.clsid); RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.tlbid); RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.progid); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.name); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.version); break; case ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION: RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.iid); @@ -804,10 +803,6 @@ static void free_entity_array(struct entity_array *array) case ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION: RtlFreeHeap(GetProcessHeap(), 0, entity->u.class.name); break; - case ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION: - RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrclass.name); - RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrclass.clsid); - break; case ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES: RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.name); RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.clsid); @@ -1806,18 +1801,34 @@ static BOOL parse_clr_class_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) BOOL end = FALSE, error; struct entity* entity; - entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION); + entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION); if (!entity) return FALSE; while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) { if (xmlstr_cmp(&attr_name, nameW)) { - if (!(entity->u.clrclass.name = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.name = xmlstrdupW(&attr_value))) return FALSE; } else if (xmlstr_cmp(&attr_name, clsidW)) { - if (!(entity->u.clrclass.clsid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.clsid = xmlstrdupW(&attr_value))) return FALSE; + } + else if (xmlstr_cmp(&attr_name, progidW)) + { + if (!(entity->u.comclass.progid = xmlstrdupW(&attr_value))) return FALSE; + } + else if (xmlstr_cmp(&attr_name, tlbidW)) + { + if (!(entity->u.comclass.tlbid = xmlstrdupW(&attr_value))) return FALSE; + } + else if (xmlstr_cmp(&attr_name, threadingmodelW)) + { + entity->u.comclass.model = parse_com_class_threadingmodel(&attr_value); + } + else if (xmlstr_cmp(&attr_name, runtimeVersionW)) + { + if (!(entity->u.comclass.version = xmlstrdupW(&attr_value))) return FALSE; } else {

1 0

Nikolay Sivov : kernel32: Forward ZombifyActCtx() to ntdll.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 045682a4da707a1a93766221a223466388a52e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=045682a4da707a1a93766221a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 14:30:50 2013 +0400 kernel32: Forward ZombifyActCtx() to ntdll. --- dlls/kernel32/actctx.c | 17 +++++++++-------- dlls/ntdll/actctx.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index 86752b3..bcf95ec 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -33,9 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx); - -#define ACTCTX_FAKE_HANDLE ((HANDLE) 0xf00baa) - /*********************************************************************** * CreateActCtxA (KERNEL32.@) * @@ -200,14 +197,18 @@ void WINAPI ReleaseActCtx(HANDLE hActCtx) /*********************************************************************** * ZombifyActCtx (KERNEL32.@) * - * Release a reference to an activation context. + * Deactivate context without releasing it. */ BOOL WINAPI ZombifyActCtx(HANDLE hActCtx) { - FIXME("%p\n", hActCtx); - if (hActCtx != ACTCTX_FAKE_HANDLE) - return FALSE; - return TRUE; + NTSTATUS status; + + if ((status = RtlZombifyActivationContext(hActCtx))) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + return TRUE; } /*********************************************************************** diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 369e928..f652c18 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -4138,6 +4138,16 @@ void WINAPI RtlReleaseActivationContext( HANDLE handle ) if ((actctx = check_actctx( handle ))) actctx_release( actctx ); } +/****************************************************************** + * RtlZombifyActivationContext (NTDLL.@) + * + * FIXME: function prototype might be wrong + */ +NTSTATUS WINAPI RtlZombifyActivationContext( HANDLE handle ) +{ + FIXME("%p: stub\n", handle); + return STATUS_NOT_IMPLEMENTED; +} /****************************************************************** * RtlActivateActivationContext (NTDLL.@) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index dbef513..cb120da 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -934,7 +934,7 @@ @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stub RtlZeroHeap @ stdcall RtlZeroMemory(ptr long) -# @ stub RtlZombifyActivationContext +@ stdcall RtlZombifyActivationContext(ptr) # @ stub RtlpApplyLengthFunction # @ stub RtlpEnsureBufferSize # @ stub RtlpNotOwnerCriticalSection diff --git a/include/winternl.h b/include/winternl.h index 41ba0a0..bb7a381 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2540,6 +2540,7 @@ NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlWriteRegistryValue(ULONG,PCWSTR,PCWSTR,ULONG,PVOID,ULONG); +NTSYSAPI NTSTATUS WINAPI RtlZombifyActivationContext(HANDLE); NTSYSAPI NTSTATUS WINAPI RtlpNtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI RtlpNtEnumerateSubKey(HANDLE,UNICODE_STRING *, ULONG); NTSYSAPI NTSTATUS WINAPI RtlpWaitForCriticalSection(RTL_CRITICAL_SECTION *);

1 0

Frédéric Delanoy : wineusr: Remove inappropriate msgtext tags in table cells & upgrade to Docbook 4 SGML .
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: docs Branch: master Commit: f8d33a0edc6ac04307b05b51280666edc616c7ff URL: http://source.winehq.org/git/docs.git/?a=commit;h=f8d33a0edc6ac04307b05b512… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 31 18:49:03 2013 +0200 wineusr: Remove inappropriate msgtext tags in table cells & upgrade to Docbook 4 SGML. --- en/wineusr-guide.sgml | 14 +++++++------- en/wineusr-running.sgml | 25 ++++++++++++------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/en/wineusr-guide.sgml b/en/wineusr-guide.sgml index 13698b4..175d194 100644 --- a/en/wineusr-guide.sgml +++ b/en/wineusr-guide.sgml @@ -1,11 +1,11 @@ -<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" [ -<!entity introduction SYSTEM "wineusr-introduction.sgml"> -<!entity getting SYSTEM "wineusr-getting.sgml"> -<!entity configuring SYSTEM "wineusr-configuring.sgml"> -<!entity running SYSTEM "wineusr-running.sgml"> -<!entity bugs SYSTEM "wineusr-bugs.sgml"> -<!entity glossary SYSTEM "wineusr-glossary.sgml"> +<!ENTITY introduction SYSTEM "wineusr-introduction.sgml"> +<!ENTITY getting SYSTEM "wineusr-getting.sgml"> +<!ENTITY configuring SYSTEM "wineusr-configuring.sgml"> +<!ENTITY running SYSTEM "wineusr-running.sgml"> +<!ENTITY bugs SYSTEM "wineusr-bugs.sgml"> +<!ENTITY glossary SYSTEM "wineusr-glossary.sgml"> ]> <book id="index" lang="en"> diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index 747e704..402e34f 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -501,18 +501,19 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" </row> </thead> <tbody> - <row> + <row> <entry>How to run (assuming executable is called <filename>foo.exe</filename>)</entry> - <entry><msgtext> -<screen><prompt>$</prompt> <userinput>wine foo.exe</userinput></screen> - </msgtext></entry> - <entry><msgtext> -<screen><prompt>$</prompt> <userinput>wineconsole -- --backend=user foo.exe</userinput></screen> - </msgtext></entry> - <entry><msgtext> -<screen><prompt>$</prompt> <userinput>wineconsole foo.exe</userinput></screen> - </msgtext>You can also use <userinput>--backend=curses</userinput> as an option</entry> - </row> + <entry> + <screen><prompt>$ </prompt><userinput>wine foo.exe</userinput></screen> + </entry> + <entry> + <screen><prompt>$ </prompt><userinput>wineconsole -- --backend=user foo.exe</userinput></screen> + </entry> + <entry> + <screen><prompt>$ </prompt><userinput>wineconsole foo.exe</userinput></screen> + You can also use <parameter class="option">--backend=curses</parameter> as an option + </entry> + </row> <row> <entry>Good support for line oriented CUI applications (which print information line after line) @@ -711,7 +712,6 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" <row> <entry>Edition mode</entry> <entry> - <msgtext> <para> When the user enter commands, he or she can choose between several edition modes: @@ -735,7 +735,6 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" </listitem> </itemizedlist> </para> - </msgtext> </entry> </row> </tbody>

1 0

Frédéric Delanoy : winedev: Remove inappropriate msgtext tags in table cells & upgrade to Docbook 4 SGML .
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: docs Branch: master Commit: 2ac7f38d911dca3081e6e5cf97e1dbdffe7adbe2 URL: http://source.winehq.org/git/docs.git/?a=commit;h=2ac7f38d911dca3081e6e5cf9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 31 18:49:04 2013 +0200 winedev: Remove inappropriate msgtext tags in table cells & upgrade to Docbook 4 SGML. --- en/winedev-debugger.sgml | 14 -------------- en/winedev-documentation.sgml | 6 +++--- en/winedev-guide.sgml | 28 ++++++++++++++-------------- en/winedev-kernel.sgml | 4 ---- 4 files changed, 17 insertions(+), 35 deletions(-) diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index 1b764b0..f73d473 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -1533,12 +1533,10 @@ set $BreakAllThreadsStartup = 1 <tbody> <row> <entry> - <msgtext> <simplelist type="inline"> <member><command>cont</command></member> <member><command>c</command></member> </simplelist> - </msgtext> </entry> <entry>continue execution until next breakpoint or exception.</entry> @@ -1550,12 +1548,10 @@ set $BreakAllThreadsStartup = 1 </row> <row> <entry> - <msgtext> <simplelist type="inline"> <member><command>step</command></member> <member><command>s</command></member> </simplelist> - </msgtext> </entry> <entry> continue execution until next <quote>C</quote> line of code @@ -1564,12 +1560,10 @@ set $BreakAllThreadsStartup = 1 </row> <row> <entry> - <msgtext> <simplelist type="inline"> <member><command>next</command></member> <member><command>n</command></member> </simplelist> - </msgtext> </entry> <entry> continue execution until next <quote>C</quote> line of code @@ -1578,12 +1572,10 @@ set $BreakAllThreadsStartup = 1 </row> <row> <entry> - <msgtext> <simplelist type="inline"> <member><command>stepi</command></member> <member><command>si</command></member> </simplelist> - </msgtext> </entry> <entry> execute next assembly instruction (enters function @@ -1592,12 +1584,10 @@ set $BreakAllThreadsStartup = 1 </row> <row> <entry> - <msgtext> <simplelist type="inline"> <member><command>nexti</command></member> <member><command>ni</command></member> </simplelist> - </msgtext> </entry> <entry> execute next assembly instruction (doesn't enter @@ -1606,12 +1596,10 @@ set $BreakAllThreadsStartup = 1 </row> <row> <entry> - <msgtext> <simplelist type="inline"> <member><command>finish</command></member> <member><command>f</command></member> </simplelist> - </msgtext> </entry> <entry>execute until current function is exited</entry> </row> @@ -1981,7 +1969,6 @@ set $BreakAllThreadsStartup = 1 </row> <row> <entry> - <msgtext> <simplelist type="inline"> <member> <command>del display</command> @@ -1992,7 +1979,6 @@ set $BreakAllThreadsStartup = 1 <replaceable>N</replaceable> </member> </simplelist> - </msgtext> </entry> <entry>deletes display <replaceable>N</replaceable></entry> </row> diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml index 407a228..e83657b 100644 --- a/en/winedev-documentation.sgml +++ b/en/winedev-documentation.sgml @@ -920,7 +920,7 @@ Generally, you will declare which DTD you want to use as the first line of your SGML document. In the case of DocBook, you will use something like this: - <programlisting><!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" []> + <programlisting><!doctype book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" []> <book> ... </book></programlisting> @@ -929,7 +929,7 @@ Note that you must specify your toplevel element inside the doctype declaration. If you were writing an article rather than a book, you might use this declaration instead: - <programlisting><!doctype article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" []> + <programlisting><!doctype article PUBLIC "-//OASIS//DTD DocBook V4.5//EN" []> <article> ... </article></programlisting> @@ -980,7 +980,7 @@ --> <programlisting> <![CDATA[ -<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" []> +<!doctype book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" []> <book id="index"> <bookinfo> <title>A Poet's Guide to Nonsense</title> diff --git a/en/winedev-guide.sgml b/en/winedev-guide.sgml index aebbbac..0e39680 100644 --- a/en/winedev-guide.sgml +++ b/en/winedev-guide.sgml @@ -1,19 +1,19 @@ -<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" [ -<!entity debugger SYSTEM "winedev-debugger.sgml"> -<!entity debugging SYSTEM "winedev-debugging.sgml"> -<!entity otherdebug SYSTEM "winedev-otherdebug.sgml"> -<!entity codingpractice SYSTEM "winedev-coding.sgml"> -<!entity testing SYSTEM "winedev-testing.sgml"> -<!entity documentation SYSTEM "winedev-documentation.sgml"> +<!ENTITY debugger SYSTEM "winedev-debugger.sgml"> +<!ENTITY debugging SYSTEM "winedev-debugging.sgml"> +<!ENTITY otherdebug SYSTEM "winedev-otherdebug.sgml"> +<!ENTITY codingpractice SYSTEM "winedev-coding.sgml"> +<!ENTITY testing SYSTEM "winedev-testing.sgml"> +<!ENTITY documentation SYSTEM "winedev-documentation.sgml"> -<!entity architecture SYSTEM "winedev-architecture.sgml"> -<!entity kernel SYSTEM "winedev-kernel.sgml"> -<!entity windowing SYSTEM "winedev-windowing.sgml"> -<!entity ole SYSTEM "winedev-ole.sgml"> -<!entity opengl SYSTEM "winedev-opengl.sgml"> -<!entity ddraw SYSTEM "winedev-ddraw.sgml"> -<!entity multimedia SYSTEM "winedev-multimedia.sgml"> +<!ENTITY architecture SYSTEM "winedev-architecture.sgml"> +<!ENTITY kernel SYSTEM "winedev-kernel.sgml"> +<!ENTITY windowing SYSTEM "winedev-windowing.sgml"> +<!ENTITY ole SYSTEM "winedev-ole.sgml"> +<!ENTITY opengl SYSTEM "winedev-opengl.sgml"> +<!ENTITY ddraw SYSTEM "winedev-ddraw.sgml"> +<!ENTITY multimedia SYSTEM "winedev-multimedia.sgml"> ]> <book id="index" lang="en"> diff --git a/en/winedev-kernel.sgml b/en/winedev-kernel.sgml index 16067f3..4a210ef 100644 --- a/en/winedev-kernel.sgml +++ b/en/winedev-kernel.sgml @@ -1189,7 +1189,6 @@ if (res != ERROR_SUCCESS) return res; <entry>Drive relative path</entry> <entry><filename>j:gee\bar.txt</filename></entry> <entry> - <msgtext> <para> <itemizedlist> <listitem> @@ -1212,10 +1211,8 @@ if (res != ERROR_SUCCESS) return res; </listitem> </itemizedlist> </para> - </msgtext> </entry> <entry> - <msgtext> <para> <itemizedlist> <listitem> @@ -1238,7 +1235,6 @@ if (res != ERROR_SUCCESS) return res; </listitem> </itemizedlist> </para> - </msgtext> </entry> </row> <row>

1 0

Frédéric Delanoy : winelib: Upgrade to Docbook 4 SGML.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: docs Branch: master Commit: c24e262aee7e5a7a2c23c4df3e629b2edf24fafd URL: http://source.winehq.org/git/docs.git/?a=commit;h=c24e262aee7e5a7a2c23c4df3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 31 18:49:05 2013 +0200 winelib: Upgrade to Docbook 4 SGML. --- en/winelib-guide.sgml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/en/winelib-guide.sgml b/en/winelib-guide.sgml index fb94674..e09f922 100644 --- a/en/winelib-guide.sgml +++ b/en/winelib-guide.sgml @@ -1,10 +1,10 @@ -<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" [ -<!entity intro SYSTEM "winelib-intro.sgml"> -<!entity porting SYSTEM "winelib-porting.sgml"> -<!entity toolkit SYSTEM "winelib-toolkit.sgml"> -<!entity mfc SYSTEM "winelib-mfc.sgml"> -<!entity bindlls SYSTEM "winelib-bindlls.sgml"> +<!ENTITY intro SYSTEM "winelib-intro.sgml"> +<!ENTITY porting SYSTEM "winelib-porting.sgml"> +<!ENTITY toolkit SYSTEM "winelib-toolkit.sgml"> +<!ENTITY mfc SYSTEM "winelib-mfc.sgml"> +<!ENTITY bindlls SYSTEM "winelib-bindlls.sgml"> ]>

1 0

Frédéric Delanoy : winedev: Use 'wpid' where appropriate.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: docs Branch: master Commit: 6f1ef46bb486aedaad33ebf6e49bd302c909cbd4 URL: http://source.winehq.org/git/docs.git/?a=commit;h=6f1ef46bb486aedaad33ebf6e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 2 14:18:04 2013 +0200 winedev: Use 'wpid' where appropriate. --- en/winedev-debugger.sgml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index f73d473..e62bcab 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -2214,7 +2214,7 @@ set $BreakAllThreadsStartup = 1 <entry><command>info map</command> <replaceable>N</replaceable></entry> <entry> lists all virtual mappings used by the program of - pid <replaceable>N</replaceable> + wpid <replaceable>N</replaceable> </entry> </row> <row> @@ -2512,10 +2512,10 @@ kdbg -r localhost:12345 wine <command>gdb</command>, repeat for all Wine processes: </para> <screen> -<prompt>(gdb) </prompt><userinput>attach <replaceable>PID</replaceable></userinput> +<prompt>(gdb) </prompt><userinput>attach <replaceable>wpid</replaceable></userinput> </screen> <para> - with <replaceable>PID</replaceable> being the process ID of one of + with <replaceable>wpid</replaceable> being the process ID of one of the Wine processes. Use </para> <screen>

1 0

André Hentschel : winelib: Add some notes about the interactive mode in winemaker.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: docs Branch: master Commit: 1c8d317d4478d0965e694cece2da795b58c15003 URL: http://source.winehq.org/git/docs.git/?a=commit;h=1c8d317d4478d0965e694cece… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 2 22:13:53 2013 +0200 winelib: Add some notes about the interactive mode in winemaker. --- en/winelib-toolkit.sgml | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/en/winelib-toolkit.sgml b/en/winelib-toolkit.sgml index 040f243..8180d49 100644 --- a/en/winelib-toolkit.sgml +++ b/en/winelib-toolkit.sgml @@ -202,10 +202,16 @@ <sect2 id="interactive"> <title id="interactive.title">The interactive mode</title> <para> - what is it, - when to use it, - how to use it + The interactive mode will ask you to confirm or change options + while winemaker analyzes your code. This might be useful when + compiling MFC or in case you need different settings for each + project / target. You should consider adding more options to + the following example: </para> + <screen> + <prompt>$ </prompt><userinput>winemaker --interactive .</userinput> + <prompt>$ </prompt><userinput>make</userinput> + </screen> </sect2> <sect2 id="Makefile">

1 0