wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Jacek Caban : vbscript: Added Space() implementation.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 7308be6c0ad06a6d2b8384fcc8a9396556dcc0ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7308be6c0ad06a6d2b8384fcc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 25 14:25:22 2012 +0200 vbscript: Added Space() implementation. --- dlls/vbscript/global.c | 30 ++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 4 ++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 0513664..f7d8efe 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -672,8 +672,34 @@ static HRESULT Global_Trim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Space(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str; + int n, i; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + hres = to_int(arg, &n); + if(FAILED(hres)) + return hres; + + if(n < 0) { + FIXME("n = %d\n", n); + return E_NOTIMPL; + } + + if(!res) + return S_OK; + + str = SysAllocStringLen(NULL, n); + if(!str) + return E_OUTOFMEMORY; + + for(i=0; i<n; i++) + str[i] = ' '; + + V_VT(res) = VT_BSTR; + V_BSTR(res) = str; + return S_OK; } static HRESULT Global_String(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index c17c5b4..2ad9404 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -179,4 +179,8 @@ Call ok(Len(1) = 1, "Len(1) = " & Len(1)) Call ok(isNull(Len(null)), "Len(null) = " & Len(null)) Call ok(Len(empty) = 0, "Len(empty) = " & Len(empty)) +Call ok(Space(1) = " ", "Space(1) = " & Space(1) & """") +Call ok(Space(0) = "", "Space(0) = " & Space(0) & """") +Call ok(Space(5) = " ", "Space(5) = " & Space(5) & """") + Call reportSuccess()

1 0

Jacek Caban : mshtml: Return S_OK in plugin host' s CanInPlaceActivate implementation.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: ff34939400805e75fda9c658c3b28bf54adeb5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff34939400805e75fda9c658c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 25 14:18:44 2012 +0200 mshtml: Return S_OK in plugin host's CanInPlaceActivate implementation. --- dlls/mshtml/pluginhost.c | 6 ++++-- dlls/mshtml/tests/activex.c | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index ee7773f..e4b85a8 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -875,8 +875,10 @@ static HRESULT WINAPI PHInPlaceSite_ContextSensitiveHelp(IOleInPlaceSiteEx *ifac static HRESULT WINAPI PHInPlaceSite_CanInPlaceActivate(IOleInPlaceSiteEx *iface) { PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return S_OK; } static HRESULT WINAPI PHInPlaceSite_OnInPlaceActivate(IOleInPlaceSiteEx *iface) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index ebd2057..775a676 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -903,6 +903,9 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms hres = IOleClientSite_QueryInterface(pActiveSite, &IID_IOleInPlaceSiteEx, (void**)&ip_site); ok(hres == S_OK, "Could not get IOleInPlaceSiteEx iface: %08x\n", hres); + hres = IOleInPlaceSiteEx_CanInPlaceActivate(ip_site); + ok(hres == S_OK, "CanInPlaceActivate failed: %08x\n", hres); + SET_EXPECT(InPlaceObject_GetWindow); no_redraw = 0xdeadbeef; hres = IOleInPlaceSiteEx_OnInPlaceActivateEx(ip_site, &no_redraw, 0);

1 0

Jacek Caban : mshtml: Added DISPATCH_PROPERTYGET|DISPATCH_METHOD flags support for elements exposed as window properties .
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: f90798572a0855361bde2935290cdfd3c539ad93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90798572a0855361bde29352… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 25 14:18:30 2012 +0200 mshtml: Added DISPATCH_PROPERTYGET|DISPATCH_METHOD flags support for elements exposed as window properties. --- dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/tests/vbtest.html | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fc432d8..7122b4b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2599,6 +2599,7 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD } case GLOBAL_ELEMENTVAR: switch(flags) { + case DISPATCH_PROPERTYGET|DISPATCH_METHOD: case DISPATCH_PROPERTYGET: { IHTMLElement *elem; diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html index f023f98..44212e7 100644 --- a/dlls/mshtml/tests/vbtest.html +++ b/dlls/mshtml/tests/vbtest.html @@ -33,6 +33,7 @@ Sub runTest() Call ok(counter = 6, "counter = " & counter) Call ok(isNull(document.onkeyup), "document.onkeyup is not null") Call ok(document.formname.tagName = "FORM", "document.form.tagName = " & document.formname.tagName) + Call ok(formname.tagName = "FORM", "form.tagName = " & formname.tagName) Call external.reportSuccess() End Sub </script>

1 0

Huw Davies : comdlg32: Use a ComboBoxEx control for the filename if the structure size is not the nt40 version size .
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 7a2d68abc89b7ea07436dd5a7d2ecf34376d47a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2d68abc89b7ea07436dd5a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 25 12:40:19 2012 +0100 comdlg32: Use a ComboBoxEx control for the filename if the structure size is not the nt40 version size. --- dlls/comdlg32/comdlg32.rc | 1 + dlls/comdlg32/filedlg.c | 34 ++++++++++++++++++++++++++++------ po/ar.po | 18 +++++++++--------- po/bg.po | 18 +++++++++--------- po/ca.po | 18 +++++++++--------- po/cs.po | 18 +++++++++--------- po/da.po | 18 +++++++++--------- po/de.po | 18 +++++++++--------- po/el.po | 18 +++++++++--------- po/en.po | 18 +++++++++--------- po/en_US.po | 18 +++++++++--------- po/eo.po | 18 +++++++++--------- po/es.po | 18 +++++++++--------- po/fa.po | 18 +++++++++--------- po/fi.po | 18 +++++++++--------- po/fr.po | 18 +++++++++--------- po/he.po | 18 +++++++++--------- po/hi.po | 18 +++++++++--------- po/hu.po | 18 +++++++++--------- po/it.po | 18 +++++++++--------- po/ja.po | 18 +++++++++--------- po/ko.po | 18 +++++++++--------- po/lt.po | 18 +++++++++--------- po/ml.po | 18 +++++++++--------- po/nb_NO.po | 18 +++++++++--------- po/nl.po | 18 +++++++++--------- po/or.po | 18 +++++++++--------- po/pa.po | 18 +++++++++--------- po/pl.po | 18 +++++++++--------- po/pt_BR.po | 18 +++++++++--------- po/pt_PT.po | 18 +++++++++--------- po/rm.po | 18 +++++++++--------- po/ro.po | 18 +++++++++--------- po/ru.po | 18 +++++++++--------- po/sk.po | 18 +++++++++--------- po/sl.po | 18 +++++++++--------- po/sr_RS(a)cyrillic.po | 18 +++++++++--------- po/sr_RS(a)latin.po | 18 +++++++++--------- po/sv.po | 18 +++++++++--------- po/te.po | 18 +++++++++--------- po/th.po | 18 +++++++++--------- po/tr.po | 18 +++++++++--------- po/uk.po | 18 +++++++++--------- po/wa.po | 18 +++++++++--------- po/wine.pot | 18 +++++++++--------- po/zh_CN.po | 18 +++++++++--------- po/zh_TW.po | 18 +++++++++--------- 47 files changed, 434 insertions(+), 411 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a2d68abc89b7ea07436d…

1 0

Huw Davies : comdlg32: Use the window handle to send messages to the filename control.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 01a084383c3f50ebeafc11f2930a0bb9a7d3428f URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a084383c3f50ebeafc11f29… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 25 12:40:18 2012 +0100 comdlg32: Use the window handle to send messages to the filename control. --- dlls/comdlg32/filedlg.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 9ccd25c..416ee19 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1546,10 +1546,10 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TRACE("Value in Filename includes path, overriding InitialDir: %s, %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); } - SetDlgItemTextW(hwnd, IDC_FILENAME, fodInfos->filename); + SetWindowTextW( fodInfos->DlgInfos.hwndFileName, fodInfos->filename ); } else { - SetDlgItemTextW(hwnd, IDC_FILENAME, fodInfos->filename); + SetWindowTextW( fodInfos->DlgInfos.hwndFileName, fodInfos->filename ); } } @@ -1623,7 +1623,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TRACE("Value in Filename includes path, overriding initdir: %s, %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); } - SetDlgItemTextW(hwnd, IDC_FILENAME, fodInfos->filename); + SetWindowTextW( fodInfos->DlgInfos.hwndFileName, fodInfos->filename ); } /* 4. Win2000+: Recently used */ @@ -1707,7 +1707,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TRACE("No initial dir specified, using current dir of %s\n", debugstr_w(fodInfos->initdir)); } } - SetFocus(GetDlgItem(hwnd, IDC_FILENAME)); + SetFocus( fodInfos->DlgInfos.hwndFileName ); TRACE("After manipulation, file = %s, dir = %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); /* Must the open as read only check box be checked ?*/ @@ -3740,10 +3740,10 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U TRACE("\n"); - /* get the filenames from the edit control */ - nStrLen = SendMessageW(fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0); + /* get the filenames from the filename control */ + nStrLen = GetWindowTextLengthW( fodInfos->DlgInfos.hwndFileName ); lpstrEdit = MemAlloc( (nStrLen+1)*sizeof(WCHAR) ); - GetDlgItemTextW(hwnd, IDC_FILENAME, lpstrEdit, nStrLen+1); + GetWindowTextW( fodInfos->DlgInfos.hwndFileName, lpstrEdit, nStrLen+1); TRACE("nStrLen=%u str=%s\n", nStrLen, debugstr_w(lpstrEdit));

1 0

Huw Davies : comctl32: Forward the focus to the edit control if it exists.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 3cfc2ab772924cc18690c2c86afadeea0f10de9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cfc2ab772924cc18690c2c86… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 25 12:40:17 2012 +0100 comctl32: Forward the focus to the edit control if it exists. --- dlls/comctl32/comboex.c | 3 ++- dlls/comctl32/tests/comboex.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index a72f897..d92da3d 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -2308,7 +2308,8 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return COMBOEX_WindowPosChanging (infoPtr, (WINDOWPOS *)lParam); case WM_SETFOCUS: - SetFocus(infoPtr->hwndCombo); + if (infoPtr->hwndEdit) SetFocus( infoPtr->hwndEdit ); + else SetFocus( infoPtr->hwndCombo ); return 0; case WM_SYSCOLORCHANGE: diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index 172e564..7cddbaf 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -345,6 +345,11 @@ static void test_WM_LBUTTONDOWN(void) "Current Selection: expected %d, got %d\n", 4, idx); ok(received_end_edit, "Expected to receive a CBEN_ENDEDIT message\n"); + SetFocus( hComboExParentWnd ); + ok( GetFocus() == hComboExParentWnd, "got %p\n", GetFocus() ); + SetFocus( hComboEx ); + ok( GetFocus() == hEdit, "got %p\n", GetFocus() ); + DestroyWindow(hComboEx); }

1 0

Francois Gouget : shlwapi: PathCreateFromUrlA() should not crash when given NULL buffers.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 06439b303a723dcdb924251480f7fdf778ba332c URL: http://source.winehq.org/git/wine.git/?a=commit;h=06439b303a723dcdb92425148… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 25 16:32:57 2012 +0200 shlwapi: PathCreateFromUrlA() should not crash when given NULL buffers. Add NULL and insufficient buffer tests for PathCreateFromUrl(). --- dlls/shlwapi/path.c | 3 +++ dlls/shlwapi/tests/path.c | 45 ++++++++++++++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index bb2879e..de89196 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3242,6 +3242,9 @@ HRESULT WINAPI PathCreateFromUrlA(LPCSTR pszUrl, LPSTR pszPath, HRESULT ret; DWORD lenW = sizeof(bufW)/sizeof(WCHAR), lenA; + if (!pszUrl || !pszPath || !pcchPath || !*pcchPath) + return E_INVALIDARG; + if(!RtlCreateUnicodeStringFromAsciiz(&urlW, pszUrl)) return E_INVALIDARG; if((ret = PathCreateFromUrlW(urlW.Buffer, pathW, &lenW, dwReserved)) == E_POINTER) { diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 24eab7d..0dd4e00 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -73,10 +73,10 @@ static const struct { {"file://c%3a/foo/../bar", "\\\\c:\\foo\\..\\bar", S_OK, 0}, {"file://c%7c/foo/../bar", "\\\\c|\\foo\\..\\bar", S_OK, 0x2}, {"file://foo%20ba%2fr", "\\\\foo ba/r", S_OK, 0x2}, - {"file://localhost/c:/foo/bar", "c:\\foo\\bar", S_OK, 0x2}, - {"file://localhost/c:/foo%20ba%5Cr", "c:\\foo ba\\r", S_OK, 0x2}, - {"file://LocalHost/c:/foo/bar", "c:\\foo\\bar", S_OK, 0x2}, - {"file:\\\\localhost\\c:\\foo\\bar", "c:\\foo\\bar", S_OK, 0x2}, + {"file://localhost/c:/foo/bar", "c:\\foo\\bar", S_OK, 0x6}, + {"file://localhost/c:/foo%20ba%5Cr", "c:\\foo ba\\r", S_OK, 0x6}, + {"file://LocalHost/c:/foo/bar", "c:\\foo\\bar", S_OK, 0x6}, + {"file:\\\\localhost\\c:\\foo\\bar", "c:\\foo\\bar", S_OK, 0x6}, {"file://incomplete", "\\\\incomplete", S_OK, 0}, /* 3 leading (back)slashes (omitting hostname) */ @@ -103,16 +103,16 @@ static const struct { {"file:%5C%5Clocalhost%5Cc:/foo/bar", "\\\\localhost\\c:\\foo\\bar", S_OK, 0}, /* Hostname handling */ - {"file://l%6fcalhost/c:/foo/bar", "\\\\localhostc:\\foo\\bar", S_OK, 0}, - {"file://localhost:80/c:/foo/bar", "\\\\localhost:80c:\\foo\\bar", S_OK, 0}, - {"file://host/c:/foo/bar", "\\\\hostc:\\foo\\bar", S_OK, 0}, + {"file://l%6fcalhost/c:/foo/bar", "\\\\localhostc:\\foo\\bar", S_OK, 0x4}, + {"file://localhost:80/c:/foo/bar", "\\\\localhost:80c:\\foo\\bar", S_OK, 0x4}, + {"file://host/c:/foo/bar", "\\\\hostc:\\foo\\bar", S_OK, 0x4}, {"file://host//c:/foo/bar", "\\\\host\\\\c:\\foo\\bar", S_OK, 0}, {"file://host/\\c:/foo/bar", "\\\\host\\\\c:\\foo\\bar", S_OK, 0}, {"file://host/c:foo/bar", "\\\\hostc:foo\\bar", S_OK, 0x2}, {"file://host/foo/bar", "\\\\host\\foo\\bar", S_OK, 0}, - {"file:\\\\host\\c:\\foo\\bar", "\\\\hostc:\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\c:\\foo\\bar", "\\\\hostc:\\foo\\bar", S_OK, 0x4}, {"file:\\\\host\\ca\\foo\\bar", "\\\\host\\ca\\foo\\bar", S_OK, 0}, - {"file:\\\\host\\c|\\foo\\bar", "\\\\hostc|\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\c|\\foo\\bar", "\\\\hostc|\\foo\\bar", S_OK, 0x4}, {"file:\\%5Chost\\c:\\foo\\bar", "\\\\host\\c:\\foo\\bar", S_OK, 0}, {"file:\\\\host\\cx:\\foo\\bar", "\\\\host\\cx:\\foo\\bar", S_OK, 0}, {"file:///host/c:/foo/bar", "\\host\\c:\\foo\\bar", S_OK, 0}, @@ -257,21 +257,22 @@ static void test_PathCreateFromUrl(void) { size_t i; char ret_path[INTERNET_MAX_URL_LENGTH]; - DWORD len, ret; + DWORD len, len2, ret; WCHAR ret_pathW[INTERNET_MAX_URL_LENGTH]; WCHAR *pathW, *urlW; - static const char url[] = "http://www.winehq.org"; if (!pPathCreateFromUrlA) { win_skip("PathCreateFromUrlA not found\n"); return; } - /* Check ret_path = NULL */ - len = sizeof(url); - ret = pPathCreateFromUrlA(url, NULL, &len, 0); - ok ( ret == E_INVALIDARG, "got 0x%08x expected E_INVALIDARG\n", ret); + /* Won't say how much is needed without a buffer */ + len = 0xdeca; + ret = pPathCreateFromUrlA("file://foo", NULL, &len, 0); + ok(ret == E_INVALIDARG, "got 0x%08x expected E_INVALIDARG\n", ret); + ok(len == 0xdeca, "got %x expected 0xdeca\n", len); + /* Test the decoding itself */ for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) { len = INTERNET_MAX_URL_LENGTH; ret = pPathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0); @@ -287,6 +288,7 @@ static void test_PathCreateFromUrl(void) /* Wrong string, don't bother checking the length */ ok(!lstrcmpi(ret_path, TEST_PATHFROMURL[i].path), "got %s expected %s from url %s\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); } + if (pPathCreateFromUrlW) { len = INTERNET_MAX_URL_LENGTH; pathW = GetWideString(TEST_PATHFROMURL[i].path); @@ -307,6 +309,19 @@ static void test_PathCreateFromUrl(void) ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); } + + if (SUCCEEDED(ret)) + { + /* Check what happens if the buffer is too small */ + len2 = 2; + ret = pPathCreateFromUrlW(urlW, ret_pathW, &len2, 0); + ok(ret == E_POINTER, "ret %08x, expected E_POINTER from url %s\n", ret, TEST_PATHFROMURL[i].url); + if(!(TEST_PATHFROMURL[i].todo & 0x4)) + ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); + else todo_wine + ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); + } + FreeWideString(urlW); FreeWideString(pathW); }

1 0

Francois Gouget : include: Remove a misplaced duplicate definition of SORT_STRINGSORT.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: d86abc4921b5d78cca5634ad6f6603fb47de50f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d86abc4921b5d78cca5634ad6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 25 11:36:38 2012 +0200 include: Remove a misplaced duplicate definition of SORT_STRINGSORT. --- include/winnls.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/include/winnls.h b/include/winnls.h index 71b5a8f..9ed4344 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -348,7 +348,7 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define SORT_DIGITSASNUMBERS 0x00000008 #define LINGUISTIC_IGNORECASE 0x00000010 #define LINGUISTIC_IGNOREDIACRITIC 0x00000020 -#define SORT_STRINGSORT 0x00001000 +#define SORT_STRINGSORT 0x00001000 /* Take punctuation into account */ #define NORM_IGNOREKANATYPE 0x00010000 #define NORM_IGNOREWIDTH 0x00020000 #define NORM_LINGUISTIC_CASING 0x08000000 @@ -395,8 +395,6 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define LCMAP_SORTKEY 0x00000400 /* Create a sort key */ #define LCMAP_BYTEREV 0x00000800 /* Reverse the result */ -#define SORT_STRINGSORT 0x00001000 /* Take punctuation into account */ - #define LCMAP_HIRAGANA 0x00100000 /* Transform Japanese katakana into hiragana */ #define LCMAP_KATAKANA 0x00200000 /* Transform Japanese hiragana into katakana */ #define LCMAP_HALFWIDTH 0x00400000 /* Use single byte chars in output */

1 0

Francois Gouget : mshtml/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 9c1402e6a9c72fc0f0006a7e2d01159491a0892c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1402e6a9c72fc0f0006a7e2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 25 11:33:16 2012 +0200 mshtml/tests: Add a trailing '\n' to an ok() call. --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c988ac6..d6fbd64 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4823,7 +4823,7 @@ static void test_defaults(IHTMLDocument2 *doc) str = NULL; hres = IHTMLDocument2_get_charset(doc, &str); ok(hres == S_OK, "get_charset failed: %08x\n", hres); - ok(str && *str, "charset is empty"); /* FIXME: better tests */ + ok(str && *str, "charset is empty\n"); /* FIXME: better tests */ SysFreeString(str); test_window(doc);

1 0

Francois Gouget : wininet: Check for the 'http:' protocol in a locale independent way.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 2606b8568701e225ab3a8f30f7bf6aad6c24323b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2606b8568701e225ab3a8f30f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 25 11:33:05 2012 +0200 wininet: Check for the 'http:' protocol in a locale independent way. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 28f82a3..f465ad7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -640,7 +640,7 @@ static void HTTP_FixURL(http_request_t *request) } } - if(CSTR_EQUAL != CompareStringW( LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + if(CSTR_EQUAL != CompareStringW( LOCALE_INVARIANT, NORM_IGNORECASE, request->path, strlenW(request->path), szHttp, strlenW(szHttp) ) && request->path[0] != '/') /* not an absolute path ?? --> fix it !! */ {

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
83
Older →

Jump to page:

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 September 2012