March 2011 - wine-commits

Piotr Caban : msvcrt: Don't call get_locale two times in _isctype function.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: f421d22e5a5c9fb0aeeeb0f772598fe1552c990f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f421d22e5a5c9fb0aeeeb0f77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 31 17:09:09 2011 +0200 msvcrt: Don't call get_locale two times in _isctype function. --- dlls/msvcrt/ctype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 7e7d9f0..ba9d9ba 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -85,8 +85,8 @@ int CDECL _isctype(int c, int type) *pconv++ = (UINT)c >> 8; *pconv++ = c & 0xff; *pconv = 0; - /* FIXME: Use ctype LCID, not lc_all */ - if (GetStringTypeExA(get_locale()->locinfo->lc_handle[MSVCRT_LC_CTYPE], + + if (GetStringTypeExA(locale->locinfo->lc_handle[MSVCRT_LC_CTYPE], CT_CTYPE1, convert, convert[1] ? 2 : 1, &typeInfo)) return typeInfo & type; }

1 0

Piotr Caban : msvcrt: Fix locale creation for multibyte encoding.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 68239a620c631ef19797de7e65e6dc6603198b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68239a620c631ef19797de7e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 31 17:07:58 2011 +0200 msvcrt: Fix locale creation for multibyte encoding. --- dlls/msvcrt/locale.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 2f2be43..7da61d8 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -746,6 +746,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) if(lcid[MSVCRT_LC_CTYPE] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_CTYPE)) { CPINFO cp; + int j; if(update_threadlocinfo_category(lcid[MSVCRT_LC_CTYPE], loc, MSVCRT_LC_CTYPE)) { MSVCRT__free_locale(loc); @@ -778,8 +779,11 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) GetStringTypeA(lcid[MSVCRT_LC_CTYPE], CT_CTYPE1, buf, 1, loc->locinfo->ctype1+i); - loc->locinfo->ctype1[i] |= 0x200; } + + for(i=0; cp.LeadByte[i+1]!=0; i+=2) + for(j=cp.LeadByte[i]; j<=cp.LeadByte[i+1]; j++) + loc->locinfo->ctype1[j+1] |= MSVCRT__LEADBYTE; } else { loc->locinfo->lc_clike = 1; loc->locinfo->mb_cur_max = 1; @@ -787,8 +791,13 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) loc->locinfo->lc_category[MSVCRT_LC_CTYPE].locale = _strdup("C"); } - for(i=0; i<256; i++) - buf[i] = i; + for(i=0; i<256; i++) { + if(loc->locinfo->pctype[i] & MSVCRT__LEADBYTE) + buf[i] = ' '; + else + buf[i] = i; + + } LCMapStringA(lcid[MSVCRT_LC_CTYPE], LCMAP_LOWERCASE, buf, 256, (char*)loc->locinfo->pclmap, 256);

1 0

Francois Gouget : msvcrt/tests: Wine should not have trouble with the environ pointers so replace a few skip ()s with win_skip()s.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 709b42346ab855b97578d6304fa972bb6a7aa9d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=709b42346ab855b97578d6304… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 31 13:06:23 2011 +0200 msvcrt/tests: Wine should not have trouble with the environ pointers so replace a few skip()s with win_skip()s. --- dlls/msvcrt/tests/environ.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 9e1263a..fdfe81f 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -93,7 +93,7 @@ static void test__environ(void) "Expected _environ pointers to be identical\n" ); } else - skip( "__p__environ() is not available\n" ); + win_skip( "__p__environ() is not available\n" ); /* Note that msvcrt from Windows versions older than Vista * expects the mode pointer parameter to be valid.*/ @@ -138,7 +138,7 @@ static void test__wenviron(void) ok( *p_wenviron == NULL, "Expected _wenviron to be NULL, got %p\n", *p_wenviron ); else { - skip( "Pointer to _wenviron is not valid\n" ); + win_skip( "Pointer to _wenviron is not valid\n" ); return; } @@ -149,7 +149,7 @@ static void test__wenviron(void) "Expected _wenviron pointers to be NULL\n" ); } else - skip( "__p__wenviron() is not available\n" ); + win_skip( "__p__wenviron() is not available\n" ); /* __getmainargs doesn't initialize _wenviron. */ __getmainargs(&argc, &argv, &envp, 0, &mode);

1 0

Francois Gouget : wintab32/tests: Remove an unused variable.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 46ad9cd7f14df1115bc617519af37504612d57df URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ad9cd7f14df1115bc617519… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 31 12:47:48 2011 +0200 wintab32/tests: Remove an unused variable. --- dlls/wintab32/tests/context.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wintab32/tests/context.c b/dlls/wintab32/tests/context.c index c9f13fa..6b37129 100644 --- a/dlls/wintab32/tests/context.c +++ b/dlls/wintab32/tests/context.c @@ -25,7 +25,6 @@ #include "wine/test.h" static const CHAR wintab32Dll[] = "Wintab32.dll"; -static const CHAR defaultWindowName[] = "Wintab Test"; static const CHAR wintabTestWindowClassName[] = "WintabTestWnd"; static const CHAR contextName[] = "TestContext"; static const UINT X = 0;

1 0

Francois Gouget : winhlp32: Remove the unimplemented help color and visibility menus.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 3767e9a2dcd67db9043398ea6e719e835e145e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3767e9a2dcd67db9043398ea6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 31 12:44:31 2011 +0200 winhlp32: Remove the unimplemented help color and visibility menus. --- po/ar.po | 70 +++++++++++++++------------------------ po/bg.po | 70 +++++++++++++++------------------------ po/ca.po | 70 +++++++++++++++------------------------ po/cs.po | 70 +++++++++++++++------------------------ po/da.po | 70 +++++++++++++++------------------------ po/de.po | 70 +++++++++++++++------------------------ po/el.po | 70 +++++++++++++++------------------------ po/en.po | 70 +++++++++++++++------------------------ po/en_US.po | 70 +++++++++++++++------------------------ po/eo.po | 70 +++++++++++++++------------------------ po/es.po | 70 +++++++++++++++------------------------ po/fa.po | 70 +++++++++++++++------------------------ po/fi.po | 70 +++++++++++++++------------------------ po/fr.po | 70 +++++++++++++++------------------------ po/he.po | 70 +++++++++++++++------------------------ po/hi.po | 70 +++++++++++++++------------------------ po/hu.po | 70 +++++++++++++++------------------------ po/it.po | 70 +++++++++++++++------------------------ po/ja.po | 70 +++++++++++++++------------------------ po/ko.po | 70 +++++++++++++++------------------------ po/lt.po | 70 +++++++++++++++------------------------ po/ml.po | 70 +++++++++++++++------------------------ po/nb_NO.po | 70 +++++++++++++++------------------------ po/nl.po | 70 +++++++++++++++------------------------ po/or.po | 70 +++++++++++++++------------------------ po/pa.po | 70 +++++++++++++++------------------------ po/pl.po | 70 +++++++++++++++------------------------ po/pt_BR.po | 70 +++++++++++++++------------------------ po/pt_PT.po | 70 +++++++++++++++------------------------ po/rm.po | 70 +++++++++++++++------------------------ po/ro.po | 70 +++++++++++++++------------------------ po/ru.po | 70 +++++++++++++++------------------------ po/sk.po | 70 +++++++++++++++------------------------ po/sl.po | 70 +++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 70 +++++++++++++++------------------------ po/sr_RS(a)latin.po | 70 +++++++++++++++------------------------ po/sv.po | 70 +++++++++++++++------------------------ po/te.po | 70 +++++++++++++++------------------------ po/th.po | 70 +++++++++++++++------------------------ po/tr.po | 70 +++++++++++++++------------------------ po/uk.po | 70 +++++++++++++++------------------------ po/wa.po | 70 +++++++++++++++------------------------ po/wine.pot | 70 +++++++++++++++------------------------ po/zh_CN.po | 70 +++++++++++++++------------------------ po/zh_TW.po | 70 +++++++++++++++------------------------ programs/winhlp32/winhelp.c | 9 ----- programs/winhlp32/winhelp_res.h | 8 ---- programs/winhlp32/winhlp32.rc | 14 -------- 48 files changed, 1215 insertions(+), 1966 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3767e9a2dcd67db904339…

1 0

Francois Gouget : winhlp32: Implement MACRO_HelpOnTop() and thus the corresponding menu.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 2b12e89d5e89229348cb13b49a45091e8236f37e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b12e89d5e89229348cb13b49… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 31 12:44:21 2011 +0200 winhlp32: Implement MACRO_HelpOnTop() and thus the corresponding menu. --- programs/winhlp32/macro.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 3151e0d..7f3328f 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -488,7 +488,29 @@ void CALLBACK MACRO_HelpOn(void) void CALLBACK MACRO_HelpOnTop(void) { - WINE_FIXME("()\n"); + static BOOL on_top = FALSE; + WINHELP_WINDOW *win; + HWND main_wnd = NULL; + HMENU menu; + + for (win = Globals.win_list; win; win = win->next) + if (!lstrcmpi(win->info->name, "main")) + main_wnd = win->hMainWnd; + if (!main_wnd) + { + WINE_ERR("could not find the main window!\n"); + return; + } + menu = GetMenu(main_wnd); + + on_top = !on_top; + if (on_top) { + CheckMenuItem(menu, MNID_HELP_HELPTOP, MF_BYCOMMAND|MF_CHECKED); + SetWindowPos(main_wnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); + } else { + CheckMenuItem(menu, MNID_HELP_HELPTOP, MF_BYCOMMAND|MF_UNCHECKED); + SetWindowPos(main_wnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); + } } void CALLBACK MACRO_History(void)

1 0

Francois Gouget : regedit: Remove the unimplemented menus to connect to remote registries.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 7a569851d39b8a89505bcf0b468ae0ae6a8ae2e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a569851d39b8a89505bcf0b4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 31 12:43:51 2011 +0200 regedit: Remove the unimplemented menus to connect to remote registries. --- po/ar.po | 176 +++++++++++++++++++----------------------- po/bg.po | 176 +++++++++++++++++++----------------------- po/ca.po | 176 +++++++++++++++++++----------------------- po/cs.po | 176 +++++++++++++++++++----------------------- po/da.po | 176 +++++++++++++++++++----------------------- po/de.po | 176 +++++++++++++++++++----------------------- po/el.po | 176 +++++++++++++++++++----------------------- po/en.po | 176 +++++++++++++++++++----------------------- po/en_US.po | 176 +++++++++++++++++++----------------------- po/eo.po | 176 +++++++++++++++++++----------------------- po/es.po | 176 +++++++++++++++++++----------------------- po/fa.po | 176 +++++++++++++++++++----------------------- po/fi.po | 176 +++++++++++++++++++----------------------- po/fr.po | 176 +++++++++++++++++++----------------------- po/he.po | 176 +++++++++++++++++++----------------------- po/hi.po | 176 +++++++++++++++++++----------------------- po/hu.po | 176 +++++++++++++++++++----------------------- po/it.po | 176 +++++++++++++++++++----------------------- po/ja.po | 176 +++++++++++++++++++----------------------- po/ko.po | 176 +++++++++++++++++++----------------------- po/lt.po | 176 +++++++++++++++++++----------------------- po/ml.po | 176 +++++++++++++++++++----------------------- po/nb_NO.po | 176 +++++++++++++++++++----------------------- po/nl.po | 176 +++++++++++++++++++----------------------- po/or.po | 176 +++++++++++++++++++----------------------- po/pa.po | 176 +++++++++++++++++++----------------------- po/pl.po | 176 +++++++++++++++++++----------------------- po/pt_BR.po | 176 +++++++++++++++++++----------------------- po/pt_PT.po | 176 +++++++++++++++++++----------------------- po/rm.po | 176 +++++++++++++++++++----------------------- po/ro.po | 176 +++++++++++++++++++----------------------- po/ru.po | 176 +++++++++++++++++++----------------------- po/sk.po | 176 +++++++++++++++++++----------------------- po/sl.po | 176 +++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 176 +++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 176 +++++++++++++++++++----------------------- po/sv.po | 176 +++++++++++++++++++----------------------- po/te.po | 176 +++++++++++++++++++----------------------- po/th.po | 176 +++++++++++++++++++----------------------- po/tr.po | 176 +++++++++++++++++++----------------------- po/uk.po | 176 +++++++++++++++++++----------------------- po/wa.po | 176 +++++++++++++++++++----------------------- po/wine.pot | 176 +++++++++++++++++++----------------------- po/zh_CN.po | 176 +++++++++++++++++++----------------------- po/zh_TW.po | 176 +++++++++++++++++++----------------------- programs/regedit/framewnd.c | 4 - programs/regedit/regedit.rc | 9 +-- programs/regedit/resource.h | 2 - 48 files changed, 3601 insertions(+), 4334 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a569851d39b8a89505bc…

1 0

Francois Gouget : notepad: Remove the unimplemented help search menu.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 80cf194e14e61d54b8fb5bbf5bcfc6801d6e6b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80cf194e14e61d54b8fb5bbf5… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 31 12:41:59 2011 +0200 notepad: Remove the unimplemented help search menu. --- po/ar.po | 46 ++++++++++++++++------------------- po/bg.po | 46 ++++++++++++++++------------------- po/ca.po | 46 ++++++++++++++++------------------- po/cs.po | 46 ++++++++++++++++------------------- po/da.po | 51 ++++++++++++++++----------------------- po/de.po | 46 ++++++++++++++++------------------- po/el.po | 47 ++++++++++++++++-------------------- po/en.po | 46 ++++++++++++++++------------------- po/en_US.po | 46 ++++++++++++++++------------------- po/eo.po | 46 ++++++++++++++++------------------- po/es.po | 46 ++++++++++++++++------------------- po/fa.po | 46 ++++++++++++++++------------------- po/fi.po | 46 ++++++++++++++++------------------- po/fr.po | 46 ++++++++++++++++------------------- po/he.po | 46 ++++++++++++++++------------------- po/hi.po | 46 ++++++++++++++++------------------- po/hu.po | 51 ++++++++++++++++----------------------- po/it.po | 51 ++++++++++++++++----------------------- po/ja.po | 46 ++++++++++++++++------------------- po/ko.po | 46 ++++++++++++++++------------------- po/lt.po | 46 ++++++++++++++++------------------- po/ml.po | 46 ++++++++++++++++------------------- po/nb_NO.po | 46 ++++++++++++++++------------------- po/nl.po | 46 ++++++++++++++++------------------- po/or.po | 46 ++++++++++++++++------------------- po/pa.po | 46 ++++++++++++++++------------------- po/pl.po | 46 ++++++++++++++++------------------- po/pt_BR.po | 51 ++++++++++++++++----------------------- po/pt_PT.po | 51 ++++++++++++++++----------------------- po/rm.po | 46 ++++++++++++++++------------------- po/ro.po | 51 ++++++++++++++++----------------------- po/ru.po | 46 ++++++++++++++++------------------- po/sk.po | 46 ++++++++++++++++------------------- po/sl.po | 46 ++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 46 ++++++++++++++++------------------- po/sr_RS(a)latin.po | 46 ++++++++++++++++------------------- po/sv.po | 46 ++++++++++++++++------------------- po/te.po | 46 ++++++++++++++++------------------- po/th.po | 46 ++++++++++++++++------------------- po/tr.po | 46 ++++++++++++++++------------------- po/uk.po | 46 ++++++++++++++++------------------- po/wa.po | 46 ++++++++++++++++------------------- po/wine.pot | 46 ++++++++++++++++------------------- po/zh_CN.po | 46 ++++++++++++++++------------------- po/zh_TW.po | 51 ++++++++++++++++----------------------- programs/notepad/dialog.c | 5 ---- programs/notepad/main.c | 1 - programs/notepad/notepad.rc | 1 - programs/notepad/notepad_res.h | 1 - 49 files changed, 945 insertions(+), 1169 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80cf194e14e61d54b8fb5…

1 0

Francois Gouget : progman: Implement the cascade and tile windows menus.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 92e412c5cbd3d8a29eab7da6567ad638e87f1bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e412c5cbd3d8a29eab7da65… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 31 12:42:20 2011 +0200 progman: Implement the cascade and tile windows menus. --- programs/progman/main.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/progman/main.c b/programs/progman/main.c index d76a079..e4383ea 100644 --- a/programs/progman/main.c +++ b/programs/progman/main.c @@ -296,6 +296,14 @@ static VOID MAIN_MenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) break; /* Menu Windows */ + case PM_OVERLAP: + SendMessageW(Globals.hMDIWnd, WM_MDICASCADE, 0, 0); + break; + + case PM_SIDE_BY_SIDE: + SendMessageW(Globals.hMDIWnd, WM_MDITILE, MDITILE_VERTICAL, 0); + break; + case PM_ARRANGE: if (hActiveGroupWnd && !IsIconic(hActiveGroupWnd))

1 0

Francois Gouget : progman: Remove the unimplemented help search menu.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 801e77577441f9044c4462d713b2eced4c2f2783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=801e77577441f9044c4462d71… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 31 12:41:40 2011 +0200 progman: Remove the unimplemented help search menu. --- po/ar.po | 52 +++++++++++++++++++++--------------------- po/bg.po | 52 +++++++++++++++++++++--------------------- po/ca.po | 52 +++++++++++++++++++++--------------------- po/cs.po | 52 +++++++++++++++++++++--------------------- po/da.po | 52 +++++++++++++++++++++--------------------- po/de.po | 52 +++++++++++++++++++++--------------------- po/el.po | 52 +++++++++++++++++++++--------------------- po/en.po | 52 +++++++++++++++++++++--------------------- po/en_US.po | 52 +++++++++++++++++++++--------------------- po/eo.po | 52 +++++++++++++++++++++--------------------- po/es.po | 52 +++++++++++++++++++++--------------------- po/fa.po | 52 +++++++++++++++++++++--------------------- po/fi.po | 52 +++++++++++++++++++++--------------------- po/fr.po | 52 +++++++++++++++++++++--------------------- po/he.po | 52 +++++++++++++++++++++--------------------- po/hi.po | 52 +++++++++++++++++++++--------------------- po/hu.po | 52 +++++++++++++++++++++--------------------- po/it.po | 52 +++++++++++++++++++++--------------------- po/ja.po | 52 +++++++++++++++++++++--------------------- po/ko.po | 52 +++++++++++++++++++++--------------------- po/lt.po | 52 +++++++++++++++++++++--------------------- po/ml.po | 52 +++++++++++++++++++++--------------------- po/nb_NO.po | 52 +++++++++++++++++++++--------------------- po/nl.po | 52 +++++++++++++++++++++--------------------- po/or.po | 52 +++++++++++++++++++++--------------------- po/pa.po | 52 +++++++++++++++++++++--------------------- po/pl.po | 52 +++++++++++++++++++++--------------------- po/pt_BR.po | 52 +++++++++++++++++++++--------------------- po/pt_PT.po | 52 +++++++++++++++++++++--------------------- po/rm.po | 52 +++++++++++++++++++++--------------------- po/ro.po | 52 +++++++++++++++++++++--------------------- po/ru.po | 52 +++++++++++++++++++++--------------------- po/sk.po | 52 +++++++++++++++++++++--------------------- po/sl.po | 52 +++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 52 +++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 52 +++++++++++++++++++++--------------------- po/sv.po | 52 +++++++++++++++++++++--------------------- po/te.po | 52 +++++++++++++++++++++--------------------- po/th.po | 52 +++++++++++++++++++++--------------------- po/tr.po | 52 +++++++++++++++++++++--------------------- po/uk.po | 52 +++++++++++++++++++++--------------------- po/wa.po | 52 +++++++++++++++++++++--------------------- po/wine.pot | 52 +++++++++++++++++++++--------------------- po/zh_CN.po | 52 +++++++++++++++++++++--------------------- po/zh_TW.po | 52 +++++++++++++++++++++--------------------- programs/progman/progman.h | 1 - programs/progman/progman.rc | 1 - 47 files changed, 1170 insertions(+), 1172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=801e77577441f9044c446…

1 0

Francois Gouget : winefile: Remove the unimplemented help search menu.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: ddeacf86a469d69feef8cab56aaf7e6dc6b674f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddeacf86a469d69feef8cab56… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 31 12:41:27 2011 +0200 winefile: Remove the unimplemented help search menu. --- po/ar.po | 49 ++++++++++++++++++---------------------- po/bg.po | 49 ++++++++++++++++++---------------------- po/ca.po | 48 ++++++++++++++++++--------------------- po/cs.po | 48 ++++++++++++++++++--------------------- po/da.po | 48 ++++++++++++++++++--------------------- po/de.po | 48 ++++++++++++++++++--------------------- po/el.po | 49 ++++++++++++++++++---------------------- po/en.po | 48 ++++++++++++++++++--------------------- po/en_US.po | 48 ++++++++++++++++++--------------------- po/eo.po | 49 ++++++++++++++++++---------------------- po/es.po | 48 ++++++++++++++++++--------------------- po/fa.po | 49 ++++++++++++++++++---------------------- po/fi.po | 49 ++++++++++++++++++---------------------- po/fr.po | 48 ++++++++++++++++++--------------------- po/he.po | 48 ++++++++++++++++++--------------------- po/hi.po | 48 ++++++++++++++++++--------------------- po/hu.po | 48 ++++++++++++++++++--------------------- po/it.po | 48 ++++++++++++++++++--------------------- po/ja.po | 48 ++++++++++++++++++--------------------- po/ko.po | 48 ++++++++++++++++++--------------------- po/lt.po | 48 ++++++++++++++++++--------------------- po/ml.po | 48 ++++++++++++++++++--------------------- po/nb_NO.po | 48 ++++++++++++++++++--------------------- po/nl.po | 48 ++++++++++++++++++--------------------- po/or.po | 48 ++++++++++++++++++--------------------- po/pa.po | 48 ++++++++++++++++++--------------------- po/pl.po | 48 ++++++++++++++++++--------------------- po/pt_BR.po | 48 ++++++++++++++++++--------------------- po/pt_PT.po | 48 ++++++++++++++++++--------------------- po/rm.po | 48 ++++++++++++++++++--------------------- po/ro.po | 48 ++++++++++++++++++--------------------- po/ru.po | 48 ++++++++++++++++++--------------------- po/sk.po | 48 ++++++++++++++++++--------------------- po/sl.po | 48 ++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 49 ++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 49 ++++++++++++++++++---------------------- po/sv.po | 48 ++++++++++++++++++--------------------- po/te.po | 48 ++++++++++++++++++--------------------- po/th.po | 49 ++++++++++++++++++---------------------- po/tr.po | 48 ++++++++++++++++++--------------------- po/uk.po | 48 ++++++++++++++++++--------------------- po/wa.po | 49 ++++++++++++++++++---------------------- po/wine.pot | 48 ++++++++++++++++++--------------------- po/zh_CN.po | 48 ++++++++++++++++++--------------------- po/zh_TW.po | 48 ++++++++++++++++++--------------------- programs/winefile/winefile.rc | 1 - 46 files changed, 990 insertions(+), 1181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ddeacf86a469d69feef8c…

1 0

Francois Gouget : msi: Make load_ttf_name_id() static.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 1d246654cbcf2e0c57b446dbb9b046cc8601e64e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d246654cbcf2e0c57b446dbb… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 31 12:35:58 2011 +0200 msi: Make load_ttf_name_id() static. --- dlls/msi/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/font.c b/dlls/msi/font.c index 7a49386..f74c59e 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -84,7 +84,7 @@ static const WCHAR regfont2[] = * Code based off of code located here * http://www.codeproject.com/gdi/fontnamefromfile.asp */ -WCHAR *load_ttf_name_id( const WCHAR *filename, DWORD id ) +static WCHAR *load_ttf_name_id( const WCHAR *filename, DWORD id ) { TT_TABLE_DIRECTORY tblDir; BOOL bFound = FALSE;

1 0

David Hedberg : comdlg32: Add ICommDlgBrowser3 stub to Item Dialog.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 338d700a23c221290e884852f05961781a0f201f URL: http://source.winehq.org/git/wine.git/?a=commit;h=338d700a23c221290e884852f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 31 05:55:27 2011 +0200 comdlg32: Add ICommDlgBrowser3 stub to Item Dialog. --- dlls/comdlg32/itemdlg.c | 125 +++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/tests/itemdlg.c | 12 +++- 2 files changed, 135 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 145bca7..35812f2 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -60,6 +60,7 @@ typedef struct FileDialogImpl { enum ITEMDLG_TYPE dlg_type; IExplorerBrowserEvents IExplorerBrowserEvents_iface; IServiceProvider IServiceProvider_iface; + ICommDlgBrowser3 ICommDlgBrowser3_iface; LONG ref; FILEOPENDIALOGOPTIONS options; @@ -483,6 +484,12 @@ static HRESULT WINAPI IFileDialog2_fnQueryInterface(IFileDialog2 *iface, { *ppvObject = &This->IServiceProvider_iface; } + else if(IsEqualGUID(&IID_ICommDlgBrowser3, riid) || + IsEqualGUID(&IID_ICommDlgBrowser2, riid) || + IsEqualGUID(&IID_ICommDlgBrowser, riid)) + { + *ppvObject = &This->ICommDlgBrowser3_iface; + } else FIXME("Unknown interface requested: %s.\n", debugstr_guid(riid)); @@ -1533,6 +1540,123 @@ static const IServiceProviderVtbl vt_IServiceProvider = { IServiceProvider_fnQueryService }; +/************************************************************************** + * ICommDlgBrowser3 implementation + */ +static inline FileDialogImpl *impl_from_ICommDlgBrowser3(ICommDlgBrowser3 *iface) +{ + return CONTAINING_RECORD(iface, FileDialogImpl, ICommDlgBrowser3_iface); +} + +static HRESULT WINAPI ICommDlgBrowser3_fnQueryInterface(ICommDlgBrowser3 *iface, + REFIID riid, void **ppvObject) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + TRACE("%p\n", This); + return IFileDialog2_QueryInterface(&This->IFileDialog2_iface, riid, ppvObject); +} + +static ULONG WINAPI ICommDlgBrowser3_fnAddRef(ICommDlgBrowser3 *iface) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + TRACE("%p\n", This); + return IFileDialog2_AddRef(&This->IFileDialog2_iface); +} + +static ULONG WINAPI ICommDlgBrowser3_fnRelease(ICommDlgBrowser3 *iface) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + TRACE("%p\n", This); + return IFileDialog2_Release(&This->IFileDialog2_iface); +} + +static HRESULT WINAPI ICommDlgBrowser3_fnOnDefaultCommand(ICommDlgBrowser3 *iface, + IShellView *shv) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p)\n", This, shv); + return S_OK; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnOnStateChange(ICommDlgBrowser3 *iface, + IShellView *shv, ULONG uChange ) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p, %x)\n", This, shv, uChange); + return S_OK; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnIncludeObject(ICommDlgBrowser3 *iface, + IShellView *shv, LPCITEMIDLIST pidl) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p, %p)\n", This, shv, pidl); + return S_OK; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnNotify(ICommDlgBrowser3 *iface, + IShellView *ppshv, DWORD dwNotifyType) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p, 0x%x)\n", This, ppshv, dwNotifyType); + return E_NOTIMPL; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnGetDefaultMenuText(ICommDlgBrowser3 *iface, + IShellView *pshv, + LPWSTR pszText, int cchMax) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p, %p, %d)\n", This, pshv, pszText, cchMax); + return E_NOTIMPL; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnGetViewFlags(ICommDlgBrowser3 *iface, DWORD *pdwFlags) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p)\n", This, pdwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnOnColumnClicked(ICommDlgBrowser3 *iface, + IShellView *pshv, int iColumn) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p, %d)\n", This, pshv, iColumn); + return E_NOTIMPL; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnGetCurrentFilter(ICommDlgBrowser3 *iface, + LPWSTR pszFileSpec, int cchFileSpec) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p, %d)\n", This, pszFileSpec, cchFileSpec); + return E_NOTIMPL; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnOnPreviewCreated(ICommDlgBrowser3 *iface, + IShellView *pshv) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p)\n", This, pshv); + return E_NOTIMPL; +} + +static const ICommDlgBrowser3Vtbl vt_ICommDlgBrowser3 = { + ICommDlgBrowser3_fnQueryInterface, + ICommDlgBrowser3_fnAddRef, + ICommDlgBrowser3_fnRelease, + ICommDlgBrowser3_fnOnDefaultCommand, + ICommDlgBrowser3_fnOnStateChange, + ICommDlgBrowser3_fnIncludeObject, + ICommDlgBrowser3_fnNotify, + ICommDlgBrowser3_fnGetDefaultMenuText, + ICommDlgBrowser3_fnGetViewFlags, + ICommDlgBrowser3_fnOnColumnClicked, + ICommDlgBrowser3_fnGetCurrentFilter, + ICommDlgBrowser3_fnOnPreviewCreated +}; + static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv, enum ITEMDLG_TYPE type) { FileDialogImpl *fdimpl; @@ -1553,6 +1677,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->IFileDialog2_iface.lpVtbl = &vt_IFileDialog2; fdimpl->IExplorerBrowserEvents_iface.lpVtbl = &vt_IExplorerBrowserEvents; fdimpl->IServiceProvider_iface.lpVtbl = &vt_IServiceProvider; + fdimpl->ICommDlgBrowser3_iface.lpVtbl = &vt_ICommDlgBrowser3; if(type == ITEMDLG_TYPE_OPEN) { diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 069de20..8f031c2 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -196,8 +196,8 @@ static BOOL test_instantiation(void) hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_ICommDlgBrowser, (void**)&punk); ok(hr == E_FAIL, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); - hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_ICommDlgBrowser, (void**)&punk); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); + hr = IServiceProvider_QueryService(psp, &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser, (void**)&punk); + ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); IServiceProvider_Release(psp); @@ -215,6 +215,10 @@ static BOOL test_instantiation(void) ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = IFileOpenDialog_QueryInterface(pfod, &IID_ICommDlgBrowser3, (void**)&punk); + ok(hr == S_OK, "got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = IFileOpenDialog_QueryInterface(pfod, &IID_IShellBrowser, (void**)&punk); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); @@ -255,6 +259,10 @@ static BOOL test_instantiation(void) ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = IFileOpenDialog_QueryInterface(pfsd, &IID_ICommDlgBrowser3, (void**)&punk); + ok(hr == S_OK, "got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IShellBrowser, (void**)&punk); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk);

1 0

David Hedberg : comdlg32: Add IServiceProvider implementation to the Item Dialog.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 768d498ed5eef9947a25969d9d03ebc8171ea831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=768d498ed5eef9947a25969d9… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 31 05:55:26 2011 +0200 comdlg32: Add IServiceProvider implementation to the Item Dialog. --- dlls/comdlg32/itemdlg.c | 69 +++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/tests/itemdlg.c | 2 +- 2 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 23429f0..145bca7 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -59,6 +59,7 @@ typedef struct FileDialogImpl { } u; enum ITEMDLG_TYPE dlg_type; IExplorerBrowserEvents IExplorerBrowserEvents_iface; + IServiceProvider IServiceProvider_iface; LONG ref; FILEOPENDIALOGOPTIONS options; @@ -478,6 +479,10 @@ static HRESULT WINAPI IFileDialog2_fnQueryInterface(IFileDialog2 *iface, { *ppvObject = &This->IExplorerBrowserEvents_iface; } + else if(IsEqualGUID(riid, &IID_IServiceProvider)) + { + *ppvObject = &This->IServiceProvider_iface; + } else FIXME("Unknown interface requested: %s.\n", debugstr_guid(riid)); @@ -1465,6 +1470,69 @@ static const IExplorerBrowserEventsVtbl vt_IExplorerBrowserEvents = { IExplorerBrowserEvents_fnOnNavigationFailed }; +/************************************************************************** + * IServiceProvider implementation + */ +static inline FileDialogImpl *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, FileDialogImpl, IServiceProvider_iface); +} + +static HRESULT WINAPI IServiceProvider_fnQueryInterface(IServiceProvider *iface, + REFIID riid, void **ppvObject) +{ + FileDialogImpl *This = impl_from_IServiceProvider(iface); + TRACE("%p\n", This); + return IFileDialog2_QueryInterface(&This->IFileDialog2_iface, riid, ppvObject); +} + +static ULONG WINAPI IServiceProvider_fnAddRef(IServiceProvider *iface) +{ + FileDialogImpl *This = impl_from_IServiceProvider(iface); + TRACE("%p\n", This); + return IFileDialog2_AddRef(&This->IFileDialog2_iface); +} + +static ULONG WINAPI IServiceProvider_fnRelease(IServiceProvider *iface) +{ + FileDialogImpl *This = impl_from_IServiceProvider(iface); + TRACE("%p\n", This); + return IFileDialog2_Release(&This->IFileDialog2_iface); +} + +static HRESULT WINAPI IServiceProvider_fnQueryService(IServiceProvider *iface, + REFGUID guidService, + REFIID riid, void **ppv) +{ + FileDialogImpl *This = impl_from_IServiceProvider(iface); + HRESULT hr = E_FAIL; + TRACE("%p (%s, %s, %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + *ppv = NULL; + if(IsEqualGUID(guidService, &SID_STopLevelBrowser) && This->peb) + hr = IExplorerBrowser_QueryInterface(This->peb, riid, ppv); + else if(IsEqualGUID(guidService, &SID_SExplorerBrowserFrame)) + hr = IFileDialog2_QueryInterface(&This->IFileDialog2_iface, riid, ppv); + else + FIXME("Interface %s requested from unknown service %s\n", + debugstr_guid(riid), debugstr_guid(guidService)); + + if(SUCCEEDED(hr) && *ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + return E_FAIL; +} + +static const IServiceProviderVtbl vt_IServiceProvider = { + IServiceProvider_fnQueryInterface, + IServiceProvider_fnAddRef, + IServiceProvider_fnRelease, + IServiceProvider_fnQueryService +}; + static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv, enum ITEMDLG_TYPE type) { FileDialogImpl *fdimpl; @@ -1484,6 +1552,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->ref = 1; fdimpl->IFileDialog2_iface.lpVtbl = &vt_IFileDialog2; fdimpl->IExplorerBrowserEvents_iface.lpVtbl = &vt_IExplorerBrowserEvents; + fdimpl->IServiceProvider_iface.lpVtbl = &vt_IServiceProvider; if(type == ITEMDLG_TYPE_OPEN) { diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 8b998a6..069de20 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -181,7 +181,7 @@ static BOOL test_instantiation(void) if(SUCCEEDED(hr)) IFileOpenDialog_Release(pfsd); hr = IFileOpenDialog_QueryInterface(pfod, &IID_IServiceProvider, (void**)&psp); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) { IExplorerBrowser *peb;

1 0

David Hedberg : comdlg32: Add ExplorerBrowser control to Item Dialog.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 140113b266ee2772cc91b4901292901f44752faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=140113b266ee2772cc91b4901… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 31 05:55:25 2011 +0200 comdlg32: Add ExplorerBrowser control to Item Dialog. --- dlls/comdlg32/itemdlg.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index dfd2d3a..23429f0 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -76,6 +76,8 @@ typedef struct FileDialogImpl { IShellItem *psi_folder; HWND dlg_hwnd; + IExplorerBrowser *peb; + DWORD ebevents_cookie; } FileDialogImpl; /************************************************************************** @@ -88,6 +90,7 @@ static SIZE update_layout(FileDialogImpl *This) RECT dialog_rc; RECT cancel_rc, open_rc; RECT filetype_rc, filename_rc, filenamelabel_rc; + RECT ebrowser_rc; int missing_width, missing_height; static const UINT vspacing = 4, hspacing = 4; SIZE ret; @@ -190,12 +193,21 @@ static SIZE update_layout(FileDialogImpl *This) filename_rc.bottom = filename_rc.top + filename_height; } + /* The ExplorerBrowser control. */ + ebrowser_rc.left = dialog_rc.left + vspacing; + ebrowser_rc.top = 0; + ebrowser_rc.right = dialog_rc.right - vspacing; + ebrowser_rc.bottom = filename_rc.top - hspacing; + /**** * Move everything to the right place. */ /* FIXME: The Save Dialog uses a slightly different layout. */ - hdwp = BeginDeferWindowPos(5); + hdwp = BeginDeferWindowPos(6); + + if(hdwp && This->peb) + IExplorerBrowser_SetRect(This->peb, &hdwp, ebrowser_rc); /* The default controls */ if(hdwp && (hwnd = GetDlgItem(This->dlg_hwnd, IDC_FILETYPE)) ) @@ -228,11 +240,60 @@ static SIZE update_layout(FileDialogImpl *This) return ret; } +static HRESULT init_explorerbrowser(FileDialogImpl *This) +{ + IShellItem *psi_folder; + FOLDERSETTINGS fos; + RECT rc = {0}; + HRESULT hr; + + /* Create ExplorerBrowser instance */ + OleInitialize(NULL); + + hr = CoCreateInstance(&CLSID_ExplorerBrowser, NULL, CLSCTX_INPROC_SERVER, + &IID_IExplorerBrowser, (void**)&This->peb); + if(FAILED(hr)) + { + ERR("Failed to instantiate ExplorerBrowser control.\n"); + return hr; + } + + IExplorerBrowser_SetOptions(This->peb, EBO_SHOWFRAMES); + + hr = IExplorerBrowser_Initialize(This->peb, This->dlg_hwnd, &rc, NULL); + if(FAILED(hr)) + { + ERR("Failed to initialize the ExplorerBrowser control.\n"); + IExplorerBrowser_Release(This->peb); + This->peb = NULL; + return hr; + } + hr = IExplorerBrowser_Advise(This->peb, &This->IExplorerBrowserEvents_iface, &This->ebevents_cookie); + if(FAILED(hr)) + ERR("Advise (ExplorerBrowser) failed.\n"); + + /* Get previous options? */ + fos.ViewMode = fos.fFlags = 0; + if(!(This->options & FOS_ALLOWMULTISELECT)) + fos.fFlags |= FWF_SINGLESEL; + + IExplorerBrowser_SetFolderSettings(This->peb, &fos); + + /* Browse somewhere */ + psi_folder = This->psi_setfolder ? This->psi_setfolder : This->psi_defaultfolder; + IExplorerBrowser_BrowseToObject(This->peb, (IUnknown*)psi_folder, SBSP_DEFBROWSER); + + hr = IUnknown_SetSite((IUnknown*)This->peb, (IUnknown*)This); + if(FAILED(hr)) + ERR("SetSite (ExplorerBrowser) failed.\n"); + + return S_OK; +} + static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) { FileDialogImpl *This = (FileDialogImpl*)lParam; HWND hitem; - TRACE("(%p, %p)\n", This, hwnd); SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LPARAM)This); @@ -257,6 +318,7 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) else ShowWindow(hitem, SW_HIDE); + init_explorerbrowser(This); update_layout(This); return TRUE; @@ -284,6 +346,13 @@ static LRESULT on_wm_destroy(FileDialogImpl *This) { TRACE("%p\n", This); + if(This->peb) + { + IExplorerBrowser_Destroy(This->peb); + IExplorerBrowser_Release(This->peb); + This->peb = NULL; + } + This->dlg_hwnd = NULL; return TRUE; @@ -307,12 +376,34 @@ static LRESULT on_idcancel(FileDialogImpl *This) return FALSE; } +static LRESULT on_command_filetype(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) +{ + if(HIWORD(wparam) == CBN_SELCHANGE) + { + IShellView *psv; + HRESULT hr; + + This->filetypeindex = SendMessageW((HWND)lparam, CB_GETCURSEL, 0, 0); + TRACE("File type selection changed to %d.\n", This->filetypeindex); + + hr = IExplorerBrowser_GetCurrentView(This->peb, &IID_IShellView, (void**)&psv); + if(SUCCEEDED(hr)) + { + IShellView_Refresh(psv); + IShellView_Release(psv); + } + } + + return FALSE; +} + static LRESULT on_wm_command(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) { switch(wparam) { case IDOK: return on_idok(This); case IDCANCEL: return on_idcancel(This); + case IDC_FILETYPE: return on_command_filetype(This, wparam, lparam); default: TRACE("Unknown command.\n"); } return FALSE; @@ -1340,7 +1431,19 @@ static HRESULT WINAPI IExplorerBrowserEvents_fnOnNavigationComplete(IExplorerBro PCIDLIST_ABSOLUTE pidlFolder) { FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + HRESULT hr; TRACE("%p (%p)\n", This, pidlFolder); + + if(This->psi_folder) + IShellItem_Release(This->psi_folder); + + hr = SHCreateItemFromIDList(pidlFolder, &IID_IShellItem, (void**)&This->psi_folder); + if(FAILED(hr)) + { + ERR("Failed to get the current folder.\n"); + This->psi_folder = NULL; + } + return S_OK; } @@ -1406,6 +1509,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->events_next_cookie = 0; fdimpl->dlg_hwnd = NULL; + fdimpl->peb = NULL; /* FIXME: The default folder setting should be restored for the * application if it was previously set. */

1 0

David Hedberg : comdlg32: Add IExplorerBrowserEvents stub to Item Dialog.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 4bd2cc7ae8b26be367b31244ab8286745ffcec46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd2cc7ae8b26be367b31244a… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 31 05:55:24 2011 +0200 comdlg32: Add IExplorerBrowserEvents stub to Item Dialog. --- dlls/comdlg32/itemdlg.c | 79 +++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/tests/itemdlg.c | 4 +- 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 7343d70..dfd2d3a 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -58,6 +58,7 @@ typedef struct FileDialogImpl { IFileSaveDialog IFileSaveDialog_iface; } u; enum ITEMDLG_TYPE dlg_type; + IExplorerBrowserEvents IExplorerBrowserEvents_iface; LONG ref; FILEOPENDIALOGOPTIONS options; @@ -382,6 +383,10 @@ static HRESULT WINAPI IFileDialog2_fnQueryInterface(IFileDialog2 *iface, { *ppvObject = &This->u.IFileSaveDialog_iface; } + else if(IsEqualGUID(riid, &IID_IExplorerBrowserEvents)) + { + *ppvObject = &This->IExplorerBrowserEvents_iface; + } else FIXME("Unknown interface requested: %s.\n", debugstr_guid(riid)); @@ -1284,6 +1289,79 @@ static const IFileSaveDialogVtbl vt_IFileSaveDialog = { IFileSaveDialog_fnApplyProperties }; +/************************************************************************** + * IExplorerBrowserEvents implementation + */ +static inline FileDialogImpl *impl_from_IExplorerBrowserEvents(IExplorerBrowserEvents *iface) +{ + return CONTAINING_RECORD(iface, FileDialogImpl, IExplorerBrowserEvents_iface); +} + +static HRESULT WINAPI IExplorerBrowserEvents_fnQueryInterface(IExplorerBrowserEvents *iface, + REFIID riid, void **ppvObject) +{ + FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + TRACE("%p (%s, %p)\n", This, debugstr_guid(riid), ppvObject); + + return IFileDialog2_QueryInterface(&This->IFileDialog2_iface, riid, ppvObject); +} + +static ULONG WINAPI IExplorerBrowserEvents_fnAddRef(IExplorerBrowserEvents *iface) +{ + FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + TRACE("%p\n", This); + return IFileDialog2_AddRef(&This->IFileDialog2_iface); +} + +static ULONG WINAPI IExplorerBrowserEvents_fnRelease(IExplorerBrowserEvents *iface) +{ + FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + TRACE("%p\n", This); + return IFileDialog2_Release(&This->IFileDialog2_iface); +} + +static HRESULT WINAPI IExplorerBrowserEvents_fnOnNavigationPending(IExplorerBrowserEvents *iface, + PCIDLIST_ABSOLUTE pidlFolder) +{ + FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + TRACE("%p (%p)\n", This, pidlFolder); + return S_OK; +} + +static HRESULT WINAPI IExplorerBrowserEvents_fnOnViewCreated(IExplorerBrowserEvents *iface, + IShellView *psv) +{ + FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + TRACE("%p (%p)\n", This, psv); + return S_OK; +} + +static HRESULT WINAPI IExplorerBrowserEvents_fnOnNavigationComplete(IExplorerBrowserEvents *iface, + PCIDLIST_ABSOLUTE pidlFolder) +{ + FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + TRACE("%p (%p)\n", This, pidlFolder); + return S_OK; +} + +static HRESULT WINAPI IExplorerBrowserEvents_fnOnNavigationFailed(IExplorerBrowserEvents *iface, + PCIDLIST_ABSOLUTE pidlFolder) +{ + FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + TRACE("%p (%p)\n", This, pidlFolder); + return S_OK; +} + +static const IExplorerBrowserEventsVtbl vt_IExplorerBrowserEvents = { + IExplorerBrowserEvents_fnQueryInterface, + IExplorerBrowserEvents_fnAddRef, + IExplorerBrowserEvents_fnRelease, + IExplorerBrowserEvents_fnOnNavigationPending, + IExplorerBrowserEvents_fnOnViewCreated, + IExplorerBrowserEvents_fnOnNavigationComplete, + IExplorerBrowserEvents_fnOnNavigationFailed +}; + static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv, enum ITEMDLG_TYPE type) { FileDialogImpl *fdimpl; @@ -1302,6 +1380,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->ref = 1; fdimpl->IFileDialog2_iface.lpVtbl = &vt_IFileDialog2; + fdimpl->IExplorerBrowserEvents_iface.lpVtbl = &vt_IExplorerBrowserEvents; if(type == ITEMDLG_TYPE_OPEN) { diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index b0661b4..8b998a6 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -212,7 +212,7 @@ static BOOL test_instantiation(void) if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = IFileOpenDialog_QueryInterface(pfod, &IID_IExplorerBrowserEvents, (void**)&punk); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = IFileOpenDialog_QueryInterface(pfod, &IID_IShellBrowser, (void**)&punk); @@ -252,7 +252,7 @@ static BOOL test_instantiation(void) if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IExplorerBrowserEvents, (void**)&punk); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IShellBrowser, (void**)&punk);

1 0

David Hedberg : comdlg32: Implement Show and Close for the Item Dialog.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 3db65935910ef9e0718752d3d033d9bb02f21c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db65935910ef9e0718752d3d… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 31 05:55:23 2011 +0200 comdlg32: Implement Show and Close for the Item Dialog. --- dlls/comdlg32/itemdlg.c | 293 ++++++++++++++++++++++++++++++++++++++++- dlls/comdlg32/tests/itemdlg.c | 3 - 2 files changed, 289 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3db65935910ef9e071875…

1 0

David Hedberg : comdlg32: Add NEWFILEOPENV3ORD resource.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 9df020cd73a13f33f8e9f71ddad22af9b37c63bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df020cd73a13f33f8e9f71dd… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 31 05:55:22 2011 +0200 comdlg32: Add NEWFILEOPENV3ORD resource. --- dlls/comdlg32/cdlg_En.rc | 18 ++++++++++++++++++ include/dlgs.h | 1 + 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/cdlg_En.rc b/dlls/comdlg32/cdlg_En.rc index d4f215d..3a5197f 100644 --- a/dlls/comdlg32/cdlg_En.rc +++ b/dlls/comdlg32/cdlg_En.rc @@ -352,6 +352,24 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Help", pshHelp,222,145,50,14 } +NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN | + WS_THICKFRAME +CAPTION "Open" +FONT 8, "MS Shell Dlg" +{ + LTEXT "File name:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT + EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP + + LTEXT "Files of type:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT + COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | + CBS_HASSTRINGS | CBS_DROPDOWNLIST + + DEFPUSHBUTTON "&Open", IDOK, 350, 240, 40, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 395, 240, 40, 14 + PUSHBUTTON "&Help", pshHelp, 350, 272, 40, 14 +} + /****************************************************************/ /* English neutral resources /****************************************************************/ diff --git a/include/dlgs.h b/include/dlgs.h index b5cace3..7315b11 100644 --- a/include/dlgs.h +++ b/include/dlgs.h @@ -209,5 +209,6 @@ #define PAGESETUPDLGORDMOTIF 1550 #define COLORMGMTDLGORD 1551 #define NEWFILEOPENV2ORD 1552 +#define NEWFILEOPENV3ORD 1553 #endif /* #ifdef __WINE_DLGS_H */

1 0

Marcus Meissner : widl: Mark up a FALLTHROUGH case (Coverity).
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 0222ad7326e7454fa3d2f269430ef347bebbe538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0222ad7326e7454fa3d2f2694… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Mar 29 15:34:15 2011 +0200 widl: Mark up a FALLTHROUGH case (Coverity). --- tools/widl/expr.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/expr.c b/tools/widl/expr.c index e1a5196..60e3a50 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -94,6 +94,7 @@ static int is_signed_integer_type(const type_t *type) case TYPE_BASIC_HANDLE: return FALSE; } + /* FALLTHROUGH */ default: return FALSE; }

1 0

Marcus Meissner : winebuild: Mark up fallthrough switch cases (Coverity).
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 7a0797a6a8b343f9fff1fb08f18fd925b09672c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0797a6a8b343f9fff1fb08f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Mar 29 15:33:04 2011 +0200 winebuild: Mark up fallthrough switch cases (Coverity). --- tools/winebuild/spec32.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index e16260a..2429982 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -200,9 +200,13 @@ static void output_relay_debug( DLLSPEC *spec ) switch (args) { default: output( "\tmovq %%%s,72(%%rsp)\n", is_float_arg( odp, 3 ) ? "xmm3" : "r9" ); + /* fall through */ case 3: output( "\tmovq %%%s,64(%%rsp)\n", is_float_arg( odp, 2 ) ? "xmm2" : "r8" ); + /* fall through */ case 2: output( "\tmovq %%%s,56(%%rsp)\n", is_float_arg( odp, 1 ) ? "xmm1" : "rdx" ); + /* fall through */ case 1: output( "\tmovq %%%s,48(%%rsp)\n", is_float_arg( odp, 0 ) ? "xmm0" : "rcx" ); + /* fall through */ case 0: break; } output( "\tleaq 40(%%rsp),%%r8\n" );

1 0

Hans Leidekker : msi: Fix building the message string in MSI_ProcessMessage .
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 31291ec2050a642ce67dd8c2f224d701f55050a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31291ec2050a642ce67dd8c2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 31 11:57:47 2011 +0200 msi: Fix building the message string in MSI_ProcessMessage. --- dlls/msi/package.c | 62 ++++++++++++++++++++++++++------------------------- 1 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7317af2..49acdb7 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1703,8 +1703,7 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) return handle; } -INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, - MSIRECORD *record) +INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIRECORD *record ) { static const WCHAR szActionData[] = {'A','c','t','i','o','n','D','a','t','a',0}; @@ -1713,10 +1712,9 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, static const WCHAR szActionText[] = {'A','c','t','i','o','n','T','e','x','t',0}; LPWSTR message; - DWORD sz, total_size = 0, log_type = 0; - INT i, rc = 0; + DWORD i, len, total_len, log_type = 0; + INT rc = 0; char *msg; - int len; TRACE("%x\n", eMessageType); @@ -1769,35 +1767,39 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, } else { - INT msg_field=1; - message = msi_alloc(1*sizeof (WCHAR)); - message[0]=0; - msg_field = MSI_RecordGetFieldCount(record); - for (i = 1; i <= msg_field; i++) + static const WCHAR format[] = {'%','u',':',' ',0}; + UINT count = MSI_RecordGetFieldCount( record ); + WCHAR *p; + + total_len = 1; + for (i = 1; i <= count; i++) + { + len = 0; + MSI_RecordGetStringW( record, i, NULL, &len ); + total_len += len + 13; + } + p = message = msi_alloc( total_len * sizeof(WCHAR) ); + if (!p) return ERROR_OUTOFMEMORY; + + for (i = 1; i <= count; i++) { - LPWSTR tmp; - WCHAR number[3]; - static const WCHAR format[] = { '%','i',':',' ',0}; - sz = 0; - MSI_RecordGetStringW(record,i,NULL,&sz); - sz+=4; - total_size+=sz*sizeof(WCHAR); - tmp = msi_alloc(sz*sizeof(WCHAR)); - message = msi_realloc(message,total_size*sizeof (WCHAR)); - - MSI_RecordGetStringW(record,i,tmp,&sz); - - if (msg_field > 1) + if (count > 1) { - sprintfW(number,format,i); - strcatW(message,number); + len = sprintfW( p, format, i ); + total_len -= len; + p += len; + } + len = total_len; + MSI_RecordGetStringW( record, i, p, &len ); + total_len -= len; + p += len; + if (count > 1 && total_len) + { + *p++ = ' '; + total_len--; } - strcatW(message,tmp); - if (msg_field > 1) - strcatW(message, szSpace); - - msi_free(tmp); } + p[0] = 0; } TRACE("%p %p %p %x %x %s\n", gUIHandlerA, gUIHandlerW, gUIHandlerRecord,

1 0

Hans Leidekker : msi: Fix buffer size calculation in get_keypath.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 0aaf17c0d8c35de836540f83b573e1329b991e09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aaf17c0d8c35de836540f83b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 31 11:57:25 2011 +0200 msi: Fix buffer size calculation in get_keypath. --- dlls/msi/action.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a5a1e33..73d6d1b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2879,14 +2879,11 @@ static WCHAR *get_keypath( MSIPACKAGE *package, HKEY root, const WCHAR *path ) UINT size; WCHAR *path_32node; - size = (strlenW( path ) + strlenW( szWow6432Node ) + 1) * sizeof(WCHAR); - path_32node = msi_alloc( size ); - if (!path_32node) - return NULL; + size = (strlenW( path ) + strlenW( szWow6432Node ) + 2) * sizeof(WCHAR); + if (!(path_32node = msi_alloc( size ))) return NULL; memcpy( path_32node, path, len * sizeof(WCHAR) ); - path_32node[len] = 0; - strcatW( path_32node, szWow6432Node ); + strcpyW( path_32node + len, szWow6432Node ); strcatW( path_32node, szBackSlash ); strcatW( path_32node, path + len ); return path_32node;

1 0

Bart Van Assche : ntdll: Avoid examining uninitialized data.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: e5fe510720ba3d8a247a91e17d1b09bde5f268c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5fe510720ba3d8a247a91e17… Author: Bart Van Assche <bvanassche(a)acm.org> Date: Wed Mar 30 20:50:12 2011 +0200 ntdll: Avoid examining uninitialized data. --- dlls/ntdll/directory.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 66572da..b57741a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -923,7 +923,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) struct statfs stfs; - statfs( dir, &stfs ); + if (statfs( dir, &stfs ) == -1) return FALSE; /* Assume these file systems are always case insensitive on Mac OS. * For FreeBSD, only assume CIOPFS is case insensitive (AFAIK, Mac OS * is the only UNIX that supports case-insensitive lookup). @@ -960,7 +960,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) #elif defined(__NetBSD__) struct statvfs stfs; - statvfs( dir, &stfs ); + if (statvfs( dir, &stfs ) == -1) return FALSE; /* Only assume CIOPFS is case insensitive. */ if (strcmp( stfs.f_fstypename, "fusefs" ) || strncmp( stfs.f_mntfromname, "ciopfs", 5 )) @@ -973,7 +973,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) char *cifile; /* Only assume CIOPFS is case insensitive. */ - statfs( dir, &stfs ); + if (statfs( dir, &stfs ) == -1) return FALSE; if (stfs.f_type != 0x65735546 /* FUSE_SUPER_MAGIC */) return TRUE; /* Normally, we'd have to parse the mtab to find out exactly what @@ -2175,7 +2175,6 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i } } closedir( dir ); - goto not_found; /* avoid warning */ not_found: unix_name[pos - 1] = 0;

1 0

Matteo Bruni : opengl32/tests: Improve window destroy tests.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: bc3ba2f06e4ce34177ac60dc4a48b6c39470d6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3ba2f06e4ce34177ac60dc4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 14 14:47:25 2011 +0100 opengl32/tests: Improve window destroy tests. --- dlls/opengl32/tests/opengl.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 1669d73..64b9ee5 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -949,6 +949,8 @@ static void test_destroy(HDC oldhdc) glFinish(); glerr = glGetError(); ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + ret = SwapBuffers(dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); ret = DestroyWindow(window); ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); @@ -960,6 +962,10 @@ static void test_destroy(HDC oldhdc) err = GetLastError(); ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + SetLastError(0xdeadbeef); + ret = SwapBuffers(dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); ok(wglGetCurrentContext() == ctx, "Wrong current context.\n"); @@ -967,6 +973,10 @@ static void test_destroy(HDC oldhdc) glFinish(); glerr = glGetError(); ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + SetLastError(0xdeadbeef); + ret = SwapBuffers(dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); ret = wglMakeCurrent(NULL, NULL); ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); @@ -975,6 +985,10 @@ static void test_destroy(HDC oldhdc) glFinish(); glerr = glGetError(); todo_wine ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr); + SetLastError(0xdeadbeef); + ret = SwapBuffers(dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); SetLastError(0xdeadbeef); ret = wglMakeCurrent(dc, ctx); @@ -1087,6 +1101,8 @@ static void test_destroy_read(HDC oldhdc) glFinish(); glerr = glGetError(); ok(glerr == GL_NO_ERROR, "Failed glCopyPixel, error %#x.\n", glerr); + ret = SwapBuffers(draw_dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); ret = DestroyWindow(read_window); ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); @@ -1105,6 +1121,8 @@ static void test_destroy_read(HDC oldhdc) glFinish(); glerr = glGetError(); ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + ret = SwapBuffers(draw_dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); ret = wglMakeCurrent(NULL, NULL); ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); @@ -1125,6 +1143,10 @@ static void test_destroy_read(HDC oldhdc) glFinish(); glerr = glGetError(); todo_wine ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr); + SetLastError(0xdeadbeef); + ret = SwapBuffers(draw_dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); SetLastError(0xdeadbeef); ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx);

1 0

Matteo Bruni : winex11.drv: Take care of the destroyed drawable in wglFlush /wglFinish too.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 1e0075cd61c908b3cf6523c132fb16b1a8ee58ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0075cd61c908b3cf6523c13… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 7 22:39:34 2011 +0100 winex11.drv: Take care of the destroyed drawable in wglFlush/wglFinish too. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a7ec8c8..feead5f 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2271,7 +2271,7 @@ void flush_gl_drawable(X11DRV_PDEVICE *physDev) { int w, h; - if (!physDev->gl_copy) + if (!physDev->gl_copy || !physDev->current_pf) return; w = physDev->dc_rect.right - physDev->dc_rect.left;

1 0

Matteo Bruni : winex11.drv: Don' t call glXSwapBuffers if the context or the drawable are invalid.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 90608c8ce633cd79dffd45d02b32fe16e615f4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=90608c8ce633cd79dffd45d02… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 17 22:51:04 2011 +0100 winex11.drv: Don't call glXSwapBuffers if the context or the drawable are invalid. --- dlls/winex11.drv/opengl.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 81979ae..a7ec8c8 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3818,6 +3818,20 @@ BOOL CDECL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) TRACE("(%p)\n", physDev); + if (!ctx) + { + WARN("Using a NULL context, skipping\n"); + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!physDev->current_pf) + { + WARN("Using an invalid drawable, skipping\n"); + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + drawable = get_glxdrawable(physDev); wine_tsx11_lock();

1 0

Matteo Bruni : winex11.drv: Fix wglMakeContextCurrent with an invalid drawable.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 1902e1cb9306b65ab903f02d855078545a1ddfa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1902e1cb9306b65ab903f02d8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 16 00:32:47 2011 +0100 winex11.drv: Fix wglMakeContextCurrent with an invalid drawable. --- dlls/opengl32/tests/opengl.c | 8 ++++---- dlls/winex11.drv/opengl.c | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 7b6c911..1669d73 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1129,10 +1129,10 @@ static void test_destroy_read(HDC oldhdc) SetLastError(0xdeadbeef); ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); err = GetLastError(); - todo_wine ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), + ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); - todo_wine ok(wglGetCurrentContext() == NULL, "Wrong current context.\n"); + ok(wglGetCurrentContext() == NULL, "Wrong current context.\n"); wglMakeCurrent(NULL, NULL); @@ -1142,10 +1142,10 @@ static void test_destroy_read(HDC oldhdc) SetLastError(0xdeadbeef); ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); err = GetLastError(); - todo_wine ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), + ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), "Unexpected behavior when making context current, last error %#x.\n", err); - todo_wine ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); ret = wglDeleteContext(ctx); ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 1d2eacf..81979ae 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1972,6 +1972,12 @@ BOOL CDECL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* pDrawDev, X11DRV_PDEV ret = pglXMakeCurrent(gdi_display, None, NULL); NtCurrentTeb()->glContext = NULL; } + else if (!pDrawDev->current_pf) + { + WARN("Trying to use an invalid drawable\n"); + SetLastError(ERROR_INVALID_HANDLE); + ret = FALSE; + } else { if (NULL == pglXMakeContextCurrent) {

1 0

Matteo Bruni : winex11.drv: Don' t modify state if glXMakeContextCurrent fails.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 868974c61579fda8eabf84a3caf299346e069662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868974c61579fda8eabf84a3c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 11 21:47:32 2011 +0100 winex11.drv: Don't modify state if glXMakeContextCurrent fails. --- dlls/winex11.drv/opengl.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0a23e44..1d2eacf 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1977,22 +1977,27 @@ BOOL CDECL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* pDrawDev, X11DRV_PDEV if (NULL == pglXMakeContextCurrent) { ret = FALSE; } else { - Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; Wine_GLContext *ctx = (Wine_GLContext *) hglrc; Drawable d_draw = get_glxdrawable(pDrawDev); Drawable d_read = get_glxdrawable(pReadDev); - if (prev_ctx) prev_ctx->tid = 0; - - ctx->has_been_current = TRUE; - ctx->tid = GetCurrentThreadId(); - ctx->hdc = pDrawDev->hdc; - ctx->read_hdc = pReadDev->hdc; - ctx->drawables[0] = d_draw; - ctx->drawables[1] = d_read; - ctx->refresh_drawables = FALSE; ret = pglXMakeContextCurrent(gdi_display, d_draw, d_read, ctx->ctx); - NtCurrentTeb()->glContext = ctx; + if (ret) + { + Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; + if (prev_ctx) prev_ctx->tid = 0; + + ctx->has_been_current = TRUE; + ctx->tid = GetCurrentThreadId(); + ctx->hdc = pDrawDev->hdc; + ctx->read_hdc = pReadDev->hdc; + ctx->drawables[0] = d_draw; + ctx->drawables[1] = d_read; + ctx->refresh_drawables = FALSE; + NtCurrentTeb()->glContext = ctx; + } + else + SetLastError(ERROR_INVALID_HANDLE); } } wine_tsx11_unlock();

1 0

Matteo Bruni : opengl32/tests: Add a test for window destroy with wglMakeContextCurrentARB.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 8818c1d8b6712af5efa754a5145817a28d36a23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8818c1d8b6712af5efa754a51… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 18 14:16:58 2011 +0100 opengl32/tests: Add a test for window destroy with wglMakeContextCurrentARB. --- dlls/opengl32/tests/opengl.c | 158 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 157 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 9834c6d..7b6c911 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -24,8 +24,10 @@ void WINAPI glClearColor(float red, float green, float blue, float alpha); void WINAPI glClear(unsigned int mask); -void WINAPI glFinish(void); +#define GL_COLOR 0x1800 typedef unsigned int GLenum; +void WINAPI glCopyPixels(int x, int y, int width, int height, GLenum type); +void WINAPI glFinish(void); #define GL_NO_ERROR 0x0 #define GL_INVALID_OPERATION 0x502 GLenum WINAPI glGetError(void); @@ -1003,6 +1005,157 @@ static void test_destroy(HDC oldhdc) ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); } +static void test_destroy_read(HDC oldhdc) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND draw_window, read_window; + HGLRC ctx; + BOOL ret; + HDC read_dc, draw_dc; + GLenum glerr; + DWORD err; + HGLRC oldctx = wglGetCurrentContext(); + + ok(!!oldctx, "Expected to find a valid current context\n"); + + draw_window = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!draw_window, "Failed to create window, last error %#x.\n", GetLastError()); + + draw_dc = GetDC(draw_window); + ok(!!draw_dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(draw_dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(draw_window, draw_dc); + DestroyWindow(draw_window); + return; + } + + ret = SetPixelFormat(draw_dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + read_window = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!read_window, "Failed to create window, last error %#x.\n", GetLastError()); + + read_dc = GetDC(read_window); + ok(!!draw_dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(read_dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(read_window, read_dc); + DestroyWindow(read_window); + ReleaseDC(draw_window, draw_dc); + DestroyWindow(draw_window); + return; + } + + ret = SetPixelFormat(read_dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx = wglCreateContext(draw_dc); + ok(!!ctx, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + glCopyPixels(0, 0, 640, 480, GL_COLOR); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glCopyPixel, error %#x.\n", glerr); + + ret = DestroyWindow(read_window); + ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); + + ok(wglGetCurrentContext() == ctx, "Wrong current context.\n"); + + if (0) /* Crashes on AMD on Windows */ + { + glCopyPixels(0, 0, 640, 480, GL_COLOR); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glCopyPixel, error %#x.\n", glerr); + } + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); + + if (0) /* This crashes with Nvidia drivers on Windows. */ + { + SetLastError(0xdeadbeef); + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + } + + ret = DestroyWindow(draw_window); + ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + todo_wine ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr); + + SetLastError(0xdeadbeef); + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + err = GetLastError(); + todo_wine ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + + todo_wine ok(wglGetCurrentContext() == NULL, "Wrong current context.\n"); + + wglMakeCurrent(NULL, NULL); + + wglMakeCurrent(oldhdc, oldctx); + ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + + SetLastError(0xdeadbeef); + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + err = GetLastError(); + todo_wine ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), + "Unexpected behavior when making context current, last error %#x.\n", err); + + todo_wine ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(read_window, read_dc); + ReleaseDC(draw_window, draw_dc); + + wglMakeCurrent(oldhdc, oldctx); +} + START_TEST(opengl) { HWND hwnd; @@ -1103,7 +1256,10 @@ START_TEST(opengl) test_opengl3(hdc); if(strstr(wgl_extensions, "WGL_ARB_make_current_read")) + { test_make_current_read(hdc); + test_destroy_read(hdc); + } else skip("WGL_ARB_make_current_read not supported, skipping test\n");

1 0

Piotr Caban : mshtml/tests: Ignore calls missing in IE6.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 454da235ea30fae25bb6d12c8661565301dc2830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454da235ea30fae25bb6d12c8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 22:28:27 2011 +0200 mshtml/tests: Ignore calls missing in IE6. --- dlls/mshtml/tests/htmldoc.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 2df4e74..b0ceea0 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -74,6 +74,12 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHECK_CALLED_BROKEN(func) \ + do { \ + ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + static IOleDocumentView *view = NULL; static HWND container_hwnd = NULL, hwnd = NULL, last_hwnd = NULL; @@ -1213,7 +1219,7 @@ static void continue_binding(IBindStatusCallback *callback) BINDSTATUS_BEGINDOWNLOADDATA, doc_url); ok(hres == S_OK, "OnProgress(BINDSTATUS_BEGINDOWNLOADDATA) failed: %08x\n", hres); if(status_code != HTTP_STATUS_OK) { - CHECK_CALLED(IsErrorUrl); + CHECK_CALLED_BROKEN(IsErrorUrl); SET_EXPECT(IsErrorUrl); } @@ -3928,7 +3934,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_37); - todo_wine CHECK_CALLED(IsErrorUrl); + todo_wine CHECK_CALLED_BROKEN(IsErrorUrl); } else todo_wine CHECK_CALLED(GetTravelLog); @@ -4068,18 +4074,18 @@ static void test_download(DWORD flags) CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); CHECK_CALLED(Exec_HTTPEQUIV_DONE); SET_CALLED(SetStatusText); - if(nav_url) { /* avoiding race, FIXME: fund better way */ + if(nav_url) { /* avoiding race, FIXME: find better way */ SET_CALLED(UpdateUI); SET_CALLED(Exec_UPDATECOMMANDS); SET_CALLED(Exec_SETTITLE); - todo_wine CHECK_CALLED(UpdateBackForwardState); + todo_wine CHECK_CALLED_BROKEN(UpdateBackForwardState); } if(!editmode && !(flags & DWL_EMPTY)) todo_wine CHECK_CALLED(FireNavigateComplete2); if(!editmode) CHECK_CALLED(FireDocumentComplete); todo_wine CHECK_CALLED(ActiveElementChanged); - todo_wine CHECK_CALLED(IsErrorUrl); + todo_wine CHECK_CALLED_BROKEN(IsErrorUrl); load_state = LD_COMPLETE;

1 0

Vincent Pelletier : dinput: Effect length can actually be 0.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: f1beea4f861be815b5b6c3d539ba4eec9c668414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1beea4f861be815b5b6c3d53… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Wed Mar 30 21:52:14 2011 +0200 dinput: Effect length can actually be 0. This fixes force feedback devices slamming for 10ms at full strength, as attack is an absolute value, not a factor of effect level. --- dlls/dinput/effect_linuxinput.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index fbc5994..0154f49 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -606,13 +606,12 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( else env = NULL; if (peff->lpEnvelope == NULL) { - /* if this type had an envelope, reset it - * note that length can never be zero, so we set it to something minuscule */ + /* if this type had an envelope, reset it */ if (env) { - env->attack_length = 0x10; - env->attack_level = 0x7FFF; - env->fade_length = 0x10; - env->fade_level = 0x7FFF; + env->attack_length = 0; + env->attack_level = 0; + env->fade_length = 0; + env->fade_level = 0; } } else { /* did we get passed an envelope for a type that doesn't even have one? */

1 0

André Hentschel : uxtheme/tests: Fix typo.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 1f8f7cf7af317fded4daef9407e35b34bc400c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8f7cf7af317fded4daef940… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 30 21:51:02 2011 +0200 uxtheme/tests: Fix typo. --- dlls/uxtheme/tests/system.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 7f77546..b730246 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -421,7 +421,7 @@ static void test_OpenThemeDataEx(void) ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", GetLastError()); - skip("No active theme, skipping rest of OpenThemeData tests\n"); + skip("No active theme, skipping rest of OpenThemeDataEx tests\n"); return; }

1 0

Henri Verbeet : wined3d: Rename "numContexts" to "context_count".
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 692aa004d00080d7361a2c0d35db68a67a3a87c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=692aa004d00080d7361a2c0d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 20:49:27 2011 +0200 wined3d: Rename "numContexts" to "context_count". --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/device.c | 18 ++++++++++-------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e52bc48..3b0a9b6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -659,7 +659,7 @@ static void context_enum_surface_fbo_entries(IWineD3DDeviceImpl *device, { UINT i; - for (i = 0; i < device->numContexts; ++i) + for (i = 0; i < device->context_count; ++i) { struct wined3d_context *context = device->contexts[i]; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -1370,7 +1370,7 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, } ctx = pwglCreateContext(hdc); - if (device->numContexts) + if (device->context_count) { if (!pwglShareLists(device->contexts[0]->glCtx, ctx)) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 695dbb2..1ef9c62 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -504,7 +504,8 @@ BOOL device_context_add(IWineD3DDeviceImpl *device, struct wined3d_context *cont TRACE("Adding context %p.\n", context); if (!device->contexts) new_array = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_array)); - else new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts, sizeof(*new_array) * (device->numContexts + 1)); + else new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts, + sizeof(*new_array) * (device->context_count + 1)); if (!new_array) { @@ -512,7 +513,7 @@ BOOL device_context_add(IWineD3DDeviceImpl *device, struct wined3d_context *cont return FALSE; } - new_array[device->numContexts++] = context; + new_array[device->context_count++] = context; device->contexts = new_array; return TRUE; } @@ -525,7 +526,7 @@ void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *c TRACE("Removing context %p.\n", context); - for (i = 0; i < device->numContexts; ++i) + for (i = 0; i < device->context_count; ++i) { if (device->contexts[i] == context) { @@ -540,15 +541,15 @@ void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *c return; } - if (!--device->numContexts) + if (!--device->context_count) { HeapFree(GetProcessHeap(), 0, device->contexts); device->contexts = NULL; return; } - memmove(&device->contexts[i], &device->contexts[i + 1], (device->numContexts - i) * sizeof(*device->contexts)); - new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts, device->numContexts * sizeof(*device->contexts)); + memmove(&device->contexts[i], &device->contexts[i + 1], (device->context_count - i) * sizeof(*device->contexts)); + new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts, device->context_count * sizeof(*device->contexts)); if (!new_array) { ERR("Failed to shrink context array. Oh well.\n"); @@ -6283,7 +6284,7 @@ static void delete_opengl_contexts(IWineD3DDeviceImpl *device, IWineD3DSwapChain context_release(context); - while (device->numContexts) + while (device->context_count) { context_destroy(device, device->contexts[0]); } @@ -7065,7 +7066,8 @@ void IWineD3DDeviceImpl_MarkStateDirty(IWineD3DDeviceImpl *This, DWORD state) { BYTE shift; UINT i; - for(i = 0; i < This->numContexts; i++) { + for (i = 0; i < This->context_count; ++i) + { context = This->contexts[i]; if(isStateDirty(context, rep)) continue; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f76cdde..5d4dfa7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1013,7 +1013,7 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_ IWineD3DDeviceImpl *device = This->resource.device; unsigned int i; - for (i = 0; i < device->numContexts; ++i) + for (i = 0; i < device->context_count; ++i) { context_surface_update(device->contexts[i], This); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8587afc..c985378 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1759,7 +1759,7 @@ struct IWineD3DDeviceImpl /* Context management */ struct wined3d_context **contexts; - UINT numContexts; + UINT context_count; /* High level patch management */ #define PATCHMAP_SIZE 43

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DBaseShader typedefs.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 8fe80e18b2856de90108ae18215502bf8bb73057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe80e18b2856de90108ae182… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 20:49:26 2011 +0200 wined3d: Get rid of the IWineD3DBaseShader typedefs. --- dlls/wined3d/arb_program_shader.c | 48 ++++++++++++++++----------------- dlls/wined3d/device.c | 48 ++++++++++++++++----------------- dlls/wined3d/glsl_shader.c | 52 +++++++++++++++++------------------- dlls/wined3d/shader.c | 28 ++++++++++---------- dlls/wined3d/state.c | 4 +- dlls/wined3d/stateblock.c | 4 +- dlls/wined3d/wined3d_private.h | 16 +++++------ 7 files changed, 96 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fe80e18b2856de90108a…

1 0

Henri Verbeet : wined3d: Remove COM from the shader implementation.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: f8f83ff2f7da887570eeafbc24e47ca7f824bcc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f83ff2f7da887570eeafbc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 20:49:25 2011 +0200 wined3d: Remove COM from the shader implementation. --- dlls/d3d10core/d3d10core_private.h | 6 +- dlls/d3d10core/shader.c | 10 +- dlls/d3d8/d3d8_private.h | 6 +- dlls/d3d8/device.c | 21 +++--- dlls/d3d8/shader.c | 8 +- dlls/d3d8/vertexdeclaration.c | 4 +- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 12 ++-- dlls/d3d9/shader.c | 12 ++-- dlls/wined3d/arb_program_shader.c | 10 +- dlls/wined3d/device.c | 24 +++--- dlls/wined3d/glsl_shader.c | 12 ++-- dlls/wined3d/shader.c | 150 ++++++++++++------------------------ dlls/wined3d/stateblock.c | 12 ++-- dlls/wined3d/wined3d.spec | 6 ++ dlls/wined3d/wined3d_private.h | 21 +++--- include/wine/wined3d.idl | 41 ++++------ 17 files changed, 153 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8f83ff2f7da887570eea…

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DBaseShaderClass.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 5555d904beee92833996059d288539478164a40f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5555d904beee92833996059d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 20:49:24 2011 +0200 wined3d: Get rid of IWineD3DBaseShaderClass. --- dlls/wined3d/arb_program_shader.c | 185 +++++++++++---------- dlls/wined3d/device.c | 12 +- dlls/wined3d/glsl_shader.c | 169 ++++++++++---------- dlls/wined3d/shader.c | 319 +++++++++++++++++++------------------ dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 81 +++++----- 6 files changed, 388 insertions(+), 382 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5555d904beee928339960…

1 0

Henri Verbeet : wined3d: Merge the IWineD3DBaseShader implementations.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 45fd0d4e7a2c0935a68d05e2833dc9aced1e3e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45fd0d4e7a2c0935a68d05e28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 20:49:23 2011 +0200 wined3d: Merge the IWineD3DBaseShader implementations. --- dlls/wined3d/shader.c | 203 ++++-------------------------------------------- 1 files changed, 17 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45fd0d4e7a2c0935a68d0…

1 0

Piotr Caban : msvcrt: Fix buffer size in _ecvt_s.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: f48cfa2be0e0d199072308cd759c2e75734a7cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48cfa2be0e0d199072308cd7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 20:33:06 2011 +0200 msvcrt: Fix buffer size in _ecvt_s. --- dlls/msvcrt/math.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ab9cec4..3428398 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1306,17 +1306,17 @@ int CDECL _ecvt_s( char *buffer, MSVCRT_size_t length, double number, int ndigit (*sign) = 0; return 0; } - result = (char*)MSVCRT_malloc(max(ndigits + 7, 7)); + /* handle cases with zero ndigits or less */ + prec = ndigits; + if( prec < 1) prec = 2; + result = (char*)MSVCRT_malloc(prec + 7); if( number < 0) { *sign = TRUE; number = -number; } else *sign = FALSE; - /* handle cases with zero ndigits or less */ - prec = ndigits; - if( prec < 1) prec = 2; - len = snprintf(result, 80, "%.*le", prec - 1, number); + len = snprintf(result, prec + 7, "%.*le", prec - 1, number); /* take the decimal "point away */ if( prec != 1) memmove( result + 1, result + 2, len - 1 );

1 0

Piotr Caban : msvcrt/tests: Fix memory leaks (valgrind).
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: d5e3e9301a5dca7a3d171d202f644d18fe8c8f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e3e9301a5dca7a3d171d202… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 20:31:33 2011 +0200 msvcrt/tests: Fix memory leaks (valgrind). --- dlls/msvcrt/tests/cpp.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index c3b7c3d..dfb2cd7 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -810,7 +810,8 @@ static void test_rtti(void) void *casted; if (bAncientVersion || - !p__RTCastToVoid || !p__RTtypeid || !pexception_ctor || !pbad_typeid_ctor || !p__RTDynamicCast) + !p__RTCastToVoid || !p__RTtypeid || !pexception_ctor || !pbad_typeid_ctor + || !p__RTDynamicCast || !pexception_dtor || !pbad_typeid_dtor) return; call_func2(pexception_ctor, &e, &e_name); @@ -834,6 +835,9 @@ static void test_rtti(void) /* dynamic_cast down */ casted = p__RTDynamicCast(&e, 0, NULL, bti, 0); ok (casted == NULL, "Cast succeeded\n"); + + call_func1(pexception_dtor, &e); + call_func1(pbad_typeid_dtor, &b); } struct _demangle { @@ -864,7 +868,8 @@ static void test_demangle_datatype(void) ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); else todo_wine ok(name != NULL && !strcmp(name,demangle[i].result), "Got name %s for %d\n", name, i); - + if(name) + pfree(name); } }

1 0

Piotr Caban : msvcrt: Correctly terminate string in wcsncat_s.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: da4ed4707683687254d4abcb63f8abdd0ba7b313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da4ed4707683687254d4abcb6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 15:45:21 2011 +0200 msvcrt: Correctly terminate string in wcsncat_s. --- dlls/msvcrt/wcs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index cf3cba3..a7c7a77 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1716,7 +1716,7 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, if (srclen < (elem - dststart)) { memcpy(&dst[dststart], src, srclen*sizeof(MSVCRT_wchar_t)); - dst[srclen] = '\0'; + dst[dststart+srclen] = '\0'; return ret; } MSVCRT_INVALID_PMT("dst[elem] is too small");

1 0

Piotr Caban : msvcrt: Added space for nullbyte in size returned by wcstombs_s and mbstowcs_s.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: fdffe548f10d4b07a8fb0af9668ba310824b2304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdffe548f10d4b07a8fb0af96… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 15:45:04 2011 +0200 msvcrt: Added space for nullbyte in size returned by wcstombs_s and mbstowcs_s. --- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/tests/string.c | 8 ++++++++ dlls/msvcrt/wcs.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 2a2ac72..caadc32 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1900,7 +1900,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, if(!wcstr && !size) { conv = MSVCRT__mbstowcs_l(NULL, mbstr, 0, locale); if(ret) - *ret = conv; + *ret = conv+1; return 0; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index f3d8dc4..6aba883 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1337,6 +1337,10 @@ static void test_mbstowcs(void) ok(ret == 3, "ret = %d\n", (int)ret); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + err = pmbstowcs_s(&ret, NULL, 0, mHiragana, 1); + ok(err == 0, "err = %d\n", err); + ok(ret == 3, "ret = %d\n", (int)ret); + err = pwcstombs_s(&ret, mOut, 6, wSimple, _TRUNCATE); ok(err == 0, "err = %d\n", err); ok(ret == 5, "ret = %d\n", (int)ret); @@ -1346,6 +1350,10 @@ static void test_mbstowcs(void) ok(err == 0, "err = %d\n", err); ok(ret == 5, "ret = %d\n", (int)ret); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); + + err = pwcstombs_s(&ret, NULL, 0, wHiragana, 1); + ok(err == 0, "err = %d\n", err); + ok(ret == 5, "ret = %d\n", (int)ret); } static void test_gcvt(void) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 93aa0f0..cf3cba3 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -341,7 +341,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, if(!mbstr && !size) { conv = MSVCRT__wcstombs_l(NULL, wcstr, 0, locale); if(ret) - *ret = conv; + *ret = conv+1; return 0; }

1 0

Francois Gouget : winedbg: stack_get_register_current_frame() is not used anymore so remove it.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: f54b1688550da7df74ecbbd4e3df8bceb0318122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54b1688550da7df74ecbbd4e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:41:23 2011 +0200 winedbg: stack_get_register_current_frame() is not used anymore so remove it. --- programs/winedbg/stack.c | 23 ----------------------- 1 files changed, 0 insertions(+), 23 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index a291c61..f6583a3 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -111,29 +111,6 @@ BOOL stack_get_current_frame(IMAGEHLP_STACK_FRAME* ihsf) return stack_get_frame(dbg_curr_thread->curr_frame, ihsf); } -BOOL stack_get_register_current_frame(unsigned regno, DWORD_PTR** pval) -{ - enum be_cpu_addr kind; - - if (dbg_curr_thread->frames == NULL) return FALSE; - - if (!be_cpu->get_register_info(regno, &kind)) return FALSE; - - switch (kind) - { - case be_cpu_addr_pc: - *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_pc; - break; - case be_cpu_addr_stack: - *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_stack; - break; - case be_cpu_addr_frame: - *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_frame; - break; - } - return TRUE; -} - BOOL stack_get_register_frame(const struct dbg_internal_var* div, DWORD_PTR** pval) { if (dbg_curr_thread->frames == NULL) return FALSE;

1 0

Francois Gouget : winedbg: memory_get_current_frame() is not used anymore so remove it.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: f8624006a7023ac837ec092bea616fb178d50c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8624006a7023ac837ec092be… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:40:17 2011 +0200 winedbg: memory_get_current_frame() is not used anymore so remove it. --- programs/winedbg/debugger.h | 1 - programs/winedbg/memory.c | 7 ------- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 529191f..9c72916 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -367,7 +367,6 @@ extern void memory_examine(const struct dbg_lvalue *lvalue, int coun extern void* memory_to_linear_addr(const ADDRESS64* address); extern BOOL memory_get_current_pc(ADDRESS64* address); extern BOOL memory_get_current_stack(ADDRESS64* address); -extern BOOL memory_get_current_frame(ADDRESS64* address); extern BOOL memory_get_string(struct dbg_process* pcs, void* addr, BOOL in_debuggee, BOOL unicode, char* buffer, int size); extern BOOL memory_get_string_indirect(struct dbg_process* pcs, void* addr, BOOL unicode, WCHAR* buffer, int size); extern BOOL memory_get_register(DWORD regno, DWORD_PTR** value, char* buffer, int len); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 5a54ec1..7a0b085 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -67,13 +67,6 @@ BOOL memory_get_current_stack(ADDRESS64* addr) be_cpu_addr_stack, addr); } -BOOL memory_get_current_frame(ADDRESS64* addr) -{ - assert(be_cpu->get_addr); - return be_cpu->get_addr(dbg_curr_thread->handle, &dbg_context, - be_cpu_addr_frame, addr); -} - static void memory_report_invalid_addr(const void* addr) { ADDRESS64 address;

1 0

Francois Gouget : programs: In English punctuations are not preceded by a space.
by Alexandre Julliard 30 Mar '11

30 Mar '11

1 0

Francois Gouget : winmm: Remove a space before a punctuation.
by Alexandre Julliard 30 Mar '11

30 Mar '11

1 0

Francois Gouget : winefile: Fix the compilation when _NO_EXTENSIONS is defined.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 1a56a26b854127aafa7fdee4b23d937d6dc60522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a56a26b854127aafa7fdee4b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:57:46 2011 +0200 winefile: Fix the compilation when _NO_EXTENSIONS is defined. --- programs/winefile/winefile.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 40175f0..51a889d 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2105,6 +2105,7 @@ static BOOL activate_drive_window(LPCWSTR path) return FALSE; } +#ifndef _NO_EXTENSIONS static BOOL activate_fs_window(LPCWSTR filesys) { HWND child_wnd; @@ -2127,6 +2128,7 @@ static BOOL activate_fs_window(LPCWSTR filesys) return FALSE; } +#endif /* _NO_EXTENSIONS */ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { @@ -2562,6 +2564,7 @@ static BOOL calc_widths(Pane* pane, BOOL anyway) } +#ifndef _NO_EXTENSIONS /* calculate one preferred column width */ static void calc_single_width(Pane* pane, int col) @@ -2620,6 +2623,7 @@ static void calc_single_width(Pane* pane, int col) SendMessageW(pane->hwnd, LB_SETHORIZONTALEXTENT, x, 0); } +#endif /* _NO_EXTENSIONS */ static BOOL pattern_match(LPCWSTR str, LPCWSTR pattern) @@ -3314,7 +3318,7 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi } else hpen = CreatePen(PS_DOT, 0, RGB(255,255,255)); - lastPen = SelectPen(dis->hDC, hpen); + lastPen = SelectObject(dis->hDC, hpen); lastBrush = SelectObject(dis->hDC, GetStockObject(HOLLOW_BRUSH)); SetROP2(dis->hDC, R2_XORPEN); Rectangle(dis->hDC, focusRect.left, focusRect.top, focusRect.right, focusRect.bottom); @@ -3986,6 +3990,7 @@ static BOOL CtxMenu_HandleMenuMsg(UINT nmsg, WPARAM wparam, LPARAM lparam) } +#ifndef _NO_EXTENSIONS static HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParent, int cidl, LPCITEMIDLIST* apidl, int x, int y) { IContextMenu* pcm; @@ -4031,6 +4036,7 @@ static HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParen return FAILED(hr)? hr: executed? S_OK: S_FALSE; } +#endif /* _NO_EXTENSIONS */ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) @@ -4681,7 +4687,7 @@ static BOOL CALLBACK EnumWndProc(HWND hwnd, LPARAM lparam) { WCHAR cls[128]; - GetClassName(hwnd, cls, 128); + GetClassNameW(hwnd, cls, 128); if (!lstrcmpW(cls, (LPCWSTR)lparam)) { g_foundPrevInstance++;

1 0

Francois Gouget : winefile: Remove commented out code.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 378cf80a1af9d0925cabc79211b678a95ef2a779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=378cf80a1af9d0925cabc7921… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:50:55 2011 +0200 winefile: Remove commented out code. --- programs/winefile/winefile.c | 56 +----------------------------------------- 1 files changed, 1 insertions(+), 55 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 2bad75c..40175f0 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2872,9 +2872,6 @@ static void calc_tabbed_width(Pane* pane, LPDRAWITEMSTRUCT dis, int col, LPCWSTR { RECT rt = {0, 0, 0, 0}; -/* DRAWTEXTPARAMS dtp = {sizeof(DRAWTEXTPARAMS), 2}; - DrawTextExW(dis->hDC, (LPWSTR)str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_NOPREFIX|DT_EXPANDTABS|DT_TABSTOP, &dtp);*/ - DrawTextW(dis->hDC, str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); /*FIXME rt (0,0) ??? */ @@ -2906,9 +2903,6 @@ static void output_tabbed_text(Pane* pane, LPDRAWITEMSTRUCT dis, int col, LPCWST rt.right = x+pane->positions[col+1]-Globals.spaceSize.cx; rt.bottom = dis->rcItem.bottom; -/* DRAWTEXTPARAMS dtp = {sizeof(DRAWTEXTPARAMS), 2}; - DrawTextExW(dis->hDC, (LPWSTR)str, -1, &rt, DT_SINGLELINE|DT_NOPREFIX|DT_EXPANDTABS|DT_TABSTOP, &dtp);*/ - DrawTextW(dis->hDC, str, -1, &rt, DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); } @@ -3065,7 +3059,6 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi hrgn_org = 0; } - /* HGDIOBJ holdPen = SelectObject(dis->hDC, GetStockObject(BLACK_PEN)); */ ExtSelectClipRgn(dis->hDC, hrgn, RGN_AND); DeleteObject(hrgn); @@ -3103,7 +3096,6 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi SelectClipRgn(dis->hDC, hrgn_org); if (hrgn_org) DeleteObject(hrgn_org); - /* SelectObject(dis->hDC, holdPen); */ } else if (calcWidthCol==col || calcWidthCol==COLUMNS) { int right = img_pos + IMAGE_WIDTH - TREE_LINE_DX; @@ -3305,43 +3297,6 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi col++; } -/*TODO - if (flags.security) { - static const WCHAR sSecTabs[] = { - ' ','\t',' ','\t',' ','\t',' ', - ' ','\t',' ', - ' ','\t',' ','\t',' ','\t',' ', - ' ','\t',' ', - ' ','\t',' ','\t',' ','\t',' ', - '\0' - }; - - DWORD rights = get_access_mask(); - - lstrcpyW(buffer, sSecTabs); - - if (rights & FILE_READ_DATA) buffer[ 0] = 'R'; - if (rights & FILE_WRITE_DATA) buffer[ 2] = 'W'; - if (rights & FILE_APPEND_DATA) buffer[ 4] = 'A'; - if (rights & FILE_READ_EA) {buffer[6] = 'entry'; buffer[ 7] = 'R';} - if (rights & FILE_WRITE_EA) {buffer[9] = 'entry'; buffer[10] = 'W';} - if (rights & FILE_EXECUTE) buffer[12] = 'X'; - if (rights & FILE_DELETE_CHILD) buffer[14] = 'D'; - if (rights & FILE_READ_ATTRIBUTES) {buffer[16] = 'a'; buffer[17] = 'R';} - if (rights & FILE_WRITE_ATTRIBUTES) {buffer[19] = 'a'; buffer[20] = 'W';} - if (rights & WRITE_DAC) buffer[22] = 'C'; - if (rights & WRITE_OWNER) buffer[24] = 'O'; - if (rights & SYNCHRONIZE) buffer[26] = 'S'; - - output_text(dis, col++, buffer, DT_LEFT, 3, psize); - } - - if (flags.description) { - get_description(buffer); - output_text(dis, col++, buffer, 0, psize); - } -*/ - #ifdef _NO_EXTENSIONS } @@ -4037,7 +3992,6 @@ static HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParen BOOL executed = FALSE; HRESULT hr = IShellFolder_GetUIObjectOf(shell_folder, hwndParent, cidl, apidl, &IID_IContextMenu, NULL, (LPVOID*)&pcm); -/* HRESULT hr = CDefFolderMenu_Create2(dir?dir->_pidl:DesktopFolder(), hwndParent, 1, &pidl, shell_folder, NULL, 0, NULL, &pcm); */ if (SUCCEEDED(hr)) { HMENU hmenu = CreatePopupMenu(); @@ -4628,10 +4582,7 @@ static BOOL show_frame(HWND hwndParent, int cmdshow, LPCWSTR path) {1, ID_WINDOW_CASCADE, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, {2, ID_WINDOW_TILE_HORZ, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, {3, ID_WINDOW_TILE_VERT, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, -/*TODO - {4, ID_... , TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, - {5, ID_... , TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, -*/ }; + }; Globals.htoolbar = CreateToolbarEx(Globals.hMainWnd, WS_CHILD|WS_VISIBLE, IDW_TOOLBAR, 2, Globals.hInstance, IDB_TOOLBAR, toolbarBtns, @@ -4642,11 +4593,6 @@ static BOOL show_frame(HWND hwndParent, int cmdshow, LPCWSTR path) Globals.hstatusbar = CreateStatusWindowW(WS_CHILD|WS_VISIBLE, 0, Globals.hMainWnd, IDW_STATUSBAR); CheckMenuItem(Globals.hMenuOptions, ID_VIEW_STATUSBAR, MF_BYCOMMAND|MF_CHECKED); -/* CreateStatusWindowW does not accept WS_BORDER - Globals.hstatusbar = CreateWindowExW(WS_EX_NOPARENTNOTIFY, STATUSCLASSNAME, 0, - WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_BORDER|CCS_NODIVIDER, 0,0,0,0, - Globals.hMainWnd, (HMENU)IDW_STATUSBAR, hinstance, 0);*/ - /*TODO: read paths from registry */ if (!path || !*path) {

1 0

Francois Gouget : winefile: Remove the format disk command.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 519e6f896cd195e80504b2d42cea0c1cfabba317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=519e6f896cd195e80504b2d42… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:47:58 2011 +0200 winefile: Remove the format disk command. SHFormatDrive() is unimplemented in Wine and a format command seems useless in winefile. --- po/ar.po | 104 ++++++++++++++++++++--------------------- po/bg.po | 104 ++++++++++++++++++++--------------------- po/ca.po | 104 ++++++++++++++++++++--------------------- po/cs.po | 104 ++++++++++++++++++++--------------------- po/da.po | 104 ++++++++++++++++++++--------------------- po/de.po | 104 ++++++++++++++++++++--------------------- po/el.po | 104 ++++++++++++++++++++--------------------- po/en.po | 104 ++++++++++++++++++++--------------------- po/en_US.po | 104 ++++++++++++++++++++--------------------- po/eo.po | 104 ++++++++++++++++++++--------------------- po/es.po | 104 ++++++++++++++++++++--------------------- po/fa.po | 104 ++++++++++++++++++++--------------------- po/fi.po | 104 ++++++++++++++++++++--------------------- po/fr.po | 104 ++++++++++++++++++++--------------------- po/he.po | 104 ++++++++++++++++++++--------------------- po/hi.po | 104 ++++++++++++++++++++--------------------- po/hu.po | 104 ++++++++++++++++++++--------------------- po/it.po | 104 ++++++++++++++++++++--------------------- po/ja.po | 104 ++++++++++++++++++++--------------------- po/ko.po | 104 ++++++++++++++++++++--------------------- po/lt.po | 104 ++++++++++++++++++++--------------------- po/ml.po | 104 ++++++++++++++++++++--------------------- po/nb_NO.po | 104 ++++++++++++++++++++--------------------- po/nl.po | 104 ++++++++++++++++++++--------------------- po/or.po | 104 ++++++++++++++++++++--------------------- po/pa.po | 104 ++++++++++++++++++++--------------------- po/pl.po | 104 ++++++++++++++++++++--------------------- po/pt_BR.po | 104 ++++++++++++++++++++--------------------- po/pt_PT.po | 104 ++++++++++++++++++++--------------------- po/rm.po | 104 ++++++++++++++++++++--------------------- po/ro.po | 104 ++++++++++++++++++++--------------------- po/ru.po | 104 ++++++++++++++++++++--------------------- po/sk.po | 104 ++++++++++++++++++++--------------------- po/sl.po | 104 ++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 104 ++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 104 ++++++++++++++++++++--------------------- po/sv.po | 104 ++++++++++++++++++++--------------------- po/te.po | 104 ++++++++++++++++++++--------------------- po/th.po | 104 ++++++++++++++++++++--------------------- po/tr.po | 104 ++++++++++++++++++++--------------------- po/uk.po | 104 ++++++++++++++++++++--------------------- po/wa.po | 104 ++++++++++++++++++++--------------------- po/wine.pot | 104 ++++++++++++++++++++--------------------- po/zh_CN.po | 104 ++++++++++++++++++++--------------------- po/zh_TW.po | 104 ++++++++++++++++++++--------------------- programs/winefile/resource.h | 1 - programs/winefile/winefile.c | 7 --- programs/winefile/winefile.h | 2 +- programs/winefile/winefile.rc | 2 - 49 files changed, 2251 insertions(+), 2441 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=519e6f896cd195e80504b…

1 0

Francois Gouget : winefile: Remove unimplemented menu entries.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 0a2be1a0bee10f467838cbcd06f87cb23724c8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2be1a0bee10f467838cbcd0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:46:13 2011 +0200 winefile: Remove unimplemented menu entries. They unnecessarily clutter the GUI and are unlikely to ever be implemented. --- po/ar.po | 239 ++++++++++----------------------------- po/bg.po | 242 ++++++++++------------------------------ po/ca.po | 235 ++++++++++----------------------------- po/cs.po | 235 ++++++++++----------------------------- po/da.po | 235 ++++++++++----------------------------- po/de.po | 235 ++++++++++----------------------------- po/el.po | 237 ++++++++++----------------------------- po/en.po | 234 ++++++++++---------------------------- po/en_US.po | 234 ++++++++++---------------------------- po/eo.po | 241 ++++++++++------------------------------ po/es.po | 235 ++++++++++----------------------------- po/fa.po | 239 ++++++++++----------------------------- po/fi.po | 247 ++++++++++------------------------------- po/fr.po | 234 ++++++++++---------------------------- po/he.po | 234 ++++++++++---------------------------- po/hi.po | 234 ++++++++++---------------------------- po/hu.po | 235 ++++++++++----------------------------- po/it.po | 235 ++++++++++----------------------------- po/ja.po | 234 ++++++++++---------------------------- po/ko.po | 234 ++++++++++---------------------------- po/lt.po | 234 ++++++++++---------------------------- po/ml.po | 234 ++++++++++---------------------------- po/nb_NO.po | 235 ++++++++++----------------------------- po/nl.po | 234 ++++++++++---------------------------- po/or.po | 234 ++++++++++---------------------------- po/pa.po | 234 ++++++++++---------------------------- po/pl.po | 234 ++++++++++---------------------------- po/pt_BR.po | 235 ++++++++++----------------------------- po/pt_PT.po | 235 ++++++++++----------------------------- po/rm.po | 237 ++++++++++----------------------------- po/ro.po | 235 ++++++++++----------------------------- po/ru.po | 234 ++++++++++---------------------------- po/sk.po | 237 ++++++++++----------------------------- po/sl.po | 235 ++++++++++----------------------------- po/sr_RS(a)cyrillic.po | 242 ++++++++++------------------------------ po/sr_RS(a)latin.po | 247 ++++++++++------------------------------- po/sv.po | 234 ++++++++++---------------------------- po/te.po | 234 ++++++++++---------------------------- po/th.po | 239 ++++++++++----------------------------- po/tr.po | 235 ++++++++++----------------------------- po/uk.po | 234 ++++++++++---------------------------- po/wa.po | 241 ++++++++++------------------------------ po/wine.pot | 234 ++++++++++---------------------------- po/zh_CN.po | 235 ++++++++++----------------------------- po/zh_TW.po | 235 ++++++++++----------------------------- programs/winefile/resource.h | 2 - programs/winefile/winefile.c | 2 - programs/winefile/winefile.rc | 43 ------- 48 files changed, 2745 insertions(+), 7927 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a2be1a0bee10f467838c…

1 0

Francois Gouget : kernel32: Only get the Windows directory if PROFILE_Open( ) needs it.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: f3aabde8cb60ff2e77dc437b7897083a88828930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3aabde8cb60ff2e77dc437b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:43:36 2011 +0200 kernel32: Only get the Windows directory if PROFILE_Open() needs it. --- dlls/kernel32/profile.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 26c6736..a2bd5b5 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -734,7 +734,6 @@ static BOOL is_not_current(FILETIME * ft) */ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) { - WCHAR windirW[MAX_PATH]; WCHAR buffer[MAX_PATH]; HANDLE hFile = INVALID_HANDLE_VALUE; FILETIME LastWriteTime; @@ -757,8 +756,6 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) ZeroMemory(&MRUProfile[i]->LastWriteTime, sizeof(FILETIME)); } - GetWindowsDirectoryW( windirW, MAX_PATH ); - if (!filename) filename = wininiW; @@ -766,6 +763,8 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) !strchrW(filename, '\\') && !strchrW(filename, '/')) { static const WCHAR wszSeparator[] = {'\\', 0}; + WCHAR windirW[MAX_PATH]; + GetWindowsDirectoryW( windirW, MAX_PATH ); strcpyW(buffer, windirW); strcatW(buffer, wszSeparator); strcatW(buffer, filename);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011