wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Sven Baars : ipconfig: Update the Dutch translation.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: d7d61dacc18e72360946577d644cd9060f9d6924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d61dacc18e72360946577d6… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Sep 7 23:07:52 2010 +0200 ipconfig: Update the Dutch translation. --- programs/ipconfig/Nl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Nl.rc b/programs/ipconfig/Nl.rc index cda3152..66c126f 100644 --- a/programs/ipconfig/Nl.rc +++ b/programs/ipconfig/Nl.rc @@ -42,4 +42,6 @@ STRINGTABLE STRING_DESCRIPTION, "Beschrijving" STRING_PHYS_ADDR, "Fysiek adres" STRING_DHCP_ENABLED, "DHCP geactiveerd" + STRING_YES, "Ja" + STRING_NO, "Nee" }

1 0

Luca Bennati : ipconfig: Update Italian translation.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 167a940e9d8626608f574113e56d56d58d9ed941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=167a940e9d8626608f574113e… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Sep 7 21:11:31 2010 +0200 ipconfig: Update Italian translation. --- programs/ipconfig/It.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/It.rc b/programs/ipconfig/It.rc index 0a7bf40..1784026 100644 --- a/programs/ipconfig/It.rc +++ b/programs/ipconfig/It.rc @@ -46,4 +46,6 @@ STRINGTABLE STRING_DESCRIPTION, "Descrizione" STRING_PHYS_ADDR, "Indirizzo fisico" STRING_DHCP_ENABLED, "DHCP abilitato" + STRING_YES, "Sì" + STRING_NO, "No" }

1 0

Gerald Pfeifer : setupx.dll16: Simplify VCP_CopyFiles by removing a set, but never read, variable.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 053ba796e7dca37c0659c0f15a4589bccf2274c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053ba796e7dca37c0659c0f15… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Sep 7 21:03:00 2010 +0200 setupx.dll16: Simplify VCP_CopyFiles by removing a set, but never read, variable. --- dlls/setupx.dll16/virtcopy.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index ffb54f3..b80a5be 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -437,11 +437,11 @@ static RETERR16 VCP_CheckPaths(void) static RETERR16 VCP_CopyFiles(void) { char fn_src[MAX_PATH], fn_dst[MAX_PATH]; - RETERR16 res = OK, cbres; + RETERR16 res = OK; DWORD n; LPVIRTNODE lpvn; - cbres = VCP_Callback(&vcp_status, VCPM_VSTATCOPYSTART, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATCOPYSTART, 0, 0, VCP_MsgRef); for (n = 0; n < vn_num; n++) { lpvn = pvnlist[n]; @@ -451,7 +451,7 @@ static RETERR16 VCP_CopyFiles(void) strcpy(fn_dst, VcpExplain16(lpvn, VCPEX_DST_FULL)); /* FIXME: what is this VCPM_VSTATWRITE here for ? * I guess it's to signal successful destination file creation */ - cbres = VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef); /* FIXME: need to do the file copy in small chunks for notifications */ TRACE("copying '%s' to '%s'\n", fn_src, fn_dst); @@ -464,12 +464,12 @@ static RETERR16 VCP_CopyFiles(void) } vcp_status.prgFileRead.dwSoFar++; - cbres = VCP_Callback(&vcp_status, VCPM_VSTATREAD, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATREAD, 0, 0, VCP_MsgRef); vcp_status.prgFileWrite.dwSoFar++; - cbres = VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef); } - cbres = VCP_Callback(&vcp_status, VCPM_VSTATCOPYEND, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATCOPYEND, 0, 0, VCP_MsgRef); return res; }

1 0

Gerald Pfeifer : gdi32/tests: Fix another test description in test_logpen.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: db9c3b0f53e4f99165161a6ea23fcc3d27251936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9c3b0f53e4f99165161a6ea… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Sep 7 20:56:04 2010 +0200 gdi32/tests: Fix another test description in test_logpen. --- dlls/gdi32/tests/pen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 5a5c063..640ffc0 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -424,7 +424,7 @@ test_geometric_pens: ok(ext_pen.elp.elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen.elp.elpHatch); ok(ext_pen.elp.elpNumEntries == 2, "expected 0, got %x\n", ext_pen.elp.elpNumEntries); ok(ext_pen.elp.elpStyleEntry[0] == 0xabc, "expected 0xabc, got %x\n", ext_pen.elp.elpStyleEntry[0]); - ok(ext_pen.elp.elpStyleEntry[1] == 0xdef, "expected 0xabc, got %x\n", ext_pen.elp.elpStyleEntry[1]); + ok(ext_pen.elp.elpStyleEntry[1] == 0xdef, "expected 0xdef, got %x\n", ext_pen.elp.elpStyleEntry[1]); break; default:

1 0

Aric Stewart : gdi32: Correct usage of ScriptLayout for bidi code.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 8ac121c6717dc13357cbd6829f6eb5a2338f9823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac121c6717dc13357cbd6829… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 7 14:41:56 2010 -0500 gdi32: Correct usage of ScriptLayout for bidi code. --- dlls/gdi32/bidi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 7b3995b..7d748fd 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -321,7 +321,7 @@ static void BidiLines(int baselevel, LPWSTR pszOutLine, LPCWSTR pszLine, WORD * { int i; /* reorder each line in place */ - ScriptLayout(cchLine, plevelLine, run, NULL); + ScriptLayout(cchLine, plevelLine, NULL, run); for (i = 0; i < cchLine; i++) pszOutLine[done+run[i]] = pszLine[i]; } @@ -590,7 +590,7 @@ BOOL BIDI_Reorder( for (j = 0; j < nItems; j++) runOrder[j] = pItems[j].a.s.uBidiLevel; - ScriptLayout(nItems, runOrder, NULL, visOrder); + ScriptLayout(nItems, runOrder, visOrder, NULL); for (j = 0; j < nItems; j++) {

1 0

Aric Stewart : imm32/tests: Test various Imm call cross-thread.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 8d12fc61d5321350ad63b173bdfb50feef1f4b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d12fc61d5321350ad63b173b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 7 12:34:44 2010 -0500 imm32/tests: Test various Imm call cross-thread. --- dlls/imm32/tests/imm32.c | 91 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 90 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 06b12f3..8b8db90 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -22,6 +22,7 @@ #include "wine/test.h" #include "winuser.h" +#include "wingdi.h" #include "imm.h" #define NUMELEMS(array) (sizeof((array))/sizeof((array)[0])) @@ -135,6 +136,19 @@ static void msg_spy_cleanup(void) { static const char wndcls[] = "winetest_imm32_wndcls"; static HWND hwnd; +static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_IME_SETCONTEXT: + case WM_NCCREATE: + case WM_CREATE: + return TRUE; + } + + return DefWindowProcA(hwnd,msg,wParam,lParam); +} + static BOOL init(void) { WNDCLASSEX wc; HIMC imc; @@ -145,7 +159,7 @@ static BOOL init(void) { wc.cbSize = sizeof(WNDCLASSEX); wc.style = 0; - wc.lpfnWndProc = DefWindowProc; + wc.lpfnWndProc = wndProc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = GetModuleHandle(0); @@ -356,6 +370,8 @@ static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) { HIMC h1,h2; HWND hwnd2; + COMPOSITIONFORM cf; + POINT pt; igc_threadinfo *info= (igc_threadinfo*)lpParam; info->hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, @@ -378,6 +394,10 @@ static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) ImmReleaseContext(info->hwnd,h2); DestroyWindow(hwnd2); + /* priming for later tests */ + ImmSetCompositionWindow(h1, &cf); + ImmSetStatusWindowPos(h1, &pt); + SetEvent(info->event); Sleep(INFINITE); return 1; @@ -389,6 +409,11 @@ static void test_ImmThreads(void) igc_threadinfo threadinfo; HANDLE hThread; DWORD dwThreadId; + BOOL rc; + LOGFONT lf; + COMPOSITIONFORM cf; + DWORD status, sentence; + POINT pt; himc = ImmGetContext(hwnd); threadinfo.event = CreateEvent(NULL, TRUE, FALSE, NULL); @@ -410,6 +435,70 @@ static void test_ImmThreads(void) ImmReleaseContext(hwnd,h1); } + + /* OpenStatus */ + rc = ImmSetOpenStatus(himc, TRUE); + ok(rc != 0, "ImmSetOpenStatus failed\n"); + rc = ImmGetOpenStatus(himc); + ok(rc != 0, "ImmGetOpenStatus failed\n"); + rc = ImmSetOpenStatus(himc, FALSE); + ok(rc != 0, "ImmSetOpenStatus failed\n"); + rc = ImmGetOpenStatus(himc); + ok(rc == 0, "ImmGetOpenStatus failed\n"); + + rc = ImmSetOpenStatus(otherHimc, TRUE); + todo_wine ok(rc == 0, "ImmSetOpenStatus should fail\n"); + rc = ImmGetOpenStatus(otherHimc); + todo_wine ok(rc == 0, "ImmGetOpenStatus failed\n"); + rc = ImmSetOpenStatus(otherHimc, FALSE); + todo_wine ok(rc == 0, "ImmSetOpenStatus should fail\n"); + rc = ImmGetOpenStatus(otherHimc); + ok(rc == 0, "ImmGetOpenStatus failed\n"); + + /* CompositionFont */ + rc = ImmGetCompositionFont(himc, &lf); + ok(rc != 0, "ImmGetCompositionFont failed\n"); + rc = ImmSetCompositionFont(himc, &lf); + ok(rc != 0, "ImmSetCompositionFont failed\n"); + + rc = ImmGetCompositionFont(otherHimc, &lf); + ok(rc != 0 || broken(rc == 0), "ImmGetCompositionFont failed\n"); + rc = ImmSetCompositionFont(otherHimc, &lf); + todo_wine ok(rc == 0, "ImmSetCompositionFont should fail\n"); + + /* CompositionWindow */ + rc = ImmSetCompositionWindow(himc, &cf); + ok(rc != 0, "ImmSetCompositionWindow failed\n"); + rc = ImmGetCompositionWindow(himc, &cf); + ok(rc != 0, "ImmGetCompositionWindow failed\n"); + + rc = ImmSetCompositionWindow(otherHimc, &cf); + todo_wine ok(rc == 0, "ImmSetCompositionWindow should fail\n"); + rc = ImmGetCompositionWindow(otherHimc, &cf); + ok(rc != 0 || broken(rc == 0), "ImmGetCompositionWindow failed\n"); + + /* ConversionStatus */ + rc = ImmGetConversionStatus(himc, &status, &sentence); + ok(rc != 0, "ImmGetConversionStatus failed\n"); + rc = ImmSetConversionStatus(himc, status, sentence); + ok(rc != 0, "ImmSetConversionStatus failed\n"); + + rc = ImmGetConversionStatus(otherHimc, &status, &sentence); + ok(rc != 0 || broken(rc == 0), "ImmGetConversionStatus failed\n"); + rc = ImmSetConversionStatus(otherHimc, status, sentence); + todo_wine ok(rc == 0, "ImmSetConversionStatus should fail\n"); + + /* StatusWindowPos */ + rc = ImmSetStatusWindowPos(himc, &pt); + ok(rc != 0, "ImmSetStatusWindowPos failed\n"); + rc = ImmGetStatusWindowPos(himc, &pt); + ok(rc != 0, "ImmGetStatusWindowPos failed\n"); + + rc = ImmSetStatusWindowPos(otherHimc, &pt); + todo_wine ok(rc == 0, "ImmSetStatusWindowPos should fail\n"); + rc = ImmGetStatusWindowPos(otherHimc, &pt); + ok(rc != 0 || broken(rc == 0), "ImmGetStatusWindowPos failed\n"); + ImmReleaseContext(threadinfo.hwnd,otherHimc); ImmReleaseContext(hwnd,himc);

1 0

André Hentschel : ipconfig: Update German translation.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 09e164cbc66fc91dea1495e5dd793e6b42dbf0d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e164cbc66fc91dea1495e5d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 7 18:47:04 2010 +0200 ipconfig: Update German translation. --- programs/ipconfig/De.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/De.rc b/programs/ipconfig/De.rc index 08b0441..b21493a 100644 --- a/programs/ipconfig/De.rc +++ b/programs/ipconfig/De.rc @@ -44,4 +44,6 @@ STRINGTABLE STRING_DESCRIPTION, "Beschreibung" STRING_PHYS_ADDR, "Physikalische Adresse" STRING_DHCP_ENABLED, "DHCP aktiviert" + STRING_YES, "Ja" + STRING_NO, "Nein" }

1 0

Austin English : kernel32: Add a stub for GetThreadUILanguage.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 4be494c081d35a573785450f973b10de1daa655c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be494c081d35a573785450f9… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 7 11:07:38 2010 -0500 kernel32: Add a stub for GetThreadUILanguage. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/thread.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 4cb4f96..8a33013 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -658,6 +658,7 @@ @ stdcall GetTimeFormatA(long long ptr str ptr long) @ stdcall GetTimeFormatW(long long ptr wstr ptr long) @ stdcall GetTimeZoneInformation(ptr) +@ stdcall GetThreadUILanguage() @ stdcall GetUserDefaultLCID() @ stdcall GetUserDefaultLangID() @ stdcall GetUserDefaultLocaleName(ptr long) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 024e825..691ef02 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -777,3 +777,22 @@ DWORD WINAPI GetThreadErrorMode( void ) { return rtlmode_to_win32mode( RtlGetThreadErrorMode() ); } + +/*********************************************************************** + * GetThreadUILanguage (KERNEL32.@) + * + * Get the current thread's language identifier. + * + * PARAMS + * None. + * + * RETURNS + * The current thread's language identifier. + */ +LANGID WINAPI GetThreadUILanguage( void ) +{ + LANGID lang; + NtQueryDefaultUILanguage( &lang ); + FIXME(": stub, returning default language.\n"); + return lang; +}

1 0

Alexandre Julliard : gdi32: Mirror the returned rectangle in GetClipBox for RTL layout.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 0766d375bc29874d11a813f82622fc6984240b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0766d375bc29874d11a813f82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 8 13:21:18 2010 +0200 gdi32: Mirror the returned rectangle in GetClipBox for RTL layout. --- dlls/gdi32/clipping.c | 6 ++++++ dlls/gdi32/tests/mapping.c | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index b8d9ed5..7be7650 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -400,6 +400,12 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) DeleteObject( hrgn ); } else ret = GetRgnBox( dc->hVisRgn, rect ); + if (dc->layout & LAYOUT_RTL) + { + int tmp = rect->left; + rect->left = rect->right - 1; + rect->right = tmp - 1; + } DPtoLP( hdc, (LPPOINT)rect, 2 ); release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index c4a97ac..fba0abf 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -313,6 +313,9 @@ static void test_dc_layout(void) GetRgnBox( hrgn, &ret_rc ); ok( EqualRect( &rc, &ret_rc ), "wrong clip box %d,%d - %d,%d\n", ret_rc.left, ret_rc.top, ret_rc.right, ret_rc.bottom ); + GetClipBox( hdc, &ret_rc ); + ok( EqualRect( &rc, &ret_rc ), "wrong clip box %d,%d - %d,%d\n", + ret_rc.left, ret_rc.top, ret_rc.right, ret_rc.bottom ); SetRectRgn( hrgn, 60, 10, 80, 20 ); pSetLayout( hdc, LAYOUT_LTR ); ExtSelectClipRgn( hdc, hrgn, RGN_OR ); @@ -322,6 +325,9 @@ static void test_dc_layout(void) GetRgnBox( hrgn, &ret_rc ); ok( EqualRect( &rc, &ret_rc ), "wrong clip box %d,%d - %d,%d\n", ret_rc.left, ret_rc.top, ret_rc.right, ret_rc.bottom ); + GetClipBox( hdc, &ret_rc ); + ok( EqualRect( &rc, &ret_rc ), "wrong clip box %d,%d - %d,%d\n", + ret_rc.left, ret_rc.top, ret_rc.right, ret_rc.bottom ); /* OffsetClipRgn mirrors too */ OffsetClipRgn( hdc, 5, 5 );

1 0

Alexandre Julliard : user32: Don' t try to set the WS_EX_LAYOUTRTL flag on the desktop window.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 72533173d51bf7d27d60f9c80760f17f3afe3c11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72533173d51bf7d27d60f9c80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 8 13:19:17 2010 +0200 user32: Don't try to set the WS_EX_LAYOUTRTL flag on the desktop window. --- dlls/user32/win.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f5e9064..63f6689 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1233,8 +1233,10 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, /* are we creating the desktop or HWND_MESSAGE parent itself? */ if (className != (LPCWSTR)DESKTOP_CLASS_ATOM && (IS_INTRESOURCE(className) || strcmpiW( className, messageW ))) + { parent = GetDesktopWindow(); - if (process_layout & LAYOUT_RTL) cs->dwExStyle |= WS_EX_LAYOUTRTL; + if (process_layout & LAYOUT_RTL) cs->dwExStyle |= WS_EX_LAYOUTRTL; + } } WIN_FixCoordinates(cs, &sw); /* fix default coordinates */

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
86
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 2010