December 2008 - Wine-Commits

Gerald Pfeifer : wpp: Add missing #include <ctype.h>.
by Alexandre Julliard Dec. 27, 2008

Dec. 27, 2008

Module: wine Branch: master Commit: 3ba99863253af1e326b796a86d02fce4ee1001ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba99863253af1e326b796a86… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 27 09:14:20 2008 +0100 wpp: Add missing #include <ctype.h>. --- libs/wpp/preproc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index c1fa3fc..63455ce 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -20,6 +20,7 @@ #include "wine/port.h" #include <assert.h> +#include <ctype.h> #include <fcntl.h> #include <stdio.h> #include <stdlib.h>

1 0

Gerald Pfeifer : comctl32: Shed off some unused parameters.
by Alexandre Julliard Dec. 27, 2008

Dec. 27, 2008

Module: wine Branch: master Commit: d7d6ceb4da5cfdebe006d8c9ef41180290ca8192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d6ceb4da5cfdebe006d8c9e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 27 08:42:50 2008 +0100 comctl32: Shed off some unused parameters. --- dlls/comctl32/hotkey.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index 33f3920..165d95d 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -342,7 +342,7 @@ HOTKEY_KeyDown (HOTKEY_INFO *infoPtr, DWORD key, DWORD flags) static LRESULT -HOTKEY_KeyUp (HOTKEY_INFO *infoPtr, DWORD key, DWORD flags) +HOTKEY_KeyUp (HOTKEY_INFO *infoPtr, DWORD key) { BYTE bOldMod; @@ -383,7 +383,7 @@ HOTKEY_KeyUp (HOTKEY_INFO *infoPtr, DWORD key, DWORD flags) static LRESULT -HOTKEY_KillFocus (HOTKEY_INFO *infoPtr, HWND receiveFocus) +HOTKEY_KillFocus (HOTKEY_INFO *infoPtr) { infoPtr->bFocus = FALSE; DestroyCaret (); @@ -424,7 +424,7 @@ HOTKEY_NCCreate (HWND hwnd, const CREATESTRUCTW *lpcs) } static LRESULT -HOTKEY_SetFocus (HOTKEY_INFO *infoPtr, HWND lostFocus) +HOTKEY_SetFocus (HOTKEY_INFO *infoPtr) { infoPtr->bFocus = TRUE; @@ -505,10 +505,10 @@ HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_KEYUP: case WM_SYSKEYUP: - return HOTKEY_KeyUp (infoPtr, wParam, lParam); + return HOTKEY_KeyUp (infoPtr, wParam); case WM_KILLFOCUS: - return HOTKEY_KillFocus (infoPtr, (HWND)wParam); + return HOTKEY_KillFocus (infoPtr); case WM_LBUTTONDOWN: return HOTKEY_LButtonDown (infoPtr); @@ -522,7 +522,7 @@ HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; case WM_SETFOCUS: - return HOTKEY_SetFocus (infoPtr, (HWND)wParam); + return HOTKEY_SetFocus (infoPtr); case WM_SETFONT: return HOTKEY_SetFont (infoPtr, (HFONT)wParam, LOWORD(lParam));

1 0

Gerald Pfeifer : comctl32: Simplify NATIVEFONT_Create.
by Alexandre Julliard Dec. 27, 2008

Dec. 27, 2008

Module: wine Branch: master Commit: 6eb33b932e4cd832ac34be42b777ec78984f210a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb33b932e4cd832ac34be42b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 27 08:57:44 2008 +0100 comctl32: Simplify NATIVEFONT_Create. --- dlls/comctl32/nativefont.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/nativefont.c b/dlls/comctl32/nativefont.c index 26347a3..2e11a9e 100644 --- a/dlls/comctl32/nativefont.c +++ b/dlls/comctl32/nativefont.c @@ -47,7 +47,7 @@ typedef struct #define NATIVEFONT_GetInfoPtr(hwnd) ((NATIVEFONT_INFO *)GetWindowLongPtrW (hwnd, 0)) static LRESULT -NATIVEFONT_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) +NATIVEFONT_Create (HWND hwnd) { NATIVEFONT_INFO *infoPtr; @@ -85,7 +85,7 @@ NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (uMsg) { case WM_CREATE: - return NATIVEFONT_Create (hwnd, wParam, lParam); + return NATIVEFONT_Create (hwnd); case WM_DESTROY: return NATIVEFONT_Destroy (infoPtr);

1 0

Gerald Pfeifer : comctl32: Simplify DATETIME_Char.
by Alexandre Julliard Dec. 27, 2008

Dec. 27, 2008

Module: wine Branch: master Commit: d7876a2cd48a4370d57160c2168ed40bd9ffda8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7876a2cd48a4370d57160c21… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 27 08:51:39 2008 +0100 comctl32: Simplify DATETIME_Char. --- dlls/comctl32/datetime.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 34c750a..ae538a5 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -949,7 +949,7 @@ DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode) static LRESULT -DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode, LPARAM keyData) +DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode) { int fieldNum = infoPtr->select & DTHT_DATEFIELD; @@ -1353,7 +1353,7 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return DATETIME_KeyDown (infoPtr, wParam); case WM_CHAR: - return DATETIME_Char (infoPtr, wParam, lParam); + return DATETIME_Char (infoPtr, wParam); case WM_KILLFOCUS: return DATETIME_KillFocus (infoPtr, (HWND)wParam);

1 0

Gerald Pfeifer : comctl32: Simplify COMBOEX_Command.
by Alexandre Julliard Dec. 27, 2008

Dec. 27, 2008

Module: wine Branch: master Commit: 568a4bdd2a033a653a3781f371578b5e567b506f URL: http://source.winehq.org/git/wine.git/?a=commit;h=568a4bdd2a033a653a3781f37… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 27 08:55:50 2008 +0100 comctl32: Simplify COMBOEX_Command. --- dlls/comctl32/comboex.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index f576eee..0f55f4e 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1118,7 +1118,7 @@ static LRESULT COMBOEX_Create (HWND hwnd, CREATESTRUCTA const *cs) } -static LRESULT COMBOEX_Command (COMBOEX_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +static LRESULT COMBOEX_Command (COMBOEX_INFO *infoPtr, WPARAM wParam) { LRESULT lret; INT command = HIWORD(wParam); @@ -2273,7 +2273,7 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* Window messages passed to parent */ case WM_COMMAND: - return COMBOEX_Command (infoPtr, wParam, lParam); + return COMBOEX_Command (infoPtr, wParam); case WM_NOTIFY: if (infoPtr->NtfUnicode)

1 0

Nikolay Sivov : gdiplus: Stub for GdipRotateLineTransform.
by Alexandre Julliard Dec. 27, 2008

Dec. 27, 2008

Module: wine Branch: master Commit: be7d21255ca7382bd821f4e17ebe6a632fc080c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7d21255ca7382bd821f4e17… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 27 21:39:57 2008 +0300 gdiplus: Stub for GdipRotateLineTransform. --- dlls/gdiplus/brush.c | 14 ++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index a24f54e..9a513e1 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1331,3 +1331,17 @@ GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient *brush, GpRect *rect) return ret; } + +GpStatus WINGDIPAPI GdipRotateLineTransform(GpLineGradient* brush, + REAL angle, GpMatrixOrder order) +{ + static int calls; + + if(!brush) + return InvalidParameter; + + if(!(calls++)) + FIXME("(%p, %.2f, %d) stub\n", brush, angle, order); + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c995144..12a2316 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -485,7 +485,7 @@ @ stdcall GdipResetWorldTransform(ptr) @ stdcall GdipRestoreGraphics(ptr long) @ stdcall GdipReversePath(ptr) -@ stub GdipRotateLineTransform +@ stdcall GdipRotateLineTransform(ptr long long) @ stdcall GdipRotateMatrix(ptr long long) @ stub GdipRotatePathGradientTransform @ stub GdipRotatePenTransform

1 0

Nikolay Sivov : gdiplus: Stub for GdipResetPenTransform.
by Alexandre Julliard Dec. 27, 2008

Dec. 27, 2008

Module: wine Branch: master Commit: 62512971fed983e3363e2bdfb352e5155219f985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62512971fed983e3363e2bdfb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 27 21:33:21 2008 +0300 gdiplus: Stub for GdipResetPenTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d380d74..ad6b191 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -480,7 +480,7 @@ @ stub GdipResetPageTransform @ stdcall GdipResetPath(ptr) @ stub GdipResetPathGradientTransform -@ stub GdipResetPenTransform +@ stdcall GdipResetPenTransform(ptr) @ stdcall GdipResetTextureTransform(ptr) @ stdcall GdipResetWorldTransform(ptr) @ stdcall GdipRestoreGraphics(ptr long) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index b2d6dab..da8a06a 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -385,6 +385,19 @@ GpStatus WINGDIPAPI GdipGetPenWidth(GpPen *pen, REAL *width) return Ok; } +GpStatus WINGDIPAPI GdipResetPenTransform(GpPen *pen) +{ + static int calls; + + if(!pen) + return InvalidParameter; + + if(!(calls++)) + FIXME("(%p) stub\n", pen); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) { TRACE("(%p, %p)\n", pen, brush);

1 0

Nikolay Sivov : gdiplus: Stub for GdipScalePenTransform.
by Alexandre Julliard Dec. 27, 2008

Dec. 27, 2008

Module: wine Branch: master Commit: f4c017eac149d8ab7c1148a64bb1af63886fafe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c017eac149d8ab7c1148a64… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 27 21:35:40 2008 +0300 gdiplus: Stub for GdipScalePenTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ad6b191..c995144 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -499,7 +499,7 @@ @ stub GdipScaleLineTransform @ stdcall GdipScaleMatrix(ptr long long long) @ stub GdipScalePathGradientTransform -@ stub GdipScalePenTransform +@ stdcall GdipScalePenTransform(ptr long long long) @ stdcall GdipScaleTextureTransform(ptr long long long) @ stdcall GdipScaleWorldTransform(ptr long long long) @ stdcall GdipSetAdjustableArrowCapFillState(ptr long) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index da8a06a..4a68a27 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -398,6 +398,19 @@ GpStatus WINGDIPAPI GdipResetPenTransform(GpPen *pen) return NotImplemented; } +GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrixOrder order) +{ + static int calls; + + if(!pen) + return InvalidParameter; + + if(!(calls++)) + FIXME("(%p, %.2f, %.2f, %d) stub\n", pen, sx, sy, order); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) { TRACE("(%p, %p)\n", pen, brush);

1 0

Vitaliy Margolen : dinput: Replace perror with more appropriate ERR and WARN.
by Alexandre Julliard Dec. 27, 2008

Dec. 27, 2008

Module: wine Branch: master Commit: 7915569511d32c87e16b2d3c9637632749bcbe41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7915569511d32c87e16b2d3c9… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Dec 27 11:23:15 2008 -0700 dinput: Replace perror with more appropriate ERR and WARN. --- dlls/dinput/joystick_linuxinput.c | 67 +++++++++++++++++++++---------------- 1 files changed, 38 insertions(+), 29 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index c6f07ac..a08a5b7 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -243,21 +243,25 @@ static void find_joydevs(void) continue; } - if ((-1==ioctl(fd,EVIOCGBIT(0,sizeof(joydev.evbits)),joydev.evbits))) { - perror("EVIOCGBIT 0"); - close(fd); - continue; - } - if (-1==ioctl(fd,EVIOCGBIT(EV_ABS,sizeof(joydev.absbits)),joydev.absbits)) { - perror("EVIOCGBIT EV_ABS"); - close(fd); - continue; - } - if (-1==ioctl(fd,EVIOCGBIT(EV_KEY,sizeof(joydev.keybits)),joydev.keybits)) { - perror("EVIOCGBIT EV_KEY"); - close(fd); - continue; - } + if (ioctl(fd, EVIOCGBIT(0, sizeof(joydev.evbits)), joydev.evbits) == -1) + { + WARN("ioct(EVIOCGBIT, 0) failed: %d %s\n", errno, strerror(errno)); + close(fd); + continue; + } + if (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(joydev.absbits)), joydev.absbits) == -1) + { + WARN("ioct(EVIOCGBIT, EV_ABS) failed: %d %s\n", errno, strerror(errno)); + close(fd); + continue; + } + if (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(joydev.keybits)), joydev.keybits) == -1) + { + WARN("ioct(EVIOCGBIT, EV_KEY) failed: %d %s\n", errno, strerror(errno)); + close(fd); + continue; + } + /* A true joystick has at least axis X and Y, and at least 1 * button. copied from linux/drivers/input/joydev.c */ if (test_bit(joydev.absbits,ABS_X) && test_bit(joydev.absbits,ABS_Y) && @@ -628,24 +632,29 @@ static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) TRACE("(this=%p)\n",This); - res = IDirectInputDevice2AImpl_Acquire(iface); - if (res==DI_OK) { - if (-1==(This->joyfd=open(This->joydev->device,O_RDWR))) { - if (-1==(This->joyfd=open(This->joydev->device,O_RDONLY))) { - /* Couldn't open the device at all */ - perror(This->joydev->device); - IDirectInputDevice2AImpl_Unacquire(iface); - return DIERR_NOTFOUND; - } else { - /* Couldn't open in r/w but opened in read-only. */ - WARN("Could not open %s in read-write mode. Force feedback will be disabled.\n", This->joydev->device); + if ((res = IDirectInputDevice2AImpl_Acquire(iface)) != DI_OK) + { + WARN("Failed to acquire: %x\n", res); + return res; + } + + if ((This->joyfd = open(This->joydev->device, O_RDWR)) == -1) + { + if ((This->joyfd = open(This->joydev->device, O_RDONLY)) == -1) + { + /* Couldn't open the device at all */ + ERR("Failed to open device %s: %d %s\n", This->joydev->device, errno, strerror(errno)); + IDirectInputDevice2AImpl_Unacquire(iface); + return DIERR_NOTFOUND; } - } } else - WARN("Failed to acquire: %x\n", res); + { + /* Couldn't open in r/w but opened in read-only. */ + WARN("Could not open %s in read-write mode. Force feedback will be disabled.\n", This->joydev->device); + } - return res; + return DI_OK; } /******************************************************************************

1 0

Vitaliy Margolen : dinput: Warn if failed to open device.
by Alexandre Julliard Dec. 27, 2008

Dec. 27, 2008

Module: wine Branch: master Commit: a179f491fd06ff59cdab6348fdeeea3666f5eb8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a179f491fd06ff59cdab6348f… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Dec 27 11:23:13 2008 -0700 dinput: Warn if failed to open device. --- dlls/dinput/joystick_linuxinput.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 95666e8..c6f07ac 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -231,12 +231,17 @@ static void find_joydevs(void) snprintf(buf, sizeof(buf), EVDEVPREFIX"%d", i); - if ((fd=open(buf, O_RDWR))==-1) { - fd = open(buf, O_RDONLY); - no_ff_check = 1; - } + if ((fd = open(buf, O_RDWR)) == -1) + { + fd = open(buf, O_RDONLY); + no_ff_check = 1; + } - if (fd!=-1) { + if (fd == -1) + { + WARN("Failed to open \"%s\": %d %s\n", buf, errno, strerror(errno)); + continue; + } if ((-1==ioctl(fd,EVIOCGBIT(0,sizeof(joydev.evbits)),joydev.evbits))) { perror("EVIOCGBIT 0"); @@ -319,9 +324,8 @@ static void find_joydevs(void) have_joydevs++; } - close(fd); + close(fd); } - } } static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version, int id)

1 0