July 2007 - Wine-Commits - list.winehq.org

appdb/ include/appData.php include/application ...
by WineHQ July 31, 2007

July 31, 2007

ChangeSet ID: 31299 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/31 18:48:22 Modified files: include : appData.php application.php browse_newest_apps.php bugs.php distribution.php downloadurl.php monitor.php note.php screenshot.php testData.php url.php util.php version.php vote.php tables : appdb_tables.sql banner.sql buglinks.sql distributions.sql monitors.sql session_list.sql testResults.sql user_list.sql Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Convert from timestamp to datetime. Datetime is consistent between mysql 4.0x and newer versions and is faster for date/time computations. Modify object creation methods to specify any time fields that were previously updated with timestamp properties. Patch: http://cvs.winehq.org/patch.py?id=31299 Old revision New revision Changes Path 1.31 1.32 +2 -2 appdb/include/appData.php 1.122 1.123 +8 -6 appdb/include/application.php 1.3 1.4 +1 -1 appdb/include/browse_newest_apps.php 1.27 1.28 +7 -5 appdb/include/bugs.php 1.40 1.41 +5 -3 appdb/include/distribution.php 1.22 1.23 +6 -4 appdb/include/downloadurl.php 1.17 1.18 +5 -3 appdb/include/monitor.php 1.26 1.27 +8 -4 appdb/include/note.php 1.75 1.76 +3 -2 appdb/include/screenshot.php 1.75 1.76 +8 -5 appdb/include/testData.php 1.20 1.21 +5 -4 appdb/include/url.php 1.100 1.101 +1 -6 appdb/include/util.php 1.143 1.144 +6 -5 appdb/include/version.php 1.28 1.29 +1 -1 appdb/include/vote.php 1.33 1.34 +16 -16 appdb/tables/appdb_tables.sql 1.1.1.1 1.2 +1 -1 appdb/tables/banner.sql 1.1 1.2 +1 -1 appdb/tables/buglinks.sql 1.1 1.2 +7 -7 appdb/tables/distributions.sql 1.1 1.2 +1 -1 appdb/tables/monitors.sql 1.1 1.2 +1 -1 appdb/tables/session_list.sql 1.3 1.4 +1 -1 appdb/tables/testResults.sql 1.9 1.10 +2 -2 appdb/tables/user_list.sql

1 0

Alexandre Julliard : make_makefiles: Add check for incorrect module name.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: a1a8036bbb652a0ec6f6caf4535aa1c76de3f072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1a8036bbb652a0ec6f6caf45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 16:00:09 2007 +0200 make_makefiles: Add check for incorrect module name. --- tools/make_makefiles | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 513b5b1..05b90da 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -373,6 +373,7 @@ sub update_dlls(@) } else { + die "invalid module $module" unless $module =~ /\./; (my $mod = $module) =~ s/\.dll$//; die "invalid directory $dir for module $module\n" unless $mod eq $dir; $directories{$module} = $dir;

1 0

Paul Vriens : winhttp: Fix compile/install issue.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 2aaafbb9e866a4b2e64834060d68e2e679637d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aaafbb9e866a4b2e64834060… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jul 31 15:35:42 2007 +0200 winhttp: Fix compile/install issue. --- dlls/winhttp/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 7e76b1e..893c990 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = winhttp +MODULE = winhttp.dll IMPORTS = kernel32 C_SRCS = main.c

1 0

Nigel Liang : winecfg: Add menu font settings to desktop integration tab.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: a4d8f32d5521a95264b77f000758704148846a21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d8f32d5521a95264b77f000… Author: Nigel Liang <ncliang(a)gmail.com> Date: Mon Jul 30 21:06:44 2007 -0700 winecfg: Add menu font settings to desktop integration tab. --- programs/winecfg/Cs.rc | 1 + programs/winecfg/De.rc | 1 + programs/winecfg/En.rc | 1 + programs/winecfg/Es.rc | 1 + programs/winecfg/Fr.rc | 1 + programs/winecfg/Ko.rc | 1 + programs/winecfg/No.rc | 1 + programs/winecfg/Pl.rc | 1 + programs/winecfg/Ro.rc | 1 + programs/winecfg/Ru.rc | 1 + programs/winecfg/resource.h | 1 + programs/winecfg/theme.c | 56 ++++++++++++++++++++++++++++++++++++++++++- 12 files changed, 66 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc index 7dbf274..149b642 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc @@ -311,4 +311,5 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "P�smo titulku aktivn�ho okna" IDC_SYSPARAMS_INACTIVE_TITLE "Pozad� titulku neaktivn�ho okna" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "P�smo titulku neaktivn�ho okna" + IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" END diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 0ec296e..8db8fde 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -306,4 +306,5 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Aktiver Titelleistentext" IDC_SYSPARAMS_INACTIVE_TITLE "Inaktive Titelleiste" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inaktiver Titelleistentext" + IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" END diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 9243e3c..93f5091 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -308,4 +308,5 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Active Title Text" IDC_SYSPARAMS_INACTIVE_TITLE "Inactive Title Bar" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inactive Title Text" + IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" END diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index 3e79eed..a8b773a 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -306,4 +306,5 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Texto de barra de t�tulo activa" IDC_SYSPARAMS_INACTIVE_TITLE "Barra de t�tulo inactiva" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Texto de barra de t�tulo inactiva" + IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" END diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 148b35b..83dceff 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -306,4 +306,5 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Texte de la barre de titre active" IDC_SYSPARAMS_INACTIVE_TITLE "Barre de titre inactive" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Texte de la barre de titre inactive" + IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" END diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 8909743..edc6613 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -308,4 +308,5 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Ȱ�� " IDC_SYSPARAMS_INACTIVE_TITLE "��Ȱ�� " IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "��Ȱ�� " + IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" END diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 5d1f379..bc6be43 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -305,4 +305,5 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Aktiv titteltekst" IDC_SYSPARAMS_INACTIVE_TITLE "Inaktiv tittellinje" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inaktiv titteltekst" + IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" END diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc index 4134a04..c73e7a3 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc @@ -311,4 +311,5 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Tytu� aktywnego okna" IDC_SYSPARAMS_INACTIVE_TITLE "T�o nag��wka nieaktywnego okna" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Tytu� nieaktywnego okna" + IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" END diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc index eb22685..e43077a 100644 --- a/programs/winecfg/Ro.rc +++ b/programs/winecfg/Ro.rc @@ -307,6 +307,7 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Text bară de titlu activă" IDC_SYSPARAMS_INACTIVE_TITLE "Bară de titlu inactivă" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Text bară de titlu inactivă" + IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" END #pragma code_page(default) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 5037338..889090e 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -307,4 +307,5 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "�� - ��" IDC_SYSPARAMS_INACTIVE_TITLE "�� " IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "�� - ��" + IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" END diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index c484cee..0166f71 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -231,3 +231,4 @@ #define IDC_SYSPARAMS_ACTIVE_TITLE_TEXT 8413 #define IDC_SYSPARAMS_INACTIVE_TITLE 8414 #define IDC_SYSPARAMS_INACTIVE_TITLE_TEXT 8415 +#define IDC_SYSPARAMS_MSGBOX_TEXT 8416 diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 4380eae..5797c96 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -835,6 +835,7 @@ static struct const char *color_reg; int size; COLORREF color; + LOGFONTW lf; } metrics[] = { {-1, COLOR_BTNFACE, "ButtonFace" }, /* IDC_SYSPARAMS_BUTTON */ @@ -852,7 +853,8 @@ static struct {SM_CXSIZE, COLOR_ACTIVECAPTION, "ActiveTitle" }, /* IDC_SYSPARAMS_ACTIVE_TITLE */ {-1, COLOR_CAPTIONTEXT, "TitleText" }, /* IDC_SYSPARAMS_ACTIVE_TITLE_TEXT */ {-1, COLOR_INACTIVECAPTION, "InactiveTitle" }, /* IDC_SYSPARAMS_INACTIVE_TITLE */ - {-1, COLOR_INACTIVECAPTIONTEXT,"InactiveTitleText" } /* IDC_SYSPARAMS_INACTIVE_TITLE_TEXT */ + {-1, COLOR_INACTIVECAPTIONTEXT,"InactiveTitleText" }, /* IDC_SYSPARAMS_INACTIVE_TITLE_TEXT */ + {-1, -1, "MsgBoxText" } /* IDC_SYSPARAMS_MSGBOX_TEXT */ }; static void save_sys_color(int idx, COLORREF clr) @@ -867,6 +869,7 @@ static void read_sysparams(HWND hDlg) { WCHAR buffer[256]; HWND list = GetDlgItem(hDlg, IDC_SYSPARAM_COMBO); + NONCLIENTMETRICSW nonclient_metrics; int i, idx; for (i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++) @@ -881,6 +884,18 @@ static void read_sysparams(HWND hDlg) if (metrics[i].color_idx != -1) metrics[i].color = GetSysColor(metrics[i].color_idx); } + + nonclient_metrics.cbSize = sizeof(NONCLIENTMETRICSW); + SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &nonclient_metrics, 0); + + memcpy(&(metrics[IDC_SYSPARAMS_MENU_TEXT - IDC_SYSPARAMS_BUTTON].lf), + &(nonclient_metrics.lfMenuFont), sizeof(LOGFONTW)); + memcpy(&(metrics[IDC_SYSPARAMS_ACTIVE_TITLE_TEXT - IDC_SYSPARAMS_BUTTON].lf), + &(nonclient_metrics.lfCaptionFont), sizeof(LOGFONTW)); + memcpy(&(metrics[IDC_SYSPARAMS_TOOLTIP_TEXT - IDC_SYSPARAMS_BUTTON].lf), + &(nonclient_metrics.lfStatusFont), sizeof(LOGFONTW)); + memcpy(&(metrics[IDC_SYSPARAMS_MSGBOX_TEXT - IDC_SYSPARAMS_BUTTON].lf), + &(nonclient_metrics.lfMessageFont), sizeof(LOGFONTW)); } static void apply_sysparams(void) @@ -900,6 +915,19 @@ static void apply_sysparams(void) nonclient_metrics.iScrollWidth = nonclient_metrics.iScrollHeight = metrics[IDC_SYSPARAMS_SCROLLBAR - IDC_SYSPARAMS_BUTTON].size; + memcpy(&(nonclient_metrics.lfMenuFont), + &(metrics[IDC_SYSPARAMS_MENU_TEXT - IDC_SYSPARAMS_BUTTON].lf), + sizeof(LOGFONTW)); + memcpy(&(nonclient_metrics.lfCaptionFont), + &(metrics[IDC_SYSPARAMS_ACTIVE_TITLE_TEXT - IDC_SYSPARAMS_BUTTON].lf), + sizeof(LOGFONTW)); + memcpy(&(nonclient_metrics.lfStatusFont), + &(metrics[IDC_SYSPARAMS_TOOLTIP_TEXT - IDC_SYSPARAMS_BUTTON].lf), + sizeof(LOGFONTW)); + memcpy(&(nonclient_metrics.lfMessageFont), + &(metrics[IDC_SYSPARAMS_MSGBOX_TEXT - IDC_SYSPARAMS_BUTTON].lf), + sizeof(LOGFONTW)); + SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(nonclient_metrics), &nonclient_metrics, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); @@ -932,6 +960,13 @@ static void on_sysparam_change(HWND hDlg) else set_text(hDlg, IDC_SYSPARAM_SIZE, ""); + EnableWindow(GetDlgItem(hDlg, IDC_SYSPARAM_FONT), + index == IDC_SYSPARAMS_MENU_TEXT-IDC_SYSPARAMS_BUTTON || + index == IDC_SYSPARAMS_ACTIVE_TITLE_TEXT-IDC_SYSPARAMS_BUTTON || + index == IDC_SYSPARAMS_TOOLTIP_TEXT-IDC_SYSPARAMS_BUTTON || + index == IDC_SYSPARAMS_MSGBOX_TEXT-IDC_SYSPARAMS_BUTTON + ); + updating_ui = FALSE; } @@ -970,6 +1005,21 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) } } +static void on_select_font(HWND hDlg) +{ + CHOOSEFONTW cf; + int index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETCURSEL, 0, 0); + index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETITEMDATA, index, 0); + + ZeroMemory(&cf, sizeof(cf)); + cf.lStructSize = sizeof(CHOOSEFONTW); + cf.hwndOwner = hDlg; + cf.lpLogFont = &(metrics[index].lf); + cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT | CF_NOSCRIPTSEL; + + ChooseFontW(&cf); +} + INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1030,6 +1080,10 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) on_theme_install (hDlg); break; + case IDC_SYSPARAM_FONT: + on_select_font(hDlg); + break; + case IDC_BROWSE_SFPATH: if (browse_for_unix_folder(hDlg, psfiSelected->szLinkTarget)) { update_shell_folder_listview(hDlg);

1 0

Nigel Liang : winecfg: Add trackbar to set screen resolution in graphics tab.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: e027f0297e378c5ee441fda119b2decdc2585deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e027f0297e378c5ee441fda11… Author: Nigel Liang <ncliang(a)gmail.com> Date: Mon Jul 30 15:16:51 2007 -0700 winecfg: Add trackbar to set screen resolution in graphics tab. --- programs/winecfg/Bg.rc | 32 +++++++++++++---------- programs/winecfg/Cs.rc | 4 +++ programs/winecfg/De.rc | 4 +++ programs/winecfg/En.rc | 12 ++++++--- programs/winecfg/Es.rc | 4 +++ programs/winecfg/Fi.rc | 32 +++++++++++++---------- programs/winecfg/Fr.rc | 4 +++ programs/winecfg/Hu.rc | 32 +++++++++++++---------- programs/winecfg/It.rc | 4 +++ programs/winecfg/Ja.rc | 6 ++++- programs/winecfg/Ko.rc | 4 +++ programs/winecfg/Nl.rc | 4 +++ programs/winecfg/No.rc | 32 +++++++++++++---------- programs/winecfg/Pl.rc | 4 +++ programs/winecfg/Pt.rc | 4 +++ programs/winecfg/Ro.rc | 4 +++ programs/winecfg/Ru.rc | 6 ++++- programs/winecfg/Si.rc | 4 +++ programs/winecfg/Tr.rc | 32 +++++++++++++---------- programs/winecfg/resource.h | 3 ++ programs/winecfg/winecfg.h | 1 + programs/winecfg/x11drvdlg.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 22 files changed, 211 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e027f0297e378c5ee441f…

1 0

Jacek Caban : winhttp: Added winhttp.dll.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 21572967db5f8b8ba05f791dd0708c9216f46ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21572967db5f8b8ba05f791dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 31 00:54:42 2007 +0200 winhttp: Added winhttp.dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/winhttp/Makefile.in | 12 ++++++ dlls/winhttp/main.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp.spec | 31 ++++++++++++++++ 7 files changed, 134 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 48cba1a..7ae3049 100644 --- a/Makefile.in +++ b/Makefile.in @@ -425,6 +425,7 @@ ALL_MAKEFILES = \ dlls/winequartz.drv/Makefile \ dlls/winex11.drv/Makefile \ dlls/wing32/Makefile \ + dlls/winhttp/Makefile \ dlls/wininet/Makefile \ dlls/wininet/tests/Makefile \ dlls/winmm/Makefile \ @@ -786,6 +787,7 @@ dlls/wineps.drv/Makefile: dlls/wineps.drv/Makefile.in dlls/Makedll.rules dlls/winequartz.drv/Makefile: dlls/winequartz.drv/Makefile.in dlls/Makedll.rules dlls/winex11.drv/Makefile: dlls/winex11.drv/Makefile.in dlls/Makedll.rules dlls/wing32/Makefile: dlls/wing32/Makefile.in dlls/Makedll.rules +dlls/winhttp/Makefile: dlls/winhttp/Makefile.in dlls/Makedll.rules dlls/wininet/Makefile: dlls/wininet/Makefile.in dlls/Makedll.rules dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.rules dlls/winmm/Makefile: dlls/winmm/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 6a55924..14b4aa6 100755 --- a/configure +++ b/configure @@ -20799,6 +20799,8 @@ ac_config_files="$ac_config_files dlls/winex11.drv/Makefile" ac_config_files="$ac_config_files dlls/wing32/Makefile" +ac_config_files="$ac_config_files dlls/winhttp/Makefile" + ac_config_files="$ac_config_files dlls/wininet/Makefile" ac_config_files="$ac_config_files dlls/wininet/tests/Makefile" @@ -21790,6 +21792,7 @@ do "dlls/winequartz.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winequartz.drv/Makefile" ;; "dlls/winex11.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winex11.drv/Makefile" ;; "dlls/wing32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wing32/Makefile" ;; + "dlls/winhttp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winhttp/Makefile" ;; "dlls/wininet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/Makefile" ;; "dlls/wininet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/tests/Makefile" ;; "dlls/winmm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/Makefile" ;; diff --git a/configure.ac b/configure.ac index 8687171..9a1ec62 100644 --- a/configure.ac +++ b/configure.ac @@ -1825,6 +1825,7 @@ AC_CONFIG_FILES([dlls/wineps.drv/Makefile]) AC_CONFIG_FILES([dlls/winequartz.drv/Makefile]) AC_CONFIG_FILES([dlls/winex11.drv/Makefile]) AC_CONFIG_FILES([dlls/wing32/Makefile]) +AC_CONFIG_FILES([dlls/winhttp/Makefile]) AC_CONFIG_FILES([dlls/wininet/Makefile]) AC_CONFIG_FILES([dlls/wininet/tests/Makefile]) AC_CONFIG_FILES([dlls/winmm/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 39e3c65..72b2e36 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -212,6 +212,7 @@ BASEDIRS = \ wineoss.drv \ wineps.drv \ wing32 \ + winhttp \ wininet \ winmm \ winnls32 \ diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in new file mode 100644 index 0000000..7e76b1e --- /dev/null +++ b/dlls/winhttp/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = winhttp +IMPORTS = kernel32 + +C_SRCS = main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c new file mode 100644 index 0000000..e90352d --- /dev/null +++ b/dlls/winhttp/main.c @@ -0,0 +1,84 @@ +/* + * Copyright 2007 Jacek Caban 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winhttp); + +/****************************************************************** + * DllMain (winhttp.@) + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +/****************************************************************** + * DllGetClassObject (winhttp.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/****************************************************************** + * DllCanUnloadNow (winhttp.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME("()\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (winhttp.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("()\n"); + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (winhttp.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("()\n"); + return S_OK; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec new file mode 100644 index 0000000..73eae07 --- /dev/null +++ b/dlls/winhttp/winhttp.spec @@ -0,0 +1,31 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stub WinHttpAddRequestHeaders +@ stub WinHttpCheckPlatform +@ stub WinHttpCloseHandle +@ stub WinHttpConnect +@ stub WinHttpCrackUrl +@ stub WinHttpCreateUrl +@ stub WinHttpDetectAutoProxyConfigUrl +@ stub WinHttpGetDefaultProxyConfiguration +@ stub WinHttpGetIEProxyConfigForCurrentUser +@ stub WinHttpGetProxyForUrl +@ stub WinHttpOpen +@ stub WinHttpOpenRequest +@ stub WinHttpQueryAuthSchemes +@ stub WinHttpQueryDataAvailable +@ stub WinHttpQueryHeaders +@ stub WinHttpQueryOption +@ stub WinHttpReadData +@ stub WinHttpReceiveResponse +@ stub WinHttpSendRequest +@ stub WinHttpSetCredentials +@ stub WinHttpSetDefaultProxyConfiguration +@ stub WinHttpSetOption +@ stub WinHttpSetStatusCallback +@ stub WinHttpSetTimeouts +@ stub WinHttpTimeFromSystemTime +@ stub WinHttpTimeToSystemTime +@ stub WinHttpWriteData

1 0

Dmitry Timoshkov : winecfg: Fix some compatibility problems.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 43a072b1cbf30ec3fbea605ee73d4559afe9b436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a072b1cbf30ec3fbea605ee… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jul 30 21:23:03 2007 +0900 winecfg: Fix some compatibility problems. --- programs/winecfg/drive.c | 8 ++++---- programs/winecfg/libraries.c | 1 + programs/winecfg/theme.c | 10 ++++++++++ programs/winecfg/winecfg.c | 16 ++++++++-------- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index 69b5699..dd3befd 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -168,10 +168,10 @@ static DWORD get_drive_type( char letter ) if (!RegQueryValueExA( hKey, driveValue, NULL, NULL, (LPBYTE)buffer, &size )) { WINE_TRACE("Got type '%s' for %s\n", buffer, driveValue ); - if (!strcasecmp( buffer, "hd" )) ret = DRIVE_FIXED; - else if (!strcasecmp( buffer, "network" )) ret = DRIVE_REMOTE; - else if (!strcasecmp( buffer, "floppy" )) ret = DRIVE_REMOVABLE; - else if (!strcasecmp( buffer, "cdrom" )) ret = DRIVE_CDROM; + if (!lstrcmpi( buffer, "hd" )) ret = DRIVE_FIXED; + else if (!lstrcmpi( buffer, "network" )) ret = DRIVE_REMOTE; + else if (!lstrcmpi( buffer, "floppy" )) ret = DRIVE_REMOVABLE; + else if (!lstrcmpi( buffer, "cdrom" )) ret = DRIVE_CDROM; } RegCloseKey(hKey); } diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 78f694b..8e4e46b 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #define NONAMELESSUNION #define WIN32_LEAN_AND_MEAN diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index ee18840..4380eae 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -22,11 +22,21 @@ * */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <stdlib.h> #include <stdio.h> +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif +#ifdef HAVE_DIRECT_H +#include <direct.h> +#endif #define COBJMACROS diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 42f03fb..0aa051b 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -317,9 +317,9 @@ char *get_reg_key(HKEY root, const char *path, const char *name, const char *def s = LIST_ENTRY(cursor, struct setting, entry); if (root != s->root) continue; - if (strcasecmp(path, s->path) != 0) continue; + if (lstrcmpi(path, s->path) != 0) continue; if (!s->name) continue; - if (strcasecmp(name, s->name) != 0) continue; + if (lstrcmpi(name, s->name) != 0) continue; WINE_TRACE("found %s:%s in settings list, returning %s\n", path, name, s->value); return s->value ? strdupA(s->value) : NULL; @@ -363,8 +363,8 @@ static void set_reg_key_ex(HKEY root, const char *path, const char *name, const struct setting *s = LIST_ENTRY(cursor, struct setting, entry); if (root != s->root) continue; - if (strcasecmp(s->path, path) != 0) continue; - if ((s->name && name) && strcasecmp(s->name, name) != 0) continue; + if (lstrcmpi(s->path, path) != 0) continue; + if ((s->name && name) && lstrcmpi(s->name, name) != 0) continue; /* are we attempting a double delete? */ if (!s->name && !name) return; @@ -463,8 +463,8 @@ char **enumerate_values(HKEY root, char *path) LIST_FOR_EACH( cursor, settings ) { struct setting *s = LIST_ENTRY(cursor, struct setting, entry); - if (strcasecmp(s->path, path) != 0) continue; - if (strcasecmp(s->name, name) != 0) continue; + if (lstrcmpi(s->path, path) != 0) continue; + if (lstrcmpi(s->name, name) != 0) continue; if (!s->value) { @@ -503,13 +503,13 @@ char **enumerate_values(HKEY root, char *path) struct setting *setting = LIST_ENTRY(cursor, struct setting, entry); BOOL found = FALSE; - if (strcasecmp(setting->path, path) != 0) continue; + if (lstrcmpi(setting->path, path) != 0) continue; if (!setting->value) continue; for (i = 0; i < valueslen; i++) { - if (strcasecmp(setting->name, values[i]) == 0) + if (lstrcmpi(setting->name, values[i]) == 0) { found = TRUE; break;

1 0

Alexandre Julliard : Avoid non-portable Unix mode bits macros.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 0faf3f8a1a171aa0a7c148c0c3e57be193464c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0faf3f8a1a171aa0a7c148c0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 13:18:03 2007 +0200 Avoid non-portable Unix mode bits macros. --- dlls/shell32/shellpath.c | 4 ++-- programs/winecfg/theme.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8c05aaf..241b4a7 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2040,7 +2040,7 @@ static void _SHCreateSymbolicLinks(void) for (i = 0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { strcpy(szMyStuffTarget, szPersonalTarget); if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget, S_IRWXU|S_IRWXG|S_IRWXO); + mkdir(szMyStuffTarget, 0777); } } else @@ -2061,7 +2061,7 @@ static void _SHCreateSymbolicLinks(void) for (i = 0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { strcpy(szMyStuffTarget, szPersonalTarget); if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget, S_IRWXU|S_IRWXG|S_IRWXO); + mkdir(szMyStuffTarget, 0777); } } diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 4f3a377..ee18840 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -813,7 +813,7 @@ static void apply_shell_folder_changes(void) { if (!lstat(szBackupPath, &statPath) && S_ISDIR(statPath.st_mode)) { rename(szBackupPath, szUnixPath); } else { - mkdir(szUnixPath, S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH); + mkdir(szUnixPath, 0777); } } }

1 0

Maarten Lankhorst : winealsa: Implement a light form of locking for dsoutput.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 3d3d4e2c8bac3522bad14eab30e3fcf8853900bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3d4e2c8bac3522bad14eab3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jul 29 16:17:22 2007 +0200 winealsa: Implement a light form of locking for dsoutput. --- dlls/winealsa.drv/dsoutput.c | 111 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 97 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index bfe10a6..0c50969 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -88,7 +88,7 @@ struct IDsDriverBufferImpl snd_pcm_t *pcm; snd_pcm_hw_params_t *hw_params; snd_pcm_sw_params_t *sw_params; - snd_pcm_uframes_t mmap_buflen_frames, mmap_pos, mmap_commitahead, mmap_writeahead; + snd_pcm_uframes_t mmap_buflen_frames, mmap_pos, mmap_commitahead; }; /** Fill buffers, for starting and stopping @@ -225,7 +225,7 @@ static int DSDB_CreateMMAP(IDsDriverBufferImpl* pdbi) return DSERR_GENERIC; } snd_pcm_format_set_silence(format, areas->addr, pdbi->mmap_buflen_frames); - err = snd_pcm_mmap_commit(pcm, ofs, avail); + pdbi->mmap_pos = ofs + snd_pcm_mmap_commit(pcm, ofs, 0); pdbi->mmap_buffer = areas->addr; TRACE("created mmap buffer of %ld frames (%d bytes) at %p\n", @@ -284,16 +284,88 @@ static HRESULT WINAPI IDsDriverBufferImpl_Lock(PIDSDRIVERBUFFER iface, DWORD dwWritePosition,DWORD dwWriteLen, DWORD dwFlags) { - FIXME("(%p) stub\n", iface); - return DSERR_UNSUPPORTED; + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; + snd_pcm_uframes_t writepos; + + TRACE("%d bytes from %d\n", dwWriteLen, dwWritePosition); + + /* **** */ + EnterCriticalSection(&This->pcm_crst); + + if (dwWriteLen > This->mmap_buflen_bytes || dwWritePosition >= This->mmap_buflen_bytes) + { + /* **** */ + LeaveCriticalSection(&This->pcm_crst); + return DSERR_INVALIDPARAM; + } + + if (ppvAudio2) *ppvAudio2 = NULL; + if (pdwLen2) *pdwLen2 = 0; + + *ppvAudio1 = (LPBYTE)This->mmap_buffer + dwWritePosition; + *pdwLen1 = dwWriteLen; + + if (dwWritePosition+dwWriteLen > This->mmap_buflen_bytes) + { + DWORD remainder = This->mmap_buflen_bytes - dwWritePosition; + *pdwLen1 = remainder; + + if (ppvAudio2 && pdwLen2) + { + *ppvAudio2 = This->mmap_buffer; + *pdwLen2 = dwWriteLen - remainder; + } + else dwWriteLen = remainder; + } + + writepos = snd_pcm_bytes_to_frames(This->pcm, dwWritePosition); + if (writepos == This->mmap_pos && snd_pcm_state(This->pcm) == SND_PCM_STATE_RUNNING) + { + const snd_pcm_channel_area_t *areas; + snd_pcm_uframes_t writelen = snd_pcm_bytes_to_frames(This->pcm, dwWriteLen), putin = writelen; + TRACE("Hit mmap_pos, locking data!\n"); + snd_pcm_mmap_begin(This->pcm, &areas, &This->mmap_pos, &putin); + } + + LeaveCriticalSection(&This->pcm_crst); + /* **** */ + return DS_OK; } static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, LPVOID pvAudio1,DWORD dwLen1, LPVOID pvAudio2,DWORD dwLen2) { - FIXME("(%p) stub\n", iface); - return DSERR_UNSUPPORTED; + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; + snd_pcm_uframes_t writepos; + + if (!dwLen1) + return DS_OK; + + /* **** */ + EnterCriticalSection(&This->pcm_crst); + + writepos = snd_pcm_bytes_to_frames(This->pcm, (DWORD_PTR)pvAudio1 - (DWORD_PTR)This->mmap_buffer); + if (writepos == This->mmap_pos) + { + const snd_pcm_channel_area_t *areas; + snd_pcm_uframes_t writelen = snd_pcm_bytes_to_frames(This->pcm, dwLen1); + TRACE("Committing data\n"); + This->mmap_pos += snd_pcm_mmap_commit(This->pcm, This->mmap_pos, writelen); + if (This->mmap_pos == This->mmap_buflen_frames) + This->mmap_pos = 0; + if (!This->mmap_pos && dwLen2) + { + writelen = snd_pcm_bytes_to_frames(This->pcm, dwLen2); + snd_pcm_mmap_begin(This->pcm, &areas, &This->mmap_pos, &writelen); + This->mmap_pos += snd_pcm_mmap_commit(This->pcm, This->mmap_pos, writelen); + assert(This->mmap_pos < This->mmap_buflen_frames); + } + } + LeaveCriticalSection(&This->pcm_crst); + /* **** */ + + return DS_OK; } static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL forced) @@ -384,7 +456,6 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo This->mmap_commitahead = 3 * psize; while (This->mmap_commitahead <= 512) This->mmap_commitahead += psize; - This->mmap_writeahead = This->mmap_commitahead; if (This->pcm) { @@ -462,6 +533,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, snd_pcm_uframes_t hw_pptr=0, hw_wptr=0; snd_pcm_state_t state; + /* **** */ EnterCriticalSection(&This->pcm_crst); if (!This->pcm) @@ -471,6 +543,9 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, return DSERR_GENERIC; } + if (!lpdwPlay && !lpdwWrite) + CommitAll(This); + state = snd_pcm_state(This->pcm); if (state != SND_PCM_STATE_PREPARED && state != SND_PCM_STATE_RUNNING) @@ -480,21 +555,20 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, } if (state == SND_PCM_STATE_RUNNING) { - snd_pcm_uframes_t used = CommitAll(This); + snd_pcm_uframes_t used = This->mmap_buflen_frames - snd_pcm_avail_update(This->pcm); if (This->mmap_pos > used) hw_pptr = This->mmap_pos - used; else - hw_pptr = This->mmap_buflen_frames - used + This->mmap_pos; - - hw_wptr = hw_pptr + (This->mmap_writeahead > used ? used : This->mmap_writeahead); - hw_wptr %= This->mmap_buflen_frames; + hw_pptr = This->mmap_buflen_frames + This->mmap_pos - used; hw_pptr %= This->mmap_buflen_frames; + hw_wptr = This->mmap_pos; TRACE("At position: %ld (%ld) - Used %ld\n", hw_pptr, This->mmap_pos, used); } LeaveCriticalSection(&This->pcm_crst); + /* **** */ if (lpdwPlay) *lpdwPlay = snd_pcm_frames_to_bytes(This->pcm, hw_pptr); @@ -512,8 +586,8 @@ static HRESULT WINAPI IDsDriverBufferImpl_Play(PIDSDRIVERBUFFER iface, DWORD dwR /* **** */ EnterCriticalSection(&This->pcm_crst); - snd_pcm_start(This->pcm); CommitAll(This); + snd_pcm_start(This->pcm); /* **** */ LeaveCriticalSection(&This->pcm_crst); return DS_OK; @@ -521,13 +595,22 @@ static HRESULT WINAPI IDsDriverBufferImpl_Play(PIDSDRIVERBUFFER iface, DWORD dwR static HRESULT WINAPI IDsDriverBufferImpl_Stop(PIDSDRIVERBUFFER iface) { + const snd_pcm_channel_area_t *areas; + snd_pcm_uframes_t avail; + snd_pcm_format_t format; IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; TRACE("(%p)\n",iface); /* **** */ EnterCriticalSection(&This->pcm_crst); + avail = This->mmap_buflen_frames; snd_pcm_drop(This->pcm); snd_pcm_prepare(This->pcm); + snd_pcm_mmap_begin(This->pcm, &areas, &This->mmap_pos, &avail); + snd_pcm_hw_params_get_format(This->hw_params, &format); + snd_pcm_format_set_silence(format, areas->addr, This->mmap_buflen_frames); + This->mmap_pos += snd_pcm_mmap_commit(This->pcm, This->mmap_pos, avail); + /* **** */ LeaveCriticalSection(&This->pcm_crst); return DS_OK; @@ -585,7 +668,7 @@ static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, PDSDRIVERDES IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p,%p)\n",iface,pDesc); memcpy(pDesc, &(WOutDev[This->wDevID].ds_desc), sizeof(DSDRIVERDESC)); - pDesc->dwFlags = DSDDESC_DONTNEEDPRIMARYLOCK | DSDDESC_DONTNEEDSECONDARYLOCK | DSDDESC_DONTNEEDWRITELEAD; + pDesc->dwFlags = DSDDESC_DONTNEEDSECONDARYLOCK | DSDDESC_DONTNEEDWRITELEAD; pDesc->dnDevNode = WOutDev[This->wDevID].waveDesc.dnDevNode; pDesc->wVxdId = 0; pDesc->wReserved = 0;

1 0

Evan Stade : gdi32: Handle PS_USERSTYLE in ExtCreatePen.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: eca194da7f733a89fea56a4d6c481710cc1ff93a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca194da7f733a89fea56a4d6… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 30 19:09:19 2007 -0700 gdi32: Handle PS_USERSTYLE in ExtCreatePen. --- dlls/gdi32/pen.c | 32 ++++++++++++++++++++++++++++---- dlls/gdi32/tests/pen.c | 24 ++++++------------------ 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 3dd545b..2703ecc 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -123,14 +123,38 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, if ((style & PS_STYLE_MASK) == PS_USERSTYLE) { - if (!style_count || (style_count > 16) || !style_bits) + if(((INT)style_count) <= 0) + return 0; + + if ((style_count > 16) || !style_bits) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } - /* FIXME: PS_USERSTYLE workaround */ - FIXME("PS_USERSTYLE not handled\n"); - style = (style & ~PS_STYLE_MASK) | PS_SOLID; + + if ((style & PS_TYPE_MASK) == PS_COSMETIC) + { + /* FIXME: PS_USERSTYLE workaround */ + FIXME("PS_COSMETIC | PS_USERSTYLE not handled\n"); + style = (style & ~PS_STYLE_MASK) | PS_SOLID; + } + else + { + UINT i; + BOOL has_neg = FALSE, all_zero = TRUE; + + for(i = 0; (i < style_count) && !has_neg; i++) + { + has_neg = has_neg || (((INT)(style_bits[i])) < 0); + all_zero = all_zero && (style_bits[i] == 0); + } + + if(all_zero || has_neg) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + } } else { diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 0de3f0d..ada892b 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -409,12 +409,6 @@ test_geometric_pens: ok(ext_pen.elp.elpPenStyle == pen[i].ret_style, "expected %x, got %x\n", pen[i].ret_style, ext_pen.elp.elpPenStyle); else { -if (pen[i].style == PS_USERSTYLE) -{ - todo_wine - ok(ext_pen.elp.elpPenStyle == (PS_GEOMETRIC | pen[i].style), "expected %x, got %x\n", PS_GEOMETRIC | pen[i].style, ext_pen.elp.elpPenStyle); -} -else ok(ext_pen.elp.elpPenStyle == (PS_GEOMETRIC | pen[i].style), "expected %x, got %x\n", PS_GEOMETRIC | pen[i].style, ext_pen.elp.elpPenStyle); } @@ -510,8 +504,7 @@ static void test_ps_userstyle(void) pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 0, style); ok(pen == 0, "ExtCreatePen should fail\n"); - todo_wine - expect(0xdeadbeef, GetLastError()); + expect(0xdeadbeef, GetLastError()); DeleteObject(pen); SetLastError(0xdeadbeef); @@ -523,24 +516,19 @@ static void test_ps_userstyle(void) pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, -1, style); ok(pen == 0, "ExtCreatePen should fail\n"); - todo_wine - expect(0xdeadbeef, GetLastError()); + expect(0xdeadbeef, GetLastError()); DeleteObject(pen); SetLastError(0xdeadbeef); pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 5, bad_style); - todo_wine - ok(pen == 0, "ExtCreatePen should fail\n"); - todo_wine - expect(ERROR_INVALID_PARAMETER, GetLastError()); + ok(pen == 0, "ExtCreatePen should fail\n"); + expect(ERROR_INVALID_PARAMETER, GetLastError()); DeleteObject(pen); SetLastError(0xdeadbeef); pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 5, bad_style2); - todo_wine - ok(pen == 0, "ExtCreatePen should fail\n"); - todo_wine - expect(ERROR_INVALID_PARAMETER, GetLastError()); + ok(pen == 0, "ExtCreatePen should fail\n"); + expect(ERROR_INVALID_PARAMETER, GetLastError()); DeleteObject(pen); SetLastError(0xdeadbeef);

1 0