November 2011 - Wine-commits

Andrew Talbot : shlwapi: Suppress sign-extension through integer promotion.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 0bed0f4ce6c7f0a646bf756ed5d9abc16aaf775b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bed0f4ce6c7f0a646bf756ed… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 8 22:23:45 2011 +0000 shlwapi: Suppress sign-extension through integer promotion. --- dlls/shlwapi/wsprintf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c index 1093393..56eea41 100644 --- a/dlls/shlwapi/wsprintf.c +++ b/dlls/shlwapi/wsprintf.c @@ -488,7 +488,7 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar case WPR_STRING: { LPCSTR ptr = argData.lpcstr_view; - for (i = 0; i < len; i++) *p++ = (WCHAR)*ptr++; + for (i = 0; i < len; i++) *p++ = (BYTE)*ptr++; } break; case WPR_WSTRING: @@ -514,7 +514,7 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar /* fall through */ case WPR_UNSIGNED: for (i = len; i < format.precision; i++, maxlen--) *p++ = '0'; - for (i = sign; i < len; i++) *p++ = (WCHAR)number[i]; + for (i = sign; i < len; i++) *p++ = (BYTE)number[i]; break; case WPR_UNKNOWN: continue;

1 0

Andrew Talbot : user32: Suppress sign-extension through integer promotion.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 7e31baba31880e1859e3ab107db8daaf403059ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e31baba31880e1859e3ab107… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 8 22:23:49 2011 +0000 user32: Suppress sign-extension through integer promotion. --- dlls/user32/wsprintf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/wsprintf.c b/dlls/user32/wsprintf.c index 5e618d6..17d39a4 100644 --- a/dlls/user32/wsprintf.c +++ b/dlls/user32/wsprintf.c @@ -475,7 +475,7 @@ static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list a case WPR_STRING: { LPCSTR ptr = argData.lpcstr_view; - for (i = 0; i < len; i++) *p++ = (WCHAR)*ptr++; + for (i = 0; i < len; i++) *p++ = (BYTE)*ptr++; } break; case WPR_WSTRING: @@ -501,7 +501,7 @@ static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list a /* fall through */ case WPR_UNSIGNED: for (i = len; i < format.precision; i++, maxlen--) *p++ = '0'; - for (i = sign; i < len; i++) *p++ = (WCHAR)number[i]; + for (i = sign; i < len; i++) *p++ = (BYTE)number[i]; break; case WPR_UNKNOWN: continue;

1 0

Michael Stefaniuc : include: Fixup "long" numeric constants in commctrl.h.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 43a95a9b03feed8ea57f46974997289d9d78692d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a95a9b03feed8ea57f46974… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 8 23:25:00 2011 +0100 include: Fixup "long" numeric constants in commctrl.h. --- dlls/comctl32/rebar.c | 2 +- include/commctrl.h | 112 ++++++++++++++++++++++++------------------------ 2 files changed, 57 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43a95a9b03feed8ea57f4…

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (mmddk.h).
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: eefcb584834ce47ad7292ade978a7b41832aaecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eefcb584834ce47ad7292ade9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 8 23:28:01 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (mmddk.h). --- include/mmddk.h | 72 +++++++++++++++++++++++++++--------------------------- 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/include/mmddk.h b/include/mmddk.h index 17366db..d6359ef 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -67,8 +67,8 @@ typedef struct { * - codes from 0 to 0x7FFFFFFF are user defined * - codes from 0x80000000 to 0xFFFFFFFF are reserved for future definition by microsoft */ -#define DRVM_IOCTL_CMD_USER 0x00000000L -#define DRVM_IOCTL_CMD_SYSTEM 0x80000000L +#define DRVM_IOCTL_CMD_USER __MSABI_LONG(0x00000000) +#define DRVM_IOCTL_CMD_SYSTEM __MSABI_LONG(0x80000000) #define DRVM_MAPPER 0x2000 #define DRVM_USER 0x4000 @@ -207,12 +207,12 @@ typedef struct { #define JOY_HW_LASTENTRY 12 /* calibration flags */ -#define JOY_ISCAL_XY 0x00000001l /* XY are calibrated */ -#define JOY_ISCAL_Z 0x00000002l /* Z is calibrated */ -#define JOY_ISCAL_R 0x00000004l /* R is calibrated */ -#define JOY_ISCAL_U 0x00000008l /* U is calibrated */ -#define JOY_ISCAL_V 0x00000010l /* V is calibrated */ -#define JOY_ISCAL_POV 0x00000020l /* POV is calibrated */ +#define JOY_ISCAL_XY __MSABI_LONG(0x00000001) /* XY are calibrated */ +#define JOY_ISCAL_Z __MSABI_LONG(0x00000002) /* Z is calibrated */ +#define JOY_ISCAL_R __MSABI_LONG(0x00000004) /* R is calibrated */ +#define JOY_ISCAL_U __MSABI_LONG(0x00000008) /* U is calibrated */ +#define JOY_ISCAL_V __MSABI_LONG(0x00000010) /* V is calibrated */ +#define JOY_ISCAL_POV __MSABI_LONG(0x00000020) /* POV is calibrated */ /* point of view constants */ #define JOY_POV_NUMDIRS 4 @@ -222,42 +222,42 @@ typedef struct { #define JOY_POVVAL_RIGHT 3 /* Specific settings for joystick hardware */ -#define JOY_HWS_HASZ 0x00000001l /* has Z info? */ -#define JOY_HWS_HASPOV 0x00000002l /* point of view hat present */ -#define JOY_HWS_POVISBUTTONCOMBOS 0x00000004l /* pov done through combo of buttons */ -#define JOY_HWS_POVISPOLL 0x00000008l /* pov done through polling */ -#define JOY_HWS_ISYOKE 0x00000010l /* joystick is a flight yoke */ -#define JOY_HWS_ISGAMEPAD 0x00000020l /* joystick is a game pad */ -#define JOY_HWS_ISCARCTRL 0x00000040l /* joystick is a car controller */ +#define JOY_HWS_HASZ __MSABI_LONG(0x00000001) /* has Z info? */ +#define JOY_HWS_HASPOV __MSABI_LONG(0x00000002) /* point of view hat present */ +#define JOY_HWS_POVISBUTTONCOMBOS __MSABI_LONG(0x00000004) /* pov done through combo of buttons */ +#define JOY_HWS_POVISPOLL __MSABI_LONG(0x00000008) /* pov done through polling */ +#define JOY_HWS_ISYOKE __MSABI_LONG(0x00000010) /* joystick is a flight yoke */ +#define JOY_HWS_ISGAMEPAD __MSABI_LONG(0x00000020) /* joystick is a game pad */ +#define JOY_HWS_ISCARCTRL __MSABI_LONG(0x00000040) /* joystick is a car controller */ /* X defaults to J1 X axis */ -#define JOY_HWS_XISJ1Y 0x00000080l /* X is on J1 Y axis */ -#define JOY_HWS_XISJ2X 0x00000100l /* X is on J2 X axis */ -#define JOY_HWS_XISJ2Y 0x00000200l /* X is on J2 Y axis */ +#define JOY_HWS_XISJ1Y __MSABI_LONG(0x00000080) /* X is on J1 Y axis */ +#define JOY_HWS_XISJ2X __MSABI_LONG(0x00000100) /* X is on J2 X axis */ +#define JOY_HWS_XISJ2Y __MSABI_LONG(0x00000200) /* X is on J2 Y axis */ /* Y defaults to J1 Y axis */ -#define JOY_HWS_YISJ1X 0x00000400l /* Y is on J1 X axis */ -#define JOY_HWS_YISJ2X 0x00000800l /* Y is on J2 X axis */ -#define JOY_HWS_YISJ2Y 0x00001000l /* Y is on J2 Y axis */ +#define JOY_HWS_YISJ1X __MSABI_LONG(0x00000400) /* Y is on J1 X axis */ +#define JOY_HWS_YISJ2X __MSABI_LONG(0x00000800) /* Y is on J2 X axis */ +#define JOY_HWS_YISJ2Y __MSABI_LONG(0x00001000) /* Y is on J2 Y axis */ /* Z defaults to J2 Y axis */ -#define JOY_HWS_ZISJ1X 0x00002000l /* Z is on J1 X axis */ -#define JOY_HWS_ZISJ1Y 0x00004000l /* Z is on J1 Y axis */ -#define JOY_HWS_ZISJ2X 0x00008000l /* Z is on J2 X axis */ +#define JOY_HWS_ZISJ1X __MSABI_LONG(0x00002000) /* Z is on J1 X axis */ +#define JOY_HWS_ZISJ1Y __MSABI_LONG(0x00004000) /* Z is on J1 Y axis */ +#define JOY_HWS_ZISJ2X __MSABI_LONG(0x00008000) /* Z is on J2 X axis */ /* POV defaults to J2 Y axis, if it is not button based */ -#define JOY_HWS_POVISJ1X 0x00010000l /* pov done through J1 X axis */ -#define JOY_HWS_POVISJ1Y 0x00020000l /* pov done through J1 Y axis */ -#define JOY_HWS_POVISJ2X 0x00040000l /* pov done through J2 X axis */ +#define JOY_HWS_POVISJ1X __MSABI_LONG(0x00010000) /* pov done through J1 X axis */ +#define JOY_HWS_POVISJ1Y __MSABI_LONG(0x00020000) /* pov done through J1 Y axis */ +#define JOY_HWS_POVISJ2X __MSABI_LONG(0x00040000) /* pov done through J2 X axis */ /* R defaults to J2 X axis */ -#define JOY_HWS_HASR 0x00080000l /* has R (4th axis) info */ -#define JOY_HWS_RISJ1X 0x00100000l /* R done through J1 X axis */ -#define JOY_HWS_RISJ1Y 0x00200000l /* R done through J1 Y axis */ -#define JOY_HWS_RISJ2Y 0x00400000l /* R done through J2 X axis */ +#define JOY_HWS_HASR __MSABI_LONG(0x00080000) /* has R (4th axis) info */ +#define JOY_HWS_RISJ1X __MSABI_LONG(0x00100000) /* R done through J1 X axis */ +#define JOY_HWS_RISJ1Y __MSABI_LONG(0x00200000) /* R done through J1 Y axis */ +#define JOY_HWS_RISJ2Y __MSABI_LONG(0x00400000) /* R done through J2 X axis */ /* U & V for future hardware */ -#define JOY_HWS_HASU 0x00800000l /* has U (5th axis) info */ -#define JOY_HWS_HASV 0x01000000l /* has V (6th axis) info */ +#define JOY_HWS_HASU __MSABI_LONG(0x00800000) /* has U (5th axis) info */ +#define JOY_HWS_HASV __MSABI_LONG(0x01000000) /* has V (6th axis) info */ /* Usage settings */ -#define JOY_US_HASRUDDER 0x00000001l /* joystick configured with rudder */ -#define JOY_US_PRESENT 0x00000002l /* is joystick actually present? */ -#define JOY_US_ISOEM 0x00000004l /* joystick is an OEM defined type */ +#define JOY_US_HASRUDDER __MSABI_LONG(0x00000001) /* joystick configured with rudder */ +#define JOY_US_PRESENT __MSABI_LONG(0x00000002) /* is joystick actually present? */ +#define JOY_US_ISOEM __MSABI_LONG(0x00000004) /* joystick is an OEM defined type */ /* struct for storing x,y, z, and rudder values */

1 0

Michael Stefaniuc : include: Fixup "long" numeric constants in vfw.h.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 84fac09bb05337f6e3c049a816a154d4afb56062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fac09bb05337f6e3c049a81… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 8 23:33:03 2011 +0100 include: Fixup "long" numeric constants in vfw.h. --- include/vfw.h | 76 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 38 insertions(+), 38 deletions(-) diff --git a/include/vfw.h b/include/vfw.h index c0689fb..a2dad18 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -167,7 +167,7 @@ typedef struct { /* 24: */ } ICOPEN,*LPICOPEN; -#define ICCOMPRESS_KEYFRAME 0x00000001L +#define ICCOMPRESS_KEYFRAME __MSABI_LONG(0x00000001) typedef struct { DWORD dwFlags; @@ -471,15 +471,15 @@ static inline LRESULT VFWAPI ICDecompressExQuery(HIC hic, DWORD dwFlags, #define ICDecompressExEnd(hic) \ ICSendMessage(hic, ICM_DECOMPRESSEX_END, 0, 0) -#define ICDRAW_QUERY 0x00000001L /* test for support */ -#define ICDRAW_FULLSCREEN 0x00000002L /* draw to full screen */ -#define ICDRAW_HDC 0x00000004L /* draw to a HDC/HWND */ -#define ICDRAW_ANIMATE 0x00000008L /* expect palette animation */ -#define ICDRAW_CONTINUE 0x00000010L /* draw is a continuation of previous draw */ -#define ICDRAW_MEMORYDC 0x00000020L /* DC is offscreen, by the way */ -#define ICDRAW_UPDATING 0x00000040L /* We're updating, as opposed to playing */ -#define ICDRAW_RENDER 0x00000080L /* used to render data not draw it */ -#define ICDRAW_BUFFER 0x00000100L /* buffer data offscreen, we will need to update it */ +#define ICDRAW_QUERY __MSABI_LONG(0x00000001) /* test for support */ +#define ICDRAW_FULLSCREEN __MSABI_LONG(0x00000002) /* draw to full screen */ +#define ICDRAW_HDC __MSABI_LONG(0x00000004) /* draw to a HDC/HWND */ +#define ICDRAW_ANIMATE __MSABI_LONG(0x00000008) /* expect palette animation */ +#define ICDRAW_CONTINUE __MSABI_LONG(0x00000010) /* draw is a continuation of previous draw */ +#define ICDRAW_MEMORYDC __MSABI_LONG(0x00000020) /* DC is offscreen, by the way */ +#define ICDRAW_UPDATING __MSABI_LONG(0x00000040) /* We're updating, as opposed to playing */ +#define ICDRAW_RENDER __MSABI_LONG(0x00000080) /* used to render data not draw it */ +#define ICDRAW_BUFFER __MSABI_LONG(0x00000100) /* buffer data offscreen, we will need to update it */ #define ICDecompressOpen(fccType, fccHandler, lpbiIn, lpbiOut) \ ICLocate(fccType, fccHandler, lpbiIn, lpbiOut, ICMODE_DECOMPRESS) @@ -597,11 +597,11 @@ typedef struct { DWORD dwScale; } ICDRAWBEGIN; -#define ICDRAW_HURRYUP 0x80000000L /* don't draw just buffer (hurry up!) */ -#define ICDRAW_UPDATE 0x40000000L /* don't draw just update screen */ -#define ICDRAW_PREROLL 0x20000000L /* this frame is before real start */ -#define ICDRAW_NULLFRAME 0x10000000L /* repeat last frame */ -#define ICDRAW_NOTKEYFRAME 0x08000000L /* this frame is not a key frame */ +#define ICDRAW_HURRYUP __MSABI_LONG(0x80000000) /* don't draw just buffer (hurry up!) */ +#define ICDRAW_UPDATE __MSABI_LONG(0x40000000) /* don't draw just update screen */ +#define ICDRAW_PREROLL __MSABI_LONG(0x20000000) /* this frame is before real start */ +#define ICDRAW_NULLFRAME __MSABI_LONG(0x10000000) /* repeat last frame */ +#define ICDRAW_NOTKEYFRAME __MSABI_LONG(0x08000000) /* this frame is not a key frame */ typedef struct { DWORD dwFlags; @@ -632,10 +632,10 @@ static inline LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpb } #define ICDrawQuery(hic, lpbiInput) \ - ICSendMessage(hic, ICM_DRAW_QUERY, (DWORD_PTR)(LPVOID)(lpbiInput), 0L) + ICSendMessage(hic, ICM_DRAW_QUERY, (DWORD_PTR)(LPVOID)(lpbiInput), 0) #define ICDrawChangePalette(hic, lpbiInput) \ - ICSendMessage(hic, ICM_DRAW_CHANGEPALETTE, (DWORD_PTR)(LPVOID)(lpbiInput), 0L) + ICSendMessage(hic, ICM_DRAW_CHANGEPALETTE, (DWORD_PTR)(LPVOID)(lpbiInput), 0) #define ICGetBuffersWanted(hic, lpdwBuffers) \ ICSendMessage(hic, ICM_GETBUFFERSWANTED, (DWORD_PTR)(LPVOID)(lpdwBuffers), 0) @@ -750,7 +750,7 @@ typedef WORD TWOCC; #define ckidAVINEWINDEX mmioFOURCC('i', 'd', 'x', '1') -#define streamtypeANY 0UL +#define streamtypeANY 0U #define streamtypeVIDEO mmioFOURCC('v', 'i', 'd', 's') #define streamtypeAUDIO mmioFOURCC('a', 'u', 'd', 's') #define streamtypeMIDI mmioFOURCC('m', 'i', 'd', 's') @@ -964,22 +964,22 @@ typedef struct { DWORD dwInterleaveEvery; /* for non-video streams only */ } AVICOMPRESSOPTIONS, *LPAVICOMPRESSOPTIONS,*PAVICOMPRESSOPTIONS; -#define FIND_DIR 0x0000000FL /* direction mask */ -#define FIND_NEXT 0x00000001L /* search forward */ -#define FIND_PREV 0x00000004L /* search backward */ -#define FIND_FROM_START 0x00000008L /* start at the logical beginning */ +#define FIND_DIR __MSABI_LONG(0x0000000F) /* direction mask */ +#define FIND_NEXT __MSABI_LONG(0x00000001) /* search forward */ +#define FIND_PREV __MSABI_LONG(0x00000004) /* search backward */ +#define FIND_FROM_START __MSABI_LONG(0x00000008) /* start at the logical beginning */ -#define FIND_TYPE 0x000000F0L /* type mask */ -#define FIND_KEY 0x00000010L /* find a key frame */ -#define FIND_ANY 0x00000020L /* find any (non-empty) sample */ -#define FIND_FORMAT 0x00000040L /* find a formatchange */ +#define FIND_TYPE __MSABI_LONG(0x000000F0) /* type mask */ +#define FIND_KEY __MSABI_LONG(0x00000010) /* find a key frame */ +#define FIND_ANY __MSABI_LONG(0x00000020) /* find any (non-empty) sample */ +#define FIND_FORMAT __MSABI_LONG(0x00000040) /* find a formatchange */ -#define FIND_RET 0x0000F000L /* return mask */ -#define FIND_POS 0x00000000L /* return logical position */ -#define FIND_LENGTH 0x00001000L /* return logical size */ -#define FIND_OFFSET 0x00002000L /* return physical position */ -#define FIND_SIZE 0x00003000L /* return physical size */ -#define FIND_INDEX 0x00004000L /* return physical index position */ +#define FIND_RET __MSABI_LONG(0x0000F000) /* return mask */ +#define FIND_POS __MSABI_LONG(0x00000000) /* return logical position */ +#define FIND_LENGTH __MSABI_LONG(0x00001000) /* return logical size */ +#define FIND_OFFSET __MSABI_LONG(0x00002000) /* return physical position */ +#define FIND_SIZE __MSABI_LONG(0x00003000) /* return physical size */ +#define FIND_INDEX __MSABI_LONG(0x00004000) /* return physical index position */ #include <ole2.h> @@ -1039,7 +1039,7 @@ DECLARE_INTERFACE_(IAVIStream,IUnknown) #define IAVIStream_SetInfo(p,a,b) (p)->lpVtbl->SetInfo(p,a,b) #endif -#define AVISTREAMREAD_CONVENIENT (-1L) +#define AVISTREAMREAD_CONVENIENT (__MSABI_LONG(-1)) ULONG WINAPI AVIStreamAddRef(PAVISTREAM iface); ULONG WINAPI AVIStreamRelease(PAVISTREAM iface); @@ -1444,17 +1444,17 @@ HWND VFWAPIV MCIWndCreateW(HWND, HINSTANCE, DWORD, LPCWSTR); #define MCIWndSetActiveTimer(hWnd,active) \ (VOID)MCIWndSM(hWnd,MCIWNDM_SETACTIVETIMER, \ - (WPARAM)(UINT)(active),0L) + (WPARAM)(UINT)(active),0) #define MCIWndSetInactiveTimer(hWnd,inactive) \ (VOID)MCIWndSM(hWnd,MCIWNDM_SETINACTIVETIMER, \ - (WPARAM)(UINT)(inactive),0L) + (WPARAM)(UINT)(inactive),0) #define MCIWndSetTimers(hWnd,active,inactive) \ (VOID)MCIWndSM(hWnd,MCIWNDM_SETTIMERS,(WPARAM)(UINT)(active),\ (LPARAM)(UINT)(inactive)) #define MCIWndGetActiveTimer(hWnd) \ - (UINT)MCIWndSM(hWnd,MCIWNDM_GETACTIVETIMER,0,0L); + (UINT)MCIWndSM(hWnd,MCIWNDM_GETACTIVETIMER,0,0); #define MCIWndGetInactiveTimer(hWnd) \ - (UINT)MCIWndSM(hWnd,MCIWNDM_GETINACTIVETIMER,0,0L); + (UINT)MCIWndSM(hWnd,MCIWNDM_GETINACTIVETIMER,0,0); #define MCIWndRealize(hWnd,fBkgnd) (LONG)MCIWndSM(hWnd,MCIWNDM_REALIZE,(WPARAM)(BOOL)(fBkgnd),0) @@ -1468,7 +1468,7 @@ HWND VFWAPIV MCIWndCreateW(HWND, HINSTANCE, DWORD, LPCWSTR); #define MCIWndGetFileName(hWnd,lp,len) (LONG)MCIWndSM(hWnd,MCIWNDM_GETFILENAME,(WPARAM)(UINT)(len),(LPARAM)(LPVOID)(lp)) #define MCIWndGetDevice(hWnd,lp,len) (LONG)MCIWndSM(hWnd,MCIWNDM_GETDEVICE,(WPARAM)(UINT)(len),(LPARAM)(LPVOID)(lp)) -#define MCIWndGetStyles(hWnd) (UINT)MCIWndSM(hWnd,MCIWNDM_GETSTYLES,0,0L) +#define MCIWndGetStyles(hWnd) (UINT)MCIWndSM(hWnd,MCIWNDM_GETSTYLES,0,0) #define MCIWndChangeStyles(hWnd,mask,value) (LONG)MCIWndSM(hWnd,MCIWNDM_CHANGESTYLES,(WPARAM)(UINT)(mask),(LPARAM)(LONG)(value)) #define MCIWndOpenInterface(hWnd,pUnk) (LONG)MCIWndSM(hWnd,MCIWNDM_OPENINTERFACE,0,(LPARAM)(LPUNKNOWN)(pUnk))

1 0

Vincent Povirk : include: Add definition of IWICComponentFactory and its dependencies.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 5d3328d511b389d6fb6cec03e1bb1c64160d001a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d3328d511b389d6fb6cec03e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 8 13:33:49 2011 -0600 include: Add definition of IWICComponentFactory and its dependencies. --- .gitignore | 1 + include/Makefile.in | 1 + include/wincodec.idl | 23 +++++ include/wincodecsdk.idl | 213 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 238 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index dd8e290..97c1f18 100644 --- a/.gitignore +++ b/.gitignore @@ -231,6 +231,7 @@ include/wbemcli.h include/wia_lh.h include/wia_xp.h include/wincodec.h +include/wincodecsdk.h include/wine/itss.h include/wine/svcctl.h include/wine/winedxgi.h diff --git a/include/Makefile.in b/include/Makefile.in index 6313fa8..ddc07ba 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -100,6 +100,7 @@ PUBLIC_IDL_H_SRCS = \ wia_lh.idl \ wia_xp.idl \ wincodec.idl \ + wincodecsdk.idl \ wine/itss.idl \ wine/svcctl.idl \ winsxs.idl \ diff --git a/include/wincodec.idl b/include/wincodec.idl index 6a24f5e..8228bd8 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -900,6 +900,29 @@ interface IWICImagingFactory : IUnknown [out] IWICMetadataQueryWriter **ppIQueryWriter); } +[ + local, + object, + uuid(dc2bb46d-3f07-481e-8625-220c4aedbb33) +] +interface IWICEnumMetadataItem : IUnknown +{ + HRESULT Next( + [in] ULONG celt, + [in, out, unique, size_is(celt)] PROPVARIANT *rgeltSchema, + [in, out, size_is(celt)] PROPVARIANT *rgeltId, + [in, out, optional, size_is(celt)] PROPVARIANT *rgeltValue, + [out, optional] ULONG *pceltFetched); + + HRESULT Skip( + [in] ULONG celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IWICEnumMetadataItem **ppIEnumMetadataItem); +} + cpp_quote("HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst);") cpp_quote("DEFINE_GUID(CLSID_WICBmpDecoder, 0x6b462062,0x7cbf,0x400d,0x9f,0xdb,0x81,0x3d,0xd1,0x0f,0x27,0x78);") diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl new file mode 100644 index 0000000..d83349c --- /dev/null +++ b/include/wincodecsdk.idl @@ -0,0 +1,213 @@ +/* + * Copyright 2011 Vincent Povirk for CodeWeavers + * + * 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 + */ + +import "wincodec.idl"; + +typedef enum WICPersistOptions { + WICPersistOptionsDefault = 0x00000000, + WICPersistOptionsLittleEndian = 0x00000001, + WICPersistOptionsBigEndian = 0x00000002, + WICPersistOptionsStrictFormat = 0x00000004, + WICPersistOptionsNoCacheStream = 0x00000008, + WICPersistOptionsMask = 0x0000FFFF +} WICPersistOptions; + +typedef enum WICMetadataCreationOptions { + WICMetadataCreationDefault = 0x00000000, + WICMetadataCreationAllowUnknown = WICMetadataCreationDefault, + WICMetadataCreationFailUnknown = 0x00010000, + WICMetadataCreationMask = 0xFFFF0000 +} WICMetadataCreationOptions; + +[ + object, + uuid(aba958bf-c672-44d1-8d61-ce6df2e682c2) +] +interface IWICMetadataHandlerInfo : IWICComponentInfo +{ + HRESULT GetMetadataFormat( + [out] GUID *pguidMetadataFormat); + + HRESULT GetContainerFormats( + [in] UINT cContainerFormats, + [in, out, unique, size_is(cContainerFormats)] GUID *pguidContainerFormats, + [out] UINT *pcchActual); + + HRESULT GetDeviceManufacturer( + [in] UINT cchDeviceManufacturer, + [in, out, unique, size_is(cchDeviceManufacturer)] WCHAR *wzDeviceManufacturer, + [out] UINT *pcchActual); + + HRESULT GetDeviceModels( + [in] UINT cchDeviceModels, + [in, out, unique, size_is(cchDeviceModels)] WCHAR *wzDeviceModels, + [out] UINT *pcchActual); + + HRESULT DoesRequireFullStream( + [out] BOOL *pfRequiresFullStream); + + HRESULT DoesSupportPadding( + [out] BOOL *pfSupportsPadding); + + HRESULT DoesRequireFixedSize( + [out] BOOL *pfFixedSize); +} + +[ + object, + uuid(9204fe99-d8fc-4fd5-a001-9536b067a899) +] +interface IWICMetadataReader : IUnknown +{ + HRESULT GetMetadataFormat( + [out] GUID *pguidMetadataFormat); + + HRESULT GetMetadataHandlerInfo( + [out] IWICMetadataHandlerInfo **ppIHandler); + + HRESULT GetCount( + [out] UINT *pcCount); + + HRESULT GetValueByIndex( + [in] UINT nIndex, + [in, out, unique] PROPVARIANT *pvarSchema, + [in, out, unique] PROPVARIANT *pvarId, + [in, out, unique] PROPVARIANT *pvarValue); + + HRESULT GetValue( + [in] const PROPVARIANT *pvarSchema, + [in] const PROPVARIANT *pvarId, + [in, out, unique] const PROPVARIANT *pvarValue); + + HRESULT GetEnumerator( + [out] IWICEnumMetadataItem **ppIEnumMetadata); +} + +[ + object, + uuid(f7836e16-3be0-470b-86bb-160d0aecd7de) +] +interface IWICMetadataWriter : IWICMetadataReader +{ + HRESULT SetValue( + [in, unique] const PROPVARIANT *pvarSchema, + [in] const PROPVARIANT *pvarId, + [in] const PROPVARIANT *pvarValue); + + HRESULT SetValueByIndex( + [in] UINT nIndex, + [in, unique] const PROPVARIANT *pvarSchema, + [in] const PROPVARIANT *pvarId, + [in] const PROPVARIANT *pvarValue); + + HRESULT RemoveValue( + [in, unique] const PROPVARIANT *pvarSchema, + [in] const PROPVARIANT *pvarId); + + HRESULT RemoveValueByIndex( + [in] UINT nIndex); +} + +[ + object, + uuid(feaa2a8d-b3f3-43e4-b25c-d1de990a1ae1) +] +interface IWICMetadataBlockReader : IUnknown +{ + HRESULT GetContainerFormat( + [out] GUID *pguidContainerFormat); + + HRESULT GetCount( + [out] UINT *pcCount); + + HRESULT GetReaderByIndex( + [in] UINT nIndex, + [out] IWICMetadataReader **ppIMetadataReader); + + HRESULT GetEnumerator( + [out] IEnumUnknown **ppIEnumMetadata); +} + +[ + object, + uuid(08fb9676-b444-41e8-8dbe-6a53a542bff1) +] +interface IWICMetadataBlockWriter : IWICMetadataBlockReader +{ + HRESULT InitializeFromBlockReader( + [in] IWICMetadataBlockReader *pIMDBlockReader); + + HRESULT GetWriterByIndex( + [in] UINT nIndex, + [out] IWICMetadataWriter **ppIMetadataWriter); + + HRESULT AddWriter( + [in] IWICMetadataWriter *pIMetadataWriter); + + HRESULT SetWriterByIndex( + [in] UINT nIndex, + [in] IWICMetadataWriter *pIMetadataWriter); + + HRESULT RemoveWriterByIndex( + [in] UINT nIndex); +} + +[ + object, + uuid(412d0c3a-9650-44fa-af5b-dd2a06c8e8fb) +] +interface IWICComponentFactory : IWICImagingFactory +{ + HRESULT CreateMetadataReader( + [in] REFGUID guidMetadataFormat, + [in, unique] const GUID *pguidVendor, + [in] DWORD dwOptions, + [in] IStream *pIStream, + [out] IWICMetadataReader **ppIReader); + + HRESULT CreateMetadataReaderFromContainer( + [in] REFGUID guidMetadataFormat, + [in, unique] const GUID *pguidVendor, + [in] DWORD dwOptions, + [in] IStream *pIStream, + [out] IWICMetadataReader **ppIReader); + + HRESULT CreateMetadataWriter( + [in] REFGUID guidMetadataFormat, + [in, unique] const GUID *pguidVendor, + [in] DWORD dwMetadataOptions, + [out] IWICMetadataWriter **ppIWriter); + + HRESULT CreateMetadataWriterFromReader( + [in] IWICMetadataReader *pIReader, + [in, unique] const GUID *pguidVendor, + [out] IWICMetadataWriter **ppIWriter); + + HRESULT CreateQueryReaderFromBlockReader( + [in] IWICMetadataBlockReader *pIBlockReader, + [out] IWICMetadataQueryReader **ppIQueryReader); + + HRESULT CreateQueryWriterFromBlockWriter( + [in] IWICMetadataBlockWriter *pIBlockWriter, + [out] IWICMetadataQueryWriter **ppIQueryWriter); + + HRESULT CreateEncoderPropertyBag( + [in, unique, size_is(cCount)] PROPBAG2 *ppropOptions, + [in] UINT cCount, + [out] IPropertyBag2 **ppIPropertyBag); +}

1 0

Jacek Caban : winegecko: Added 1.4 release.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: tools Branch: master Commit: aa3be3c61cba02e9f634753d5c8c28a9d3b3fa91 URL: http://source.winehq.org/git/tools.git/?a=commit;h=aa3be3c61cba02e9f634753d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 9 18:11:27 2011 +0100 winegecko: Added 1.4 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 5be7585..05d6f33 100644 --- a/winegecko.php +++ b/winegecko.php @@ -60,7 +60,9 @@ $aFileSizes = array( '1.2.0-x86'=>12604928, '1.2.0-x86_64'=>12841472, '1.3-x86'=>13609984, - '1.3-x86_64'=>13835776 + '1.3-x86_64'=>13835776, + '1.4-x86'=>14732288, + '1.4-x86_64'=>14980096 ); // Exact size of the file:

1 0

Vincent Povirk : gdiplus: Fix center point calculation in GdipAddPathPie.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 006e2d97b3ca33d6140e24308a43c37b54dfe402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=006e2d97b3ca33d6140e24308… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 8 10:18:22 2011 -0600 gdiplus: Fix center point calculation in GdipAddPathPie. --- dlls/gdiplus/graphicspath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 971ab31..120802c 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -744,7 +744,7 @@ GpStatus WINGDIPAPI GdipAddPathPie(GpPath *path, REAL x, REAL y, REAL width, REA arc2polybezier(ptf, x, y, width, height, startAngle, sweepAngle); - status = GdipAddPathLine(path, (width - x)/2, (height - y)/2, ptf[0].X, ptf[0].Y); + status = GdipAddPathLine(path, x + width/2, y + height/2, ptf[0].X, ptf[0].Y); if(status != Ok){ GdipFree(ptf); return status;

1 0

Austin English : apphelp: Add a stub for ApphelpCheckShellObject.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: e423abf5a528579b66945729d6050e39cf663971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e423abf5a528579b66945729d… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Nov 8 10:41:00 2011 -0600 apphelp: Add a stub for ApphelpCheckShellObject. --- dlls/apphelp/apphelp.c | 6 ++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 4a3cd96..9394cf3 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -67,3 +67,9 @@ PDB WINAPI SdbCreateDatabase( LPCWSTR path, PATH_TYPE type ) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return NULL; } + +BOOL WINAPI ApphelpCheckShellObject( REFCLSID clsid, BOOL shim, ULONGLONG *flags ) +{ + FIXME("stub: %s %p\n", debugstr_guid(clsid), flags ); + return TRUE; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index e8ebccb..76af9ad 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -4,7 +4,7 @@ @ stdcall ApphelpCheckMsiPackage(ptr wstr) @ stub ApphelpCheckRunApp @ stub ApphelpCheckRunAppEx -@ stub ApphelpCheckShellObject +@ stdcall ApphelpCheckShellObject(ptr long ptr) @ stub ApphelpCreateAppcompatData @ stub ApphelpFixMsiPackage @ stub ApphelpFixMsiPackageExe

1 0

Alexandre Julliard : user32/tests: Flush events before the key flags test.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: f0d1bf5f4e0e42b4406305049867579c145fa70b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d1bf5f4e0e42b4406305049… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 18:16:55 2011 +0100 user32/tests: Flush events before the key flags test. --- dlls/user32/tests/msg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 90b518d..0376162 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13024,6 +13024,7 @@ static void test_keyflags(void) test_window = CreateWindowEx(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); + flush_events(); flush_sequence(); /* keyup without a keydown */

1 0