July 2010 - Wine-commits - list.winehq.org

Paul Chitescu : d3dx9_36: Provide an empty error message in the stub D3DXCompileShader.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 8068d4ee2280108aabd09c1f8b0cf8631774cb36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8068d4ee2280108aabd09c1f8… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Jul 28 13:50:46 2010 +0300 d3dx9_36: Provide an empty error message in the stub D3DXCompileShader. --- dlls/d3dx9_36/shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 9677e0b..2c21773 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -661,6 +661,8 @@ HRESULT WINAPI D3DXCompileShader(LPCSTR pSrcData, TRACE("Shader source:\n"); TRACE("%s\n", debugstr_an(pSrcData, srcDataLen)); + if (ppErrorMsgs) + D3DXCreateBuffer(1, ppErrorMsgs); /* zero fill used as string end */ return D3DERR_INVALIDCALL; }

1 0

Huw Davies : ole32: Pass a real IUnknown ptr to CoMarshalInterface.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 127260bb628d029c7608e96013bcec207e635249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=127260bb628d029c7608e9601… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 28 11:42:04 2010 +0100 ole32: Pass a real IUnknown ptr to CoMarshalInterface. --- dlls/ole32/ole2.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index f570167..a9a4885 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -409,6 +409,7 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) HRESULT hr; IStream *stream; HANDLE map; + IUnknown *unk; TRACE("(%p,%p)\n", hwnd, pDropTarget); @@ -449,7 +450,15 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); if(FAILED(hr)) return hr; - hr = CoMarshalInterface(stream, &IID_IDropTarget, (IUnknown*)pDropTarget, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + hr = IDropTarget_QueryInterface(pDropTarget, &IID_IUnknown, (void**)&unk); + if(FAILED(hr)) + { + IStream_Release(stream); + return hr; + } + hr = CoMarshalInterface(stream, &IID_IDropTarget, unk, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + IUnknown_Release(unk); + if(SUCCEEDED(hr)) { hr = create_map_from_stream(stream, &map);

1 0

Jacek Caban : wscript.exe: Added stub implementation.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 16bad58a8c7b6d89cc96e3a5654be7a9d47a6f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16bad58a8c7b6d89cc96e3a56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 27 15:51:18 2010 +0200 wscript.exe: Added stub implementation. --- configure | 1 + configure.ac | 1 + programs/wscript/Makefile.in | 13 +++++++++++++ programs/wscript/main.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7661617..ead05fb 100755 --- a/configure +++ b/configure @@ -14913,6 +14913,7 @@ wine_fn_config_program winoldap.mod16 enable_win16 install wine_fn_config_program winver enable_winver install wine_fn_config_program wordpad enable_wordpad install wine_fn_config_program write enable_write install +wine_fn_config_program wscript enable_wscript install wine_fn_config_program xcopy enable_xcopy install wine_fn_config_makefile server enable_server wine_fn_config_tool tools diff --git a/configure.ac b/configure.ac index 5ba22c4..a3a6c67 100644 --- a/configure.ac +++ b/configure.ac @@ -2769,6 +2769,7 @@ WINE_CONFIG_PROGRAM(winoldap.mod16,install,enable_win16) WINE_CONFIG_PROGRAM(winver,install) WINE_CONFIG_PROGRAM(wordpad,install) WINE_CONFIG_PROGRAM(write,install) +WINE_CONFIG_PROGRAM(wscript,install) WINE_CONFIG_PROGRAM(xcopy,install) WINE_CONFIG_MAKEFILE([server]) WINE_CONFIG_TOOL(tools) diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in new file mode 100644 index 0000000..8d208ba --- /dev/null +++ b/programs/wscript/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = wscript.exe +APPMODE = -mwindows -municode +IMPORTS = +EXTRADEFS = -DWINE_NO_UNICODE_MACROS + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/wscript/main.c b/programs/wscript/main.c new file mode 100644 index 0000000..33e14e9 --- /dev/null +++ b/programs/wscript/main.c @@ -0,0 +1,32 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * 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 <stdarg.h> + +#include <windef.h> +#include <winbase.h> + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(wscript); + +int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) +{ + WINE_FIXME("(%p %p %s %x)\n", hInst, hPrevInst, wine_dbgstr_w(cmdline), cmdshow); + return 0; +}

1 0

Jacek Caban : jscript: Return S_OK in SetScriptState for SCRIPTSTATE_INITIALIZED.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: c21061866340fbcaa1e1b6cf80e242aa2284115a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21061866340fbcaa1e1b6cf8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 27 15:51:29 2010 +0200 jscript: Return S_OK in SetScriptState for SCRIPTSTATE_INITIALIZED. --- dlls/jscript/jscript.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index c7c77e3..bcb81fa 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -378,6 +378,9 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s exec_queued_code(This); break; + case SCRIPTSTATE_INITIALIZED: + FIXME("unimplemented SCRIPTSTATE_INITIALIZED\n"); + return S_OK; default: FIXME("unimplemented state %d\n", ss); return E_NOTIMPL;

1 0

Austin English : kernel32/tests: Add a test for CreateFileA.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 067168b67be2885612f96e873bf2e06b0bdb3b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=067168b67be2885612f96e873… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 27 01:36:39 2010 -0500 kernel32/tests: Add a test for CreateFileA. --- dlls/kernel32/tests/file.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index c0a36c7..7cebbc7 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -874,6 +874,13 @@ static void test_CreateFileA(void) ret = DeleteFileA(filename); ok(ret, "DeleteFileA: error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + hFile = CreateFileA("c:\\*.*", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(hFile == INVALID_HANDLE_VALUE, "hFile should have been INVALID_HANDLE_VALUE\n"); + ok(GetLastError() == ERROR_INVALID_NAME || + broken(GetLastError() == ERROR_FILE_NOT_FOUND), /* Win98 */ + "LastError should have been ERROR_INVALID_NAME or ERROR_FILE_NOT_FOUND but got %u\n", GetLastError()); + /* get windows drive letter */ ret = GetWindowsDirectory(windowsdir, sizeof(windowsdir)); ok(ret < sizeof(windowsdir), "windowsdir is abnormally long!\n");

1 0

Andrew Nguyen : propsys: Fix comma processing in PSPropertyKeyFromString.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 4c7f9efd16caee6c1641532d8051f2a1882e217e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7f9efd16caee6c1641532d8… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jul 27 02:36:50 2010 -0500 propsys: Fix comma processing in PSPropertyKeyFromString. --- dlls/propsys/propsys_main.c | 59 +++++++++++++++++++++++++++++------------- dlls/propsys/tests/propsys.c | 48 ++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 18 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 35efda8..6c46781 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -216,7 +216,7 @@ static BOOL string_to_guid(LPCWSTR s, LPGUID id) HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) { - int has_minus = 0; + int has_minus = 0, has_comma = 0; TRACE("(%s, %p)\n", debugstr_w(pszString), pkey); @@ -233,31 +233,54 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) if (!*pszString) return E_INVALIDARG; - /* Only the space seems to be recognized as whitespace. */ - while (*pszString == ' ') + /* Only the space seems to be recognized as whitespace. The comma is only + * recognized once and processing terminates if another comma is found. */ + while (*pszString == ' ' || *pszString == ',') + { + if (*pszString == ',') + { + if (has_comma) + return S_OK; + else + has_comma = 1; + } pszString++; + } if (!*pszString) return E_INVALIDARG; - /* Only two minus signs are recognized. The first is ignored, and the - * second is interpreted. */ - if (*pszString == '-') - pszString++; - - /* Skip any intermediate spaces after the first minus sign. */ - while (*pszString == ' ') - pszString++; - - if (*pszString == '-') + /* Only two minus signs are recognized if no comma is detected. The first + * sign is ignored, and the second is interpreted. If a comma is detected + * before the minus sign, then only one minus sign counts, and property ID + * interpretation begins with the next character. */ + if (has_comma) { - has_minus = 1; - pszString++; + if (*pszString == '-') + { + has_minus = 1; + pszString++; + } } + else + { + if (*pszString == '-') + pszString++; - /* Skip any remaining spaces after minus sign. */ - while (*pszString == ' ') - pszString++; + /* Skip any intermediate spaces after the first minus sign. */ + while (*pszString == ' ') + pszString++; + + if (*pszString == '-') + { + has_minus = 1; + pszString++; + } + + /* Skip any remaining spaces after minus sign. */ + while (*pszString == ' ') + pszString++; + } /* Overflow is not checked. */ while (isdigitW(*pszString)) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 8c11c42..d734029 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -290,6 +290,42 @@ static void test_PSPropertyKeyFromString(void) static const WCHAR fmtid_overflowpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', '1','2','3','4','-','1','2','3','4','-', '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','1','2','3','4','5','6','7','8','9','0','1',0}; + static const WCHAR fmtid_commapidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', + '1','2','3','4','-','1','2','3','4','-', + '1','2','3','4','5','6','7','8','9','0','1','2','}',',','1','3','5','7','9',0}; + static const WCHAR fmtid_commaspidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', + '1','2','3','4','-','1','2','3','4','-', + '1','2','3','4','5','6','7','8','9','0','1','2','}',',',',',',','1','3','5','7','9',0}; + static const WCHAR fmtid_commaspacepidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', + '1','2','3','4','-','1','2','3','4','-', + '1','2','3','4','5','6','7','8','9','0','1','2','}',',',' ','1','3','5','7','9',0}; + static const WCHAR fmtid_spacecommapidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', + '1','2','3','4','-','1','2','3','4','-', + '1','2','3','4','5','6','7','8','9','0','1','2','}',' ',',','1','3','5','7','9',0}; + static const WCHAR fmtid_spccommaspcpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', + '1','2','3','4','-','1','2','3','4','-', + '1','2','3','4','5','6','7','8','9','0','1','2','}',' ',',',' ','1','3','5','7','9',0}; + static const WCHAR fmtid_spacescommaspidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', + '1','2','3','4','-','1','2','3','4','-', + '1','2','3','4','5','6','7','8','9','0','1','2','}',' ',',',' ',',','1','3','5','7','9',0}; + static const WCHAR fmtid_commanegpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', + '1','2','3','4','-','1','2','3','4','-', + '1','2','3','4','5','6','7','8','9','0','1','2','}',',','-','1','3','5','7','9',0}; + static const WCHAR fmtid_spccommanegpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', + '1','2','3','4','-','1','2','3','4','-', + '1','2','3','4','5','6','7','8','9','0','1','2','}',' ',',','-','1','3','5','7','9',0}; + static const WCHAR fmtid_commaspcnegpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', + '1','2','3','4','-','1','2','3','4','-', + '1','2','3','4','5','6','7','8','9','0','1','2','}',',',' ','-','1','3','5','7','9',0}; + static const WCHAR fmtid_spccommaspcnegpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', + '1','2','3','4','-','1','2','3','4','-', + '1','2','3','4','5','6','7','8','9','0','1','2','}',' ',',',' ','-','1','3','5','7','9',0}; + static const WCHAR fmtid_commanegspcpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', + '1','2','3','4','-','1','2','3','4','-', + '1','2','3','4','5','6','7','8','9','0','1','2','}',',','-',' ','1','3','5','7','9',0}; + static const WCHAR fmtid_negcommapidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', + '1','2','3','4','-','1','2','3','4','-', + '1','2','3','4','5','6','7','8','9','0','1','2','}','-',',','1','3','5','7','9',0}; static const WCHAR fmtid_normalpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', '1','2','3','4','-','1','2','3','4','-', '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','1','3','5','7','9',0}; @@ -357,6 +393,18 @@ static void test_PSPropertyKeyFromString(void) {fmtid_hexpidW, &out, S_OK, {expect_guid, 0}}, {fmtid_mixedpidW, &out, S_OK, {expect_guid, 0}}, {fmtid_overflowpidW, &out, S_OK, {expect_guid, 3755744309U}}, + {fmtid_commapidW, &out, S_OK, {expect_guid, 13579}}, + {fmtid_commaspidW, &out, S_OK, {expect_guid, 0}}, + {fmtid_commaspacepidW, &out, S_OK, {expect_guid, 13579}}, + {fmtid_spacecommapidW, &out, S_OK, {expect_guid, 13579}}, + {fmtid_spccommaspcpidW, &out, S_OK, {expect_guid, 13579}}, + {fmtid_spacescommaspidW, &out, S_OK, {expect_guid, 0}}, + {fmtid_commanegpidW, &out, S_OK, {expect_guid, 4294953717U}}, + {fmtid_spccommanegpidW, &out, S_OK, {expect_guid, 4294953717U}}, + {fmtid_commaspcnegpidW, &out, S_OK, {expect_guid, 4294953717U}}, + {fmtid_spccommaspcnegpidW, &out, S_OK, {expect_guid, 4294953717U}}, + {fmtid_commanegspcpidW, &out, S_OK, {expect_guid, 0U}}, + {fmtid_negcommapidW, &out, S_OK, {expect_guid, 0}}, {fmtid_normalpidW, &out, S_OK, {expect_guid, 13579}}, };

1 0

Andrew Nguyen : ntdll: Fix the status code for ProcessDebugObjectHandle class in NtQueryInformationProcess when the debugger is absent .
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: d7956bab541fde38f4b3f5011b209fa7d9989c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7956bab541fde38f4b3f5011… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jul 27 06:15:35 2010 -0500 ntdll: Fix the status code for ProcessDebugObjectHandle class in NtQueryInformationProcess when the debugger is absent. --- dlls/ntdll/process.c | 5 +- dlls/ntdll/tests/info.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 104 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 6fdceae..f331429 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -291,8 +291,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( } break; case ProcessDebugPort: - /* "These are not the debuggers you are looking for." * - * set it to 0 aka "no debugger" to satisfy copy protections */ len = sizeof(DWORD_PTR); if (ProcessInformationLength == len) { @@ -327,7 +325,10 @@ NTSTATUS WINAPI NtQueryInformationProcess( else if (!ProcessHandle) ret = STATUS_INVALID_HANDLE; else + { memset(ProcessInformation, 0, ProcessInformationLength); + ret = STATUS_PORT_NOT_SET; + } } else ret = STATUS_INFO_LENGTH_MISMATCH; diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 13c29f8..a56bcd1 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -920,6 +920,102 @@ static void test_query_process_image_file_name(void) HeapFree(GetProcessHeap(), 0, file_nameA); } +static void test_query_process_debug_object_handle(int argc, char **argv) +{ + char cmdline[MAX_PATH]; + STARTUPINFO si = {0}; + PROCESS_INFORMATION pi; + BOOL ret; + HANDLE debug_object; + NTSTATUS status; + + sprintf(cmdline, "%s %s %s", argv[0], argv[1], "debuggee"); + + si.cb = sizeof(si); + ret = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, + NULL, &si, &pi); + ok(ret, "CreateProcess failed with last error %u\n", GetLastError()); + if (!ret) return; + + status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL, + 0, NULL); + if (status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED) + { + win_skip("ProcessDebugObjectHandle is not supported\n"); + return; + } + ok(status == STATUS_INFO_LENGTH_MISMATCH, + "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n", + status); + + status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL, + sizeof(debug_object), NULL); + ok(status == STATUS_INVALID_HANDLE || + status == STATUS_ACCESS_VIOLATION, /* XP */ + "Expected NtQueryInformationProcess to return STATUS_INVALID_HANDLE, got 0x%08x\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), + ProcessDebugObjectHandle, NULL, sizeof(debug_object), NULL); + ok(status == STATUS_ACCESS_VIOLATION, + "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08x\n", status); + + status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle, + &debug_object, sizeof(debug_object), NULL); + ok(status == STATUS_INVALID_HANDLE, + "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08x\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), + ProcessDebugObjectHandle, &debug_object, + sizeof(debug_object) - 1, NULL); + ok(status == STATUS_INFO_LENGTH_MISMATCH, + "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), + ProcessDebugObjectHandle, &debug_object, + sizeof(debug_object) + 1, NULL); + ok(status == STATUS_INFO_LENGTH_MISMATCH, + "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n", status); + + debug_object = (HANDLE)0xdeadbeef; + status = pNtQueryInformationProcess(GetCurrentProcess(), + ProcessDebugObjectHandle, &debug_object, + sizeof(debug_object), NULL); + ok(status == STATUS_PORT_NOT_SET, + "Expected NtQueryInformationProcess to return STATUS_PORT_NOT_SET, got 0x%08x\n", status); + ok(debug_object == NULL || + broken(debug_object == (HANDLE)0xdeadbeef), /* Wow64 */ + "Expected debug object handle to be NULL, got %p\n", debug_object); + + debug_object = (HANDLE)0xdeadbeef; + status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugObjectHandle, + &debug_object, sizeof(debug_object), NULL); + todo_wine + ok(status == STATUS_SUCCESS, + "Expected NtQueryInformationProcess to return STATUS_SUCCESS, got 0x%08x\n", status); + todo_wine + ok(debug_object != NULL, + "Expected debug object handle to be non-NULL, got %p\n", debug_object); + + for (;;) + { + DEBUG_EVENT ev; + + ret = WaitForDebugEvent(&ev, INFINITE); + ok(ret, "WaitForDebugEvent failed with last error %u\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 with last error %u\n", GetLastError()); + if (!ret) break; + } + + ret = CloseHandle(pi.hThread); + ok(ret, "CloseHandle failed with last error %u\n", GetLastError()); + ret = CloseHandle(pi.hProcess); + ok(ret, "CloseHandle failed with last error %u\n", GetLastError()); +} static void test_readvirtualmemory(void) { @@ -1202,10 +1298,14 @@ START_TEST(info) trace("Starting test_query_process_handlecount()\n"); test_query_process_handlecount(); - /* 27 ProcessImageFileName */ + /* 0x1B ProcessImageFileName */ trace("Starting test_query_process_image_file_name()\n"); test_query_process_image_file_name(); + /* 0x1E ProcessDebugObjectHandle */ + trace("Starting test_query_process_debug_object_handle()\n"); + test_query_process_debug_object_handle(argc, argv); + /* belongs into it's own file */ trace("Starting test_readvirtualmemory()\n"); test_readvirtualmemory();

1 0

Igor Paliychuk : crypt32: Ukrainian translation update.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 304fdd32264c337b86f4d9a8ef1d2182c319462c URL: http://source.winehq.org/git/wine.git/?a=commit;h=304fdd32264c337b86f4d9a8e… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Tue Jul 27 17:50:19 2010 +0300 crypt32: Ukrainian translation update. --- dlls/crypt32/crypt32_Uk.rc | 250 ++++++++++++++++++++++---------------------- 1 files changed, 125 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=304fdd32264c337b86f4d…

1 0

Igor Paliychuk : comdlg32: Fixed Russian standard dialog sizes.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: a6b595918ca3d1b67f7af98b1f3cc3e629b517ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b595918ca3d1b67f7af98b1… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Tue Jul 27 19:46:51 2010 +0300 comdlg32: Fixed Russian standard dialog sizes. --- dlls/comdlg32/cdlg_Ru.rc | 48 +++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ru.rc b/dlls/comdlg32/cdlg_Ru.rc index 61a1ecf..57236bd 100644 --- a/dlls/comdlg32/cdlg_Ru.rc +++ b/dlls/comdlg32/cdlg_Ru.rc @@ -153,26 +153,26 @@ FONT 8, "MS Shell Dlg" } -CHOOSE_COLOR DIALOG 36, 24, 310, 185 +CHOOSE_COLOR DIALOG 36, 24, 300, 185 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Изменение палитры" +CAPTION "Выбор цвета" FONT 8, "MS Shell Dlg" { LTEXT "&Базовая палитра:", 1088, 4, 4, 140, 10 LTEXT "До&полнительные цвета:", 1089, 4, 106, 140, 10 LTEXT "Цвет|За&ливка", 1090, 150, 151, 48, 10 - LTEXT "Крас&ный:", 726 /*1094*/,254,126,32,10 - EDITTEXT 706, 288,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Зелёный:",727/*1095*/,254,140,32,10 - EDITTEXT 707, 288,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "С&иний:",728 /*1096*/,264,154,24,10 - EDITTEXT 708, 288,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "О&ттенок:" ,723 /*1091*/,202,126,30,10 - EDITTEXT 703, 234,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Контраст:" ,724 /*1092*/,199,140,34,10 - EDITTEXT 704, 234,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Яркость:" ,725 /*1093*/,202,154,30,10 - EDITTEXT 705, 234,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Крас&н:", 726 /*1094*/,253,126,24,10 + EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Зелён:",727/*1095*/,252,140,24,10 + EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "С&иний:",728 /*1096*/,251,154,24,10 + EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "О&ттенок:" ,723 /*1091*/,196,126,30,10 + EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Контраст:" ,724 /*1092*/,193,140,34,10 + EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Яркость:" ,725 /*1093*/,197,154,30,10 + EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 @@ -187,22 +187,22 @@ FONT 8, "MS Shell Dlg" } -FINDDLGORD DIALOG 36, 24, 245, 62 +FINDDLGORD DIALOG 36, 24, 236, 62 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Поиск" FONT 8, "MS Shell Dlg" { LTEXT "&Образец:", -1, 4, 8, 42, 8 - EDITTEXT 1152, 47, 7, 138, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "&Только слово целиком", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "C &учетом регистра", 1041, 4, 42, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Направление", 1072, 107, 26, 78, 28 - CONTROL "&Вверх", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 40, 12 - CONTROL "В&низ", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 38, 30, 12 - - DEFPUSHBUTTON "&Найти далее", IDOK, 190, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Отмена", IDCANCEL , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Справка", pshHelp , 190, 45, 50, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "C &учетом регистра", 1041, 4, 42, 75, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Направление", 1072, 107, 26, 68, 28 + CONTROL "&Вверх", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 109, 38, 33, 12 + CONTROL "В&низ", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 143, 38, 28, 12 + + DEFPUSHBUTTON "&Найти далее", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Отмена", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Справка", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP }

1 0

Paul Vriens : msxml3: Ignore a property.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: fa8f79feb82c5823d111526e43862223d7cb8836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8f79feb82c5823d111526e4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 27 15:32:51 2010 +0200 msxml3: Ignore a property. --- dlls/msxml3/domdoc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f9f02e0..aff5b74 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -59,6 +59,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #define XML_SAVE_AS_HTML 64 static const WCHAR SZ_PROPERTY_SELECTION_LANGUAGE[] = {'S','e','l','e','c','t','i','o','n','L','a','n','g','u','a','g','e',0}; +static const WCHAR SZ_PROPERTY_PROHIBIT_DTD[] = {'P','r','o','h','i','b','i','t','D','T','D',0}; static const WCHAR SZ_VALUE_XPATH[] = {'X','P','a','t','h',0}; static const WCHAR SZ_VALUE_XSLPATTERN[] = {'X','S','L','P','a','t','t','e','r','n',0}; @@ -2075,6 +2076,12 @@ static HRESULT WINAPI domdoc_setProperty( VariantClear(&varStr); return hr; } + else if (lstrcmpiW(p, SZ_PROPERTY_PROHIBIT_DTD) == 0) + { + /* Ignore */ + FIXME("Ignoring property ProhibitDTD, value %d\n", V_BOOL(&var)); + return S_OK; + } FIXME("Unknown property %s\n", wine_dbgstr_w(p)); return E_FAIL;

1 0