August 2007 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : ntdll: Reimplement TIME_GetBias using new time zone code .
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: d2d5bbe5d0e306457f9d3a7f896fd1f53452ee02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d5bbe5d0e306457f9d3a7f8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Aug 22 17:02:18 2007 +0900 ntdll: Reimplement TIME_GetBias using new time zone code. --- dlls/ntdll/time.c | 125 +++++++++++++++++++++++----------------------------- 1 files changed, 55 insertions(+), 70 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index b243021..36b1ef5 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -51,6 +51,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); +static int init_tz_info(RTL_TIME_ZONE_INFORMATION *tzi); + static RTL_CRITICAL_SECTION TIME_tz_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = { @@ -239,26 +241,27 @@ BOOLEAN WINAPI RtlTimeFieldsToTime( * RETURNS * The bias for the current timezone. */ -static int TIME_GetBias(time_t utc, int *pdaylight) +static LONG TIME_GetBias(void) { - struct tm *ptm; static time_t last_utc; - static int last_bias; - static int last_daylight; - int ret; + static LONG last_bias; + LONG ret; + time_t utc; + + utc = time( NULL ); RtlEnterCriticalSection( &TIME_tz_section ); if (utc != last_utc) { - ptm = localtime(&utc); - last_daylight = ptm->tm_isdst; /* daylight for local timezone */ - ptm = gmtime(&utc); - ptm->tm_isdst = last_daylight; /* use local daylight, not that of Greenwich */ + RTL_TIME_ZONE_INFORMATION tzi; + int is_dst = init_tz_info( &tzi ); + last_utc = utc; - last_bias = (int)(utc - mktime(ptm)); + last_bias = tzi.Bias; + last_bias += is_dst ? tzi.DaylightBias : tzi.StandardBias; + last_bias *= SECSPERMIN; } - *pdaylight = last_daylight; ret = last_bias; RtlLeaveCriticalSection( &TIME_tz_section ); @@ -281,15 +284,12 @@ static int TIME_GetBias(time_t utc, int *pdaylight) NTSTATUS WINAPI RtlLocalTimeToSystemTime( const LARGE_INTEGER *LocalTime, PLARGE_INTEGER SystemTime) { - time_t gmt; - int bias, daylight; + LONG bias; TRACE("(%p, %p)\n", LocalTime, SystemTime); - gmt = time(NULL); - bias = TIME_GetBias(gmt, &daylight); - - SystemTime->QuadPart = LocalTime->QuadPart - bias * (LONGLONG)TICKSPERSEC; + bias = TIME_GetBias(); + SystemTime->QuadPart = LocalTime->QuadPart + bias * (LONGLONG)TICKSPERSEC; return STATUS_SUCCESS; } @@ -309,15 +309,12 @@ NTSTATUS WINAPI RtlLocalTimeToSystemTime( const LARGE_INTEGER *LocalTime, NTSTATUS WINAPI RtlSystemTimeToLocalTime( const LARGE_INTEGER *SystemTime, PLARGE_INTEGER LocalTime ) { - time_t gmt; - int bias, daylight; + LONG bias; TRACE("(%p, %p)\n", SystemTime, LocalTime); - gmt = time(NULL); - bias = TIME_GetBias(gmt, &daylight); - - LocalTime->QuadPart = SystemTime->QuadPart + bias * (LONGLONG)TICKSPERSEC; + bias = TIME_GetBias(); + LocalTime->QuadPart = SystemTime->QuadPart - bias * (LONGLONG)TICKSPERSEC; return STATUS_SUCCESS; } @@ -731,21 +728,31 @@ static time_t find_dst_change(unsigned long min, unsigned long max, int *is_dst) return min; } -static void init_tz_info(RTL_TIME_ZONE_INFORMATION *tzi, int *valid_year) +static int init_tz_info(RTL_TIME_ZONE_INFORMATION *tzi) { + static RTL_TIME_ZONE_INFORMATION cached_tzi; + static int current_year = -1; struct tm *tm; time_t year_start, year_end, tmp, dlt = 0, std = 0; - int is_dst; + int is_dst, current_is_dst; + + RtlEnterCriticalSection( &TIME_tz_section ); year_start = time(NULL); tm = localtime(&year_start); - if (*valid_year == tm->tm_year) return; + current_is_dst = tm->tm_isdst; + if (current_year == tm->tm_year) + { + *tzi = cached_tzi; + RtlLeaveCriticalSection( &TIME_tz_section ); + return current_is_dst; + } memset(tzi, 0, sizeof(*tzi)); TRACE("tz data will be valid through year %d\n", tm->tm_year + 1900); - *valid_year = tm->tm_year; + current_year = tm->tm_year; tm->tm_isdst = 0; tm->tm_mday = 1; @@ -781,8 +788,9 @@ static void init_tz_info(RTL_TIME_ZONE_INFORMATION *tzi, int *valid_year) if (dlt == std || !dlt || !std) { + RtlLeaveCriticalSection( &TIME_tz_section ); TRACE("there is no daylight saving rules in this time zone\n"); - return; + return 0; } tmp = dlt - tzi->Bias * 60; @@ -828,6 +836,11 @@ static void init_tz_info(RTL_TIME_ZONE_INFORMATION *tzi, int *valid_year) tzi->StandardBias); find_reg_tz_info(tzi); + cached_tzi = *tzi; + + RtlLeaveCriticalSection( &TIME_tz_section ); + + return current_is_dst; } /*********************************************************************** @@ -844,18 +857,7 @@ static void init_tz_info(RTL_TIME_ZONE_INFORMATION *tzi, int *valid_year) */ NTSTATUS WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION *tzinfo) { - static RTL_TIME_ZONE_INFORMATION *cached_tzi; - static int current_year = -1; - - RtlEnterCriticalSection(&TIME_tz_section); - - if (!cached_tzi) - cached_tzi = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*cached_tzi)); - - init_tz_info(cached_tzi, &current_year); - *tzinfo = *cached_tzi; - - RtlLeaveCriticalSection(&TIME_tz_section); + init_tz_info( tzinfo ); return STATUS_SUCCESS; } @@ -894,41 +896,23 @@ NTSTATUS WINAPI RtlSetTimeZoneInformation( const RTL_TIME_ZONE_INFORMATION *tzin */ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *OldTime) { - TIME_FIELDS tf; struct timeval tv; - struct timezone tz; - struct tm t; - time_t sec, oldsec; - int dst, bias; + time_t tm_t; + DWORD sec, oldsec; + LARGE_INTEGER tm; int err; /* Return the old time if necessary */ - if(OldTime) - NtQuerySystemTime(OldTime); - - RtlTimeToTimeFields(NewTime, &tf); - - /* call gettimeofday to get the current timezone */ - gettimeofday(&tv, &tz); - oldsec = tv.tv_sec; - /* get delta local time from utc */ - bias = TIME_GetBias(oldsec, &dst); - - /* get the number of seconds */ - t.tm_sec = tf.Second; - t.tm_min = tf.Minute; - t.tm_hour = tf.Hour; - t.tm_mday = tf.Day; - t.tm_mon = tf.Month - 1; - t.tm_year = tf.Year - 1900; - t.tm_isdst = dst; - sec = mktime (&t); - /* correct for timezone and daylight */ - sec += bias; + if (!OldTime) OldTime = &tm; + + NtQuerySystemTime( OldTime ); + RtlTimeToSecondsSince1970( OldTime, &oldsec ); + + RtlTimeToSecondsSince1970( NewTime, &sec ); /* set the new time */ tv.tv_sec = sec; - tv.tv_usec = tf.Milliseconds * 1000; + tv.tv_usec = 0; /* error and sanity check*/ if(sec == (time_t)-1 || abs((int)(sec-oldsec)) > SETTIME_MAX_ADJUST) { @@ -943,8 +927,9 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old #endif } - ERR("Cannot set time to %d/%d/%d %d:%d:%d Time adjustment %ld %s\n", - tf.Year, tf.Month, tf.Day, tf.Hour, tf.Minute, tf.Second, + tm_t = sec; + ERR("Cannot set time to %s Time adjustment %ld %s\n", + ctime( &tm_t ), (long)(sec-oldsec), err == -1 ? "No Permission" : sec == (time_t)-1 ? "" : "is too large." );

1 0

Dmitry Timoshkov : include/wine/test.h: Use appropriate type.
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: db552fbf4be747d6e60417c45ebb17ef4ee43227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db552fbf4be747d6e60417c45… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Aug 22 17:01:55 2007 +0900 include/wine/test.h: Use appropriate type. --- include/wine/test.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index ea79475..dbce98c 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -345,7 +345,7 @@ static const struct test *find_test( const char *name ) { const struct test *test; const char *p; - int len; + size_t len; if ((p = strrchr( name, '/' ))) name = p + 1; if ((p = strrchr( name, '\\' ))) name = p + 1;

1 0

Maarten Lankhorst : dsound: Move assignment of DSBCAPS_LOC to primary buffer creation time.
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: 4ef6e8eaa09dde9212038fa216b900dda42f099b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef6e8eaa09dde9212038fa21… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Aug 21 21:01:53 2007 +0200 dsound: Move assignment of DSBCAPS_LOC to primary buffer creation time. --- dlls/dsound/dsound.c | 4 ++++ dlls/dsound/primary.c | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 0cb66ca..bbbbd0d 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1594,6 +1594,10 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( *ppdsb = (LPDIRECTSOUNDBUFFER)(device->primary); } else { device->dsbd = *dsbd; + device->dsbd.dwFlags &= ~(DSBCAPS_LOCHARDWARE | DSBCAPS_LOCSOFTWARE); + if (device->hwbuf) + device->dsbd.dwFlags |= DSBCAPS_LOCHARDWARE; + else device->dsbd.dwFlags |= DSBCAPS_LOCSOFTWARE; hres = PrimaryBufferImpl_Create(device, (PrimaryBufferImpl**)&(device->primary), &(device->dsbd)); if (device->primary) { IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)(device->primary)); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index ac1a17e..65dc7d6 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -980,9 +980,6 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCaps( } caps->dwFlags = device->dsbd.dwFlags; - if (device->hwbuf) caps->dwFlags |= DSBCAPS_LOCHARDWARE; - else caps->dwFlags |= DSBCAPS_LOCSOFTWARE; - caps->dwBufferBytes = device->buflen; /* Windows reports these as zero */

1 0

Paul Vriens : ntdll/tests: Fix typos.
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: efc001a21f6b9f7318f712e690924de09f6bf5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc001a21f6b9f7318f712e69… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 22 09:09:07 2007 +0200 ntdll/tests: Fix typos. --- dlls/ntdll/tests/om.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index cee8a76..0eacd20 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -139,13 +139,13 @@ static void test_namespace_pipe(void) InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_PIPE_NOT_AVAILABLE, - "pNtOpenFile should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08x)\n", status); + "NtOpenFile should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08x)\n", status); pRtlInitUnicodeString(&str, buffer4); InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); ok(status == STATUS_OBJECT_NAME_NOT_FOUND, - "pNtOpenFile should have failed with STATUS_OBJECT_NAME_NOT_FOUND got(%08x)\n", status); + "NtOpenFile should have failed with STATUS_OBJECT_NAME_NOT_FOUND got(%08x)\n", status); pNtClose(pipe); }

1 0

Paul Vriens : gdi32: Fix possible NULL pointer dereference (Coverity).
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: d469eca1c67606f7556fd249ecf213dc03379487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d469eca1c67606f7556fd249e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 22 08:40:22 2007 +0200 gdi32: Fix possible NULL pointer dereference (Coverity). --- dlls/gdi32/gdiobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 075058e..f2dd4e1 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1448,8 +1448,8 @@ BOOL WINAPI GdiComment(HDC hdc, UINT cbSize, const BYTE *lpData) { if (dc->funcs->pGdiComment) ret = dc->funcs->pGdiComment( dc->physDev, cbSize, lpData ); + DC_ReleaseDCPtr( dc ); } - DC_ReleaseDCPtr( dc ); return ret; }

1 0

Misha Koshelev : wininet: Fix reference count on internet handle for asynchronous InternetReadFileEx call .
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: 1ee9ea91a5e60c3839235c4d6b55a0da2d85a11a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ee9ea91a5e60c3839235c4d6… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Aug 22 00:12:52 2007 -0500 wininet: Fix reference count on internet handle for asynchronous InternetReadFileEx call. --- dlls/wininet/internet.c | 11 ++++++----- dlls/wininet/tests/http.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index bfad36c..d24eed3 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1883,11 +1883,11 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu req = &workRequest.u.InternetReadFileExA; req->lpBuffersOut = lpBuffersOut; - retval = INTERNET_AsyncCall(&workRequest); - if (!retval) return FALSE; - - INTERNET_SetLastError(ERROR_IO_PENDING); - return FALSE; + if (!INTERNET_AsyncCall(&workRequest)) + WININET_Release( lpwh ); + else + INTERNET_SetLastError(ERROR_IO_PENDING); + goto end; } } @@ -1903,6 +1903,7 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu sizeof(dwBytesReceived)); } +end: WININET_Release( lpwh ); TRACE("-- %s (bytes read: %d)\n", retval ? "TRUE": "FALSE", lpBuffersOut->dwBufferLength); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 699aaa0..d699998 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -704,6 +704,8 @@ static void InternetReadFileExA_test(int flags) abort: SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); if (hor) { + SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); + SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED); rc = InternetCloseHandle(hor); ok ((rc != 0), "InternetCloseHandle of handle opened by HttpOpenRequestA failed\n"); rc = InternetCloseHandle(hor); @@ -721,6 +723,16 @@ abort: Sleep(100); CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); } + if (hor != 0x0) todo_wine + { + CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + } + else + { + CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + } CloseHandle(hCompleteEvent); first_connection_to_test_url = FALSE; }

1 0

Misha Koshelev : wininet: Don' t send INTERNET_STATUS_HANDLE_CLOSING when closing handle opened with InternetOpen for HTTP connection .
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: 5320d3e3eacc3b2a491b283ae04c6f3023736b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5320d3e3eacc3b2a491b283ae… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Aug 22 00:07:06 2007 -0500 wininet: Don't send INTERNET_STATUS_HANDLE_CLOSING when closing handle opened with InternetOpen for HTTP connection. --- dlls/wininet/http.c | 2 -- dlls/wininet/tests/http.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9ddd885..b676f48 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2800,8 +2800,6 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, assert( hIC->hdr.htype == WH_HINIT ); - hIC->hdr.dwContext = dwContext; - lpwhs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WININETHTTPSESSIONW)); if (NULL == lpwhs) { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f76d88d..699aaa0 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -458,7 +458,7 @@ abort: if (flags & INTERNET_FLAG_ASYNC) Sleep(100); } - todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); + CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); if (hor != 0x0) todo_wine { CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); @@ -719,7 +719,7 @@ abort: ok ((rc != 0), "InternetCloseHandle of handle opened by InternetOpenA failed\n"); if (flags & INTERNET_FLAG_ASYNC) Sleep(100); - todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); + CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); } CloseHandle(hCompleteEvent); first_connection_to_test_url = FALSE;

1 0

Paul Vriens : gdi32: Fix possible NULL pointer dereference (Coverity).
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: 4b098028f3fe27445e188593e74ece50e460cf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b098028f3fe27445e188593e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 22 08:32:47 2007 +0200 gdi32: Fix possible NULL pointer dereference (Coverity). --- dlls/gdi32/dc.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index a623868..4bf19b4 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1617,8 +1617,11 @@ INT WINAPI GetRelAbs( HDC hdc, DWORD dwIgnore ) { INT ret = 0; DC *dc = DC_GetDCPtr( hdc ); - if (dc) ret = dc->relAbsMode; - DC_ReleaseDCPtr( dc ); + if (dc) + { + ret = dc->relAbsMode; + DC_ReleaseDCPtr( dc ); + } return ret; }

1 0

Andrew Talbot : rpcrt4: Constify some variables.
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: 04e0986d60d3fe017c0cfcb34c0aa34c130f00f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e0986d60d3fe017c0cfcb34… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Aug 21 21:37:15 2007 +0100 rpcrt4: Constify some variables. --- dlls/rpcrt4/rpc_server.c | 2 +- dlls/rpcrt4/rpc_transport.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 8a72ab3..b62954b 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -119,7 +119,7 @@ static inline UUID *LookupObjType(UUID *ObjUuid) } static RpcServerInterface* RPCRT4_find_interface(UUID* object, - RPC_SYNTAX_IDENTIFIER* if_id, + const RPC_SYNTAX_IDENTIFIER* if_id, BOOL check_object) { UUID* MgrType = NULL; diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index cc33e5e..53876a9 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1475,7 +1475,7 @@ ULONG RpcAssoc_Release(RpcAssoc *assoc) #define ROUND_UP(value, alignment) (((value) + ((alignment) - 1)) & ~((alignment)-1)) -static RPC_STATUS RpcAssoc_BindConnection(RpcAssoc *assoc, RpcConnection *conn, +static RPC_STATUS RpcAssoc_BindConnection(const RpcAssoc *assoc, RpcConnection *conn, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax) {

1 0

appdb/include objectManager.php
by WineHQ Aug. 21, 2007

Aug. 21, 2007

ChangeSet ID: 31332 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/21 21:52:08 Modified files: include : objectManager.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add a 'move children' link to the object editing pages, if we have permission to move the entries Patch: http://cvs.winehq.org/patch.py?id=31332 Old revision New revision Changes Path 1.47 1.48 +16 -8 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.47 appdb/include/objectManager.php:1.48 --- appdb/include/objectManager.php:1.47 22 Aug 2007 2:52: 8 -0000 +++ appdb/include/objectManager.php 22 Aug 2007 2:52: 8 -0000 @@ -296,6 +296,9 @@ class ObjectManager echo html_frame_end(); } else { + // display the move children entry + $this->displayMoveChildren($oObject); + echo '<tr valign=top><td class=color3 align=center colspan=2>',"\n"; echo '<input name="sSubmit" type="submit" value="Submit" class="button">'. '&nbsp',"\n"; @@ -461,25 +464,30 @@ class ObjectManager "now</a>, it only takes a few seconds."); } - - /* View an entry */ - function view($sBackLink) + function displayMoveChildren($oObject) { - $this->checkMethods(array("display")); - - $oObject = new $this->sClass($this->iId); - /* Display a link to the move child objects page if the class has the necessary functions and the user has edit rights. Not all classes have child objects. */ if(method_exists($oObject, "objectMoveChildren") && method_exists($oObject, "objectGetId") && $oObject->canEdit()) { echo "<a href=\"".$this->makeUrl("showMoveChildren", $this->iId, - "Move Child Objects")."\">Move child objects</a><br /><br />\n"; + "Move Child Objects")."\">Move child objects</a>\n"; } + } + + /* View an entry */ + function view($sBackLink) + { + $this->checkMethods(array("display")); + + $oObject = new $this->sClass($this->iId); $oObject->display(); + // display the move children entry + $this->displayMoveChildren($oObject); + echo html_back_link(1, $sBackLink); }

1 0