June 2014 - Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt/tests: Avoid size_t in traces.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 762c94144fe43e3c2402d6dc5cbae8e45a790396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=762c94144fe43e3c2402d6dc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 18 19:52:27 2014 +0200 msvcrt/tests: Avoid size_t in traces. --- dlls/msvcrt/tests/file.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index c98adf4..73965f3 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2219,12 +2219,11 @@ static void test__open_osfhandle(void) CloseHandle(tmp); } -static void test_write_flush_size(FILE *file, size_t bufsize) +static void test_write_flush_size(FILE *file, int bufsize) { char *inbuffer; char *outbuffer; - size_t size; - int fd; + int size, fd; fd = fileno(file); inbuffer = calloc(bufsize + 1, 1);

1 0

Vincent Povirk : windowscodecs: Fix leak in DGifGetImageDesc.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: bb8fdb734ed1552f0d9bf9b2bcec614d29d72bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8fdb734ed1552f0d9bf9b2b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 12 14:15:21 2014 -0500 windowscodecs: Fix leak in DGifGetImageDesc. --- dlls/windowscodecs/ungif.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index c2887ed..427b32f 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -405,10 +405,7 @@ DGifGetImageDesc(GifFileType * GifFile) { GifFile->Image.Interlace = (Buf[0] & 0x40); if (Buf[0] & 0x80) { /* Does this image have local color map? */ - /*** FIXME: Why do we check both of these in order to do this? - * Why do we have both Image and SavedImages? */ - if (GifFile->Image.ColorMap && GifFile->SavedImages == NULL) - FreeMapObject(GifFile->Image.ColorMap); + FreeMapObject(GifFile->Image.ColorMap); GifFile->Image.ColorMap = MakeMapObject(1 << BitsPerPixel, NULL); if (GifFile->Image.ColorMap == NULL) {

1 0

Vincent Povirk : windowscodecs: Fix memory leak in ComponentFactory_CreateBitmapFromSource.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 831b7371bc70525413bf9554f74922620ab9bf34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831b7371bc70525413bf9554f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 6 15:28:09 2014 -0500 windowscodecs: Fix memory leak in ComponentFactory_CreateBitmapFromSource. --- dlls/windowscodecs/imgfactory.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index b969313..e7095dd 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -547,20 +547,22 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFacto IWICBitmapLock_Release(lock); } - if (SUCCEEDED(hr)) - hr = PaletteImpl_Create(&palette); - if (SUCCEEDED(hr) && (format_type == WICPixelFormatNumericRepresentationUnspecified || format_type == WICPixelFormatNumericRepresentationIndexed)) { - hr = IWICBitmapSource_CopyPalette(piBitmapSource, palette); + hr = PaletteImpl_Create(&palette); if (SUCCEEDED(hr)) - hr = IWICBitmap_SetPalette(result, palette); - else - hr = S_OK; + { + hr = IWICBitmapSource_CopyPalette(piBitmapSource, palette); + + if (SUCCEEDED(hr)) + hr = IWICBitmap_SetPalette(result, palette); + else + hr = S_OK; - IWICPalette_Release(palette); + IWICPalette_Release(palette); + } } if (SUCCEEDED(hr))

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 6144bae7f873e2881c554762dc01c87cb9200aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6144bae7f873e2881c554762d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 19 00:27:53 2014 +0900 po: Update Japanese translation. --- po/ja.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ja.po b/po/ja.po index 82d4e3e..8214d10 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-05-22 01:00+0900\n" -"Last-Translator: Toshiaki Hirose <t_hirose(a)aol.com>\n" +"PO-Revision-Date: 2014-06-19 00:15+0900\n" +"Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" "MIME-Version: 1.0\n" @@ -6581,10 +6581,8 @@ msgid "This network connection does not exist.\n" msgstr "このネットワーク接続は存在しません。\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "接続は拒否されました。\n" +msgstr "相手側により接続がリセットされました。\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Alexandre Julliard : kernel32: Only try to load krnl386 in native applications.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: b0953a09bdc8d807b6549051c4283a6e2dc6ad88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0953a09bdc8d807b6549051c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 18 18:35:19 2014 +0200 kernel32: Only try to load krnl386 in native applications. --- dlls/kernel32/kernel_main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 13c01ed..6afc1cb 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -101,7 +101,13 @@ static BOOL process_attach( HMODULE module ) /* Securom checks for this one when version is NT */ set_entry_point( module, "FT_Thunk", 0 ); } - else LoadLibraryA( "krnl386.exe16" ); + else + { + LDR_MODULE *ldr; + + if (LdrFindEntryForAddress( GetModuleHandleW( 0 ), &ldr ) || !(ldr->Flags & LDR_WINE_INTERNAL)) + LoadLibraryA( "krnl386.exe16" ); + } /* finish the process initialisation for console bits, if needed */ __wine_set_signal_handler(SIGINT, CONSOLE_HandleCtrlC);

1 0

Alexandre Julliard : krnl386: Properly handle failure to set a 16-bit LDT entry.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 699daa77495c559b5f7f651bcc8e39661512309a URL: http://source.winehq.org/git/wine.git/?a=commit;h=699daa77495c559b5f7f651bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 18 18:34:33 2014 +0200 krnl386: Properly handle failure to set a 16-bit LDT entry. --- dlls/krnl386.exe16/kernel.c | 2 +- dlls/krnl386.exe16/ne_module.c | 9 ++++++++- dlls/krnl386.exe16/selector.c | 36 +++++++++++++++++++++++++----------- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/krnl386.exe16/kernel.c b/dlls/krnl386.exe16/kernel.c index 6b0081a..0a66d1e 100644 --- a/dlls/krnl386.exe16/kernel.c +++ b/dlls/krnl386.exe16/kernel.c @@ -71,7 +71,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: - LoadLibrary16( "krnl386.exe" ); + if (LoadLibrary16( "krnl386.exe" ) < 32) return FALSE; /* fall through */ case DLL_THREAD_ATTACH: thread_attach(); diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 34d961c..c0e1a98 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -43,6 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); WINE_DECLARE_DEBUG_CHANNEL(loaddll); WINE_DECLARE_DEBUG_CHANNEL(relay); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #include "pshpack1.h" typedef struct _GPHANDLERDEF @@ -623,7 +624,12 @@ static HMODULE16 build_module( const void *mapping, SIZE_T mapping_size, LPCSTR sizeof(OFSTRUCT) - sizeof(ofs->szPathName) + strlen(path) + 1; hModule = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, size ); - if (!hModule) return ERROR_BAD_FORMAT; + if (!hModule) + { + ERR_(winediag)( "Failed to create module for %s, 16-bit LDT support may be missing.\n", + debugstr_a(path) ); + return ERROR_BAD_FORMAT; + } FarSetOwner16( hModule, hModule ); pModule = GlobalLock16( hModule ); @@ -1035,6 +1041,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ TRACE("Trying built-in '%s'\n", libname); hinst = NE_DoLoadBuiltinModule( descr, file_name, mod32 ); if (hinst > 32) TRACE_(loaddll)("Loaded module %s : builtin\n", debugstr_a(file_name)); + else FreeLibrary( mod32 ); } else { diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index 5a99f72..fa9dd52 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -52,7 +52,14 @@ WORD WINAPI AllocSelectorArray16( WORD count ) wine_ldt_set_base( &entry, 0 ); wine_ldt_set_limit( &entry, 1 ); /* avoid 0 base and limit */ wine_ldt_set_flags( &entry, WINE_LDT_FLAGS_DATA ); - for (i = 0; i < count; i++) wine_ldt_set_entry( sel + (i << __AHSHIFT), &entry ); + for (i = 0; i < count; i++) + { + if (wine_ldt_set_entry( sel + (i << __AHSHIFT), &entry ) < 0) + { + wine_ldt_free_entries( sel, count ); + return 0; + } + } } return sel; } @@ -102,7 +109,7 @@ WORD WINAPI FreeSelector16( WORD sel ) * * Set the LDT entries for an array of selectors. */ -static void SELECTOR_SetEntries( WORD sel, const void *base, DWORD size, unsigned char flags ) +static BOOL SELECTOR_SetEntries( WORD sel, const void *base, DWORD size, unsigned char flags ) { LDT_ENTRY entry; WORD i, count; @@ -113,11 +120,12 @@ static void SELECTOR_SetEntries( WORD sel, const void *base, DWORD size, unsigne count = (size + 0xffff) / 0x10000; for (i = 0; i < count; i++) { - wine_ldt_set_entry( sel + (i << __AHSHIFT), &entry ); + if (wine_ldt_set_entry( sel + (i << __AHSHIFT), &entry ) < 0) return FALSE; wine_ldt_set_base( &entry, (char*)wine_ldt_get_base(&entry) + 0x10000); /* yep, Windows sets limit like that, not 64K sel units */ wine_ldt_set_limit( &entry, wine_ldt_get_limit(&entry) - 0x10000 ); } + return TRUE; } @@ -132,8 +140,12 @@ WORD SELECTOR_AllocBlock( const void *base, DWORD size, unsigned char flags ) if (!size) return 0; count = (size + 0xffff) / 0x10000; - sel = wine_ldt_alloc_entries( count ); - if (sel) SELECTOR_SetEntries( sel, base, size, flags ); + if ((sel = wine_ldt_alloc_entries( count ))) + { + if (SELECTOR_SetEntries( sel, base, size, flags )) return sel; + wine_ldt_free_entries( sel, count ); + sel = 0; + } return sel; } @@ -202,8 +214,9 @@ WORD WINAPI AllocCStoDSAlias16( WORD sel ) if (!newsel) return 0; wine_ldt_get_entry( sel, &entry ); entry.HighWord.Bits.Type = WINE_LDT_FLAGS_DATA; - wine_ldt_set_entry( newsel, &entry ); - return newsel; + if (wine_ldt_set_entry( newsel, &entry ) >= 0) return newsel; + wine_ldt_free_entries( newsel, 1 ); + return 0; } @@ -221,8 +234,9 @@ WORD WINAPI AllocDStoCSAlias16( WORD sel ) if (!newsel) return 0; wine_ldt_get_entry( sel, &entry ); entry.HighWord.Bits.Type = WINE_LDT_FLAGS_CODE; - wine_ldt_set_entry( newsel, &entry ); - return newsel; + if (wine_ldt_set_entry( newsel, &entry ) >= 0) return newsel; + wine_ldt_free_entries( newsel, 1 ); + return 0; } @@ -260,7 +274,7 @@ WORD WINAPI SetSelectorBase( WORD sel, DWORD base ) LDT_ENTRY entry; wine_ldt_get_entry( sel, &entry ); wine_ldt_set_base( &entry, DOSMEM_MapDosToLinear(base) ); - wine_ldt_set_entry( sel, &entry ); + if (wine_ldt_set_entry( sel, &entry ) < 0) sel = 0; return sel; } @@ -282,7 +296,7 @@ WORD WINAPI SetSelectorLimit16( WORD sel, DWORD limit ) LDT_ENTRY entry; wine_ldt_get_entry( sel, &entry ); wine_ldt_set_limit( &entry, limit ); - wine_ldt_set_entry( sel, &entry ); + if (wine_ldt_set_entry( sel, &entry ) < 0) sel = 0; return sel; }

1 0

Sebastian Lackner : wininet: Don' t update *lpdwIndex if HttpQueryInfoW fails with ERROR_INSUFFICIENT_BUFFER.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 2e0921d065121fe4bf3b17a54ab529f3fd4041fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0921d065121fe4bf3b17a54… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jun 17 02:57:10 2014 +0200 wininet: Don't update *lpdwIndex if HttpQueryInfoW fails with ERROR_INSUFFICIENT_BUFFER. --- dlls/wininet/http.c | 3 +-- dlls/wininet/tests/http.c | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c7e3474..d2b3de9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3695,8 +3695,6 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, return ERROR_HTTP_HEADER_NOT_FOUND; } - if (lpdwIndex) (*lpdwIndex)++; - /* coalesce value to requested type */ if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER && lpBuffer) { @@ -3742,6 +3740,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, } *lpdwBufferLength = len - sizeof(WCHAR); } + if (lpdwIndex) (*lpdwIndex)++; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 41f4c5b..f3340df 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -465,7 +465,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) char *post_data = NULL; BOOL res, on_async = TRUE; CHAR buffer[4000]; - DWORD length, exlen = 0, post_len = 0; + DWORD length, index, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -635,12 +635,23 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); ok(!strcmp(buffer, test->redirected_url), "Wrong URL %s\n", buffer); + index = 0; + length = 0; + SetLastError(0xdeadbeef); + ok(HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,NULL,&length,&index) == FALSE,"Query worked\n"); + if(test->flags & TESTF_COMPRESSED) + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, + "expected ERROR_HTTP_HEADER_NOT_FOUND, got %u\n", GetLastError()); + ok(index == 0, "Index was incremented\n"); + + index = 0; length = 16; - res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,0x0); + res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,&index); trace("Option HTTP_QUERY_CONTENT_LENGTH -> %i %s (%u)\n",res,buffer,GetLastError()); if(test->flags & TESTF_COMPRESSED) ok(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND, got %x (%u)\n", res, GetLastError()); + ok(!res || index == 1, "Index was not incremented although result is %x (index = %u)\n", res, index); length = 100; res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_TYPE,buffer,&length,0x0); @@ -1594,6 +1605,8 @@ static void HttpHeaders_test(void) strcpy(buffer,"Warning"); ok(HttpQueryInfoA(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index) == FALSE,"Query succeeded on a too small buffer\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(index == 0, "Index was incremented\n"); ok(strcmp(buffer,"Warning")==0, "incorrect string was returned(%s)\n",buffer); /* string not touched */ ok(len == 6, "Invalid length (exp. 6, got %d)\n", len); /* unlike success, the length includes the NULL-terminator */

1 0

Austin English : kernel32: Add a stub for UnregisterApplicationRestart.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: fd6c5490dfe8818b1f9fa19e6502e22ae1736e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd6c5490dfe8818b1f9fa19e6… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 17 16:24:48 2014 -0700 kernel32: Add a stub for UnregisterApplicationRestart. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a6c6b29..8aa5d21 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1237,6 +1237,7 @@ @ stdcall UnlockFile(long long long long long) @ stdcall UnlockFileEx(long long long long ptr) @ stdcall UnmapViewOfFile(ptr) +@ stdcall UnregisterApplicationRestart() # @ stub UnregisterConsoleIME @ stdcall UnregisterWait(long) @ stdcall UnregisterWaitEx(long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0b70a55..2566ac4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3956,3 +3956,13 @@ VOID WINAPI FlushProcessWriteBuffers(void) if (!once++) FIXME(": stub\n"); } + +/*********************************************************************** + * UnregisterApplicationRestart (KERNEL32.@) + */ +HRESULT WINAPI UnregisterApplicationRestart(void) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return S_OK; +} diff --git a/include/winbase.h b/include/winbase.h index 7432983..a269833 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2411,6 +2411,7 @@ WINBASEAPI BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED); #define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle)) WINBASEAPI BOOL WINAPI UnmapViewOfFile(LPCVOID); +WINBASEAPI HRESULT WINAPI UnregisterApplicationRestart(void); WINBASEAPI BOOL WINAPI UnregisterWait(HANDLE); WINBASEAPI BOOL WINAPI UnregisterWaitEx(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI UpdateResourceA(HANDLE,LPCSTR,LPCSTR,WORD,LPVOID,DWORD);

1 0

Vincent Povirk : advapi32/tests: Account for limited users in registry test.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 8340636c55cdbcf4f3415ac25dc01377fb8e6fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8340636c55cdbcf4f3415ac25… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 29 14:10:05 2014 -0500 advapi32/tests: Account for limited users in registry test. --- dlls/advapi32/tests/registry.c | 151 +++++++++++++++++++++++++++------------- 1 file changed, 102 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8340636c55cdbcf4f3415…

1 0

Vincent Povirk : shell32: Set tm_isdst before calling mktime.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: fa8d59c30b250ac1d4814268e2b7956a11d8f8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8d59c30b250ac1d4814268e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 28 10:20:42 2014 -0500 shell32: Set tm_isdst before calling mktime. --- dlls/shell32/trash.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 043ae5b..3ca6e4e 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -515,6 +515,7 @@ static HRESULT TRASH_GetDetails(const TRASH_BUCKET *bucket, LPCSTR filename, WIN &del_time.tm_hour, &del_time.tm_min, &del_time.tm_sec); del_time.tm_year -= 1900; del_time.tm_mon--; + del_time.tm_isdst = -1; del_secs = mktime(&del_time); RtlSecondsSince1970ToTime(del_secs, (LARGE_INTEGER *)&data->ftLastAccessTime);

1 0