July 2010 - Wine-commits - list.winehq.org

Mike Kaplinskiy : server: Fix some comments.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: a6203f8b5325ea32a92d3f30dfa89a8dfae6c198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6203f8b5325ea32a92d3f30d… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Tue Jul 27 00:16:28 2010 -0400 server: Fix some comments. Apparently windows reports only currently valid events for WSAEnumNetworkEvents. --- dlls/ws2_32/tests/sock.c | 3 --- server/sock.c | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b078b9f..5a8e0df 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3126,9 +3126,6 @@ static void test_events(int useMessages) ok(ret == 2, "Failed to send buffer %d err %d\n", ret, GetLastError()); broken_seq[0] = read_read_seq; /* win9x */ broken_seq[1] = NULL; - /* we like to erase pmask in server, so we have varying behavior here * - * it is only fixed for now because we refuse to send notifications with - * any kind of asyncs requests running */ ok_event_seq(src, hEvent, empty_seq, broken_seq, 0); dwRet = WaitForSingleObject(ov.hEvent, 100); diff --git a/server/sock.c b/server/sock.c index 44422ad..4922d64 100644 --- a/server/sock.c +++ b/server/sock.c @@ -961,7 +961,9 @@ DECL_HANDLER(enable_socket_event) FILE_WRITE_ATTRIBUTES, &sock_ops))) return; - sock->pmask &= ~req->mask; /* is this safe? */ + /* for event-based notification, windows erases stale events */ + sock->pmask &= ~req->mask; + sock->hmask &= ~req->mask; sock->state |= req->sstate; sock->state &= ~req->cstate;

1 0

Michael Stefaniuc : server: Simplify tkill() and remove unreachable code ( Smatch).
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 5c8b44cd24e4f82669524faa111d53673381af9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8b44cd24e4f82669524faa1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 27 01:01:01 2010 +0200 server: Simplify tkill() and remove unreachable code (Smatch). --- server/ptrace.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 48b30b4..cc08d32 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -213,18 +213,17 @@ static int wait4_thread( struct thread *thread, int signal ) static inline int tkill( int tgid, int pid, int sig ) { #ifdef __linux__ - int ret = -ENOSYS; # ifdef __i386__ - ret = syscall(270 /*SYS_tgkill*/, tgid, pid, sig); + int ret = syscall(270 /*SYS_tgkill*/, tgid, pid, sig); if (ret < 0 && errno == -ENOSYS) ret = syscall(238 /*SYS_tkill*/, pid, sig); return ret; # elif defined(__x86_64__) return syscall(200 /*SYS_tkill*/, pid, sig); -# endif - if (ret >= 0) return ret; - errno = -ret; +# else + errno = ENOSYS; return -1; +# endif #elif defined(__FreeBSD__) && defined(HAVE_THR_KILL2) return thr_kill2( tgid, pid, sig ); #else

1 0

Anders Jonsson : shdocvw: Add Swedish translation.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: e5cc9b0f8a81feb73372ad2f5796cf332c095286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5cc9b0f8a81feb73372ad2f5… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Jul 27 00:08:07 2010 +0200 shdocvw: Add Swedish translation. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/Sv.rc | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index f2f91f8..2ff6bee 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -35,6 +35,7 @@ RC_SRCS = \ Lt.rc \ Nl.rc \ Ro.rc \ + Sv.rc \ Uk.rc \ shdocvw.rc diff --git a/dlls/shdocvw/Sv.rc b/dlls/shdocvw/Sv.rc new file mode 100644 index 0000000..0bfa311 --- /dev/null +++ b/dlls/shdocvw/Sv.rc @@ -0,0 +1,59 @@ +/* + * Copyright 2010 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 + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Öppna webbadress" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ange webbadressen du vill öppna med Internet Explorer",-1,25, 5, 150,15 + LTEXT "Öppna:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "&OK", IDOK, 25, 50, 50, 15 + PUSHBUTTON "&Avbryt", IDCANCEL, 85, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Arkiv" + { + POPUP "&Nytt" + { + MENUITEM "&Fönster" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Öppna...", ID_BROWSE_OPEN + MENUITEM "&Spara", ID_BROWSE_SAVE + MENUITEM "S&para som...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "U&tskriftsformat...", ID_BROWSE_PRINT_FORMAT + MENUITEM "Skriv &ut...", ID_BROWSE_PRINT + MENUITEM "&Förhandsgranska...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Egenskaper...", ID_BROWSE_PROPERTIES + } + POPUP "&Hjälp" + { + MENUITEM "&Om Internet Explorer...", ID_BROWSE_ABOUT + } +}

1 0

Frédéric Delanoy : shdocvw: Add French translation.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: abd0e0895396dfb410964392a81ef0ff8e9d6a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd0e0895396dfb410964392a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 27 10:26:57 2010 +0200 shdocvw: Add French translation. --- dlls/shdocvw/Fr.rc | 58 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/Makefile.in | 1 + 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Fr.rc b/dlls/shdocvw/Fr.rc new file mode 100644 index 0000000..2d053a2 --- /dev/null +++ b/dlls/shdocvw/Fr.rc @@ -0,0 +1,58 @@ +/* + * shdocvw French resources + * Copyright 2010 Frédéric Delanoy + * + * 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 + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Open URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Spécifiez l'URL que vous désirez ouvrir dans Internet Explorer :",-1,30, 6, 150, 17 + LTEXT "Ouvrir :", -1, 2, 32, 27, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 30, 30, 155, 13 + DEFPUSHBUTTON "&OK", IDOK, 54, 50, 50, 15 + PUSHBUTTON "&Annuler", IDCANCEL, 114, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Fichier" + { + MENUITEM "&Nouvelle fenêtre" ID_BROWSE_NEW_WINDOW + MENUITEM "&Ouvrir...", ID_BROWSE_OPEN + MENUITEM "&Enregistrer", ID_BROWSE_SAVE + MENUITEM "Enregistrer &sous...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Format d'impression...", ID_BROWSE_PRINT_FORMAT + MENUITEM "&Imprimer...", ID_BROWSE_PRINT + MENUITEM "&Aperçu avant impression...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Propriétés...", ID_BROWSE_PROPERTIES + } + POPUP "&Aide" + { + MENUITEM "À &propos d'Internet Explorer...", ID_BROWSE_ABOUT + } +} diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 2ff6bee..fa2b3ac 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -31,6 +31,7 @@ C_SRCS = \ RC_SRCS = \ De.rc \ En.rc \ + Fr.rc \ Ko.rc \ Lt.rc \ Nl.rc \

1 0

Mariusz Pluciński : gameux: Add gameux. dll library stub.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: b3a9ce44327bae77dbe3c5e3facaefcb40696834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a9ce44327bae77dbe3c5e3f… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Jul 22 23:59:34 2010 +0200 gameux: Add gameux.dll library stub. --- configure | 1 + configure.ac | 1 + dlls/gameux/Makefile.in | 13 ++++++++++ dlls/gameux/gameux.spec | 5 ++++ dlls/gameux/main.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/gameux/version.rc | 29 ++++++++++++++++++++++++ 6 files changed, 106 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ead05fb..925df23 100755 --- a/configure +++ b/configure @@ -14507,6 +14507,7 @@ wine_fn_config_dll fltlib enable_fltlib wine_fn_config_dll fusion enable_fusion wine_fn_config_test dlls/fusion/tests fusion_test wine_fn_config_dll fwpuclnt enable_fwpuclnt +wine_fn_config_dll gameux enable_gameux wine_fn_config_dll gdi.exe16 enable_win16 wine_fn_config_dll gdi32 enable_gdi32 gdi32 wine_fn_config_test dlls/gdi32/tests gdi32_test diff --git a/configure.ac b/configure.ac index a3a6c67..2888d1e 100644 --- a/configure.ac +++ b/configure.ac @@ -2363,6 +2363,7 @@ WINE_CONFIG_DLL(fltlib) WINE_CONFIG_DLL(fusion) WINE_CONFIG_TEST(dlls/fusion/tests) WINE_CONFIG_DLL(fwpuclnt) +WINE_CONFIG_DLL(gameux) WINE_CONFIG_DLL(gdi.exe16,enable_win16) WINE_CONFIG_DLL(gdi32,,[gdi32]) WINE_CONFIG_TEST(dlls/gdi32/tests) diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in new file mode 100644 index 0000000..d26a8ab --- /dev/null +++ b/dlls/gameux/Makefile.in @@ -0,0 +1,13 @@ +EXTRADEFS = -DCOM_NO_WINDOWS_H +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = gameux.dll + +C_SRCS = \ + main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/gameux/gameux.spec b/dlls/gameux/gameux.spec new file mode 100644 index 0000000..1c89098 --- /dev/null +++ b/dlls/gameux/gameux.spec @@ -0,0 +1,5 @@ +@ stub GameUxShimW +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer diff --git a/dlls/gameux/main.c b/dlls/gameux/main.c new file mode 100644 index 0000000..205d48e --- /dev/null +++ b/dlls/gameux/main.c @@ -0,0 +1,57 @@ +/* + * Gameux library main file + * + * Copyright (C) 2010 Mariusz Pluciński + * + * 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 + */ + +#include "config.h" + +#define COBJMACROS + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +#include "ole2.h" +#include "shobjidl.h" +#include "initguid.h" +#include "gameux.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gameux); + +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME("stub\n"); + return S_FALSE; +} + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("(%p, %d, %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/gameux/version.rc b/dlls/gameux/version.rc new file mode 100644 index 0000000..a637163 --- /dev/null +++ b/dlls/gameux/version.rc @@ -0,0 +1,29 @@ +/* + * Gameux library version resource + * + * Copyright (C) 2010 Mariusz Pluciński + * + * 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 + */ + +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine Games Explorer" +#define WINE_FILENAME_STR "gameux.dll" +#define WINE_FILEVERSION 6,1,7600,16385 +#define WINE_FILEVERSION_STR "6.1.7600.16385" +#define WINE_PRODUCTVERSION 6,1,7600,16385 +#define WINE_PRODUCTVERSION_STR "6.1.7600.16385" + +#include "wine/wine_common_ver.rc"

1 0

Alexander Nicolaysen Sørnes : shdocvw: Make the addressbar in IE do something useful.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 7833ca6bbb57dc60f49dccfd45e6c9dc1f9d065b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7833ca6bbb57dc60f49dccfd4… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 2 16:35:42 2010 +0200 shdocvw: Make the addressbar in IE do something useful. --- dlls/shdocvw/iexplore.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index e596c85..d81e8f1 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -168,6 +168,36 @@ static LRESULT iewnd_OnSize(InternetExplorer *This, INT width, INT height) return 0; } +static LRESULT iewnd_OnNotify(InternetExplorer *This, WPARAM wparam, LPARAM lparam) +{ + NMHDR* hdr = (NMHDR*)lparam; + + if(hdr->idFrom == IDC_BROWSE_ADDRESSBAR && hdr->code == CBEN_ENDEDITW) + { + NMCBEENDEDITW* info = (NMCBEENDEDITW*)lparam; + + if(info->fChanged && info->iWhy == CBENF_RETURN && info->szText) + { + VARIANT vt; + HWND hwndEdit = (HWND)SendMessageW(hdr->hwndFrom, CBEM_GETEDITCONTROL, 0, 0); + + V_VT(&vt) = VT_BSTR; + V_BSTR(&vt) = SysAllocString(info->szText); + + IWebBrowser2_Navigate2(WEBBROWSER2(This), &vt, NULL, NULL, NULL, NULL); + + SysFreeString(V_BSTR(&vt)); + + /* Clear the address bar, as we don't change it when + the user navigates to a new page */ + SendMessageW(hwndEdit, WM_SETTEXT, 0, 0); + return 0; + } + } + + return 0; +} + static LRESULT iewnd_OnDestroy(InternetExplorer *This) { TRACE("%p\n", This); @@ -225,6 +255,8 @@ ie_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) return iewnd_OnSize(This, LOWORD(lparam), HIWORD(lparam)); case WM_COMMAND: return iewnd_OnCommand(This, hwnd, msg, wparam, lparam); + case WM_NOTIFY: + return iewnd_OnNotify(This, wparam, lparam); case WM_DOCHOSTTASK: return process_dochost_task(&This->doc_host, lparam); }

1 0

Johan Gill : ddraw: Added a todo_wine test for SetCooperativeLevel.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 1fb67788b126b77cf2bcf30acb31a2a1222503d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb67788b126b77cf2bcf30ac… Author: Johan Gill <johan.gill(a)gmail.com> Date: Wed Jul 28 00:39:42 2010 +0200 ddraw: Added a todo_wine test for SetCooperativeLevel. --- dlls/ddraw/tests/ddrawmodes.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 7818255..8235d86 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -645,10 +645,16 @@ static void testcooperativelevels_normal(void) static void testcooperativelevels_exclusive(void) { + BOOL success; HRESULT rc; + RECT window_rect; /* Do some tests with DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN mode */ + /* First, resize the window so it is not the same size as any screen */ + success = SetWindowPos(hwnd, 0, 0, 0, 281, 92, 0); + ok(success, "SetWindowPos failed\n"); + /* Try to set exclusive mode only */ rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_EXCLUSIVE); @@ -663,6 +669,10 @@ static void testcooperativelevels_exclusive(void) rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE); ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN) returned: %x\n",rc); + GetClientRect(hwnd, &window_rect); + /* rect_before_create is assumed to hold the screen rect */ + rc = EqualRect(&rect_before_create, &window_rect); + todo_wine ok(rc!=0, "Fullscreen window has wrong size\n"); /* Set the focus window. Should fail */ rc = IDirectDraw_SetCooperativeLevel(lpDD,

1 0

Jörg Höhle : msvfw32/tests: Add ICDecompressQuery format tests.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: aab254a11e18f09a34bba20dea0ea480db95b9f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab254a11e18f09a34bba20de… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jun 8 17:22:53 2010 +0200 msvfw32/tests: Add ICDecompressQuery format tests. --- dlls/msvfw32/tests/msvfw.c | 140 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 139 insertions(+), 1 deletions(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index b0d8208..46aba3c 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -1,7 +1,7 @@ /* * Unit tests for video playback * - * Copyright 2008 Jörg Höhle + * Copyright 2008,2010 Jörg Höhle * Copyright 2008 Austin English * * This library is free software; you can redistribute it and/or @@ -63,7 +63,145 @@ static void test_OpenCase(void) } } +static void test_Locate(void) +{ + static BITMAPINFOHEADER bi = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RLE8, 0,100000,100000, 0,0}; + static BITMAPINFOHEADER bo = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RGB, 0,100000,100000, 0,0}; + HIC h; + DWORD err; + + /* Oddly, MSDN documents that ICLocate takes BITMAPINFOHEADER + * pointers, while ICDecompressQuery takes the larger + * BITMAPINFO. Probably it's all the same as long as the + * variable length color quads are present when they are + * needed. */ + + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h != 0, "RLE8->RGB failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + + bo.biHeight = - bo.biHeight; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h == 0, "RLE8->RGB height<0 succeeded\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + + bi.biCompression = mmioFOURCC('c','v','i','d'); /* Cinepak */ + h = ICOpen(ICTYPE_VIDEO, mmioFOURCC('c','v','i','d'), ICMODE_DECOMPRESS); + if (h == 0) win_skip("Cinepak/ICCVID codec not found\n"); + else { + bo.biBitCount = bi.biBitCount = 32; + err = ICDecompressQuery(h, &bi, &bo); + ok(err == ICERR_OK, "Query cvid->RGB32: %d\n", err); + + err = ICDecompressQuery(h, &bi, NULL); + ok(err == ICERR_OK, "Query cvid 32: %d\n", err); + + bo.biHeight = -bo.biHeight; + err = ICDecompressQuery(h, &bi, &bo); + todo_wine ok(err == ICERR_OK, "Query cvid->RGB32 height<0: %d\n", err); + bo.biHeight = -bo.biHeight; + + ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + + bo.biBitCount = bi.biBitCount = 8; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + todo_wine ok(h != 0, "cvid->RGB8 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + todo_wine ok(h != 0, "cvid->RGB8 height<0 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + + bo.biBitCount = bi.biBitCount = 16; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h != 0, "cvid->RGB16 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + todo_wine ok(h != 0, "cvid->RGB16 height<0 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + + bo.biBitCount = bi.biBitCount = 32; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h != 0, "cvid->RGB32 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + todo_wine ok(h != 0, "cvid->RGB32 height<0 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + + bi.biCompression = mmioFOURCC('C','V','I','D'); + /* Unlike ICOpen, upper case fails with ICLocate. */ + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h == 0, "CVID->RGB32 upper case succeeded\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + } + + bi.biCompression = mmioFOURCC('M','S','V','C'); /* MS Video 1 */ + + bo.biBitCount = bi.biBitCount = 16; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h != 0, "MSVC->RGB16 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + + bo.biHeight = - bo.biHeight; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + todo_wine ok(h != 0, "MSVC->RGB16 height<0 failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight = - bo.biHeight; + + bo.biHeight--; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h == 0, "MSVC->RGB16 height too small succeeded\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + bo.biHeight++; + + /* ICLocate wants upper case MSVC */ + bi.biCompression = mmioFOURCC('m','s','v','c'); + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h == 0, "msvc->RGB16 succeeded\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + + bi.biCompression = mmioFOURCC('M','S','V','C'); + h = ICOpen(ICTYPE_VIDEO, mmioFOURCC('M','S','V','C'), ICMODE_DECOMPRESS); + ok(h != 0, "No MSVC codec installed!?\n"); + if (h != 0) { + err = ICDecompressQuery(h, &bi, &bo); + ok(err == ICERR_OK, "Query MSVC->RGB16: %d\n", err); + + err = ICDecompressQuery(h, &bi, NULL); + ok(err == ICERR_OK, "Query MSVC 16: %d\n", err); + + bo.biHeight = -bo.biHeight; + err = ICDecompressQuery(h, &bi, &bo); + todo_wine ok(err == ICERR_OK, "Query MSVC->RGB16 height<0: %d\n", err); + bo.biHeight = -bo.biHeight; + + bi.biCompression = mmioFOURCC('m','s','v','c'); + err = ICDecompressQuery(h, &bi, &bo); + todo_wine ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %d\n", err); + + ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + } + + bi.biCompression = BI_RGB; + bo.biBitCount = bi.biBitCount = 8; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + todo_wine ok(h != 0, "RGB8->RGB identity failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); + + bi.biCompression = BI_RLE8; + h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); + ok(h != 0, "RLE8->RGB again failed\n"); + if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); +} + START_TEST(msvfw) { test_OpenCase(); + test_Locate(); }

1 0

Jörg Höhle : msvidc: ICDecompressQuery returns ICERR_BADFORMAT on error.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: c678bdd718030da780ee1d778c3307119d7a4596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c678bdd718030da780ee1d778… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jun 8 17:25:39 2010 +0200 msvidc: ICDecompressQuery returns ICERR_BADFORMAT on error. --- dlls/msvfw32/tests/msvfw.c | 2 +- dlls/msvidc32/msvideo1.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 46aba3c..139c644 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -183,7 +183,7 @@ static void test_Locate(void) bi.biCompression = mmioFOURCC('m','s','v','c'); err = ICDecompressQuery(h, &bi, &bo); - todo_wine ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %d\n", err); + ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %d\n", err); ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); } diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index d01f07a..7add314 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -308,26 +308,26 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out ) if( ( in->bmiHeader.biCompression != CRAM_MAGIC ) && ( in->bmiHeader.biCompression != MSVC_MAGIC ) && ( in->bmiHeader.biCompression != WHAM_MAGIC ) ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( ( in->bmiHeader.biBitCount != 16 ) && ( in->bmiHeader.biBitCount != 8 ) ) { TRACE("can't do %d bpp\n", in->bmiHeader.biBitCount ); - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; } /* output must be same dimensions as input */ if( out ) { if( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( in->bmiHeader.biWidth != out->bmiHeader.biWidth ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; } TRACE("OK!\n");

1 0

Nikolay Sivov : comctl32/treeview: Fix possible crash in TVS_SINGELEXPAND helper (Coverity).
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 279677b7d8419d9ef03a95822c0d9e097c8b6ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=279677b7d8419d9ef03a95822… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 28 15:37:10 2010 +0400 comctl32/treeview: Fix possible crash in TVS_SINGELEXPAND helper (Coverity). --- dlls/comctl32/tests/treeview.c | 7 +++++++ dlls/comctl32/treeview.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index a0a3e23..5464975 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1255,6 +1255,13 @@ static void test_TVS_SINGLEEXPAND(void) ok(ret, "got %d\n", ret); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_singleexpand_seq, "singleexpand notifications", FALSE); + /* a workaround for NT4 that sends expanding notification when nothing is about to expand */ + ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hRoot); + ok(ret, "got %d\n", ret); + fill_tree(hTree); + ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, 0); + ok(ret, "got %d\n", ret); + DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 3ee1639..e4c465b 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3426,7 +3426,7 @@ static void TREEVIEW_SingleExpand(TREEVIEW_INFO *infoPtr, { TREEVIEW_ITEM *SelItem; - if ((infoPtr->dwStyle & TVS_SINGLEEXPAND) == 0 || infoPtr->hwndEdit) return; + if ((infoPtr->dwStyle & TVS_SINGLEEXPAND) == 0 || infoPtr->hwndEdit || !item) return; TREEVIEW_SendTreeviewNotify(infoPtr, TVN_SINGLEEXPAND, TVC_UNKNOWN, TVIF_HANDLE | TVIF_PARAM, item, 0);

1 0