April 2008 - Wine-commits - list.winehq.org

Mikołaj Zalewski : gdi32: Fix GetGlyphIndices to select properly the invalid char glyph for TrueType fonts .
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 4094ff025675a14e7572d975d4fd1bf7c11dc2e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4094ff025675a14e7572d975d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Mar 30 21:43:15 2008 +0200 gdi32: Fix GetGlyphIndices to select properly the invalid char glyph for TrueType fonts. --- dlls/gdi32/freetype.c | 21 ++++++++++++++------- dlls/gdi32/tests/font.c | 32 +++++++++++++++++++++++--------- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 04db3ae..6356c1f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4068,26 +4068,33 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) /************************************************************* * WineEngGetGlyphIndices * - * FIXME: add support for GGI_MARK_NONEXISTING_GLYPHS */ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags) { int i; - WCHAR default_char = 0; - TEXTMETRICW textm; + int default_char = -1; - if (flags & GGI_MARK_NONEXISTING_GLYPHS) default_char = 0x001f; /* Indicate non existence */ + if (flags & GGI_MARK_NONEXISTING_GLYPHS) default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */ for(i = 0; i < count; i++) { pgi[i] = get_glyph_index(font, lpstr[i]); if (pgi[i] == 0) { - if (!default_char) + if (default_char == -1) { - WineEngGetTextMetrics(font, &textm); - default_char = textm.tmDefaultChar; + if (FT_IS_SFNT(font->ft_face)) + { + TT_OS2 *pOS2 = pFT_Get_Sfnt_Table(font->ft_face, ft_sfnt_os2); + default_char = (pOS2->usDefaultChar ? get_glyph_index(font, pOS2->usDefaultChar) : 0); + } + else + { + TEXTMETRICW textm; + WineEngGetTextMetrics(font, &textm); + default_char = textm.tmDefaultChar; + } } pgi[i] = default_char; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ce34ab2..d85ab12 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -583,35 +583,49 @@ static void test_GetGlyphIndices(void) WCHAR testtext[] = {'T','e','s','t',0xffff,0}; WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRIC textm; + HFONT hOldFont; if (!pGetGlyphIndicesW) { skip("GetGlyphIndices not available on platform\n"); return; } - if(!is_font_installed("Symbol")) + hdc = GetDC(0); + + ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); + flags |= GGI_MARK_NONEXISTING_GLYPHS; + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); + ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]); + flags = 0; + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); + ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndices should have returned a %04x not %04x\n", + textm.tmDefaultChar, glyphs[4]); + + if(!is_font_installed("Tahoma")) { - skip("Symbol is not installed so skipping this test\n"); + skip("Tahoma is not installed so skipping this test\n"); return; } - memset(&lf, 0, sizeof(lf)); - strcpy(lf.lfFaceName, "Symbol"); + strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = 20; hfont = CreateFontIndirectA(&lf); - hdc = GetDC(0); - + hOldFont = SelectObject(hdc, hfont); ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); flags |= GGI_MARK_NONEXISTING_GLYPHS; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok((glyphs[4] == 0x001f || glyphs[4] == UNICODE_NOCHAR /* Vista */), "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]); + ok(glyphs[4] == 0xffff, "GetGlyphIndices should have returned 0xffff char not %04x\n", glyphs[4]); flags = 0; + testtext[0] = textm.tmDefaultChar; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndices should have returned a %04x not %04x\n", - textm.tmDefaultChar, glyphs[4]); + todo_wine ok(glyphs[0] == 0, "GetGlyphIndices for tmDefaultChar should be 0 not %04x\n", glyphs[0]); + ok(glyphs[4] == 0, "GetGlyphIndices should have returned 0 not %04x\n", glyphs[4]); + DeleteObject(SelectObject(hdc, hOldFont)); } static void test_GetKerningPairs(void)

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

Hwang YunSong(황윤성) : 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 : 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

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 : 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 : 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 : 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