February 2009 - Wine-commits

Alexandre Julliard : ntdll: Moved exit_thread and abort_thread functions to thread.c.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: cc933f586af2a29de423a378edf232675b572014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc933f586af2a29de423a378e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 20 11:23:08 2009 +0100 ntdll: Moved exit_thread and abort_thread functions to thread.c. --- dlls/ntdll/ntdll_misc.h | 3 +- dlls/ntdll/server.c | 65 ++++--------------------------------------- dlls/ntdll/signal_i386.c | 8 ++-- dlls/ntdll/signal_powerpc.c | 2 +- dlls/ntdll/signal_sparc.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/sync.c | 2 +- dlls/ntdll/thread.c | 61 +++++++++++++++++++++++++++++++++++++--- 8 files changed, 71 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc933f586af2a29de423a…

1 0

Alexandre Julliard : ntdll: Call pthread_create and pthread_exit directly from ntdll.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 1ac7bafcb248150f0ede665c26cb8c2b1fb2cb11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac7bafcb248150f0ede665c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 20 11:45:47 2009 +0100 ntdll: Call pthread_create and pthread_exit directly from ntdll. --- dlls/ntdll/thread.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index eeb98c3..e11976c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -67,6 +67,7 @@ static RTL_BITMAP fls_bitmap; static LIST_ENTRY tls_links; static size_t sigstack_total_size; static ULONG sigstack_zero_bits; +static int nb_threads = 1; static struct wine_pthread_functions pthread_functions; @@ -352,12 +353,14 @@ HANDLE thread_init(void) */ void abort_thread( int status ) { + if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status ); + pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); close( ntdll_get_thread_data()->wait_fd[0] ); close( ntdll_get_thread_data()->wait_fd[1] ); close( ntdll_get_thread_data()->reply_fd ); close( ntdll_get_thread_data()->request_fd ); - pthread_functions.abort_thread( status ); + pthread_exit( UIntToPtr(status) ); } @@ -366,8 +369,11 @@ void abort_thread( int status ) */ static void DECLSPEC_NORETURN exit_thread( int status ) { - struct wine_pthread_thread_info info; int fds[4]; + void *teb_addr; + SIZE_T teb_size; + + if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) exit( status ); RtlAcquirePebLock(); RemoveEntryList( &NtCurrentTeb()->TlsLinks ); @@ -375,25 +381,24 @@ static void DECLSPEC_NORETURN exit_thread( int status ) RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->FlsSlots ); RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->TlsExpansionSlots ); - info.stack_base = NtCurrentTeb()->DeallocationStack; - info.teb_base = NtCurrentTeb(); - info.teb_sel = wine_get_fs(); - info.exit_status = status; - fds[0] = ntdll_get_thread_data()->wait_fd[0]; fds[1] = ntdll_get_thread_data()->wait_fd[1]; fds[2] = ntdll_get_thread_data()->reply_fd; fds[3] = ntdll_get_thread_data()->request_fd; pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - info.stack_size = virtual_free_system_view( &info.stack_base ); - info.teb_size = virtual_free_system_view( &info.teb_base ); + virtual_free_system_view( &NtCurrentTeb()->DeallocationStack ); + teb_addr = NtCurrentTeb(); + teb_size = virtual_free_system_view( &teb_addr ); close( fds[0] ); close( fds[1] ); close( fds[2] ); close( fds[3] ); - pthread_functions.exit_thread( &info ); + + wine_ldt_free_fs( wine_get_fs() ); + if (teb_size) munmap( teb_addr, teb_size ); + pthread_exit( UIntToPtr(status) ); } @@ -514,6 +519,8 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * HANDLE *handle_ptr, CLIENT_ID *id ) { sigset_t sigset; + pthread_t pthread_id; + pthread_attr_t attr; struct ntdll_thread_data *thread_data = NULL; struct ntdll_thread_regs *thread_regs; struct startup_info *info = NULL; @@ -623,11 +630,19 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * info->entry_point = start; info->entry_arg = param; - if (pthread_functions.create_thread( &info->pthread_info ) == -1) + pthread_attr_init( &attr ); + pthread_attr_setstacksize( &attr, stack_reserve ); + pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED ); + pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */ + interlocked_xchg_add( &nb_threads, 1 ); + if (pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info )) { + interlocked_xchg_add( &nb_threads, -1 ); + pthread_attr_destroy( &attr ); status = STATUS_NO_MEMORY; goto error; } + pthread_attr_destroy( &attr ); pthread_sigmask( SIG_SETMASK, &sigset, NULL ); if (id) id->UniqueThread = ULongToHandle(tid);

1 0

Aurimas Fischer : winspool.drv: Properly free destinations list returned by CUPS.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 7ea4fcb7c65e5034d5948c10d82da391c6bdf8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea4fcb7c65e5034d5948c10d… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Thu Feb 19 19:21:07 2009 +0200 winspool.drv: Properly free destinations list returned by CUPS. --- dlls/winspool.drv/info.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index df6bf91..92bbc94 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -460,6 +460,7 @@ static BOOL add_printer_driver(const char *name) } #ifdef SONAME_LIBCUPS +static typeof(cupsFreeDests) *pcupsFreeDests; static typeof(cupsGetDests) *pcupsGetDests; static typeof(cupsGetPPD) *pcupsGetPPD; static typeof(cupsPrintFile) *pcupsPrintFile; @@ -486,6 +487,7 @@ static BOOL CUPS_LoadPrinters(void) p##x = wine_dlsym(cupshandle, #x, NULL,0); \ if (!p##x) return FALSE; + DYNCUPS(cupsFreeDests); DYNCUPS(cupsGetPPD); DYNCUPS(cupsGetDests); DYNCUPS(cupsPrintFile); @@ -566,6 +568,7 @@ static BOOL CUPS_LoadPrinters(void) } if (hadprinter & !haddefault) WINSPOOL_SetDefaultPrinter(dests[0].name, dests[0].name, TRUE); + pcupsFreeDests(nrofdests, dests); RegCloseKey(hkeyPrinters); return hadprinter; }

1 0

Nicolas Le Cam : fusion/tests: Fix a test on some platforms.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: b76007d847a18c76f49718de42d9cbee7a4be83b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76007d847a18c76f49718de4… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Feb 19 22:48:22 2009 +0100 fusion/tests: Fix a test on some platforms. --- dlls/fusion/tests/asmcache.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index c5e4acd..436a04d 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -887,6 +887,8 @@ static void test_InstallAssembly(void) HRESULT hr; ULONG disp; DWORD attr; + char dllpath[MAX_PATH]; + UINT size; static const WCHAR empty[] = {0}; static const WCHAR noext[] = {'f','i','l','e',0}; @@ -940,8 +942,10 @@ static void test_InstallAssembly(void) hr = IAssemblyCache_InstallAssembly(cache, 0, winedll, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - attr = GetFileAttributes("C:\\windows\\assembly\\GAC_MSIL\\wine\\" - "1.0.0.0__2d03617b1c31e2f5/wine.dll"); + size = GetWindowsDirectoryA(dllpath, MAX_PATH); + strcat(dllpath, "\\assembly\\GAC_MSIL\\wine\\\\1.0.0.0__2d03617b1c31e2f5\\wine.dll"); + + attr = GetFileAttributes(dllpath); ok(attr != INVALID_FILE_ATTRIBUTES, "Expected assembly to exist\n"); /* uninstall the assembly from the GAC */ @@ -955,10 +959,11 @@ static void test_InstallAssembly(void) } /* FIXME: remove once UninstallAssembly is implemented */ - DeleteFileA("C:\\windows\\assembly\\GAC_MSIL\\wine\\" - "1.0.0.0__2d03617b1c31e2f5\\wine.dll"); - RemoveDirectoryA("C:\\windows\\assembly\\GAC_MSIL\\wine\\1.0.0.0__2d03617b1c31e2f5"); - RemoveDirectoryA("C:\\windows\\assembly\\GAC_MSIL\\wine"); + DeleteFileA(dllpath); + dllpath[size + sizeof("\\assembly\\GAC_MSIL\\wine\\1.0.0.0__2d03617b1c31e2f5")] = '\0'; + RemoveDirectoryA(dllpath); + dllpath[size + sizeof("\\assembly\\GAC_MSIL\\wine")] = '\0'; + RemoveDirectoryA(dllpath); DeleteFileA("test.dll"); DeleteFileA("wine.dll");

1 0

Paul Vriens : fusion/tests: Don't crash on .NET 1.x.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 93c415828341c61e69c1696fbb6d6229ef630494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c415828341c61e69c1696fb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Feb 20 08:01:17 2009 +0100 fusion/tests: Don't crash on .NET 1.x. --- dlls/fusion/tests/asmenum.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index 0349eb3..14cf002 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -181,8 +181,12 @@ static void test_CreateAssemblyEnum(void) ok(asmname != NULL, "Expected non-NULL asmname\n"); /* pEnum is NULL */ - hr = pCreateAssemblyEnum(NULL, NULL, asmname, ASM_CACHE_GAC, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + if (0) + { + /* Crashes on .NET 1.x */ + hr = pCreateAssemblyEnum(NULL, NULL, asmname, ASM_CACHE_GAC, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + } /* pName is NULL */ asmenum = NULL;

1 0

Paul Vriens : fusion/tests: Don' t use strdup to prevent crashes when freeing memory.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: ad9fb647b43bada4b9ea70e90fe86a8e6099960e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad9fb647b43bada4b9ea70e90… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Feb 20 08:14:22 2009 +0100 fusion/tests: Don't use strdup to prevent crashes when freeing memory. --- dlls/fusion/tests/asmenum.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index 14cf002..f3be262 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -253,7 +253,8 @@ static BOOL enum_gac_assemblies(struct list *assemblies, int depth, LPSTR path) lstrcatA(disp, buf); name = HeapAlloc(GetProcessHeap(), 0, sizeof(ASMNAME)); - name->data = strdup(disp); + name->data = HeapAlloc(GetProcessHeap(), 0, lstrlenA(disp) + 1); + lstrcpyA(name->data, disp); list_add_tail(assemblies, &name->entry); continue;

1 0

Henri Verbeet : d3d10core: Convert between DXGI_FORMAT and WINED3DFORMAT values.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: d28e5a055129dfa48be93358983346feb64c2d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d28e5a055129dfa48be933589… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 19 16:59:42 2009 +0100 d3d10core: Convert between DXGI_FORMAT and WINED3DFORMAT values. --- dlls/d3d10core/d3d10core_private.h | 3 + dlls/d3d10core/device.c | 19 ++-- dlls/d3d10core/utils.c | 198 ++++++++++++++++++++++++++++++++++++ 3 files changed, 211 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d28e5a055129dfa48be93…

1 0

Austin English : kernel32: Add test for renaming file over itself.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 68cc3ff120756977c080333373a08465411c1e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68cc3ff120756977c08033337… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 19 10:46:30 2009 -0600 kernel32: Add test for renaming file over itself. --- dlls/kernel32/tests/file.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3f55977..906924b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -564,6 +564,9 @@ static void test_CopyFileA(void) ret = GetTempFileNameA(temp_path, prefix, 0, source); ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError()); + ret = MoveFileA(source, source); + todo_wine ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); + /* make the source have not zero size */ hfile = CreateFileA(source, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 ); ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file\n");

1 0

Aurimas Fischer : winspool.drv: Add Lithuanian translation.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 2b22863fec930a582b917e3b063c89da73c4bf6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b22863fec930a582b917e3b0… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sat Feb 7 16:52:12 2009 +0200 winspool.drv: Add Lithuanian translation. --- dlls/winspool.drv/Lt.rc | 44 +++++++++++++++++++++++++++++++++++++++++ dlls/winspool.drv/winspool.rc | 1 + 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/Lt.rc b/dlls/winspool.drv/Lt.rc new file mode 100644 index 0000000..5630862 --- /dev/null +++ b/dlls/winspool.drv/Lt.rc @@ -0,0 +1,44 @@ +/* + * Lithuanian resources for winspool + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Spausdinti į failą" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Išvesties failo pavadinimas:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "Gerai", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Atsisakyti", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_CAPTION "Lokalus prievadas" + IDS_FILE_EXISTS "Išvesties failas jau egzistouja. Norėdami failą keisti spauskite Gerai." + IDS_CANNOT_OPEN "Nepavyko sukurti išvesties failo." +} + +#pragma code_page(default) diff --git a/dlls/winspool.drv/winspool.rc b/dlls/winspool.drv/winspool.rc index 805dab6..f831618 100644 --- a/dlls/winspool.drv/winspool.rc +++ b/dlls/winspool.drv/winspool.rc @@ -49,6 +49,7 @@ #include "Fr.rc" #include "It.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

Alexandre Julliard : winetest: Get rid of the archive URL, it' s no longer used.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 9caf14c44434ec02f2e3ec58ad734df38f2d66d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9caf14c44434ec02f2e3ec58a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 19 20:27:53 2009 +0100 winetest: Get rid of the archive URL, it's no longer used. --- programs/winetest/Makefile.in | 2 +- programs/winetest/dist.rc | 3 --- programs/winetest/main.c | 5 +---- programs/winetest/resource.h | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 05427e7..140adb5 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -55,7 +55,7 @@ winetest-dist.exe: $(OBJS) dist.res.o Makefile.in $(CC) $(APPMODE) $(OBJS) dist.res.o -o $@ -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) $(ALL_LIBS) -upx -9 -qqq $@ -dist.res: winetest.rc tests.rc build.nfo tests.url winetest.ico $(TESTBINS) +dist.res: winetest.rc tests.rc build.nfo winetest.ico $(TESTBINS) @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/winetest/dist.rc b/programs/winetest/dist.rc index e7080db..4acbfa6 100644 --- a/programs/winetest/dist.rc +++ b/programs/winetest/dist.rc @@ -22,6 +22,3 @@ /* @makedep: build.nfo */ BUILD_INFO STRINGRES "build.nfo" - -/* @makedep: tests.url */ -TESTS_URL STRINGRES "tests.url" diff --git a/programs/winetest/main.c b/programs/winetest/main.c index ab9c79e..e53502d 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -631,10 +631,7 @@ run_tests (char *logname) xprintf ("Version 4\n"); xprintf ("Tests from build %s\n", build_id[0] ? build_id : "-" ); - strres = extract_rcdata (MAKEINTRESOURCE(TESTS_URL), STRINGRES, &strsize); - xprintf ("Archive: "); - if (strres) xprintf ("%.*s", strsize, strres); - else xprintf ("-\n"); + xprintf ("Archive: -\n"); /* no longer used */ xprintf ("Tag: %s\n", tag); xprintf ("Build info:\n"); strres = extract_rcdata (MAKEINTRESOURCE(BUILD_INFO), STRINGRES, &strsize); diff --git a/programs/winetest/resource.h b/programs/winetest/resource.h index 4b21491..6676508 100644 --- a/programs/winetest/resource.h +++ b/programs/winetest/resource.h @@ -52,4 +52,3 @@ /* String resources */ #define BUILD_INFO 10001 -#define TESTS_URL 10002

1 0