wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Austin English : msi: Spelling fixes.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 5644f05edf598ca4a51b5edbcf99ba8f4dff41c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5644f05edf598ca4a51b5edbc… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 7 14:44:23 2008 -0500 msi: Spelling fixes. --- dlls/msi/action.c | 6 +++--- dlls/msi/helpers.c | 4 ++-- dlls/msi/msi.c | 2 +- dlls/msi/tests/db.c | 2 +- dlls/msi/tests/format.c | 4 ++-- dlls/msi/tests/install.c | 2 +- dlls/msi/tests/package.c | 2 +- dlls/msi/tests/source.c | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 43ada4c..d7acc12 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2767,7 +2767,7 @@ static void ACTION_RefCountComponent( MSIPACKAGE* package, MSICOMPONENT *comp ) } } - /* add a count for permenent */ + /* add a count for permanent */ if (comp->Attributes & msidbComponentAttributesPermanent) count ++; @@ -2826,7 +2826,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) comp->RefCount); /* * Write the keypath out if the component is to be registered - * and delete the key if the component is to be deregistered + * and delete the key if the component is to be unregistered */ if (ACTION_VerifyComponentForAction( comp, INSTALLSTATE_LOCAL)) { @@ -3101,7 +3101,7 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) buffer = MSI_RecordGetString(row,2); target_folder = resolve_folder(package, buffer,FALSE,FALSE,TRUE,NULL); - /* may be needed because of a bug somehwere else */ + /* may be needed because of a bug somewhere else */ create_full_pathW(target_folder); filename = msi_dup_record_field( row, 3 ); diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 90055a1..25c1c71 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -19,7 +19,7 @@ */ /* - * Here are helper functions formally in action.c that are used by a variaty of + * Here are helper functions formally in action.c that are used by a variety of * actions and functions. */ @@ -885,7 +885,7 @@ LPWSTR create_component_advertise_string(MSIPACKAGE* package, return output; } -/* update compoennt state based on a feature change */ +/* update component state based on a feature change */ void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature) { INSTALLSTATE newstate; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index adc4b68..97af66f 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1066,7 +1066,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, if (!prod && !classes) goto done; - /* FIME */ + /* FIXME */ val = strdupW(empty); r = msi_copy_outval(val, szValue, pcchValue); } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index cd9abad..3a627c0 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2274,7 +2274,7 @@ static UINT set_summary_info(MSIHANDLE hdb) UINT res; MSIHANDLE suminfo; - /* build summmary info */ + /* build summary info */ res = MsiGetSummaryInformation(hdb, NULL, 7, &suminfo); ok( res == ERROR_SUCCESS , "Failed to open summaryinfo\n" ); diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index f4c1670..00d3856 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -205,7 +205,7 @@ static UINT set_summary_info(MSIHANDLE hdb) UINT res; MSIHANDLE suminfo; - /* build summmary info */ + /* build summary info */ res = MsiGetSummaryInformation(hdb, NULL, 7, &suminfo); ok( res == ERROR_SUCCESS , "Failed to open summaryinfo\n" ); @@ -318,7 +318,7 @@ static MSIHANDLE helper_createpackage( const char *szName ) res = MsiDatabaseCommit( hdb ); ok( res == ERROR_SUCCESS , "Failed to commit database\n" ); - /* build summmary info */ + /* build summary info */ res = MsiGetSummaryInformation(hdb, NULL, 7, &suminfo); ok( res == ERROR_SUCCESS , "Failed to open summaryinfo\n" ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 7b1d92e..a85cdd4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3512,7 +3512,7 @@ static void set_transform_summary_info(void) UINT r; MSIHANDLE suminfo = 0; - /* build summmary info */ + /* build summary info */ r = MsiGetSummaryInformation(0, mstfile, 3, &suminfo); todo_wine { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 232b75e..5178384 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -532,7 +532,7 @@ static UINT set_summary_info(MSIHANDLE hdb) UINT res; MSIHANDLE suminfo; - /* build summmary info */ + /* build summary info */ res = MsiGetSummaryInformation(hdb, NULL, 7, &suminfo); ok( res == ERROR_SUCCESS , "Failed to open summaryinfo\n" ); diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index aef15ba..4d2cbbd 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -2161,7 +2161,7 @@ static void test_MsiSourceListAddMediaDisk(void) ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - /* update dwDiskId 1, szVolumeLable is NULL */ + /* update dwDiskId 1, szVolumeLabel is NULL */ r = pMsiSourceListAddMediaDiskA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 1, NULL, "provocar"); @@ -2172,7 +2172,7 @@ static void test_MsiSourceListAddMediaDisk(void) CHECK_REG_STR(media, "1", ";provocar"); CHECK_REG_STR(media, "42", "label42;prompt42"); - /* update dwDiskId 1, szVolumeLable is empty */ + /* update dwDiskId 1, szVolumeLabel is empty */ r = pMsiSourceListAddMediaDiskA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 1, "", "provoquer");

1 0

Alexandre Julliard : winex11: Improved handling of broken 8-bit TARGETS selection.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 828ac88f24e96537a28bf30f055cfef264268a87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828ac88f24e96537a28bf30f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 12:24:54 2008 +0200 winex11: Improved handling of broken 8-bit TARGETS selection. --- dlls/winex11.drv/clipboard.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 2404a71..cdf54c1 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1902,8 +1902,22 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(LPCLIPBOARDINFO lpcbinfo) * The TARGETS property should have returned us a list of atoms * corresponding to each selection target format supported. */ - if (aformat == 32 && (atype == XA_ATOM || atype == x11drv_atom(TARGETS))) - X11DRV_CLIPBOARD_InsertSelectionProperties(display, targetList, cSelectionTargets); + if (atype == XA_ATOM || atype == x11drv_atom(TARGETS)) + { + if (aformat == 32) + { + X11DRV_CLIPBOARD_InsertSelectionProperties(display, targetList, cSelectionTargets); + } + else if (aformat == 8) /* work around quartz-wm brain damage */ + { + unsigned long i, count = cSelectionTargets / sizeof(CARD32); + Atom *atoms = HeapAlloc( GetProcessHeap(), 0, count * sizeof(Atom) ); + for (i = 0; i < count; i++) + atoms[i] = ((CARD32 *)targetList)[i]; /* FIXME: byte swapping */ + X11DRV_CLIPBOARD_InsertSelectionProperties( display, atoms, count ); + HeapFree( GetProcessHeap(), 0, atoms ); + } + } /* Free the list of targets */ wine_tsx11_lock();

1 0

Detlef Riekenberg : ntoskrnl.exe: Implement KeQueryInterruptTime.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 28553fa8a79fe1dbc0c2cc15a1672d88bb7d1e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28553fa8a79fe1dbc0c2cc15a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 7 21:15:46 2008 +0200 ntoskrnl.exe: Implement KeQueryInterruptTime. --- dlls/ntoskrnl.exe/ntoskrnl.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cd155f7..cf1603a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -529,6 +529,21 @@ KAFFINITY WINAPI KeQueryActiveProcessors( void ) } +/********************************************************************** + * KeQueryInterruptTime (NTOSKRNL.EXE.@) + * + * Return the interrupt time count + * + */ +ULONGLONG WINAPI KeQueryInterruptTime( void ) +{ + LARGE_INTEGER totaltime; + + KeQueryTickCount(&totaltime); + return totaltime.QuadPart; +} + + /*********************************************************************** * KeQuerySystemTime (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index dbab0fa..3aef928 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -570,7 +570,7 @@ @ stub KeProfileInterruptWithSource @ stub KePulseEvent @ stdcall KeQueryActiveProcessors() -@ stub KeQueryInterruptTime +@ stdcall KeQueryInterruptTime() @ stub KeQueryPriorityThread @ stub KeQueryRuntimeThread @ stdcall KeQuerySystemTime(ptr)

1 0

Detlef Riekenberg : ntoskrnl.exe: Implement KeQueryActiveProcessors.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: ee4a99696317320727f3cad4b42b804930d18159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee4a99696317320727f3cad4b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 7 21:10:12 2008 +0200 ntoskrnl.exe: Implement KeQueryActiveProcessors. --- dlls/ntoskrnl.exe/ntoskrnl.c | 18 ++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6a3c9f3..cd155f7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -511,6 +511,24 @@ void WINAPI KeInitializeTimer( PKTIMER Timer ) } +/********************************************************************** + * KeQueryActiveProcessors (NTOSKRNL.EXE.@) + * + * Return the active Processors as bitmask + * + * RETURNS + * active Processors as bitmask + * + */ +KAFFINITY WINAPI KeQueryActiveProcessors( void ) +{ + DWORD_PTR AffinityMask; + + GetProcessAffinityMask( GetCurrentProcess(), &AffinityMask, NULL); + return AffinityMask; +} + + /*********************************************************************** * KeQuerySystemTime (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 461bf28..dbab0fa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -569,7 +569,7 @@ @ stub KeProfileInterrupt @ stub KeProfileInterruptWithSource @ stub KePulseEvent -@ stub KeQueryActiveProcessors +@ stdcall KeQueryActiveProcessors() @ stub KeQueryInterruptTime @ stub KeQueryPriorityThread @ stub KeQueryRuntimeThread

1 0

Maarten Lankhorst : quartz: Fix deadlocks in pullpin.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: f4d9c09dd44d9ba32434787cee5f3a44fa54a899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d9c09dd44d9ba32434787ce… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 15:45:51 2008 -0700 quartz: Fix deadlocks in pullpin. --- dlls/quartz/parser.c | 73 +++++++++++++++++++++---------------------------- dlls/quartz/pin.c | 57 ++++++++++++++++++++++++++++++-------- dlls/quartz/pin.h | 15 +++++++--- 3 files changed, 87 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4d9c09dd44d9ba324347…

1 0

Maarten Lankhorst : quartz: Make wait timeout in directsound slightly larger.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: d1aa222e85938424bf85b95f395df5a13877b644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1aa222e85938424bf85b95f3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 15:44:51 2008 -0700 quartz: Make wait timeout in directsound slightly larger. --- dlls/quartz/dsoundrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 0cfd163..e65ae12 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -188,7 +188,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, const BYTE *d /* Wait for enough of the buffer to empty before filling it */ if(buf_free < This->buf_size/4) { - Sleep(10); + Sleep(50); continue; }

1 0

Alexandre Julliard : user32: Get rid of the debug mark option in the system menu.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 806d08c206c36f1e35dd68b114bf8caf256cd2e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=806d08c206c36f1e35dd68b11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 12:20:04 2008 +0200 user32: Get rid of the debug mark option in the system menu. --- dlls/user32/nonclient.c | 4 ---- dlls/user32/resources/user32_Bg.rc | 2 -- dlls/user32/resources/user32_Ca.rc | 2 -- dlls/user32/resources/user32_Da.rc | 2 -- dlls/user32/resources/user32_De.rc | 2 -- dlls/user32/resources/user32_En.rc | 2 -- dlls/user32/resources/user32_Eo.rc | 1 - dlls/user32/resources/user32_Es.rc | 2 -- dlls/user32/resources/user32_Fi.rc | 2 -- dlls/user32/resources/user32_Fr.rc | 2 -- dlls/user32/resources/user32_Hu.rc | 2 -- dlls/user32/resources/user32_It.rc | 2 -- dlls/user32/resources/user32_Ja.rc | 1 - dlls/user32/resources/user32_Ko.rc | 2 -- dlls/user32/resources/user32_Nl.rc | 2 -- dlls/user32/resources/user32_No.rc | 2 -- dlls/user32/resources/user32_Pl.rc | 2 -- dlls/user32/resources/user32_Pt.rc | 4 ---- dlls/user32/resources/user32_Ro.rc | 2 -- dlls/user32/resources/user32_Ru.rc | 2 -- dlls/user32/resources/user32_Si.rc | 2 -- dlls/user32/resources/user32_Sk.rc | 2 -- dlls/user32/resources/user32_Tr.rc | 2 -- dlls/user32/resources/user32_Uk.rc | 2 -- dlls/user32/resources/user32_Wa.rc | 2 -- 25 files changed, 0 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=806d08c206c36f1e35dd6…

1 0

Alexandre Julliard : libwine: Added mappings for codepage 1361 ( Korean Johab).
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 5fe73e6903c9ef4db2f6a90813396b174f6d5b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe73e6903c9ef4db2f6a9081… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 12:19:27 2008 +0200 libwine: Added mappings for codepage 1361 (Korean Johab). --- libs/wine/Makefile.in | 1 + libs/wine/c_1361.c | 8872 +++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/cpmap.pl | 12 +- libs/wine/cptable.c | 4 +- 4 files changed, 8885 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fe73e6903c9ef4db2f6a…

1 0

Lei Zhang : user32: Handle VK_ESCAPE correctly in EDIT_WM_KeyDown.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 6736ed82ed5cb416771390c5c1bee7781e95b61c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6736ed82ed5cb416771390c5c… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:18:34 2008 -0700 user32: Handle VK_ESCAPE correctly in EDIT_WM_KeyDown. --- dlls/user32/edit.c | 4 ++++ dlls/user32/tests/edit.c | 17 ++++------------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index f359555..2159ab7 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4610,6 +4610,10 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) SendMessageW( hwndParent, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndParent, IDOK ) ); } break; + case VK_ESCAPE: + if (!(es->style & ES_MULTILINE)) + SendMessageW(GetParent(es->hwndSelf), WM_COMMAND, IDCANCEL, (LPARAM)GetDlgItem( GetParent(es->hwndSelf), IDCANCEL ) ); + break; } return 0; } diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 9542714..058d9fe 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -300,8 +300,6 @@ static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM break; case 1: PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); - /* needed so the test does not wait for user input */ - PostMessage(hdlg, WM_USER, 0xfeedbeef, 0); break; case 2: PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); @@ -330,8 +328,6 @@ static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM case 7: PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); - /* needed so the test does not wait for user input */ - PostMessage(hdlg, WM_USER, 0xfeedbeef, 0); break; case 8: PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); @@ -371,11 +367,6 @@ static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM HWND hfocus = GetFocus(); int len = SendMessage(hedit, WM_GETTEXTLENGTH, 0, 0); - if (wparam == 0xfeedbeef) - { - EndDialog(hdlg, 66); - break; - } if (wparam != 0xdeadbeef) break; @@ -1872,7 +1863,7 @@ static void test_singleline_wantreturn_edit_dialog(void) /* tests for WM_KEYDOWN */ r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); - todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); @@ -1888,7 +1879,7 @@ static void test_singleline_wantreturn_edit_dialog(void) /* tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); - todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8); @@ -1896,7 +1887,7 @@ static void test_singleline_wantreturn_edit_dialog(void) /* tests for WM_KEYDOWN */ r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); - todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); @@ -1912,7 +1903,7 @@ static void test_singleline_wantreturn_edit_dialog(void) /* tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); - todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8);

1 0

Lei Zhang : user32: Handle ES_MULTILINE correctly for WM_KEYDOWN/VK_RETURN.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 7f10fe07443a7eadb2b491981e69b1cbca9b5808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f10fe07443a7eadb2b491981… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:13:04 2008 -0700 user32: Handle ES_MULTILINE correctly for WM_KEYDOWN/VK_RETURN. --- dlls/user32/edit.c | 2 +- dlls/user32/tests/edit.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 8afc87a..f359555 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4596,7 +4596,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) break; case VK_RETURN: /* If the edit doesn't want the return send a message to the default object */ - if(!(es->style & ES_WANTRETURN)) + if(!(es->style & ES_MULTILINE) || !(es->style & ES_WANTRETURN)) { HWND hwndParent = GetParent(es->hwndSelf); DWORD dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 396f74d..9542714 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1898,7 +1898,7 @@ static void test_singleline_wantreturn_edit_dialog(void) r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); - todo_wine ok(111 == r, "Expected %d, got %d\n", 111, r); + ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); ok(444 == r, "Expected %d, got %d\n", 444, r); @@ -1914,7 +1914,7 @@ static void test_singleline_wantreturn_edit_dialog(void) r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); - todo_wine ok(111 == r, "Expected %d, got %d\n", 111, r); + ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8); ok(444 == r, "Expected %d, got %d\n", 444, r); }

1 0

Lei Zhang : user32: Fix WM_CHAR return value for edit controls.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: c8a4bb8fff225aa74d9a2c115cde7f2c4d31c5ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a4bb8fff225aa74d9a2c115… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:11:58 2008 -0700 user32: Fix WM_CHAR return value for edit controls. --- dlls/user32/edit.c | 9 +++++---- dlls/user32/tests/edit.c | 25 ++++++++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index e6d2530..8afc87a 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -257,7 +257,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es); /* * WM_XXX message handlers */ -static void EDIT_WM_Char(EDITSTATE *es, WCHAR c); +static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c); static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND conrtol); static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y); static void EDIT_WM_Copy(EDITSTATE *es); @@ -834,7 +834,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, strng[1] = wParam & 0xff; if (strng[0]) MultiByteToWideChar(CP_ACP, 0, strng, 2, &charW, 1); else MultiByteToWideChar(CP_ACP, 0, &strng[1], 1, &charW, 1); - EDIT_WM_Char(es, charW); + result = EDIT_WM_Char(es, charW); break; } /* fall through */ @@ -866,7 +866,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, if (charW == VK_TAB || charW == VK_RETURN) break; } - EDIT_WM_Char(es, charW); + result = EDIT_WM_Char(es, charW); break; } @@ -3994,7 +3994,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) * WM_CHAR * */ -static void EDIT_WM_Char(EDITSTATE *es, WCHAR c) +static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) { BOOL control; @@ -4065,6 +4065,7 @@ static void EDIT_WM_Char(EDITSTATE *es, WCHAR c) } break; } + return 1; } diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0eafc80..396f74d 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -731,6 +731,7 @@ static void test_edit_control_2(void) { HWND hwndMain; char szLocalString[MAXLEN]; + LONG r; /* Create main and edit windows. */ hwndMain = CreateWindow(szEditTest2Class, "ET2", WS_OVERLAPPEDWINDOW, @@ -749,9 +750,12 @@ static void test_edit_control_2(void) trace("EDIT: SETTEXT atomicity\n"); /* Send messages to "type" in the word 'foo'. */ - SendMessage(hwndET2, WM_CHAR, 'f', 1); - SendMessage(hwndET2, WM_CHAR, 'o', 1); - SendMessage(hwndET2, WM_CHAR, 'o', 1); + r = SendMessage(hwndET2, WM_CHAR, 'f', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessage(hwndET2, WM_CHAR, 'o', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessage(hwndET2, WM_CHAR, 'o', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* 'foo' should have been changed to 'bar' by the UPDATE handler. */ GetWindowText(hwndET2, szLocalString, MAXLEN); ok(lstrcmp(szLocalString, "bar")==0, @@ -1553,7 +1557,8 @@ static void test_espassword(void) /* select all, cut (ctrl-x) */ SendMessage(hwEdit, EM_SETSEL, 0, -1); - SendMessage(hwEdit, WM_CHAR, 24, 0); + r = SendMessage(hwEdit, WM_CHAR, 24, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ r = SendMessage(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); @@ -1569,8 +1574,10 @@ static void test_espassword(void) /* select all, copy (ctrl-c) and paste (ctrl-v) */ SendMessage(hwEdit, EM_SETSEL, 0, -1); - SendMessage(hwEdit, WM_CHAR, 3, 0); - SendMessage(hwEdit, WM_CHAR, 22, 0); + r = SendMessage(hwEdit, WM_CHAR, 3, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessage(hwEdit, WM_CHAR, 22, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0; @@ -1607,7 +1614,7 @@ static void test_undo(void) /* cut (ctrl-x) */ r = SendMessage(hwEdit, WM_CHAR, 24, 0); - todo_wine { ok(1 == r, "Expected: %d, got: %d\n", 1, r); } + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0; @@ -1617,7 +1624,7 @@ static void test_undo(void) /* undo (ctrl-z) */ r = SendMessage(hwEdit, WM_CHAR, 26, 0); - todo_wine { ok(1 == r, "Expected: %d, got: %d\n", 1, r); } + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0; @@ -1627,7 +1634,7 @@ static void test_undo(void) /* undo again (ctrl-z) */ r = SendMessage(hwEdit, WM_CHAR, 26, 0); - todo_wine { ok(1 == r, "Expected: %d, got: %d\n", 1, r); } + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0;

1 0

Lei Zhang : user32: Add tests for edit controls and VK_TAB.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 42d32aba0223dcf4a08b577a2b32f7f65cc3faaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d32aba0223dcf4a08b577a2… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:07:04 2008 -0700 user32: Add tests for edit controls and VK_TAB. --- dlls/user32/tests/edit.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 4ff294c..0eafc80 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1707,6 +1707,55 @@ static void test_enter(void) DestroyWindow (hwEdit); } +static void test_tab(void) +{ + HWND hwEdit; + LONG r; + char buffer[16]; + + /* multiline */ + hwEdit = create_editcontrol(ES_MULTILINE, 0); + r = get_edit_style(hwEdit); + ok(ES_MULTILINE == r, "Wrong style expected 0x%x got: 0x%x\n", ES_MULTILINE, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessage(hwEdit, WM_CHAR, VK_TAB, 0); + todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + todo_wine { + ok(1 == r, "Expected: %d, got len %d\n", 1, r); + ok(0 == strcmp(buffer, "\t"), "expected \"\\t\", got \"%s\"\n", buffer); + } + + DestroyWindow (hwEdit); + + /* single line */ + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessage(hwEdit, WM_CHAR, VK_TAB, 0); + todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow (hwEdit); +} + static void test_edit_dialog(void) { int r; @@ -1932,6 +1981,7 @@ START_TEST(edit) test_espassword(); test_undo(); test_enter(); + test_tab(); test_edit_dialog(); test_multi_edit_dialog(); test_wantreturn_edit_dialog();

1 0

Lei Zhang : user32: Add tests for edit controls and VK_RETURN.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: d1abf27f8d3057131cf0bbc01bbfff121fdcb9c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1abf27f8d3057131cf0bbc01… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:01:00 2008 -0700 user32: Add tests for edit controls and VK_RETURN. --- dlls/user32/tests/edit.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 9ca687b..4ff294c 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1638,6 +1638,75 @@ static void test_undo(void) DestroyWindow (hwEdit); } +static void test_enter(void) +{ + HWND hwEdit; + LONG r; + char buffer[16]; + + /* multiline */ + hwEdit = create_editcontrol(ES_MULTILINE, 0); + r = get_edit_style(hwEdit); + ok(ES_MULTILINE == r, "Wrong style expected 0x%x got: 0x%x\n", ES_MULTILINE, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0); + todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + todo_wine { + ok(2 == r, "Expected: %d, got len %d\n", 2, r); + ok(0 == strcmp(buffer, "\r\n"), "expected \"\\r\\n\", got \"%s\"\n", buffer); + } + + DestroyWindow (hwEdit); + + /* single line */ + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0); + todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow (hwEdit); + + /* single line with ES_WANTRETURN */ + hwEdit = create_editcontrol(ES_WANTRETURN, 0); + r = get_edit_style(hwEdit); + ok(ES_WANTRETURN == r, "Wrong style expected 0x%x got: 0x%x\n", ES_WANTRETURN, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0); + todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow (hwEdit); +} + static void test_edit_dialog(void) { int r; @@ -1862,6 +1931,7 @@ START_TEST(edit) test_text_position(); test_espassword(); test_undo(); + test_enter(); test_edit_dialog(); test_multi_edit_dialog(); test_wantreturn_edit_dialog();

1 0

Lei Zhang : user32: Add more tests for single line edit control inside a dialog.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: e91de3952191b1a5775b00adb62d5ef320b3d01f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e91de3952191b1a5775b00adb… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 13:32:36 2008 -0700 user32: Add more tests for single line edit control inside a dialog. --- dlls/user32/tests/edit.c | 182 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 20 +++++ 2 files changed, 202 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index c226131..9ca687b 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -284,6 +284,134 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA return FALSE; } +static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases for WM_KEYDOWN */ + case 0: + PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + /* needed so the test does not wait for user input */ + PostMessage(hdlg, WM_USER, 0xfeedbeef, 0); + break; + case 2: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* test cases for WM_CHAR */ + case 3: + PostMessage(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 5: + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessage(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + break; + case 7: + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + /* needed so the test does not wait for user input */ + PostMessage(hdlg, WM_USER, 0xfeedbeef, 0); + break; + case 8: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + int len = SendMessage(hedit, WM_GETTEXTLENGTH, 0, 0); + + if (wparam == 0xfeedbeef) + { + EndDialog(hdlg, 66); + break; + } + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if ((hfocus == hedit) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + default: + EndDialog(hdlg, 55); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + static INT_PTR CALLBACK edit_wantreturn_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -1613,6 +1741,59 @@ static void test_wantreturn_edit_dialog(void) ok(444 == r, "Expected %d, got %d\n", 444, r); } +static void test_singleline_wantreturn_edit_dialog(void) +{ + int r; + + /* tests for WM_KEYDOWN */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); + todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); + todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); + todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); + todo_wine ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); + todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); + todo_wine ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); +} + static BOOL RegisterWindowClasses (void) { WNDCLASSA test2; @@ -1684,6 +1865,7 @@ START_TEST(edit) test_edit_dialog(); test_multi_edit_dialog(); test_wantreturn_edit_dialog(); + test_singleline_wantreturn_edit_dialog(); UnregisterWindowClasses(); } diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 833797d..7da8a6c 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -118,6 +118,26 @@ FONT 8, "MS Shell Dlg" EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL } +EDIT_SINGLELINE_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOVSCROLL +} + +EDIT_SINGLELINE_WANTRETURN_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN +} + EDIT_WANTRETURN_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Edit Test"

1 0

Lei Zhang : user32: Add more tests for ES_WANTRETURN.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 8cf7eef073955e825a675485234b7ef1d6f00cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf7eef073955e825a6754852… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 13:32:20 2008 -0700 user32: Add more tests for ES_WANTRETURN. --- dlls/user32/tests/edit.c | 159 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 10 +++ 2 files changed, 169 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0e9487d..c226131 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -284,6 +284,135 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA return FALSE; } +static INT_PTR CALLBACK edit_wantreturn_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases for WM_KEYDOWN */ + case 0: + PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 2: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* test cases for WM_CHAR */ + case 3: + PostMessage(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 5: + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessage(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 7: + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 8: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + int len = SendMessage(hedit, WM_GETTEXTLENGTH, 0, 0); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if ((hfocus == hedit) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 2: + if ((hfocus == hedit) && len == 2) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + default: + EndDialog(hdlg, 55); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + static HINSTANCE hinst; static HWND hwndET2; static const char szEditTest2Class[] = "EditTest2Class"; @@ -1455,6 +1584,35 @@ static void test_multi_edit_dialog(void) ok(11 == r, "Expected %d, got %d\n", 11, r); } +static void test_wantreturn_edit_dialog(void) +{ + int r; + + /* tests for WM_KEYDOWN */ + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 0); + ok(333 == r, "Expected %d, got %d\n", 333, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 1); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 4); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 6); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 7); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); +} + static BOOL RegisterWindowClasses (void) { WNDCLASSA test2; @@ -1525,6 +1683,7 @@ START_TEST(edit) test_undo(); test_edit_dialog(); test_multi_edit_dialog(); + test_wantreturn_edit_dialog(); UnregisterWindowClasses(); } diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 80abf08..833797d 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -118,6 +118,16 @@ FONT 8, "MS Shell Dlg" EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL } +EDIT_WANTRETURN_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN +} + EDIT_READONLY_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Edit Readonly Test"

1 0

Stefan Dösinger : wined3d: Mark the SYSMEM copy outdated after releasing memory.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: df2b1bea63223533fcae81eccf9abe86b2fc8dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=df2b1bea63223533fcae81ecc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 7 23:24:12 2008 +0200 wined3d: Mark the SYSMEM copy outdated after releasing memory. Strictly speaking this is redundant because the UnLoad before did the job, but if we mess with the allocated memory we have to tell the surface about that. Updating INDRAWABLE will automatically mark SYSMEM outdated. --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cd39e20..c594460 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7002,6 +7002,8 @@ static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, WINED3DPRESENT_PARAM surface->resource.allocatedMemory = NULL; surface->resource.heapMemory = NULL; surface->resource.size = IWineD3DSurface_GetPitch((IWineD3DSurface *) surface) * surface->pow2Width; + /* INDRAWABLE is a sane place for implicit targets / depth stencil after the reset */ + IWineD3DSurface_ModifyLocation((IWineD3DSurface *) surface, SFLAG_INDRAWABLE, TRUE); } static HRESULT WINAPI reset_unload_resources(IWineD3DResource *resource, void *data) {

1 0

Stefan Dösinger : wined3d: Put implicit surfaces into drawable on unload.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 0de167db9e2ef6c62ba48b050bc3d0ba2638467f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0de167db9e2ef6c62ba48b050… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 7 23:21:33 2008 +0200 wined3d: Put implicit surfaces into drawable on unload. If we mark the sysmem copy up to date we would have to take care about allocating it. As explained in the comment, INDRAWABLE is a saner choice --- dlls/wined3d/surface.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 733d095..3eeaaa3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -563,14 +563,21 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { * Implicit resources stay however. So this means we have an implicit render target * or depth stencil. The content may be destroyed, but we still have to tear down * opengl resources, so we cannot leave early. + * + * Put the most up to date surface location into the drawable. D3D-wise this content + * is undefined, so it would be nowhere, but that would make the location management + * more complicated. The drawable is a sane location, because if we mark sysmem or + * texture up to date, drawPrim will copy the uninitialized texture or sysmem to the + * uninitialized drawable. That's pointless and we'd have to allocate the texture / + * sysmem copy here. */ - IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, TRUE); } else { /* Load the surface into system memory */ IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); } IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); - IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); This->Flags &= ~SFLAG_ALLOCATED; /* Destroy PBOs, but load them into real sysmem before */

1 0

Rok Mandeljc : oleaut32: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 0f4f6fac3ce8254fe7f92032b1ce278e7186eac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f4f6fac3ce8254fe7f92032b… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:07 2008 +0200 oleaut32: Added Slovenian translation. --- dlls/oleaut32/oleaut32.rc | 3 ++- dlls/oleaut32/oleaut32_Si.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut32.rc b/dlls/oleaut32/oleaut32.rc index 44a3641..d57b886 100644 --- a/dlls/oleaut32/oleaut32.rc +++ b/dlls/oleaut32/oleaut32.rc @@ -42,6 +42,7 @@ #include "oleaut32_Pt.rc" #include "oleaut32_Ro.rc" #include "oleaut32_Ru.rc" +#include "oleaut32_Si.rc" #include "oleaut32_Sv.rc" #include "oleaut32_Th.rc" #include "oleaut32_Tr.rc" @@ -49,6 +50,6 @@ /* * FIXME: * Finnish, Greek, Hebrew, Japanese, Korean, - * Turkish, Slovenian (at least) are localised in XP Home. + * Turkish (at least) are localised in XP Home. * I expect Chinese etc are localised in Asian Editions also. */ diff --git a/dlls/oleaut32/oleaut32_Si.rc b/dlls/oleaut32/oleaut32_Si.rc new file mode 100644 index 0000000..365d877 --- /dev/null +++ b/dlls/oleaut32/oleaut32_Si.rc @@ -0,0 +1,35 @@ +/* + * Slovenian resources for oleaut32 + * + * Copyright 2008 Rok Mandeljc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Da" + IDS_FALSE "Ne" + IDS_YES "Da" + IDS_NO "Ne" + IDS_ON "Vključeno" + IDS_OFF "Izključeno" +} + +#pragma code_page(default)

1 0

Andrew Talbot : msdmo: Array parameter is passed to function as pointer so loses size information .
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: a9200b24014607c4c82fb052b97de88daa804a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9200b24014607c4c82fb052b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Apr 7 22:39:33 2008 +0100 msdmo: Array parameter is passed to function as pointer so loses size information. --- dlls/msdmo/dmoreg.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 9560234..f6d71bd 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -291,8 +291,9 @@ lend: * * Get DMP Name from the registry */ -HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[80]) +HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[]) { +#define NAME_SIZE 80 /* Size of szName[] */ WCHAR szguid[64]; HRESULT hres; HKEY hrkey = 0; @@ -311,7 +312,7 @@ HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[80]) if (ERROR_SUCCESS != hres) goto lend; - count = sizeof(szName); + count = NAME_SIZE; hres = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szName, &count); @@ -323,6 +324,7 @@ lend: RegCloseKey(hkey); return hres; +#undef NAME_SIZE }

1 0

Rok Mandeljc : regedit: Updated Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: a7c4c6a9f1fa58131bc7467dceeec6bd352b180d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c4c6a9f1fa58131bc7467dc… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:42:46 2008 +0200 regedit: Updated Slovenian translation. --- programs/regedit/Si.rc | 263 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 217 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7c4c6a9f1fa58131bc74…

1 0

Rok Mandeljc : msvfw32: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 44aa996e3defd5693a5cf764dc5038030254dd89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44aa996e3defd5693a5cf764d… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:04 2008 +0200 msvfw32: Added Slovenian translation. --- dlls/msvfw32/msvfw32_Si.rc | 55 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvfw32/rsrc.rc | 1 + 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Si.rc b/dlls/msvfw32/msvfw32_Si.rc new file mode 100644 index 0000000..05d1ba5 --- /dev/null +++ b/dlls/msvfw32/msvfw32_Si.rc @@ -0,0 +1,55 @@ +/* + * Copyright 2008 Rok Mandeljc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Stiskanje videa" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "V redu",IDOK,129,2,49,14 + PUSHBUTTON "Prekliči",IDCANCEL,129,18,49,14 + + LTEXT "&Kodek za stiskanje:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "&Nastavitve ...",882,129,36,49,14 + PUSHBUTTON "&O ...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Kakovost &stiskanja:",886,9,34,80,8 + + CONTROL "&Ključna slika na vsakih",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "slik",889,103,62,26,10 + + CONTROL "&Pretok podatkov",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "kb/s",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Polne slike (nestisnjeno)" +} + +#pragma code_page(default) diff --git a/dlls/msvfw32/rsrc.rc b/dlls/msvfw32/rsrc.rc index ba00f7d..15c7b53 100644 --- a/dlls/msvfw32/rsrc.rc +++ b/dlls/msvfw32/rsrc.rc @@ -30,5 +30,6 @@ #include "msvfw32_No.rc" #include "msvfw32_Pl.rc" #include "msvfw32_Ru.rc" +#include "msvfw32_Si.rc" #include "msvfw32_Sv.rc" #include "msvfw32_Tr.rc"

1 0

Rok Mandeljc : msvidc32: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 704949d76a80155969652af9827fc23ab1cc6920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704949d76a80155969652af98… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:05 2008 +0200 msvidc32: Added Slovenian translation. --- dlls/msvidc32/msvidc32_Si.rc | 29 +++++++++++++++++++++++++++++ dlls/msvidc32/rsrc.rc | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/msvidc32_Si.rc b/dlls/msvidc32/msvidc32_Si.rc new file mode 100644 index 0000000..060ad08 --- /dev/null +++ b/dlls/msvidc32/msvidc32_Si.rc @@ -0,0 +1,29 @@ +/* + * Copyright 2008 Rok Mandeljc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "MS-CRAM" + IDS_DESCRIPTION "Wine Video 1 video kodek" +} + +#pragma code_page(default) diff --git a/dlls/msvidc32/rsrc.rc b/dlls/msvidc32/rsrc.rc index bb8fdfe..ff97399 100644 --- a/dlls/msvidc32/rsrc.rc +++ b/dlls/msvidc32/rsrc.rc @@ -29,5 +29,6 @@ #include "msvidc32_Pl.rc" #include "msvidc32_Ro.rc" #include "msvidc32_Ru.rc" +#include "msvidc32_Si.rc" #include "msvidc32_Sv.rc" #include "msvidc32_Tr.rc"

1 0

Rok Mandeljc : localui: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 151ae30aaf6c8d50246ba16a8f71a44ecabff39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=151ae30aaf6c8d50246ba16a8… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:00 2008 +0200 localui: Added Slovenian translation. --- dlls/localui/localui.rc | 1 + dlls/localui/ui_Si.rc | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index 7c67807..d51101d 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -46,4 +46,5 @@ #include "ui_No.rc" #include "ui_Pl.rc" #include "ui_Ru.rc" +#include "ui_Si.rc" #include "ui_Sv.rc" diff --git a/dlls/localui/ui_Si.rc b/dlls/localui/ui_Si.rc new file mode 100644 index 0000000..961a2e0 --- /dev/null +++ b/dlls/localui/ui_Si.rc @@ -0,0 +1,58 @@ +/* + * Slovenian resources for localui + * + * Copyright 2008 Rok Mandeljc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Dodaj lokalna vrata" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ime vrat:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "V redu", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Prekliči", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Nastavitev LPT vrat" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Časovna omejitev (seconds)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Ponoven poskus prenosa:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "V redu", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Prekliči", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Lokalna vrata" + IDS_INVALIDNAME "'%s' ni veljavno ime vrat" + IDS_PORTEXISTS "Vrata z imenom %s že obstajajo" + IDS_NOTHINGTOCONFIG "Ta vrata nimajo možnosti nastavitve" +} + +#pragma code_page(default)

1 0

Rok Mandeljc : taskmgr: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 2d4c036e747f87966960d19f0752b2d60779f6c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4c036e747f87966960d19f0… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:21 2008 +0200 taskmgr: Added Slovenian translation. --- programs/taskmgr/Si.rc | 504 +++++++++++++++++++++++++++++++++++++++++++ programs/taskmgr/taskmgr.rc | 1 + 2 files changed, 505 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d4c036e747f87966960d…

1 0

Rok Mandeljc : cmd: Updated Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 2f807a2fa8ab6f331df831945d767c9cd22e9a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f807a2fa8ab6f331df831945… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:42:50 2008 +0200 cmd: Updated Slovenian translation. --- programs/cmd/Si.rc | 352 +++++++++++++++++++++++++++------------------------- 1 files changed, 180 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f807a2fa8ab6f331df83…

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
52
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 April 2008