February 2009 - Wine-commits

Anders Jonsson : browseui: Add Swedish translation.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 161d52a2858f52a8366ef04efdf061d489063f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=161d52a2858f52a8366ef04ef… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Feb 18 22:57:26 2009 +0100 browseui: Add Swedish translation. --- dlls/browseui/rsrc.rc | 1 + dlls/browseui/rsrc_Sv.rc | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/rsrc.rc b/dlls/browseui/rsrc.rc index 4b77cb3..8ad4672 100644 --- a/dlls/browseui/rsrc.rc +++ b/dlls/browseui/rsrc.rc @@ -36,4 +36,5 @@ #include "rsrc_Ro.rc" #include "rsrc_Ru.rc" #include "rsrc_Si.rc" +#include "rsrc_Sv.rc" #include "rsrc_Zh.rc" diff --git a/dlls/browseui/rsrc_Sv.rc b/dlls/browseui/rsrc_Sv.rc new file mode 100644 index 0000000..795f737 --- /dev/null +++ b/dlls/browseui/rsrc_Sv.rc @@ -0,0 +1,40 @@ +/* + * Swedish language support + * + * Copyright 2009 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 + */ + + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CANCELLING "Avbryter..." +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "&Avbryt", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +}

1 0

Michael Stefaniuc : imaadp32.acm: Don' t truncate a pointer by casting it to a DWORD.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 0ca2d32682657232ba08d3cfcc5a76060980692b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca2d32682657232ba08d3cfc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 22:46:59 2009 +0100 imaadp32.acm: Don't truncate a pointer by casting it to a DWORD. --- dlls/imaadp32.acm/imaadp32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index f784f59..dd3cc5d 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -688,7 +688,7 @@ static LRESULT ADPCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) aad = HeapAlloc(GetProcessHeap(), 0, sizeof(AcmAdpcmData)); if (aad == 0) return MMSYSERR_NOMEM; - adsi->dwDriver = (DWORD)aad; + adsi->dwDriver = (DWORD_PTR)aad; if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM)

1 0

Michael Stefaniuc : qcap: Remove superfluous pointer casts.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 1f56ce42e32b780e3a4a83a336d8b757db6bbef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f56ce42e32b780e3a4a83a33… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 22:46:51 2009 +0100 qcap: Remove superfluous pointer casts. --- dlls/qcap/capturegraph.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index b858762..7294d5d 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -78,9 +78,9 @@ static inline CaptureGraphImpl *impl_from_ICaptureGraphBuilder2( ICaptureGraphBu /* converts This to an interface pointer */ -#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl2) -#define _ICaptureGraphBuilder_(This) (ICaptureGraphBuilder*)&(This->lpVtbl) -#define _ICaptureGraphBuilder2_(This) (ICaptureGraphBuilder2*)&(This->lpVtbl2) +#define _IUnknown_(This) (&(This)->lpVtbl2) +#define _ICaptureGraphBuilder_(This) (&(This)->lpVtbl) +#define _ICaptureGraphBuilder2_(This) ((ICaptureGraphBuilder2*)&(This)->lpVtbl2) IUnknown * CALLBACK QCAP_createCaptureGraphBuilder2(IUnknown *pUnkOuter,

1 0

Michael Stefaniuc : shell32: Remove superfluous pointer casts from macros.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 8324ed6cc956dab82f983303d47613baf2f57064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8324ed6cc956dab82f983303d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 22:45:59 2009 +0100 shell32: Remove superfluous pointer casts from macros. --- dlls/shell32/autocomplete.c | 6 +++--- dlls/shell32/cpanelfolder.c | 18 +++++++++--------- dlls/shell32/dragdrophelper.c | 4 ++-- dlls/shell32/shfldr_fs.c | 18 +++++++++--------- dlls/shell32/shfldr_mycomp.c | 12 ++++++------ dlls/shell32/shfldr_netplaces.c | 6 +++--- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 2057b25..7646dee 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -84,9 +84,9 @@ static const IAutoCompleteDropDownVtbl acdropdownvt; /* converts This to an interface pointer */ -#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) -#define _IAutoComplete2_(This) (IAutoComplete2*)&(This->lpVtbl) -#define _IAutoCompleteDropDown_(This) (IAutoCompleteDropDown*)&(This->lpDropDownVtbl) +#define _IUnknown_(This) ((IUnknown*)&(This)->lpVtbl) +#define _IAutoComplete2_(This) ((IAutoComplete2*)&(This)->lpVtbl) +#define _IAutoCompleteDropDown_(This) (&(This)->lpDropDownVtbl) static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDropDown *iface) { diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 5ef78af..2e4e683 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -96,15 +96,15 @@ static inline ICPanelImpl *impl_from_IShellExecuteHookA( IShellExecuteHookA *ifa /* converts This to an interface pointer */ -#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) -#define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) -#define _IShellFolder2_(This) (IShellFolder2*)&(This->lpVtbl) - -#define _IPersist_(This) (IPersist*)&(This->lpVtblPersistFolder2) -#define _IPersistFolder_(This) (IPersistFolder*)&(This->lpVtblPersistFolder2) -#define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2) -#define _IShellExecuteHookW_(This) (IShellExecuteHookW*)&(This->lpVtblShellExecuteHookW) -#define _IShellExecuteHookA_(This) (IShellExecuteHookA*)&(This->lpVtblShellExecuteHookA) +#define _IUnknown_(This) ((IUnknown*)&(This)->lpVtbl) +#define _IShellFolder_(This) ((IShellFolder*)&(This)->lpVtbl) +#define _IShellFolder2_(This) (&(This)->lpVtbl) + +#define _IPersist_(This) (&(This)->lpVtblPersistFolder2) +#define _IPersistFolder_(This) (&(This)->lpVtblPersistFolder2) +#define _IPersistFolder2_(This) (&(This)->lpVtblPersistFolder2) +#define _IShellExecuteHookW_(This) (&(This)->lpVtblShellExecuteHookW) +#define _IShellExecuteHookA_(This) (&(This)->lpVtblShellExecuteHookA) /*********************************************************************** * IShellFolder [ControlPanel] implementation diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c index 82ad0d9..5015722 100644 --- a/dlls/shell32/dragdrophelper.c +++ b/dlls/shell32/dragdrophelper.c @@ -54,8 +54,8 @@ typedef struct { static const IDropTargetHelperVtbl vt_IDropTargetHelper; -#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) -#define _IDropTargetHelper_(This) (IDropTargetHelper*)&(This->lpVtbl) +#define _IUnknown_(This) ((IUnknown*)&(This)->lpVtbl) +#define _IDropTargetHelper_(This) (&(This)->lpVtbl) /************************************************************************** * IDropTargetHelper_Constructor diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 891ff4a..25acf40 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -110,15 +110,15 @@ static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) /* converts This to an interface pointer */ -#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) -#define _IShellFolder_(This) (IShellFolder*)&(This->lpvtblShellFolder) -#define _IShellFolder2_(This) (IShellFolder2*)&(This->lpvtblShellFolder) -#define _IPersist_(This) (IPersist*)&(This->lpvtblPersistFolder3) -#define _IPersistFolder_(This) (IPersistFolder*)&(This->lpvtblPersistFolder3) -#define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpvtblPersistFolder3) -#define _IPersistFolder3_(This) (IPersistFolder3*)&(This->lpvtblPersistFolder3) -#define _IDropTarget_(This) (IDropTarget*)&(This->lpvtblDropTarget) -#define _ISFHelper_(This) (ISFHelper*)&(This->lpvtblSFHelper) +#define _IUnknown_(This) ((IUnknown*)&(This)->lpVtbl) +#define _IShellFolder_(This) ((IShellFolder*)&(This)->lpvtblShellFolder) +#define _IShellFolder2_(This) ((IShellFolder2*)&(This)->lpvtblShellFolder) +#define _IPersist_(This) (&(This)->lpvtblPersistFolder3) +#define _IPersistFolder_(This) (&(This)->lpvtblPersistFolder3) +#define _IPersistFolder2_(This) (&(This)->lpvtblPersistFolder3) +#define _IPersistFolder3_(This) (&(This)->lpvtblPersistFolder3) +#define _IDropTarget_(This) (&(This)->lpvtblDropTarget) +#define _ISFHelper_(This) (&(This)->lpvtblSFHelper) /************************************************************************** * registers clipboardformat once diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index c6ff06e..17f61c9 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -75,13 +75,13 @@ static inline IGenericSFImpl *impl_from_IPersistFolder2( IPersistFolder2 *iface /* converts This to an interface pointer */ -#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) -#define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) -#define _IShellFolder2_(This) (IShellFolder2*)&(This->lpVtbl) +#define _IUnknown_(This) ((IUnknown*)&(This)->lpVtbl) +#define _IShellFolder_(This) ((IShellFolder*)&(This)->lpVtbl) +#define _IShellFolder2_(This) (&(This)->lpVtbl) -#define _IPersist_(This) (IPersist*)&(This->lpVtblPersistFolder2) -#define _IPersistFolder_(This) (IPersistFolder*)&(This->lpVtblPersistFolder2) -#define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2) +#define _IPersist_(This) (&(This)->lpVtblPersistFolder2) +#define _IPersistFolder_(This) (&(This)->lpVtblPersistFolder2) +#define _IPersistFolder2_(This) (&(This)->lpVtblPersistFolder2) /*********************************************************************** * IShellFolder [MyComputer] implementation diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 39f61a7..30ab73e 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -69,9 +69,9 @@ static const IPersistFolder2Vtbl vt_NP_PersistFolder2; #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = \ (class*)(((char*)name) - FIELD_OFFSET(IGenericSFImpl, lpVtblPersistFolder2)) -#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) -#define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) -#define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2) +#define _IUnknown_(This) ((IUnknown*)&(This)->lpVtbl) +#define _IShellFolder_(This) ((IShellFolder*)&(This)->lpVtbl) +#define _IPersistFolder2_(This) (&(This)->lpVtblPersistFolder2) static const shvheader NetworkPlacesSFHeader[] = { {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},

1 0

Michael Stefaniuc : shell32: Remove superfluous pointer casts.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 6c54ad3dbae12e8bee041d77170ade61d178b096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c54ad3dbae12e8bee041d771… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 22:46:39 2009 +0100 shell32: Remove superfluous pointer casts. --- dlls/shell32/appbar.c | 2 +- dlls/shell32/autocomplete.c | 7 +++---- dlls/shell32/brsfolder.c | 12 ++++++------ dlls/shell32/changenotify.c | 16 ++++++++-------- dlls/shell32/control.c | 6 +++--- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/dataobject.c | 4 ++-- dlls/shell32/debughlp.c | 10 +++++----- dlls/shell32/dragdrophelper.c | 4 ++-- dlls/shell32/enumidlist.c | 2 +- dlls/shell32/folders.c | 6 +++--- dlls/shell32/iconcache.c | 5 +++-- dlls/shell32/pidl.c | 14 +++++++------- dlls/shell32/shelllink.c | 12 ++++++------ dlls/shell32/shellole.c | 2 +- dlls/shell32/shellord.c | 18 +++++++++--------- dlls/shell32/shfldr_fs.c | 4 ++-- dlls/shell32/shfldr_mycomp.c | 2 +- dlls/shell32/shfldr_unixfs.c | 8 ++++---- dlls/shell32/shlfileop.c | 8 ++++---- dlls/shell32/shlfsbind.c | 2 +- dlls/shell32/shlview.c | 37 +++++++++++++++---------------------- dlls/shell32/shpolicy.c | 8 ++++---- dlls/shell32/tests/shlexec.c | 6 +++--- 24 files changed, 95 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c54ad3dbae12e8bee041…

1 0

Rob Shearman : gdi32: Move 16-bit functions not exported in gdi32. dll into files compiled only when 16-bit functionality is enabled.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: ccce11d2c390dc7c4cead537ea753bff8a3dc27a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccce11d2c390dc7c4cead537e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Feb 18 20:34:00 2009 +0000 gdi32: Move 16-bit functions not exported in gdi32.dll into files compiled only when 16-bit functionality is enabled. --- dlls/gdi32/bitmap.c | 1 - dlls/gdi32/brush.c | 32 +--- dlls/gdi32/clipping.c | 143 ----------------- dlls/gdi32/dc.c | 77 +--------- dlls/gdi32/dib.c | 52 +------ dlls/gdi32/gdi16.c | 380 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_main.c | 10 -- dlls/gdi32/gdi_private.h | 8 + dlls/gdi32/gdiobj.c | 13 -- dlls/gdi32/mapping.c | 38 ----- dlls/gdi32/palette.c | 51 +------ 11 files changed, 407 insertions(+), 398 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccce11d2c390dc7c4cead…

1 0

Juan Lang : oleaut32: Implement VarDecFix.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 48d1f9fba1ffcf610cb3233d8322765937f57f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d1f9fba1ffcf610cb3233d8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 18 09:05:51 2009 -0800 oleaut32: Implement VarDecFix. --- dlls/oleaut32/vartype.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 3e435ab..0b0ed28 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5662,6 +5662,9 @@ HRESULT WINAPI VarDecAbs(const DECIMAL* pDecIn, DECIMAL* pDecOut) */ HRESULT WINAPI VarDecFix(const DECIMAL* pDecIn, DECIMAL* pDecOut) { + double dbl; + HRESULT hr; + if (DEC_SIGN(pDecIn) & ~DECIMAL_NEG) return E_INVALIDARG; @@ -5671,8 +5674,13 @@ HRESULT WINAPI VarDecFix(const DECIMAL* pDecIn, DECIMAL* pDecOut) return S_OK; } - FIXME("semi-stub!\n"); - return DISP_E_OVERFLOW; + hr = VarR8FromDec(pDecIn, &dbl); + if (SUCCEEDED(hr)) { + LONGLONG rounded = dbl; + + hr = VarDecFromI8(rounded, pDecOut); + } + return hr; } /************************************************************************

1 0

Juan Lang : oleaut32: Implement VarDecInt.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 32bacc9c0b545f95f87a7d26145632bbc01b4cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32bacc9c0b545f95f87a7d261… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 18 09:06:19 2009 -0800 oleaut32: Implement VarDecInt. --- dlls/oleaut32/vartype.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 0b0ed28..6d972a2 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5702,14 +5702,22 @@ HRESULT WINAPI VarDecFix(const DECIMAL* pDecIn, DECIMAL* pDecOut) */ HRESULT WINAPI VarDecInt(const DECIMAL* pDecIn, DECIMAL* pDecOut) { + double dbl; + HRESULT hr; + if (DEC_SIGN(pDecIn) & ~DECIMAL_NEG) return E_INVALIDARG; if (!(DEC_SIGN(pDecIn) & DECIMAL_NEG) || !DEC_SCALE(pDecIn)) return VarDecFix(pDecIn, pDecOut); /* The same, if +ve or no fractionals */ - FIXME("semi-stub!\n"); - return DISP_E_OVERFLOW; + hr = VarR8FromDec(pDecIn, &dbl); + if (SUCCEEDED(hr)) { + LONGLONG rounded = dbl >= 0.0 ? dbl + 0.5 : dbl - 0.5; + + hr = VarDecFromI8(rounded, pDecOut); + } + return hr; } /************************************************************************

1 0

Rob Shearman : widl: Fix typos in write_remoting_arg which caused ref pointers to unions to not result in direct calls to NonEncapsulatedUnion /EncapsulatedUnion functions.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 944f22db8052032ec6b3a72a6253d483834b9ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=944f22db8052032ec6b3a72a6… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Feb 18 20:32:15 2009 +0000 widl: Fix typos in write_remoting_arg which caused ref pointers to unions to not result in direct calls to NonEncapsulatedUnion/EncapsulatedUnion functions. --- tools/widl/typegen.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f1a00e6..6e55d11 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3320,14 +3320,14 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const print_phase_function(file, indent, struct_type, local_var_prefix, phase, var, start_offset); } } - else if (type->type == RPC_FC_RP && is_union(type->type)) + else if (type->type == RPC_FC_RP && is_union(ref->type)) { const char *union_type = NULL; if (phase == PHASE_FREE) union_type = "Pointer"; else { - unsigned char tc = type->type; + unsigned char tc = ref->type; if (tc == RPC_FC_NON_ENCAPSULATED_UNION) union_type = "NonEncapsulatedUnion";

1 0

Rob Shearman : winejoystick.drv: Use CP_UNIXCP instead of CP_ACP when converting a string that comes from the OS .
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 466b682dc6ebb51afe9b632efc964d0a7e158e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=466b682dc6ebb51afe9b632ef… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Feb 18 20:32:27 2009 +0000 winejoystick.drv: Use CP_UNIXCP instead of CP_ACP when converting a string that comes from the OS. --- dlls/winejoystick.drv/joystick.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index 2967a50..9a6902e 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -221,7 +221,7 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k', driverVersion, identString, nrOfAxes, nrOfButtons); lpCaps->wMid = MM_MICROSOFT; lpCaps->wPid = MM_PC_JOYSTICK; - MultiByteToWideChar(CP_ACP, 0, identString, -1, lpCaps->szPname, MAXPNAMELEN); + MultiByteToWideChar(CP_UNIXCP, 0, identString, -1, lpCaps->szPname, MAXPNAMELEN); lpCaps->szPname[MAXPNAMELEN-1] = '\0'; lpCaps->wXmin = 0; lpCaps->wXmax = 0xFFFF;

1 0