wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Saulius Krasuckas : comctl32/tests: Make updown. c compile with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: f44ceec023dbe7b5bf6f588ceb703fca13164022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44ceec023dbe7b5bf6f588ce… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 23:33:28 2013 +0300 comctl32/tests: Make updown.c compile with -D__WINESRC__. --- dlls/comctl32/tests/updown.c | 128 +++++++++++++++++++++--------------------- 1 files changed, 64 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f44ceec023dbe7b5bf6f5…

1 0

Saulius Krasuckas : comctl32/tests: Make tooltips. c compile with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 6d773fd979bd5c7e67b657c58e75a0a91e502982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d773fd979bd5c7e67b657c58… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 23:10:34 2013 +0300 comctl32/tests: Make tooltips.c compile with -D__WINESRC__. --- dlls/comctl32/tests/tooltips.c | 78 ++++++++++++++++++++-------------------- 1 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d773fd979bd5c7e67b65…

1 0

Saulius Krasuckas : comctl32/tests: Make mru.c, pager.c and syslink. c compile with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 26ec350b73f490c2df8b0c87e8cff5545d8cb5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ec350b73f490c2df8b0c87e… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 22:35:01 2013 +0300 comctl32/tests: Make mru.c, pager.c and syslink.c compile with -D__WINESRC__. --- dlls/comctl32/tests/mru.c | 8 ++++---- dlls/comctl32/tests/pager.c | 4 ++-- dlls/comctl32/tests/syslink.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 1d8ad9a..5b5f98e 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -409,7 +409,7 @@ static void test_MRUListA(void) /* check entry 0 */ buffer[0] = 0; iRet = pEnumMRUListA(hMRU, 0, buffer, 255); - ok(iRet == lstrlen(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[3]), iRet); + ok(iRet == lstrlenA(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[3]), iRet); ok(strcmp(buffer, checks[3]) == 0, "EnumMRUList expected %s, got %s\n", checks[3], buffer); /* check entry 0 with a too small buffer */ @@ -418,7 +418,7 @@ static void test_MRUListA(void) buffer[2] = 'A'; /* unchanged */ buffer[3] = 0; /* unchanged */ iRet = pEnumMRUListA(hMRU, 0, buffer, 2); - ok(iRet == lstrlen(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[3]), iRet); + ok(iRet == lstrlenA(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[3]), iRet); ok(strcmp(buffer, "T") == 0, "EnumMRUList expected %s, got %s\n", "T", buffer); /* make sure space after buffer has old values */ ok(buffer[2] == 'A', "EnumMRUList expected %02x, got %02x\n", 'A', buffer[2]); @@ -426,13 +426,13 @@ static void test_MRUListA(void) /* check entry 1 */ buffer[0] = 0; iRet = pEnumMRUListA(hMRU, 1, buffer, 255); - ok(iRet == lstrlen(checks[1]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[1]), iRet); + ok(iRet == lstrlenA(checks[1]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[1]), iRet); ok(strcmp(buffer, checks[1]) == 0, "EnumMRUList expected %s, got %s\n", checks[1], buffer); /* check entry 2 */ buffer[0] = 0; iRet = pEnumMRUListA(hMRU, 2, buffer, 255); - ok(iRet == lstrlen(checks[2]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[2]), iRet); + ok(iRet == lstrlenA(checks[2]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[2]), iRet); ok(strcmp(buffer, checks[2]) == 0, "EnumMRUList expected %s, got %s\n", checks[2], buffer); /* check out of bounds entry 3 */ diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 56cadaf..d352140 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -100,7 +100,7 @@ static BOOL register_parent_wnd_class(void) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(NULL); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "Pager test parent class"; @@ -112,7 +112,7 @@ static HWND create_parent_window(void) if (!register_parent_wnd_class()) return NULL; - return CreateWindow("Pager test parent class", "Pager test parent window", + return CreateWindowA("Pager test parent class", "Pager test parent window", WS_OVERLAPPED | WS_VISIBLE, 0, 0, 200, 200, 0, NULL, GetModuleHandleA(NULL), NULL ); } diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c index 26bd924..d493cb7 100644 --- a/dlls/comctl32/tests/syslink.c +++ b/dlls/comctl32/tests/syslink.c @@ -70,7 +70,7 @@ static void flush_events(void) while (diff > 0) { if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); diff = time - GetTickCount(); } } @@ -245,8 +245,8 @@ START_TEST(syslink) /* Make the SysLink control visible */ flush_sequences(sequences, NUM_MSG_SEQUENCE); - oldstyle = GetWindowLong(hWndSysLink, GWL_STYLE); - SetWindowLong(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE); + oldstyle = GetWindowLongA(hWndSysLink, GWL_STYLE); + SetWindowLongA(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE); RedrawWindow(hWndSysLink, NULL, NULL, RDW_INVALIDATE); flush_events(); ok_sequence(sequences, SYSLINK_SEQ_INDEX, visible_syslink_wnd_seq, "visible SysLink", TRUE);

1 0

Saulius Krasuckas : comctl32/tests: Make status. c compile with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 529484603bbf7049e6aec8fea422c6911aaa00f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529484603bbf7049e6aec8fea… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 21:30:47 2013 +0300 comctl32/tests: Make status.c compile with -D__WINESRC__. --- dlls/comctl32/tests/status.c | 196 +++++++++++++++++++++--------------------- 1 files changed, 98 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=529484603bbf7049e6aec…

1 0

Saulius Krasuckas : comctl32/tests: Make subclass. c compile with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 10f5a733c10d35549b50ed8b713f4f7ac4776979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f5a733c10d35549b50ed8b7… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 18:23:32 2013 +0300 comctl32/tests: Make subclass.c compile with -D__WINESRC__. --- dlls/comctl32/tests/subclass.c | 64 ++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index e32919b..d5bfeef 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -166,7 +166,7 @@ static void ok_sequence(const struct message *expected, const char *context) flush_sequence(); } -static LRESULT WINAPI WndProc1(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +static LRESULT WINAPI wnd_proc_1(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct message msg; @@ -175,12 +175,12 @@ static LRESULT WINAPI WndProc1(HWND hwnd, UINT message, WPARAM wParam, LPARAM lP msg.procnum = 1; add_message(&msg); } - return DefWindowProc(hwnd, message, wParam, lParam); + return DefWindowProcA(hwnd, message, wParam, lParam); } -static WNDPROC origProc3; -static LRESULT WINAPI WndProc3(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +static WNDPROC orig_proc_3; +static LRESULT WINAPI wnd_proc_3(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct message msg; @@ -189,10 +189,10 @@ static LRESULT WINAPI WndProc3(HWND hwnd, UINT message, WPARAM wParam, LPARAM lP msg.procnum = 3; add_message(&msg); } - return CallWindowProc(origProc3, hwnd, message, wParam, lParam); + return CallWindowProcA(orig_proc_3, hwnd, message, wParam, lParam); } -static LRESULT WINAPI WndProcSub(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, UINT_PTR uldSubclass, DWORD_PTR dwRefData) +static LRESULT WINAPI wnd_proc_sub(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, UINT_PTR uldSubclass, DWORD_PTR dwRefData) { struct message msg; @@ -203,13 +203,13 @@ static LRESULT WINAPI WndProcSub(HWND hwnd, UINT message, WPARAM wParam, LPARAM if(lParam) { if(dwRefData & DELETE_SELF) { - pRemoveWindowSubclass(hwnd, WndProcSub, uldSubclass); - pRemoveWindowSubclass(hwnd, WndProcSub, uldSubclass); + pRemoveWindowSubclass(hwnd, wnd_proc_sub, uldSubclass); + pRemoveWindowSubclass(hwnd, wnd_proc_sub, uldSubclass); } if(dwRefData & DELETE_PREV) - pRemoveWindowSubclass(hwnd, WndProcSub, uldSubclass-1); + pRemoveWindowSubclass(hwnd, wnd_proc_sub, uldSubclass-1); if(dwRefData & SEND_NEST) - SendMessage(hwnd, WM_USER, wParam+1, 0); + SendMessageA(hwnd, WM_USER, wParam+1, 0); } } return pDefSubclassProc(hwnd, message, wParam, lParam); @@ -221,51 +221,51 @@ static void test_subclass(void) 100, 100, 200, 200, 0, 0, 0, NULL); assert(hwnd); - pSetWindowSubclass(hwnd, WndProcSub, 2, 0); - SendMessage(hwnd, WM_USER, 1, 0); - SendMessage(hwnd, WM_USER, 2, 0); + pSetWindowSubclass(hwnd, wnd_proc_sub, 2, 0); + SendMessageA(hwnd, WM_USER, 1, 0); + SendMessageA(hwnd, WM_USER, 2, 0); ok_sequence(Sub_BasicTest, "Basic"); - pSetWindowSubclass(hwnd, WndProcSub, 2, DELETE_SELF); - SendMessage(hwnd, WM_USER, 1, 1); + pSetWindowSubclass(hwnd, wnd_proc_sub, 2, DELETE_SELF); + SendMessageA(hwnd, WM_USER, 1, 1); ok_sequence(Sub_DeletedTest, "Deleted"); - SendMessage(hwnd, WM_USER, 1, 0); + SendMessageA(hwnd, WM_USER, 1, 0); ok_sequence(Sub_AfterDeletedTest, "After Deleted"); - pSetWindowSubclass(hwnd, WndProcSub, 2, 0); - origProc3 = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc3); - SendMessage(hwnd, WM_USER, 1, 0); - SendMessage(hwnd, WM_USER, 2, 0); + pSetWindowSubclass(hwnd, wnd_proc_sub, 2, 0); + orig_proc_3 = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)wnd_proc_3); + SendMessageA(hwnd, WM_USER, 1, 0); + SendMessageA(hwnd, WM_USER, 2, 0); ok_sequence(Sub_OldAfterNewTest, "Old after New"); - pSetWindowSubclass(hwnd, WndProcSub, 4, 0); - SendMessage(hwnd, WM_USER, 1, 0); + pSetWindowSubclass(hwnd, wnd_proc_sub, 4, 0); + SendMessageA(hwnd, WM_USER, 1, 0); ok_sequence(Sub_MixTest, "Mix"); /* Now the fun starts */ - pSetWindowSubclass(hwnd, WndProcSub, 4, SEND_NEST); - SendMessage(hwnd, WM_USER, 1, 1); + pSetWindowSubclass(hwnd, wnd_proc_sub, 4, SEND_NEST); + SendMessageA(hwnd, WM_USER, 1, 1); ok_sequence(Sub_MixAndNestTest, "Mix and nest"); - pSetWindowSubclass(hwnd, WndProcSub, 4, SEND_NEST | DELETE_SELF); - SendMessage(hwnd, WM_USER, 1, 1); + pSetWindowSubclass(hwnd, wnd_proc_sub, 4, SEND_NEST | DELETE_SELF); + SendMessageA(hwnd, WM_USER, 1, 1); ok_sequence(Sub_MixNestDelTest, "Mix, nest, del"); - pSetWindowSubclass(hwnd, WndProcSub, 4, 0); - pSetWindowSubclass(hwnd, WndProcSub, 5, DELETE_PREV); - SendMessage(hwnd, WM_USER, 1, 1); + pSetWindowSubclass(hwnd, wnd_proc_sub, 4, 0); + pSetWindowSubclass(hwnd, wnd_proc_sub, 5, DELETE_PREV); + SendMessageA(hwnd, WM_USER, 1, 1); ok_sequence(Sub_MixDelPrevTest, "Mix and del prev"); DestroyWindow(hwnd); } -static BOOL RegisterWindowClasses(void) +static BOOL register_window_classes(void) { WNDCLASSA cls; cls.style = 0; - cls.lpfnWndProc = WndProc1; + cls.lpfnWndProc = wnd_proc_1; cls.cbClsExtra = 0; cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(0); @@ -323,7 +323,7 @@ START_TEST(subclass) { if(!init_function_pointers()) return; - if(!RegisterWindowClasses()) assert(0); + if(!register_window_classes()) assert(0); test_subclass(); }

1 0

Saulius Krasuckas : comctl32/tests: Make progress. c compile with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: ce91a287282b36dce99b4b4215df411dcde107be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce91a287282b36dce99b4b421… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 18:04:23 2013 +0300 comctl32/tests: Make progress.c compile with -D__WINESRC__. --- dlls/comctl32/tests/progress.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index 59a4b00..af8a84c 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -48,12 +48,12 @@ static void flush_events(void) while (diff > 0) { if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min(10,diff), QS_ALLINPUT ) == WAIT_TIMEOUT) break; - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); diff = time - GetTickCount(); } } -static LRESULT CALLBACK ProgressTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK progress_test_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { @@ -72,7 +72,7 @@ static WNDPROC progress_wndproc; static BOOL erased; static RECT last_paint_rect; -static LRESULT CALLBACK ProgressSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK progress_subclass_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { if (msg == WM_PAINT) { @@ -82,7 +82,7 @@ static LRESULT CALLBACK ProgressSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, { erased = TRUE; } - return CallWindowProc(progress_wndproc, hWnd, msg, wParam, lParam); + return CallWindowProcA(progress_wndproc, hWnd, msg, wParam, lParam); } @@ -117,11 +117,11 @@ static void init(void) wc.cbWndExtra = 0; wc.hInstance = GetModuleHandleA(NULL); wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, IDC_ARROW); + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = progressTestClass; - wc.lpfnWndProc = ProgressTestWndProc; + wc.lpfnWndProc = progress_test_wnd_proc; RegisterClassA(&wc); rect.left = 0; @@ -135,10 +135,10 @@ static void init(void) assert(hProgressParentWnd != NULL); GetClientRect(hProgressParentWnd, &rect); - hProgressWnd = CreateWindowEx(0, PROGRESS_CLASS, "", WS_CHILD | WS_VISIBLE, + hProgressWnd = CreateWindowExA(0, PROGRESS_CLASSA, "", WS_CHILD | WS_VISIBLE, 0, 0, rect.right, rect.bottom, hProgressParentWnd, NULL, GetModuleHandleA(NULL), 0); assert(hProgressWnd != NULL); - progress_wndproc = (WNDPROC)SetWindowLongPtr(hProgressWnd, GWLP_WNDPROC, (LPARAM)ProgressSubclassProc); + progress_wndproc = (WNDPROC)SetWindowLongPtrA(hProgressWnd, GWLP_WNDPROC, (LPARAM)progress_subclass_proc); ShowWindow(hProgressParentWnd, SW_SHOWNORMAL); ok(GetUpdateRect(hProgressParentWnd, NULL, FALSE), "GetUpdateRect: There should be a region that needs to be updated\n"); @@ -201,13 +201,13 @@ static void test_redraw(void) position is not in the new range, it does. Don't test this, it may change in future Windows versions. */ - SendMessage(hProgressWnd, PBM_SETPOS, 0, 0); + SendMessageA(hProgressWnd, PBM_SETPOS, 0, 0); update_window(hProgressWnd); /* increase to 10 - no background erase required */ erased = FALSE; SetRectEmpty(&last_paint_rect); - SendMessage(hProgressWnd, PBM_SETPOS, 10, 0); + SendMessageA(hProgressWnd, PBM_SETPOS, 10, 0); GetClientRect(hProgressWnd, &client_rect); ok(EqualRect(&last_paint_rect, &client_rect), "last_paint_rect was { %d, %d, %d, %d } instead of { %d, %d, %d, %d }\n", @@ -219,7 +219,7 @@ static void test_redraw(void) /* decrease to 0 - background erase will be required */ erased = FALSE; SetRectEmpty(&last_paint_rect); - SendMessage(hProgressWnd, PBM_SETPOS, 0, 0); + SendMessageA(hProgressWnd, PBM_SETPOS, 0, 0); GetClientRect(hProgressWnd, &client_rect); ok(EqualRect(&last_paint_rect, &client_rect), "last_paint_rect was { %d, %d, %d, %d } instead of { %d, %d, %d, %d }\n",

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 9c8d4a9489b1ee16f37345e98d8aba1a087dd313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8d4a9489b1ee16f37345e98… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Nov 7 21:12:10 2013 +0200 po: Update Finnish translation. --- po/fi.po | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/po/fi.po b/po/fi.po index 87023ae..1ae9e94 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4690,8 +4690,6 @@ msgid "No Unicode translation.\n" msgstr "Ei Unicode-käännöstä.\n" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "DLL:n alustus epäonnistui.\n"

1 0

Jacek Caban : mshtml: Added IHTMLStyle6::boxSizing property implementation.
by Alexandre Julliard 07 Nov '13

07 Nov '13

Module: wine Branch: master Commit: 321c96574ea4b88c971e92372c82d272db95bd60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=321c96574ea4b88c971e92372… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 7 17:01:31 2013 +0100 mshtml: Added IHTMLStyle6::boxSizing property implementation. --- dlls/mshtml/htmlstyle.c | 4 ++++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle3.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 17 +++++++++++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 5ed2f93..5f4fc67 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -91,6 +91,9 @@ static const WCHAR attrBorderWidth[] = {'b','o','r','d','e','r','-','w','i','d','t','h',0}; static const WCHAR attrBottom[] = {'b','o','t','t','o','m',0}; +/* FIXME: Use unprefixed version (requires Gecko changes). */ +static const WCHAR attrBoxSizing[] = + {'-','m','o','z','-','b','o','x','-','s','i','z','i','n','g',0}; static const WCHAR attrClear[] = {'c','l','e','a','r',0}; static const WCHAR attrClip[] = @@ -221,6 +224,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrBorderTopWidth, DISPID_IHTMLSTYLE_BORDERTOPWIDTH}, {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, {attrBottom, DISPID_IHTMLSTYLE2_BOTTOM}, + {attrBoxSizing, DISPID_IHTMLSTYLE6_BOXSIZING}, {attrClear, DISPID_IHTMLSTYLE_CLEAR}, {attrClip, DISPID_IHTMLSTYLE_CLIP}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 646375f..382a226 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -61,6 +61,7 @@ typedef enum { STYLEID_BORDER_TOP_WIDTH, STYLEID_BORDER_WIDTH, STYLEID_BOTTOM, + STYLEID_BOX_SIZING, STYLEID_CLEAR, STYLEID_CLIP, STYLEID_COLOR, diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 116181c..1cff71b 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -762,15 +762,19 @@ static HRESULT WINAPI HTMLStyle6_get_outlineColor(IHTMLStyle6 *iface, VARIANT *p static HRESULT WINAPI HTMLStyle6_put_boxSizing(IHTMLStyle6 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_BOX_SIZING, v, 0); } static HRESULT WINAPI HTMLStyle6_get_boxSizing(IHTMLStyle6 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_BOX_SIZING, p, 0); } static HRESULT WINAPI HTMLStyle6_put_boxSpacing(IHTMLStyle6 *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index c434c1c..2df585a 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -492,6 +492,23 @@ static void test_style6(IHTMLStyle6 *style) ok(hres == S_OK, "get_outline failed: %08x\n", hres); ok(wstr_contains(str, "1px"), "outline = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + str = (void*)0xdeadbeef; + hres = IHTMLStyle6_get_boxSizing(style, &str); + ok(hres == S_OK, "get_boxSizing failed: %08x\n", hres); + ok(!str, "boxSizing = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("border-box"); + hres = IHTMLStyle6_put_boxSizing(style, str); + ok(hres == S_OK, "put_boxSizing failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle6_get_boxSizing(style, &str); + ok(hres == S_OK, "get_boxSizing failed: %08x\n", hres); + ok(!strcmp_wa(str, "border-box"), "boxSizing = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); } static void test_body_style(IHTMLStyle *style)

1 0

Frédéric Delanoy : Assorted spelling fixes.
by Alexandre Julliard 07 Nov '13

07 Nov '13

Module: wine Branch: master Commit: da6c728195ab17ae9dcf83cd3c97c67093c72e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=da6c728195ab17ae9dcf83cd3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 7 16:47:33 2013 +0100 Assorted spelling fixes. --- dlls/advapi32/tests/service.c | 2 +- dlls/avifil32/icmstream.c | 2 +- dlls/kernel32/tests/comm.c | 2 +- dlls/localspl/provider.c | 2 +- dlls/urlmon/uri.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index b47a5e3..fac6bd9 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -415,7 +415,7 @@ static void test_create_delete_svc(void) /* Wait a while. One of the following tests also does a CreateService for the * same servicename and this would result in an ERROR_SERVICE_MARKED_FOR_DELETE - * error if we do this to quick. Vista seems more picky then the others. + * error if we do this too quickly. Vista seems more picky than the others. */ Sleep(1000); diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index 31dd2be..eaca594 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -314,7 +314,7 @@ static LONG WINAPI ICMStream_fnFindSample(IAVIStream *iface, LONG pos, return This->lLastKey; } } else if (flags & FIND_ANY) { - return pos; /* We really don't know, reread is to expensive, so guess. */ + return pos; /* We really don't know, reread is too expensive, so guess. */ } else if (flags & FIND_FORMAT) { if (flags & FIND_PREV) return 0; diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index db5a369..1f88707 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1070,7 +1070,7 @@ static void test_LoopbackRead(void) ok(read == sizeof(tbuf),"ReadFile read %d bytes, expected \"%s\"\n", read,rbuf); /* Now do the same with a slower Baud rate. - As we request more characters then written, we will hit the timeout + As we request more characters than written, we will hit the timeout */ ok(GetCommState(hcom, &dcb), "GetCommState failed\n"); diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 0c12a0e..87d84fd 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -251,7 +251,7 @@ static BOOL apd_copyfile( WCHAR *pathname, WCHAR *file_part, apd_data_t *apd ) * * RETURNS * the length (in WCHAR) of the serverpart (0 for the local computer) - * (-length), when the name is to long + * (-length), when the name is too long * */ static LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index dbdeaff..72e9053 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1904,7 +1904,7 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f return TRUE; } -/* Parses the path of an opaque URI (much less strict then the parser +/* Parses the path of an opaque URI (much less strict than the parser * for a hierarchical URI). * * NOTE:

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 07 Nov '13

07 Nov '13

Module: wine Branch: master Commit: ba6a5f3d6da0bcf1931b89298eb5a056f2721ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6a5f3d6da0bcf1931b89298… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Nov 7 16:38:42 2013 +0100 po: Update German translation. --- po/de.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index cc5b6a1..f7191e8 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-06-19 11:34+0200\n" +"PO-Revision-Date: 2013-11-07 16:38+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -4705,8 +4705,6 @@ msgid "No Unicode translation.\n" msgstr "Keine Unicode-Übersetzung.\n" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "DLL-Initialisierung fehlgeschlagen.\n"

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
57
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 November 2013