wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Alexandre Julliard : makefiles: Generate the config. status dependency as part of the makefile dependencies.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 03e01a2987738ff98ead1c51e1237723d946e020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e01a2987738ff98ead1c51e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 13:40:57 2010 +0100 makefiles: Generate the config.status dependency as part of the makefile dependencies. --- Makefile.in | 2 +- aclocal.m4 | 4 +- configure | 1088 +++++++++++++++++++++++++++++----------------------------- 3 files changed, 547 insertions(+), 547 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03e01a2987738ff98ead1…

1 0

Alexandre Julliard : makefiles: Get rid of the (broken) aclocal installation rules.
by Alexandre Julliard 03 Feb '10

03 Feb '10

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 - -@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 : makefiles: Simplify the installation of program binaries by not attempting to hardlink them .
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 7b7444fbcad4a0a56e842f645e42a28fa18be1bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7444fbcad4a0a56e842f645… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 11:50:24 2010 +0100 makefiles: Simplify the installation of program binaries by not attempting to hardlink them. --- Make.rules.in | 1 - aclocal.m4 | 17 ----------------- configure | 17 ----------------- configure.ac | 1 - programs/Makefile.in | 17 ++++------------- 5 files changed, 4 insertions(+), 49 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index c7813b0..e155d88 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -40,7 +40,6 @@ AR = @AR@ ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ STRIP = @STRIP@ -LN = @LN@ LN_S = @LN_S@ TOOLSDIR = @TOOLSDIR@ LDFLAGS = @LDFLAGS@ diff --git a/aclocal.m4 b/aclocal.m4 index aedffae..a88883a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -118,23 +118,6 @@ LIBS="$LIBS $2" AC_CHECK_FUNCS([$1],[$3],[$4]) LIBS="$ac_wine_check_funcs_save_LIBS"]) -dnl **** Check for ln **** -dnl -dnl Usage: WINE_PROG_LN -dnl -AC_DEFUN([WINE_PROG_LN], -[AC_MSG_CHECKING([whether ln works]) -rm -f conf$$ conf$$.file -echo >conf$$.file -if ln conf$$.file conf$$ 2>/dev/null; then - AC_SUBST(LN,ln) - AC_MSG_RESULT([yes]) -else - AC_SUBST(LN,["cp -p"]) - AC_MSG_RESULT([no, using $LN]) -fi -rm -f conf$$ conf$$.file]) - dnl **** Check for a mingw program, trying the various mingw prefixes **** dnl dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path]) diff --git a/configure b/configure index 2ae042f..537eb04 100755 --- a/configure +++ b/configure @@ -694,7 +694,6 @@ INSTALL_PROGRAM LDCONFIG EGREP GREP -LN LN_S STRIP RANLIB @@ -4572,22 +4571,6 @@ else $as_echo "no, using $LN_S" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln works" >&5 -$as_echo_n "checking whether ln works... " >&6; } -rm -f conf$$ conf$$.file -echo >conf$$.file -if ln conf$$.file conf$$ 2>/dev/null; then - LN=ln - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - LN="cp -p" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN" >&5 -$as_echo "no, using $LN" >&6; } -fi -rm -f conf$$ conf$$.file { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } if test "${ac_cv_path_GREP+set}" = set; then : diff --git a/configure.ac b/configure.ac index f823045..b8b04c2 100644 --- a/configure.ac +++ b/configure.ac @@ -246,7 +246,6 @@ AC_SUBST(ARFLAGS,rc) AC_PROG_RANLIB AC_CHECK_TOOL(STRIP,strip,strip) AC_PROG_LN_S -WINE_PROG_LN AC_PROG_EGREP AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH]) AC_PROG_INSTALL diff --git a/programs/Makefile.in b/programs/Makefile.in index b339aa3..eff82f9 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -20,25 +20,16 @@ wineapploader: wineapploader.in # Rules for installation -.PHONY: install-apploader install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__) +.PHONY: install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__) -install-apploader: wineapploader $(INSTALLDIRS) dummy - $(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/wineapploader - -$(INSTALLPROGS:%=%/__installprog__): install-apploader - $(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(LN) $(DESTDIR)$(bindir)/wineapploader $(DESTDIR)$(bindir)/`dirname $@` +$(INSTALLPROGS:%=%/__installprog__): wineapploader $(INSTALLDIRS) dummy + $(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/`dirname $@` install-progs.so: $(INSTALLPROGS:%=%/__installprog__) - $(RM) $(DESTDIR)$(bindir)/wineapploader - install-progs: # nothing to do here @WOW64_DISABLE@ install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS) uninstall:: - -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS) + -cd $(DESTDIR)$(bindir) && $(RM) $(INSTALLPROGS) -rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) - -# Rules for testing - -check test:: $(SUBDIRS:%=%/__test__)

1 0

Peter Rosin : ntdll: Add RtlSetThreadErrorMode and RtlGetThreadErrorMode.
by Alexandre Julliard 03 Feb '10

03 Feb '10

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

Peter Rosin : ntdll: Add tests for RtlSetThreadErrorMode and RtlGetThreadErrorMode.
by Alexandre Julliard 03 Feb '10

03 Feb '10

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: Move some helpers to the module where they are used.
by Alexandre Julliard 03 Feb '10

03 Feb '10

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

Hans Leidekker : msi: Implement the ScheduleReboot standard action.
by Alexandre Julliard 03 Feb '10

03 Feb '10

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

Hans Leidekker : msi: Add a stub implementation of the SetODBCFolders standard action.
by Alexandre Julliard 03 Feb '10

03 Feb '10

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

Christian Costa : d3drm/tests: Use better name for test function and make it static ( spotted by Stefan Dosinger).
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 3d361e64127db24b8188e43bed8681cca5a751ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d361e64127db24b8188e43be… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Feb 3 08:38:41 2010 +0100 d3drm/tests: Use better name for test function and make it static (spotted by Stefan Dosinger). --- dlls/d3drm/tests/d3drm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 9e74c12..3a89aa3 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -62,7 +62,7 @@ char data_bad[] = "1; 2; 3;\n" "}\n"; -void Test(void) +static void MeshBuilderTest(void) { HRESULT hr; LPDIRECT3DRM pD3DRM; @@ -95,7 +95,7 @@ START_TEST(d3drm) if (!InitFunctionPtrs()) return; - Test(); + MeshBuilderTest(); FreeLibrary(d3drm_handle); }

1 0

Andrew Nguyen : msnet32: Add copyright author information.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: f1b30eb49d5ac61afed0d88d4f5bc59e60967eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b30eb49d5ac61afed0d88d4… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Feb 3 01:28:37 2010 -0600 msnet32: Add copyright author information. --- dlls/msnet32/msnet_main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msnet32/msnet_main.c b/dlls/msnet32/msnet_main.c index 7c75900..1ffef50 100644 --- a/dlls/msnet32/msnet_main.c +++ b/dlls/msnet32/msnet_main.c @@ -1,4 +1,9 @@ /* + * Microsoft Network API implementation + * + * Copyright 2003 Rein Klazes + * Copyright 2006 Alexandre Julliard + * * 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

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010