October 2006 - Wine-commits

Mikołaj Zalewski : shlwapi/tests: Enable the locale-dependent tests if the delimiters are correct.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 5f5c662a673a6195db8455781671089c8d7c762f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5c662a673a6195db8455781… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 22 19:40:56 2006 +0200 shlwapi/tests: Enable the locale-dependent tests if the delimiters are correct. --- dlls/shlwapi/tests/string.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index b6dc9d3..802811d 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -720,8 +720,13 @@ static void test_SHUnicodeToUnicode(void START_TEST(string) { + TCHAR thousandDelim[8]; + TCHAR decimalDelim[8]; CoInitialize(0); + GetLocaleInfo(GetUserDefaultLCID(), LOCALE_STHOUSAND, thousandDelim, 8); + GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SDECIMAL, decimalDelim, 8); + hShlwapi = GetModuleHandleA("shlwapi"); if (!hShlwapi) return; @@ -738,15 +743,11 @@ START_TEST(string) test_StrToIntExA(); test_StrToIntExW(); test_StrDupA(); - if (0) + if (lstrcmp(thousandDelim, ",")==0 && lstrcmp(decimalDelim, ".")==0) { - /* this test fails on locales which do not use '.' as a decimal separator */ + /* these tests are locale-dependent */ test_StrFormatByteSize64A(); - - /* this test fails on locales which do not use '.' as a decimal separator */ test_StrFormatKBSizeA(); - - /* FIXME: Awaiting NLS fixes in kernel before these succeed */ test_StrFormatKBSizeW(); } test_StrFromTimeIntervalA();

1 0

Mikołaj Zalewski : shlwapi/tests: Make the string. c tests compile in Visual C++.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: bd35b0a12245ddf1745324e4a75bd61d0ce560b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd35b0a12245ddf1745324e4a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 22 19:37:42 2006 +0200 shlwapi/tests: Make the string.c tests compile in Visual C++. --- dlls/shlwapi/tests/string.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 733d8dc..b6dc9d3 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -43,7 +43,7 @@ static BOOL (WINAPI *pIntlStrEqWorker static BOOL (WINAPI *pStrIsIntlEqualW)(BOOL,LPCWSTR,LPCWSTR,int); static BOOL (WINAPI *pIntlStrEqWorkerW)(BOOL,LPCWSTR,LPCWSTR,int); -static inline int strcmpW(const WCHAR *str1, const WCHAR *str2) +static int strcmpW(const WCHAR *str1, const WCHAR *str2) { while (*str1 && (*str1 == *str2)) { str1++; str2++; } return *str1 - *str2; @@ -619,7 +619,7 @@ static void test_StrRetToBSTR(void) if (!pStrRetToBSTR) return; strret.uType = STRRET_WSTR; - strret.u.pOleStr = CoDupStrW("Test"); + U(strret).pOleStr = CoDupStrW("Test"); bstr = 0; ret = pStrRetToBSTR(&strret, NULL, &bstr); ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW), @@ -628,7 +628,7 @@ static void test_StrRetToBSTR(void) SysFreeString(bstr); strret.uType = STRRET_CSTR; - lstrcpyA(strret.u.cStr, "Test"); + lstrcpyA(U(strret).cStr, "Test"); ret = pStrRetToBSTR(&strret, NULL, &bstr); ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW), "STRRET_CSTR: dup failed, ret=0x%08x, bstr %p\n", ret, bstr); @@ -636,7 +636,7 @@ static void test_StrRetToBSTR(void) SysFreeString(bstr); strret.uType = STRRET_OFFSET; - strret.u.uOffset = 1; + U(strret).uOffset = 1; strcpy((char*)&iidl, " Test"); ret = pStrRetToBSTR(&strret, iidl, &bstr); ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW),

1 0

Mikołaj Zalewski : notepad: Fix ellipsis in menu items .
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 66890b8b2d9ca19744715f9b0cb7337e7ea5aad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66890b8b2d9ca19744715f9b0… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 22 19:27:37 2006 +0200 notepad: Fix ellipsis in menu items. --- programs/notepad/Bg.rc | 12 ++++++------ programs/notepad/Cs.rc | 12 ++++++------ programs/notepad/Da.rc | 10 +++++----- programs/notepad/De.rc | 10 +++++----- programs/notepad/En.rc | 12 ++++++------ programs/notepad/Es.rc | 12 ++++++------ programs/notepad/Fi.rc | 10 +++++----- programs/notepad/Fr.rc | 12 ++++++------ programs/notepad/Hu.rc | 10 +++++----- programs/notepad/It.rc | 12 ++++++------ programs/notepad/Ja.rc | 12 ++++++------ programs/notepad/Ko.rc | 12 ++++++------ programs/notepad/Nl.rc | 12 ++++++------ programs/notepad/No.rc | 12 ++++++------ programs/notepad/Pl.rc | 12 ++++++------ programs/notepad/Pt.rc | 10 +++++----- programs/notepad/Ru.rc | 12 ++++++------ programs/notepad/Si.rc | 10 +++++----- programs/notepad/Sk.rc | 12 ++++++------ programs/notepad/Sw.rc | 10 +++++----- programs/notepad/Th.rc | 6 +++--- programs/notepad/Tr.rc | 12 ++++++------ programs/notepad/Wa.rc | 10 +++++----- programs/notepad/Zh.rc | 12 ++++++------ 24 files changed, 133 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66890b8b2d9ca19744715…

1 0

Mikołaj Zalewski : notepad: Implement Find and Find Next.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 84fc75c3d2910902a5c53e86caa5bc58a99b851c URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fc75c3d2910902a5c53e86c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 22 18:58:12 2006 +0200 notepad: Implement Find and Find Next. --- programs/notepad/dialog.c | 8 +++-- programs/notepad/main.c | 76 ++++++++++++++++++++++++++++++++++++++++++++- programs/notepad/main.h | 2 + 3 files changed, 82 insertions(+), 4 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 9f822d4..c72e01f 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -663,7 +663,7 @@ VOID DIALOG_Search(VOID) Globals.find.hInstance = Globals.hInstance; Globals.find.lpstrFindWhat = Globals.szFindText; Globals.find.wFindWhatLen = SIZEOF(Globals.szFindText); - Globals.find.Flags = FR_DOWN; + Globals.find.Flags = FR_DOWN|FR_HIDEWHOLEWORD; /* We only need to create the modal FindReplace dialog which will */ /* notify us of incoming events using hMainWnd Window Messages */ @@ -674,8 +674,10 @@ VOID DIALOG_Search(VOID) VOID DIALOG_SearchNext(VOID) { - /* FIXME: Search Next */ - DIALOG_Search(); + if (Globals.lastFind.lpstrFindWhat == NULL) + DIALOG_Search(); + else /* use the last find data */ + NOTEPAD_DoFind(&Globals.lastFind); } VOID DIALOG_HelpContents(VOID) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 33c82b2..3ffa14b 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -25,6 +25,7 @@ #define UNICODE #include <windows.h> +#include <shlwapi.h> #include <stdio.h> #include "main.h" @@ -314,6 +315,65 @@ static VOID NOTEPAD_InitMenuPopup(HMENU GetWindowTextLength(Globals.hEdit) ? MF_ENABLED : MF_GRAYED); } +static LPTSTR NOTEPAD_StrRStr(LPTSTR pszSource, LPTSTR pszLast, LPTSTR pszSrch) +{ + int len = lstrlen(pszSrch); + pszLast--; + while (pszLast >= pszSource) + { + if (StrCmpN(pszLast, pszSrch, len) == 0) + return pszLast; + pszLast--; + } + return NULL; +} + +/*********************************************************************** + * The user activated the Find dialog + */ +void NOTEPAD_DoFind(FINDREPLACE *fr) +{ + LPTSTR content; + LPTSTR found; + int len = lstrlen(fr->lpstrFindWhat); + int fileLen; + DWORD pos; + + fileLen = GetWindowTextLength(Globals.hEdit) + 1; + content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(TCHAR)); + if (!content) return; + GetWindowText(Globals.hEdit, content, fileLen); + + SendMessage(Globals.hEdit, EM_GETSEL, 0, (LPARAM)&pos); + switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) + { + case 0: + found = StrRStrI(content, content+pos-len, fr->lpstrFindWhat); + break; + case FR_DOWN: + found = StrStrI(content+pos, fr->lpstrFindWhat); + break; + case FR_MATCHCASE: + found = NOTEPAD_StrRStr(content, content+pos-len, fr->lpstrFindWhat); + break; + case FR_DOWN|FR_MATCHCASE: + found = StrStr(content+pos, fr->lpstrFindWhat); + break; + default: /* shouldn't happen */ + return; + } + HeapFree(GetProcessHeap(), 0, content); + + if (found == NULL) + { + DIALOG_StringMsgBox(Globals.hFindReplaceDlg, STRING_NOTFOUND, fr->lpstrFindWhat, + MB_ICONINFORMATION|MB_OK); + return; + } + + SendMessage(Globals.hEdit, EM_SETSEL, found - content, found - content + len); +} + /*********************************************************************** * * NOTEPAD_WndProc @@ -321,13 +381,27 @@ static VOID NOTEPAD_InitMenuPopup(HMENU static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + if (msg == aFINDMSGSTRING) /* not a constant so can't be used in switch */ + { + FINDREPLACE *fr = (FINDREPLACE *)lParam; + + if (fr->Flags & FR_DIALOGTERM) + Globals.hFindReplaceDlg = NULL; + if (fr->Flags & FR_FINDNEXT) + { + Globals.lastFind = *fr; + NOTEPAD_DoFind(fr); + } + return 0; + } + switch (msg) { case WM_CREATE: { static const WCHAR editW[] = { 'e','d','i','t',0 }; DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | - ES_AUTOVSCROLL | ES_MULTILINE; + ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL; RECT rc; GetClientRect(hWnd, &rc); diff --git a/programs/notepad/main.h b/programs/notepad/main.h index 3dd6bb0..075a248 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -51,6 +51,7 @@ typedef struct INT iWindowPosDY; FINDREPLACE find; + FINDREPLACE lastFind; HGLOBAL hDevMode; /* printer mode */ HGLOBAL hDevNames; /* printer names */ } NOTEPAD_GLOBALS; @@ -58,3 +59,4 @@ typedef struct extern NOTEPAD_GLOBALS Globals; VOID SetFileName(LPCWSTR szFileName); +void NOTEPAD_DoFind(FINDREPLACE *fr);

1 0

Mikołaj Zalewski : notepad: Add a generic function for message boxes with a string parameter.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: b0905acb6e332c5155b9fa64c290f2ea730c5bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0905acb6e332c5155b9fa64c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 22 18:54:51 2006 +0200 notepad: Add a generic function for message boxes with a string parameter. --- programs/notepad/Makefile.in | 2 +- programs/notepad/dialog.c | 35 ++++++++++++++++++----------------- programs/notepad/dialog.h | 1 + 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index 0930544..c67191d 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = notepad.exe APPMODE = -mwindows -IMPORTS = comdlg32 shell32 user32 gdi32 msvcrt advapi32 kernel32 +IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 msvcrt advapi32 kernel32 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt MODCFLAGS = @BUILTINFLAG@ EXTRADEFS = -DNO_LIBWINE_PORT diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index a4f7de5..9f822d4 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -26,6 +26,7 @@ #include <assert.h> #include <stdio.h> #include <windows.h> #include <commdlg.h> +#include <shlwapi.h> #include "main.h" #include "dialog.h" @@ -78,39 +79,39 @@ static void UpdateWindowCaption(void) SetWindowText(Globals.hMainWnd, szCaption); } -static void AlertFileNotFound(LPCWSTR szFileName) +int DIALOG_StringMsgBox(HWND hParent, int formatId, LPCWSTR szString, DWORD dwFlags) { WCHAR szMessage[MAX_STRING_LEN]; WCHAR szResource[MAX_STRING_LEN]; /* Load and format szMessage */ - LoadString(Globals.hInstance, STRING_NOTFOUND, szResource, SIZEOF(szResource)); - wsprintf(szMessage, szResource, szFileName); + LoadString(Globals.hInstance, formatId, szResource, SIZEOF(szResource)); + wnsprintf(szMessage, SIZEOF(szMessage), szResource, szString); /* Load szCaption */ - LoadString(Globals.hInstance, STRING_ERROR, szResource, SIZEOF(szResource)); + if ((dwFlags & MB_ICONMASK) == MB_ICONEXCLAMATION) + LoadString(Globals.hInstance, STRING_ERROR, szResource, SIZEOF(szResource)); + else + LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); /* Display Modal Dialog */ - MessageBox(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION); + if (hParent == NULL) + hParent = Globals.hMainWnd; + return MessageBox(hParent, szMessage, szResource, dwFlags); +} + +static void AlertFileNotFound(LPCWSTR szFileName) +{ + DIALOG_StringMsgBox(NULL, STRING_NOTFOUND, szFileName, MB_ICONEXCLAMATION|MB_OK); } static int AlertFileNotSaved(LPCWSTR szFileName) { - WCHAR szMessage[MAX_STRING_LEN]; - WCHAR szResource[MAX_STRING_LEN]; WCHAR szUntitled[MAX_STRING_LEN]; LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, SIZEOF(szUntitled)); - - /* Load and format Message */ - LoadString(Globals.hInstance, STRING_NOTSAVED, szResource, SIZEOF(szResource)); - wsprintf(szMessage, szResource, szFileName[0] ? szFileName : szUntitled); - - /* Load Caption */ - LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); - - /* Display modal */ - return MessageBox(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION|MB_YESNOCANCEL); + return DIALOG_StringMsgBox(NULL, STRING_NOTSAVED, szFileName[0] ? szFileName : szUntitled, + MB_ICONQUESTION|MB_YESNOCANCEL); } /** diff --git a/programs/notepad/dialog.h b/programs/notepad/dialog.h index 3d9d2e1..ffadf00 100644 --- a/programs/notepad/dialog.h +++ b/programs/notepad/dialog.h @@ -49,6 +49,7 @@ VOID DIALOG_HelpNoWarranty(VOID); VOID DIALOG_HelpAboutWine(VOID); VOID DIALOG_TimeDate(VOID); +int DIALOG_StringMsgBox(HWND hParent, int formatId, LPCWSTR szString, DWORD dwFlags); /* utility functions */ VOID ShowLastError(void);

1 0

Andrew Talbot : comdlg32: Cast-qual warning fix.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 10c1faa79e552ad99ec126a00224beb1243290c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c1faa79e552ad99ec126a00… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Oct 22 13:32:03 2006 +0100 comdlg32: Cast-qual warning fix. --- dlls/comdlg32/filedlg31.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 5f48fa9..e835901 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -724,12 +724,14 @@ void FD31_MapOfnStructA(const LPOPENFILE ofnW->lpstrTitle = usBuffer.Buffer; } else { WCHAR buf[16]; + LPWSTR title_tmp; int len; LoadStringW(COMDLG32_hInstance, open ? IDS_OPEN_FILE : IDS_SAVE_AS, buf, sizeof(buf)/sizeof(WCHAR)); len = lstrlenW(buf)+1; - ofnW->lpstrTitle = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - memcpy((void*)ofnW->lpstrTitle, buf, len*sizeof(WCHAR)); + title_tmp = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + memcpy(title_tmp, buf, len * sizeof(WCHAR)); + ofnW->lpstrTitle = title_tmp; } ofnW->Flags = ofnA->Flags; ofnW->nFileOffset = ofnA->nFileOffset;

1 0

Andrew Talbot : comdlg32: Cast-qual warnings fix.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 0c868151dbe6f8baeaff02942d9414b7f7fb3816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c868151dbe6f8baeaff02942… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Oct 22 13:32:29 2006 +0100 comdlg32: Cast-qual warnings fix. --- dlls/comdlg32/colordlg.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 92523b3..86926f5 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -1328,7 +1328,9 @@ BOOL WINAPI ChooseColorW( LPCHOOSECOLORW BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol ) { + LPWSTR template_name = NULL; BOOL ret; + LPCHOOSECOLORW lpcc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CHOOSECOLORW)); lpcc->lStructSize = sizeof(*lpcc); lpcc->hwndOwner = lpChCol->hwndOwner; @@ -1341,8 +1343,9 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA if ((lpcc->Flags & CC_ENABLETEMPLATE) && (lpChCol->lpTemplateName)) { if (HIWORD(lpChCol->lpTemplateName)) { INT len = MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, NULL, 0); - lpcc->lpTemplateName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, (LPWSTR)lpcc->lpTemplateName, len ); + template_name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, template_name, len ); + lpcc->lpTemplateName = template_name; } else { lpcc->lpTemplateName = (LPCWSTR)lpChCol->lpTemplateName; } @@ -1352,7 +1355,7 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA if (ret) lpChCol->rgbResult = lpcc->rgbResult; - if (HIWORD(lpcc->lpTemplateName)) HeapFree(GetProcessHeap(), 0, (LPSTR)lpcc->lpTemplateName); + HeapFree(GetProcessHeap(), 0, template_name); HeapFree(GetProcessHeap(), 0, lpcc); return ret; }

1 0

Andrew Talbot : comctl32: Cast-qual warnings fix.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: e2d9ce1dbcebee0fc39d8c2ecc0b94558a5ecd03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d9ce1dbcebee0fc39d8c2ec… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Oct 20 20:39:22 2006 +0100 comctl32: Cast-qual warnings fix. --- dlls/comctl32/datetime.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 8649c2f..7b24403 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -526,7 +526,8 @@ DATETIME_ReturnFieldWidth (DATETIME_INFO static const WCHAR fld_mon[] = { 'S', 'e', 'p', 't', 'e', 'm', 'b', 'e', 'r', 0 }; static const WCHAR fld_mon3[] = { 'D', 'e', 'c', 0 }; int spec; - WCHAR buffer[80], *bufptr; + WCHAR buffer[80]; + LPCWSTR bufptr; SIZE size; TRACE ("%d,%d\n", infoPtr->nrFields, count); @@ -564,32 +565,32 @@ DATETIME_ReturnFieldWidth (DATETIME_INFO case TWODIGITMINUTE: case TWODIGITMONTH: case TWODIGITYEAR: - bufptr = (WCHAR *)fld_d2W; + bufptr = fld_d2W; break; case INVALIDFULLYEAR: case FULLYEAR: - bufptr = (WCHAR *)fld_d4W; + bufptr = fld_d4W; break; case THREECHARDAY: - bufptr = (WCHAR *)fld_day3; + bufptr = fld_day3; break; case FULLDAY: - bufptr = (WCHAR *)fld_day; + bufptr = fld_day; break; case THREECHARMONTH: - bufptr = (WCHAR *)fld_mon3; + bufptr = fld_mon3; break; case FULLMONTH: - bufptr = (WCHAR *)fld_mon; + bufptr = fld_mon; break; case ONELETTERAMPM: - bufptr = (WCHAR *)fld_am1; + bufptr = fld_am1; break; case TWOLETTERAMPM: - bufptr = (WCHAR *)fld_am2; + bufptr = fld_am2; break; default: - bufptr = (WCHAR *)fld_d1W; + bufptr = fld_d1W; break; } }

1 0

Markus Amsler : msvcrt: Speed up new operator.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 9fb58434cbfd8619ae828921b1e36f324a5e7cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb58434cbfd8619ae828921b… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Sun Oct 22 04:51:23 2006 +0200 msvcrt: Speed up new operator. --- dlls/msvcrt/heap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 12c1c6e..0158435 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -49,8 +49,9 @@ void* CDECL MSVCRT_operator_new(unsigned { void *retval = HeapAlloc(GetProcessHeap(), 0, size); TRACE("(%ld) returning %p\n", size, retval); + if(retval) return retval; LOCK_HEAP; - if(!retval && MSVCRT_new_handler) + if(MSVCRT_new_handler) (*MSVCRT_new_handler)(size); UNLOCK_HEAP; return retval;

1 0

Andrey Turkin : mshtml: Insert missing "return" operator.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 25b1d67231debb85b84a38d06bfc75fe03ec7929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b1d67231debb85b84a38d06… Author: Andrey Turkin <pancha(a)mail.nnov.ru> Date: Fri Oct 20 23:40:01 2006 +0400 mshtml: Insert missing "return" operator. --- dlls/mshtml/nsembed.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 5654148..cd4ff3b 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -228,7 +228,7 @@ static BOOL load_mozctl(PRUnichar *gre_p WCHAR *ptr; if((ptr = strrchrW(gre_path, '\\'))) ptr[1] = 0; - load_xpcom(gre_path); + return load_xpcom(gre_path); }else { ERR("Could not get value of %s\n", debugstr_w(wszMozCtlClsidKey)); }

1 0