Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[khornicek] 45947: - sync wined3d, ddraw, d3d8 and d3d9 with Wine 1.1.40
by khornicek＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: khornicek Date: Sat Mar 6 15:49:14 2010 New Revision: 45947 URL: http://svn.reactos.org/svn/reactos?rev=45947&view=rev Log: - sync wined3d, ddraw, d3d8 and d3d9 with Wine 1.1.40 Removed: trunk/reactos/dll/directx/wine/wined3d/baseshader.c Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c trunk/reactos/dll/directx/wine/ddraw/viewport.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/config.h trunk/reactos/include/reactos/wine/wined3d.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Removed: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

1 0

[cwittich] 45946: [CRT] add TrailBytes-info for codepage 1361 <david dot hedberg at gmail dot com>
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 15:40:19 2010 New Revision: 45946 URL: http://svn.reactos.org/svn/reactos?rev=45946&view=rev Log: [CRT] add TrailBytes-info for codepage 1361 <david dot hedberg at gmail dot com> Modified: trunk/reactos/lib/sdk/crt/locale/locale.c Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.… ============================================================================== --- trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Sat Mar 6 15:40:19 2010 @@ -44,6 +44,7 @@ {936, {0x40, 0xfe, 0, 0}}, {949, {0x41, 0xfe, 0, 0}}, {950, {0x40, 0x7e, 0xa1, 0xfe, 0, 0}}, + {1361, {0x31, 0x7e, 0x81, 0xfe, 0, 0}}, {20932, {1, 255, 0, 0}}, /* seems to give different results on different systems */ {0, {1, 255, 0, 0}} /* match all with FIXME */ };

1 0

[cwittich] 45945: [RTL] sync find_query_actctx with wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 15:29:56 2010 New Revision: 45945 URL: http://svn.reactos.org/svn/reactos?rev=45945&view=rev Log: [RTL] sync find_query_actctx with wine 1.1.40 Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=45945… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sat Mar 6 15:29:56 2010 @@ -2096,6 +2096,8 @@ if (flags & QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX) { + if (*handle) return STATUS_INVALID_PARAMETER; + if (NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame) *handle = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame->ActivationContext; } @@ -2103,6 +2105,8 @@ { ULONG magic; LDR_DATA_TABLE_ENTRY *pldr; + + if (!*handle) return STATUS_INVALID_PARAMETER; LdrLockLoaderLock( 0, NULL, &magic ); if (!LdrFindEntryForAddress( *handle, &pldr ))

1 0

[cwittich] 45944: add xmllite_winetest to bootcd
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 15:18:56 2010 New Revision: 45944 URL: http://svn.reactos.org/svn/reactos?rev=45944&view=rev Log: add xmllite_winetest to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Mar 6 15:18:56 2010 @@ -798,6 +798,7 @@ modules\rostests\winetests\wintrust\wintrust_winetest.exe 7 optional modules\rostests\winetests\wlanapi\wlanapi_winetest.exe 7 optional modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional +modules\rostests\winetests\xmllite\xmllite_winetest.exe 7 optional modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional

1 0

[cwittich] 45943: [XMLLITE_WINETEST] add xmllite_winetest from wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 15:12:31 2010 New Revision: 45943 URL: http://svn.reactos.org/svn/reactos?rev=45943&view=rev Log: [XMLLITE_WINETEST] add xmllite_winetest from wine 1.1.40 Added: trunk/rostests/winetests/xmllite/ (with props) trunk/rostests/winetests/xmllite/reader.c (with props) trunk/rostests/winetests/xmllite/testlist.c (with props) trunk/rostests/winetests/xmllite/xmllite.rbuild (with props) Modified: trunk/rostests/winetests/directory.rbuild Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… ============================================================================== --- trunk/rostests/winetests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/directory.rbuild [iso-8859-1] Sat Mar 6 15:12:31 2010 @@ -250,4 +250,7 @@ <directory name="winmm"> <xi:include href="winmm/winmm.rbuild" /> </directory> + <directory name="xmllite"> + <xi:include href="xmllite/xmllite.rbuild" /> + </directory> </group> Propchange: trunk/rostests/winetests/xmllite/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Mar 6 15:12:31 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/winetests/xmllite/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/winetests/xmllite/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/winetests/xmllite/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c (added) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Sat Mar 6 15:12:31 2010 @@ -1,0 +1,623 @@ +/* + * XMLLite IXmlReader tests + * + * Copyright 2010 (C) Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "ole2.h" +#include "xmllite.h" +#include "wine/test.h" + +DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); + +HRESULT WINAPI (*pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); +HRESULT WINAPI (*pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, + IMalloc *pMalloc, + LPCWSTR encoding, + BOOL hint, + LPCWSTR base_uri, + IXmlReaderInput **ppInput); +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + +static const char xmldecl_full[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; + +static IStream *create_stream_on_data(const char *data, int size) +{ + IStream *stream = NULL; + HGLOBAL hglobal; + void *ptr; + HRESULT hr; + + hglobal = GlobalAlloc(GHND, size); + ptr = GlobalLock(hglobal); + + memcpy(ptr, data, size); + + hr = CreateStreamOnHGlobal(hglobal, TRUE, &stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(stream != NULL, "Expected non-NULL stream\n"); + + GlobalUnlock(hglobal); + + return stream; +} + +static void ok_pos_(IXmlReader *reader, int line, int pos, int line_broken, + int pos_broken, int todo, int _line_) +{ + UINT l, p; + HRESULT hr; + int broken_state; + + hr = IXmlReader_GetLineNumber(reader, &l); + ok_(__FILE__, _line_)(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IXmlReader_GetLinePosition(reader, &p); + ok_(__FILE__, _line_)(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + if (line_broken == -1 && pos_broken == -1) + broken_state = 0; + else + broken_state = broken((line_broken == -1 ? line : line_broken) == l && + (pos_broken == -1 ? pos : pos_broken) == p); + + if (todo) + todo_wine + ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, + "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); + else + { + ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, + "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); + } +} +#define ok_pos(reader, l, p, l_brk, p_brk, todo) ok_pos_(reader, l, p, l_brk, p_brk, todo, __LINE__) + +typedef struct input_iids_t { + IID iids[10]; + int count; +} input_iids_t; + +static const IID *setinput_full[] = { + &IID_IXmlReaderInput, + &IID_IStream, + &IID_ISequentialStream, + NULL +}; + +/* this applies to early xmllite versions */ +static const IID *setinput_full_old[] = { + &IID_IXmlReaderInput, + &IID_ISequentialStream, + &IID_IStream, + NULL +}; + +/* after ::SetInput(IXmlReaderInput*) */ +static const IID *setinput_readerinput[] = { + &IID_IStream, + &IID_ISequentialStream, + NULL +}; + +static const IID *empty_seq[] = { + NULL +}; + +static input_iids_t input_iids; + +static void ok_iids_(const input_iids_t *iids, const IID **expected, const IID **exp_broken, int todo, int line) +{ + int i = 0, size = 0; + + while (expected[i++]) size++; + + if (todo) { + todo_wine + ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count); + } + else + ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count); + + if (iids->count != size) return; + + for (i = 0; i < size; i++) { + ok_(__FILE__, line)(IsEqualGUID(&iids->iids[i], expected[i]) || + (exp_broken ? broken(IsEqualGUID(&iids->iids[i], exp_broken[i])) : FALSE), + "Wrong IID(%d), got (%s)\n", i, debugstr_guid(&iids->iids[i])); + } +} +#define ok_iids(got, exp, brk, todo) ok_iids_(got, exp, brk, todo, __LINE__) + +static const char *state_to_str(XmlReadState state) +{ + static const char* state_names[] = { + "XmlReadState_Initial", + "XmlReadState_Interactive", + "XmlReadState_Error", + "XmlReadState_EndOfFile", + "XmlReadState_Closed" + }; + + static const char unknown[] = "unknown"; + + switch (state) + { + case XmlReadState_Initial: + case XmlReadState_Interactive: + case XmlReadState_Error: + case XmlReadState_EndOfFile: + case XmlReadState_Closed: + return state_names[state]; + default: + return unknown; + } +} + +static const char *type_to_str(XmlNodeType type) +{ + static const char* type_names[] = { + "XmlNodeType_None", + "XmlNodeType_Element", + "XmlNodeType_Attribute", + "XmlNodeType_Text", + "XmlNodeType_CDATA", + "", "", + "XmlNodeType_ProcessingInstruction", + "XmlNodeType_Comment", + "", + "XmlNodeType_DocumentType", + "", "", + "XmlNodeType_Whitespace", + "", + "XmlNodeType_EndElement", + "", + "XmlNodeType_XmlDeclaration" + }; + + static const char unknown[] = "unknown"; + + switch (type) + { + case XmlNodeType_None: + case XmlNodeType_Element: + case XmlNodeType_Attribute: + case XmlNodeType_Text: + case XmlNodeType_CDATA: + case XmlNodeType_ProcessingInstruction: + case XmlNodeType_Comment: + case XmlNodeType_DocumentType: + case XmlNodeType_Whitespace: + case XmlNodeType_EndElement: + case XmlNodeType_XmlDeclaration: + return type_names[type]; + default: + return unknown; + } +} + +static void test_read_state_(IXmlReader *reader, XmlReadState expected, + XmlReadState exp_broken, int todo, int line) +{ + XmlReadState state; + HRESULT hr; + int broken_state; + + state = -1; /* invalid value */ + hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, (LONG_PTR*)&state); + ok_(__FILE__, line)(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + if (exp_broken == -1) + broken_state = 0; + else + broken_state = broken(exp_broken == state); + + if (todo) + { + todo_wine + ok_(__FILE__, line)(state == expected || broken_state, "Expected (%s), got (%s)\n", + state_to_str(expected), state_to_str(state)); + } + else + ok_(__FILE__, line)(state == expected || broken_state, "Expected (%s), got (%s)\n", + state_to_str(expected), state_to_str(state)); +} + +#define test_read_state(reader, exp, brk, todo) test_read_state_(reader, exp, brk, todo, __LINE__) + +typedef struct _testinput +{ + const IUnknownVtbl *lpVtbl; + LONG ref; +} testinput; + +static inline testinput *impl_from_IUnknown(IUnknown *iface) +{ + return (testinput *)((char*)iface - FIELD_OFFSET(testinput, lpVtbl)); +} + +static HRESULT WINAPI testinput_QueryInterface(IUnknown *iface, REFIID riid, void** ppvObj) +{ + if (IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + input_iids.iids[input_iids.count++] = *riid; + + *ppvObj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI testinput_AddRef(IUnknown *iface) +{ + testinput *This = impl_from_IUnknown(iface); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI testinput_Release(IUnknown *iface) +{ + testinput *This = impl_from_IUnknown(iface); + LONG ref; + + ref = InterlockedDecrement(&This->ref); + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static const struct IUnknownVtbl testinput_vtbl = +{ + testinput_QueryInterface, + testinput_AddRef, + testinput_Release +}; + +static HRESULT testinput_createinstance(void **ppObj) +{ + testinput *input; + + input = HeapAlloc(GetProcessHeap(), 0, sizeof (*input)); + if(!input) return E_OUTOFMEMORY; + + input->lpVtbl = &testinput_vtbl; + input->ref = 1; + + *ppObj = &input->lpVtbl; + + return S_OK; +} + +static BOOL init_pointers(void) +{ + /* don't free module here, it's to be unloaded on exit */ + HMODULE mod = LoadLibraryA("xmllite.dll"); + + if (!mod) + { + win_skip("xmllite library not available\n"); + return FALSE; + } + +#define MAKEFUNC(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return FALSE; + MAKEFUNC(CreateXmlReader); + MAKEFUNC(CreateXmlReaderInputWithEncodingName); +#undef MAKEFUNC + + return TRUE; +} + +static void test_reader_create(void) +{ + HRESULT hr; + IXmlReader *reader; + IUnknown *input; + + /* crashes native */ + if (0) + { + hr = pCreateXmlReader(&IID_IXmlReader, NULL, NULL); + hr = pCreateXmlReader(NULL, (LPVOID*)&reader, NULL); + } + + hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_read_state(reader, XmlReadState_Closed, -1, FALSE); + + /* Null input pointer, releases previous input */ + hr = IXmlReader_SetInput(reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_read_state(reader, XmlReadState_Initial, XmlReadState_Closed, FALSE); + + /* test input interface selection sequence */ + hr = testinput_createinstance((void**)&input); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + input_iids.count = 0; + hr = IXmlReader_SetInput(reader, input); + ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok_iids(&input_iids, setinput_full, setinput_full_old, FALSE); + + IUnknown_Release(input); + + IXmlReader_Release(reader); +} + +static void test_readerinput(void) +{ + IXmlReaderInput *reader_input; + IXmlReader *reader, *reader2; + IUnknown *obj, *input; + IStream *stream; + HRESULT hr; + LONG ref; + + hr = pCreateXmlReaderInputWithEncodingName(NULL, NULL, NULL, FALSE, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + hr = pCreateXmlReaderInputWithEncodingName(NULL, NULL, NULL, FALSE, NULL, &reader_input); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + ref = IStream_AddRef(stream); + ok(ref == 2, "Expected 2, got %d\n", ref); + IStream_Release(stream); + hr = pCreateXmlReaderInputWithEncodingName((IUnknown*)stream, NULL, NULL, FALSE, NULL, &reader_input); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* IXmlReaderInput grabs a stream reference */ + ref = IStream_AddRef(stream); + ok(ref == 3, "Expected 3, got %d\n", ref); + IStream_Release(stream); + + /* try ::SetInput() with valid IXmlReaderInput */ + hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + ref = IUnknown_AddRef(reader_input); + ok(ref == 2, "Expected 2, got %d\n", ref); + IUnknown_Release(reader_input); + + hr = IXmlReader_SetInput(reader, reader_input); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_read_state(reader, XmlReadState_Initial, -1, FALSE); + + /* IXmlReader grabs a IXmlReaderInput reference */ + ref = IUnknown_AddRef(reader_input); + ok(ref == 3, "Expected 3, got %d\n", ref); + IUnknown_Release(reader_input); + + ref = IStream_AddRef(stream); + ok(ref == 4, "Expected 4, got %d\n", ref); + IStream_Release(stream); + + /* reset input and check state */ + hr = IXmlReader_SetInput(reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_read_state(reader, XmlReadState_Initial, XmlReadState_Closed, FALSE); + + IXmlReader_Release(reader); + + ref = IStream_AddRef(stream); + ok(ref == 3, "Expected 3, got %d\n", ref); + IStream_Release(stream); + + ref = IUnknown_AddRef(reader_input); + ok(ref == 2, "Expected 2, got %d\n", ref); + IUnknown_Release(reader_input); + + /* IID_IXmlReaderInput */ + /* it returns a kind of private undocumented vtable incompatible with IUnknown, + so it's not a COM interface actually. + Such query will be used only to check if input is really IXmlReaderInput */ + obj = (IUnknown*)0xdeadbeef; + hr = IUnknown_QueryInterface(reader_input, &IID_IXmlReaderInput, (void**)&obj); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ref = IUnknown_AddRef(reader_input); + ok(ref == 3, "Expected 3, got %d\n", ref); + IUnknown_Release(reader_input); + + IUnknown_Release(reader_input); + IUnknown_Release(reader_input); + IStream_Release(stream); + + /* test input interface selection sequence */ + hr = testinput_createinstance((void**)&input); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + input_iids.count = 0; + ref = IUnknown_AddRef(input); + ok(ref == 2, "Expected 2, got %d\n", ref); + IUnknown_Release(input); + hr = pCreateXmlReaderInputWithEncodingName(input, NULL, NULL, FALSE, NULL, &reader_input); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok_iids(&input_iids, empty_seq, NULL, FALSE); + /* IXmlReaderInput stores stream interface as IUnknown */ + ref = IUnknown_AddRef(input); + ok(ref == 3, "Expected 3, got %d\n", ref); + IUnknown_Release(input); + + hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + input_iids.count = 0; + ref = IUnknown_AddRef(reader_input); + ok(ref == 2, "Expected 2, got %d\n", ref); + IUnknown_Release(reader_input); + ref = IUnknown_AddRef(input); + ok(ref == 3, "Expected 3, got %d\n", ref); + IUnknown_Release(input); + hr = IXmlReader_SetInput(reader, reader_input); + ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok_iids(&input_iids, setinput_readerinput, NULL, FALSE); + + test_read_state(reader, XmlReadState_Closed, -1, FALSE); + + ref = IUnknown_AddRef(input); + ok(ref == 3, "Expected 3, got %d\n", ref); + IUnknown_Release(input); + + ref = IUnknown_AddRef(reader_input); + ok(ref == 3 || broken(ref == 2) /* versions 1.0.x and 1.1.x - XP, Vista */, + "Expected 3, got %d\n", ref); + IUnknown_Release(reader_input); + /* repeat another time, no check or caching here */ + input_iids.count = 0; + hr = IXmlReader_SetInput(reader, reader_input); + ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok_iids(&input_iids, setinput_readerinput, NULL, FALSE); + + /* another reader */ + hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader2, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* resolving from IXmlReaderInput to IStream/ISequentialStream is done at + ::SetInput() level, each time it's called */ + input_iids.count = 0; + hr = IXmlReader_SetInput(reader2, reader_input); + ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok_iids(&input_iids, setinput_readerinput, NULL, FALSE); + + IXmlReader_Release(reader2); + IXmlReader_Release(reader); + + IUnknown_Release(reader_input); + IUnknown_Release(input); +} + +static void test_reader_state(void) +{ + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* invalid arguments */ + hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + IXmlReader_Release(reader); +} + +static void test_read_xmldeclaration(void) +{ + IXmlReader *reader; + IStream *stream; + HRESULT hr; + XmlNodeType type; + UINT count = 0; + + hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* position methods with Null args */ + hr = IXmlReader_GetLineNumber(reader, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IXmlReader_GetLinePosition(reader, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + stream = create_stream_on_data(xmldecl_full, sizeof(xmldecl_full)); + + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + ok_pos(reader, 0, 0, -1, -1, FALSE); + + type = -1; + hr = IXmlReader_Read(reader, &type); +todo_wine { + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(type == XmlNodeType_XmlDeclaration, + "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); +} + /* new version 1.2.x and 1.3.x properly update postition for <?xml ?> */ + ok_pos(reader, 1, 3, -1, 55, TRUE); + + /* check attributes */ + hr = IXmlReader_MoveToNextAttribute(reader); + todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok_pos(reader, 1, 7, -1, 55, TRUE); + + hr = IXmlReader_MoveToFirstAttribute(reader); + todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok_pos(reader, 1, 7, -1, 55, TRUE); + + hr = IXmlReader_GetAttributeCount(reader, &count); +todo_wine { + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(count == 3, "Expected 3, got %d\n", count); +} + hr = IXmlReader_GetDepth(reader, &count); +todo_wine { + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(count == 1, "Expected 1, got %d\n", count); +} + + IStream_Release(stream); + IXmlReader_Release(reader); +} + +START_TEST(reader) +{ + HRESULT r; + + r = CoInitialize( NULL ); + ok( r == S_OK, "failed to init com\n"); + + if (!init_pointers()) + { + CoUninitialize(); + return; + } + + test_reader_create(); + test_readerinput(); + test_reader_state(); + test_read_xmldeclaration(); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/xmllite/reader.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/xmllite/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/testlis… ============================================================================== --- trunk/rostests/winetests/xmllite/testlist.c (added) +++ trunk/rostests/winetests/xmllite/testlist.c [iso-8859-1] Sat Mar 6 15:12:31 2010 @@ -1,0 +1,15 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_reader(void); + +const struct test winetest_testlist[] = +{ + { "reader", func_reader }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/xmllite/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/xmllite/xmllite.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/xmllite… ============================================================================== --- trunk/rostests/winetests/xmllite/xmllite.rbuild (added) +++ trunk/rostests/winetests/xmllite/xmllite.rbuild [iso-8859-1] Sat Mar 6 15:12:31 2010 @@ -1,0 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="xmllite_winetest" type="win32cui" installbase="bin" installname="xmllite_winetest.exe" allowwarnings="true"> + <include base="wininet_winetest">.</include> + <define name="__ROS_LONG64__" /> + <library>wine</library> + <library>xmllite</library> + <library>ole32</library> + <library>ntdll</library> + <file>reader.c</file> + <file>testlist.c</file> +</module> +</group> Propchange: trunk/rostests/winetests/xmllite/xmllite.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 45942: [WINTRUST] sync wintrust to wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 15:06:19 2010 New Revision: 45942 URL: http://svn.reactos.org/svn/reactos?rev=45942&view=rev Log: [WINTRUST] sync wintrust to wine 1.1.40 Modified: trunk/reactos/dll/win32/wintrust/softpub.c Modified: trunk/reactos/dll/win32/wintrust/softpub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/softpub… ============================================================================== --- trunk/reactos/dll/win32/wintrust/softpub.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/softpub.c [iso-8859-1] Sat Mar 6 15:06:19 2010 @@ -845,7 +845,7 @@ HRESULT WINAPI GenericChainCertificateTrust(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + DWORD err; WTD_GENERIC_CHAIN_POLICY_DATA *policyData = data->pWintrustData->pPolicyCallbackData; @@ -854,15 +854,11 @@ if (policyData && policyData->u.cbSize != sizeof(WTD_GENERIC_CHAIN_POLICY_CREATE_INFO)) { - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; + err = ERROR_INVALID_PARAMETER; goto end; } if (!data->csSigners) - { - ret = FALSE; - SetLastError(TRUST_E_NOSIGNATURE); - } + err = TRUST_E_NOSIGNATURE; else { DWORD i; @@ -880,19 +876,18 @@ pChainPara = &chainPara; pCreateInfo = &createInfo; } - ret = TRUE; - for (i = 0; i < data->csSigners; i++) - ret = WINTRUST_CreateChainForSigner(data, i, pCreateInfo, + err = ERROR_SUCCESS; + for (i = 0; !err && i < data->csSigners; i++) + err = WINTRUST_CreateChainForSigner(data, i, pCreateInfo, pChainPara); } end: - if (!ret) - data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = - GetLastError(); - TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, + if (err) + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = err; + TRACE("returning %d (%08x)\n", !err ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]); - return ret ? S_OK : S_FALSE; + return !err ? S_OK : S_FALSE; } HRESULT WINAPI SoftpubAuthenticode(CRYPT_PROVIDER_DATA *data)

1 0

[spetreolle] 45941: [framebuf_new] Attempt to fix release build.
by spetreolle＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: spetreolle Date: Sat Mar 6 15:06:08 2010 New Revision: 45941 URL: http://svn.reactos.org/svn/reactos?rev=45941&view=rev Log: [framebuf_new] Attempt to fix release build. Modified: trunk/reactos/drivers/video/displays/framebuf_new/driver.h Modified: trunk/reactos/drivers/video/displays/framebuf_new/driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_new/driver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf_new/driver.h [iso-8859-1] Sat Mar 6 15:06:08 2010 @@ -7,7 +7,7 @@ * ReactOS Portable Systems Group */ -#define DBG 1 +//#define DBG 1 #include "stddef.h" #include <stdarg.h> #include "windef.h"

1 0

[cwittich] 45940: [WINDOWSCODECS] sync windowscodecs to wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 15:04:11 2010 New Revision: 45940 URL: http://svn.reactos.org/svn/reactos?rev=45940&view=rev Log: [WINDOWSCODECS] sync windowscodecs to wine 1.1.40 Modified: trunk/reactos/dll/win32/windowscodecs/pngformat.c Modified: trunk/reactos/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pn… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] Sat Mar 6 15:04:11 2010 @@ -60,7 +60,11 @@ MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); MAKE_FUNCPTR(png_set_error_fn); +#if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 MAKE_FUNCPTR(png_set_expand_gray_1_2_4_to_8); +#else +MAKE_FUNCPTR(png_set_gray_1_2_4_to_8); +#endif MAKE_FUNCPTR(png_set_filler); MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_IHDR); @@ -103,7 +107,11 @@ LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_set_bgr); LOAD_FUNCPTR(png_set_error_fn); +#if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 LOAD_FUNCPTR(png_set_expand_gray_1_2_4_to_8); +#else + LOAD_FUNCPTR(png_set_gray_1_2_4_to_8); +#endif LOAD_FUNCPTR(png_set_filler); LOAD_FUNCPTR(png_set_gray_to_rgb); LOAD_FUNCPTR(png_set_IHDR); @@ -306,7 +314,11 @@ { if (bit_depth < 8) { +#if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 ppng_set_expand_gray_1_2_4_to_8(This->png_ptr); +#else + ppng_set_gray_1_2_4_to_8(This->png_ptr); +#endif bit_depth = 8; } ppng_set_gray_to_rgb(This->png_ptr);

1 0

[cwittich] 45939: [MPR] partial sync to wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 14:42:21 2010 New Revision: 45939 URL: http://svn.reactos.org/svn/reactos?rev=45939&view=rev Log: [MPR] partial sync to wine 1.1.40 Added: trunk/reactos/dll/win32/mpr/mpr_Lt.rc (with props) Removed: trunk/reactos/dll/win32/mpr/mpr_ros.diff Modified: trunk/reactos/dll/win32/mpr/mpr.rc trunk/reactos/dll/win32/mpr/mpr_Bg.rc trunk/reactos/dll/win32/mpr/mpr_Cs.rc trunk/reactos/dll/win32/mpr/mpr_Da.rc trunk/reactos/dll/win32/mpr/mpr_De.rc trunk/reactos/dll/win32/mpr/mpr_En.rc trunk/reactos/dll/win32/mpr/mpr_Eo.rc trunk/reactos/dll/win32/mpr/mpr_Es.rc trunk/reactos/dll/win32/mpr/mpr_Fr.rc trunk/reactos/dll/win32/mpr/mpr_Hu.rc trunk/reactos/dll/win32/mpr/mpr_It.rc trunk/reactos/dll/win32/mpr/mpr_Ja.rc trunk/reactos/dll/win32/mpr/mpr_Ko.rc trunk/reactos/dll/win32/mpr/mpr_Nl.rc trunk/reactos/dll/win32/mpr/mpr_No.rc trunk/reactos/dll/win32/mpr/mpr_Pl.rc trunk/reactos/dll/win32/mpr/mpr_Pt.rc trunk/reactos/dll/win32/mpr/mpr_Ro.rc trunk/reactos/dll/win32/mpr/mpr_Ru.rc trunk/reactos/dll/win32/mpr/mpr_Si.rc trunk/reactos/dll/win32/mpr/mpr_Sv.rc trunk/reactos/dll/win32/mpr/mpr_Tr.rc trunk/reactos/dll/win32/mpr/mpr_Uk.rc trunk/reactos/dll/win32/mpr/mpr_Zh.rc trunk/reactos/dll/win32/mpr/mpr_main.c trunk/reactos/dll/win32/mpr/mprres.h trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/mpr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rc?rev=4… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -27,23 +27,27 @@ #include "mpr_Bg.rc" #include "mpr_Cs.rc" #include "mpr_Da.rc" -#include "mpr_De.rc" #include "mpr_En.rc" #include "mpr_Eo.rc" #include "mpr_Es.rc" -#include "mpr_Fr.rc" #include "mpr_Hu.rc" #include "mpr_It.rc" -#include "mpr_Ja.rc" #include "mpr_Ko.rc" #include "mpr_Nl.rc" #include "mpr_No.rc" #include "mpr_Pl.rc" +#include "mpr_Sv.rc" +#include "mpr_Tr.rc" + +/* UTF-8 */ +#include "mpr_De.rc" +#include "mpr_Fr.rc" +#include "mpr_Ja.rc" +#include "mpr_Lt.rc" #include "mpr_Pt.rc" #include "mpr_Ro.rc" #include "mpr_Ru.rc" #include "mpr_Si.rc" -#include "mpr_Sv.rc" -#include "mpr_Tr.rc" +#include "mpr_Uk.rc" #include "mpr_Zh.rc" -#include "mpr_Uk.rc" + Modified: trunk/reactos/dll/win32/mpr/mpr_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Bg.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Bg.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/mpr_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Cs.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Cs.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/mpr_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Da.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Da.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/mpr_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_De.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_De.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -17,6 +17,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" + +#pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/mpr_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_En.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_En.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/mpr_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Eo.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Eo.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Eo.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/mpr_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Es.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Es.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/mpr_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Fr.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Fr.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -19,29 +19,34 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - IDS_ENTIRENETWORK "Le réseau entier" + IDS_ENTIRENETWORK "Le rÃ©seau entier" } -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 210, 146 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Entrez le mot de passe réseau" +CAPTION "Entrez le mot de passe rÃ©seau" FONT 8, "MS Shell Dlg" { - LTEXT "Veuillez saisir votre nom d'utilisateur et votre mot de passe:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 + LTEXT "Veuillez saisir votre nom d'utilisateur et votre mot de passe :", IDC_EXPLAIN, 10, 6, 150, 17 + LTEXT "Proxy", -1, 10, 31, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Utilisateur", -1, 40, 66, 50, 10 - LTEXT "Mot de passe", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Enregistrer ce mot de passe (risqué)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Annuler", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "Utilisateur", -1, 10, 68, 45, 10 + LTEXT "Mot de passe", -1, 10, 88, 45, 10 + LTEXT "" IDC_PROXY, 56, 32, 144, 14, 0 + LTEXT "" IDC_REALM, 56, 46, 144, 14, 0 + EDITTEXT IDC_USERNAME, 56, 66, 144, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 56, 86, 144, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Enregistrer ce mot de passe (risquÃ©)", IDC_SAVEPASSWORD, + 56, 106, 144, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 68, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Annuler", IDCANCEL, 128, 126, 56, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/mpr_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Hu.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Hu.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/mpr_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_It.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_It.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/mpr_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ja.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Ja.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + /* UTF-8 */ #pragma code_page(65001) @@ -28,4 +30,22 @@ IDS_ENTIRENETWORK "ãããã¯ã¼ã¯å¨ä½" } -#pragma code_page(default) +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ãããã¯ã¼ã¯ç¨ãã¹ã¯ã¼ããå¥å" +FONT 8, "MS Shell Dlg" +{ + LTEXT "ã¦ã¼ã¶ã¼åã¨ãã¹ã¯ã¼ããå¥åãã¦ãã ãã:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "ãããã·", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "ã¦ã¼ã¶ã¼å", -1, 40, 66, 50, 10 + LTEXT "ãã¹ã¯ã¼ã", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "ãã¹ã¯ã¼ããä¿åãã(&S)(ã»ãã¥ã¢ã§ã¯ããã¾ãã)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} Modified: trunk/reactos/dll/win32/mpr/mpr_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ko.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Ko.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Added: trunk/reactos/dll/win32/mpr/mpr_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Lt.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Lt.rc (added) +++ trunk/reactos/dll/win32/mpr/mpr_Lt.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -1,0 +1,51 @@ +/* + * MPR dll resources + * + * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "mprres.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Visas tinklas" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ä®veskite tinklo slaptaÅ¾odÄ¯" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ä®veskite savo naudotojo vardÄ ir slaptaÅ¾odÄ¯:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Ä®galiot. serv.", -1, 40, 26, 50, 10 +/* LTEXT "Sritis", -1, 40, 46, 50, 10 */ + LTEXT "Naudotojas", -1, 40, 66, 50, 10 + LTEXT "SlaptaÅ¾odis", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "Ä®&raÅ¡yti Å¡Ä¯ slaptaÅ¾odÄ¯ (nesaugu)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Gerai", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} Propchange: trunk/reactos/dll/win32/mpr/mpr_Lt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mpr/mpr_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Nl.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Nl.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/mpr_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_No.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_No.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/mpr/mpr_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Pl.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Pl.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/mpr_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Pt.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Pt.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -2,7 +2,7 @@ * MPR dll resources * * Copyright (C) 2004 Marcelo Duarte - * Copyright (C) 2006 Américo José Melo + * Copyright (C) 2006 AmÃ©rico JosÃ© Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,7 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +#include "mprres.h" + +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { @@ -34,10 +38,10 @@ CAPTION "Entre a senha da rede" FONT 8, "MS Shell Dlg" { - LTEXT "Por favor, entre como o nome de usuário e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Por favor, entre como o nome de usuÃ¡rio e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Usuário", -1, 40, 66, 50, 10 + LTEXT "UsuÃ¡rio", -1, 40, 66, 50, 10 LTEXT "Senha", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 Modified: trunk/reactos/dll/win32/mpr/mpr_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ro.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Ro.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -16,6 +16,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -44,5 +46,3 @@ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "RenunÈÄ", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/mpr/mpr_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ru.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Ru.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -18,29 +18,34 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_ENTIRENETWORK "Âñÿ ñåòü" + IDS_ENTIRENETWORK "ÐÑÑ ÑÐµÑÑ" } IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ââåäèòå ñåòåâîé ïàðîëü" +CAPTION "ÐÐ²ÐµÐ´Ð¸ÑÐµ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ" FONT 8, "MS Shell Dlg" { - LTEXT "Ââåäèòå âàøè èìÿ è ïàðîëü ïîëüçîâàòåëÿ:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Ïðîêñè", -1, 40, 26, 50, 10 + LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð²Ð°ÑÐ¸ Ð¸Ð¼Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "ÐÑÐ¾ÐºÑÐ¸", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Èìÿ", -1, 40, 66, 50, 10 - LTEXT "Ïàðîëü", -1, 40, 86, 50, 10 + LTEXT "ÐÐ¼Ñ", -1, 40, 66, 50, 10 + LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Ñîõðàíèòü ýòîò ïàðîëü (íåáåçîïàñíî!)", IDC_SAVEPASSWORD, + CHECKBOX "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÑÐ¾Ñ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð½ÐµÐ±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾!)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Îòìåíà", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/mpr_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Si.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Si.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" #pragma code_page(65001) @@ -46,5 +48,3 @@ PUSHBUTTON "V redu", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "PrekliÄi", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/mpr/mpr_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Sv.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Sv.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/mpr_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Tr.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Tr.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/mpr_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Uk.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Uk.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -1,7 +1,8 @@ /* - * MPR dll resources (Ukrainian) + * MPR dll Ukrainian resources * - * Copyright 2006 Artem Reznikov + * Copyright (C) 2004 Juan Lang + * Copyright (C) 2007 Artem Reznikov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -15,32 +16,37 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" + +/* UTF-8 */ +#pragma code_page(65001) LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_ENTIRENETWORK "Âñÿ Ìåðåæà" + IDS_ENTIRENETWORK "ÐÑÑ ÐÐµÑÐµÐ¶Ð°" } IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ââåä³òü Ìåðåæíèé Ïàðîëü" +CAPTION "ÐÐ²ÐµÐ´ÑÑÑ ÐÐµÑÐµÐ¶Ð½Ð¸Ð¹ ÐÐ°ÑÐ¾Ð»Ñ" FONT 8, "MS Shell Dlg" { - LTEXT "Áóäü ëàñêà, ââåä³òü Âàø³ ³ì'ÿ òà ïàðîëü:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Ïðîêñ³", -1, 40, 26, 50, 10 + LTEXT "ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, Ð²Ð²ÐµÐ´ÑÑÑ ÐÐ°ÑÑ ÑÐ¼'Ñ ÑÐ° Ð¿Ð°ÑÐ¾Ð»Ñ:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "ÐÑÐ¾ÐºÑÑ", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Êîðèñòóâà÷", -1, 40, 66, 50, 10 - LTEXT "Ïàðîëü", -1, 40, 86, 50, 10 + LTEXT "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ", -1, 40, 66, 50, 10 + LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Çáåðåãòè öåé ïàðîëü (íåáåçïå÷íî)", IDC_SAVEPASSWORD, + CHECKBOX "&ÐÐ±ÐµÑÐµÐ³ÑÐ¸ ÑÐµÐ¹ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð½ÐµÐ±ÐµÐ·Ð¿ÐµÑÐ½Ð¾)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/mpr_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Zh.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Zh.rc [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "mprres.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -74,5 +76,3 @@ PUSHBUTTON "ç¢ºå®", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "åæ¶", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/mpr/mpr_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_main.c [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -78,7 +78,6 @@ */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("Stub\n"); return S_OK; } Removed: trunk/reactos/dll/win32/mpr/mpr_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_ros.diff… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_ros.diff (removed) @@ -1,114 +1,0 @@ -Index: mpr.rc -=================================================================== ---- mpr.rc (revision 23782) -+++ mpr.rc (working copy) -@@ -39,5 +39,7 @@ - #include "mpr_No.rc" - #include "mpr_Pl.rc" - #include "mpr_Pt.rc" -+#include "mpr_Ru.rc" - #include "mpr_Sv.rc" - #include "mpr_Tr.rc" -+#include "mpr_Uk.rc" -Index: mpr_Ru.rc -=================================================================== ---- mpr_Ru.rc (revision 23782) -+++ mpr_Ru.rc (working copy) -@@ -0,0 +1,46 @@ -+/* -+ * MPR dll resources -+ * -+ * Copyright (C) 2005 Mikhail Y. Zvyozdochkin -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ */ -+ -+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -+ -+STRINGTABLE DISCARDABLE -+{ -+ IDS_ENTIRENETWORK "Âñÿ ñåòü" -+} -+ -+IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -+CAPTION "Ââåäèòå Ñåòåâîé Ïàðîëü" -+FONT 8, "MS Shell Dlg" -+{ -+ LTEXT "Ïîæàëóéñòà, ââåäèòå Âàøè èìÿ è ïàðîëü:", IDC_EXPLAIN, 40, 6, 150, 15 -+ LTEXT "Ïðîêñè-ñåðâåð", -1, 40, 26, 50, 10 -+/* LTEXT "Realm", -1, 40, 46, 50, 10 */ -+ LTEXT "Èìÿ ïîëüçîâàòåëÿ", -1, 40, 66, 50, 10 -+ LTEXT "Ïàðîëü", -1, 40, 86, 50, 10 -+ LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 -+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 -+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP -+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD -+ CHECKBOX "&Ñîõðàíèòü ïàðîëü (íåáåçîïàñíî)", IDC_SAVEPASSWORD, -+ 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON -+ PUSHBUTTON "Îòìåíà", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -+} -Index: mpr_Uk.rc -=================================================================== ---- mpr_Uk.rc (revision 23782) -+++ mpr_Uk.rc (working copy) -@@ -0,0 +1,46 @@ -+/* -+ * MPR dll resources (Ukrainian) -+ * -+ * Copyright 2006 Artem Reznikov -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ */ -+ -+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -+ -+STRINGTABLE DISCARDABLE -+{ -+ IDS_ENTIRENETWORK "Âñÿ Ìåðåæà" -+} -+ -+IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -+CAPTION "Ââåä³òü Ìåðåæíèé Ïàðîëü" -+FONT 8, "MS Shell Dlg" -+{ -+ LTEXT "Áóäü ëàñêà, ââåä³òü Âàø³ ³ì'ÿ òà ïàðîëü:", IDC_EXPLAIN, 40, 6, 150, 15 -+ LTEXT "Ïðîêñ³", -1, 40, 26, 50, 10 -+/* LTEXT "Realm", -1, 40, 46, 50, 10 */ -+ LTEXT "Êîðèñòóâà÷", -1, 40, 66, 50, 10 -+ LTEXT "Ïàðîëü", -1, 40, 86, 50, 10 -+ LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 -+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 -+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP -+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD -+ CHECKBOX "&Çáåðåãòè öåé ïàðîëü (íåáåçïå÷íî)", IDC_SAVEPASSWORD, -+ 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON -+ PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -+} Modified: trunk/reactos/dll/win32/mpr/mprres.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mprres.h?rev… ============================================================================== --- trunk/reactos/dll/win32/mpr/mprres.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mprres.h [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -18,6 +18,9 @@ #ifndef __WINE_MPRRES_H__ #define __WINE_MPRRES_H__ +#include <windef.h> +#include <winuser.h> + #define IDS_ENTIRENETWORK 1 #define IDD_PROXYDLG 0x400 Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=4… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Sat Mar 6 14:42:21 2010 @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "winioctl.h" #include "winnetwk.h" #include "npapi.h" #include "winreg.h" @@ -634,7 +635,10 @@ if (!lphEnum) ret = WN_BAD_POINTER; else if (!providerTable || providerTable->numProviders == 0) + { + lphEnum = NULL; ret = WN_NO_NETWORK; + } else { if (lpNet) @@ -723,7 +727,10 @@ if (!lphEnum) ret = WN_BAD_POINTER; else if (!providerTable || providerTable->numProviders == 0) + { + lphEnum = NULL; ret = WN_NO_NETWORK; + } else { switch (dwScope) @@ -1923,7 +1930,7 @@ break; } - SetLastError(err); + if (err != WN_NO_ERROR) SetLastError(err); return err; }

1 0

[cwittich] 45938: [KERNEL32_WINETEST] sync kernel32_winetest to wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 14:36:22 2010 New Revision: 45938 URL: http://svn.reactos.org/svn/reactos?rev=45938&view=rev Log: [KERNEL32_WINETEST] sync kernel32_winetest to wine 1.1.40 Modified: trunk/rostests/winetests/kernel32/change.c trunk/rostests/winetests/kernel32/debugger.c trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/format_msg.c trunk/rostests/winetests/kernel32/thread.c Modified: trunk/rostests/winetests/kernel32/change.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/change… ============================================================================== --- trunk/rostests/winetests/kernel32/change.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/change.c [iso-8859-1] Sat Mar 6 14:36:22 2010 @@ -79,6 +79,7 @@ ok(status == WAIT_OBJECT_0, "WaitForSingleObject status %d error %d\n", status, GetLastError()); ok(GetExitCodeThread(thread, &exitcode), "Could not retrieve thread exit code\n"); + CloseHandle(thread); return exitcode; } Modified: trunk/rostests/winetests/kernel32/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/debugg… ============================================================================== --- trunk/rostests/winetests/kernel32/debugger.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/debugger.c [iso-8859-1] Sat Mar 6 14:36:22 2010 @@ -31,12 +31,32 @@ #define STATUS_DEBUGGER_INACTIVE ((NTSTATUS) 0xC0000354) #endif +#ifdef __GNUC__ +#define PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define PRINTF_ATTR(fmt,args) +#endif + +#define child_ok (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_child_ok + static int myARGC; static char** myARGV; static BOOL (WINAPI *pCheckRemoteDebuggerPresent)(HANDLE,PBOOL); static BOOL (WINAPI *pDebugActiveProcessStop)(DWORD); static BOOL (WINAPI *pDebugSetProcessKillOnExit)(BOOL); + +static LONG child_failures; + +static void PRINTF_ATTR(2, 3) test_child_ok(int condition, const char *msg, ...) +{ + va_list valist; + + va_start(valist, msg); + winetest_vok(condition, msg, valist); + va_end(valist); + if (!condition) ++child_failures; +} /* Copied from the process test */ static void get_file_name(char* buf) @@ -468,6 +488,94 @@ "expected error ERROR_INVALID_PARAMETER, got %d/%x\n",GetLastError(), GetLastError()); } +struct child_blackbox +{ + LONG failures; +}; + +static void doChild(int argc, char **argv) +{ + struct child_blackbox blackbox; + const char *blackbox_file; + HANDLE parent; + DWORD ppid; + BOOL ret; + + blackbox_file = argv[4]; + sscanf(argv[3], "%08x", &ppid); + + parent = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, ppid); + child_ok(!!parent, "OpenProcess failed, last error %#x.\n", GetLastError()); + + ret = DebugActiveProcess(ppid); + child_ok(ret, "DebugActiveProcess failed, last error %#x.\n", GetLastError()); + + ret = pDebugActiveProcessStop(ppid); + child_ok(ret, "DebugActiveProcessStop failed, last error %#x.\n", GetLastError()); + + ret = CloseHandle(parent); + child_ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + + blackbox.failures = child_failures; + save_blackbox(blackbox_file, &blackbox, sizeof(blackbox)); +} + +static void test_debug_loop(int argc, char **argv) +{ + const char *arguments = " debugger child "; + struct child_blackbox blackbox; + char blackbox_file[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si; + DWORD pid; + char *cmd; + BOOL ret; + + if (!pDebugActiveProcessStop) + { + win_skip("DebugActiveProcessStop not available, skipping test.\n"); + return; + } + + pid = GetCurrentProcessId(); + get_file_name(blackbox_file); + cmd = HeapAlloc(GetProcessHeap(), 0, strlen(argv[0]) + strlen(arguments) + strlen(blackbox_file) + 10); + sprintf(cmd, "%s%s%08x %s", argv[0], arguments, pid, blackbox_file); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + ret = CreateProcessA(NULL, cmd, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, cmd); + + for (;;) + { + DEBUG_EVENT ev; + + ret = WaitForDebugEvent(&ev, INFINITE); + ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError()); + if (!ret) break; + + if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; + + ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); + ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError()); + if (!ret) break; + } + + ret = CloseHandle(pi.hThread); + ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ret = CloseHandle(pi.hProcess); + ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + + load_blackbox(blackbox_file, &blackbox, sizeof(blackbox)); + ok(!blackbox.failures, "Got %d failures from child process.\n", blackbox.failures); + + ret = DeleteFileA(blackbox_file); + ok(ret, "DeleteFileA failed, last error %#x.\n", GetLastError()); +} + START_TEST(debugger) { HMODULE hdll; @@ -486,9 +594,14 @@ { doDebugger(myARGC, myARGV); } + else if (myARGC >= 5 && !strcmp(myARGV[2], "child")) + { + doChild(myARGC, myARGV); + } else { test_ExitCode(); test_RemoteDebugger(); - } -} + test_debug_loop(myARGC, myARGV); + } +} Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c… ============================================================================== --- trunk/rostests/winetests/kernel32/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/file.c [iso-8859-1] Sat Mar 6 14:36:22 2010 @@ -1602,12 +1602,12 @@ /* zero-byte lock */ ok( LockFile( handle, 100, 0, 0, 0 ), "LockFile 100,0 failed\n" ); - limited_LockFile || ok( !LockFile( handle, 98, 0, 4, 0 ), "LockFile 98,4 succeeded\n" ); + if (!limited_LockFile) ok( !LockFile( handle, 98, 0, 4, 0 ), "LockFile 98,4 succeeded\n" ); ok( LockFile( handle, 90, 0, 10, 0 ), "LockFile 90,10 failed\n" ); - limited_LockFile || ok( !LockFile( handle, 100, 0, 10, 0 ), "LockFile 100,10 failed\n" ); + if (!limited_LockFile) ok( !LockFile( handle, 100, 0, 10, 0 ), "LockFile 100,10 failed\n" ); ok( UnlockFile( handle, 90, 0, 10, 0 ), "UnlockFile 90,10 failed\n" ); - !ok( UnlockFile( handle, 100, 0, 10, 0 ), "UnlockFile 100,10 failed\n" ); + ok( !UnlockFile( handle, 100, 0, 10, 0 ), "UnlockFile 100,10 succeeded\n" ); ok( UnlockFile( handle, 100, 0, 0, 0 ), "UnlockFile 100,0 failed\n" ); Modified: trunk/rostests/winetests/kernel32/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/format… ============================================================================== --- trunk/rostests/winetests/kernel32/format_msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/format_msg.c [iso-8859-1] Sat Mar 6 14:36:22 2010 @@ -709,6 +709,7 @@ ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_RESOURCE_LANG_NOT_FOUND || error == ERROR_MR_MID_NOT_FOUND || + error == ERROR_MUI_FILE_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, "last error %u\n", error); @@ -719,7 +720,8 @@ ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_RESOURCE_LANG_NOT_FOUND || error == ERROR_MR_MID_NOT_FOUND || - error == ERROR_MUI_FILE_NOT_FOUND, + error == ERROR_MUI_FILE_NOT_FOUND || + error == ERROR_MUI_FILE_NOT_LOADED, "last error %u\n", error); } Modified: trunk/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread… ============================================================================== --- trunk/rostests/winetests/kernel32/thread.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/thread.c [iso-8859-1] Sat Mar 6 14:36:22 2010 @@ -421,7 +421,17 @@ "Thread did not execute successfully\n"); ok(CloseHandle(thread[i])!=0,"CloseHandle failed\n"); } - ok(TlsFree(tlsIndex)!=0,"TlsFree failed\n"); + + SetLastError(0xCAFEF00D); + ok(TlsFree(tlsIndex)!=0,"TlsFree failed: %08x\n", GetLastError()); + ok(GetLastError()==0xCAFEF00D, + "GetLastError: expected 0xCAFEF00D, got %08x\n", GetLastError()); + + /* Test freeing an already freed TLS index */ + SetLastError(0xCAFEF00D); + ok(TlsFree(tlsIndex)==0,"TlsFree succeeded\n"); + ok(GetLastError()==ERROR_INVALID_PARAMETER, + "GetLastError: expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); /* Test how passing NULL as a pointer to threadid works */ SetLastError(0xFACEaBAD); @@ -780,7 +790,7 @@ static VOID test_thread_processor(void) { HANDLE curthread,curproc; - DWORD_PTR processMask,systemMask; + DWORD_PTR processMask,systemMask,retMask; SYSTEM_INFO sysInfo; int error=0; BOOL is_wow64; @@ -803,6 +813,10 @@ "SetThreadAffinityMask failed\n"); ok(SetThreadAffinityMask(curthread,processMask+1)==0, "SetThreadAffinityMask passed for an illegal processor\n"); +/* NOTE: Pre-Vista does not recognize the "all processors" flag (all bits set) */ + retMask = SetThreadAffinityMask(curthread,~0UL); + ok(broken(retMask==0) || retMask==processMask, + "SetThreadAffinityMask(thread,-1) failed to request all processors.\n"); /* NOTE: This only works on WinNT/2000/XP) */ if (pSetThreadIdealProcessor) { SetLastError(0xdeadbeef);

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
90
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 March 2010