October 2011 - Wine-commits

Henri Verbeet : ddraw: Clear attached_iface before releasing it in ddraw_surface_delete_attached_surface ().
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 4408c5abc643bdbd2041f41eff955f2cc34f9d4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4408c5abc643bdbd2041f41ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 18 20:46:12 2011 +0200 ddraw: Clear attached_iface before releasing it in ddraw_surface_delete_attached_surface(). Spotted by Dan Kegel / Valgrind. --- dlls/ddraw/surface.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a673806..c01ac45 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1590,8 +1590,12 @@ static HRESULT ddraw_surface_delete_attached_surface(IDirectDrawSurfaceImpl *Thi IDirect3DDeviceImpl_UpdateDepthStencil(This->ddraw->d3ddevice); } LeaveCriticalSection(&ddraw_cs); - IUnknown_Release(Surf->attached_iface); + + /* Set attached_iface to NULL before releasing it, the surface may go + * away. */ Surf->attached_iface = NULL; + IUnknown_Release(detach_iface); + return DD_OK; }

1 0

Henri Verbeet : wined3d: Detach any attached overlays on surface cleanup.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 30428604786724b9eb885c952e4713fe34500323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30428604786724b9eb885c952… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 18 20:46:13 2011 +0200 wined3d: Detach any attached overlays on surface cleanup. Spotted by Dan Kegel / Valgrind. --- dlls/wined3d/surface.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 277a317..1f1dc8f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -42,6 +42,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa static void surface_cleanup(struct wined3d_surface *surface) { + struct wined3d_surface *overlay, *cur; + TRACE("surface %p.\n", surface); if (surface->texture_name || (surface->flags & SFLAG_PBO) @@ -109,6 +111,12 @@ static void surface_cleanup(struct wined3d_surface *surface) if (surface->overlay_dest) list_remove(&surface->overlay_entry); + LIST_FOR_EACH_ENTRY_SAFE(overlay, cur, &surface->overlays, struct wined3d_surface, overlay_entry) + { + list_remove(&overlay->overlay_entry); + overlay->overlay_dest = NULL; + } + HeapFree(GetProcessHeap(), 0, surface->palette9); resource_cleanup(&surface->resource); @@ -1996,6 +2004,8 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) static void surface_gdi_cleanup(struct wined3d_surface *surface) { + struct wined3d_surface *overlay, *cur; + TRACE("surface %p.\n", surface); if (surface->flags & SFLAG_DIBSECTION) @@ -2014,6 +2024,12 @@ static void surface_gdi_cleanup(struct wined3d_surface *surface) if (surface->overlay_dest) list_remove(&surface->overlay_entry); + LIST_FOR_EACH_ENTRY_SAFE(overlay, cur, &surface->overlays, struct wined3d_surface, overlay_entry) + { + list_remove(&overlay->overlay_entry); + overlay->overlay_dest = NULL; + } + HeapFree(GetProcessHeap(), 0, surface->palette9); resource_cleanup(&surface->resource); @@ -3277,6 +3293,7 @@ HRESULT CDECL wined3d_surface_update_overlay(struct wined3d_surface *surface, co if (surface->overlay_dest && (surface->overlay_dest != dst_surface || flags & WINEDDOVER_HIDE)) { + surface->overlay_dest = NULL; list_remove(&surface->overlay_entry); }

1 0

Henri Verbeet : wined3d: Make the present_parameters parameter to wined3d_device_reset() const.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: d607586d62cd5626bc0c7e7c5c12d77ef8b9c468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d607586d62cd5626bc0c7e7c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 18 20:46:14 2011 +0200 wined3d: Make the present_parameters parameter to wined3d_device_reset() const. --- dlls/d3d8/device.c | 14 -------------- dlls/d3d9/device.c | 19 +------------------ dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 3 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1c8829f..2a78117 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -596,20 +596,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Reset(IDirect3DDevice8 *iface, } wined3d_mutex_unlock(); - pPresentationParameters->BackBufferWidth = localParameters.BackBufferWidth; - pPresentationParameters->BackBufferHeight = localParameters.BackBufferHeight; - pPresentationParameters->BackBufferFormat = d3dformat_from_wined3dformat(localParameters.BackBufferFormat); - pPresentationParameters->BackBufferCount = localParameters.BackBufferCount; - pPresentationParameters->MultiSampleType = localParameters.MultiSampleType; - pPresentationParameters->SwapEffect = localParameters.SwapEffect; - pPresentationParameters->hDeviceWindow = localParameters.hDeviceWindow; - pPresentationParameters->Windowed = localParameters.Windowed; - pPresentationParameters->EnableAutoDepthStencil = localParameters.EnableAutoDepthStencil; - pPresentationParameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(localParameters.AutoDepthStencilFormat); - pPresentationParameters->Flags = localParameters.Flags; - pPresentationParameters->FullScreen_RefreshRateInHz = localParameters.FullScreen_RefreshRateInHz; - pPresentationParameters->FullScreen_PresentationInterval = localParameters.PresentationInterval; - return hr; } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8dc7334..0372239 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -582,26 +582,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(IDirect3DDevi hr = wined3d_device_reset(This->wined3d_device, &localParameters, reset_enum_callback); if (FAILED(hr)) - { This->notreset = TRUE; - - pPresentationParameters->BackBufferWidth = localParameters.BackBufferWidth; - pPresentationParameters->BackBufferHeight = localParameters.BackBufferHeight; - pPresentationParameters->BackBufferFormat = d3dformat_from_wined3dformat(localParameters.BackBufferFormat); - pPresentationParameters->BackBufferCount = localParameters.BackBufferCount; - pPresentationParameters->MultiSampleType = localParameters.MultiSampleType; - pPresentationParameters->MultiSampleQuality = localParameters.MultiSampleQuality; - pPresentationParameters->SwapEffect = localParameters.SwapEffect; - pPresentationParameters->hDeviceWindow = localParameters.hDeviceWindow; - pPresentationParameters->Windowed = localParameters.Windowed; - pPresentationParameters->EnableAutoDepthStencil = localParameters.EnableAutoDepthStencil; - pPresentationParameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(localParameters.AutoDepthStencilFormat); - pPresentationParameters->Flags = localParameters.Flags; - pPresentationParameters->FullScreen_RefreshRateInHz = localParameters.FullScreen_RefreshRateInHz; - pPresentationParameters->PresentationInterval = localParameters.PresentationInterval; - } else { + else This->notreset = FALSE; - } wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 10acdce..999794f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5524,7 +5524,7 @@ err: /* Do not call while under the GL lock. */ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, - WINED3DPRESENT_PARAMETERS *present_parameters, + const WINED3DPRESENT_PARAMETERS *present_parameters, wined3d_device_reset_cb callback) { struct wined3d_resource *resource, *cursor; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7e382e1..e66fe16 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2282,7 +2282,7 @@ HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, const struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf); void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, - WINED3DPRESENT_PARAMETERS *present_parameters, wined3d_device_reset_cb callback); + const WINED3DPRESENT_PARAMETERS *present_parameters, wined3d_device_reset_cb callback); void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window); HRESULT __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const float *plane);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_creation_parameters() const.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 73723911aab948869e9c63843b1130ba43a245e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73723911aab948869e9c63843… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 18 20:46:15 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_creation_parameters() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 999794f..26b4d27 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5814,7 +5814,7 @@ HRESULT CDECL wined3d_device_set_dialog_box_mode(struct wined3d_device *device, } -HRESULT CDECL wined3d_device_get_creation_parameters(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_creation_parameters(const struct wined3d_device *device, WINED3DDEVICE_CREATION_PARAMETERS *parameters) { TRACE("device %p, parameters %p.\n", device, parameters); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e66fe16..a94f5d0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2209,7 +2209,7 @@ HRESULT __cdecl wined3d_device_get_back_buffer(const struct wined3d_device *devi INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, float *plane); HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status); -HRESULT __cdecl wined3d_device_get_creation_parameters(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, WINED3DDEVICE_CREATION_PARAMETERS *creation_parameters); HRESULT __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device, struct wined3d_surface **depth_stencil);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 1172b8102e35af7df5a76b4661c0fb637856e3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=1172b8102e35af7df5a76b466… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Oct 18 21:25:54 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 35 ++++++++++++----------------------- 1 files changed, 12 insertions(+), 23 deletions(-) diff --git a/po/lt.po b/po/lt.po index bbb6abf..757a267 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,12 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)gmail.com>, 2011. -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011. +# msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-10-09 11:54+0300\n" +"PO-Revision-Date: 2011-10-18 21:24+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -6733,9 +6732,8 @@ msgid "Trash" msgstr "Šiukšlinė" #: shlwapi.rc:27 -#, fuzzy msgid "%d bytes" -msgstr "%ld baitai" +msgstr "%d baitai" #: shlwapi.rc:28 msgctxt "time unit: hours" @@ -11343,59 +11341,50 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Neteisingas parametrų skaičius - pagalba: xcopy /?\n" #: xcopy.rc:28 -#, fuzzy msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "Neteisingas parametras „%s“ - pagalba: xcopy /?\n" +msgstr "Neteisingas parametras „%1“ – pagalba: xcopy /?\n" #: xcopy.rc:29 msgid "Press <enter> to begin copying\n" msgstr "Spauskite <įvesti> kopijavimui pradėti\n" #: xcopy.rc:30 -#, fuzzy msgid "%1!d! file(s) would be copied\n" -msgstr "bus nukopijuota failų: %d\n" +msgstr "bus nukopijuota failų: %1!d!\n" #: xcopy.rc:31 -#, fuzzy msgid "%1!d! file(s) copied\n" -msgstr "nukopijuota failų: %d\n" +msgstr "nukopijuota failų: %1!d!\n" #: xcopy.rc:34 -#, fuzzy msgid "" "Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"Ar „%s“ yra failas, ar katalogas,\n" +"Ar „%1“ yra failas, ar katalogas,\n" "ar paskirtis?\n" "(F - failas, K - katalogas)\n" #: xcopy.rc:35 -#, fuzzy msgid "%1? (Yes|No)\n" -msgstr "%s? (Taip|Ne)\n" +msgstr "%1? (Taip|Ne)\n" #: xcopy.rc:36 -#, fuzzy msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "Perrašyti %s? (Taip|Ne|Visus)\n" +msgstr "Perrašyti %1? (Taip|Ne|Visus)\n" #: xcopy.rc:37 -#, fuzzy msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "„%s“ kopijavimas į „%s“ nepavyko su r/c %d\n" +msgstr "„%1“ kopijavimas į „%2“ nepavyko su r/c %3!d!\n" #: xcopy.rc:38 -#, fuzzy msgid "Failed to open '%1'\n" -msgstr "Nepavyko atverti „%s“\n" +msgstr "Nepavyko atverti „%1“\n" #: xcopy.rc:39 -#, fuzzy msgid "Failed during reading of '%1'\n" -msgstr "Klaida skaitant „%s“\n" +msgstr "Klaida skaitant „1“\n" #: xcopy.rc:43 msgctxt "File key"

1 0

Aric Stewart : usp10: Handle multi-glyph clusters in ScriptStringOut.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 0aa30c46738a66d910f04d87f81f7eb42abef89d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa30c46738a66d910f04d87f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 18 13:57:03 2011 -0500 usp10: Handle multi-glyph clusters in ScriptStringOut. --- dlls/usp10/usp10.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8f472ac..4b03835 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1263,6 +1263,21 @@ error: return hr; } +static inline BOOL does_glyph_start_cluster(const SCRIPT_VISATTR *pva, const WORD *pwLogClust, int cChars, int glyph, int direction) +{ + int i; + + if (pva[glyph].fClusterStart) + return TRUE; + for (i = 0; i < cChars; i++) + if (pwLogClust[i] == glyph) break; + if (i != cChars) + return TRUE; + + return FALSE; +} + + static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, int iX, int iY, @@ -1344,6 +1359,25 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, cGlyphs++; + if (cEnd < 0 || scriptInformation[analysis->pItem[iItem].a.eScript].props.fNeedsCaretInfo) + { + INT direction; + INT clust_glyph; + + clust_glyph = iGlyph + cGlyphs; + if (analysis->pItem[iItem].a.fRTL) + direction = -1; + else + direction = 1; + + while(clust_glyph < analysis->glyphs[iItem].numGlyphs && + !does_glyph_start_cluster(analysis->glyphs[iItem].psva, analysis->glyphs[iItem].pwLogClust, (analysis->pItem[iItem+1].iCharPos - analysis->pItem[iItem].iCharPos), clust_glyph, direction)) + { + cGlyphs++; + clust_glyph++; + } + } + hr = ScriptTextOut(analysis->hdc, (SCRIPT_CACHE *)&analysis->glyphs[iItem].sc, iX + off_x, iY, uOptions, prc, &analysis->pItem[iItem].a, NULL, 0, @@ -1660,11 +1694,8 @@ static inline int get_glyph_cluster_advance(const int* piAdvance, const SCRIPT_V for (glyph+=direction; glyph < cGlyphs && glyph >= 0; glyph +=direction) { - if (pva[glyph].fClusterStart) - break; - for (i = 0; i < cChars; i++) - if (pwLogClust[i] == glyph) break; - if (i != cChars) + + if (does_glyph_start_cluster(pva, pwLogClust, cChars, glyph, direction)) break; if (glyph > log_clust_max) break;

1 0

Austin English : configure: Use -fno-omit-frame-pointer when available.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 5cfe7db1854ff1142d598eaf49f6050676c8d547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cfe7db1854ff1142d598eaf4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 18 12:17:37 2011 -0700 configure: Use -fno-omit-frame-pointer when available. --- configure | 28 ++++++++++++++++++++++++++++ configure.ac | 5 +++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7325264..138fa8d 100755 --- a/configure +++ b/configure @@ -12014,6 +12014,34 @@ if test $ac_cv_cflags__Wwrite_strings = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" fi + case $host_cpu in + *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5 +$as_echo_n "checking whether the compiler supports -fno-omit-frame-pointer... " >&6; } +if ${ac_cv_cflags__fno_omit_frame_pointer+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fno-omit-frame-pointer" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__fno_omit_frame_pointer=yes +else + ac_cv_cflags__fno_omit_frame_pointer=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_omit_frame_pointer" >&5 +$as_echo "$ac_cv_cflags__fno_omit_frame_pointer" >&6; } +if test $ac_cv_cflags__fno_omit_frame_pointer = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -fno-omit-frame-pointer" +fi ;; + esac + saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken string.h that generates warnings with -Wpointer-arith" >&5 diff --git a/configure.ac b/configure.ac index 5a9fd2b..363d08f 100644 --- a/configure.ac +++ b/configure.ac @@ -1684,6 +1684,11 @@ then WINE_TRY_CFLAGS([-Wunused-but-set-parameter]) WINE_TRY_CFLAGS([-Wwrite-strings]) + dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections + case $host_cpu in + *i[[3456789]]86*) WINE_TRY_CFLAGS([-fno-omit-frame-pointer]) ;; + esac + dnl Check for noisy string.h saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror"

1 0

Francois Gouget : xcopy: Use FormatMessage() for better internationalization support.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 0cdabdd64873439052b3efa84850bc08cacf5395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cdabdd64873439052b3efa84… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 18 16:44:32 2011 +0200 xcopy: Use FormatMessage() for better internationalization support. This makes it possible to reorder the format string placeholders in message translations. --- po/ar.po | 22 +++++++++++++--------- po/bg.po | 22 +++++++++++++--------- po/ca.po | 31 ++++++++++++++++++++++--------- po/cs.po | 22 +++++++++++++--------- po/da.po | 31 ++++++++++++++++++++++--------- po/de.po | 31 ++++++++++++++++++++++--------- po/el.po | 22 +++++++++++++--------- po/en.po | 38 +++++++++++++++++++++----------------- po/en_US.po | 38 +++++++++++++++++++++----------------- po/eo.po | 22 +++++++++++++--------- po/es.po | 26 ++++++++++++++++---------- po/fa.po | 22 +++++++++++++--------- po/fi.po | 22 +++++++++++++--------- po/fr.po | 31 ++++++++++++++++++++++--------- po/he.po | 31 ++++++++++++++++++++++--------- po/hi.po | 22 +++++++++++++--------- po/hu.po | 22 +++++++++++++--------- po/it.po | 31 ++++++++++++++++++++++--------- po/ja.po | 31 ++++++++++++++++++++++--------- po/ko.po | 31 ++++++++++++++++++++++--------- po/lt.po | 31 ++++++++++++++++++++++--------- po/ml.po | 22 +++++++++++++--------- po/nb_NO.po | 31 ++++++++++++++++++++++--------- po/nl.po | 31 ++++++++++++++++++++++--------- po/or.po | 22 +++++++++++++--------- po/pa.po | 22 +++++++++++++--------- po/pl.po | 31 ++++++++++++++++++++++--------- po/pt_BR.po | 31 ++++++++++++++++++++++--------- po/pt_PT.po | 31 ++++++++++++++++++++++--------- po/rm.po | 22 +++++++++++++--------- po/ro.po | 31 ++++++++++++++++++++++--------- po/ru.po | 31 ++++++++++++++++++++++--------- po/sk.po | 22 +++++++++++++--------- po/sl.po | 31 ++++++++++++++++++++++--------- po/sr_RS(a)cyrillic.po | 31 ++++++++++++++++++++++--------- po/sr_RS(a)latin.po | 31 ++++++++++++++++++++++--------- po/sv.po | 31 ++++++++++++++++++++++--------- po/te.po | 22 +++++++++++++--------- po/th.po | 22 +++++++++++++--------- po/tr.po | 22 +++++++++++++--------- po/uk.po | 33 +++++++++++++++++++++++---------- po/wa.po | 22 +++++++++++++--------- po/wine.pot | 22 +++++++++++++--------- po/zh_CN.po | 22 +++++++++++++--------- po/zh_TW.po | 22 +++++++++++++--------- programs/xcopy/xcopy.c | 16 +++++++++------- programs/xcopy/xcopy.rc | 18 +++++++++--------- 47 files changed, 812 insertions(+), 439 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0cdabdd64873439052b3e…

1 0

Francois Gouget : shlwapi: Don' t use a long where an int is more than big enough.
by Alexandre Julliard 18 Oct '11

18 Oct '11

1 0

Dmitry Timoshkov : ntdll: Take into account timezone bias changes when detecting daylight saving rules .
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 0e44bda72a716a34106382f1b4ef5f376f28f267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e44bda72a716a34106382f1b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 18 15:34:05 2011 +0900 ntdll: Take into account timezone bias changes when detecting daylight saving rules. --- dlls/ntdll/time.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 5a120f4..d233f23 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -728,18 +728,20 @@ static time_t find_dst_change(unsigned long min, unsigned long max, int *is_dst) static int init_tz_info(RTL_TIME_ZONE_INFORMATION *tzi) { static RTL_TIME_ZONE_INFORMATION cached_tzi; - static int current_year = -1; + static int current_year = -1, current_bias = 65535; struct tm *tm; time_t year_start, year_end, tmp, dlt = 0, std = 0; - int is_dst, current_is_dst; + int is_dst, current_is_dst, bias; RtlEnterCriticalSection( &TIME_tz_section ); year_start = time(NULL); - tm = localtime(&year_start); + tm = gmtime(&year_start); + bias = (LONG)(mktime(tm) - year_start) / 60; + tm = localtime(&year_start); current_is_dst = tm->tm_isdst; - if (current_year == tm->tm_year) + if (current_year == tm->tm_year && current_bias == bias) { *tzi = cached_tzi; RtlLeaveCriticalSection( &TIME_tz_section ); @@ -748,8 +750,11 @@ static int init_tz_info(RTL_TIME_ZONE_INFORMATION *tzi) memset(tzi, 0, sizeof(*tzi)); - TRACE("tz data will be valid through year %d\n", tm->tm_year + 1900); + TRACE("tz data will be valid through year %d, bias %d\n", tm->tm_year + 1900, bias); current_year = tm->tm_year; + current_bias = bias; + + tzi->Bias = bias; tm->tm_isdst = 0; tm->tm_mday = 1; @@ -764,10 +769,6 @@ static int init_tz_info(RTL_TIME_ZONE_INFORMATION *tzi) year_end = mktime(tm); TRACE("year_end: %s", ctime(&year_end)); - tm = gmtime(&year_start); - tzi->Bias = (LONG)(mktime(tm) - year_start) / 60; - TRACE("bias: %d\n", tzi->Bias); - tmp = find_dst_change(year_start, year_end, &is_dst); if (is_dst) dlt = tmp;

1 0