May 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Fix debug_d3dusage() to handle combinations of flags.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 7c2e91c59255d6d811c4893cbe9dfd8b8ebe0eea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c2e91c59255d6d811c4893cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 25 09:17:22 2009 +0200 wined3d: Fix debug_d3dusage() to handle combinations of flags. --- dlls/wined3d/utils.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 09f76fd..8a9f7e0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -911,9 +911,12 @@ const char* debug_d3ddevicetype(WINED3DDEVTYPE devtype) { } } -const char* debug_d3dusage(DWORD usage) { - switch (usage & WINED3DUSAGE_MASK) { -#define WINED3DUSAGE_TO_STR(u) case u: return #u +const char *debug_d3dusage(DWORD usage) +{ + char buf[284]; + + buf[0] = '\0'; +#define WINED3DUSAGE_TO_STR(u) if (usage & u) { strcat(buf, " | "#u); usage &= ~u; } WINED3DUSAGE_TO_STR(WINED3DUSAGE_RENDERTARGET); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DEPTHSTENCIL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_WRITEONLY); @@ -926,11 +929,9 @@ const char* debug_d3dusage(DWORD usage) { WINED3DUSAGE_TO_STR(WINED3DUSAGE_AUTOGENMIPMAP); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); #undef WINED3DUSAGE_TO_STR - case 0: return "none"; - default: - FIXME("Unrecognized %u Usage!\n", usage); - return "unrecognized"; - } + if (usage) FIXME("Unrecognized usage flag(s) %#x\n", usage); + + return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; } const char* debug_d3dusagequery(DWORD usagequery) {

1 0

Henri Verbeet : wined3d: Fix debug_d3dusagequery() to handle combinations of flags.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 6a9212a1b221b0d440e3ad492cc815f2ef79dd6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9212a1b221b0d440e3ad492… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 25 09:17:22 2009 +0200 wined3d: Fix debug_d3dusagequery() to handle combinations of flags. --- dlls/wined3d/utils.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8a9f7e0..cce4920 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -934,9 +934,12 @@ const char *debug_d3dusage(DWORD usage) return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; } -const char* debug_d3dusagequery(DWORD usagequery) { - switch (usagequery & WINED3DUSAGE_QUERY_MASK) { -#define WINED3DUSAGEQUERY_TO_STR(u) case u: return #u +const char *debug_d3dusagequery(DWORD usagequery) +{ + char buf[238]; + + buf[0] = '\0'; +#define WINED3DUSAGEQUERY_TO_STR(u) if (usagequery & u) { strcat(buf, " | "#u); usagequery &= ~u; } WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_FILTER); WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_LEGACYBUMPMAP); WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING); @@ -945,11 +948,9 @@ const char* debug_d3dusagequery(DWORD usagequery) { WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_VERTEXTEXTURE); WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_WRAPANDMIP); #undef WINED3DUSAGEQUERY_TO_STR - case 0: return "none"; - default: - FIXME("Unrecognized %u Usage Query!\n", usagequery); - return "unrecognized"; - } + if (usagequery) FIXME("Unrecognized usage query flag(s) %#x\n", usagequery); + + return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; } const char* debug_d3ddeclmethod(WINED3DDECLMETHOD method) {

1 0

Paul Vriens : kernel32: Use Polish translations.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: a15282371b9e7b751c3bdba759a3b7598410b13c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15282371b9e7b751c3bdba75… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon May 25 10:09:14 2009 +0200 kernel32: Use Polish translations. --- dlls/kernel32/kernel.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel.rc b/dlls/kernel32/kernel.rc index 29df694..30d1dca 100644 --- a/dlls/kernel32/kernel.rc +++ b/dlls/kernel32/kernel.rc @@ -24,5 +24,6 @@ #include "nls/winerr_kor.mc.rc" #include "nls/winerr_nld.mc.rc" #include "nls/winerr_nor.mc.rc" +#include "nls/winerr_plk.mc.rc" #include "version.rc"

1 0

Paul Vriens : kernel32/tests: Fix comment.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: bb4168ab7373e465b83a24f7e591cfbe1d4492be URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4168ab7373e465b83a24f7e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon May 25 10:29:01 2009 +0200 kernel32/tests: Fix comment. --- dlls/kernel32/tests/volume.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 6454731..e447e0f 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -67,7 +67,7 @@ static void test_query_dos_deviceA(void) } for (;drivestr[0] <= 'z'; drivestr[0]++) { - /* Older W2K fails with ERROR_INSUFFICIENT_BUFFER when buflen is > 32767 big */ + /* Older W2K fails with ERROR_INSUFFICIENT_BUFFER when buflen is > 32767 */ ret = QueryDosDeviceA( drivestr, buffer, buflen - 1); if(ret) { for (p = buffer; *p; p++) *p = toupper(*p);

1 0

Jacek Caban : urlmon: Use TLS_OUT_OF_INDEXES as invalid TLS value.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 08d8a5ea259cd93f3f0fae3d467cd4524b550abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d8a5ea259cd93f3f0fae3d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 24 23:16:21 2009 +0200 urlmon: Use TLS_OUT_OF_INDEXES as invalid TLS value. --- dlls/urlmon/urlmon_main.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 3203753..6e51db5 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -36,7 +36,7 @@ LONG URLMON_refCount = 0; HINSTANCE URLMON_hInstance = 0; static HMODULE hCabinet = NULL; -static DWORD urlmon_tls; +static DWORD urlmon_tls = TLS_OUT_OF_INDEXES; static void init_session(BOOL); @@ -56,9 +56,12 @@ tls_data_t *get_tls_data(void) { tls_data_t *data; - if(!urlmon_tls) { + if(urlmon_tls == TLS_OUT_OF_INDEXES) { DWORD tls = TlsAlloc(); - tls = InterlockedCompareExchange((LONG*)&urlmon_tls, tls, 0); + if(tls == TLS_OUT_OF_INDEXES) + return NULL; + + tls = InterlockedCompareExchange((LONG*)&urlmon_tls, tls, TLS_OUT_OF_INDEXES); if(tls != urlmon_tls) TlsFree(tls); } @@ -83,7 +86,7 @@ static void free_tls_list(void) { tls_data_t *data; - if(!urlmon_tls) + if(urlmon_tls == TLS_OUT_OF_INDEXES) return; while(!list_empty(&tls_list)) { @@ -99,7 +102,7 @@ static void detach_thread(void) { tls_data_t *data; - if(!urlmon_tls) + if(urlmon_tls == TLS_OUT_OF_INDEXES) return; data = TlsGetValue(urlmon_tls);

1 0

Frans Kool : cryptui: Added Dutch translations.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 918935613f97a30fb9075b325dd3c9d2a32a9d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=918935613f97a30fb9075b325… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Fri May 22 22:41:07 2009 +0200 cryptui: Added Dutch translations. --- dlls/cryptui/cryptui.rc | 1 + dlls/cryptui/cryptui_Nl.rc | 461 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 462 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=918935613f97a30fb9075…

1 0

Vladimir Pankratov : winedbg: Add Russian translation.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: c75f31e1b8e6cb3202fa5c4d89519d530636fdb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75f31e1b8e6cb3202fa5c4d8… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Sat May 23 02:21:03 2009 +0500 winedbg: Add Russian translation. --- programs/winedbg/rsrc.rc | 1 + programs/winedbg/rsrc_Ru.rc | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/rsrc.rc b/programs/winedbg/rsrc.rc index fbc07d7..9963bbf 100644 --- a/programs/winedbg/rsrc.rc +++ b/programs/winedbg/rsrc.rc @@ -26,3 +26,4 @@ #include "rsrc_En.rc" #include "rsrc_Ko.rc" #include "rsrc_Nl.rc" +#include "rsrc_Ru.rc" diff --git a/programs/winedbg/rsrc_Ru.rc b/programs/winedbg/rsrc_Ru.rc new file mode 100644 index 0000000..7fc05bb --- /dev/null +++ b/programs/winedbg/rsrc_Ru.rc @@ -0,0 +1,53 @@ +/* + * Russian Language Support + * + * Copyright 2009 Vladimir Pankratov + * + * 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 + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&��", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "� �� %s �� \ + ��. �� .", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "�� Wine. \ + �� http://appdb.winehq.org � �� \ + �� .\n\n\ + �� Windows � �� , \ + �� http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "��", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "�� Wine" + IDS_INVALID_PARAMS "�� - �� " + IDS_UNIDENTIFIED "(��)" +END

1 0

Andrew Talbot : avifil32: Constify a variable.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: e281b0935bca915a9f3d876338a97f7ebc9397f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e281b0935bca915a9f3d87633… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat May 23 22:31:56 2009 +0100 avifil32: Constify a variable. --- dlls/avifil32/avifile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 1719031..49e141f 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -226,7 +226,7 @@ static ULONG AVIFILE_SearchStream(const IAVIFileImpl *This, DWORD fccType, LONG lSkip); static void AVIFILE_UpdateInfo(IAVIFileImpl *This); static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, - FOURCC ckid, DWORD flags, LPVOID buffer, + FOURCC ckid, DWORD flags, LPCVOID buffer, LONG size); HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppv) @@ -2543,7 +2543,7 @@ static void AVIFILE_UpdateInfo(IAVIFileImpl *This) } static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, - FOURCC ckid, DWORD flags, LPVOID buffer, + FOURCC ckid, DWORD flags, LPCVOID buffer, LONG size) { MMCKINFO ck;

1 0

Gerald Pfeifer : dsound: Clarify statement in DSOUND_capture_callback.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 13e14f3b8ee93ac94cfe82950f827349cf225cec URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e14f3b8ee93ac94cfe82950… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 23 22:17:08 2009 +0200 dsound: Clarify statement in DSOUND_capture_callback. --- dlls/dsound/capture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 2a8252f..312c90f 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -428,7 +428,7 @@ DSOUND_capture_callback(HWAVEIN hwi, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, if (This->state == STATE_STARTING) This->state = STATE_CAPTURING; capture_CheckNotify(Moi, (DWORD_PTR)This->pwave[index].lpData - (DWORD_PTR)This->buffer, This->pwave[index].dwBufferLength); - This->index = (++This->index) % This->nrofpwaves; + This->index = (This->index + 1) % This->nrofpwaves; if ( (This->index == 0) && !(This->capture_buffer->flags & DSCBSTART_LOOPING) ) { TRACE("end of buffer\n"); This->state = STATE_STOPPED;

1 0

Chris Robinson : wined3d: Prevent erroneous FIXMEs on newer cards.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 1d757fd6da5e5cbd57396ad0c42de78e2d7c4820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d757fd6da5e5cbd57396ad0c… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun May 10 14:17:43 2009 -0700 wined3d: Prevent erroneous FIXMEs on newer cards. Cards that have 12 or more combined samplers can trigger a fixme if they have the same amount of vertex samplers, even though it's plenty enough. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 46c1556..5ce84cd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -901,7 +901,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { * So this is just a check to check that our assumption holds true. If not, write a warning * and reduce the number of vertex samplers or probably disable vertex texture fetch. */ - if(gl_info->max_vertex_samplers && + if(gl_info->max_vertex_samplers && gl_info->max_combined_samplers < 12 && MAX_TEXTURES + gl_info->max_vertex_samplers > gl_info->max_combined_samplers) { FIXME("OpenGL implementation supports %u vertex samplers and %u total samplers\n", gl_info->max_vertex_samplers, gl_info->max_combined_samplers);

1 0