April 2011 - Wine-commits - list.winehq.org

David Hedberg : comdlg32: Factor out some path validating code from FILEDLG95_OnOpen.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: 7f5ccd32627c6c25afdbead35333580ac96f37c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5ccd32627c6c25afdbead35… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Apr 1 05:52:30 2011 +0200 comdlg32: Factor out some path validating code from FILEDLG95_OnOpen. --- dlls/comdlg32/cdlg.h | 6 + dlls/comdlg32/filedlg.c | 252 ++++++++++++++++++++++++----------------------- 2 files changed, 135 insertions(+), 123 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index fb6280d..db0421e 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -175,6 +175,8 @@ HRESULT FileSaveDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) /* Shared helper functions */ void COMDLG32_GetCanonicalPath(PCIDLIST_ABSOLUTE pidlAbsCurrent, LPWSTR lpstrFile, LPWSTR lpstrPathAndFile); +int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, + HWND hwnd, DWORD flags, BOOL isSaveDlg, int defAction); /* ITEMIDLIST */ @@ -190,4 +192,8 @@ extern LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD); extern DWORD (WINAPI *COMDLG32_SHFree)(LPVOID); extern BOOL (WINAPI *COMDLG32_SHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR); +#define ONOPEN_BROWSE 1 +#define ONOPEN_OPEN 2 +#define ONOPEN_SEARCH 3 + #endif /* _WINE_DLL_CDLG_H */ diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 84b4eeb..1e33f5a 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2211,16 +2211,6 @@ static void FILEDLG95_MRU_load_filename(LPWSTR stored_path) TRACE("got MRU path: %s\n", wine_dbgstr_w(stored_path)); } -/*********************************************************************** - * FILEDLG95_OnOpen - * - * Ok button WM_COMMAND message handler - * - * If the function succeeds, the return value is nonzero. - */ -#define ONOPEN_BROWSE 1 -#define ONOPEN_OPEN 2 -#define ONOPEN_SEARCH 3 static void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) { WCHAR strMsgTitle[MAX_PATH]; @@ -2233,6 +2223,130 @@ static void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) MessageBoxW(hwnd,strMsgText, strMsgTitle, MB_OK | MB_ICONHAND); } +int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, + HWND hwnd, DWORD flags, BOOL isSaveDlg, int defAction) +{ + int nOpenAction = defAction; + LPWSTR lpszTemp, lpszTemp1; + LPITEMIDLIST pidl = NULL; + static const WCHAR szwInvalid[] = { '/',':','<','>','|', 0}; + + /* check for invalid chars */ + if((strpbrkW(lpstrPathAndFile+3, szwInvalid) != NULL) && !(flags & OFN_NOVALIDATE)) + { + FILEDLG95_OnOpenMessage(hwnd, IDS_INVALID_FILENAME_TITLE, IDS_INVALID_FILENAME); + return FALSE; + } + + if (FAILED (SHGetDesktopFolder(ppsf))) return FALSE; + + lpszTemp1 = lpszTemp = lpstrPathAndFile; + while (lpszTemp1) + { + LPSHELLFOLDER lpsfChild; + WCHAR lpwstrTemp[MAX_PATH]; + DWORD dwEaten, dwAttributes; + LPWSTR p; + + lstrcpyW(lpwstrTemp, lpszTemp); + p = PathFindNextComponentW(lpwstrTemp); + + if (!p) break; /* end of path */ + + *p = 0; + lpszTemp = lpszTemp + lstrlenW(lpwstrTemp); + + /* There are no wildcards when OFN_NOVALIDATE is set */ + if(*lpszTemp==0 && !(flags & OFN_NOVALIDATE)) + { + static const WCHAR wszWild[] = { '*', '?', 0 }; + /* if the last element is a wildcard do a search */ + if(strpbrkW(lpszTemp1, wszWild) != NULL) + { + nOpenAction = ONOPEN_SEARCH; + break; + } + } + lpszTemp1 = lpszTemp; + + TRACE("parse now=%s next=%s sf=%p\n",debugstr_w(lpwstrTemp), debugstr_w(lpszTemp), *ppsf); + + /* append a backslash to drive letters */ + if(lstrlenW(lpwstrTemp)==2 && lpwstrTemp[1] == ':' && + ((lpwstrTemp[0] >= 'a' && lpwstrTemp[0] <= 'z') || + (lpwstrTemp[0] >= 'A' && lpwstrTemp[0] <= 'Z'))) + { + PathAddBackslashW(lpwstrTemp); + } + + dwAttributes = SFGAO_FOLDER; + if(SUCCEEDED(IShellFolder_ParseDisplayName(*ppsf, hwnd, NULL, lpwstrTemp, &dwEaten, &pidl, &dwAttributes))) + { + /* the path component is valid, we have a pidl of the next path component */ + TRACE("parse OK attr=0x%08x pidl=%p\n", dwAttributes, pidl); + if(dwAttributes & SFGAO_FOLDER) + { + if(FAILED(IShellFolder_BindToObject(*ppsf, pidl, 0, &IID_IShellFolder, (LPVOID*)&lpsfChild))) + { + ERR("bind to failed\n"); /* should not fail */ + break; + } + IShellFolder_Release(*ppsf); + *ppsf = lpsfChild; + lpsfChild = NULL; + } + else + { + TRACE("value\n"); + + /* end dialog, return value */ + nOpenAction = ONOPEN_OPEN; + break; + } + COMDLG32_SHFree(pidl); + pidl = NULL; + } + else if (!(flags & OFN_NOVALIDATE)) + { + if(*lpszTemp || /* points to trailing null for last path element */ + (lpwstrTemp[strlenW(lpwstrTemp)-1] == '\\')) /* or if last element ends in '\' */ + { + if(flags & OFN_PATHMUSTEXIST) + { + FILEDLG95_OnOpenMessage(hwnd, 0, IDS_PATHNOTEXISTING); + break; + } + } + else + { + if( (flags & OFN_FILEMUSTEXIST) && !isSaveDlg ) + { + FILEDLG95_OnOpenMessage(hwnd, 0, IDS_FILENOTEXISTING); + break; + } + } + /* change to the current folder */ + nOpenAction = ONOPEN_OPEN; + break; + } + else + { + nOpenAction = ONOPEN_OPEN; + break; + } + } + if(pidl) COMDLG32_SHFree(pidl); + + return nOpenAction; +} + +/*********************************************************************** + * FILEDLG95_OnOpen + * + * Ok button WM_COMMAND message handler + * + * If the function succeeds, the return value is nonzero. + */ BOOL FILEDLG95_OnOpen(HWND hwnd) { LPWSTR lpstrFileList; @@ -2294,120 +2408,12 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) else nOpenAction = ONOPEN_BROWSE; - /* don't apply any checks with OFN_NOVALIDATE */ - { - LPWSTR lpszTemp, lpszTemp1; - LPITEMIDLIST pidl = NULL; - static const WCHAR szwInvalid[] = { '/',':','<','>','|', 0}; - - /* check for invalid chars */ - if((strpbrkW(lpstrPathAndFile+3, szwInvalid) != NULL) && !(fodInfos->ofnInfos->Flags & OFN_NOVALIDATE)) - { - FILEDLG95_OnOpenMessage(hwnd, IDS_INVALID_FILENAME_TITLE, IDS_INVALID_FILENAME); - ret = FALSE; + nOpenAction = FILEDLG95_ValidatePathAction(lpstrPathAndFile, &lpsf, hwnd, + fodInfos->ofnInfos->Flags, + fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG, + nOpenAction); + if(!nOpenAction) goto ret; - } - - if (FAILED (SHGetDesktopFolder(&lpsf))) return FALSE; - - lpszTemp1 = lpszTemp = lpstrPathAndFile; - while (lpszTemp1) - { - LPSHELLFOLDER lpsfChild; - WCHAR lpwstrTemp[MAX_PATH]; - DWORD dwEaten, dwAttributes; - LPWSTR p; - - lstrcpyW(lpwstrTemp, lpszTemp); - p = PathFindNextComponentW(lpwstrTemp); - - if (!p) break; /* end of path */ - - *p = 0; - lpszTemp = lpszTemp + lstrlenW(lpwstrTemp); - - /* There are no wildcards when OFN_NOVALIDATE is set */ - if(*lpszTemp==0 && !(fodInfos->ofnInfos->Flags & OFN_NOVALIDATE)) - { - static const WCHAR wszWild[] = { '*', '?', 0 }; - /* if the last element is a wildcard do a search */ - if(strpbrkW(lpszTemp1, wszWild) != NULL) - { - nOpenAction = ONOPEN_SEARCH; - break; - } - } - lpszTemp1 = lpszTemp; - - TRACE("parse now=%s next=%s sf=%p\n",debugstr_w(lpwstrTemp), debugstr_w(lpszTemp), lpsf); - - /* append a backslash to drive letters */ - if(lstrlenW(lpwstrTemp)==2 && lpwstrTemp[1] == ':' && - ((lpwstrTemp[0] >= 'a' && lpwstrTemp[0] <= 'z') || - (lpwstrTemp[0] >= 'A' && lpwstrTemp[0] <= 'Z'))) - { - PathAddBackslashW(lpwstrTemp); - } - - dwAttributes = SFGAO_FOLDER; - if(SUCCEEDED(IShellFolder_ParseDisplayName(lpsf, hwnd, NULL, lpwstrTemp, &dwEaten, &pidl, &dwAttributes))) - { - /* the path component is valid, we have a pidl of the next path component */ - TRACE("parse OK attr=0x%08x pidl=%p\n", dwAttributes, pidl); - if(dwAttributes & SFGAO_FOLDER) - { - if(FAILED(IShellFolder_BindToObject(lpsf, pidl, 0, &IID_IShellFolder, (LPVOID*)&lpsfChild))) - { - ERR("bind to failed\n"); /* should not fail */ - break; - } - IShellFolder_Release(lpsf); - lpsf = lpsfChild; - lpsfChild = NULL; - } - else - { - TRACE("value\n"); - - /* end dialog, return value */ - nOpenAction = ONOPEN_OPEN; - break; - } - COMDLG32_SHFree(pidl); - pidl = NULL; - } - else if (!(fodInfos->ofnInfos->Flags & OFN_NOVALIDATE)) - { - if(*lpszTemp || /* points to trailing null for last path element */ - (lpwstrTemp[strlenW(lpwstrTemp)-1] == '\\')) /* or if last element ends in '\' */ - { - if(fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST) - { - FILEDLG95_OnOpenMessage(hwnd, 0, IDS_PATHNOTEXISTING); - break; - } - } - else - { - if( (fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST) && - !( fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG ) ) - { - FILEDLG95_OnOpenMessage(hwnd, 0, IDS_FILENOTEXISTING); - break; - } - } - /* change to the current folder */ - nOpenAction = ONOPEN_OPEN; - break; - } - else - { - nOpenAction = ONOPEN_OPEN; - break; - } - } - if(pidl) COMDLG32_SHFree(pidl); - } /* Step 3: here we have a cleaned up and validated path

1 0

Francois Gouget : regedit: Add support for creating expandable string values.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: 1ea5c7b8d9d4db8a86057d922c1e6f10019bcf14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ea5c7b8d9d4db8a86057d922… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 1 10:39:50 2011 +0200 regedit: Add support for creating expandable string values. --- po/ar.po | 160 ++++++++++++++++++++++--------------------- po/bg.po | 161 ++++++++++++++++++++++--------------------- po/ca.po | 160 ++++++++++++++++++++++--------------------- po/cs.po | 161 ++++++++++++++++++++++--------------------- po/da.po | 161 ++++++++++++++++++++++--------------------- po/de.po | 161 ++++++++++++++++++++++--------------------- po/el.po | 160 ++++++++++++++++++++++--------------------- po/en.po | 160 ++++++++++++++++++++++--------------------- po/en_US.po | 160 ++++++++++++++++++++++--------------------- po/eo.po | 160 ++++++++++++++++++++++--------------------- po/es.po | 161 ++++++++++++++++++++++--------------------- po/fa.po | 160 ++++++++++++++++++++++--------------------- po/fi.po | 160 ++++++++++++++++++++++--------------------- po/fr.po | 161 ++++++++++++++++++++++--------------------- po/he.po | 161 ++++++++++++++++++++++--------------------- po/hi.po | 160 ++++++++++++++++++++++--------------------- po/hu.po | 161 ++++++++++++++++++++++--------------------- po/it.po | 161 ++++++++++++++++++++++--------------------- po/ja.po | 161 ++++++++++++++++++++++--------------------- po/ko.po | 161 ++++++++++++++++++++++--------------------- po/lt.po | 161 ++++++++++++++++++++++--------------------- po/ml.po | 160 ++++++++++++++++++++++--------------------- po/nb_NO.po | 161 ++++++++++++++++++++++--------------------- po/nl.po | 161 ++++++++++++++++++++++--------------------- po/or.po | 160 ++++++++++++++++++++++--------------------- po/pa.po | 160 ++++++++++++++++++++++--------------------- po/pl.po | 161 ++++++++++++++++++++++--------------------- po/pt_BR.po | 161 ++++++++++++++++++++++--------------------- po/pt_PT.po | 161 ++++++++++++++++++++++--------------------- po/rm.po | 160 ++++++++++++++++++++++--------------------- po/ro.po | 161 ++++++++++++++++++++++--------------------- po/ru.po | 161 ++++++++++++++++++++++--------------------- po/sk.po | 160 ++++++++++++++++++++++--------------------- po/sl.po | 161 ++++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 160 ++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 160 ++++++++++++++++++++++--------------------- po/sv.po | 161 ++++++++++++++++++++++--------------------- po/te.po | 160 ++++++++++++++++++++++--------------------- po/th.po | 160 ++++++++++++++++++++++--------------------- po/tr.po | 161 ++++++++++++++++++++++--------------------- po/uk.po | 161 ++++++++++++++++++++++--------------------- po/wa.po | 160 ++++++++++++++++++++++--------------------- po/wine.pot | 160 ++++++++++++++++++++++--------------------- po/zh_CN.po | 161 ++++++++++++++++++++++--------------------- po/zh_TW.po | 161 ++++++++++++++++++++++--------------------- programs/regedit/framewnd.c | 3 + programs/regedit/regedit.rc | 2 + programs/regedit/resource.h | 1 + 48 files changed, 3721 insertions(+), 3510 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ea5c7b8d9d4db8a86057…

1 0

Matteo Bruni : wined3d: Better handle some instances when we can' t make the required GL context current.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: 06ef87ceb12e510b721bd5cc019c026682df4fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ef87ceb12e510b721bd5cc0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 18 19:17:52 2011 +0100 wined3d: Better handle some instances when we can't make the required GL context current. --- dlls/wined3d/context.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8413c42..c3a6a5f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1017,12 +1017,20 @@ BOOL context_set_current(struct wined3d_context *ctx) if (ctx) { + if (!ctx->valid) + { + ERR("Trying to make invalid context %p current\n", ctx); + return FALSE; + } + TRACE("Switching to D3D context %p, GL context %p, device context %p.\n", ctx, ctx->glCtx, ctx->hdc); if (!pwglMakeCurrent(ctx->hdc, ctx->glCtx)) { DWORD err = GetLastError(); ERR("Failed to make GL context %p current on device context %p, last error %#x.\n", ctx->glCtx, ctx->hdc, err); + ctx->valid = 0; + pwglMakeCurrent(NULL, NULL); TlsSetValue(wined3d_context_tls_idx, NULL); return FALSE; } @@ -1063,6 +1071,7 @@ void context_release(struct wined3d_context *context) DWORD err = GetLastError(); ERR("Failed to restore GL context %p on device context %p, last error %#x.\n", context->restore_ctx, context->restore_dc, err); + context_set_current(NULL); } context->restore_ctx = NULL; context->restore_dc = NULL; @@ -2305,6 +2314,8 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, IWineD3DSurf DWORD err = GetLastError(); ERR("Failed to make GL context %p current on device context %p, last error %#x.\n", context->glCtx, context->hdc, err); + context->valid = 0; + pwglMakeCurrent(NULL, NULL); } }

1 0

Matteo Bruni : wined3d: Fix an error message.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: 0322114cd6d3261d590d545ff8c16efe1e1c0a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0322114cd6d3261d590d545ff… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 18 18:40:37 2011 +0100 wined3d: Fix an error message. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3b0a9b6..8413c42 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2304,7 +2304,7 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, IWineD3DSurf { DWORD err = GetLastError(); ERR("Failed to make GL context %p current on device context %p, last error %#x.\n", - context->hdc, context->glCtx, err); + context->glCtx, context->hdc, err); } }

1 0

Austin Lund : user32/tests: Fixed SetParent test on 64bit Vista.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: be24fd4b64e2886485c8df13e9eb2ce6d4d7eea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be24fd4b64e2886485c8df13e… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Apr 1 09:42:48 2011 +1000 user32/tests: Fixed SetParent test on 64bit Vista. --- dlls/user32/tests/msg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ab9a3fb..712f564 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12681,6 +12681,7 @@ static const struct message WmSetParentSeq_2[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE }, { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { HCBT_SETFOCUS, hook|optional }, { WM_NCACTIVATE, sent|wparam, 0 }, { WM_ACTIVATE, sent|wparam, 0 }, { WM_ACTIVATEAPP, sent|wparam, 0 },

1 0

Francois Gouget : winefile: Remove the 'Help on Help' menu.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: fb3641c5d06551b2fe6509e0b84195adb4991e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb3641c5d06551b2fe6509e0b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 1 10:39:19 2011 +0200 winefile: Remove the 'Help on Help' menu. It is redundant with the help application's 'Help' menu and clutters winefile. --- po/ar.po | 48 ++++++++++++++++++--------------------- po/bg.po | 49 ++++++++++++++++++---------------------- po/ca.po | 48 ++++++++++++++++++--------------------- po/cs.po | 48 ++++++++++++++++++--------------------- po/da.po | 48 ++++++++++++++++++--------------------- po/de.po | 48 ++++++++++++++++++--------------------- po/el.po | 48 ++++++++++++++++++--------------------- po/en.po | 48 ++++++++++++++++++--------------------- po/en_US.po | 48 ++++++++++++++++++--------------------- po/eo.po | 49 ++++++++++++++++++---------------------- po/es.po | 48 ++++++++++++++++++--------------------- po/fa.po | 48 ++++++++++++++++++--------------------- 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 | 49 ++++++++++++++++++---------------------- po/ro.po | 48 ++++++++++++++++++--------------------- po/ru.po | 48 ++++++++++++++++++--------------------- po/sk.po | 49 ++++++++++++++++++---------------------- po/sl.po | 48 ++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 48 ++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 49 ++++++++++++++++++---------------------- po/sv.po | 48 ++++++++++++++++++--------------------- po/te.po | 48 ++++++++++++++++++--------------------- po/th.po | 48 ++++++++++++++++++--------------------- 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/resource.h | 1 - programs/winefile/winefile.rc | 1 - 47 files changed, 990 insertions(+), 1179 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb3641c5d06551b2fe650…

1 0

Francois Gouget : notepad: Remove the 'Help on Help' menu.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: 9b21a106cc0040edc8a6a84b84acd586934c1383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b21a106cc0040edc8a6a84b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 1 10:39:13 2011 +0200 notepad: Remove the 'Help on Help' menu. It is redundant with the help application's 'Help' menu and clutters notepad. --- po/ar.po | 48 +++++++++++++++++++------------------- po/bg.po | 48 +++++++++++++++++++------------------- po/ca.po | 48 +++++++++++++++++++------------------- po/cs.po | 48 +++++++++++++++++++------------------- po/da.po | 48 +++++++++++++++++++------------------- po/de.po | 48 +++++++++++++++++++------------------- po/el.po | 48 +++++++++++++++++++------------------- po/en.po | 48 +++++++++++++++++++------------------- po/en_US.po | 48 +++++++++++++++++++------------------- po/eo.po | 48 +++++++++++++++++++------------------- po/es.po | 48 +++++++++++++++++++------------------- po/fa.po | 48 +++++++++++++++++++------------------- po/fi.po | 48 +++++++++++++++++++------------------- 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 | 50 ++++++++++++++++++++-------------------- po/ro.po | 48 +++++++++++++++++++------------------- po/ru.po | 48 +++++++++++++++++++------------------- po/sk.po | 48 +++++++++++++++++++------------------- po/sl.po | 48 +++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 48 +++++++++++++++++++------------------- po/sr_RS(a)latin.po | 48 +++++++++++++++++++------------------- po/sv.po | 48 +++++++++++++++++++------------------- po/te.po | 48 +++++++++++++++++++------------------- po/th.po | 48 +++++++++++++++++++------------------- po/tr.po | 48 +++++++++++++++++++------------------- po/uk.po | 48 +++++++++++++++++++------------------- po/wa.po | 48 +++++++++++++++++++------------------- po/wine.pot | 48 +++++++++++++++++++------------------- po/zh_CN.po | 48 +++++++++++++++++++------------------- po/zh_TW.po | 48 +++++++++++++++++++------------------- programs/notepad/dialog.c | 5 ---- programs/notepad/dialog.h | 1 - programs/notepad/main.c | 1 - programs/notepad/notepad.rc | 1 - programs/notepad/notepad_res.h | 1 - 50 files changed, 1081 insertions(+), 1090 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b21a106cc0040edc8a6a…

1 0

Francois Gouget : progman: Remove the 'Help on Help' menu.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: d2e6e2a03dbff0ce2deb24691cd5169fa6051cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e6e2a03dbff0ce2deb24691… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 1 10:38:49 2011 +0200 progman: Remove the 'Help on Help' menu. It is redundant with the help application's 'Help' menu and clutters progman. --- po/ar.po | 48 +++++++++++++++++++++--------------------- po/bg.po | 48 +++++++++++++++++++++--------------------- po/ca.po | 48 +++++++++++++++++++++--------------------- po/cs.po | 48 +++++++++++++++++++++--------------------- po/da.po | 48 +++++++++++++++++++++--------------------- po/de.po | 48 +++++++++++++++++++++--------------------- po/el.po | 48 +++++++++++++++++++++--------------------- po/en.po | 48 +++++++++++++++++++++--------------------- po/en_US.po | 48 +++++++++++++++++++++--------------------- po/eo.po | 48 +++++++++++++++++++++--------------------- po/es.po | 48 +++++++++++++++++++++--------------------- po/fa.po | 48 +++++++++++++++++++++--------------------- po/fi.po | 48 +++++++++++++++++++++--------------------- 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 | 48 +++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 48 +++++++++++++++++++++--------------------- po/sv.po | 48 +++++++++++++++++++++--------------------- po/te.po | 48 +++++++++++++++++++++--------------------- po/th.po | 48 +++++++++++++++++++++--------------------- po/tr.po | 48 +++++++++++++++++++++--------------------- po/uk.po | 48 +++++++++++++++++++++--------------------- po/wa.po | 48 +++++++++++++++++++++--------------------- po/wine.pot | 48 +++++++++++++++++++++--------------------- po/zh_CN.po | 48 +++++++++++++++++++++--------------------- po/zh_TW.po | 48 +++++++++++++++++++++--------------------- programs/progman/main.c | 5 ---- programs/progman/progman.h | 1 - programs/progman/progman.rc | 1 - 48 files changed, 1080 insertions(+), 1087 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2e6e2a03dbff0ce2deb2…

1 0

Francois Gouget : progman: We don' t have a wintutor application so remove the 'Tutorial' menu.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: a80f3795650853d3e7c8451fb09b2552642bc2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80f3795650853d3e7c8451fb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 1 10:39:05 2011 +0200 progman: We don't have a wintutor application so remove the 'Tutorial' menu. --- po/ar.po | 50 +++++++++++++++++++----------------------- po/bg.po | 50 +++++++++++++++++++----------------------- po/ca.po | 50 +++++++++++++++++++----------------------- po/cs.po | 50 +++++++++++++++++++----------------------- po/da.po | 50 +++++++++++++++++++----------------------- po/de.po | 50 +++++++++++++++++++----------------------- po/el.po | 50 +++++++++++++++++++----------------------- po/en.po | 50 +++++++++++++++++++----------------------- po/en_US.po | 50 +++++++++++++++++++----------------------- po/eo.po | 50 +++++++++++++++++++----------------------- po/es.po | 50 +++++++++++++++++++----------------------- po/fa.po | 50 +++++++++++++++++++----------------------- po/fi.po | 50 +++++++++++++++++++----------------------- po/fr.po | 50 +++++++++++++++++++----------------------- po/he.po | 50 +++++++++++++++++++----------------------- po/hi.po | 50 +++++++++++++++++++----------------------- po/hu.po | 50 +++++++++++++++++++----------------------- po/it.po | 50 +++++++++++++++++++----------------------- po/ja.po | 50 +++++++++++++++++++----------------------- po/ko.po | 50 +++++++++++++++++++----------------------- po/lt.po | 50 +++++++++++++++++++----------------------- po/ml.po | 50 +++++++++++++++++++----------------------- po/nb_NO.po | 50 +++++++++++++++++++----------------------- po/nl.po | 50 +++++++++++++++++++----------------------- po/or.po | 50 +++++++++++++++++++----------------------- po/pa.po | 50 +++++++++++++++++++----------------------- po/pl.po | 50 +++++++++++++++++++----------------------- po/pt_BR.po | 50 +++++++++++++++++++----------------------- po/pt_PT.po | 50 +++++++++++++++++++----------------------- po/rm.po | 50 +++++++++++++++++++----------------------- po/ro.po | 50 +++++++++++++++++++----------------------- po/ru.po | 50 +++++++++++++++++++----------------------- po/sk.po | 50 +++++++++++++++++++----------------------- po/sl.po | 50 +++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 50 +++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 50 +++++++++++++++++++----------------------- po/sv.po | 50 +++++++++++++++++++----------------------- po/te.po | 50 +++++++++++++++++++----------------------- po/th.po | 50 +++++++++++++++++++----------------------- po/tr.po | 50 +++++++++++++++++++----------------------- po/uk.po | 50 +++++++++++++++++++----------------------- po/wa.po | 50 +++++++++++++++++++----------------------- po/wine.pot | 50 +++++++++++++++++++----------------------- po/zh_CN.po | 50 +++++++++++++++++++----------------------- po/zh_TW.po | 50 +++++++++++++++++++----------------------- programs/progman/main.c | 4 --- programs/progman/progman.h | 1 - programs/progman/progman.rc | 2 - 48 files changed, 1035 insertions(+), 1222 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a80f3795650853d3e7c84…

1 0

Vincent Povirk : comctl32: When entering a month or year, keep the day in range.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: 0d8775c9f990766f915d45065796d8fdd2866ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8775c9f990766f915d45065… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 31 14:04:15 2011 -0500 comctl32: When entering a month or year, keep the day in range. --- dlls/comctl32/datetime.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index bc643eb..fd97fdd 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -770,7 +770,7 @@ static void DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) { int fieldNum = infoPtr->select & DTHT_DATEFIELD; - int i, val=0; + int i, val=0, clamp_day=0; SYSTEMTIME date = infoPtr->date; if (infoPtr->select == -1 || infoPtr->nCharsEntered == 0) @@ -785,14 +785,17 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) case ONEDIGITYEAR: case TWODIGITYEAR: date.wYear = date.wYear - (date.wYear%100) + val; + clamp_day = 1; break; case INVALIDFULLYEAR: case FULLYEAR: date.wYear = val; + clamp_day = 1; break; case ONEDIGITMONTH: case TWODIGITMONTH: date.wMonth = val; + clamp_day = 1; break; case ONEDIGITDAY: case TWODIGITDAY: @@ -815,6 +818,9 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) break; } + if (clamp_day && date.wDay > MONTHCAL_MonthLength(date.wMonth, date.wYear)) + date.wDay = MONTHCAL_MonthLength(date.wMonth, date.wYear); + if (DATETIME_SetSystemTime(infoPtr, GDT_VALID, &date)) DATETIME_SendDateTimeChangeNotify (infoPtr); }

1 0