July 2009 - Wine-Commits - list.winehq.org

Detlef Riekenberg : urlmon/tests: Add tests for CoInternetCreateZoneManager .
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 099f031051af2112b82a98c4aa3910fbd70a3542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099f031051af2112b82a98c4a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jul 8 00:03:21 2009 +0200 urlmon/tests: Add tests for CoInternetCreateZoneManager. --- dlls/urlmon/tests/sec_mgr.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index e35cf48..07d409e 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -282,6 +282,47 @@ static void test_polices(void) IInternetZoneManager_Release(zonemgr); } +static void test_CoInternetCreateZoneManager(void) +{ + IInternetZoneManager *zonemgr = NULL; + IUnknown *punk = NULL; + HRESULT hr; + + hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0); + ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr); + if (FAILED(hr)) + return; + + hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IUnknown, (void **) &punk); + ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)n", hr, punk); + if (punk) + IUnknown_Release(punk); + + hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IInternetZoneManager, (void **) &punk); + ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)n", hr, punk); + if (punk) + IUnknown_Release(punk); + + + hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IInternetZoneManagerEx, (void **) &punk); + if (SUCCEEDED(hr)) { + IUnknown_Release(punk); + + hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IInternetZoneManagerEx2, (void **) &punk); + if (punk) + IUnknown_Release(punk); + else + win_skip("InternetZoneManagerEx2 not supported\n"); + + } + else + win_skip("InternetZoneManagerEx not supported\n"); + + hr = IInternetZoneManager_Release(zonemgr); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + +} + static void test_CreateZoneEnumerator(void) { IInternetZoneManager *zonemgr = NULL; @@ -500,6 +541,7 @@ START_TEST(sec_mgr) test_SecurityManager(); test_polices(); + test_CoInternetCreateZoneManager(); test_CreateZoneEnumerator(); test_GetZoneActionPolicy(); test_GetZoneAt();

1 0

Henri Verbeet : wined3d: Fix a sign compare warning in shader_vaddline().
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 6211643bf540209869b711c582e31b33715aae92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6211643bf540209869b711c58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 8 09:49:29 2009 +0200 wined3d: Fix a sign compare warning in shader_vaddline(). --- dlls/wined3d/baseshader.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 4e3fb92..e67e7ed 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -159,9 +159,8 @@ int shader_vaddline(SHADER_BUFFER* buffer, const char *format, va_list args) rc = vsnprintf(base, SHADER_PGMSIZE - 1 - buffer->bsize, format, args); - if (rc < 0 || /* C89 */ - rc > SHADER_PGMSIZE - 1 - buffer->bsize) { /* C99 */ - + if (rc < 0 /* C89 */ || (unsigned int)rc > SHADER_PGMSIZE - 1 - buffer->bsize /* C99 */) + { ERR("The buffer allocated for the shader program string " "is too small at %d bytes.\n", SHADER_PGMSIZE); buffer->bsize = SHADER_PGMSIZE - 1;

1 0

Detlef Riekenberg : include: Add IInternetZoneManagerEx2 interface for IE7.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 437caf390ec27cc2cc083948b463cab474ce6b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=437caf390ec27cc2cc083948b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jul 7 22:59:42 2009 +0200 include: Add IInternetZoneManagerEx2 interface for IE7. --- include/urlmon.idl | 88 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 80 insertions(+), 8 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 4e902a2..3c6576b 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1210,20 +1210,26 @@ interface IInternetZoneManager : IUnknown URLTEMPLATE_CUSTOM = 0x00000, URLTEMPLATE_PREDEFINED_MIN = 0x10000, URLTEMPLATE_LOW = 0x10000, + URLTEMPLATE_MEDLOW = 0x10500, URLTEMPLATE_MEDIUM = 0x11000, + URLTEMPLATE_MEDHIGH = 0x11500, URLTEMPLATE_HIGH = 0x12000, URLTEMPLATE_PREDEFINED_MAX = 0x20000, } URLTEMPLATE ; typedef enum { - ZAFLAGS_CUSTOM_EDIT = 0x00000001, - ZAFLAGS_ADD_SITES = 0x00000002, - ZAFLAGS_REQUIRE_VERIFICATION = 0x00000004, - ZAFLAGS_INCLUDE_PROXY_OVERRIDE = 0x00000008, - ZAFLAGS_INCLUDE_INTRANET_SITES = 0x00000010, - ZAFLAGS_NO_UI = 0x00000020, - ZAFLAGS_SUPPORTS_VERIFICATION = 0x00000040, - ZAFLAGS_UNC_AS_INTRANET = 0x00000080, + ZAFLAGS_CUSTOM_EDIT = 0x00000001, + ZAFLAGS_ADD_SITES = 0x00000002, + ZAFLAGS_REQUIRE_VERIFICATION = 0x00000004, + ZAFLAGS_INCLUDE_PROXY_OVERRIDE = 0x00000008, + ZAFLAGS_INCLUDE_INTRANET_SITES = 0x00000010, + ZAFLAGS_NO_UI = 0x00000020, + ZAFLAGS_SUPPORTS_VERIFICATION = 0x00000040, + ZAFLAGS_UNC_AS_INTRANET = 0x00000080, + ZAFLAGS_DETECT_INTRANET = 0x00000100, + ZAFLAGS_USE_LOCKED_ZONES = 0x00010000, + ZAFLAGS_VERIFY_TEMPLATE_SETTINGS = 0x00020000, + ZAFLAGS_NO_CACHE = 0x00040000, } ZAFLAGS ; enum { @@ -1316,6 +1322,72 @@ interface IInternetZoneManager : IUnknown [in] DWORD dwReserved); } +/***************************************************************************** + * IInternetZoneManagerEx interface + */ +[ + local, + object, + uuid(A4C23339-8E06-431E-9BF4-7E711C085648), + pointer_default(unique) +] +interface IInternetZoneManagerEx : IInternetZoneManager +{ + HRESULT GetZoneActionPolicyEx( + [in] DWORD dwZone, + [in] DWORD dwAction, + [out] BYTE* pPolicy, + [in] DWORD cbPolicy, + [in] URLZONEREG urlZoneReg, + [in] DWORD dwFlags); + + HRESULT SetZoneActionPolicyEx( + [in] DWORD dwZone, + [in] DWORD dwAction, + [in] BYTE* pPolicy, + [in] DWORD cbPolicy, + [in] URLZONEREG urlZoneReg, + [in] DWORD dwFlags); + +} + +/***************************************************************************** + * IInternetZoneManagerEx2 interface + */ + +cpp_quote("#define SECURITY_IE_STATE_GREEN 0") +cpp_quote("#define SECURITY_IE_STATE_RED 1") + +[ + local, + object, + uuid(EDC17559-DD5D-4846-8EEF-8BECBA5A4ABF), + pointer_default(unique) +] +interface IInternetZoneManagerEx2 : IInternetZoneManagerEx +{ + HRESULT GetZoneAttributesEx( + [in] DWORD dwZone, + [in, out, unique] ZONEATTRIBUTES* pZoneAttributes, + [in] DWORD dwFlags); + + HRESULT GetZoneSecurityState( + [in] DWORD dwZoneIndex, + [in] BOOL fRespectPolicy, + [in, out] LPDWORD pdwState, + [in, out] BOOL *pfPolicyEncountered); + + HRESULT GetIESecurityState( + [in] BOOL fRespectPolicy, + [in, out] LPDWORD pdwState, + [in, out] BOOL *pfPolicyEncountered, + [in] BOOL fNoCache); + + HRESULT FixInsecureSettings(void); + +} + + typedef struct _tagSOFTDISTINFO { ULONG cbSize;

1 0

Huw Davies : wordpad: Add English neutral translations.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 6df07402c0cc773cf3a4de45f158609f9f0931db URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df07402c0cc773cf3a4de45f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 8 15:24:08 2009 +0100 wordpad: Add English neutral translations. --- programs/wordpad/En.rc | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 3f8070c..fe92de7 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -244,3 +244,12 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Printing not implemented" STRING_MAX_TAB_STOPS, "Cannot add more than 32 tab stops." END + +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "Left" + STRING_ALIGN_RIGHT, "Right" + STRING_ALIGN_CENTER, "Centre" +END

1 0

Andrew Eikum : gdiplus: Don' t modify container list if container restoration fails.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: a06c2570e5870d1c5538760442956fedab1594ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06c2570e5870d1c553876044… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Tue Jul 7 22:30:29 2009 -0500 gdiplus: Don't modify container list if container restoration fails. --- dlls/gdiplus/graphics.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b81a984..12f1e26 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3400,7 +3400,7 @@ GpStatus WINGDIPAPI GdipComment(GpGraphics *graphics, UINT sizeData, GDIPCONST B return NotImplemented; } -GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsState state) +GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsContainer state) { GpStatus sts; GraphicsContainerItem *container, *container2; @@ -3419,6 +3419,10 @@ GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsState state) if(&container->entry == &graphics->containers) return Ok; + sts = restore_container(graphics, container); + if(sts != Ok) + return sts; + /* remove all of the containers on top of the found container */ LIST_FOR_EACH_ENTRY_SAFE(container, container2, &graphics->containers, GraphicsContainerItem, entry){ if(container->contid == state) @@ -3428,10 +3432,9 @@ GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsState state) } list_remove(&container->entry); - sts = restore_container(graphics, container); delete_container(container); - return sts; + return Ok; } GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics *graphics, REAL sx,

1 0

Anders Jonsson : winedbg: Add Swedish translation.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: f7ec04766b302fff9ffc4d86b1b4bd06bdc34472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ec04766b302fff9ffc4d86b… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Jul 7 22:16:41 2009 +0200 winedbg: Add Swedish translation. --- programs/winedbg/Makefile.in | 3 +- programs/winedbg/rsrc_Sv.rc | 60 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index c3329e2..fa13abf 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -37,7 +37,8 @@ RC_SRCS = \ rsrc_Ko.rc \ rsrc_Lt.rc \ rsrc_Nl.rc \ - rsrc_Ru.rc + rsrc_Ru.rc \ + rsrc_Sv.rc LEX_SRCS = debug.l BISON_SRCS = dbg.y diff --git a/programs/winedbg/rsrc_Sv.rc b/programs/winedbg/rsrc_Sv.rc new file mode 100644 index 0000000..7a24982 --- /dev/null +++ b/programs/winedbg/rsrc_Sv.rc @@ -0,0 +1,60 @@ +/* + * Swedish Language Support + * + * Copyright 2008 Anders Jonsson + * + * 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 + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Felsök", 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 "Programfel" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "Programmet %s har stött på ett allvarligt problem och \ + måste avslutas. Vi ber om ursäkt för besväret.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Detta kan ha orsakats av ett fel i programmet eller en brist i Wine. \ + Du kan söka på http://appdb.winehq.org efter tips om hur man kör \ + detta program.\n\n\ + Om problemet inte uppstår i Windows och ännu inte har rapporterats \ + så kan du rapportera det på http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Stäng", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Krasch i Wine-program" + IDS_INVALID_PARAMS "Interna fel - ogiltiga parametrar mottogs" + IDS_UNIDENTIFIED "(oidentifierad)" +END + +#pragma code_page(default)

1 0

Detlef Riekenberg : urlmon: Partial InternetZoneManagerEx2 implementation.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 1c6efb42417725ff93a48ab6c47befe7dfed2a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c6efb42417725ff93a48ab6c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jul 7 23:55:00 2009 +0200 urlmon: Partial InternetZoneManagerEx2 implementation. --- dlls/urlmon/sec_mgr.c | 163 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 143 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c6efb42417725ff93a48…

1 0

Huw Davies : gdi32/tests: Don' t continue with the tests if GetWinMetaFileBits fails.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 904b2749f79b096f6ed04462ee00734ca42d1461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=904b2749f79b096f6ed04462e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 8 15:20:25 2009 +0100 gdi32/tests: Don't continue with the tests if GetWinMetaFileBits fails. --- dlls/gdi32/tests/metafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 49a5489..2eacd37 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2331,7 +2331,7 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc) UINT size, emf_size, i; WORD check = 0; DWORD rec_num = 0; - METAHEADER *mh; + METAHEADER *mh = NULL; METARECORD *rec; INT horz_res, vert_res, horz_size, vert_size; @@ -2363,6 +2363,7 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc) size = GetWinMetaFileBits(emf, 0, NULL, mode, display_dc); ok(size, "GetWinMetaFileBits returns 0\n"); + if(!size) goto end; mh = HeapAlloc(GetProcessHeap(), 0, size); GetWinMetaFileBits(emf, size, (BYTE*)mh, mode, display_dc); @@ -2464,6 +2465,7 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc) rec = (METARECORD*)((WORD*)rec + rec->rdSize); } +end: HeapFree(GetProcessHeap(), 0, mh); HeapFree(GetProcessHeap(), 0, enh_header); DeleteEnhMetaFile(emf);

1 0

Paul Vriens : comctl32/tests: Fix test failures with comctl32 <= 5.80.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: f88d9ab195c810d504a77c66fdd408fe1a601359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88d9ab195c810d504a77c66f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 8 11:57:23 2009 +0200 comctl32/tests: Fix test failures with comctl32 <= 5.80. --- dlls/comctl32/tests/datetime.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 8fdbbe5..038a789 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -423,10 +423,13 @@ static void test_dtm_set_range_swap_min_max(HWND hWndDateTime) r = SendMessage(hWndDateTime, DTM_GETRANGE, 0, (LPARAM)getSt); ok(r == (GDTR_MIN | GDTR_MAX), "Expected %x, not %x(GDTR_MIN) or %x(GDTR_MAX), got %lx\n", (GDTR_MIN | GDTR_MAX), GDTR_MIN, GDTR_MAX, r); todo_wine { - expect_systime(&st[0], &getSt[0]); - } - todo_wine { - expect_systime(&st[1], &getSt[1]); + ok(compare_systime(&st[0], &getSt[0]) == 1 || + broken(compare_systime(&st[0], &getSt[1]) == 1), /* comctl32 version <= 5.80 */ + "ST1 != ST2\n"); + + ok(compare_systime(&st[1], &getSt[1]) == 1 || + broken(compare_systime(&st[1], &getSt[0]) == 1), /* comctl32 version <= 5.80 */ + "ST1 != ST2\n"); } fill_systime_struct(&st[0], 1980, 1, 3, 23, 14, 34, 37, 465); @@ -439,7 +442,9 @@ static void test_dtm_set_range_swap_min_max(HWND hWndDateTime) and doing DTM_SETSYSTEMTIME */ expect_systime_date(&st[0], &getSt[0]); todo_wine { - expect_systime_time(&origSt, &getSt[0]); + ok(compare_systime_time(&origSt, &getSt[0]) == 1 || + broken(compare_systime_time(&st[0], &getSt[0]) == 1), /* comctl32 version <= 5.80 */ + "ST1.time != ST2.time\n"); } /* set st[0] to value higher than minimum */ @@ -455,10 +460,13 @@ static void test_dtm_set_range_swap_min_max(HWND hWndDateTime) r = SendMessage(hWndDateTime, DTM_GETRANGE, 0, (LPARAM)getSt); ok(r == (GDTR_MIN | GDTR_MAX), "Expected %x, not %x(GDTR_MIN) or %x(GDTR_MAX), got %lx\n", (GDTR_MIN | GDTR_MAX), GDTR_MIN, GDTR_MAX, r); todo_wine { - expect_systime(&st[0], &getSt[1]); - } - todo_wine { - expect_systime(&st[1], &getSt[0]); + ok(compare_systime(&st[0], &getSt[1]) == 1 || + broken(compare_systime(&st[0], &getSt[0]) == 1), /* comctl32 version <= 5.80 */ + "ST1 != ST2\n"); + + ok(compare_systime(&st[1], &getSt[0]) == 1 || + broken(compare_systime(&st[1], &getSt[1]) == 1), /* comctl32 version <= 5.80 */ + "ST1 != ST2\n"); } /* set st[0] to value higher than st[1] */

1 0

Henri Verbeet : wined3d: Fix a sign compare warning in glsl_shader.c.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: e41831990df6991c5ed06b5c98a556f0381abe73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e41831990df6991c5ed06b5c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 8 09:49:28 2009 +0200 wined3d: Fix a sign compare warning in glsl_shader.c. --- dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bc84737..e15436c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -769,9 +769,9 @@ static void shader_glsl_update_float_pixel_constants(IWineD3DDevice *iface, UINT } } -static int vec4_varyings(DWORD shader_major, const WineD3D_GL_Info *gl_info) +static unsigned int vec4_varyings(DWORD shader_major, const WineD3D_GL_Info *gl_info) { - int ret = GL_LIMITS(glsl_varyings) / 4; + unsigned int ret = GL_LIMITS(glsl_varyings) / 4; /* 4.0 shaders do not write clip coords because d3d10 does not support user clipplanes */ if(shader_major > 3) return ret; @@ -1186,7 +1186,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (This->baseShader.reg_maps.shader_version.major >= 3) { DWORD idx = ((IWineD3DPixelShaderImpl *)This)->input_reg_map[reg->idx]; - DWORD in_count = vec4_varyings(This->baseShader.reg_maps.shader_version.major, gl_info); + unsigned int in_count = vec4_varyings(This->baseShader.reg_maps.shader_version.major, gl_info); if (reg->rel_addr) { @@ -3351,7 +3351,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in UINT semantic_idx_in, semantic_idx_out; DWORD *set; DWORD in_idx; - DWORD in_count = vec4_varyings(3, gl_info); + unsigned int in_count = vec4_varyings(3, gl_info); char reg_mask[6], reg_mask_out[6]; char destination[50]; WORD input_map, output_map; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da51604..d3d32e4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2747,7 +2747,7 @@ typedef struct IWineD3DPixelShaderImpl { struct wined3d_shader_signature_element input_signature[MAX_REG_INPUT]; DWORD input_reg_map[MAX_REG_INPUT]; BOOL input_reg_used[MAX_REG_INPUT]; - int declared_in_count; + unsigned int declared_in_count; /* The GL shader */ void *backend_priv;

1 0