wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Nikolay Sivov : gdi32: PlgBlt implementation.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: caafb52559235dae5903b36e9c1f5a9e1f5ab69e URL: http://source.winehq.org/git/wine.git/?a=commit;h=caafb52559235dae5903b36e9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Mar 27 01:59:34 2008 +0300 gdi32: PlgBlt implementation. --- dlls/gdi32/bitblt.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 4a814b7..e91ae53 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -20,6 +20,11 @@ #include <stdarg.h> +#include <math.h> +#ifdef HAVE_FLOAT_H +#include <float.h> +#endif + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -522,9 +527,75 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig * */ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, - HDC hdcSrc, INT nXDest, INT nYDest, INT nWidth, + HDC hdcSrc, INT nXSrc, INT nYSrc, INT nWidth, INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask) { - FIXME("PlgBlt, stub\n"); - return 1; + int oldgMode; + /* parallelogram coords */ + POINT plg[3]; + /* rect coords */ + POINT rect[3]; + XFORM xf; + XFORM SrcXf; + XFORM oldDestXf; + FLOAT det; + + /* save actual mode, set GM_ADVANCED */ + oldgMode = SetGraphicsMode(hdcDest,GM_ADVANCED); + if (oldgMode == 0) + return FALSE; + + memcpy(plg,lpPoint,sizeof(POINT)*3); + rect[0].x = nXSrc; + rect[0].y = nYSrc; + rect[1].x = nXSrc + nWidth; + rect[1].y = nYSrc; + rect[2].x = nXSrc; + rect[2].y = nYSrc + nHeight; + /* calc XFORM matrix to transform hdcDest -> hdcSrc (parallelogram to rectangle) */ + /* determinant */ + det = (FLOAT)(rect[1].x*(rect[2].y - rect[0].y) - rect[2].x*(rect[1].y - rect[0].y) - rect[0].x*(rect[2].y - rect[1].y)); + + if (fabs(det) < 1e-5) + { + SetGraphicsMode(hdcDest,oldgMode); + return FALSE; + } + + TRACE("hdcSrc=%p %d,%d,%dx%d -> hdcDest=%p %d,%d,%d,%d,%d,%d\n", + hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hdcDest, plg[0].x, plg[0].y, plg[1].x, plg[1].y, plg[2].x, plg[2].y); + + /* X components */ + xf.eM11 = (plg[1].x*(rect[2].y - rect[0].y) - plg[2].x*(rect[1].y - rect[0].y) - plg[0].x*(rect[2].y - rect[1].y)) / det; + xf.eM21 = (rect[1].x*(plg[2].x - plg[0].x) - rect[2].x*(plg[1].x - plg[0].x) - rect[0].x*(plg[2].x - plg[1].x)) / det; + xf.eDx = (rect[0].x*(rect[1].y*plg[2].x - rect[2].y*plg[1].x) - + rect[1].x*(rect[0].y*plg[2].x - rect[2].y*plg[0].x) + + rect[2].x*(rect[0].y*plg[1].x - rect[1].y*plg[0].x) + ) / det; + + /* Y components */ + xf.eM12 = (plg[1].y*(rect[2].y - rect[0].y) - plg[2].y*(rect[1].y - rect[0].y) - plg[0].y*(rect[2].y - rect[1].y)) / det; + xf.eM22 = (plg[1].x*(rect[2].y - rect[0].y) - plg[2].x*(rect[1].y - rect[0].y) - plg[0].x*(rect[2].y - rect[1].y)) / det; + xf.eDy = (rect[0].x*(rect[1].y*plg[2].y - rect[2].y*plg[1].y) - + rect[1].x*(rect[0].y*plg[2].y - rect[2].y*plg[0].y) + + rect[2].x*(rect[0].y*plg[1].y - rect[1].y*plg[0].y) + ) / det; + + GetWorldTransform(hdcSrc,&SrcXf); + CombineTransform(&xf,&xf,&SrcXf); + + /* save actual dest transform */ + GetWorldTransform(hdcDest,&oldDestXf); + + SetWorldTransform(hdcDest,&xf); + /* now destination and source DCs use same coords */ + MaskBlt(hdcDest,nXSrc,nYSrc,nWidth,nHeight, + hdcSrc, nXSrc,nYSrc, + hbmMask,xMask,yMask, + SRCCOPY); + /* restore dest DC */ + SetWorldTransform(hdcDest,&oldDestXf); + SetGraphicsMode(hdcDest,oldgMode); + + return TRUE; }

1 0

James Hawkins : shell32: Handle a few cases in FO_COPY that arise from not double-NULL terminating the input .
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 6ecccdb790fad9dd24acdbc12fbc361ebe148fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ecccdb790fad9dd24acdbc12… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 2 03:28:29 2008 -0500 shell32: Handle a few cases in FO_COPY that arise from not double-NULL terminating the input. --- dlls/shell32/shlfileop.c | 11 +++- dlls/shell32/tests/shlfileop.c | 111 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 61d7ab0..cb7f995 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1186,8 +1186,12 @@ static HRESULT copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, const FIL if (op->req->fFlags & FOF_MULTIDESTFILES && flFrom->bAnyFromWildcard) return ERROR_CANCELLED; - if (!(op->req->fFlags & FOF_MULTIDESTFILES) && flTo->dwNumFiles != 1) + if (!(op->req->fFlags & FOF_MULTIDESTFILES) && + flFrom->dwNumFiles != 1 && flTo->dwNumFiles != 1 && + !flFrom->bAnyFromWildcard) + { return ERROR_CANCELLED; + } if (op->req->fFlags & FOF_MULTIDESTFILES && flFrom->dwNumFiles != 1 && flFrom->dwNumFiles != flTo->dwNumFiles) @@ -1243,7 +1247,8 @@ static HRESULT copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, const FIL } if ((flFrom->dwNumFiles > 1 && flTo->dwNumFiles == 1) || - (flFrom->dwNumFiles == 1 && IsAttribDir(fileDest->attributes))) + (IsAttribDir(fileDest->attributes) && + (flFrom->dwNumFiles == 1 || flFrom->bAnyFromWildcard))) { copy_to_dir(op, entryToCopy, fileDest); } @@ -1537,7 +1542,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) if (ret == ERROR_CANCELLED) lpFileOp->fAnyOperationsAborted = TRUE; - + return ret; } diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 247ab76..bc82fc1 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -839,6 +839,117 @@ static void test_copy(void) retval = SHFileOperation(&shfo); ok(retval == 0, "Expected 0, got %d\n", retval); ok(file_has_content("testdir2\\test4.txt\\test1.txt", "test4.txt\\.\\test1.txt\n"), "The file was not copied\n"); + + createTestFile("one.txt"); + + /* no double-NULL terminator for pFrom */ + memset(from, 'a', MAX_PATH); + lstrcpyA(from, "one.txt"); + shfo.pFrom = from; + shfo.pTo = "two.txt\0"; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + retval = SHFileOperation(&shfo); + todo_wine + { + ok(retval == 1148, "Expected 1148, got %d\n", retval); + } + ok(DeleteFileA("one.txt"), "Expected file to exist\n"); + ok(!DeleteFileA("two.txt"), "Expected file to not exist\n"); + + createTestFile("one.txt"); + + /* no double-NULL terminator for pTo */ + memset(to, 'a', MAX_PATH); + lstrcpyA(to, "two.txt"); + shfo.pFrom = "one.txt\0"; + shfo.pTo = to; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + retval = SHFileOperation(&shfo); + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("one.txt"), "Expected file to exist\n"); + ok(DeleteFileA("two.txt"), "Expected file to exist\n"); + + createTestFile("one.txt"); + + /* no FOF_MULTIDESTFILES, two files in pTo */ + shfo.pFrom = "one.txt\0"; + shfo.pTo = "two.txt\0three.txt\0"; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + retval = SHFileOperation(&shfo); + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("one.txt"), "Expected file to exist\n"); + ok(DeleteFileA("two.txt"), "Expected file to exist\n"); + + createTestFile("one.txt"); + + /* no double-NULL terminator for pFrom and pTo */ + memset(from, 'a', MAX_PATH); + memset(to, 'a', MAX_PATH); + lstrcpyA(from, "one.txt"); + lstrcpyA(to, "two.txt"); + shfo.pFrom = from; + shfo.pTo = to; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + retval = SHFileOperation(&shfo); + todo_wine + { + ok(retval == 1148, "Expected 1148, got %d\n", retval); + } + ok(DeleteFileA("one.txt"), "Expected file to exist\n"); + ok(!DeleteFileA("two.txt"), "Expected file to not exist\n"); + + createTestFile("one.txt"); + + /* no double-NULL terminator for pTo, FOF_MULTIDESTFILES */ + memset(to, 'a', MAX_PATH); + lstrcpyA(to, "two.txt"); + shfo.pFrom = "one.txt\0"; + shfo.pTo = to; + shfo.fFlags = FOF_MULTIDESTFILES | FOF_NOCONFIRMATION | + FOF_SILENT | FOF_NOERRORUI; + retval = SHFileOperation(&shfo); + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("one.txt"), "Expected file to exist\n"); + ok(DeleteFileA("two.txt"), "Expected file to exist\n"); + + createTestFile("one.txt"); + createTestFile("two.txt"); + + /* no double-NULL terminator for pTo, + * multiple source files, FOF_MULTIDESTFILES + */ + memset(to, 'a', 2 * MAX_PATH); + lstrcpyA(to, "three.txt"); + shfo.pFrom = "one.txt\0two.txt\0"; + shfo.pTo = to; + shfo.fFlags = FOF_MULTIDESTFILES | FOF_NOCONFIRMATION | + FOF_SILENT | FOF_NOERRORUI; + retval = SHFileOperation(&shfo); + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + ok(DeleteFileA("one.txt"), "Expected file to exist\n"); + ok(DeleteFileA("two.txt"), "Expected file to exist\n"); + todo_wine + { + ok(!DeleteFileA("three.txt"), "Expected file to not exist\n"); + } + + createTestFile("aa.txt"); + createTestFile("ab.txt"); + CreateDirectoryA("one", NULL); + CreateDirectoryA("two", NULL); + + /* pFrom has a glob, pTo has more than one dest */ + shfo.pFrom = "a*.txt\0"; + shfo.pTo = "one\0two\0"; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + retval = SHFileOperation(&shfo); + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("one\\aa.txt"), "Expected file to exist\n"); + ok(DeleteFileA("one\\ab.txt"), "Expected file to exist\n"); + ok(DeleteFileA("aa.txt"), "Expected file to exist\n"); + ok(DeleteFileA("ab.txt"), "Expected file to exist\n"); + ok(RemoveDirectoryA("one"), "Expected dir to exist\n"); + ok(RemoveDirectoryA("two"), "Expected dir to exist\n"); } /* tests the FO_MOVE action */

1 0

James Hawkins : msi: Handle sorting an empty table.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: bed661aef47c0e565bb61961098a6f52238ce092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed661aef47c0e565bb619610… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 2 03:47:24 2008 -0500 msi: Handle sorting an empty table. --- dlls/msi/table.c | 3 +++ dlls/msi/tests/db.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index a8f0f40..572cad6 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2054,6 +2054,9 @@ static UINT TABLE_sort(struct tagMSIVIEW *view, column_info *columns) if (r != ERROR_SUCCESS) return r; + if (rows == 0) + return ERROR_SUCCESS; + order = msi_alloc_zero(sizeof(MSIORDERINFO) + sizeof(UINT) * cols); if (!order) return ERROR_OUTOFMEMORY; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index ac15d24..aee2e80 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4777,6 +4777,10 @@ static void test_order(void) hdb = create_db(); ok(hdb, "failed to create db\n"); + query = "CREATE TABLE `Empty` ( `A` SHORT NOT NULL PRIMARY KEY `A`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + query = "CREATE TABLE `Mesa` ( `A` SHORT NOT NULL, `B` SHORT, `C` SHORT PRIMARY KEY `A`)"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -4964,6 +4968,18 @@ static void test_order(void) MsiViewClose(hview); MsiCloseHandle(hview); + + query = "SELECT * FROM `Empty` ORDER BY `A`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiViewClose(hview); + MsiCloseHandle(hview); MsiCloseHandle(hdb); }

1 0

EA Durbin : include: Define some console display modes.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 9cd9023db6dea20bd5493749e480f420e70cae2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd9023db6dea20bd5493749e… Author: EA Durbin <ead1234(a)hotmail.com> Date: Mon Mar 31 20:44:28 2008 -0500 include: Define some console display modes. --- include/wincon.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wincon.h b/include/wincon.h index f17961e..3257c21 100644 --- a/include/wincon.h +++ b/include/wincon.h @@ -23,6 +23,9 @@ extern "C" { #endif +#define CONSOLE_FULLSCREEN 1 +#define CONSOLE_FULLSCREEN_HARDWARE 2 + #define CTRL_C_EVENT 0 #define CTRL_BREAK_EVENT 1 #define CTRL_CLOSE_EVENT 2

1 0

Alexandre Julliard : wineboot: Make services. exe inherit the wineboot event to keep it alive.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: d478cc42d8e12d88f5165bff902adc28d0afe936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d478cc42d8e12d88f5165bff9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 12:19:25 2008 +0200 wineboot: Make services.exe inherit the wineboot event to keep it alive. --- programs/wineboot/wineboot.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4d0236e..b57dea9 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -557,7 +557,7 @@ static BOOL start_services_process(void) strcatW(path, services); ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); - if (!CreateProcessW(path, path, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + if (!CreateProcessW(path, path, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) { WINE_ERR("Couldn't start services.exe: error %u\n", GetLastError()); return FALSE; @@ -749,6 +749,7 @@ int main( int argc, char *argv[] ) int optc; int end_session = 0, force = 0, init = 0, kill = 0, restart = 0, shutdown = 0; HANDLE event; + SECURITY_ATTRIBUTES sa; GetWindowsDirectoryW( windowsdir, MAX_PATH ); if( !SetCurrentDirectoryW( windowsdir ) ) @@ -781,7 +782,11 @@ int main( int argc, char *argv[] ) if (shutdown) return 0; - event = CreateEventW( NULL, TRUE, FALSE, wineboot_eventW ); + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = TRUE; /* so that services.exe inherits it */ + event = CreateEventW( &sa, TRUE, FALSE, wineboot_eventW ); + ResetEvent( event ); /* in case this is a restart */ wininit();

1 0

Rob Shearman : wineboot: Start services. exe on startup instead of on demand in the advapi32 services code.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 9bc84d81df330610a52c7b6cd1805dfed84b8f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bc84d81df330610a52c7b6cd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 1 12:48:46 2008 +0100 wineboot: Start services.exe on startup instead of on demand in the advapi32 services code. --- dlls/advapi32/service.c | 62 +----------------------------------------- programs/wineboot/wineboot.c | 44 +++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 61 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index c95fcd9..77dc30b 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -244,78 +244,18 @@ static inline DWORD multisz_cb(LPCWSTR wmultisz) } /****************************************************************************** - * RPC connection with servies.exe + * RPC connection with services.exe */ -static BOOL check_services_exe(void) -{ - static const WCHAR svcctl_started_event[] = SVCCTL_STARTED_EVENT; - HANDLE hEvent = OpenEventW(SYNCHRONIZE, FALSE, svcctl_started_event); - if (hEvent == NULL) /* need to start services.exe */ - { - static const WCHAR services[] = {'\\','s','e','r','v','i','c','e','s','.','e','x','e',0}; - PROCESS_INFORMATION out; - STARTUPINFOW si; - HANDLE wait_handles[2]; - WCHAR path[MAX_PATH]; - - if (!GetSystemDirectoryW(path, MAX_PATH - strlenW(services))) - return FALSE; - strcatW(path, services); - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - if (!CreateProcessW(path, path, NULL, NULL, FALSE, 0, NULL, NULL, &si, &out)) - { - ERR("Couldn't start services.exe: error %u\n", GetLastError()); - return FALSE; - } - CloseHandle(out.hThread); - - hEvent = CreateEventW(NULL, TRUE, FALSE, svcctl_started_event); - wait_handles[0] = hEvent; - wait_handles[1] = out.hProcess; - - /* wait for the event to become available or the process to exit */ - if ((WaitForMultipleObjects(2, wait_handles, FALSE, INFINITE)) == WAIT_OBJECT_0 + 1) - { - DWORD exit_code; - GetExitCodeProcess(out.hProcess, &exit_code); - ERR("Unexpected termination of services.exe - exit code %d\n", exit_code); - CloseHandle(out.hProcess); - CloseHandle(hEvent); - return FALSE; - } - - TRACE("services.exe started successfully\n"); - CloseHandle(out.hProcess); - CloseHandle(hEvent); - return TRUE; - } - - TRACE("Waiting for services.exe to be available\n"); - WaitForSingleObject(hEvent, INFINITE); - TRACE("Services.exe are available\n"); - CloseHandle(hEvent); - - return TRUE; -} - handle_t __RPC_USER MACHINE_HANDLEW_bind(MACHINE_HANDLEW MachineName) { WCHAR transport[] = SVCCTL_TRANSPORT; WCHAR endpoint[] = SVCCTL_ENDPOINT; - LPWSTR server_copy = NULL; RPC_WSTR binding_str; RPC_STATUS status; handle_t rpc_handle; - /* unlike Windows we start services.exe on demand. We start it always as - * checking if this is our address can be tricky */ - if (!check_services_exe()) - return NULL; - status = RpcStringBindingComposeW(NULL, transport, (RPC_WSTR)MachineName, endpoint, NULL, &binding_str); - HeapFree(GetProcessHeap(), 0, server_copy); if (status != RPC_S_OK) { ERR("RpcStringBindingComposeW failed (%d)\n", (DWORD)status); diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 30c7752..4d0236e 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -61,6 +61,7 @@ # include <getopt.h> #endif #include <windows.h> +#include <wine/svcctl.h> #include <wine/unicode.h> #include <wine/debug.h> @@ -542,6 +543,46 @@ static int ProcessWindowsFileProtection(void) return 1; } +static BOOL start_services_process(void) +{ + static const WCHAR svcctl_started_event[] = SVCCTL_STARTED_EVENT; + static const WCHAR services[] = {'\\','s','e','r','v','i','c','e','s','.','e','x','e',0}; + PROCESS_INFORMATION pi; + STARTUPINFOW si; + HANDLE wait_handles[2]; + WCHAR path[MAX_PATH]; + + if (!GetSystemDirectoryW(path, MAX_PATH - strlenW(services))) + return FALSE; + strcatW(path, services); + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + if (!CreateProcessW(path, path, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + WINE_ERR("Couldn't start services.exe: error %u\n", GetLastError()); + return FALSE; + } + CloseHandle(pi.hThread); + + wait_handles[0] = CreateEventW(NULL, TRUE, FALSE, svcctl_started_event); + wait_handles[1] = pi.hProcess; + + /* wait for the event to become available or the process to exit */ + if ((WaitForMultipleObjects(2, wait_handles, FALSE, INFINITE)) == WAIT_OBJECT_0 + 1) + { + DWORD exit_code; + GetExitCodeProcess(pi.hProcess, &exit_code); + WINE_ERR("Unexpected termination of services.exe - exit code %d\n", exit_code); + CloseHandle(pi.hProcess); + CloseHandle(wait_handles[0]); + return FALSE; + } + + CloseHandle(pi.hProcess); + CloseHandle(wait_handles[0]); + return TRUE; +} + /* start services */ static void start_services(void) { @@ -554,6 +595,9 @@ static void start_services(void) WCHAR name[MAX_PATH]; SC_HANDLE manager; + if (!start_services_process()) return; + + /* FIXME: do all of this in services.exe instead */ if (RegOpenKeyW( HKEY_LOCAL_MACHINE, servicesW, &hkey )) return; if (!(manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS )))

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : avifil32: Updated Korean resource.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: bea9f062003a370738eceef31a3f27d5d1cc42fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea9f062003a370738eceef31… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Apr 1 09:38:24 2008 +0900 avifil32: Updated Korean resource. --- dlls/avifil32/avifile_Ko.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/avifile_Ko.rc b/dlls/avifil32/avifile_Ko.rc index 035888c..4bf6004 100644 --- a/dlls/avifil32/avifile_Ko.rc +++ b/dlls/avifil32/avifile_Ko.rc @@ -31,8 +31,8 @@ BEGIN AUTOCHECKBOX "�׻� ��ȣ��ġ(&I)",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL LTEXT "��",-1,104,43,36,9 - LTEXT "�� :",-1,3,56,53,9 - LTEXT "�� ϴ� ��",IDC_FORMATTEXT,55,56,90,26 + LTEXT "�� :",-1,3,56,53,9 + LTEXT "�ʿ�� ",IDC_FORMATTEXT,55,56,90,26 DEFPUSHBUTTON "Ȯ��",IDOK,145,42,45,14 PUSHBUTTON "��",IDCANCEL,145,61,45,14 END @@ -46,6 +46,6 @@ STRINGTABLE DISCARDABLE IDS_VIDEO "��" IDS_AUDIO "��" IDS_AVISTREAMFORMAT "%s %s #%d" - IDS_AVIFILETYPE "Wine AVI-�⺻-��ڵ鷯r" + IDS_AVIFILETYPE "Wine AVI-�⺻-��ڵ鷯" IDS_UNCOMPRESSED "��" }

1 0

Rob Shearman : net: Display a more specific error message when a service command fails.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: e4c8d763c9839391d41498b6512fece32037c7f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c8d763c9839391d41498b65… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 1 12:49:29 2008 +0100 net: Display a more specific error message when a service command fails. Use FormatMessage to get the message for the Win32 error. --- programs/net/net.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index f27c853..30337a6 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -37,6 +37,20 @@ int output_string(int msg, ...) return 0; } +BOOL output_error_string(DWORD error) +{ + LPSTR pBuffer; + if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, error, 0, (LPSTR)&pBuffer, 0, NULL)) + { + fputs(pBuffer, stdout); + LocalFree(pBuffer); + return TRUE; + } + return FALSE; +} + static BOOL net_use(int argc, char *argv[]) { USE_INFO_2 *buffer, *connection; @@ -140,14 +154,22 @@ static BOOL net_service(int operation, char *service_name) result = StartService(serviceHandle, 0, NULL); if(result) output_string(STRING_START_SVC_SUCCESS, service_display_name); - else output_string(STRING_START_SVC_FAIL, service_display_name); + else + { + if (!output_error_string(GetLastError())) + output_string(STRING_START_SVC_FAIL, service_display_name); + } break; case NET_STOP: output_string(STRING_STOP_SVC, service_display_name); result = StopService(SCManager, serviceHandle); if(result) output_string(STRING_STOP_SVC_SUCCESS, service_display_name); - else output_string(STRING_STOP_SVC_FAIL, service_display_name); + else + { + if (!output_error_string(GetLastError())) + output_string(STRING_STOP_SVC_FAIL, service_display_name); + } break; }

1 0

Maarten Lankhorst : include: Add BroadcastSystemMessageEx.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: e4136355f01f4f550cbd09a2cff64e7f01e38f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4136355f01f4f550cbd09a2c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 11:49:53 2008 -0700 include: Add BroadcastSystemMessageEx. --- include/winuser.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index f7bf196..366ab9f 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -104,6 +104,13 @@ typedef struct tagUSEROBJECTFLAGS { DWORD dwFlags; } USEROBJECTFLAGS, *PUSEROBJECTFLAGS; +typedef struct tagBSMINFO { + UINT cbSize; + HDESK hdesk; + HWND hwnd; + LUID luid; +} BSMINFO, *PBSMINFO; + /* Window stations */ #define WINSTA_ENUMDESKTOPS 0x0001 #define WINSTA_READATTRIBUTES 0x0002 @@ -4324,6 +4331,9 @@ WINUSERAPI BOOL WINAPI BringWindowToTop(HWND); WINUSERAPI LONG WINAPI BroadcastSystemMessageA(DWORD,LPDWORD,UINT,WPARAM,LPARAM); WINUSERAPI LONG WINAPI BroadcastSystemMessageW(DWORD,LPDWORD,UINT,WPARAM,LPARAM); #define BroadcastSystemMessage WINELIB_NAME_AW(BroadcastSystemMessage) +WINUSERAPI LONG WINAPI BroadcastSystemMessageExA(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO); +WINUSERAPI LONG WINAPI BroadcastSystemMessageExW(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO); +#define BroadcastSystemMessageEx WINELIB_NAME_AW(BroadcastSystemMessageEx) WINUSERAPI void WINAPI CalcChildScroll(HWND, INT); WINUSERAPI BOOL WINAPI CallMsgFilterA(LPMSG,INT); WINUSERAPI BOOL WINAPI CallMsgFilterW(LPMSG,INT);

1 0

Maarten Lankhorst : quartz: Make acmwrapper respond to a sample discontinuity by dropping the frame after parsing it .
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 975dc033024fb7f9215930a5bf75d38ac83dd481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=975dc033024fb7f9215930a5b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 14:49:54 2008 -0700 quartz: Make acmwrapper respond to a sample discontinuity by dropping the frame after parsing it. --- dlls/quartz/acmwrapper.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index ffe14c9..35e154c 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -47,7 +47,6 @@ typedef struct ACMWrapperImpl HACMSTREAM has; LPWAVEFORMATEX pWfIn; LPWAVEFORMATEX pWfOut; - BOOL reinit_codec; /* FIXME: Should use sync points instead */ } ACMWrapperImpl; static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilter, IMediaSample *pSample) @@ -115,19 +114,31 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte } unprepare_header = TRUE; - if ((res = acmStreamConvert(This->has, &ash, This->reinit_codec ? ACM_STREAMCONVERTF_START : 0))) { + if (IMediaSample_IsDiscontinuity(pSample) == S_OK) + res = acmStreamConvert(This->has, &ash, ACM_STREAMCONVERTF_START); + else + res = acmStreamConvert(This->has, &ash, 0); + + + if (res) + { if(res != MMSYSERR_MOREDATA) ERR("Cannot convert data header %d\n", res); goto error; } - This->reinit_codec = FALSE; TRACE("used in %u/%u, used out %u/%u\n", ash.cbSrcLengthUsed, ash.cbSrcLength, ash.cbDstLengthUsed, ash.cbDstLength); hr = IMediaSample_SetActualDataLength(pOutSample, ash.cbDstLengthUsed); assert(hr == S_OK); - assert(ash.cbSrcLengthUsed); + if (!ash.cbSrcLengthUsed) + { + WARN("Sample was skipped\n"); + ash.cbSrcLength = 0; + goto error; + } + TRACE("Sample start time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000)); if (ash.cbSrcLengthUsed == cbSrcStream) { @@ -148,7 +159,11 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte } TRACE("Sample stop time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000)); - hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); + if (IMediaSample_IsDiscontinuity(pSample) == S_FALSE) + hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); + else + TRACE("Skipping first sample: Discontinuity\n"); + if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { if (FAILED(hr)) ERR("Error sending sample (%x)\n", hr); @@ -259,8 +274,6 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) This = CoTaskMemAlloc(sizeof(ACMWrapperImpl)); ZeroMemory(This, sizeof(ACMWrapperImpl)); - This->reinit_codec = TRUE; - hr = TransformFilter_Create(&(This->tf), &CLSID_ACMWrapper, &ACMWrapper_FuncsTable, NULL, NULL, NULL); if (FAILED(hr))

1 0

Maarten Lankhorst : quartz: Add seeking to mpeg splitter.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 553fe8565df83e3dc024841fdb2354ce088386cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=553fe8565df83e3dc024841fd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 14:43:09 2008 -0700 quartz: Add seeking to mpeg splitter. --- dlls/quartz/mpegsplit.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 79 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 0185b80..fcd0a5c 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -737,6 +737,84 @@ static HRESULT MPEGSplitter_cleanup(LPVOID iface) return S_OK; } +static HRESULT MPEGSplitter_seek(IBaseFilter *iface) +{ + MPEGSplitterImpl *This = (MPEGSplitterImpl*)iface; + PullPin *pPin = This->Parser.pInputPin; + LONGLONG newpos, timepos, bytepos; + HRESULT hr = S_OK; + BYTE header[4]; + + /* Position, in bytes */ + bytepos = This->header_bytes; + + /* Position, in media time, current and new */ + timepos = 0; + newpos = This->Parser.mediaSeeking.llCurrent; + + if (newpos > This->duration) + { + FIXME("Requesting position %x%08x beyond end of stream %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(This->duration>>32), (DWORD)This->duration); + return E_INVALIDARG; + } + + if (This->position/1000000 == newpos/1000000) + { + FIXME("Requesting position %x%08x same as current position %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(This->position>>32), (DWORD)This->position); + return S_OK; + } + + hr = IAsyncReader_SyncRead(pPin->pReader, bytepos, 4, header); + + while (bytepos < This->EndOfFile && SUCCEEDED(hr)) + { + LONGLONG length = 0; + hr = IAsyncReader_SyncRead(pPin->pReader, bytepos, 4, header); + while (parse_header(header, &length, &timepos)) + { + /* No valid header yet; shift by a byte and check again */ + memmove(header, header+1, 3); + hr = IAsyncReader_SyncRead(pPin->pReader, ++bytepos, 1, header + 3); + if (FAILED(hr)) + break; + } + bytepos += length; + TRACE("Pos: %x%08x/%x%08x\n", (DWORD)(bytepos >> 32), (DWORD)bytepos, (DWORD)(This->EndOfFile>>32), (DWORD)This->EndOfFile); + if (timepos >= newpos) + break; + } + if (SUCCEEDED(hr)) + { + FILTER_STATE state; + PullPin *pin = This->Parser.pInputPin; + + TRACE("Moving sound to %x%08x bytes!\n", (DWORD)(bytepos>>32), (DWORD)bytepos); + + IPin_BeginFlush((IPin *)pin); + IPin_NewSegment((IPin*)pin, newpos, This->duration, pin->dRate); + IPin_EndFlush((IPin *)pin); + + /* Make sure this is done while stopped */ + EnterCriticalSection(&This->Parser.csFilter); + pin->rtStart = pin->rtCurrent = MEDIATIME_FROM_BYTES(bytepos); + pin->rtStop = MEDIATIME_FROM_BYTES((REFERENCE_TIME)This->EndOfFile); + This->seek = TRUE; + This->skipbytes = This->remaining_bytes = 0; + This->position = newpos; + if (This->pCurrentSample) + { + IMediaSample_Release(This->pCurrentSample); + This->pCurrentSample = NULL; + } + state = This->Parser.state; + LeaveCriticalSection(&This->Parser.csFilter); + + if (state == State_Running && pin->state == State_Paused) + PullPin_StartProcessing(pin); + + } + return hr; +} HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { @@ -755,7 +833,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) return E_OUTOFMEMORY; ZeroMemory(This, sizeof(MPEGSplitterImpl)); - hr = Parser_Create(&(This->Parser), &CLSID_MPEG1Splitter, MPEGSplitter_process_sample, MPEGSplitter_query_accept, MPEGSplitter_pre_connect, MPEGSplitter_cleanup, NULL, NULL, NULL); + hr = Parser_Create(&(This->Parser), &CLSID_MPEG1Splitter, MPEGSplitter_process_sample, MPEGSplitter_query_accept, MPEGSplitter_pre_connect, MPEGSplitter_cleanup, NULL, MPEGSplitter_seek, NULL); if (FAILED(hr)) { CoTaskMemFree(This);

1 0

Maarten Lankhorst : quartz: Prepare mpeg splitter code for seeking by making most splitter parsing locked .
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: b1b75243d494da501f13c6cb213ff91255853ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b75243d494da501f13c6cb2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 14:42:32 2008 -0700 quartz: Prepare mpeg splitter code for seeking by making most splitter parsing locked. --- dlls/quartz/mpegsplit.c | 91 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 63 insertions(+), 28 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 0dbc3c5..0185b80 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -60,7 +60,9 @@ typedef struct MPEGSplitterImpl LONGLONG duration; LONGLONG position; DWORD skipbytes; + DWORD header_bytes; DWORD remaining_bytes; + BOOL seek; } MPEGSplitterImpl; static int MPEGSplitter_head_check(const BYTE *header) @@ -115,7 +117,7 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) ((header[1]>>1)&0x3) != 0 && ((header[2]>>4)&0xf) != 0xf && ((header[2]>>2)&0x3) != 0x3)) { - WARN("Not a valid header: %02x:%02x\n", header[0], header[1]); + FIXME("Not a valid header: %02x:%02x\n", header[0], header[1]); return E_INVALIDARG; } @@ -132,6 +134,13 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) emphasis = ((header[3]>>0)&0x3); bitrate = tabsel_123[lsf][layer-1][bitrate_index] * 1000; + if (!bitrate || layer != 3) + { + ERR("Not a valid header: %02x:%02x:%02x:%02x\n", header[0], header[1], header[2], header[3]); + return E_INVALIDARG; + } + + if (layer == 3 || layer == 2) length = 144 * bitrate / freqs[freq_index] + padding; else @@ -173,7 +182,7 @@ static HRESULT copy_data(IMediaSample *to, BYTE** from, DWORD *flen, DWORD amoun return hr; } -static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen) +static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen, IMediaSample *pCurrentSample) { Parser_OutputPin * pOutputPin = (Parser_OutputPin*)This->Parser.ppPins[1]; LONGLONG length = 0; @@ -197,11 +206,11 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen) { DWORD towrite = min(This->remaining_bytes, *flen); - hr = copy_data(This->pCurrentSample, fbuf, flen, towrite); + hr = copy_data(pCurrentSample, fbuf, flen, towrite); if (FAILED(hr)) { WARN("Could not resize sample: %08x\n", hr); - goto release; + return hr; } This->remaining_bytes -= towrite; @@ -213,7 +222,7 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen) } /* Special case, last source sample might (or might not have) had a header, and now we want to retrieve it */ - dlen = IMediaSample_GetActualDataLength(This->pCurrentSample); + dlen = IMediaSample_GetActualDataLength(pCurrentSample); if (dlen > 0 && dlen < 4) { BYTE *header = NULL; @@ -222,15 +231,15 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen) /* Shoot anyone with a small sample! */ assert(*flen >= 6); - hr = IMediaSample_GetPointer(This->pCurrentSample, &header); + hr = IMediaSample_GetPointer(pCurrentSample, &header); if (SUCCEEDED(hr)) - hr = IMediaSample_SetActualDataLength(This->pCurrentSample, 7); + hr = IMediaSample_SetActualDataLength(pCurrentSample, 7); if (FAILED(hr)) { WARN("Could not resize sample: %08x\n", hr); - goto release; + return hr; } memcpy(header + dlen, *fbuf, 6 - dlen); @@ -243,12 +252,12 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen) /* No header found */ if (attempts == dlen) { - hr = IMediaSample_SetActualDataLength(This->pCurrentSample, 0); + hr = IMediaSample_SetActualDataLength(pCurrentSample, 0); return hr; } - IMediaSample_SetActualDataLength(This->pCurrentSample, 4); - IMediaSample_SetTime(This->pCurrentSample, &time, &This->position); + IMediaSample_SetActualDataLength(pCurrentSample, 4); + IMediaSample_SetTime(pCurrentSample, &time, &This->position); /* Move header back to beginning */ if (attempts) @@ -274,21 +283,21 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen) if (*flen < 4) { assert(!length); - hr = copy_data(This->pCurrentSample, fbuf, flen, *flen); + hr = copy_data(pCurrentSample, fbuf, flen, *flen); return hr; } - IMediaSample_SetTime(This->pCurrentSample, &time, &This->position); + IMediaSample_SetTime(pCurrentSample, &time, &This->position); if (*flen < length) { /* Partial copy: Copy 4 bytes, the rest will be copied by the logic for This->remaining_bytes */ This->remaining_bytes = length - 4; - copy_data(This->pCurrentSample, fbuf, flen, 4); + copy_data(pCurrentSample, fbuf, flen, 4); return hr; } - hr = copy_data(This->pCurrentSample, fbuf, flen, length); + hr = copy_data(pCurrentSample, fbuf, flen, length); if (FAILED(hr)) { WARN("Couldn't set data size to %x%08x\n", (DWORD)(length >> 32), (DWORD)length); @@ -306,21 +315,33 @@ out_append: if (length > *flen) break; - if (FAILED(copy_data(This->pCurrentSample, fbuf, flen, length))) + if (FAILED(copy_data(pCurrentSample, fbuf, flen, length))) break; This->position += sampleduration; sampleduration = 0; - IMediaSample_SetTime(This->pCurrentSample, &time, &This->position); + IMediaSample_SetTime(pCurrentSample, &time, &This->position); } TRACE("Media time: %u.%03u\n", (DWORD)(This->position/10000000), (DWORD)((This->position/10000)%1000)); - hr = OutputPin_SendSample(&pOutputPin->pin, This->pCurrentSample); + IMediaSample_AddRef(pCurrentSample); + LeaveCriticalSection(&This->Parser.csFilter); + + hr = OutputPin_SendSample(&pOutputPin->pin, pCurrentSample); + + EnterCriticalSection(&This->Parser.csFilter); + IMediaSample_Release(pCurrentSample); + if (FAILED(hr)) + { WARN("Error sending sample (%x)\n", hr); -release: - IMediaSample_Release(This->pCurrentSample); - This->pCurrentSample = NULL; + return hr; + } + if (This->pCurrentSample) + { + IMediaSample_Release(pCurrentSample); + This->pCurrentSample = NULL; + } return hr; } @@ -346,6 +367,7 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample) /* trace removed for performance reasons */ /* TRACE("(%p), %llu -> %llu\n", pSample, tStart, tStop); */ + EnterCriticalSection(&This->Parser.csFilter); /* Now, try to find a new header */ while (cbSrcStream > 0) { @@ -361,16 +383,16 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample) if (FAILED(hr = IMediaSample_SetActualDataLength(This->pCurrentSample, 0))) goto fail; IMediaSample_SetSyncPoint(This->pCurrentSample, TRUE); + IMediaSample_SetDiscontinuity(This->pCurrentSample, This->seek); + This->seek = FALSE; } - hr = FillBuffer(This, &pbSrcStream, &cbSrcStream); - if (SUCCEEDED(hr)) { - if (hr == S_FALSE) - break; + hr = FillBuffer(This, &pbSrcStream, &cbSrcStream, This->pCurrentSample); + if (SUCCEEDED(hr) && hr != S_FALSE) continue; - } fail: - FIXME("Failed with hres: %08x!\n", hr); + if (hr != S_FALSE) + FIXME("Failed with hres: %08x!\n", hr); This->skipbytes += This->remaining_bytes; This->remaining_bytes = 0; if (This->pCurrentSample) @@ -379,6 +401,7 @@ fail: IMediaSample_Release(This->pCurrentSample); This->pCurrentSample = NULL; } + break; } if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile) @@ -416,6 +439,7 @@ fail: hr = S_FALSE; } + LeaveCriticalSection(&This->Parser.csFilter); return hr; } @@ -612,7 +636,7 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) if (FAILED(hr)) return hr; pos -= 4; - This->skipbytes = pos; + This->header_bytes = This->skipbytes = pos; switch(streamtype) { @@ -671,6 +695,7 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) hr = S_OK; TRACE("Duration: %d seconds\n", (DWORD)(duration / 10000000)); TRACE("Parsing took %u ms\n", GetTickCount() - ticks); + This->duration = duration; break; } case MPEG_VIDEO_HEADER: @@ -701,9 +726,18 @@ static HRESULT MPEGSplitter_cleanup(LPVOID iface) IMediaSample_Release(This->pCurrentSample); This->pCurrentSample = NULL; + if (This->Parser.pInputPin && !This->seek) + { + This->skipbytes += This->remaining_bytes; + This->Parser.pInputPin->rtCurrent += MEDIATIME_FROM_BYTES(This->skipbytes); + } + if (!This->seek) + This->skipbytes = This->remaining_bytes = 0; + return S_OK; } + HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { MPEGSplitterImpl *This; @@ -727,6 +761,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) CoTaskMemFree(This); return hr; } + This->seek = TRUE; /* Note: This memory is managed by the parser filter once created */ *ppv = (LPVOID)This;

1 0

Maarten Lankhorst : quartz: Fix parser and pins logic to no longer deadlock .
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 0e9ed6b402c6d7a49be736623d7e2bcf649d270b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e9ed6b402c6d7a49be736623… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 14:35:14 2008 -0700 quartz: Fix parser and pins logic to no longer deadlock. --- dlls/quartz/parser.c | 14 +++-- dlls/quartz/pin.c | 108 +++++++++++++++++++++++++++------------ dlls/quartz/pin.h | 4 +- dlls/quartz/tests/filtergraph.c | 11 ++++ 4 files changed, 97 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e9ed6b402c6d7a49be73…

1 0

Maarten Lankhorst : quartz: Implement filtergraph mediaseeking setposition.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 855e3a08b527f38bbc1b996982f6c8693c48b039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=855e3a08b527f38bbc1b99698… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 14:07:38 2008 -0700 quartz: Implement filtergraph mediaseeking setposition. --- dlls/quartz/filtergraph.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 5fd6a95..0a841d9 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2015,16 +2015,50 @@ static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, return S_OK; } +struct pos_args { + LONGLONG* current, *stop; + DWORD curflags, stopflags; +}; + +static HRESULT WINAPI found_setposition(IFilterGraphImpl *This, IMediaSeeking *seek, DWORD_PTR pargs) +{ + struct pos_args *args = (void*)pargs; + + return IMediaSeeking_SetPositions(seek, args->current, args->curflags, args->stop, args->stopflags); +} + static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *pCurrent, DWORD dwCurrentFlags, LONGLONG *pStop, DWORD dwStopFlags) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); + HRESULT hr = S_OK; + FILTER_STATE state; + struct pos_args args; - FIXME("(%p/%p)->(%p, %08x, %p, %08x): stub !!!\n", This, iface, pCurrent, dwCurrentFlags, pStop, dwStopFlags); + TRACE("(%p/%p)->(%p, %08x, %p, %08x)\n", This, iface, pCurrent, dwCurrentFlags, pStop, dwStopFlags); - return S_OK; + EnterCriticalSection(&This->cs); + state = This->state; + TRACE("State: %s\n", state == State_Running ? "Running" : (state == State_Paused ? "Paused" : (state == State_Stopped ? "Stopped" : "UNKNOWN"))); + + if ((dwCurrentFlags & 0x7) == AM_SEEKING_AbsolutePositioning) + This->position = *pCurrent; + else if ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) + FIXME("Adjust method %x not handled yet!\n", dwCurrentFlags & 0x7); + + if ((dwStopFlags & 0x7) != AM_SEEKING_NoPositioning) + FIXME("Stop position not handled yet!\n"); + + args.current = pCurrent; + args.stop = pStop; + args.curflags = dwCurrentFlags; + args.stopflags = dwStopFlags; + hr = all_renderers_seek(This, found_setposition, (DWORD_PTR)&args); + LeaveCriticalSection(&This->cs); + + return hr; } static HRESULT WINAPI MediaSeeking_GetPositions(IMediaSeeking *iface,

1 0

Maarten Lankhorst : quartz: Don' t hold lock when changing state in filtergraph.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 7cb1324ae3d5924d8191d86ac2ab6306b2de36ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb1324ae3d5924d8191d86ac… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 14:03:34 2008 -0700 quartz: Don't hold lock when changing state in filtergraph. --- dlls/quartz/filtergraph.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4f8eebb..5fd6a95 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1472,7 +1472,9 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF CoTaskMemFree(ppPins); } TRACE("Doing stuff with filter %p\n", PinInfo.pFilter); + LeaveCriticalSection(&pGraph->cs); FoundFilter(PinInfo.pFilter); + EnterCriticalSection(&pGraph->cs); } if (PinInfo.pFilter) IBaseFilter_Release(PinInfo.pFilter); @@ -1499,11 +1501,11 @@ static HRESULT WINAPI SendRun(IBaseFilter *pFilter) { } static HRESULT WINAPI SendPause(IBaseFilter *pFilter) { - return IBaseFilter_Pause(pFilter); + return IBaseFilter_Pause(pFilter); } static HRESULT WINAPI SendStop(IBaseFilter *pFilter) { - return IBaseFilter_Stop(pFilter); + return IBaseFilter_Stop(pFilter); } static HRESULT SendFilterMessage(IMediaControl *iface, fnFoundFilter FoundFilter) { @@ -1776,7 +1778,9 @@ static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, IBaseFilter_QueryInterface(pfilter, &IID_IMediaSeeking, (void**)&seek); if (!seek) continue; + LeaveCriticalSection(&This->cs); hr = FoundSeek(This, seek, arg); + EnterCriticalSection(&This->cs); IMediaSeeking_Release(seek); if (hr_return != E_NOTIMPL) allnotimpl = FALSE; @@ -1980,6 +1984,7 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, if (!pCurrent) return E_POINTER; + EnterCriticalSection(&This->cs); if (This->state == State_Running && This->refClock) { IReferenceClock_GetTime(This->refClock, &time); @@ -1991,6 +1996,7 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, } else *pCurrent = This->position; + LeaveCriticalSection(&This->cs); TRACE("Time: %lld.%03lld\n", *pCurrent / 10000000, (*pCurrent / 10000)%1000); return S_OK;

1 0

Maarten Lankhorst : quartz: Fix locking in MediaSeeking and forward SetPosition.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 4b5d06d30f681c95743f5f80f7f898946611c9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b5d06d30f681c95743f5f80f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 13:56:28 2008 -0700 quartz: Fix locking in MediaSeeking and forward SetPosition. Don't hold locks while forwarding messages, instead rely on the reference count. This prevents some really fun deadlocks from occuring. --- dlls/quartz/control.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index 6e5cb0d..af6de28 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef HRESULT (*SeekFunc)( IMediaSeeking *to, LPVOID arg ); -static HRESULT ForwardCmdSeek( IBaseFilter* from, SeekFunc fnSeek, LPVOID arg ) +static HRESULT ForwardCmdSeek( PCRITICAL_SECTION crit_sect, IBaseFilter* from, SeekFunc fnSeek, LPVOID arg ) { HRESULT hr = S_OK; HRESULT hr_return = S_OK; @@ -71,7 +71,9 @@ static HRESULT ForwardCmdSeek( IBaseFilter* from, SeekFunc fnSeek, LPVOID arg ) if (!hr_local) { foundend = TRUE; + LeaveCriticalSection( crit_sect ); hr_local = fnSeek( seek , arg ); + EnterCriticalSection( crit_sect ); if (hr_local != E_NOTIMPL) allnotimpl = FALSE; @@ -90,7 +92,7 @@ static HRESULT ForwardCmdSeek( IBaseFilter* from, SeekFunc fnSeek, LPVOID arg ) hr = hr_return; out: - FIXME("Returning: %08x\n", hr); + TRACE("Returning: %08x\n", hr); return hr; } @@ -148,7 +150,9 @@ HRESULT WINAPI MediaSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * if (!pCapabilities) return E_POINTER; - hr = ForwardCmdSeek(This->pUserData, fwd_checkcaps, pCapabilities); + EnterCriticalSection(This->crst); + hr = ForwardCmdSeek(This->crst, This->pUserData, fwd_checkcaps, pCapabilities); + LeaveCriticalSection(This->crst); if (FAILED(hr) && hr != E_NOTIMPL) return hr; @@ -217,7 +221,9 @@ HRESULT WINAPI MediaSeekingImpl_SetTimeFormat(IMediaSeeking * iface, const GUID MediaSeekingImpl *This = (MediaSeekingImpl *)iface; TRACE("(%s)\n", qzdebugstr_guid(pFormat)); - ForwardCmdSeek(This->pUserData, fwd_settimeformat, (LPVOID)pFormat); + EnterCriticalSection(This->crst); + ForwardCmdSeek(This->crst, This->pUserData, fwd_settimeformat, (LPVOID)pFormat); + LeaveCriticalSection(This->crst); return (IsEqualIID(pFormat, &TIME_FORMAT_MEDIA_TIME) ? S_OK : S_FALSE); } @@ -246,7 +252,7 @@ HRESULT WINAPI MediaSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pD EnterCriticalSection(This->crst); *pDuration = This->llDuration; - ForwardCmdSeek(This->pUserData, fwd_getduration, pDuration); + ForwardCmdSeek(This->crst, This->pUserData, fwd_getduration, pDuration); LeaveCriticalSection(This->crst); return S_OK; @@ -276,7 +282,7 @@ HRESULT WINAPI MediaSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG EnterCriticalSection(This->crst); *pStop = This->llStop; - ForwardCmdSeek(This->pUserData, fwd_getstopposition, pStop); + ForwardCmdSeek(This->crst, This->pUserData, fwd_getstopposition, pStop); LeaveCriticalSection(This->crst); return S_OK; @@ -307,7 +313,7 @@ HRESULT WINAPI MediaSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGLO EnterCriticalSection(This->crst); *pCurrent = This->llCurrent; - ForwardCmdSeek(This->pUserData, fwd_getcurposition, pCurrent); + ForwardCmdSeek(This->crst, This->pUserData, fwd_getcurposition, pCurrent); LeaveCriticalSection(This->crst); return S_OK; @@ -341,14 +347,33 @@ static inline LONGLONG Adjust(LONGLONG value, const LONGLONG * pModifier, DWORD } } +struct pos_args { + LONGLONG* current, *stop; + DWORD curflags, stopflags; +}; + +static HRESULT fwd_setposition(IMediaSeeking *seek, LPVOID pargs) +{ + struct pos_args *args = (void*)pargs; + + return IMediaSeeking_SetPositions(seek, args->current, args->curflags, args->stop, args->stopflags); +} + + HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * pCurrent, DWORD dwCurrentFlags, LONGLONG * pStop, DWORD dwStopFlags) { MediaSeekingImpl *This = (MediaSeekingImpl *)iface; BOOL bChangeCurrent = FALSE, bChangeStop = FALSE; LONGLONG llNewCurrent, llNewStop; + struct pos_args args; TRACE("(%p, %x, %p, %x)\n", pCurrent, dwCurrentFlags, pStop, dwStopFlags); + args.current = pCurrent; + args.stop = pStop; + args.curflags = dwCurrentFlags; + args.stopflags = dwStopFlags; + EnterCriticalSection(This->crst); llNewCurrent = Adjust(This->llCurrent, pCurrent, dwCurrentFlags); @@ -359,6 +384,8 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p if (llNewStop != This->llStop) bChangeStop = TRUE; + TRACE("Old: %u, New: %u\n", (DWORD)(This->llCurrent/10000000), (DWORD)(llNewCurrent/10000000)); + This->llCurrent = llNewCurrent; This->llStop = llNewStop; @@ -367,13 +394,14 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p if (dwStopFlags & AM_SEEKING_ReturnTime) *pStop = llNewStop; + ForwardCmdSeek(This->crst, This->pUserData, fwd_setposition, &args); + LeaveCriticalSection(This->crst); + if (bChangeCurrent) This->fnChangeCurrent(This->pUserData); if (bChangeStop) This->fnChangeStop(This->pUserData); - LeaveCriticalSection(This->crst); - return S_OK; } @@ -436,7 +464,7 @@ HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) This->dRate = dRate; if (bChangeRate) hr = This->fnChangeRate(This->pUserData); - ForwardCmdSeek(This->pUserData, fwd_setrate, &dRate); + ForwardCmdSeek(This->crst, This->pUserData, fwd_setrate, &dRate); LeaveCriticalSection(This->crst); return hr;

1 0

Maarten Lankhorst : quartz: Implement seeking stubs for transform filters.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: e18129068e3fcfdf98c8b8ee571d4ee015b13646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18129068e3fcfdf98c8b8ee5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 13:41:25 2008 -0700 quartz: Implement seeking stubs for transform filters. --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/control_private.h | 5 ++ dlls/quartz/transform.c | 89 +++++++++++++++++++++++++++++++++++++++- dlls/quartz/transform.h | 5 ++- 5 files changed, 97 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index d34fcc6..ffe14c9 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -261,7 +261,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) This->reinit_codec = TRUE; - hr = TransformFilter_Create(&(This->tf), &CLSID_ACMWrapper, &ACMWrapper_FuncsTable); + hr = TransformFilter_Create(&(This->tf), &CLSID_ACMWrapper, &ACMWrapper_FuncsTable, NULL, NULL, NULL); if (FAILED(hr)) return hr; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 16dfe69..b8a1b19 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -291,7 +291,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pBihIn = NULL; This->pBihOut = NULL; - hr = TransformFilter_Create(&(This->tf), &CLSID_AVIDec, &AVIDec_FuncsTable); + hr = TransformFilter_Create(&(This->tf), &CLSID_AVIDec, &AVIDec_FuncsTable, NULL, NULL, NULL); if (FAILED(hr)) return hr; diff --git a/dlls/quartz/control_private.h b/dlls/quartz/control_private.h index 15855d6..b5e3997 100644 --- a/dlls/quartz/control_private.h +++ b/dlls/quartz/control_private.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef QUARTZ_CONTROL_H +#define QUARTZ_CONTROL_H + typedef HRESULT (* CHANGEPROC)(IBaseFilter *pUserData); typedef struct MediaSeekingImpl @@ -55,3 +58,5 @@ HRESULT WINAPI MediaSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * p HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate); HRESULT WINAPI MediaSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate); HRESULT WINAPI MediaSeekingImpl_GetPreroll(IMediaSeeking * iface, LONGLONG * pPreroll); + +#endif /*QUARTZ_CONTROL_H*/ diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index ccbca58..acf9352 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -143,7 +143,76 @@ static HRESULT TransformFilter_OutputPin_Construct(const PIN_INFO * pPinInfo, co return E_FAIL; } -HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSID* pClsid, const TransformFuncsTable* pFuncsTable) + +static inline TransformFilterImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) +{ + return (TransformFilterImpl *)((char*)iface - FIELD_OFFSET(TransformFilterImpl, mediaSeeking.lpVtbl)); +} + +static HRESULT WINAPI TransformFilter_Seeking_QueryInterface(IMediaSeeking * iface, REFIID riid, LPVOID * ppv) +{ + TransformFilterImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); +} + +static ULONG WINAPI TransformFilter_Seeking_AddRef(IMediaSeeking * iface) +{ + TransformFilterImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_AddRef((IUnknown *)This); +} + +static ULONG WINAPI TransformFilter_Seeking_Release(IMediaSeeking * iface) +{ + TransformFilterImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_Release((IUnknown *)This); +} + +static const IMediaSeekingVtbl TransformFilter_Seeking_Vtbl = +{ + TransformFilter_Seeking_QueryInterface, + TransformFilter_Seeking_AddRef, + TransformFilter_Seeking_Release, + MediaSeekingImpl_GetCapabilities, + MediaSeekingImpl_CheckCapabilities, + MediaSeekingImpl_IsFormatSupported, + MediaSeekingImpl_QueryPreferredFormat, + MediaSeekingImpl_GetTimeFormat, + MediaSeekingImpl_IsUsingTimeFormat, + MediaSeekingImpl_SetTimeFormat, + MediaSeekingImpl_GetDuration, + MediaSeekingImpl_GetStopPosition, + MediaSeekingImpl_GetCurrentPosition, + MediaSeekingImpl_ConvertTimeFormat, + MediaSeekingImpl_SetPositions, + MediaSeekingImpl_GetPositions, + MediaSeekingImpl_GetAvailable, + MediaSeekingImpl_SetRate, + MediaSeekingImpl_GetRate, + MediaSeekingImpl_GetPreroll +}; + +static HRESULT TransformFilter_ChangeCurrent(IBaseFilter *iface) +{ + FIXME("(%p) filter hasn't implemented current position change!\n", iface); + return S_OK; +} + +static HRESULT TransformFilter_ChangeStop(IBaseFilter *iface) +{ + FIXME("(%p) filter hasn't implemented stop position change!\n", iface); + return S_OK; +} + +static HRESULT TransformFilter_ChangeRate(IBaseFilter *iface) +{ + FIXME("(%p) filter hasn't implemented rate change!\n", iface); + return S_OK; +} + +HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSID* pClsid, const TransformFuncsTable* pFuncsTable, CHANGEPROC stop, CHANGEPROC current, CHANGEPROC rate) { HRESULT hr; PIN_INFO piInput; @@ -184,8 +253,20 @@ HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSI hr = TransformFilter_OutputPin_Construct(&piOutput, &props, pTransformFilter, TransformFilter_Output_QueryAccept, &pTransformFilter->csFilter, &pTransformFilter->ppPins[1]); - if (FAILED(hr)) - ERR("Cannot create output pin (%x)\n", hr); + if (FAILED(hr)) + ERR("Cannot create output pin (%x)\n", hr); + else + { + if (!stop) + stop = TransformFilter_ChangeStop; + if (!current) + current = TransformFilter_ChangeCurrent; + if (!rate) + rate = TransformFilter_ChangeRate; + + MediaSeekingImpl_Init((IBaseFilter*)pTransformFilter, stop, current, rate, &pTransformFilter->mediaSeeking, &pTransformFilter->csFilter); + pTransformFilter->mediaSeeking.lpVtbl = &TransformFilter_Seeking_Vtbl; + } } else { @@ -213,6 +294,8 @@ static HRESULT WINAPI TransformFilter_QueryInterface(IBaseFilter * iface, REFIID *ppv = (LPVOID)This; else if (IsEqualIID(riid, &IID_IBaseFilter)) *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + *ppv = &This->mediaSeeking; if (*ppv) { diff --git a/dlls/quartz/transform.h b/dlls/quartz/transform.h index 209225e..89d7dfb 100644 --- a/dlls/quartz/transform.h +++ b/dlls/quartz/transform.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "control_private.h" + typedef struct TransformFilterImpl TransformFilterImpl; typedef struct TransformFuncsTable { @@ -40,10 +42,11 @@ struct TransformFilterImpl IReferenceClock * pClock; FILTER_INFO filterInfo; CLSID clsid; + struct MediaSeekingImpl mediaSeeking; IPin ** ppPins; const TransformFuncsTable * pFuncsTable; }; -HRESULT TransformFilter_Create(TransformFilterImpl*, const CLSID*, const TransformFuncsTable* pFuncsTable); +HRESULT TransformFilter_Create(TransformFilterImpl*, const CLSID*, const TransformFuncsTable* pFuncsTable, CHANGEPROC stop, CHANGEPROC current, CHANGEPROC rate);

1 0

Vitaliy Margolen : winex11drv: Distinguish left and right keys for shift, ctrl and alt.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 9faf7e358630cb8e8d63e4a534a9b5b9a56b7e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9faf7e358630cb8e8d63e4a53… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Apr 1 23:13:45 2008 -0600 winex11drv: Distinguish left and right keys for shift, ctrl and alt. --- dlls/user32/tests/input.c | 438 +++++++++++++++++++++++++++++++++++++------ dlls/winex11.drv/keyboard.c | 76 +++++--- server/queue.c | 15 +- 3 files changed, 436 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9faf7e358630cb8e8d63e…

1 0

Vitaliy Margolen : winecfg: Update Russian translation.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 20a27fe1f71215f965b4257ca6953a5f5a3c840a URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a27fe1f71215f965b4257ca… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Apr 1 23:12:51 2008 -0600 winecfg: Update Russian translation. --- programs/winecfg/Ru.rc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index d358588..25c41bd 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -307,4 +307,19 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "�� " IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "�� - ��" IDC_SYSPARAMS_MSGBOX_TEXT "�� - ��" + IDC_SYSPARAMS_APPWORKSPACE "�� MDI - ��" + IDC_SYSPARAMS_WINDOW_FRAME "�� - ��" + IDC_SYSPARAMS_ACTIVE_BORDER "�� - ��" + IDC_SYSPARAMS_INACTIVE_BORDER "�� - ��" + IDC_SYSPARAMS_BUTTON_SHADOW "�� - ��" + IDC_SYSPARAMS_GRAY_TEXT "�� " + IDC_SYSPARAMS_BUTTON_HILIGHT "�� - �� " + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "�� - �� " + IDC_SYSPARAMS_BUTTON_LIGHT "�� - ��" + IDC_SYSPARAMS_BUTTON_ALTERNATE "�� - �� 2" + IDC_SYSPARAMS_HOT_TRACKING "��, ��" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "�� " + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "�� " + IDC_SYSPARAMS_MENU_HILIGHT "�� - ��" + IDC_SYSPARAMS_MENUBAR "�� - ��" END

1 0

Michael Stefaniuc : progman: Delete bitrotted translations.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: ca9f91b42c9e6d37d8f2e385d6818fb90e2ae2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9f91b42c9e6d37d8f2e385d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 2 01:11:05 2008 +0200 progman: Delete bitrotted translations. --- programs/progman/Da.rc | 142 ---------------------------------------------- programs/progman/Fi.rc | 134 ------------------------------------------- programs/progman/Sk.rc | 133 ------------------------------------------- programs/progman/Sw.rc | 133 ------------------------------------------- programs/progman/Va.rc | 137 -------------------------------------------- programs/progman/Wa.rc | 136 -------------------------------------------- programs/progman/rsrc.rc | 8 +-- 7 files changed, 1 insertions(+), 822 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca9f91b42c9e6d37d8f2e…

1 0

Michael Stefaniuc : wrc: Sync the codepage mapping to the LANG_* identifiers from include/winnt.h.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: fae9640f4d7ca559fe9ab41a22f29a3beba24153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae9640f4d7ca559fe9ab41a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 2 00:17:10 2008 +0200 wrc: Sync the codepage mapping to the LANG_* identifiers from include/winnt.h. --- tools/wrc/utils.c | 63 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 54 insertions(+), 9 deletions(-) diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 58d6124..eb079ee 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -342,26 +342,33 @@ static const struct lang2cp lang2cps[] = { { LANG_AFRIKAANS, SUBLANG_NEUTRAL, 1252 }, { LANG_ALBANIAN, SUBLANG_NEUTRAL, 1250 }, + { LANG_ALSATIAN, SUBLANG_NEUTRAL, 1252 }, + { LANG_AMHARIC, SUBLANG_NEUTRAL, 0 }, { LANG_ARABIC, SUBLANG_NEUTRAL, 1256 }, { LANG_ARMENIAN, SUBLANG_NEUTRAL, 0 }, + { LANG_ASSAMESE, SUBLANG_NEUTRAL, 0 }, { LANG_AZERI, SUBLANG_NEUTRAL, 1254 }, { LANG_AZERI, SUBLANG_AZERI_CYRILLIC, 1251 }, + { LANG_BASHKIR, SUBLANG_NEUTRAL, 1251 }, { LANG_BASQUE, SUBLANG_NEUTRAL, 1252 }, { LANG_BELARUSIAN, SUBLANG_NEUTRAL, 1251 }, -#ifdef LANG_BRETON + { LANG_BENGALI, SUBLANG_NEUTRAL, 0 }, + { LANG_BOSNIAN, SUBLANG_NEUTRAL, 1250 }, + { LANG_BOSNIAN, SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC, 1251 }, { LANG_BRETON, SUBLANG_NEUTRAL, 1252 }, -#endif /* LANG_BRETON */ { LANG_BULGARIAN, SUBLANG_NEUTRAL, 1251 }, { LANG_CATALAN, SUBLANG_NEUTRAL, 1252 }, { LANG_CHINESE, SUBLANG_NEUTRAL, 950 }, - { LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE, 936 }, { LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED, 936 }, + { LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE, 936 }, #ifdef LANG_CORNISH { LANG_CORNISH, SUBLANG_NEUTRAL, 1252 }, #endif /* LANG_CORNISH */ + { LANG_CORSICAN, SUBLANG_NEUTRAL, 1252 }, { LANG_CROATIAN, SUBLANG_NEUTRAL, 1250 }, { LANG_CZECH, SUBLANG_NEUTRAL, 1250 }, { LANG_DANISH, SUBLANG_NEUTRAL, 1252 }, + { LANG_DARI, SUBLANG_NEUTRAL, 1256 }, { LANG_DIVEHI, SUBLANG_NEUTRAL, 0 }, { LANG_DUTCH, SUBLANG_NEUTRAL, 1252 }, { LANG_ENGLISH, SUBLANG_NEUTRAL, 1252 }, @@ -370,9 +377,10 @@ static const struct lang2cp lang2cps[] = #endif /* LANG_ESPERANTO */ { LANG_ESTONIAN, SUBLANG_NEUTRAL, 1257 }, { LANG_FAEROESE, SUBLANG_NEUTRAL, 1252 }, - { LANG_FARSI, SUBLANG_NEUTRAL, 1256 }, + { LANG_FILIPINO, SUBLANG_NEUTRAL, 1252 }, { LANG_FINNISH, SUBLANG_NEUTRAL, 1252 }, { LANG_FRENCH, SUBLANG_NEUTRAL, 1252 }, + { LANG_FRISIAN, SUBLANG_NEUTRAL, 1252 }, #ifdef LANG_GAELIC { LANG_GAELIC, SUBLANG_NEUTRAL, 1252 }, #endif /* LANG_GAELIC */ @@ -380,58 +388,95 @@ static const struct lang2cp lang2cps[] = { LANG_GEORGIAN, SUBLANG_NEUTRAL, 0 }, { LANG_GERMAN, SUBLANG_NEUTRAL, 1252 }, { LANG_GREEK, SUBLANG_NEUTRAL, 1253 }, + { LANG_GREENLANDIC, SUBLANG_NEUTRAL, 1252 }, { LANG_GUJARATI, SUBLANG_NEUTRAL, 0 }, + { LANG_HAUSA, SUBLANG_NEUTRAL, 1252 }, { LANG_HEBREW, SUBLANG_NEUTRAL, 1255 }, { LANG_HINDI, SUBLANG_NEUTRAL, 0 }, { LANG_HUNGARIAN, SUBLANG_NEUTRAL, 1250 }, { LANG_ICELANDIC, SUBLANG_NEUTRAL, 1252 }, + { LANG_IGBO, SUBLANG_NEUTRAL, 1252 }, { LANG_INDONESIAN, SUBLANG_NEUTRAL, 1252 }, + { LANG_INUKTITUT, SUBLANG_NEUTRAL, 0 }, + { LANG_INUKTITUT, SUBLANG_INUKTITUT_CANADA_LATIN, 0 }, + { LANG_IRISH, SUBLANG_NEUTRAL, 1252 }, { LANG_ITALIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_JAPANESE, SUBLANG_NEUTRAL, 932 }, { LANG_KANNADA, SUBLANG_NEUTRAL, 0 }, { LANG_KAZAK, SUBLANG_NEUTRAL, 1251 }, + { LANG_KHMER, SUBLANG_NEUTRAL, 0 }, + { LANG_KICHE, SUBLANG_NEUTRAL, 1252 }, + { LANG_KINYARWANDA, SUBLANG_NEUTRAL, 1252 }, { LANG_KONKANI, SUBLANG_NEUTRAL, 0 }, { LANG_KOREAN, SUBLANG_NEUTRAL, 949 }, { LANG_KYRGYZ, SUBLANG_NEUTRAL, 1251 }, + { LANG_LAO, SUBLANG_NEUTRAL, 0 }, { LANG_LATVIAN, SUBLANG_NEUTRAL, 1257 }, { LANG_LITHUANIAN, SUBLANG_NEUTRAL, 1257 }, + { LANG_LOWER_SORBIAN, SUBLANG_NEUTRAL, 1252 }, + { LANG_LUXEMBOURGISH, SUBLANG_NEUTRAL, 1252 }, { LANG_MACEDONIAN, SUBLANG_NEUTRAL, 1251 }, { LANG_MALAY, SUBLANG_NEUTRAL, 1252 }, + { LANG_MALAYALAM, SUBLANG_NEUTRAL, 0 }, + { LANG_MALTESE, SUBLANG_NEUTRAL, 0 }, + { LANG_MAORI, SUBLANG_NEUTRAL, 0 }, + { LANG_MAPUDUNGUN, SUBLANG_NEUTRAL, 1252 }, { LANG_MARATHI, SUBLANG_NEUTRAL, 0 }, + { LANG_MOHAWK, SUBLANG_NEUTRAL, 1252 }, { LANG_MONGOLIAN, SUBLANG_NEUTRAL, 1251 }, + { LANG_NEPALI, SUBLANG_NEUTRAL, 0 }, { LANG_NEUTRAL, SUBLANG_NEUTRAL, 1252 }, { LANG_NORWEGIAN, SUBLANG_NEUTRAL, 1252 }, + { LANG_OCCITAN, SUBLANG_NEUTRAL, 1252 }, + { LANG_ORIYA, SUBLANG_NEUTRAL, 0 }, + { LANG_PASHTO, SUBLANG_NEUTRAL, 0 }, + { LANG_PERSIAN, SUBLANG_NEUTRAL, 1256 }, { LANG_POLISH, SUBLANG_NEUTRAL, 1250 }, { LANG_PORTUGUESE, SUBLANG_NEUTRAL, 1252 }, { LANG_PUNJABI, SUBLANG_NEUTRAL, 0 }, + { LANG_QUECHUA, SUBLANG_NEUTRAL, 1252 }, { LANG_ROMANIAN, SUBLANG_NEUTRAL, 1250 }, { LANG_ROMANSH, SUBLANG_NEUTRAL, 1252 }, { LANG_RUSSIAN, SUBLANG_NEUTRAL, 1251 }, + { LANG_SAMI, SUBLANG_NEUTRAL, 1252 }, { LANG_SANSKRIT, SUBLANG_NEUTRAL, 0 }, { LANG_SERBIAN, SUBLANG_NEUTRAL, 1250 }, { LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC, 1251 }, + { LANG_SINHALESE, SUBLANG_NEUTRAL, 0 }, { LANG_SLOVAK, SUBLANG_NEUTRAL, 1250 }, { LANG_SLOVENIAN, SUBLANG_NEUTRAL, 1250 }, + { LANG_SOTHO, SUBLANG_NEUTRAL, 1252 }, { LANG_SPANISH, SUBLANG_NEUTRAL, 1252 }, { LANG_SWAHILI, SUBLANG_NEUTRAL, 1252 }, { LANG_SWEDISH, SUBLANG_NEUTRAL, 1252 }, { LANG_SYRIAC, SUBLANG_NEUTRAL, 0 }, + { LANG_TAJIK, SUBLANG_NEUTRAL, 1251 }, + { LANG_TAMAZIGHT, SUBLANG_NEUTRAL, 1252 }, { LANG_TAMIL, SUBLANG_NEUTRAL, 0 }, { LANG_TATAR, SUBLANG_NEUTRAL, 1251 }, { LANG_TELUGU, SUBLANG_NEUTRAL, 0 }, { LANG_THAI, SUBLANG_NEUTRAL, 874 }, + { LANG_TIBETAN, SUBLANG_NEUTRAL, 0 }, + { LANG_TSWANA, SUBLANG_NEUTRAL, 1252 }, { LANG_TURKISH, SUBLANG_NEUTRAL, 1254 }, + { LANG_TURKMEN, SUBLANG_NEUTRAL, 1250 }, + { LANG_UIGHUR, SUBLANG_NEUTRAL, 1256 }, { LANG_UKRAINIAN, SUBLANG_NEUTRAL, 1251 }, + { LANG_UPPER_SORBIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_URDU, SUBLANG_NEUTRAL, 1256 }, { LANG_UZBEK, SUBLANG_NEUTRAL, 1254 }, { LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC, 1251 }, - { LANG_VIETNAMESE, SUBLANG_NEUTRAL, 1258 } + { LANG_VIETNAMESE, SUBLANG_NEUTRAL, 1258 }, #ifdef LANG_WALON - , { LANG_WALON, SUBLANG_NEUTRAL, 1252 } + { LANG_WALON, SUBLANG_NEUTRAL, 1252 }, #endif /* LANG_WALON */ -#ifdef LANG_WELSH - , { LANG_WELSH, SUBLANG_NEUTRAL, 1252 } -#endif /* LANG_WELSH */ + { LANG_WELSH, SUBLANG_NEUTRAL, 1252 }, + { LANG_WOLOF, SUBLANG_NEUTRAL, 1252 }, + { LANG_XHOSA, SUBLANG_NEUTRAL, 1252 }, + { LANG_YAKUT, SUBLANG_NEUTRAL, 1251 }, + { LANG_YI, SUBLANG_NEUTRAL, 0 }, + { LANG_YORUBA, SUBLANG_NEUTRAL, 1252 }, + { LANG_ZULU, SUBLANG_NEUTRAL, 1252 } }; int get_language_codepage( unsigned short lang, unsigned short sublang )

1 0

Apostolos Alexiadis : hhctrl: Added Greek translation.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 0a8d2ba37a59531ae7a58c3d693e65dbe901a72a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8d2ba37a59531ae7a58c3d6… Author: Apostolos Alexiadis <djapal(a)gmail.com> Date: Tue Apr 1 19:09:31 2008 +0300 hhctrl: Added Greek translation. --- dlls/hhctrl.ocx/El.rc | 58 +++++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/hhctrl.rc | 1 + 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/El.rc b/dlls/hhctrl.ocx/El.rc new file mode 100644 index 0000000..dd81eb6 --- /dev/null +++ b/dlls/hhctrl.ocx/El.rc @@ -0,0 +1,58 @@ +/* + * HTML Help resources + * Greek Language Support + * + * Copyright 2008 Apostolos Alexiadis + * + * 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 + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CONTENTS "&��" + IDS_INDEX "I&ndex" + IDS_SEARCH "&��" + IDS_FAVORITES "�&��" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "��" + IDTB_CONTRACT "��" + IDTB_STOP "��" + IDTB_REFRESH "��" + IDTB_BACK "��" + IDTB_HOME "Home" + IDTB_SYNC "Sync" + IDTB_PRINT "��" + IDTB_OPTIONS "��" + IDTB_FORWARD "Forward" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "Customize" + IDTB_ZOOM "Zoom" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc index 5fca97b..2c195d4 100644 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ b/dlls/hhctrl.ocx/hhctrl.rc @@ -31,6 +31,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Cs.rc" #include "De.rc" +#include "El.rc" #include "En.rc" #include "Fr.rc" #include "Fi.rc"

1 0

Apostolos Alexiadis : comdlg32: Added Greek translation.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: e6c2dcbc7949645784f68e30ce1fcf86d7a572ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c2dcbc7949645784f68e30c… Author: Apostolos Alexiadis <djapal(a)gmail.com> Date: Tue Apr 1 19:08:43 2008 +0300 comdlg32: Added Greek translation. --- dlls/comdlg32/cdlg_El.rc | 481 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/rsrc.rc | 1 + 2 files changed, 482 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6c2dcbc7949645784f68…

1 0

Apostolos Alexiadis : comctl32: Greek translation update.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 8f0d80ef8e2039515f9388811da0ea848c9bf4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0d80ef8e2039515f9388811… Author: Apostolos Alexiadis <djapal(a)gmail.com> Date: Tue Apr 1 19:07:51 2008 +0300 comctl32: Greek translation update. --- dlls/comctl32/comctl_El.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/comctl_El.rc b/dlls/comctl32/comctl_El.rc index a226e37..2e15156 100644 --- a/dlls/comctl32/comctl_El.rc +++ b/dlls/comctl32/comctl_El.rc @@ -24,7 +24,7 @@ CAPTION " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "��", IDCANCEL,58,122,50,14 + PUSHBUTTON "��", IDCANCEL,58,122,50,14 PUSHBUTTON "&��", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "��", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 @@ -36,10 +36,10 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "��" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "< &��", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&�� >", IDC_NEXT_BUTTON,121,138,50,14 + PUSHBUTTON "< &��", IDC_BACK_BUTTON,66,138,55,14 + DEFPUSHBUTTON "&�� >", IDC_NEXT_BUTTON,121,138,55,14 DEFPUSHBUTTON "��", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "��", IDCANCEL,178,138,50,14 + PUSHBUTTON "��", IDCANCEL,178,138,50,14 PUSHBUTTON "��", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5

1 0

Aric Stewart : imm: Implement GetCompositionFont.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: fd8829fb09276f8eaa7d224c484b357516af7a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8829fb09276f8eaa7d224c4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 1 11:13:36 2008 -0500 imm: Implement GetCompositionFont. --- dlls/imm32/imm.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 866c3e3..ab57bce 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -917,9 +917,19 @@ BOOL WINAPI ImmGetCandidateWindow( */ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) { - FIXME("(%p, %p): stub\n", hIMC, lplf); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LOGFONTW lfW; + BOOL rc; + + TRACE("(%p, %p):\n", hIMC, lplf); + + rc = ImmGetCompositionFontW(hIMC,&lfW); + if (rc) + { + memcpy(lplf,&lfW,sizeof(LOGFONTA)); + WideCharToMultiByte(CP_ACP, 0, lfW.lfFaceName, -1, lplf->lfFaceName, + LF_FACESIZE, NULL, NULL); + } + return rc; } /*********************************************************************** @@ -927,9 +937,16 @@ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) */ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) { - FIXME("(%p, %p): stub\n", hIMC, lplf); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("(%p, %p):\n", hIMC, lplf); + + if (!data) + return FALSE; + + *lplf = data->IMC.lfFont.W; + + return TRUE; } /***********************************************************************

1 0

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

2003

2002

2001

wine-commits April 2008