October 2011 - Wine-commits

Michael Stefaniuc : include: Fix numeric constants in digitalv. h for LLP64 compilers.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: f9f9750586a38879187d60f9352cb756df317175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f9750586a38879187d60f93… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 29 00:30:12 2011 +0200 include: Fix numeric constants in digitalv.h for LLP64 compilers. Fixup for 4b6ad8c21923164fce70efd3d175808e2fb26113. --- include/digitalv.h | 506 ++++++++++++++++++++++++++-------------------------- 1 files changed, 253 insertions(+), 253 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9f9750586a38879187d6…

1 0

Michael Stefaniuc : include: Fix numeric constants in dinput. h for LLP64 compilers.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 8f923e38af8a1181ec928cf69687619af66c71a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f923e38af8a1181ec928cf69… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 29 00:38:03 2011 +0200 include: Fix numeric constants in dinput.h for LLP64 compilers. Fixup for f334333cb56a23143f447f7b893f8de928d7091d. --- include/dinput.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index bd9d898..353ec55 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -167,20 +167,20 @@ DECL_WINELIB_TYPE_AW(LPDIRECTINPUTDEVICE8) #define DIERR_READONLY E_ACCESSDENIED #define DIERR_HANDLEEXISTS E_ACCESSDENIED #ifndef E_PENDING -#define E_PENDING 0x8000000A +#define E_PENDING __MSABI_LONG(0x8000000A) #endif -#define DIERR_INSUFFICIENTPRIVS 0x80040200 -#define DIERR_DEVICEFULL 0x80040201 -#define DIERR_MOREDATA 0x80040202 -#define DIERR_NOTDOWNLOADED 0x80040203 -#define DIERR_HASEFFECTS 0x80040204 -#define DIERR_NOTEXCLUSIVEACQUIRED 0x80040205 -#define DIERR_INCOMPLETEEFFECT 0x80040206 -#define DIERR_NOTBUFFERED 0x80040207 -#define DIERR_EFFECTPLAYING 0x80040208 -#define DIERR_UNPLUGGED 0x80040209 -#define DIERR_REPORTFULL 0x8004020A -#define DIERR_MAPFILEFAIL 0x8004020B +#define DIERR_INSUFFICIENTPRIVS __MSABI_LONG(0x80040200) +#define DIERR_DEVICEFULL __MSABI_LONG(0x80040201) +#define DIERR_MOREDATA __MSABI_LONG(0x80040202) +#define DIERR_NOTDOWNLOADED __MSABI_LONG(0x80040203) +#define DIERR_HASEFFECTS __MSABI_LONG(0x80040204) +#define DIERR_NOTEXCLUSIVEACQUIRED __MSABI_LONG(0x80040205) +#define DIERR_INCOMPLETEEFFECT __MSABI_LONG(0x80040206) +#define DIERR_NOTBUFFERED __MSABI_LONG(0x80040207) +#define DIERR_EFFECTPLAYING __MSABI_LONG(0x80040208) +#define DIERR_UNPLUGGED __MSABI_LONG(0x80040209) +#define DIERR_REPORTFULL __MSABI_LONG(0x8004020A) +#define DIERR_MAPFILEFAIL __MSABI_LONG(0x8004020B) #define DIENUM_STOP 0 #define DIENUM_CONTINUE 1

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (winuser.h).
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 1435b5ecd73b56fe87376ef5cbf5c90d39035030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1435b5ecd73b56fe87376ef5c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 31 00:27:15 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (winuser.h). --- dlls/user32/tests/scroll.c | 8 +- dlls/user32/tests/win.c | 2 +- dlls/user32/win.c | 4 +- include/winuser.h | 318 ++++++++++++++++++++++---------------------- 4 files changed, 166 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1435b5ecd73b56fe87376…

1 0

Alexandre Julliard : wrc: Print warnings for mismatched dialogs during po file generation.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 413f5ccba5a344a10ee8c567e713d402de027353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=413f5ccba5a344a10ee8c567e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 11:04:36 2011 +0100 wrc: Print warnings for mismatched dialogs during po file generation. --- tools/wrc/po.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 82 insertions(+), 11 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 9cb2b42..f44c395 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -559,22 +559,22 @@ static po_file_t get_po_file( const language_t *lang ) return po_file->po; } -static char *get_po_file_name( const language_t *lang ) +static const char *get_language_name( const language_t *lang ) { + static char name[20]; unsigned int i; - char name[40]; - sprintf( name, "%02x-%02x", lang->id, lang->sub ); for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) - { if (languages[i].id == lang->id && languages[i].sub == lang->sub) - { - strcpy( name, languages[i].name ); - break; - } - } - strcat( name, ".po" ); - return xstrdup( name ); + return languages[i].name; + + sprintf( name, "%02x-%02x", lang->id, lang->sub ); + return name; +} + +static char *get_po_file_name( const language_t *lang ) +{ + return strmake( "%s.po", get_language_name( lang ) ); } static unsigned int flush_po_files( const char *output_name ) @@ -658,6 +658,75 @@ static void add_pot_dialog( po_file_t po, const resource_t *res ) add_pot_dialog_controls( po, dlg->controls ); } +static void compare_dialogs( const dialog_t *english_dlg, const dialog_t *dlg ) +{ + const control_t *english_ctrl, *ctrl; + unsigned int style = 0, exstyle = 0, english_style = 0, english_exstyle = 0; + char *name; + char *title = english_dlg->title ? convert_msgid_ascii( english_dlg->title, 0 ) : xstrdup("??"); + + if (english_dlg->width != dlg->width || english_dlg->height != dlg->height) + warning( "%s: dialog %s doesn't have the same size (%d,%d vs %d,%d)\n", + get_language_name( dlg->lvc.language ), title, dlg->width, dlg->height, + english_dlg->width, english_dlg->height ); + + if (dlg->gotstyle) style = dlg->style->or_mask; + if (dlg->gotexstyle) exstyle = dlg->exstyle->or_mask; + if (english_dlg->gotstyle) english_style = english_dlg->style->or_mask; + if (english_dlg->gotexstyle) english_exstyle = english_dlg->exstyle->or_mask; + if (english_style != style) + warning( "%s: dialog %s doesn't have the same style (%08x vs %08x)\n", + get_language_name( dlg->lvc.language ), title, style, english_style ); + if (english_exstyle != exstyle) + warning( "%s: dialog %s doesn't have the same exstyle (%08x vs %08x)\n", + get_language_name( dlg->lvc.language ), title, exstyle, english_exstyle ); + + if (english_dlg->font || dlg->font) + { + int size = 0, english_size = 0; + char *font = NULL, *english_font = NULL; + + if (english_dlg->font) + { + english_font = convert_msgid_ascii( english_dlg->font->name, 0 ); + english_size = english_dlg->font->size; + } + if (dlg->font) + { + font = convert_msgid_ascii( dlg->font->name, 0 ); + size = dlg->font->size; + } + + if (!english_font || !font || strcasecmp( english_font, font ) || english_size != size) + warning( "%s: dialog %s doesn't have the same font (%s %u vs %s %u)\n", + get_language_name(dlg->lvc.language), title, + english_font ? english_font : "default", english_size, + font ? font : "default", size ); + free( font ); + free( english_font ); + } + english_ctrl = english_dlg->controls; + ctrl = dlg->controls; + for ( ; english_ctrl && ctrl; ctrl = ctrl->next, english_ctrl = english_ctrl->next ) + { + if (control_has_title( english_ctrl )) + name = convert_msgid_ascii( english_ctrl->title->name.s_name, 0 ); + else + name = strmake( "%d", ctrl->id ); + + if (english_ctrl->width != ctrl->width || english_ctrl->height != ctrl->height) + warning( "%s: dialog %s control %s doesn't have the same size (%d,%d vs %d,%d)\n", + get_language_name( dlg->lvc.language ), title, name, + ctrl->width, ctrl->height, english_ctrl->width, english_ctrl->height ); + if (english_ctrl->x != ctrl->x || english_ctrl->y != ctrl->y) + warning( "%s: dialog %s control %s doesn't have the same position (%d,%d vs %d,%d)\n", + get_language_name( dlg->lvc.language ), title, name, + ctrl->x, ctrl->y, english_ctrl->x, english_ctrl->y ); + free( name ); + } + free( title ); +} + static void add_po_dialog_controls( po_file_t po, const control_t *english_ctrl, const control_t *ctrl, const language_t *lang ) { @@ -677,6 +746,8 @@ static void add_po_dialog( const resource_t *english, const resource_t *res ) const dialog_t *dlg = res->res.dlg; po_file_t po = get_po_file( dlg->lvc.language ); + compare_dialogs( english_dlg, dlg ); + if (english_dlg->title && dlg->title) add_po_string( po, english_dlg->title, dlg->title, dlg->lvc.language ); if (english_dlg->font && dlg->font)

1 0

Alexandre Julliard : wrc: Set the WS_EX_LAYOUTRTL flag when translating a dialog to a RTL language.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: f13f25343cc30a70e2fc595f7213a2014932f914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13f25343cc30a70e2fc595f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 11:22:23 2011 +0100 wrc: Set the WS_EX_LAYOUTRTL flag when translating a dialog to a RTL language. --- tools/wrc/po.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index f44c395..d93c1b7 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -59,6 +59,11 @@ static int is_english( const language_t *lan ) return lan->id == LANG_ENGLISH && lan->sub == SUBLANG_DEFAULT; } +static int is_rtl_language( const language_t *lan ) +{ + return lan->id == LANG_ARABIC || lan->id == LANG_HEBREW || lan->id == LANG_PERSIAN; +} + static version_t *get_dup_version( language_t *lang ) { /* English "translations" take precedence over the original rc contents */ @@ -674,6 +679,8 @@ static void compare_dialogs( const dialog_t *english_dlg, const dialog_t *dlg ) if (dlg->gotexstyle) exstyle = dlg->exstyle->or_mask; if (english_dlg->gotstyle) english_style = english_dlg->style->or_mask; if (english_dlg->gotexstyle) english_exstyle = english_dlg->exstyle->or_mask; + if (is_rtl_language( dlg->lvc.language )) english_exstyle |= WS_EX_LAYOUTRTL; + if (english_style != style) warning( "%s: dialog %s doesn't have the same style (%08x vs %08x)\n", get_language_name( dlg->lvc.language ), title, style, english_style ); @@ -1061,6 +1068,14 @@ static stringtable_t *translate_stringtable( stringtable_t *stt, language_t *lan static void translate_dialog( dialog_t *dlg, dialog_t *new, int *found ) { if (dlg->title) new->title = translate_string( dlg->title, found ); + if (is_rtl_language( new->lvc.language )) + { + new->gotexstyle = TRUE; + if (dlg->gotexstyle) + new->exstyle = new_style( dlg->exstyle->or_mask | WS_EX_LAYOUTRTL, dlg->exstyle->and_mask ); + else + new->exstyle = new_style( WS_EX_LAYOUTRTL, 0 ); + } if (dlg->font) { new->font = xmalloc( sizeof(*dlg->font) );

1 0

Alexandre Julliard : wrc: Increase the font size when translating a dialog to a language that needs a larger font .
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 1eeaa874b35d60413a378b430a3093ceee75ab71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eeaa874b35d60413a378b430… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 11:28:52 2011 +0100 wrc: Increase the font size when translating a dialog to a language that needs a larger font. --- tools/wrc/po.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index d93c1b7..1882d78 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -64,6 +64,11 @@ static int is_rtl_language( const language_t *lan ) return lan->id == LANG_ARABIC || lan->id == LANG_HEBREW || lan->id == LANG_PERSIAN; } +static int uses_larger_font( const language_t *lan ) +{ + return lan->id == LANG_CHINESE || lan->id == LANG_JAPANESE || lan->id == LANG_KOREAN; +} + static version_t *get_dup_version( language_t *lang ) { /* English "translations" take precedence over the original rc contents */ @@ -659,7 +664,6 @@ static void add_pot_dialog( po_file_t po, const resource_t *res ) const dialog_t *dlg = res->res.dlg; if (dlg->title) add_po_string( po, dlg->title, NULL, NULL ); - if (dlg->font) add_po_string( po, dlg->font->name, NULL, NULL ); add_pot_dialog_controls( po, dlg->controls ); } @@ -703,6 +707,7 @@ static void compare_dialogs( const dialog_t *english_dlg, const dialog_t *dlg ) font = convert_msgid_ascii( dlg->font->name, 0 ); size = dlg->font->size; } + if (uses_larger_font( dlg->lvc.language )) english_size++; if (!english_font || !font || strcasecmp( english_font, font ) || english_size != size) warning( "%s: dialog %s doesn't have the same font (%s %u vs %s %u)\n", @@ -757,8 +762,6 @@ static void add_po_dialog( const resource_t *english, const resource_t *res ) if (english_dlg->title && dlg->title) add_po_string( po, english_dlg->title, dlg->title, dlg->lvc.language ); - if (english_dlg->font && dlg->font) - add_po_string( po, english_dlg->font->name, dlg->font->name, dlg->lvc.language ); add_po_dialog_controls( po, english_dlg->controls, dlg->controls, dlg->lvc.language ); } @@ -1079,8 +1082,9 @@ static void translate_dialog( dialog_t *dlg, dialog_t *new, int *found ) if (dlg->font) { new->font = xmalloc( sizeof(*dlg->font) ); - new->font = dlg->font; - new->font->name = translate_string( dlg->font->name, found ); + *new->font = *dlg->font; + if (uses_larger_font( new->lvc.language )) new->font->size++; + new->font->name = convert_string( dlg->font->name, str_unicode, 1252 ); } new->controls = translate_controls( dlg->controls, found ); }

1 0

Alexandre Julliard : winhlp32: Convert dialogs to po files.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 4707afc74c7a91c5a4be0e8f66ca5631ee185b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4707afc74c7a91c5a4be0e8f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 29 12:12:23 2011 +0200 winhlp32: Convert dialogs to po files. --- po/ar.po | 13 +++++++++++ po/bg.po | 15 ++++++++++++ po/ca.po | 15 ++++++++++++ po/cs.po | 23 +++++++++++++++++++ po/da.po | 12 ++++++++++ po/de.po | 12 ++++++++++ po/el.po | 14 ++++++++++++ po/en.po | 12 ++++++++++ po/en_US.po | 12 ++++++++++ po/eo.po | 15 ++++++++++++ po/es.po | 12 ++++++++++ po/fa.po | 13 +++++++++++ po/fi.po | 15 ++++++++++++ po/fr.po | 12 ++++++++++ po/he.po | 12 ++++++++++ po/hi.po | 12 ++++++++++ po/hu.po | 15 ++++++++++++ po/it.po | 12 ++++++++++ po/ja.po | 12 ++++++++++ po/ko.po | 12 ++++++++++ po/lt.po | 12 ++++++++++ po/ml.po | 12 ++++++++++ po/nb_NO.po | 12 ++++++++++ po/nl.po | 12 ++++++++++ po/or.po | 12 ++++++++++ po/pa.po | 12 ++++++++++ po/pl.po | 12 ++++++++++ po/pt_BR.po | 12 ++++++++++ po/pt_PT.po | 12 ++++++++++ po/rm.po | 14 ++++++++++++ po/ro.po | 12 ++++++++++ po/ru.po | 12 ++++++++++ po/sk.po | 14 ++++++++++++ po/sl.po | 12 ++++++++++ po/sr_RS(a)cyrillic.po | 15 ++++++++++++ po/sr_RS(a)latin.po | 12 ++++++++++ po/sv.po | 12 ++++++++++ po/te.po | 12 ++++++++++ po/th.po | 14 ++++++++++++ po/tr.po | 23 +++++++++++++++++++ po/uk.po | 12 ++++++++++ po/wa.po | 15 ++++++++++++ po/wine.pot | 12 ++++++++++ po/zh_CN.po | 12 ++++++++++ po/zh_TW.po | 19 ++++++++++++++++ programs/winhlp32/Da.rc | 44 ------------------------------------- programs/winhlp32/De.rc | 42 ----------------------------------- programs/winhlp32/En.rc | 40 ---------------------------------- programs/winhlp32/Es.rc | 41 ----------------------------------- programs/winhlp32/Fr.rc | 46 --------------------------------------- programs/winhlp32/He.rc | 47 ---------------------------------------- programs/winhlp32/It.rc | 43 ------------------------------------ programs/winhlp32/Ja.rc | 43 ------------------------------------ programs/winhlp32/Ko.rc | 42 ----------------------------------- programs/winhlp32/Lt.rc | 42 ----------------------------------- programs/winhlp32/Makefile.in | 25 +-------------------- programs/winhlp32/Nl.rc | 42 ----------------------------------- programs/winhlp32/No.rc | 39 --------------------------------- programs/winhlp32/Pl.rc | 42 ----------------------------------- programs/winhlp32/Pt.rc | 48 ----------------------------------------- programs/winhlp32/Ro.rc | 43 ------------------------------------ programs/winhlp32/Ru.rc | 42 ----------------------------------- programs/winhlp32/Si.rc | 41 ----------------------------------- programs/winhlp32/Sr.rc | 44 ------------------------------------- programs/winhlp32/Sv.rc | 43 ------------------------------------ programs/winhlp32/Uk.rc | 47 ---------------------------------------- programs/winhlp32/Zh.rc | 45 -------------------------------------- programs/winhlp32/winhlp32.rc | 16 +++++++++++++ 68 files changed, 617 insertions(+), 930 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4707afc74c7a91c5a4be0…

1 0

Henri Verbeet : ddraw: Implement ddraw_surface7_BltFast() on top of wined3d_surface_blt().
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 1bf36a3f40fc47009b59b3bbee17b74a12d6ae73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf36a3f40fc47009b59b3bbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 30 18:06:34 2011 +0100 ddraw: Implement ddraw_surface7_BltFast() on top of wined3d_surface_blt(). --- dlls/ddraw/surface.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9f85153..3860959 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3700,6 +3700,8 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d IDirectDrawSurfaceImpl *src = unsafe_impl_from_IDirectDrawSurface7(Source); DWORD src_w, src_h, dst_w, dst_h; HRESULT hr = DD_OK; + DWORD flags = 0; + RECT dst_rect; TRACE("iface %p, dst_x %u, dst_y %u, src_surface %p, src_rect %s, flags %#x.\n", iface, dstx, dsty, Source, wine_dbgstr_rect(rsrc), trans); @@ -3728,17 +3730,24 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d return DDERR_INVALIDRECT; } + SetRect(&dst_rect, dstx, dsty, dstx + src_w, dsty + src_h); + if (trans & DDBLTFAST_SRCCOLORKEY) + flags |= WINEDDBLT_KEYSRC; + if (trans & DDBLTFAST_DESTCOLORKEY) + flags |= WINEDDBLT_KEYDEST; + if (trans & DDBLTFAST_WAIT) + flags |= WINEDDBLT_WAIT; + if (trans & DDBLTFAST_DONOTWAIT) + flags |= WINEDDBLT_DONOTWAIT; + EnterCriticalSection(&ddraw_cs); if (src->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) hr = ddraw_surface_update_frontbuffer(src, rsrc, TRUE); if (SUCCEEDED(hr)) - hr = wined3d_surface_bltfast(This->wined3d_surface, dstx, dsty, - src->wined3d_surface, rsrc, trans); + hr = wined3d_surface_blt(This->wined3d_surface, &dst_rect, + src->wined3d_surface, rsrc, flags, NULL, WINED3DTEXF_POINT); if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) - { - RECT dst_rect = {dstx, dsty, dstx + src_w, dsty + src_h}; hr = ddraw_surface_update_frontbuffer(This, &dst_rect, FALSE); - } LeaveCriticalSection(&ddraw_cs); switch(hr) {

1 0

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

31 Oct '11

Module: wine Branch: master Commit: 76b5b8a67bc381132ea7b9b55cd37a3d0f377112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b5b8a67bc381132ea7b9b55… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 30 18:06:35 2011 +0100 wined3d: Make the device parameter to wined3d_event_query_finish() const. --- dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index ae03479..d88d182 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -111,7 +111,7 @@ static enum wined3d_event_query_result wined3d_event_query_test(const struct win } enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, - struct wined3d_device *device) + const struct wined3d_device *device) { struct wined3d_context *context; const struct wined3d_gl_info *gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 25a24e5..73f1ea1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1045,7 +1045,7 @@ enum wined3d_event_query_result void wined3d_event_query_destroy(struct wined3d_event_query *query) DECLSPEC_HIDDEN; enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, - struct wined3d_device *device) DECLSPEC_HIDDEN; + const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_event_query_issue(struct wined3d_event_query *query, struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0

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

31 Oct '11

Module: wine Branch: master Commit: f8e7b1e80c578b5cff3248f4ce5d5561507f7a95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e7b1e80c578b5cff3248f4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 30 18:06:36 2011 +0100 wined3d: Make the device parameter to wined3d_event_query_issue() const. --- dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index d88d182..79572a2 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -179,7 +179,7 @@ enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_ return ret; } -void wined3d_event_query_issue(struct wined3d_event_query *query, struct wined3d_device *device) +void wined3d_event_query_issue(struct wined3d_event_query *query, const struct wined3d_device *device) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 73f1ea1..1a08c5b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1046,7 +1046,7 @@ enum wined3d_event_query_result void wined3d_event_query_destroy(struct wined3d_event_query *query) DECLSPEC_HIDDEN; enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN; -void wined3d_event_query_issue(struct wined3d_event_query *query, struct wined3d_device *device) DECLSPEC_HIDDEN; +void wined3d_event_query_issue(struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; struct wined3d_context

1 0