February 2009 - Wine-commits

Dmitry Timoshkov : gdi32: Make sure that World2Vport DC transformation is valid before using it.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: 5804470f26fc338f7b68864dcdaf4b7f16c61a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5804470f26fc338f7b68864dc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 5 16:41:29 2009 +0800 gdi32: Make sure that World2Vport DC transformation is valid before using it. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bad2705..34e4aed 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3333,7 +3333,7 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) { /* Windows 3.1 compatibility mode GM_COMPATIBLE has only limited font scaling abilities. */ - dcmat.eM11 = dcmat.eM22 = fabs(dc->xformWorld2Vport.eM22); + dcmat.eM11 = dcmat.eM22 = dc->vport2WorldValid ? fabs(dc->xformWorld2Vport.eM22) : 1.0; dcmat.eM21 = dcmat.eM12 = 0; }

1 0

Michael Stefaniuc : include: Change some DWORD to DWORD_PTR in msacm.h.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: 8aeacc5fb5b0baf916ebd4930045e87ff1e29ede URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aeacc5fb5b0baf916ebd4930… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 5 09:52:31 2009 +0100 include: Change some DWORD to DWORD_PTR in msacm.h. The change is for Win64 compatibility and it matches the DDK. --- dlls/msacm32/driver.c | 5 ++- dlls/msacm32/filter.c | 24 +++++++------- dlls/msacm32/format.c | 27 ++++++++-------- dlls/msacm32/stream.c | 9 +++-- dlls/msacm32/tests/msacm.c | 6 ++-- include/msacm.h | 72 ++++++++++++++++++++++++------------------- 6 files changed, 77 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8aeacc5fb5b0baf916ebd…

1 0

Michael Stefaniuc : include: Remove struct PORTALLOC from mmddk.h.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: 01af587568b0478dc1d47548cbd65b0a6258cc62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01af587568b0478dc1d47548c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 5 09:52:56 2009 +0100 include: Remove struct PORTALLOC from mmddk.h. It doesn't exist in the DDK nor is it used in Wine. --- include/mmddk.h | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/include/mmddk.h b/include/mmddk.h index 33a93b2..826aefb 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -380,13 +380,6 @@ typedef JOYDEVMSGPROC *LPJOYDEVMSGPROC; #define MAKEMCIRESOURCE(wRet, wRes) MAKELRESULT((wRet), (wRes)) typedef struct { - DWORD dwCallback; - DWORD dwInstance; - HMIDIOUT hMidi; - DWORD dwFlags; -} PORTALLOC, *LPPORTALLOC; - -typedef struct { HWAVE hWave; LPWAVEFORMATEX lpFormat; DWORD_PTR dwCallback;

1 0

Jacek Caban : mshtml: Return nsIDocumentObserver as nsISupport of nsDocumentObserver object.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: af835d654f7fff6263399877dc67433a93e9c5e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af835d654f7fff6263399877d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 5 00:53:54 2009 +0100 mshtml: Return nsIDocumentObserver as nsISupport of nsDocumentObserver object. --- dlls/mshtml/mutation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 3994888..ea61d5a 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -358,7 +358,7 @@ static nsresult NSAPI nsDocumentObserver_QueryInterface(nsIDocumentObserver *ifa if(IsEqualGUID(&IID_nsISupports, riid)) { TRACE("(%p)->(IID_nsISupports, %p)\n", This, result); - *result = NSWBCHROME(This); + *result = NSDOCOBS(This); }else if(IsEqualGUID(&IID_nsIMutationObserver, riid)) { TRACE("(%p)->(IID_nsIMutationObserver %p)\n", This, result); *result = NSDOCOBS(This);

1 0

Marcus Meissner : cryptui: Check NULL ptr differently (Coverity).
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: 540f11f6d6bf75247d8b9e1cfd8477e33768d9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=540f11f6d6bf75247d8b9e1cf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Feb 4 23:02:43 2009 +0100 cryptui: Check NULL ptr differently (Coverity). --- dlls/cryptui/main.c | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 498c158..8590d0c 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1076,25 +1076,24 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, HWND tab = GetDlgItem(hwnd, IDC_MGR_STORES); data = HeapAlloc(GetProcessHeap(), 0, sizeof(struct CertMgrData)); - if (data) + if (!data) + return 0; + data->imageList = ImageList_Create(16, 16, ILC_COLOR4 | ILC_MASK, 2, 0); + if (data->imageList) { - data->imageList = ImageList_Create(16, 16, ILC_COLOR4 | ILC_MASK, - 2, 0); - if (data->imageList) - { - HBITMAP bmp; - COLORREF backColor = RGB(255, 0, 255); + HBITMAP bmp; + COLORREF backColor = RGB(255, 0, 255); - bmp = LoadBitmapW(hInstance, MAKEINTRESOURCEW(IDB_SMALL_ICONS)); - ImageList_AddMasked(data->imageList, bmp, backColor); - DeleteObject(bmp); - ImageList_SetBkColor(data->imageList, CLR_NONE); - SendMessageW(GetDlgItem(hwnd, IDC_MGR_CERTS), LVM_SETIMAGELIST, - LVSIL_SMALL, (LPARAM)data->imageList); - } - SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); - data->title = pCryptUICertMgr->pwszTitle; + bmp = LoadBitmapW(hInstance, MAKEINTRESOURCEW(IDB_SMALL_ICONS)); + ImageList_AddMasked(data->imageList, bmp, backColor); + DeleteObject(bmp); + ImageList_SetBkColor(data->imageList, CLR_NONE); + SendMessageW(GetDlgItem(hwnd, IDC_MGR_CERTS), LVM_SETIMAGELIST, + LVSIL_SMALL, (LPARAM)data->imageList); } + SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); + data->title = pCryptUICertMgr->pwszTitle; + initialize_purpose_selection(hwnd); add_cert_columns(hwnd); if (pCryptUICertMgr->pwszTitle)

1 0

Francois Gouget : winedos: Remove spaces before '\n's.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: b4c47eabd47b8c7e598a357ad6d6398d25dcc3f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c47eabd47b8c7e598a357ad… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 5 00:21:10 2009 +0100 winedos: Remove spaces before '\n's. --- dlls/winedos/vga.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 246c1fd..6c9085e 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -899,11 +899,11 @@ int VGA_SetMode(WORD mode) /* check if mode is supported */ if (ModeInfo->Supported) { - FIXME("Setting VGA mode %i - Supported mode - Improve reporting of missing capabilities for modes & modetypes. \n", mode); + FIXME("Setting VGA mode %i - Supported mode - Improve reporting of missing capabilities for modes & modetypes.\n", mode); } else { - FIXME("Setting VGA mode %i - Unsupported mode - Will doubtfully work at all, but we'll try anyways. \n", mode); + FIXME("Setting VGA mode %i - Unsupported mode - Will doubtfully work at all, but we'll try anyways.\n", mode); } /* set up graphic or text display */ @@ -1821,12 +1821,12 @@ void VGA_ioport_out( WORD port, BYTE val ) /* check bits 6 and 7 */ if (val & 0xC0) { - FIXME("Unsupported value, VGA register 0x3d8: 0x%02x - bits 7 and 6 not supported. \n", val); + FIXME("Unsupported value, VGA register 0x3d8: 0x%02x - bits 7 and 6 not supported.\n", val); } /* check bits 5 - blink on */ if (val & 0x20) { - FIXME("Unsupported value, VGA register 0x3d8: 0x%02x (bit 5) - blink is not supported. \n", val); + FIXME("Unsupported value, VGA register 0x3d8: 0x%02x (bit 5) - blink is not supported.\n", val); } /* Enable Video Signal (bit 3) - Set the enabled bit */ VGA_SetEnabled((val & 0x08) && 1); @@ -1882,7 +1882,7 @@ void VGA_ioport_out( WORD port, BYTE val ) /* unsupported mode */ else { - FIXME("Unsupported value, VGA register 0x3d8: 0x%02x - unrecognized MDA/CGA mode \n", val); /* Set the enabled bit */ + FIXME("Unsupported value, VGA register 0x3d8: 0x%02x - unrecognized MDA/CGA mode\n", val); /* Set the enabled bit */ } break;

1 0

Francois Gouget : xrandr: X11DRV_XRandR_Cleanup() is unused so remove it.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: d7033b4be5ca9a8c9f593e804d946b988392ed16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7033b4be5ca9a8c9f593e804… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 5 00:20:26 2009 +0100 xrandr: X11DRV_XRandR_Cleanup() is unused so remove it. --- dlls/winex11.drv/xrandr.c | 8 -------- dlls/winex11.drv/xrandr.h | 1 - 2 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index fd21169..4884e1f 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -307,12 +307,4 @@ void X11DRV_XRandR_Init(void) TRACE("Enabling XRandR\n"); } -void X11DRV_XRandR_Cleanup(void) -{ - HeapFree(GetProcessHeap(), 0, real_xrandr_rates); - real_xrandr_rates = NULL; - HeapFree(GetProcessHeap(), 0, real_xrandr_rates_count); - real_xrandr_rates_count = NULL; -} - #endif /* SONAME_LIBXRANDR */ diff --git a/dlls/winex11.drv/xrandr.h b/dlls/winex11.drv/xrandr.h index 9686c87..af3d70e 100644 --- a/dlls/winex11.drv/xrandr.h +++ b/dlls/winex11.drv/xrandr.h @@ -27,7 +27,6 @@ #ifdef SONAME_LIBXRANDR void X11DRV_XRandR_Init(void); -void X11DRV_XRandR_Cleanup(void); #endif /* SONAME_LIBXRANDR */ #endif /* __WINE_XRANDR_H */

1 0

Francois Gouget : winex11.drv: X11DRV_XF86VM_SetExclusiveMode() is unused so remove it.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: 930061c2523a7d613532d4f01bebbb7e533d11c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930061c2523a7d613532d4f01… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 5 00:20:13 2009 +0100 winex11.drv: X11DRV_XF86VM_SetExclusiveMode() is unused so remove it. --- dlls/winex11.drv/xvidmode.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 19b9909..b178d26 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -263,15 +263,6 @@ void X11DRV_XF86VM_Cleanup(void) wine_tsx11_unlock(); } -void X11DRV_XF86VM_SetExclusiveMode(int lock) -{ - if (!dd_modes) return; /* no XVidMode */ - - wine_tsx11_lock(); - pXF86VidModeLockModeSwitch(gdi_display, DefaultScreen(gdi_display), lock); - wine_tsx11_unlock(); -} - /***** GAMMA CONTROL *****/ /* (only available in XF86VidMode 2.x) */

1 0

Francois Gouget : progman: Reorder some functions to avoid forward declarations in dialog.c.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: 323c94b5fe0ac96cdb16d19ba5d6742e3f35a5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=323c94b5fe0ac96cdb16d19ba… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 5 00:19:43 2009 +0100 progman: Reorder some functions to avoid forward declarations in dialog.c. --- programs/progman/dialog.c | 550 ++++++++++++++++++++++----------------------- 1 files changed, 268 insertions(+), 282 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=323c94b5fe0ac96cdb16d…

1 0

Francois Gouget : d3dx8/tests: Make compare() static.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: cb42582287de4c76f9c1e95e1e808143a2993e2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb42582287de4c76f9c1e95e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 5 00:16:37 2009 +0100 d3dx8/tests: Make compare() static. --- dlls/d3dx8/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/tests/mesh.c b/dlls/d3dx8/tests/mesh.c index 967f3c9..4dfa11f 100644 --- a/dlls/d3dx8/tests/mesh.c +++ b/dlls/d3dx8/tests/mesh.c @@ -22,7 +22,7 @@ #define admitted_error 0.0001f -BOOL compare(FLOAT u, FLOAT v) +static BOOL compare(FLOAT u, FLOAT v) { return (fabs(u-v) < admitted_error); }

1 0