February 2010 - Wine-Commits

Peter Rosin : ntdll: Add RtlSetThreadErrorMode and RtlGetThreadErrorMode.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: bdebad094ce826da0498ccc23b0a054b3636d66e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdebad094ce826da0498ccc23… Author: Peter Rosin <peda(a)lysator.liu.se> Date: Tue Feb 2 13:50:16 2010 +0100 ntdll: Add RtlSetThreadErrorMode and RtlGetThreadErrorMode. --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/rtl.c | 23 +++++++++++++++++++++++ dlls/ntdll/tests/rtl.c | 2 +- include/winternl.h | 2 ++ 4 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 67a9d13..c7c81e8 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -643,6 +643,7 @@ @ stdcall RtlGetSaclSecurityDescriptor(ptr ptr ptr ptr) # @ stub RtlGetSecurityDescriptorRMControl # @ stub RtlGetSetBootStatusData +@ stdcall RtlGetThreadErrorMode() # @ stub RtlGetUnloadEventTrace @ stub RtlGetUserInfoHeap @ stdcall RtlGetVersion(ptr) @@ -842,6 +843,7 @@ # @ stub RtlSetSecurityDescriptorRMControl @ stub RtlSetSecurityObject # @ stub RtlSetSecurityObjectEx +@ stdcall RtlSetThreadErrorMode(long ptr) # @ stub RtlSetThreadIsCritical # @ stub RtlSetThreadPoolStartFunc @ stdcall RtlSetTimeZoneInformation(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index ad4bc10..69a2955 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1165,3 +1165,26 @@ NTSTATUS WINAPI RtlDecompressBuffer(USHORT CompressionFormat, PUCHAR Uncompresse return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * RtlSetThreadErrorMode [NTDLL.@] + */ +NTSTATUS WINAPI RtlSetThreadErrorMode( DWORD mode, LPDWORD oldmode ) +{ + if (mode & ~0x70) + return STATUS_INVALID_PARAMETER_1; + + if (oldmode) + *oldmode = NtCurrentTeb()->HardErrorDisabled; + + NtCurrentTeb()->HardErrorDisabled = mode; + return STATUS_SUCCESS; +} + +/*********************************************************************** + * RtlGetThreadErrorMode [NTDLL.@] + */ +DWORD WINAPI RtlGetThreadErrorMode( void ) +{ + return NtCurrentTeb()->HardErrorDisabled; +} diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 61ceb72..6e76a3c 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1039,7 +1039,7 @@ static void test_RtlThreadErrorMode(void) if (!pRtlGetThreadErrorMode || !pRtlSetThreadErrorMode) { - skip("RtlGetThreadErrorMode and/or RtlSetThreadErrorMode not available\n"); + win_skip("RtlGetThreadErrorMode and/or RtlSetThreadErrorMode not available\n"); return; } diff --git a/include/winternl.h b/include/winternl.h index 08172b0..2f88cad 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2273,6 +2273,7 @@ NTSYSAPI ULONG WINAPI RtlGetNtGlobalFlags(void); NTSYSAPI BOOLEAN WINAPI RtlGetNtProductType(LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlGetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID *,PBOOLEAN); NTSYSAPI ULONG WINAPI RtlGetProcessHeaps(ULONG,HANDLE*); +NTSYSAPI DWORD WINAPI RtlGetThreadErrorMode(void); NTSYSAPI NTSTATUS WINAPI RtlGetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,PBOOLEAN,PACL *,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlGetVersion(RTL_OSVERSIONINFOEXW*); NTSYSAPI NTSTATUS WINAPI RtlGUIDFromString(PUNICODE_STRING,GUID*); @@ -2364,6 +2365,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE,PRTL_OVERLAPPED_COMP NTSYSAPI void WINAPI RtlSetLastWin32Error(DWORD); NTSYSAPI void WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus(NTSTATUS); NTSYSAPI NTSTATUS WINAPI RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN,PACL,BOOLEAN); +NTSYSAPI NTSTATUS WINAPI RtlSetThreadErrorMode(DWORD,LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*); NTSYSAPI SIZE_T WINAPI RtlSizeHeap(HANDLE,ULONG,const void*); NTSYSAPI NTSTATUS WINAPI RtlStringFromGUID(REFGUID,PUNICODE_STRING);

1 0

Hans Leidekker : msi: Move some helpers to the module where they are used.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 9a0020ade9f8694085b30368db15f6dbea87a7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0020ade9f8694085b30368d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 3 09:20:56 2010 +0100 msi: Move some helpers to the module where they are used. --- dlls/msi/helpers.c | 232 --------------------------------------------------- dlls/msi/msipriv.h | 1 - dlls/msi/package.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 232 insertions(+), 234 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a0020ade9f8694085b30…

1 0

Alexandre Julliard : makefiles: Create the fonts symlinks from configure.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: ce12296ce1544e665194488577b7e52a1df01006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce12296ce1544e66519448857… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 13:13:16 2010 +0100 makefiles: Create the fonts symlinks from configure. --- configure | 16 ++++++++++++++++ configure.ac | 4 ++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5aac1cf..25ea483 100755 --- a/configure +++ b/configure @@ -13685,6 +13685,18 @@ ALL_PROGRAM_BIN_INSTALL_DIRS="" ac_config_commands="$ac_config_commands include/stamp-h" +ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + fonts/marlett.ttf" +ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + fonts/symbol.ttf" +ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + fonts/tahoma.ttf" +ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + fonts/tahomabd.ttf" ac_config_links="$ac_config_links wine:tools/winewrapper" ALL_SYMLINKS="$ALL_SYMLINKS \\ wine" @@ -19607,6 +19619,10 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; + "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; + "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; + "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; + "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;; "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;; diff --git a/configure.ac b/configure.ac index 733c028..f6c4d34 100644 --- a/configure.ac +++ b/configure.ac @@ -2114,6 +2114,10 @@ AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) +WINE_CONFIG_SYMLINK(fonts/marlett.ttf) +WINE_CONFIG_SYMLINK(fonts/symbol.ttf) +WINE_CONFIG_SYMLINK(fonts/tahoma.ttf) +WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf) WINE_CONFIG_SYMLINK(wine,tools/winewrapper) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)

1 0

Hans Leidekker : msi: Implement the ScheduleReboot standard action.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 29f47299c2e93e743dce2c19f8a68d6098718b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=29f47299c2e93e743dce2c19f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 3 09:20:22 2010 +0100 msi: Implement the ScheduleReboot standard action. --- dlls/msi/action.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4b2d5b4..885b415 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5920,6 +5920,13 @@ done: return r; } +static UINT ACTION_ScheduleReboot( MSIPACKAGE *package ) +{ + TRACE("\n"); + package->need_reboot = 1; + return ERROR_SUCCESS; +} + static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, LPCSTR action, LPCWSTR table ) { @@ -6188,7 +6195,7 @@ StandardActions[] = { szRemoveShortcuts, ACTION_RemoveShortcuts }, { szResolveSource, ACTION_ResolveSource }, { szRMCCPSearch, ACTION_RMCCPSearch }, - { szScheduleReboot, NULL }, + { szScheduleReboot, ACTION_ScheduleReboot }, { szSelfRegModules, ACTION_SelfRegModules }, { szSelfUnregModules, ACTION_SelfUnregModules }, { szSetODBCFolders, ACTION_SetODBCFolders },

1 0

Alexandre Julliard : makefiles: Get rid of the (broken) aclocal installation rules.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 303b79afa6cd7ff2dc36632b79f4d68ea4493f3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=303b79afa6cd7ff2dc36632b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 11:50:37 2010 +0100 makefiles: Get rid of the (broken) aclocal installation rules. --- Makefile.in | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2d2d8b7..febb03e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,8 +51,6 @@ all: Make.rules $(PROGRAMS) WINAPI_CHECK_EXTRA_FLAGS = --global -INSTALLDIRS = $(DESTDIR)$(datadir)/aclocal - @MAKE_RULES@ $(SRCDIR)/configure: @MAINTAINER_MODE@ configure.ac aclocal.m4 @@ -75,15 +73,8 @@ wine: $(WINEWRAPPER) # Installation rules -install-aclocal: $(DESTDIR)$(datadir)/aclocal dummy - -.PHONY: install-aclocal - -(a)WOW64_DISABLE@ install install-dev:: install-aclocal - uninstall:: - $(RM) $(DESTDIR)$(datadir)/aclocal/wine.m4 - -rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(datadir)/aclocal + -rmdir $(DESTDIR)$(datadir)/wine # Dependencies between directories

1 0

Alexandre Julliard : configure: Create a symlink for generic.ppd.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: a632052692d033820805e1d3910bad6ccd90eb9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a632052692d033820805e1d39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 13:14:03 2010 +0100 configure: Create a symlink for generic.ppd. --- configure | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 25ea483..2cd384d 100755 --- a/configure +++ b/configure @@ -13685,6 +13685,9 @@ ALL_PROGRAM_BIN_INSTALL_DIRS="" ac_config_commands="$ac_config_commands include/stamp-h" +ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + dlls/wineps.drv/generic.ppd" ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" ALL_SYMLINKS="$ALL_SYMLINKS \\ fonts/marlett.ttf" @@ -19619,6 +19622,7 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; + "dlls/wineps.drv/generic.ppd") CONFIG_LINKS="$CONFIG_LINKS dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" ;; "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; diff --git a/configure.ac b/configure.ac index f6c4d34..8016dd7 100644 --- a/configure.ac +++ b/configure.ac @@ -2114,6 +2114,7 @@ AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) +WINE_CONFIG_SYMLINK(dlls/wineps.drv/generic.ppd) WINE_CONFIG_SYMLINK(fonts/marlett.ttf) WINE_CONFIG_SYMLINK(fonts/symbol.ttf) WINE_CONFIG_SYMLINK(fonts/tahoma.ttf)

1 0

Peter Rosin : ntdll: Add tests for RtlSetThreadErrorMode and RtlGetThreadErrorMode.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 2cf159f61277de5c8b6d897f276365ff6dd38bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf159f61277de5c8b6d897f2… Author: Peter Rosin <peda(a)lysator.liu.se> Date: Tue Feb 2 13:47:06 2010 +0100 ntdll: Add tests for RtlSetThreadErrorMode and RtlGetThreadErrorMode. --- dlls/ntdll/tests/rtl.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 6bc12bb..61ceb72 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -67,6 +67,11 @@ static RTL_HANDLE * (WINAPI * pRtlAllocateHandle)(RTL_HANDLE_TABLE *, ULONG *); static BOOLEAN (WINAPI * pRtlFreeHandle)(RTL_HANDLE_TABLE *, RTL_HANDLE *); static NTSTATUS (WINAPI *pRtlAllocateAndInitializeSid)(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID*); static NTSTATUS (WINAPI *pRtlFreeSid)(PSID); +static struct _TEB * (WINAPI *pNtCurrentTeb)(void); +static DWORD (WINAPI *pRtlGetThreadErrorMode)(void); +static NTSTATUS (WINAPI *pRtlSetThreadErrorMode)(DWORD, LPDWORD); +static HMODULE hkernel32 = 0; +static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); #define LEN 16 static const char* src_src = "This is a test!"; /* 16 bytes long, incl NUL */ static ULONG src_aligned_block[4]; @@ -99,6 +104,14 @@ static void InitFunctionPtrs(void) pRtlFreeHandle = (void *)GetProcAddress(hntdll, "RtlFreeHandle"); pRtlAllocateAndInitializeSid = (void *)GetProcAddress(hntdll, "RtlAllocateAndInitializeSid"); pRtlFreeSid = (void *)GetProcAddress(hntdll, "RtlFreeSid"); + pNtCurrentTeb = (void *)GetProcAddress(hntdll, "NtCurrentTeb"); + pRtlGetThreadErrorMode = (void *)GetProcAddress(hntdll, "RtlGetThreadErrorMode"); + pRtlSetThreadErrorMode = (void *)GetProcAddress(hntdll, "RtlSetThreadErrorMode"); + } + hkernel32 = LoadLibraryA("kernel32.dll"); + ok(hkernel32 != 0, "LoadLibrary failed\n"); + if (hkernel32) { + pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); } strcpy((char*)src_aligned_block, src_src); ok(strlen(src) == 15, "Source must be 16 bytes long!\n"); @@ -1017,6 +1030,70 @@ static void test_RtlDeleteTimer(void) "expected STATUS_INVALID_PARAMETER_1 or STATUS_INVALID_PARAMETER, got %x\n", ret); } +static void test_RtlThreadErrorMode(void) +{ + DWORD oldmode; + BOOL is_wow64; + DWORD mode; + NTSTATUS status; + + if (!pRtlGetThreadErrorMode || !pRtlSetThreadErrorMode) + { + skip("RtlGetThreadErrorMode and/or RtlSetThreadErrorMode not available\n"); + return; + } + + if (!pIsWow64Process || !pIsWow64Process(GetCurrentProcess(), &is_wow64)) + is_wow64 = FALSE; + + oldmode = pRtlGetThreadErrorMode(); + + status = pRtlSetThreadErrorMode(0x70, &mode); + ok(status == STATUS_SUCCESS || + status == STATUS_WAIT_1, /* Vista */ + "RtlSetThreadErrorMode failed with error 0x%08x\n", status); + ok(mode == oldmode, + "RtlSetThreadErrorMode returned mode 0x%x, expected 0x%x\n", + mode, oldmode); + ok(pRtlGetThreadErrorMode() == 0x70, + "RtlGetThreadErrorMode returned 0x%x, expected 0x%x\n", mode, 0x70); + if (!is_wow64 && pNtCurrentTeb) + ok(pNtCurrentTeb()->HardErrorDisabled == 0x70, + "The TEB contains 0x%x, expected 0x%x\n", + pNtCurrentTeb()->HardErrorDisabled, 0x70); + + status = pRtlSetThreadErrorMode(0, &mode); + ok(status == STATUS_SUCCESS || + status == STATUS_WAIT_1, /* Vista */ + "RtlSetThreadErrorMode failed with error 0x%08x\n", status); + ok(mode == 0x70, + "RtlSetThreadErrorMode returned mode 0x%x, expected 0x%x\n", + mode, 0x70); + ok(pRtlGetThreadErrorMode() == 0, + "RtlGetThreadErrorMode returned 0x%x, expected 0x%x\n", mode, 0); + if (!is_wow64 && pNtCurrentTeb) + ok(pNtCurrentTeb()->HardErrorDisabled == 0, + "The TEB contains 0x%x, expected 0x%x\n", + pNtCurrentTeb()->HardErrorDisabled, 0); + + for (mode = 1; mode; mode <<= 1) + { + status = pRtlSetThreadErrorMode(mode, NULL); + if (mode & 0x70) + ok(status == STATUS_SUCCESS || + status == STATUS_WAIT_1, /* Vista */ + "RtlSetThreadErrorMode(%x,NULL) failed with error 0x%08x\n", + mode, status); + else + ok(status == STATUS_INVALID_PARAMETER_1, + "RtlSetThreadErrorMode(%x,NULL) returns 0x%08x, " + "expected STATUS_INVALID_PARAMETER_1\n", + mode, status); + } + + pRtlSetThreadErrorMode(oldmode, NULL); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -1036,4 +1113,5 @@ START_TEST(rtl) test_HandleTables(); test_RtlAllocateAndInitializeSid(); test_RtlDeleteTimer(); + test_RtlThreadErrorMode(); }

1 0

Hans Leidekker : msi: Add a stub implementation of the SetODBCFolders standard action.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 552a9c9b85f34ecf4ab32fbe853f791c9f408815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=552a9c9b85f34ecf4ab32fbe8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 3 09:19:56 2010 +0100 msi: Add a stub implementation of the SetODBCFolders standard action. --- dlls/msi/action.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 462b9ff..4b2d5b4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6081,6 +6081,12 @@ static UINT ACTION_RemoveShortcuts( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "RemoveShortcuts", table ); } +static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'D','i','r','e','c','t','o','r','y',0 }; + return msi_unimplemented_action_stub( package, "SetODBCFolders", table ); +} + static UINT ACTION_UnpublishComponents( MSIPACKAGE *package ) { static const WCHAR table[] = { 'P','u','b','l','i','s','h','C','o','m','p','o','n','e','n','t',0 }; @@ -6185,7 +6191,7 @@ StandardActions[] = { szScheduleReboot, NULL }, { szSelfRegModules, ACTION_SelfRegModules }, { szSelfUnregModules, ACTION_SelfUnregModules }, - { szSetODBCFolders, NULL }, + { szSetODBCFolders, ACTION_SetODBCFolders }, { szStartServices, ACTION_StartServices }, { szStopServices, ACTION_StopServices }, { szUnpublishComponents, ACTION_UnpublishComponents },

1 0

Dan Kegel : cmd: %~dp0 should expand to the directory containing the batch file, not the current directory.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 60fe4dae7a8c93c6e9575f29ef7a6c1824b251bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fe4dae7a8c93c6e9575f29e… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Feb 2 16:56:38 2010 -0800 cmd: %~dp0 should expand to the directory containing the batch file, not the current directory. --- programs/cmd/batch.c | 6 +++++- programs/cmd/wcmd.h | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 21d8694..28744d4 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -91,6 +91,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN prev_context = context; context = LocalAlloc (LMEM_FIXED, sizeof (BATCH_CONTEXT)); context -> h = h; + context->batchfileW = WCMD_strdupW(string); context -> command = command; memset(context -> shift_count, 0x00, sizeof(context -> shift_count)); context -> prev_context = prev_context; @@ -122,6 +123,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN * to the caller's caller. */ + HeapFree(GetProcessHeap(), 0, context->batchfileW); LocalFree (context); if ((prev_context != NULL) && (!called)) { prev_context -> skip_rest = TRUE; @@ -382,7 +384,9 @@ void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValu if (lastModifier == firstModifier) return; /* Invalid syntax */ /* Extract the parameter to play with */ - if ((*lastModifier >= '0' && *lastModifier <= '9')) { + if (*lastModifier == '0') { + strcpyW(outputparam, context->batchfileW); + } else if ((*lastModifier >= '1' && *lastModifier <= '9')) { strcpyW(outputparam, WCMD_parameter (context -> command, *lastModifier-'0' + context -> shift_count[*lastModifier-'0'], NULL)); } else { diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 00bada2..2fde678 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -118,6 +118,7 @@ void WCMD_execute (WCHAR *orig_command, WCHAR *redirects, WCHAR *parameter, typedef struct { WCHAR *command; /* The command which invoked the batch file */ HANDLE h; /* Handle to the open batch file */ + WCHAR *batchfileW; /* Name of same */ int shift_count[10]; /* Offset in terms of shifts for %0 - %9 */ void *prev_context; /* Pointer to the previous context block */ BOOL skip_rest; /* Skip the rest of the batch program and exit */

1 0

Luca Bennati : browseui: Add Italian translation.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 1ecd8f3e7ef3b8a241b40dbb540670cb556698af URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ecd8f3e7ef3b8a241b40dbb5… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Feb 1 23:07:23 2010 +0100 browseui: Add Italian translation. --- dlls/browseui/Makefile.in | 1 + dlls/browseui/rsrc_It.rc | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index 777a217..92ac831 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -19,6 +19,7 @@ RC_SRCS = \ rsrc_En.rc \ rsrc_Es.rc \ rsrc_Fr.rc \ + rsrc_It.rc \ rsrc_Ja.rc \ rsrc_Ko.rc \ rsrc_Lt.rc \ diff --git a/dlls/browseui/rsrc_It.rc b/dlls/browseui/rsrc_It.rc new file mode 100644 index 0000000..3da2fa9 --- /dev/null +++ b/dlls/browseui/rsrc_It.rc @@ -0,0 +1,39 @@ +/* + * Copyright 2010 Luca Bennati + * + * 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 + */ + +#include "resids.h" + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CANCELLING "Annullando..." +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "&Annulla", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +}

1 0