November 2011 - Wine-commits

Alexandre Julliard : browseui: Convert dialogs to po files.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: cdaf3c0017929824fc1bd04001dffd263298cab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdaf3c0017929824fc1bd0400… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 14:12:22 2011 +0100 browseui: Convert dialogs to po files. --- dlls/browseui/Makefile.in | 26 +-------------------- dlls/browseui/browseui.rc | 13 ++++++++++ dlls/browseui/rsrc_Da.rc | 35 ----------------------------- dlls/browseui/rsrc_De.rc | 37 ------------------------------ dlls/browseui/rsrc_En.rc | 34 ---------------------------- dlls/browseui/rsrc_Es.rc | 34 ---------------------------- dlls/browseui/rsrc_Fr.rc | 34 ---------------------------- dlls/browseui/rsrc_He.rc | 38 ------------------------------- dlls/browseui/rsrc_Hu.rc | 37 ------------------------------ dlls/browseui/rsrc_It.rc | 37 ------------------------------ dlls/browseui/rsrc_Ja.rc | 37 ------------------------------ dlls/browseui/rsrc_Ko.rc | 37 ------------------------------ dlls/browseui/rsrc_Lt.rc | 37 ------------------------------ dlls/browseui/rsrc_Nl.rc | 34 ---------------------------- dlls/browseui/rsrc_No.rc | 36 ------------------------------ dlls/browseui/rsrc_Pl.rc | 34 ---------------------------- dlls/browseui/rsrc_Pt.rc | 35 ----------------------------- dlls/browseui/rsrc_Ro.rc | 37 ------------------------------ dlls/browseui/rsrc_Ru.rc | 37 ------------------------------ dlls/browseui/rsrc_Si.rc | 36 ------------------------------ dlls/browseui/rsrc_Sr.rc | 53 -------------------------------------------- dlls/browseui/rsrc_Sv.rc | 36 ------------------------------ dlls/browseui/rsrc_Uk.rc | 38 ------------------------------- dlls/browseui/rsrc_Zh.rc | 54 --------------------------------------------- po/ar.po | 20 ++++++++-------- po/bg.po | 20 ++++++++-------- po/ca.po | 20 ++++++++-------- po/cs.po | 20 ++++++++-------- po/da.po | 20 ++++++++-------- po/de.po | 20 ++++++++-------- po/el.po | 20 ++++++++-------- po/en.po | 20 ++++++++-------- po/en_US.po | 20 ++++++++-------- po/eo.po | 20 ++++++++-------- po/es.po | 20 ++++++++-------- po/fa.po | 20 ++++++++-------- po/fi.po | 20 ++++++++-------- po/fr.po | 20 ++++++++-------- po/he.po | 20 ++++++++-------- po/hi.po | 20 ++++++++-------- po/hu.po | 20 ++++++++-------- po/it.po | 20 ++++++++-------- po/ja.po | 20 ++++++++-------- po/ko.po | 20 ++++++++-------- po/lt.po | 20 ++++++++-------- po/ml.po | 20 ++++++++-------- po/nb_NO.po | 20 ++++++++-------- po/nl.po | 20 ++++++++-------- po/or.po | 20 ++++++++-------- po/pa.po | 20 ++++++++-------- po/pl.po | 20 ++++++++-------- po/pt_BR.po | 20 ++++++++-------- po/pt_PT.po | 20 ++++++++-------- po/rm.po | 20 ++++++++-------- po/ro.po | 20 ++++++++-------- po/ru.po | 20 ++++++++-------- po/sk.po | 20 ++++++++-------- po/sl.po | 20 ++++++++-------- po/sr_RS(a)cyrillic.po | 20 ++++++++-------- po/sr_RS(a)latin.po | 20 ++++++++-------- po/sv.po | 20 ++++++++-------- po/te.po | 20 ++++++++-------- po/th.po | 20 ++++++++-------- po/tr.po | 20 ++++++++-------- po/uk.po | 20 ++++++++-------- po/wa.po | 20 ++++++++-------- po/wine.pot | 20 ++++++++-------- po/zh_CN.po | 20 ++++++++-------- po/zh_TW.po | 20 ++++++++-------- 69 files changed, 464 insertions(+), 1302 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdaf3c0017929824fc1bd…

1 0

Alexandre Julliard : browseui: Make sure that common controls are loaded before creating the dialog.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 01593894846537244d938cbbf1c746d5db970efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=01593894846537244d938cbbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 14:15:23 2011 +0100 browseui: Make sure that common controls are loaded before creating the dialog. --- dlls/browseui/Makefile.in | 2 +- dlls/browseui/progressdlg.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index 102b9e6..b463cd7 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -1,5 +1,5 @@ MODULE = browseui.dll -IMPORTS = uuid ole32 user32 advapi32 +IMPORTS = uuid ole32 comctl32 user32 advapi32 EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 2de858c..9b970e2 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -304,6 +304,7 @@ static ULONG WINAPI ProgressDialog_Release(IProgressDialog *iface) static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, HWND hwndParent, IUnknown *punkEnableModeless, DWORD dwFlags, LPCVOID reserved) { + static const INITCOMMONCONTROLSEX init = { sizeof(init), ICC_ANIMATE_CLASS }; ProgressDialog *This = impl_from_IProgressDialog(iface); struct create_params params; HANDLE hThread; @@ -316,6 +317,8 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, if (dwFlags & PROGDLG_NOTIME) FIXME("Flags PROGDLG_NOTIME not supported\n"); + InitCommonControlsEx( &init ); + EnterCriticalSection(&This->cs); if (This->hwnd)

1 0

Alexandre Julliard : gdi32: Store a pointer to the path in the DC and make the path structure opaque.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: a214a3c3dadc58502c59888d1dc3c7cfecf11709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a214a3c3dadc58502c59888d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 27 11:52:12 2011 +0200 gdi32: Store a pointer to the path in the DC and make the path structure opaque. --- dlls/gdi32/dc.c | 4 +- dlls/gdi32/gdi_private.h | 26 +----- dlls/gdi32/path.c | 237 +++++++++++++++++++++++----------------------- 3 files changed, 121 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a214a3c3dadc58502c598…

1 0

Hans Leidekker : msi: Perform a case insensitive match on the volume label.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 3ad3a184d5cbb92dd6fb94c82a27dda23e4cd3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad3a184d5cbb92dd6fb94c82… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 22 10:30:23 2011 +0100 msi: Perform a case insensitive match on the volume label. --- dlls/msi/media.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index c879af1..9162c3b 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -68,7 +68,7 @@ static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root) return FALSE; } - return !strcmpW( mi->volume_label, volume_name ); + return !strcmpiW( mi->volume_label, volume_name ); } static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi)

1 0

Alexandre Julliard : gphoto2: Convert dialogs to po files.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 479857cb1a5d2ced6505503e38308fa32ba4d1b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=479857cb1a5d2ced6505503e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 13:51:09 2011 +0100 gphoto2: Convert dialogs to po files. --- configure | 2 +- configure.ac | 2 +- dlls/gphoto2.ds/Makefile.in | 25 +------ dlls/gphoto2.ds/{gphoto2_En.rc => gphoto2.rc} | 27 +++---- dlls/gphoto2.ds/gphoto2_Da.rc | 58 -------------- dlls/gphoto2.ds/gphoto2_De.rc | 58 -------------- dlls/gphoto2.ds/gphoto2_Es.rc | 59 -------------- dlls/gphoto2.ds/gphoto2_Fr.rc | 60 -------------- dlls/gphoto2.ds/gphoto2_He.rc | 62 --------------- dlls/gphoto2.ds/gphoto2_Hu.rc | 59 -------------- dlls/gphoto2.ds/gphoto2_It.rc | 58 -------------- dlls/gphoto2.ds/gphoto2_Ja.rc | 60 -------------- dlls/gphoto2.ds/gphoto2_Ko.rc | 59 -------------- dlls/gphoto2.ds/gphoto2_Lt.rc | 59 -------------- dlls/gphoto2.ds/gphoto2_Nl.rc | 56 ------------- dlls/gphoto2.ds/gphoto2_No.rc | 56 ------------- dlls/gphoto2.ds/gphoto2_Pl.rc | 57 -------------- dlls/gphoto2.ds/gphoto2_Pt.rc | 104 ------------------------- dlls/gphoto2.ds/gphoto2_Ro.rc | 57 -------------- dlls/gphoto2.ds/gphoto2_Ru.rc | 56 ------------- dlls/gphoto2.ds/gphoto2_Si.rc | 57 -------------- dlls/gphoto2.ds/gphoto2_Sr.rc | 88 --------------------- dlls/gphoto2.ds/gphoto2_Sv.rc | 56 ------------- dlls/gphoto2.ds/gphoto2_Uk.rc | 60 -------------- dlls/gphoto2.ds/gphoto2_Zh.rc | 94 ---------------------- po/ar.po | 42 ++++++++++ po/bg.po | 43 ++++++++++ po/ca.po | 44 +++++++++++ po/cs.po | 43 ++++++++++ po/da.po | 40 ++++++++++ po/de.po | 40 ++++++++++ po/el.po | 41 ++++++++++ po/en.po | 40 ++++++++++ po/en_US.po | 40 ++++++++++ po/eo.po | 47 +++++++++++ po/es.po | 40 ++++++++++ po/fa.po | 42 ++++++++++ po/fi.po | 43 ++++++++++ po/fr.po | 40 ++++++++++ po/he.po | 40 ++++++++++ po/hi.po | 41 ++++++++++ po/hu.po | 40 ++++++++++ po/it.po | 40 ++++++++++ po/ja.po | 40 ++++++++++ po/ko.po | 40 ++++++++++ po/lt.po | 40 ++++++++++ po/ml.po | 41 ++++++++++ po/nb_NO.po | 40 ++++++++++ po/nl.po | 40 ++++++++++ po/or.po | 41 ++++++++++ po/pa.po | 41 ++++++++++ po/pl.po | 40 ++++++++++ po/pt_BR.po | 40 ++++++++++ po/pt_PT.po | 40 ++++++++++ po/rm.po | 42 ++++++++++ po/ro.po | 40 ++++++++++ po/ru.po | 40 ++++++++++ po/sk.po | 42 ++++++++++ po/sl.po | 40 ++++++++++ po/sr_RS(a)cyrillic.po | 40 ++++++++++ po/sr_RS(a)latin.po | 40 ++++++++++ po/sv.po | 40 ++++++++++ po/te.po | 41 ++++++++++ po/th.po | 42 ++++++++++ po/tr.po | 42 ++++++++++ po/uk.po | 40 ++++++++++ po/wa.po | 42 ++++++++++ po/wine.pot | 40 ++++++++++ po/zh_CN.po | 40 ++++++++++ po/zh_TW.po | 40 ++++++++++ 70 files changed, 1856 insertions(+), 1373 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=479857cb1a5d2ced65055…

1 0

Henri Verbeet : wined3d: Recognize the SM4 ushr opcode.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: d695dd3af4502a1e91284b606b97e157f0c75321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d695dd3af4502a1e91284b606… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:38 2011 +0100 wined3d: Recognize the SM4 ushr opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5739733..03b525f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5128,6 +5128,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2GB */ pshader_hw_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, /* WINED3DSIH_UDIV */ NULL, + /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, }; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8e1724c..b1c9b61 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5083,6 +5083,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, /* WINED3DSIH_UDIV */ NULL, + /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, }; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 998b431..5f2448c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -139,6 +139,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_TEXREG2GB */ "texreg2gb", /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", /* WINED3DSIH_UDIV */ "udiv", + /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", }; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b78f03b..5c675c2 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -95,6 +95,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_SQRT = 0x4b, WINED3D_SM4_OP_SINCOS = 0x4d, WINED3D_SM4_OP_UDIV = 0x4e, + WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, }; @@ -182,6 +183,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_SQRT, WINED3DSIH_SQRT, 1, 1}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, 2, 2}, + {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, 1, 2}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e77347..72ffe73 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -512,6 +512,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TEXREG2GB, WINED3DSIH_TEXREG2RGB, WINED3DSIH_UDIV, + WINED3DSIH_USHR, WINED3DSIH_UTOF, WINED3DSIH_TABLE_SIZE };

1 0

Henri Verbeet : wined3d: Recognize the SM4 xor opcode.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 14cf780fde834cadee7fd0ca87b73345323572ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=14cf780fde834cadee7fd0ca8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:39 2011 +0100 wined3d: Recognize the SM4 xor opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 03b525f..451d34a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5130,6 +5130,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, + /* WINED3DSIH_XOR */ NULL, }; static BOOL get_bool_const(const struct wined3d_shader_instruction *ins, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b1c9b61..68e2f8f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5085,6 +5085,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, + /* WINED3DSIH_XOR */ NULL, }; static void shader_glsl_handle_instruction(const struct wined3d_shader_instruction *ins) { diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5f2448c..d7ba818 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -141,6 +141,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_UDIV */ "udiv", /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", + /* WINED3DSIH_XOR */ "xor", }; static const char * const semantic_names[] = diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5c675c2..25bb72a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -97,6 +97,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_UDIV = 0x4e, WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, + WINED3D_SM4_OP_XOR = 0x57, }; enum wined3d_sm4_register_type @@ -185,6 +186,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, 2, 2}, {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, 1, 2}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, + {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, 1, 2}, }; static const enum wined3d_shader_register_type register_type_table[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 72ffe73..ee29934 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -514,6 +514,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_UDIV, WINED3DSIH_USHR, WINED3DSIH_UTOF, + WINED3DSIH_XOR, WINED3DSIH_TABLE_SIZE };

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DVIEWPORT typedef.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: be8917cd914b2d10972da945d21d3092996d5817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8917cd914b2d10972da945d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:40 2011 +0100 wined3d: Get rid of the WINED3DVIEWPORT typedef. --- dlls/d3d8/device.c | 8 +++--- dlls/d3d9/device.c | 8 +++--- dlls/ddraw/device.c | 8 +++--- dlls/wined3d/device.c | 42 ++++++++++++++++++++-------------------- dlls/wined3d/state.c | 34 ++++++++++++++++---------------- dlls/wined3d/stateblock.c | 12 +++++----- dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d_private.h | 6 ++-- include/wine/wined3d.h | 20 +++++++++--------- 9 files changed, 71 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be8917cd914b2d10972da…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DGAMMARAMP typedef.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 2e1c0d83c14c57331ef103478ad28b82148d81db URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1c0d83c14c57331ef103478… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:41 2011 +0100 wined3d: Get rid of the WINED3DGAMMARAMP typedef. --- dlls/d3d8/device.c | 8 ++++---- dlls/d3d9/device.c | 8 ++++---- dlls/ddraw/surface.c | 9 +++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 12 ++++++------ 7 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 049c4e0..869da69 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -661,9 +661,9 @@ static void WINAPI IDirect3DDevice8Impl_SetGammaRamp(IDirect3DDevice8 *iface, DW TRACE("iface %p, flags %#x, ramp %p.\n", iface, Flags, pRamp); - /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ + /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ wined3d_mutex_lock(); - wined3d_device_set_gamma_ramp(This->wined3d_device, 0, Flags, (const WINED3DGAMMARAMP *)pRamp); + wined3d_device_set_gamma_ramp(This->wined3d_device, 0, Flags, (const struct wined3d_gamma_ramp *)pRamp); wined3d_mutex_unlock(); } @@ -673,9 +673,9 @@ static void WINAPI IDirect3DDevice8Impl_GetGammaRamp(IDirect3DDevice8 *iface, D3 TRACE("iface %p, ramp %p.\n", iface, pRamp); - /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ + /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ wined3d_mutex_lock(); - wined3d_device_get_gamma_ramp(This->wined3d_device, 0, (WINED3DGAMMARAMP *)pRamp); + wined3d_device_get_gamma_ramp(This->wined3d_device, 0, (struct wined3d_gamma_ramp *)pRamp); wined3d_mutex_unlock(); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 29dd180..2b47eb4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -668,9 +668,9 @@ static void WINAPI IDirect3DDevice9Impl_SetGammaRamp(IDirect3DDevice9Ex *iface, TRACE("iface %p, swapchain %u, flags %#x, ramp %p.\n", iface, iSwapChain, Flags, pRamp); - /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ + /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ wined3d_mutex_lock(); - wined3d_device_set_gamma_ramp(This->wined3d_device, iSwapChain, Flags, (const WINED3DGAMMARAMP *)pRamp); + wined3d_device_set_gamma_ramp(This->wined3d_device, iSwapChain, Flags, (const struct wined3d_gamma_ramp *)pRamp); wined3d_mutex_unlock(); } @@ -681,9 +681,9 @@ static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(IDirect3DDevice9Ex *iface, TRACE("iface %p, swapchain %u, ramp %p.\n", iface, iSwapChain, pRamp); - /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ + /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ wined3d_mutex_lock(); - wined3d_device_get_gamma_ramp(This->wined3d_device, iSwapChain, (WINED3DGAMMARAMP *)pRamp); + wined3d_device_get_gamma_ramp(This->wined3d_device, iSwapChain, (struct wined3d_gamma_ramp *)pRamp); wined3d_mutex_unlock(); } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 864b3ba..c7f92fd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4502,8 +4502,8 @@ static HRESULT WINAPI ddraw_gamma_control_GetGammaRamp(IDirectDrawGammaControl * wined3d_mutex_lock(); if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - /* Note: DDGAMMARAMP is compatible with WINED3DGAMMARAMP. */ - wined3d_device_get_gamma_ramp(surface->ddraw->wined3d_device, 0, (WINED3DGAMMARAMP *)gamma_ramp); + /* Note: DDGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ + wined3d_device_get_gamma_ramp(surface->ddraw->wined3d_device, 0, (struct wined3d_gamma_ramp *)gamma_ramp); } else { @@ -4544,8 +4544,9 @@ static HRESULT WINAPI ddraw_gamma_control_SetGammaRamp(IDirectDrawGammaControl * wined3d_mutex_lock(); if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - /* Note: DDGAMMARAMP is compatible with WINED3DGAMMARAMP */ - wined3d_device_set_gamma_ramp(surface->ddraw->wined3d_device, 0, flags, (WINED3DGAMMARAMP *)gamma_ramp); + /* Note: DDGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ + wined3d_device_set_gamma_ramp(surface->ddraw->wined3d_device, + 0, flags, (struct wined3d_gamma_ramp *)gamma_ramp); } else { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1ab205d..7e70841 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5713,7 +5713,7 @@ HRESULT CDECL wined3d_device_get_creation_parameters(const struct wined3d_device } void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, - UINT swapchain_idx, DWORD flags, const WINED3DGAMMARAMP *ramp) + UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp) { struct wined3d_swapchain *swapchain; @@ -5728,7 +5728,7 @@ void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, } void CDECL wined3d_device_get_gamma_ramp(const struct wined3d_device *device, - UINT swapchain_idx, WINED3DGAMMARAMP *ramp) + UINT swapchain_idx, struct wined3d_gamma_ramp *ramp) { struct wined3d_swapchain *swapchain; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d09c9d0..fbf19d9 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -254,7 +254,7 @@ HRESULT CDECL wined3d_swapchain_get_present_parameters(const struct wined3d_swap } HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, - DWORD flags, const WINED3DGAMMARAMP *ramp) + DWORD flags, const struct wined3d_gamma_ramp *ramp) { HDC dc; @@ -271,7 +271,7 @@ HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *s } HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain, - WINED3DGAMMARAMP *ramp) + struct wined3d_gamma_ramp *ramp) { HDC dc; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a43830e..9e44f69 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2444,7 +2444,7 @@ struct wined3d_swapchain WINED3DPRESENT_PARAMETERS presentParms; DWORD orig_width, orig_height; enum wined3d_format_id orig_fmt; - WINED3DGAMMARAMP orig_gamma; + struct wined3d_gamma_ramp orig_gamma; BOOL render_to_fbo; const struct wined3d_format *ds_format; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index abf2c61..f228e44 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1583,12 +1583,12 @@ struct wined3d_viewport float max_z; }; -typedef struct _WINED3DGAMMARAMP +struct wined3d_gamma_ramp { WORD red[256]; WORD green[256]; WORD blue[256]; -} WINED3DGAMMARAMP; +}; typedef struct _WINED3DLINEPATTERN { @@ -2211,7 +2211,7 @@ HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *dev HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_surface *dst_surface); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, - UINT swapchain_idx, WINED3DGAMMARAMP *ramp); + UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); HRESULT __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, struct wined3d_buffer **index_buffer); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, @@ -2290,7 +2290,7 @@ HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device HRESULT __cdecl wined3d_device_set_display_mode(struct wined3d_device *device, UINT swapchain_idx, const struct wined3d_display_mode *mode); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, - UINT swapchain_idx, DWORD flags, const WINED3DGAMMARAMP *ramp); + UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); HRESULT __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device, @@ -2457,7 +2457,7 @@ HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchai HRESULT __cdecl wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, struct wined3d_surface *dst_surface); HRESULT __cdecl wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain, - WINED3DGAMMARAMP *ramp); + struct wined3d_gamma_ramp *ramp); void * __cdecl wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_get_present_parameters(const struct wined3d_swapchain *swapchain, WINED3DPRESENT_PARAMETERS *present_parameters); @@ -2468,7 +2468,7 @@ HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, - DWORD flags, const WINED3DGAMMARAMP *ramp); + DWORD flags, const struct wined3d_gamma_ramp *ramp); HRESULT __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture,

1 0

Frédéric Delanoy : comctl32: Avoid hardcoding array lengths.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 954e6eba7e2c4df401e3c1de4bb23216314c349c URL: http://source.winehq.org/git/wine.git/?a=commit;h=954e6eba7e2c4df401e3c1de4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 21 19:19:46 2011 +0100 comctl32: Avoid hardcoding array lengths. --- dlls/comctl32/ipaddress.c | 2 +- dlls/comdlg32/printdlg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index e51ae08..97b6a0f 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -339,7 +339,7 @@ static BOOL IPADDRESS_SetRange (IPADDRESS_INFO *infoPtr, int index, WORD range) static void IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) { - WCHAR nil[1] = { 0 }; + static const WCHAR nil[] = { 0 }; int i; TRACE("\n"); diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index ee4dab2..aea5224 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2433,7 +2433,7 @@ static WCHAR get_decimal_sep(void) if(!sep) { - WCHAR buf[2] = {'.',0}; + WCHAR buf[] = {'.', 0}; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buf, sizeof(buf) / sizeof(buf[0])); sep = buf[0]; }

1 0