January 2007 - Wine-Commits

Thomas Kho : kernel32: Add CreateRemoteThread remote thread conformance tests.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: f9cbc4c70d8d3bd78e546650fba99560fb34891d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9cbc4c70d8d3bd78e546650f… Author: Thomas Kho <tkho(a)ucla.edu> Date: Wed Jan 3 14:22:02 2007 +0100 kernel32: Add CreateRemoteThread remote thread conformance tests. --- dlls/kernel32/tests/thread.c | 133 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 132 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 9e873c4..425c6da 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -22,6 +22,7 @@ #define _WIN32_WINNT 0x0500 #include <stdarg.h> +#include <stdio.h> #include "wine/test.h" #include <windef.h> @@ -67,9 +68,24 @@ static SetThreadIdealProcessor_t pSetThr typedef BOOL (WINAPI *SetThreadPriorityBoost_t)(HANDLE,BOOL); static SetThreadPriorityBoost_t pSetThreadPriorityBoost=NULL; +static HANDLE create_target_process(const char *arg) +{ + char **argv; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFO si = { 0 }; + si.cb = sizeof(si); + + winetest_get_mainargs( &argv ); + sprintf(cmdline, "%s %s %s", argv[0], argv[1], arg); + ok(CreateProcess(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, + &si, &pi) != 0, "error: %u\n", GetLastError()); + ok(CloseHandle(pi.hThread) != 0, "error %u\n", GetLastError()); + return pi.hProcess; +} + /* Functions not tested yet: AttachThreadInput - CreateRemoteThread SetThreadContext SwitchToThread @@ -175,6 +191,95 @@ static DWORD WINAPI threadFunc5(LPVOID p } #endif +static DWORD WINAPI threadFunc_SetEvent(LPVOID p) +{ + SetEvent((HANDLE) p); + return 0; +} + +static DWORD WINAPI threadFunc_CloseHandle(LPVOID p) +{ + CloseHandle((HANDLE) p); + return 0; +} + +/* check CreateRemoteThread */ +static VOID test_CreateRemoteThread(void) +{ + HANDLE hProcess, hThread, hEvent, hRemoteEvent; + DWORD tid, ret, exitcode; + + hProcess = create_target_process("sleep"); + ok(hProcess != NULL, "Can't start process\n"); + + hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(hEvent != NULL, "Can't create event, err=%u\n", GetLastError()); + ret = DuplicateHandle(GetCurrentProcess(), hEvent, hProcess, &hRemoteEvent, + 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(ret != 0, "DuplicateHandle failed, err=%u\n", GetLastError()); + + /* create suspended remote thread with entry point SetEvent() */ + hThread = CreateRemoteThread(hProcess, NULL, 0, threadFunc_SetEvent, + hRemoteEvent, CREATE_SUSPENDED, &tid); + todo_wine ok(hThread != NULL, "CreateRemoteThread failed, err=%u\n", + GetLastError()); + ok(tid != 0, "null tid\n"); + ret = SuspendThread(hThread); + todo_wine ok(ret == 1, "ret=%u, err=%u\n", ret, GetLastError()); + ret = ResumeThread(hThread); + todo_wine ok(ret == 2, "ret=%u, err=%u\n", ret, GetLastError()); + + /* thread still suspended, so wait times out */ + ret = WaitForSingleObject(hEvent, 100); + ok(ret == WAIT_TIMEOUT, "wait did not time out, ret=%u\n", ret); + + ret = ResumeThread(hThread); + todo_wine ok(ret == 1, "ret=%u, err=%u\n", ret, GetLastError()); + + /* wait that doesn't time out */ + ret = WaitForSingleObject(hEvent, 100); + todo_wine ok(ret == WAIT_OBJECT_0, "object not signaled, ret=%u\n", ret); + + /* wait for thread end */ + ret = WaitForSingleObject(hThread, 100); + todo_wine ok(ret == WAIT_OBJECT_0, + "waiting for thread failed, ret=%u\n", ret); + CloseHandle(hThread); + + /* create and wait for remote thread with entry point CloseHandle() */ + hThread = CreateRemoteThread(hProcess, NULL, 0, + threadFunc_CloseHandle, + hRemoteEvent, 0, &tid); + todo_wine ok(hThread != NULL, + "CreateRemoteThread failed, err=%u\n", GetLastError()); + ret = WaitForSingleObject(hThread, 100); + todo_wine ok(ret == WAIT_OBJECT_0, + "waiting for thread failed, ret=%u\n", ret); + CloseHandle(hThread); + + /* create remote thread with entry point SetEvent() */ + hThread = CreateRemoteThread(hProcess, NULL, 0, + threadFunc_SetEvent, + hRemoteEvent, 0, &tid); + todo_wine ok(hThread != NULL, + "CreateRemoteThread failed, err=%u\n", GetLastError()); + + /* closed handle, so wait times out */ + ret = WaitForSingleObject(hEvent, 100); + ok(ret == WAIT_TIMEOUT, "wait did not time out, ret=%u\n", ret); + + /* check that remote SetEvent() failed */ + ret = GetExitCodeThread(hThread, &exitcode); + todo_wine ok(ret != 0, + "GetExitCodeThread failed, err=%u\n", GetLastError()); + if (ret) todo_wine ok(exitcode == 0, "SetEvent succeeded, expected to fail\n"); + CloseHandle(hThread); + + TerminateProcess(hProcess, 0); + CloseHandle(hEvent); + CloseHandle(hProcess); +} + /* Check basic funcationality of CreateThread and Tls* functions */ static VOID test_CreateThread_basic(void) { @@ -726,6 +831,9 @@ static void test_QueueUserWorkItem(void) START_TEST(thread) { HINSTANCE lib; + int argc; + char **argv; + argc = winetest_get_mainargs( &argv ); /* Neither Cygwin nor mingW export OpenThread, so do a dynamic check so that the compile passes */ @@ -736,6 +844,29 @@ START_TEST(thread) pQueueUserWorkItem=(QueueUserWorkItem_t)GetProcAddress(lib,"QueueUserWorkItem"); pSetThreadIdealProcessor=(SetThreadIdealProcessor_t)GetProcAddress(lib,"SetThreadIdealProcessor"); pSetThreadPriorityBoost=(SetThreadPriorityBoost_t)GetProcAddress(lib,"SetThreadPriorityBoost"); + + if (argc >= 3) + { + if (!strcmp(argv[2], "sleep")) + { + Sleep(5000); /* spawned process runs for at most 5 seconds */ + return; + } + while (1) + { + HANDLE hThread; + hThread = CreateThread(NULL, 0, threadFunc2, NULL, 0, NULL); + ok(hThread != NULL, "CreateThread failed, error %u\n", + GetLastError()); + ok(WaitForSingleObject(hThread, 200) == WAIT_OBJECT_0, + "Thread did not exit in time\n"); + if (hThread == NULL) break; + CloseHandle(hThread); + } + return; + } + + test_CreateRemoteThread(); test_CreateThread_basic(); test_CreateThread_suspended(); test_SuspendThread();

1 0

Thomas Kho : kernel32: Add VirtualAllocEx remote thread conformance tests.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 91c7c7bf43663ec233cd2d513331a5f54d290c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c7c7bf43663ec233cd2d513… Author: Thomas Kho <tkho(a)ucla.edu> Date: Wed Jan 3 14:13:12 2007 +0100 kernel32: Add VirtualAllocEx remote thread conformance tests. --- dlls/kernel32/tests/virtual.c | 178 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 178 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 15f1508..8b7991e 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -19,12 +19,163 @@ */ #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" #include "winerror.h" #include "wine/test.h" +#define NUM_THREADS 4 + +static HANDLE create_target_process(const char *arg) +{ + char **argv; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFO si = { 0 }; + si.cb = sizeof(si); + + winetest_get_mainargs( &argv ); + sprintf(cmdline, "%s %s %s", argv[0], argv[1], arg); + ok(CreateProcess(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, + &si, &pi) != 0, "error: %u\n", GetLastError()); + ok(CloseHandle(pi.hThread) != 0, "error %u\n", GetLastError()); + return pi.hProcess; +} + +static void test_VirtualAllocEx(void) +{ + const unsigned int alloc_size = 1<<15; + char *src, *dst; + unsigned long bytes_written = 0, bytes_read = 0, i; + void *addr1, *addr2; + BOOL b; + DWORD old_prot; + MEMORY_BASIC_INFORMATION info; + HANDLE hProcess; + + hProcess = create_target_process("sleep"); + ok(hProcess != NULL, "Can't start process\n"); + + src = (char *) HeapAlloc( GetProcessHeap(), 0, alloc_size ); + dst = (char *) HeapAlloc( GetProcessHeap(), 0, alloc_size ); + for (i = 0; i < alloc_size; i++) + src[i] = 0xcafedead + i; + + addr1 = VirtualAllocEx(hProcess, NULL, alloc_size, MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + todo_wine ok(addr1 != NULL, "VirtualAllocEx error %u\n", GetLastError()); + b = WriteProcessMemory(hProcess, addr1, src, alloc_size, &bytes_written); + ok(b && (bytes_written == alloc_size), "%lu bytes written\n", + bytes_written); + b = ReadProcessMemory(hProcess, addr1, dst, alloc_size, &bytes_read); + ok(b && (bytes_read == alloc_size), "%lu bytes read\n", bytes_read); + ok(!memcmp(src, dst, alloc_size), "Data from remote process differs\n"); + b = VirtualFreeEx(hProcess, addr1, 0, MEM_RELEASE); + todo_wine ok(b != 0, "VirtualFreeEx, error %u\n", GetLastError()); + + HeapFree( GetProcessHeap(), 0, src ); + HeapFree( GetProcessHeap(), 0, dst ); + + /* + * The following tests parallel those in test_VirtualAlloc() + */ + + SetLastError(0xdeadbeef); + addr1 = VirtualAllocEx(hProcess, 0, 0, MEM_RESERVE, PAGE_NOACCESS); + ok(addr1 == NULL, "VirtualAllocEx should fail on zero-sized allocation\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER /* NT */ || + GetLastError() == ERROR_NOT_ENOUGH_MEMORY, /* Win9x */ + "got %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + + addr1 = VirtualAllocEx(hProcess, 0, 0xFFFC, MEM_RESERVE, PAGE_NOACCESS); + todo_wine ok(addr1 != NULL, "VirtualAllocEx failed\n"); + + /* test a not committed memory */ + memset(&info, 'q', sizeof(info)); + todo_wine ok(VirtualQueryEx(hProcess, addr1, &info, sizeof(info)) + == sizeof(info), "VirtualQueryEx failed\n"); + todo_wine ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, + addr1); + todo_wine ok(info.AllocationBase == addr1, "%p != %p\n", + info.AllocationBase, addr1); + todo_wine ok(info.AllocationProtect == PAGE_NOACCESS, + "%x != PAGE_NOACCESS\n", info.AllocationProtect); + todo_wine ok(info.RegionSize == 0x10000, "%lx != 0x10000\n", + info.RegionSize); + todo_wine ok(info.State == MEM_RESERVE, "%x != MEM_RESERVE\n", info.State); + /* NT reports Protect == 0 for a not committed memory block */ + todo_wine ok(info.Protect == 0 /* NT */ || + info.Protect == PAGE_NOACCESS, /* Win9x */ + "%x != PAGE_NOACCESS\n", info.Protect); + todo_wine ok(info.Type == MEM_PRIVATE, "%x != MEM_PRIVATE\n", info.Type); + + SetLastError(0xdeadbeef); + ok(!VirtualProtectEx(hProcess, addr1, 0xFFFC, PAGE_READONLY, &old_prot), + "VirtualProtectEx should fail on a not committed memory\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_ADDRESS /* NT */ || + GetLastError() == ERROR_INVALID_PARAMETER, /* Win9x */ + "got %u, expected ERROR_INVALID_ADDRESS\n", GetLastError()); + + addr2 = VirtualAllocEx(hProcess, addr1, 0x1000, MEM_COMMIT, PAGE_NOACCESS); + ok(addr1 == addr2, "VirtualAllocEx failed\n"); + + /* test a committed memory */ + todo_wine ok(VirtualQueryEx(hProcess, addr1, &info, sizeof(info)) + == sizeof(info), + "VirtualQueryEx failed\n"); + todo_wine ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, + addr1); + todo_wine ok(info.AllocationBase == addr1, "%p != %p\n", + info.AllocationBase, addr1); + todo_wine ok(info.AllocationProtect == PAGE_NOACCESS, + "%x != PAGE_NOACCESS\n", info.AllocationProtect); + todo_wine ok(info.RegionSize == 0x1000, "%lx != 0x1000\n", info.RegionSize); + todo_wine ok(info.State == MEM_COMMIT, "%x != MEM_COMMIT\n", info.State); + /* this time NT reports PAGE_NOACCESS as well */ + todo_wine ok(info.Protect == PAGE_NOACCESS, "%x != PAGE_NOACCESS\n", info.Protect); + todo_wine ok(info.Type == MEM_PRIVATE, "%x != MEM_PRIVATE\n", info.Type); + + /* this should fail, since not the whole range is committed yet */ + SetLastError(0xdeadbeef); + ok(!VirtualProtectEx(hProcess, addr1, 0xFFFC, PAGE_READONLY, &old_prot), + "VirtualProtectEx should fail on a not committed memory\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_ADDRESS /* NT */ || + GetLastError() == ERROR_INVALID_PARAMETER, /* Win9x */ + "got %u, expected ERROR_INVALID_ADDRESS\n", GetLastError()); + + todo_wine ok(VirtualProtectEx(hProcess, addr1, 0x1000, PAGE_READONLY, + &old_prot), "VirtualProtectEx failed\n"); + todo_wine ok(old_prot == PAGE_NOACCESS, + "wrong old protection: got %04x instead of PAGE_NOACCESS\n", old_prot); + + todo_wine ok(VirtualProtectEx(hProcess, addr1, 0x1000, PAGE_READWRITE, + &old_prot), "VirtualProtectEx failed\n"); + todo_wine ok(old_prot == PAGE_READONLY, + "wrong old protection: got %04x instead of PAGE_READONLY\n", old_prot); + + ok(!VirtualFreeEx(hProcess, addr1, 0x10000, 0), + "VirtualFreeEx should fail with type 0\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, + "got %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + + todo_wine ok(VirtualFreeEx(hProcess, addr1, 0x10000, MEM_DECOMMIT), + "VirtualFreeEx failed\n"); + + /* if the type is MEM_RELEASE, size must be 0 */ + ok(!VirtualFreeEx(hProcess, addr1, 1, MEM_RELEASE), + "VirtualFreeEx should fail\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, + "got %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + + todo_wine ok(VirtualFreeEx(hProcess, addr1, 0, MEM_RELEASE), + "VirtualFreeEx failed\n"); + + TerminateProcess(hProcess, 0); + CloseHandle(hProcess); +} + static void test_VirtualAlloc(void) { void *addr1, *addr2; @@ -263,6 +414,33 @@ static void test_MapViewOfFile(void) START_TEST(virtual) { + int argc; + char **argv; + argc = winetest_get_mainargs( &argv ); + + if (argc >= 3) + { + if (!strcmp(argv[2], "sleep")) + { + Sleep(5000); /* spawned process runs for at most 5 seconds */ + return; + } + while (1) + { + void *mem; + BOOL ret; + mem = VirtualAlloc(NULL, 1<<20, MEM_COMMIT|MEM_RESERVE, + PAGE_EXECUTE_READWRITE); + ok(mem != NULL, "VirtualAlloc failed %u\n", GetLastError()); + if (mem == NULL) break; + ret = VirtualFree(mem, 0, MEM_RELEASE); + ok(ret, "VirtualFree failed %u\n", GetLastError()); + if (!ret) break; + } + return; + } + + test_VirtualAllocEx(); test_VirtualAlloc(); test_MapViewOfFile(); }

1 0

Rob Shearman : ole32: Don' t release pUnk in OleCreate if CoCreateInstance failed.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: b8035d2c70edc0456a4f9f53927cd13b8846afc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8035d2c70edc0456a4f9f539… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 3 10:31:08 2007 +0000 ole32: Don't release pUnk in OleCreate if CoCreateInstance failed. --- dlls/ole32/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 249b75b..151957c 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2399,7 +2399,7 @@ HRESULT WINAPI OleCreate( } } - if (FAILED(hres)) + if (FAILED(hres) && pUnk) { IUnknown_Release(pUnk); pUnk = NULL;

1 0

Reinhard Karcher : user32: Speed improvement for 16bit comm support.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 426ae2f2e29f2cdb0e4bbee0cef9b93e0f243425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426ae2f2e29f2cdb0e4bbee0c… Author: Reinhard Karcher <rkarcher(a)frey.de> Date: Mon Jan 1 17:45:06 2007 +0100 user32: Speed improvement for 16bit comm support. The previous version of this patch wasn't applied correctly. --- dlls/user32/comm16.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/comm16.c b/dlls/user32/comm16.c index 0164196..ebeb97c 100644 --- a/dlls/user32/comm16.c +++ b/dlls/user32/comm16.c @@ -721,7 +721,9 @@ INT16 WINAPI GetCommError16(INT16 cid,LP if (lpStat) { lpStat->status = 0; - SleepEx(1,TRUE); + + if (comm_inbuf(ptr) == 0) + SleepEx(1,TRUE); lpStat->cbOutQue = comm_outbuf(ptr); lpStat->cbInQue = comm_inbuf(ptr);

1 0

appdb/ ./account.php ./addcomment.php ./appbro ...
by WineHQ Jan. 4, 2007

Jan. 4, 2007

ChangeSet ID: 30851 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/03 20:35:02 Modified files: . : account.php addcomment.php appbrowse.php appimage.php appsubmit.php appview.php browse_by_rating.php browse_newest_apps.php commentview.php deletecomment.php distributionView.php maintainerdelete.php maintainersubmit.php preferences.php screenshots.php search.php testResults.php vendorview.php viewScreenshots.php viewbugs.php votestats.php admin : addAppNote.php addCategory.php adminAppDataQueue.php adminAppQueue.php adminBugs.php adminCommentView.php adminMaintainerQueue.php adminMaintainers.php adminScreenshots.php adminTestResults.php adminUsers.php deleteAny.php editAppFamily.php editAppNote.php editAppVersion.php editBundle.php editDistribution.php editVendor.php moveAppVersion.php help : index.php include : application.php bugs.php comment.php distribution.php filter.php form_edit.php form_login.php form_new.php incl.php note.php screenshot.php sidebar.php testData.php url.php util.php version.php vote.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix and enable input filtering through include/filter.php Patch: http://cvs.winehq.org/patch.py?id=30851 Old revision New revision Changes Path 1.34 1.35 +0 -1 appdb/account.php 1.33 1.34 +0 -1 appdb/addcomment.php 1.22 1.23 +0 -1 appdb/appbrowse.php 1.28 1.29 +0 -1 appdb/appimage.php 1.57 1.58 +6 -20 appdb/appsubmit.php 1.96 1.97 +0 -8 appdb/appview.php 1.1 1.2 +0 -1 appdb/browse_by_rating.php 1.2 1.3 +0 -1 appdb/browse_newest_apps.php 1.15 1.16 +0 -1 appdb/commentview.php 1.30 1.31 +0 -1 appdb/deletecomment.php 1.22 1.23 +0 -1 appdb/distributionView.php 1.24 1.25 +0 -7 appdb/maintainerdelete.php 1.33 1.34 +0 -7 appdb/maintainersubmit.php 1.33 1.34 +3 -25 appdb/preferences.php 1.41 1.42 +0 -1 appdb/screenshots.php 1.21 1.22 +0 -1 appdb/search.php 1.22 1.23 +2 -10 appdb/testResults.php 1.23 1.24 +0 -1 appdb/vendorview.php 1.7 1.8 +0 -1 appdb/viewScreenshots.php 1.10 1.11 +0 -1 appdb/viewbugs.php 1.27 1.28 +0 -1 appdb/votestats.php 1.30 1.31 +1 -8 appdb/admin/addAppNote.php 1.15 1.16 +0 -8 appdb/admin/addCategory.php 1.30 1.31 +0 -9 appdb/admin/adminAppDataQueue.php 1.69 1.70 +6 -21 appdb/admin/adminAppQueue.php 1.14 1.15 +0 -9 appdb/admin/adminBugs.php 1.16 1.17 +0 -5 appdb/admin/adminCommentView.php 1.35 1.36 +0 -8 appdb/admin/adminMaintainerQueue.php 1.28 1.29 +0 -5 appdb/admin/adminMaintainers.php 1.16 1.17 +0 -9 appdb/admin/adminScreenshots.php 1.17 1.18 +1 -6 appdb/admin/adminTestResults.php 1.13 1.14 +0 -9 appdb/admin/adminUsers.php 1.22 1.23 +0 -8 appdb/admin/deleteAny.php 1.43 1.44 +0 -5 appdb/admin/editAppFamily.php 1.29 1.30 +2 -9 appdb/admin/editAppNote.php 1.41 1.42 +0 -6 appdb/admin/editAppVersion.php 1.15 1.16 +10 -10 appdb/admin/editBundle.php 1.11 1.12 +1 -7 appdb/admin/editDistribution.php 1.15 1.16 +0 -6 appdb/admin/editVendor.php 1.11 1.12 +0 -6 appdb/admin/moveAppVersion.php 1.10 1.11 +5 -5 appdb/help/index.php 1.82 1.83 +5 -11 appdb/include/application.php 1.19 1.20 +4 -6 appdb/include/bugs.php 1.31 1.32 +1 -4 appdb/include/comment.php 1.3 1.4 +2 -6 appdb/include/distribution.php 1.8 1.9 +13 -8 appdb/include/filter.php 1.10 1.11 +0 -3 appdb/include/form_edit.php 1.8 1.9 +0 -4 appdb/include/form_login.php 1.10 1.11 +0 -6 appdb/include/form_new.php 1.38 1.39 +8 -1 appdb/include/incl.php 1.20 1.21 +1 -7 appdb/include/note.php 1.53 1.54 +1 -3 appdb/include/screenshot.php 1.24 1.25 +3 -5 appdb/include/sidebar.php 1.15 1.16 +6 -12 appdb/include/testData.php 1.10 1.11 +2 -6 appdb/include/url.php 1.77 1.78 +40 -38 appdb/include/util.php 1.90 1.91 +5 -9 appdb/include/version.php 1.23 1.24 +1 -5 appdb/include/vote.php

1 0

appdb/admin adminAppQueue.php
by WineHQ Jan. 4, 2007

Jan. 4, 2007

ChangeSet ID: 30850 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/03 18:43:58 Modified files: admin : adminAppQueue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> If the admin tries to view an application that does not exist, print an error and exit instead of fetching useless data as though there actually was an application. Patch: http://cvs.winehq.org/patch.py?id=30850 Old revision New revision Changes Path 1.68 1.69 +4 -0 appdb/admin/adminAppQueue.php Index: appdb/admin/adminAppQueue.php diff -u -p appdb/admin/adminAppQueue.php:1.68 appdb/admin/adminAppQueue.php:1.69 --- appdb/admin/adminAppQueue.php:1.68 4 Jan 2007 0:43:58 -0000 +++ appdb/admin/adminAppQueue.php 4 Jan 2007 0:43:58 -0000 @@ -145,6 +145,10 @@ if ($aClean['sSub']) $oApp = new Application($aClean['iAppId']); + /* Check that the application actually exists */ + if(!$oApp->iAppId) + util_show_error_page_and_exit("There is no application with that ID."); + // if we are processing a queued application there MUST be an implicitly queued // version to go along with it. $hResult = query_parameters("SELECT versionId from appVersion where appId='?';", $aClean['iAppId']);

1 0

appdb/help maintainer_ratings.help
by WineHQ Jan. 4, 2007

Jan. 4, 2007

ChangeSet ID: 30849 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/03 18:41:58 Modified files: help : maintainer_ratings.help Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Language fixes for maintainer rating help. Also sneak in the work 'flawlessly' in the description of the Platinum rating. It is already mentioned on the front page. Patch: http://cvs.winehq.org/patch.py?id=30849 Old revision New revision Changes Path 1.5 1.6 +12 -12 appdb/help/maintainer_ratings.help Index: appdb/help/maintainer_ratings.help diff -u -p appdb/help/maintainer_ratings.help:1.5 appdb/help/maintainer_ratings.help:1.6 --- appdb/help/maintainer_ratings.help:1.5 4 Jan 2007 0:41:58 -0000 +++ appdb/help/maintainer_ratings.help 4 Jan 2007 0:41:58 -0000 @@ -1,11 +1,11 @@ - + -<h3>Maintainers Ratings Definitions</h3> +<h3>Maintainer Rating Definitions</h3> <p> -The Application Database features a Maintainers rating system that allows you to see -which applications work the best in Wine. This rating system is designed to assist -users by giving a rating based on an "expert's" experience. +The Application Database features a maintainer rating system that allows you to see +which applications work best in Wine. This rating system is designed to assist +users by giving a rating based on an ‘expert’s’ experience. </p> <ul> @@ -13,7 +13,7 @@ users by giving a rating based on an "ex <li class="platinum">Platinum</li> <p> -An application can be rated as Platinum if it installs and runs "out of the box" No changes required to winecfg. +An application can be rated as Platinum if it installs and runs flawlessly ‘out of the box’. No changes required in winecfg. </p> <li class="gold">Gold</li> @@ -25,22 +25,22 @@ Application works flawlessly with some D <li class="silver">Silver</li> <p> -Application works excellently for 'normal' use; a game works fine in single-player but not -in multi-player, Windows Media Player works fine as a plug-in and stand-alone player, but can't handle DRM etc. +Application works excellently for ‘normal’ use; a game works fine in single-player but not +in multi-player, Windows Media Player works fine as a plug-in and stand-alone player, but cannot handle DRM etc. </p> <li class="Bronze">Bronze</li> <p> -Application works, but it has some issues, even for normal use; a game may not redraw properly or display fonts in wrong colours, be a much slower than it should etc. +Application works, but it has some issues, even for normal use; a game may not redraw properly or display fonts in wrong colours, be much slower than it should etc. </p> <li class="Garbage">Garbage</li> <p> -An app gets this rating if it cannot be used for the purpose it was designed for. -There should be at least one bug report in bugzilla if an app gets this rating. -Application doesn't start, or starts but has so many errors that it is nearly impossible to use it. +An application gets this rating if it cannot be used for the purpose it was designed for. +There should be at least one bug report in Bugzilla if it gets this rating. +Application does not start, or starts but has so many errors that it is nearly impossible to use it. </p> </ul>

1 0

appdb/include html.php
by WineHQ Jan. 4, 2007

Jan. 4, 2007

ChangeSet ID: 30848 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/03 18:38:06 Modified files: include : html.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Include the $extra argument in the output HTML. Patch: http://cvs.winehq.org/patch.py?id=30848 Old revision New revision Changes Path 1.10 1.11 +8 -1 appdb/include/html.php Index: appdb/include/html.php diff -u -p appdb/include/html.php:1.10 appdb/include/html.php:1.11 --- appdb/include/html.php:1.10 4 Jan 2007 0:38: 6 -0000 +++ appdb/include/html.php 4 Jan 2007 0:38: 6 -0000 @@ -23,9 +23,16 @@ function do_html_tr($t, $arr, $class, $e if(strlen($class)) $class = " class=\"$class\""; - $str = do_indent("<tr$class>", 1); + /* $extra contains parameters to <tr>, such as valign="top" */ + if(strlen($extra)) + $extra = " $extra"; + + $str = do_indent("<tr$class$extra>", 1); for($i = 0; $i < sizeof($arr); $i++) { + /* If it is not an array, it contains the entire table cell. If it + is an array, [0] holds the main content and [1] the options like + valign="top" */ if(is_array($arr[$i])) { $val = $arr[$i][0];

1 0

appdb/include application.php
by WineHQ Jan. 4, 2007

Jan. 4, 2007

ChangeSet ID: 30847 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/03 18:36:44 Modified files: include : application.php Log message: "Michael [Plouj] Ploujnikov" <ploujj(a)gmail.com> Fix spelling of the email response in include/application.php Patch: http://cvs.winehq.org/patch.py?id=30847 Old revision New revision Changes Path 1.81 1.82 +1 -1 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.81 appdb/include/application.php:1.82 --- appdb/include/application.php:1.81 4 Jan 2007 0:36:44 -0000 +++ appdb/include/application.php 4 Jan 2007 0:36:44 -0000 @@ -373,7 +373,7 @@ class Application { case "add": $sSubject = "Submitted application accepted"; $sMsg = "The application you submitted (".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname."."; - $sMsg .= "Administrators Responce:\n"; + $sMsg .= "Administrator's Response:\n"; break; case "reject": $sSubject = "Submitted application rejected";

1 0

Bernard Ladenthin : oleaut32: Better OleIconToCursor stub.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 26f29fdad015494df24d3c8d78f9d6272e001100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f29fdad015494df24d3c8d7… Author: Bernard Ladenthin <bernard(a)ladenthin.net> Date: Sat Dec 30 04:49:27 2006 +0100 oleaut32: Better OleIconToCursor stub. --- dlls/oleaut32/oleaut.c | 10 ++++++++++ dlls/oleaut32/stubs.c | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index d6a08a9..1fe68b8 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -837,3 +837,13 @@ BOOL WINAPI DllMain(HINSTANCE hInstDll, return TRUE; } + +/*********************************************************************** + * OleIconToCursor (OLEAUT32.415) + */ +HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hIcon) +{ + FIXME("(%p,%p), partially implemented.\n",hinstExe,hIcon); + /* FIXME: make a extended conversation from HICON to HCURSOR */ + return CopyCursor(hIcon); +} diff --git a/dlls/oleaut32/stubs.c b/dlls/oleaut32/stubs.c index ac2d494..d87e76e 100644 --- a/dlls/oleaut32/stubs.c +++ b/dlls/oleaut32/stubs.c @@ -33,15 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /*********************************************************************** - * OleIconToCursor (OLEAUT32.415) - */ -HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon) -{ - FIXME("(%p,%p), not implemented (olepro32.dll)\n",hinstExe,hicon); - return S_OK; -} - -/*********************************************************************** * OleCreatePropertyFrameIndirect (OLEAUT32.416) */ HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams)

1 0