August 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : makefiles: Add rules for installing fake modules.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: 5f10595c5cd940c719cda8dbfbf89a30771c4a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f10595c5cd940c719cda8dbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 18 11:33:26 2009 +0200 makefiles: Add rules for installing fake modules. --- Make.rules.in | 1 + dlls/Makedll.rules.in | 17 ++++++++++++++--- dlls/Makefile.in | 2 +- programs/Makefile.in | 2 +- programs/Makeprog.rules.in | 18 ++++++++---------- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 9ce72d1..7220245 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -106,6 +106,7 @@ mandir = @mandir@ sysconfdir = @sysconfdir@ includedir = @includedir@/wine dlldir = @libdir@/wine +fakedlldir = $(dlldir)/fakedlls prog_manext = 1 api_manext = 3w conf_manext = 5 diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index a2c981e..ab7e8fd 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -21,7 +21,7 @@ IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o) IMPORTLIBFILE = $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) STATICIMPLIB = $(IMPORTLIBFILE:.def=.def.a) DLL_LDPATH = -L$(DLLDIR) $(DELAYIMPORTS:%=-L$(DLLDIR)/%) $(IMPORTS:%=-L$(DLLDIR)/%) -INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(datadir)/wine +INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(datadir)/wine @MAKE_RULES@ @@ -89,13 +89,24 @@ install_static_implib_a: $(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT) -install install-lib:: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) +.PHONY: install_dll install_dll.so install_dll.fake + +install_dll: $(MODULE) $(DESTDIR)$(dlldir) dummy + $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE) + +install_dll.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy + $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so + +install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy + $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) + +install install-lib:: install_dll$(DLLEXT) install_dll$(FAKEEXT) install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) dummy uninstall:: -cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIBFILE) $(STATICIMPLIB) + $(RM) $(DESTDIR)$(fakedlldir)/$(MODULE) # Misc. rules diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 8f2a977..3ff953c 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -849,7 +849,7 @@ install install-lib:: @WIN16_INSTALL@ uninstall:: -cd $(DESTDIR)$(dlldir) && $(RM) $(WIN16_FILES) - -rmdir $(DESTDIR)$(dlldir) + -rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) clean:: $(RM) $(IMPORT_SYMLINKS) $(WIN16_FILES) diff --git a/programs/Makefile.in b/programs/Makefile.in index fcfeb50..b339aa3 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -37,7 +37,7 @@ install-progs: # nothing to do here uninstall:: -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS) - -rmdir $(DESTDIR)$(dlldir) + -rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) # Rules for testing diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 4fc2093..6135771 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -13,7 +13,7 @@ DLLFLAGS = @DLLFLAGS@ DEFS = $(EXTRADEFS) ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS) RUNTESTFLAGS= -q -P wine -T $(TOPOBJDIR) -INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(mandir)/man$(prog_manext) +INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext) @MAKE_RULES@ @@ -30,23 +30,21 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT) # Rules for installation -.PHONY: install_prog install_prog.so uninstall_prog uninstall_prog.so +.PHONY: install_prog install_prog.so install_prog.fake install_prog.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so +install_prog.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy + $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) + install_prog: $(MODULE) $(DESTDIR)$(bindir) dummy $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(bindir)/$(MODULE) -uninstall_prog.so: dummy - $(RM) $(DESTDIR)$(dlldir)/$(MODULE).so - -uninstall_prog: dummy - $(RM) $(DESTDIR)$(bindir)/$(MODULE) - -install install-lib:: install_prog$(DLLEXT) +install install-lib:: install_prog$(DLLEXT) install_prog$(FAKEEXT) -uninstall:: uninstall_prog$(DLLEXT) +uninstall:: + $(RM) $(DESTDIR)$(bindir)/$(MODULE) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) clean:: $(RM) $(MODULE)

1 0

Alexandre Julliard : makefiles: Add rules for building fake modules.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: f78a8ceafc6cdc5dcecf67ff8972973a9e00fcb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78a8ceafc6cdc5dcecf67ff8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 18 11:29:35 2009 +0200 makefiles: Add rules for building fake modules. --- .gitignore | 1 + Make.rules.in | 3 ++- dlls/Makedll.rules.in | 7 +++---- programs/Makeprog.rules.in | 4 ++-- tools/make_makefiles | 1 + 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 305cd7b..78ae433 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Automatically generated by make_makefiles; DO NOT EDIT!! *.[oa] +*.fake *.ok *.res *.so diff --git a/Make.rules.in b/Make.rules.in index 2b83943..9ce72d1 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -52,6 +52,7 @@ LINTFLAGS = @LINTFLAGS@ FONTFORGE = @FONTFORGE@ RSVG = @RSVG@ ICOTOOL = @ICOTOOL@ +FAKEEXT = $(DLLEXT:.so=.fake) INCLUDES = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL) EXTRACFLAGS = @EXTRACFLAGS@ ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) @@ -108,7 +109,7 @@ dlldir = @libdir@/wine prog_manext = 1 api_manext = 3w conf_manext = 5 -CLEAN_FILES = *.o *.a *.so *.ln *.res *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej *.flc core +CLEAN_FILES = *.o *.a *.so *.ln *.res *.fake *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej *.flc core IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 9c7be29..a2c981e 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -9,7 +9,6 @@ # DLLFLAGS = @DLLFLAGS@ -DLLEXT = @DLLEXT@ MINGWAR = @MINGWAR@ DEFS = -D__WINESRC__ $(EXTRADEFS) BASEMODULE = $(MODULE:%.dll=%) @@ -24,11 +23,11 @@ STATICIMPLIB = $(IMPORTLIBFILE:.def=.def.a) DLL_LDPATH = -L$(DLLDIR) $(DELAYIMPORTS:%=-L$(DLLDIR)/%) $(IMPORTS:%=-L$(DLLDIR)/%) INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(datadir)/wine -all: $(MODULE)$(DLLEXT) $(SUBDIRS) - @MAKE_RULES@ -$(MODULE) $(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in +all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT) $(SUBDIRS) + +$(MODULE) $(MODULE).so $(MODULE).fake: $(MAINSPEC) $(ALL_OBJS) Makefile.in $(WINEGCC) -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) # Rules for import libraries diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 9c361ff..4fc2093 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -17,9 +17,9 @@ INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(mandir)/man$(p @MAKE_RULES@ -all: $(MODULE)$(DLLEXT) +all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT) -$(MODULE) $(MODULE).so: $(OBJS) Makefile.in +$(MODULE) $(MODULE).so $(MODULE).fake: $(OBJS) Makefile.in $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) # Rules for testing diff --git a/tools/make_makefiles b/tools/make_makefiles index cd495be..3883333 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -58,6 +58,7 @@ my %dont_install = # Default patterns for top-level .gitignore my @ignores = ( "*.[oa]", + "*.fake", "*.ok", "*.res", "*.so",

1 0

Alexandre Julliard : winegcc: Add support for building fake modules.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: 2de0c16363c61504082bbabdcdddeaa99ebf806f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de0c16363c61504082bbabdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 18 11:26:43 2009 +0200 winegcc: Add support for building fake modules. --- tools/winegcc/winegcc.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b337630..56d9c5f 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -556,6 +556,7 @@ static void build(struct options* opts) const char *spec_o_name; const char *output_name, *spec_file, *lang; int generate_app_loader = 1; + int fake_module = 0; unsigned int j; /* NOTE: for the files array we'll use the following convention: @@ -581,6 +582,8 @@ static void build(struct options* opts) if (opts->shared || strendswith(output_file, ".so")) generate_app_loader = 0; + if (strendswith(output_file, ".fake")) fake_module = 1; + /* normalize the filename a bit: strip .so, ensure it has proper ext */ if (strendswith(output_file, ".so")) output_file[strlen(output_file) - 3] = 0; @@ -802,8 +805,17 @@ static void build(struct options* opts) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); strarray_addall(spec_args, strarray_fromstring(DLLFLAGS, " ")); strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); - strarray_add(spec_args, "-o"); - strarray_add(spec_args, spec_o_name); + if (fake_module) + { + strarray_add(spec_args, "--fake-module"); + strarray_add(spec_args, "-o"); + strarray_add(spec_args, output_file); + } + else + { + strarray_add(spec_args, "-o"); + strarray_add(spec_args, spec_o_name); + } if (spec_file) { strarray_add(spec_args, "-E"); @@ -850,6 +862,7 @@ static void build(struct options* opts) spawn(opts->prefix, spec_args, 0); strarray_free (spec_args); + if (fake_module) return; /* nothing else to do */ /* link everything together now */ strarray_addall(link_args, get_translator(opts));

1 0

Sunil Mohan : oleaut32: Fix SLTG_ReadString to null terminate.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: f7f50d1252342db0fc035f9066b6ab10ae5f20a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7f50d1252342db0fc035f906… Author: Sunil Mohan <sunilmohan(a)fsf.org.in> Date: Tue Aug 18 11:06:42 2009 +0530 oleaut32: Fix SLTG_ReadString to null terminate. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1f104f8..f16b459 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3052,7 +3052,7 @@ static WORD SLTG_ReadString(const char *ptr, BSTR *pBstr) bytelen = *(const WORD*)ptr; if(bytelen == 0xffff) return 2; len = MultiByteToWideChar(CP_ACP, 0, ptr + 2, bytelen, NULL, 0); - *pBstr = SysAllocStringLen(NULL, len - 1); + *pBstr = SysAllocStringLen(NULL, len); if (*pBstr) len = MultiByteToWideChar(CP_ACP, 0, ptr + 2, bytelen, *pBstr, len); return bytelen + 2;

1 0

Michael Karcher : ntdll: Add handing of MEM_EXECUTE_OPTION_PERMANENT.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: ca4c571818e433956306f6221845da4593968386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4c571818e433956306f6221… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Tue Aug 18 01:20:54 2009 +0200 ntdll: Add handing of MEM_EXECUTE_OPTION_PERMANENT. --- dlls/ntdll/process.c | 2 ++ dlls/ntdll/tests/exception.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index ef581bc..6a2c66d 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -420,6 +420,8 @@ NTSTATUS WINAPI NtSetInformationProcess( case ProcessExecuteFlags: if (ProcessInformationLength != sizeof(ULONG)) return STATUS_INVALID_PARAMETER; + else if (execute_flags & MEM_EXECUTE_OPTION_PERMANENT) + return STATUS_ACCESS_DENIED; else { BOOL enable; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index f3f61e3..2a959f7 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1070,12 +1070,12 @@ static void test_dpe_exceptions(void) /* Try to turn off DEP */ val = MEM_EXECUTE_OPTION_ENABLE; stat = pNtSetInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val); - todo_wine ok(stat == STATUS_ACCESS_DENIED, "disabling DEP while permanent: status %08x\n", stat); + ok(stat == STATUS_ACCESS_DENIED, "disabling DEP while permanent: status %08x\n", stat); /* Try to turn on DEP */ val = MEM_EXECUTE_OPTION_DISABLE; stat = pNtSetInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val); - todo_wine ok(stat == STATUS_ACCESS_DENIED, "enabling DEP while permanent: status %08x\n", stat); + ok(stat == STATUS_ACCESS_DENIED, "enabling DEP while permanent: status %08x\n", stat); } #elif defined(__x86_64__)

1 0

Michael Karcher : ntdll: Add ProcessExecuteFlags handling to NtQueryInformationProcess.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: 7aa1f6c346ab6610cd91e4016ae8cdc81fdaa6d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa1f6c346ab6610cd91e4016… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Tue Aug 18 01:20:52 2009 +0200 ntdll: Add ProcessExecuteFlags handling to NtQueryInformationProcess. --- dlls/ntdll/process.c | 11 +++++++++++ dlls/ntdll/tests/exception.c | 10 +++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 265aa2e..ef581bc 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); +static ULONG execute_flags = MEM_EXECUTE_OPTION_ENABLE; + /* * Process object */ @@ -347,6 +349,14 @@ NTSTATUS WINAPI NtQueryInformationProcess( } SERVER_END_REQ; break; + case ProcessExecuteFlags: + if (ProcessInformationLength == sizeof(ULONG)) + { + *(ULONG *)ProcessInformation = execute_flags; + len = sizeof(ULONG); + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + break; default: FIXME("(%p,info_class=%d,%p,0x%08x,%p) Unknown information class\n", ProcessHandle,ProcessInformationClass, @@ -424,6 +434,7 @@ NTSTATUS WINAPI NtSetInformationProcess( default: return STATUS_INVALID_PARAMETER; } + execute_flags = *(ULONG *)ProcessInformation; VIRTUAL_SetForceExec( enable ); } break; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2a959f7..d0b85f6 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1053,7 +1053,11 @@ static void test_dpe_exceptions(void) info.exception_caught = FALSE; run_exception_test(dpe_exception_handler, &info, single_ret, sizeof(single_ret), PAGE_NOACCESS); ok(info.exception_caught == TRUE, "Execution of disabled memory suceeded\n"); - ok(info.exception_info == EXCEPTION_READ_FAULT, + if(has_hw_support) + todo_wine ok(info.exception_info == EXCEPTION_READ_FAULT, + "Access violation type: %08x\n", (unsigned)info.exception_info); + else + ok(info.exception_info == EXCEPTION_READ_FAULT, "Access violation type: %08x\n", (unsigned)info.exception_info); } else @@ -1070,12 +1074,12 @@ static void test_dpe_exceptions(void) /* Try to turn off DEP */ val = MEM_EXECUTE_OPTION_ENABLE; stat = pNtSetInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val); - ok(stat == STATUS_ACCESS_DENIED, "disabling DEP while permanent: status %08x\n", stat); + todo_wine ok(stat == STATUS_ACCESS_DENIED, "disabling DEP while permanent: status %08x\n", stat); /* Try to turn on DEP */ val = MEM_EXECUTE_OPTION_DISABLE; stat = pNtSetInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val); - ok(stat == STATUS_ACCESS_DENIED, "enabling DEP while permanent: status %08x\n", stat); + todo_wine ok(stat == STATUS_ACCESS_DENIED, "enabling DEP while permanent: status %08x\n", stat); } #elif defined(__x86_64__)

1 0

Michael Karcher : ntdll: Don' t send EXCEPTION_EXECUTE_FAULT to Windows programs that didn't enable DEP.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: 9476071fd2aaf0022619d428c18ae5f53762f12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9476071fd2aaf0022619d428c… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Tue Aug 18 01:20:53 2009 +0200 ntdll: Don't send EXCEPTION_EXECUTE_FAULT to Windows programs that didn't enable DEP. --- dlls/ntdll/signal_i386.c | 9 +++++++++ dlls/ntdll/tests/exception.c | 6 +----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index d0e0172..3d7c8e1 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1833,6 +1833,15 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; rec->ExceptionInformation[0] = (get_error_code(context) >> 1) & 0x09; + /* Send code 8 (EXCEPTION_EXECUTE_FAULT) only if data execution + prevention is enabled */ + if (rec->ExceptionInformation[0] & 8) + { + ULONG flags; + NtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, + &flags, sizeof(flags), NULL ); + if (!(flags & MEM_EXECUTE_OPTION_DISABLE)) rec->ExceptionInformation[0] &= 1; + } rec->ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index d0b85f6..f3f61e3 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1053,11 +1053,7 @@ static void test_dpe_exceptions(void) info.exception_caught = FALSE; run_exception_test(dpe_exception_handler, &info, single_ret, sizeof(single_ret), PAGE_NOACCESS); ok(info.exception_caught == TRUE, "Execution of disabled memory suceeded\n"); - if(has_hw_support) - todo_wine ok(info.exception_info == EXCEPTION_READ_FAULT, - "Access violation type: %08x\n", (unsigned)info.exception_info); - else - ok(info.exception_info == EXCEPTION_READ_FAULT, + ok(info.exception_info == EXCEPTION_READ_FAULT, "Access violation type: %08x\n", (unsigned)info.exception_info); } else

1 0

Michael Stefaniuc : wininet: Update the Romanian translation.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: a0509811a57a060d16f879c3c592ca71163e9c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0509811a57a060d16f879c3c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 17 23:26:53 2009 +0200 wininet: Update the Romanian translation. --- dlls/wininet/wininet_Ro.rc | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/wininet_Ro.rc b/dlls/wininet/wininet_Ro.rc index 2bc607a..13403ee 100644 --- a/dlls/wininet/wininet_Ro.rc +++ b/dlls/wininet/wininet_Ro.rc @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg" { LTEXT "Introduceți numele de utilizator și parola:", -1, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 - LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "Domeniu", -1, 40, 46, 50, 10 LTEXT "Utilizator", -1, 40, 66, 50, 10 LTEXT "Parolă", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 @@ -43,6 +43,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Renunță", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Autentificare necesară" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Introduceți numele de utilizator și parola:", -1, 40, 6, 150, 15 + LTEXT "Server", -1, 40, 26, 50, 10 + LTEXT "Domeniu", -1, 40, 46, 50, 10 + LTEXT "Utilizator", -1, 40, 66, 50, 10 + LTEXT "Parolă", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Salvează această parolă (nesigur)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Renunță", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "Conexiune LAN"

1 0

Michael Stefaniuc : notepad: Update the Romanian translation.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: d3a4ff8ccb5f9adea8f43027695fb73b62fbb912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a4ff8ccb5f9adea8f430276… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 17 23:27:01 2009 +0200 notepad: Update the Romanian translation. --- programs/notepad/Ro.rc | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Ro.rc b/programs/notepad/Ro.rc index a00be21..96cc742 100644 --- a/programs/notepad/Ro.rc +++ b/programs/notepad/Ro.rc @@ -93,6 +93,14 @@ PUSHBUTTON "Renunță", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Ajutor", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Codificare:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -115,4 +123,13 @@ STRING_NOTSAVED, "Fișierul '%s'\na fost modificat\n\nVreți să STRING_NOTFOUND, "'%s' nu a fost găsit." STRING_OUT_OF_MEMORY, "Nu este destulă memorie pentru a completa această sarcină.\nÎnchideți una sau mai multe aplicații pentru a mări memoria liberă." +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Acest document conține caractere unicode care se v-or pierde\n\ +dacă salvați acest fișier în codificarea %s.\n\ +Pentru a reține aceste caractere dați clic pe „Renunță” și apoi\n\ +alegeți una din opțiunile unicode din lista de selecție a codificării.\n\ +Continuă?" }

1 0

Aurimas Fišeras : winecfg: Update Lithuanian translation.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: ebca91750ba54c73fd4ea58c4f8e0098249209cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebca91750ba54c73fd4ea58c4… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Aug 17 23:01:21 2009 +0300 winecfg: Update Lithuanian translation. --- programs/winecfg/Lt.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index ca4f162..7208cc6 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -125,6 +125,16 @@ BEGIN PUSHBUTTON "Atsisakyti",IDCANCEL,57,74,45,14,WS_GROUP END +IDD_DRIVECHOOSE DIALOG DISCARDABLE 60, 70, 170, 60 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Parinkite disko raidę" +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Gerai",IDOK,105,10,45,14,WS_GROUP + PUSHBUTTON "Atsisakyti",IDCANCEL,105,30,45,14,WS_GROUP +END + IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg"

1 0