February 2006 - Wine-Commits

Troy Rollo : user: Fix argument type for EnableScrollBar.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: d07448dd3a5b841af3ead589c6916c2de7435385 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d07448dd3a5b841af3ead58… Author: Troy Rollo <wine(a)troy.rollo.name> Date: Tue Feb 14 11:37:57 2006 +0100 user: Fix argument type for EnableScrollBar. --- dlls/user/scroll.c | 2 +- include/winuser.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user/scroll.c b/dlls/user/scroll.c index 8a64672..79f283f 100644 --- a/dlls/user/scroll.c +++ b/dlls/user/scroll.c @@ -2014,7 +2014,7 @@ BOOL WINAPI ShowScrollBar(HWND hwnd, INT * * Enables or disables the scroll bars. */ -BOOL WINAPI EnableScrollBar( HWND hwnd, INT nBar, UINT flags ) +BOOL WINAPI EnableScrollBar( HWND hwnd, UINT nBar, UINT flags ) { BOOL bFineWithMe; SCROLLBAR_INFO *infoPtr; diff --git a/include/winuser.h b/include/winuser.h index daac463..de09afe 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4278,7 +4278,7 @@ INT WINAPI DrawTextExW(HDC,LPWST #define DrawTextEx WINELIB_NAME_AW(DrawTextEx) BOOL WINAPI EmptyClipboard(void); BOOL WINAPI EnableMenuItem(HMENU,UINT,UINT); -BOOL WINAPI EnableScrollBar(HWND,INT,UINT); +BOOL WINAPI EnableScrollBar(HWND,UINT,UINT); BOOL WINAPI EnableWindow(HWND,BOOL); BOOL WINAPI EndDeferWindowPos(HDWP); BOOL WINAPI EndDialog(HWND,INT_PTR);

1 0

Troy Rollo : user: Fix argument types for CheckRadioButton.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 0fbd861bddfe3bbb781bffe0addbfab0d6389b68 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0fbd861bddfe3bbb781bffe… Author: Troy Rollo <wine(a)troy.rollo.name> Date: Tue Feb 14 11:37:20 2006 +0100 user: Fix argument types for CheckRadioButton. --- dlls/user/dialog.c | 4 ++-- include/winuser.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user/dialog.c b/dlls/user/dialog.c index eb2ca45..c7b4abb 100644 --- a/dlls/user/dialog.c +++ b/dlls/user/dialog.c @@ -1381,8 +1381,8 @@ static BOOL CALLBACK CheckRB(HWND hwndCh /*********************************************************************** * CheckRadioButton (USER32.@) */ -BOOL WINAPI CheckRadioButton( HWND hwndDlg, UINT firstID, - UINT lastID, UINT checkID ) +BOOL WINAPI CheckRadioButton( HWND hwndDlg, int firstID, + int lastID, int checkID ) { RADIOGROUP radioGroup; diff --git a/include/winuser.h b/include/winuser.h index 7bcf35b..daac463 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4141,7 +4141,7 @@ BOOL WINAPI CharToOemBuffW(LPCWSTR, BOOL WINAPI CheckDlgButton(HWND,INT,UINT); DWORD WINAPI CheckMenuItem(HMENU,UINT,UINT); BOOL WINAPI CheckMenuRadioItem(HMENU,UINT,UINT,UINT,UINT); -BOOL WINAPI CheckRadioButton(HWND,UINT,UINT,UINT); +BOOL WINAPI CheckRadioButton(HWND,int,int,int); HWND WINAPI ChildWindowFromPoint(HWND,POINT); HWND WINAPI ChildWindowFromPointEx(HWND,POINT,UINT); BOOL WINAPI ClientToScreen(HWND,LPPOINT);

1 0

Troy Rollo : user: Fix return type and argument type for GetDlgItemText{A, W}.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 99020f800144a4c04dc5a4644cc556d148dfa518 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=99020f800144a4c04dc5a46… Author: Troy Rollo <wine(a)troy.rollo.name> Date: Tue Feb 14 11:36:49 2006 +0100 user: Fix return type and argument type for GetDlgItemText{A,W}. --- dlls/user/dialog.c | 8 ++++---- include/winuser.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user/dialog.c b/dlls/user/dialog.c index 6aa95a1..eb2ca45 100644 --- a/dlls/user/dialog.c +++ b/dlls/user/dialog.c @@ -1264,10 +1264,10 @@ BOOL WINAPI SetDlgItemTextW( HWND hwnd, /*********************************************************************** * GetDlgItemTextA (USER32.@) */ -INT WINAPI GetDlgItemTextA( HWND hwnd, INT id, LPSTR str, UINT len ) +UINT WINAPI GetDlgItemTextA( HWND hwnd, INT id, LPSTR str, INT len ) { if (str && (len > 0)) str[0] = '\0'; - return (INT)SendDlgItemMessageA( hwnd, id, WM_GETTEXT, + return (UINT)SendDlgItemMessageA( hwnd, id, WM_GETTEXT, len, (LPARAM)str ); } @@ -1275,10 +1275,10 @@ INT WINAPI GetDlgItemTextA( HWND hwnd, I /*********************************************************************** * GetDlgItemTextW (USER32.@) */ -INT WINAPI GetDlgItemTextW( HWND hwnd, INT id, LPWSTR str, UINT len ) +UINT WINAPI GetDlgItemTextW( HWND hwnd, INT id, LPWSTR str, INT len ) { if (str && (len > 0)) str[0] = '\0'; - return (INT)SendDlgItemMessageW( hwnd, id, WM_GETTEXT, + return (UINT)SendDlgItemMessageW( hwnd, id, WM_GETTEXT, len, (LPARAM)str ); } diff --git a/include/winuser.h b/include/winuser.h index 313679c..7bcf35b 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4352,8 +4352,8 @@ HWND WINAPI GetDesktopWindow(void INT WINAPI GetDlgCtrlID(HWND); HWND WINAPI GetDlgItem(HWND,INT); UINT WINAPI GetDlgItemInt(HWND,INT,BOOL*,BOOL); -INT WINAPI GetDlgItemTextA(HWND,INT,LPSTR,UINT); -INT WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,UINT); +UINT WINAPI GetDlgItemTextA(HWND,INT,LPSTR,INT); +UINT WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,INT); #define GetDlgItemText WINELIB_NAME_AW(GetDlgItemText) UINT WINAPI GetDoubleClickTime(void); HWND WINAPI GetFocus(void);

1 0

Dmitry Timoshkov : msvfw32: Disable datarate, keyframe and quality controls to not
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: f1e120ba7ea514fbf8c916e7608f9f165fb84135 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f1e120ba7ea514fbf8c916e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 14 11:36:19 2006 +0100 msvfw32: Disable datarate, keyframe and quality controls to not confuse users by a not implemented functionality. Add support for About codec control. --- dlls/msvideo/msvideo_main.c | 55 ++++++++++++++++++++++++++++++++++------ dlls/msvideo/msvideo_private.h | 9 +++++++ 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c index 1e1962a..647124d 100644 --- a/dlls/msvideo/msvideo_main.c +++ b/dlls/msvideo/msvideo_main.c @@ -772,17 +772,34 @@ static INT_PTR CALLBACK icm_choose_compr WCHAR buf[128]; struct choose_compressor *choose_comp = (struct choose_compressor *)lparam; + SetWindowLongPtrW(hdlg, DWLP_USER, lparam); + + /* FIXME */ + choose_comp->flags &= ~(ICMF_CHOOSE_DATARATE | ICMF_CHOOSE_KEYFRAME); + if (choose_comp->title) SetWindowTextA(hdlg, choose_comp->title); if (!(choose_comp->flags & ICMF_CHOOSE_DATARATE)) - EnableWindow(GetDlgItem(hdlg, IDC_DATARATE), FALSE); + { + ShowWindow(GetDlgItem(hdlg, IDC_DATARATE_CHECKBOX), SW_HIDE); + ShowWindow(GetDlgItem(hdlg, IDC_DATARATE), SW_HIDE); + ShowWindow(GetDlgItem(hdlg, IDC_DATARATE_KB), SW_HIDE); + } if (!(choose_comp->flags & ICMF_CHOOSE_KEYFRAME)) - EnableWindow(GetDlgItem(hdlg, IDC_KEYFRAME), FALSE); + { + ShowWindow(GetDlgItem(hdlg, IDC_KEYFRAME_CHECKBOX), SW_HIDE); + ShowWindow(GetDlgItem(hdlg, IDC_KEYFRAME), SW_HIDE); + ShowWindow(GetDlgItem(hdlg, IDC_KEYFRAME_FRAMES), SW_HIDE); + } + + /* FIXME */ + EnableWindow(GetDlgItem(hdlg, IDC_QUALITY_SCROLL), FALSE); + EnableWindow(GetDlgItem(hdlg, IDC_QUALITY_TXT), FALSE); /*if (!(choose_comp->flags & ICMF_CHOOSE_PREVIEW)) - EnableWindow(GetDlgItem(hdlg, IDC_PREVIEW), FALSE);*/ + ShowWindow(GetDlgItem(hdlg, IDC_PREVIEW), SW_HIDE);*/ LoadStringW(MSVFW32_hModule, IDS_FULLFRAMES, buf, 128); SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_ADDSTRING, 0, (LPARAM)buf); @@ -809,24 +826,41 @@ static INT_PTR CALLBACK icm_choose_compr { INT cur_sel; struct codec_info *ic; - BOOL enable = FALSE; + BOOL can_configure = FALSE, can_about = FALSE; + struct choose_compressor *choose_comp; - if (HIWORD(wparam) != CBN_SELCHANGE) + if (HIWORD(wparam) != CBN_SELCHANGE && HIWORD(wparam) != CBN_SETFOCUS) break; + choose_comp = (struct choose_compressor *)GetWindowLongPtrW(hdlg, DWLP_USER); + cur_sel = SendMessageW((HWND)lparam, CB_GETCURSEL, 0, 0); ic = (struct codec_info *)SendMessageW((HWND)lparam, CB_GETITEMDATA, cur_sel, 0); if (ic && ic->hic) { if (ICQueryConfigure(ic->hic) == DRVCNF_OK) - enable = TRUE; + can_configure = TRUE; + if (ICQueryAbout(ic->hic) == DRVCNF_OK) + can_about = TRUE; } - EnableWindow(GetDlgItem(hdlg, IDC_CONFIGURE), enable); + EnableWindow(GetDlgItem(hdlg, IDC_CONFIGURE), can_configure); + EnableWindow(GetDlgItem(hdlg, IDC_ABOUT), can_about); + + if (choose_comp->flags & ICMF_CHOOSE_DATARATE) + { + /* FIXME */ + } + if (choose_comp->flags & ICMF_CHOOSE_KEYFRAME) + { + /* FIXME */ + } + break; } case IDC_CONFIGURE: + case IDC_ABOUT: { HWND list = GetDlgItem(hdlg, IDC_COMP_LIST); INT cur_sel; @@ -839,7 +873,12 @@ static INT_PTR CALLBACK icm_choose_compr ic = (struct codec_info *)SendMessageW(list, CB_GETITEMDATA, cur_sel, 0); if (ic && ic->hic) - ICConfigure(ic->hic, hdlg); + { + if (LOWORD(wparam) == IDC_CONFIGURE) + ICConfigure(ic->hic, hdlg); + else + ICAbout(ic->hic, hdlg); + } break; } diff --git a/dlls/msvideo/msvideo_private.h b/dlls/msvideo/msvideo_private.h index 6631ef8..264bd27 100644 --- a/dlls/msvideo/msvideo_private.h +++ b/dlls/msvideo/msvideo_private.h @@ -58,7 +58,16 @@ extern LRESULT (CALLBACK *pFnCallTo16)( #define HIC_16(h32) (LOWORD(h32)) #define IDC_CONFIGURE 882 +#define IDC_ABOUT 883 + +#define IDC_QUALITY_SCROLL 884 +#define IDC_QUALITY_TXT 886 + +#define IDC_KEYFRAME_CHECKBOX 887 #define IDC_KEYFRAME 888 +#define IDC_KEYFRAME_FRAMES 889 +#define IDC_DATARATE_CHECKBOX 894 #define IDC_DATARATE 895 +#define IDC_DATARATE_KB 896 #endif /* __WINE_MSVIDEO_PRIVATE_H */

1 0

Dmitry Timoshkov : msvfw32: Initialize lpbiIn member of the COMPVARS structure.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 5de3d7df3266f7888be7164f29654dc80511ee24 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5de3d7df3266f7888be7164… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 14 11:35:36 2006 +0100 msvfw32: Initialize lpbiIn member of the COMPVARS structure. --- dlls/msvideo/msvideo_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c index ce9a25e..1e1962a 100644 --- a/dlls/msvideo/msvideo_main.c +++ b/dlls/msvideo/msvideo_main.c @@ -924,6 +924,7 @@ BOOL VFWAPI ICCompressorChoose(HWND hwnd pc->dwFlags = 0; pc->fccType = pc->fccHandler = 0; pc->hic = NULL; + pc->lpbiIn = NULL; pc->lpbiOut = NULL; pc->lpBitsOut = pc->lpBitsPrev = pc->lpState = NULL; pc->lQ = ICQUALITY_DEFAULT;

1 0

Stefan Leichter : winetest: Add riched20 tests.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 186a5cfdf58a787752ddf25776d7139474eeb963 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=186a5cfdf58a787752ddf25… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Tue Feb 14 11:35:23 2006 +0100 winetest: Add riched20 tests. --- programs/winetest/Makefile.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index fb22d56..646fb3c 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -50,6 +50,7 @@ TESTBINS = \ oleaut32_test.exe$(DLLEXT) \ psapi_test.exe$(DLLEXT) \ quartz_test.exe$(DLLEXT) \ + riched20_test.exe$(DLLEXT) \ rpcrt4_test.exe$(DLLEXT) \ rsabase_test.exe$(DLLEXT) \ rsaenh_test.exe$(DLLEXT) \ @@ -155,6 +156,8 @@ psapi_test.exe$(DLLEXT): $(DLLDIR)/psapi cp $(DLLDIR)/psapi/tests/psapi_test.exe$(DLLEXT) $@ && $(STRIP) $@ quartz_test.exe$(DLLEXT): $(DLLDIR)/quartz/tests/quartz_test.exe$(DLLEXT) cp $(DLLDIR)/quartz/tests/quartz_test.exe$(DLLEXT) $@ && $(STRIP) $@ +riched20_test.exe$(DLLEXT): $(DLLDIR)/riched20/tests/riched20_test.exe$(DLLEXT) + cp $(DLLDIR)/riched20/tests/riched20_test.exe$(DLLEXT) $@ && $(STRIP) $@ rpcrt4_test.exe$(DLLEXT): $(DLLDIR)/rpcrt4/tests/rpcrt4_test.exe$(DLLEXT) cp $(DLLDIR)/rpcrt4/tests/rpcrt4_test.exe$(DLLEXT) $@ && $(STRIP) $@ rsabase_test.exe$(DLLEXT): $(DLLDIR)/rsabase/tests/rsabase_test.exe$(DLLEXT)

1 0

Michael Jung : shell32: Return a GUID pidl for CSIDL_PERSONAL in SHGetFolderLocation.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: d7326ca7e5b0d7a912eacdeb7ba9196ca5dd9d91 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d7326ca7e5b0d7a912eacde… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Tue Feb 14 11:35:12 2006 +0100 shell32: Return a GUID pidl for CSIDL_PERSONAL in SHGetFolderLocation. The tests (shellpath.c/testPersonal) already show that it can be either PT_FOLDER or PT_GUID. It's PT_GUID on WinXP. --- dlls/shell32/pidl.c | 6 ++++++ dlls/shell32/pidl.h | 1 + dlls/shell32/shellpath.c | 4 ++++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index c4e54e0..6ec496f 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1380,6 +1380,12 @@ LPITEMIDLIST _ILCreateMyComputer() return _ILCreateGuid(PT_GUID, &CLSID_MyComputer); } +LPITEMIDLIST _ILCreateMyDocuments() +{ + TRACE("()\n"); + return _ILCreateGuid(PT_GUID, &CLSID_MyDocuments); +} + LPITEMIDLIST _ILCreateIExplore() { TRACE("()\n"); diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index 691aa2a..e80ceaa 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -240,6 +240,7 @@ HRESULT _ILCreateFromPathW (LPCWSTR szP /* Other helpers */ LPITEMIDLIST _ILCreateMyComputer (void); +LPITEMIDLIST _ILCreateMyDocuments (void); LPITEMIDLIST _ILCreateIExplore (void); LPITEMIDLIST _ILCreateControlPanel (void); LPITEMIDLIST _ILCreatePrinters (void); diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 4c18539..c597518 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2223,6 +2223,10 @@ HRESULT WINAPI SHGetFolderLocation( *ppidl = _ILCreateDesktop(); break; + case CSIDL_PERSONAL: + *ppidl = _ILCreateMyDocuments(); + break; + case CSIDL_INTERNET: *ppidl = _ILCreateIExplore(); break;

1 0

Eric Pouech : loader: Added missing attr destroy.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 4642e1e44146b0182a7146bfb6a6f33927ab3fb8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4642e1e44146b0182a7146b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Feb 14 11:34:58 2006 +0100 loader: Added missing attr destroy. --- loader/pthread.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/loader/pthread.c b/loader/pthread.c index 20cc3a9..87ef2e8 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -69,6 +69,7 @@ static void init_thread( struct wine_pth pthread_attr_t attr; pthread_getattr_np( pthread_self(), &attr ); pthread_attr_getstack( &attr, &info->stack_base, &info->stack_size ); + pthread_attr_destroy( &attr ); #elif defined(HAVE_PTHREAD_GET_STACKSIZE_NP) && defined(HAVE_PTHREAD_GET_STACKADDR_NP) char dummy; info->stack_size = pthread_get_stacksize_np(pthread_self());

1 0

Robert Shearman : Ignore documentation/html.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 8a72292f622cd02b0d01c1ec7b4812939c500653 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8a72292f622cd02b0d01c1e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 14 11:34:39 2006 +0100 Ignore documentation/html. --- documentation/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/documentation/.gitignore b/documentation/.gitignore index f3c7a7c..6ec0c70 100644 --- a/documentation/.gitignore +++ b/documentation/.gitignore @@ -1 +1,2 @@ Makefile +html

1 0

Robert Shearman : tools/c2man.pl: Generate correct html.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: a42f59dfe8e02401d24057240e75c939e9668f81 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a42f59dfe8e02401d240572… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 14 11:34:23 2006 +0100 tools/c2man.pl: Generate correct html. --- tools/c2man.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 7797e0c..436be9d 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -1341,7 +1341,7 @@ sub output_api_header($) if ($opt_output_format eq "h") { print OUTPUT "\n"; - print OUTPUT "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n"; + print OUTPUT "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n"; print OUTPUT "<HTML>\n<HEAD>\n"; print OUTPUT "<LINK REL=\"StyleSheet\" href=\"apidoc.css\" type=\"text/css\">\n"; print OUTPUT "<META NAME=\"GENERATOR\" CONTENT=\"tools/c2man.pl\">\n"; @@ -1368,7 +1368,7 @@ sub output_api_footer($) { print OUTPUT "<hr><p><i class=\"copy\">Copyright &copy ".$year." The Wine Project.". " All trademarks are the property of their respective owners.". - " Visit <a HREF=http://www.winehq.org>WineHQ</a> for license details.". + " Visit <a href=\"http://www.winehq.org\">WineHQ</a> for license details.". " Generated $date.</i></p>\n</body>\n</html>\n"; } elsif ($opt_output_format eq "s")

1 0