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

Alexandre Julliard : cabinet: Use the correct create disposition in fdi_open.
by Alexandre Julliard 22 Aug '07

22 Aug '07

Module: wine Branch: master Commit: 1bc72fb6da2e86c2323de6273034580882059e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc72fb6da2e86c2323de6273… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 11:55:01 2007 +0200 cabinet: Use the correct create disposition in fdi_open. --- dlls/cabinet/cabinet_main.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 4cea2a1..6483a3f 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -84,7 +84,7 @@ static INT_PTR fdi_open(char *pszFile, int oflag, int pmode) HANDLE handle; DWORD dwAccess = 0; DWORD dwShareMode = 0; - DWORD dwCreateDisposition = OPEN_EXISTING; + DWORD dwCreateDisposition; switch (oflag & _O_ACCMODE) { @@ -102,10 +102,17 @@ static INT_PTR fdi_open(char *pszFile, int oflag, int pmode) break; } - if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) - dwCreateDisposition = OPEN_EXISTING; + if (oflag & _O_CREAT) + { + dwCreateDisposition = OPEN_ALWAYS; + if (oflag & _O_EXCL) dwCreateDisposition = CREATE_NEW; + else if (oflag & _O_TRUNC) dwCreateDisposition = CREATE_ALWAYS; + } else - dwCreateDisposition = CREATE_NEW; + { + dwCreateDisposition = OPEN_EXISTING; + if (oflag & _O_TRUNC) dwCreateDisposition = TRUNCATE_EXISTING; + } handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL, dwCreateDisposition, 0, NULL);

1 0

Alexandre Julliard : cabinet: Use the proper fcntl defines in the FDI_OPEN calls.
by Alexandre Julliard 22 Aug '07

22 Aug '07

Module: wine Branch: master Commit: d5ff7282653129e3ca3b482e7708e05ff9b0351f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ff7282653129e3ca3b482e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 11:46:17 2007 +0200 cabinet: Use the proper fcntl defines in the FDI_OPEN calls. --- dlls/cabinet/cabinet.h | 17 +++++++++++++++++ dlls/cabinet/cabinet_main.c | 7 ------- dlls/cabinet/fdi.c | 4 ++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index befa604..4cd1f77 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -33,6 +33,23 @@ #define _S_IWRITE 0x0080 #define _S_IREAD 0x0100 +/* from msvcrt/fcntl.h */ +#define _O_RDONLY 0 +#define _O_WRONLY 1 +#define _O_RDWR 2 +#define _O_ACCMODE (_O_RDONLY|_O_WRONLY|_O_RDWR) +#define _O_APPEND 0x0008 +#define _O_RANDOM 0x0010 +#define _O_SEQUENTIAL 0x0020 +#define _O_TEMPORARY 0x0040 +#define _O_NOINHERIT 0x0080 +#define _O_CREAT 0x0100 +#define _O_TRUNC 0x0200 +#define _O_EXCL 0x0400 +#define _O_SHORT_LIVED 0x1000 +#define _O_TEXT 0x4000 +#define _O_BINARY 0x8000 + #define CAB_SPLITMAX (10) #define CAB_SEARCH_SIZE (32*1024) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 2c21286..4cea2a1 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -37,13 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabinet); -/* the following defintions are copied from msvcrt/fcntl.h */ - -#define _O_RDONLY 0 -#define _O_WRONLY 1 -#define _O_RDWR 2 -#define _O_ACCMODE (_O_RDONLY|_O_WRONLY|_O_RDWR) - /*********************************************************************** * DllGetVersion (CABINET.2) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 01203b6..ef00447 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2128,7 +2128,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state TRACE("full cab path/file name: %s\n", debugstr_a(fullpath)); /* try to get a handle to the cabfile */ - cabhf = PFDI_OPEN(CAB(hfdi), fullpath, 32768, _S_IREAD | _S_IWRITE); + cabhf = PFDI_OPEN(CAB(hfdi), fullpath, _O_RDONLY|_O_BINARY, _S_IREAD | _S_IWRITE); if (cabhf == -1) { /* no file. allow the user to try again */ fdin.fdie = FDIERROR_CABINET_NOT_FOUND; @@ -2492,7 +2492,7 @@ BOOL __cdecl FDICopy( TRACE("full cab path/file name: %s\n", debugstr_a(fullpath)); /* get a handle to the cabfile */ - cabhf = PFDI_OPEN(hfdi, fullpath, 32768, _S_IREAD | _S_IWRITE); + cabhf = PFDI_OPEN(hfdi, fullpath, _O_RDONLY|_O_BINARY, _S_IREAD | _S_IWRITE); if (cabhf == -1) { PFDI_INT(hfdi)->perf->erfOper = FDIERROR_CABINET_NOT_FOUND; PFDI_INT(hfdi)->perf->erfType = ERROR_FILE_NOT_FOUND;

1 0

James Hawkins : cabinet: Formalize the SESSION struct and add more tests of its members.
by Alexandre Julliard 22 Aug '07

22 Aug '07

Module: wine Branch: master Commit: 75e9ae7ece0eff1dbf60588100a41fd8da0fd43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e9ae7ece0eff1dbf6058810… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Aug 21 10:15:39 2007 -0700 cabinet: Formalize the SESSION struct and add more tests of its members. --- dlls/cabinet/tests/extract.c | 394 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 323 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75e9ae7ece0eff1dbf605…

1 0

Alexander Nicolaysen Sørnes : wordpad: Prompt for format when selecting new file.
by Alexandre Julliard 22 Aug '07

22 Aug '07

Module: wine Branch: master Commit: bbc20456aa4ba16e4e0b2a7429ea0dca5011a499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc20456aa4ba16e4e0b2a742… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 18 22:27:15 2007 +0200 wordpad: Prompt for format when selecting new file. --- programs/wordpad/De.rc | 18 +++++++++ programs/wordpad/En.rc | 18 +++++++++ programs/wordpad/Fr.rc | 18 +++++++++ programs/wordpad/Hu.rc | 18 +++++++++ programs/wordpad/Ko.rc | 11 ++++++ programs/wordpad/Nl.rc | 18 +++++++++ programs/wordpad/No.rc | 18 +++++++++ programs/wordpad/Pl.rc | 18 +++++++++ programs/wordpad/Ru.rc | 18 +++++++++ programs/wordpad/Tr.rc | 18 +++++++++ programs/wordpad/resource.h | 8 ++++ programs/wordpad/wordpad.c | 82 +++++++++++++++++++++++++++++++++++++++--- 12 files changed, 257 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbc20456aa4ba16e4e0b2…

1 0

Alexander Nicolaysen Sørnes : wordpad: Clear formatting before opening a file.
by Alexandre Julliard 22 Aug '07

22 Aug '07

Module: wine Branch: master Commit: 54a5aed7b4a441b47ed2d5417d9c4af46449af95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a5aed7b4a441b47ed2d5417… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 18 22:31:14 2007 +0200 wordpad: Clear formatting before opening a file. --- programs/wordpad/wordpad.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 2b8c594..075c713 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -495,6 +495,7 @@ static void DoOpenFile(LPCWSTR szOpenFileName) es.dwCookie = (DWORD_PTR)hFile; es.pfnCallback = stream_in; + clear_formatting(); SendMessageW(hEditorWnd, EM_STREAMIN, format, (LPARAM)&es); CloseHandle(hFile);

1 0

Alexander Nicolaysen Sørnes : wordpad: Store window rect in the registry.
by Alexandre Julliard 22 Aug '07

22 Aug '07

Module: wine Branch: master Commit: fef9879ce430db0a79a542a7c7b2eb4e7cee46c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef9879ce430db0a79a542a7c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 18 23:40:58 2007 +0200 wordpad: Store window rect in the registry. --- programs/wordpad/wordpad.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 075c713..767e813 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -46,8 +46,11 @@ static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a', static const WCHAR key_recentfiles[] = {'R','e','c','e','n','t',' ','f','i','l','e', ' ','l','i','s','t',0}; +static const WCHAR key_options[] = {'O','p','t','i','o','n','s',0}; static const WCHAR var_file[] = {'F','i','l','e','%','d',0}; +static const WCHAR var_framerect[] = {'F','r','a','m','e','R','e','c','t',0}; + static HWND hMainWnd; static HWND hEditorWnd; @@ -238,6 +241,42 @@ static LRESULT registry_get_handle(HKEY *hKey, LPDWORD action, LPCWSTR subKey) return ret; } +static void registry_set_winrect(void) +{ + HKEY hKey; + DWORD action; + + if(registry_get_handle(&hKey, &action, (LPWSTR)key_options) == ERROR_SUCCESS) + { + RECT rc; + + GetWindowRect(hMainWnd, &rc); + + RegSetValueExW(hKey, var_framerect, 0, REG_BINARY, (LPBYTE)&rc, sizeof(RECT)); + } +} + +static RECT registry_read_winrect(void) +{ + HKEY hKey; + RECT rc; + DWORD size = sizeof(RECT); + + ZeroMemory(&rc, sizeof(RECT)); + if(registry_get_handle(&hKey, 0, (LPWSTR)key_options) != ERROR_SUCCESS || + RegQueryValueExW(hKey, var_framerect, 0, NULL, (LPBYTE)&rc, &size) != + ERROR_SUCCESS || size != sizeof(RECT)) + { + rc.top = 0; + rc.left = 0; + rc.bottom = 300; + rc.right = 600; + } + + RegCloseKey(hKey); + return rc; +} + static void truncate_path(LPWSTR file, LPWSTR out, LPWSTR pos1, LPWSTR pos2) { static const WCHAR dots[] = {'.','.','.',0}; @@ -1621,7 +1660,10 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara case WM_CLOSE: if(prompt_save_changes()) + { + registry_set_winrect(); PostQuitMessage(0); + } break; case WM_ACTIVATE: @@ -1648,6 +1690,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar HACCEL hAccel; WNDCLASSW wc; MSG msg; + RECT rc; static const WCHAR wszAccelTable[] = {'M','A','I','N','A','C','C','E','L', 'T','A','B','L','E','\0'}; @@ -1667,8 +1710,9 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar wc.lpszClassName = wszMainWndClass; RegisterClassW(&wc); + rc = registry_read_winrect(); hMainWnd = CreateWindowExW(0, wszMainWndClass, wszAppTitle, WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, hInstance, NULL); + rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, NULL, NULL, hInstance, NULL); ShowWindow(hMainWnd, SW_SHOWDEFAULT); set_caption(NULL);

1 0

H. Verbeet : wined3d: Attach the correct surface the the fbo.
by Alexandre Julliard 22 Aug '07

22 Aug '07

Module: wine Branch: master Commit: e5e41191b349e7ed8fe1d3ca3059294cff611d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e41191b349e7ed8fe1d3ca3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Aug 21 23:22:33 2007 +0200 wined3d: Attach the correct surface the the fbo. --- dlls/wined3d/device.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2208c63..92b0943 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5505,7 +5505,8 @@ static void attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWOR IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture_impl); } - GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_COLOR_ATTACHMENT0_EXT + idx, texttarget, surface_impl->glDescription.textureName, 0)); + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_COLOR_ATTACHMENT0_EXT + idx, texttarget, + surface_impl->glDescription.textureName, surface_impl->glDescription.level)); checkGLcall("attach_surface_fbo"); } @@ -5742,7 +5743,8 @@ static void set_depth_stencil_fbo(IWineD3DDevice *iface, IWineD3DSurface *depth_ IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture_impl); } - GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, texttarget, depth_stencil_impl->glDescription.textureName, 0)); + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, texttarget, + depth_stencil_impl->glDescription.textureName, depth_stencil_impl->glDescription.level)); checkGLcall("glFramebufferTexture2DEXT()"); } } else {

1 0

Alexander Nicolaysen Sørnes : wordpad: Add recent file list.
by Alexandre Julliard 22 Aug '07

22 Aug '07

Module: wine Branch: master Commit: 07d60bc727975aab002e658e2f583b55f6608bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=07d60bc727975aab002e658e2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 18 15:41:57 2007 +0200 wordpad: Add recent file list. --- programs/wordpad/resource.h | 17 ++- programs/wordpad/wordpad.c | 272 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 285 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07d60bc727975aab002e6…

1 0

Alexander Nicolaysen Sørnes : wordpad: Handle different formats on open/save.
by Alexandre Julliard 22 Aug '07

22 Aug '07

Module: wine Branch: master Commit: 425c2c642460fd68038a428392e8d2bfa3d71f36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=425c2c642460fd68038a42839… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 18 21:59:24 2007 +0200 wordpad: Handle different formats on open/save. --- programs/wordpad/De.rc | 10 +++- programs/wordpad/En.rc | 10 +++- programs/wordpad/Fr.rc | 10 +++- programs/wordpad/Hu.rc | 10 +++- programs/wordpad/Ko.rc | 10 +++- programs/wordpad/Nl.rc | 10 +++- programs/wordpad/No.rc | 10 +++- programs/wordpad/Pl.rc | 10 +++- programs/wordpad/Ru.rc | 10 +++- programs/wordpad/Tr.rc | 10 +++- programs/wordpad/resource.h | 14 +++--- programs/wordpad/wordpad.c | 103 +++++++++++++++++++++++++++++++++++++------ 12 files changed, 167 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=425c2c642460fd68038a4…

1 0

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

22 Aug '07

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