July 2010 - Wine-Commits - list.winehq.org

Florian Köberle : comctl32: Simplify the code.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 4be9f0a79bf3059890f39dd8b0938c204d2f4a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be9f0a79bf3059890f39dd8b… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Sat Jul 17 10:02:11 2010 +0200 comctl32: Simplify the code. --- dlls/comctl32/treeview.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 2c3706e..860731e 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3311,20 +3311,11 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, TRACE(" TVN_ITEMEXPANDING returned TRUE, exiting...\n"); return FALSE; } - - if (!wineItem->firstChild) - return FALSE; - - wineItem->state |= TVIS_EXPANDED; } - else - { - if (!wineItem->firstChild) - return FALSE; + if (!wineItem->firstChild) + return FALSE; - /* this item has already been expanded */ - wineItem->state |= TVIS_EXPANDED; - } + wineItem->state |= TVIS_EXPANDED; if (bExpandPartial) FIXME("TVE_EXPANDPARTIAL not implemented\n");

1 0

Andrew Nguyen : ddraw: Return a failure code in IDirectDrawSurfaceImpl:: QueryInterface if IDirect3D7::CreateDevice fails.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: d5c2a358b716a6a469cad3425d05c43ccf568795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c2a358b716a6a469cad3425… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 16:26:33 2010 -0500 ddraw: Return a failure code in IDirectDrawSurfaceImpl::QueryInterface if IDirect3D7::CreateDevice fails. --- dlls/ddraw/surface.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ef7b381..e64ef3a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -118,10 +118,15 @@ IDirectDrawSurfaceImpl_QueryInterface(IDirectDrawSurface7 *iface, /* Call into IDirect3D7 for creation */ IDirect3D7_CreateDevice((IDirect3D7 *)&This->ddraw->IDirect3D7_vtbl, riid, (IDirectDrawSurface7 *)This, &d3d); - *obj = d3d ? (IDirect3DDevice *)&((IDirect3DDeviceImpl *)d3d)->IDirect3DDevice_vtbl : NULL; - TRACE("(%p) Returning IDirect3DDevice interface at %p\n", This, *obj); + if (d3d) + { + *obj = (IDirect3DDevice *)&((IDirect3DDeviceImpl *)d3d)->IDirect3DDevice_vtbl; + TRACE("(%p) Returning IDirect3DDevice interface at %p\n", This, *obj); + return S_OK; + } - return S_OK; + WARN("Unable to create a IDirect3DDevice instance, returning E_NOINTERFACE\n"); + return E_NOINTERFACE; } else if (IsEqualGUID( &IID_IDirect3DTexture, riid ) || IsEqualGUID( &IID_IDirect3DTexture2, riid ))

1 0

Florian Köberle : comctl32: Call TREEVIEW_SendExpanded after expanding.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 42c5ff799a3c4a564fd970744f0606be11583307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c5ff799a3c4a564fd970744… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Sat Jul 17 10:02:10 2010 +0200 comctl32: Call TREEVIEW_SendExpanded after expanding. --- dlls/comctl32/tests/treeview.c | 1 - dlls/comctl32/treeview.c | 13 +++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 320deba..18528e3 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -918,7 +918,6 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, visibleItem = TreeView_GetNextItem(pHdr->hwndFrom, visibleItem, TVGN_NEXTVISIBLE); *(HTREEITEM*)&rect = visibleItem; ok(visibleItem != NULL, "There must be a visible item after the first visisble item.\n"); - todo_wine ok(SendMessage(pHdr->hwndFrom, TVM_GETITEMRECT, TRUE, (LPARAM)&rect), "Failed to get rect for second visible item.\n"); } break; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 5adbb30..2c3706e 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3279,6 +3279,7 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, LONG orgNextTop = 0; RECT scrollRect; TREEVIEW_ITEM *nextItem, *tmpItem; + BOOL sendsNotifications; TRACE("(%p, %p, partial=%d, %d\n", infoPtr, wineItem, bExpandPartial, bUser); @@ -3301,8 +3302,9 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, TRACE("TVE_EXPAND %p %s\n", wineItem, TREEVIEW_ItemName(wineItem)); - if (bUser || ((wineItem->cChildren != 0) && - !(wineItem->state & TVIS_EXPANDEDONCE))) + sendsNotifications = bUser || ((wineItem->cChildren != 0) && + !(wineItem->state & TVIS_EXPANDEDONCE)); + if (sendsNotifications) { if (!TREEVIEW_SendExpanding(infoPtr, wineItem, TVE_EXPAND)) { @@ -3314,8 +3316,6 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, return FALSE; wineItem->state |= TVIS_EXPANDED; - TREEVIEW_SendExpanded(infoPtr, wineItem, TVE_EXPAND); - wineItem->state |= TVIS_EXPANDEDONCE; } else { @@ -3384,6 +3384,11 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, } } + if (sendsNotifications) { + TREEVIEW_SendExpanded(infoPtr, wineItem, TVE_EXPAND); + wineItem->state |= TVIS_EXPANDEDONCE; + } + return TRUE; }

1 0

Greg Geldorp : winetest: Take manifests into account when hunting for DLLs.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 6521fc192f5423e38878506ac77ba7cfe8de3e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6521fc192f5423e38878506ac… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sat Jul 17 08:48:42 2010 +0200 winetest: Take manifests into account when hunting for DLLs. --- programs/winetest/main.c | 53 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index f5bf8d4..61dab7a 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -65,6 +65,12 @@ static unsigned int nb_filters = 0; static HMODULE hmscoree; static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE *); +/* For SxS DLLs e.g. msvcr90 */ +static HANDLE (WINAPI *pCreateActCtxA)(PACTCTXA); +static BOOL (WINAPI *pActivateActCtx)(HANDLE, ULONG_PTR *); +static BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); +static void (WINAPI *pReleaseActCtx)(HANDLE); + /* To store the current PATH setting (related to .NET only provided dlls) */ static char *curpath; @@ -512,7 +518,6 @@ get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name) goto quit; } - extract_test (test, tempdir, res_name); cmd = strmake (NULL, "%s --list", test->exename); if (test->maindllpath) { /* We need to add the path (to the main dll) to PATH */ @@ -677,15 +682,37 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, WCHAR dllnameW[MAX_PATH]; HMODULE dll; DWORD err; + HANDLE actctx; + ULONG_PTR cookie; if (aborting) return TRUE; if (test_filtered_out( lpszName, NULL )) return TRUE; - /* Check if the main dll is present on this system */ CharLowerA(lpszName); + extract_test (&wine_tests[nr_of_files], tempdir, lpszName); + + /* Check if the main dll is present on this system */ strcpy(dllname, lpszName); *strstr(dllname, testexe) = 0; + if (pCreateActCtxA != NULL && pActivateActCtx != NULL && + pDeactivateActCtx != NULL && pReleaseActCtx != NULL) + { + ACTCTXA actctxinfo; + memset(&actctxinfo, 0, sizeof(ACTCTXA)); + actctxinfo.cbSize = sizeof(ACTCTXA); + actctxinfo.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID; + actctxinfo.lpSource = wine_tests[nr_of_files].exename; + actctxinfo.lpResourceName = CREATEPROCESS_MANIFEST_RESOURCE_ID; + actctx = pCreateActCtxA(&actctxinfo); + if (actctx != INVALID_HANDLE_VALUE && + ! pActivateActCtx(actctx, &cookie)) + { + pReleaseActCtx(actctx); + actctx = INVALID_HANDLE_VALUE; + } + } else actctx = INVALID_HANDLE_VALUE; + wine_tests[nr_of_files].maindllpath = NULL; strcpy(filename, dllname); dll = LoadLibraryExA(dllname, NULL, LOAD_LIBRARY_AS_DATAFILE); @@ -707,6 +734,11 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, if (!dll) { xprintf (" %s=dll is missing\n", dllname); + if (actctx != INVALID_HANDLE_VALUE) + { + pDeactivateActCtx(0, cookie); + pReleaseActCtx(actctx); + } return TRUE; } if (is_native_dll(dll)) @@ -714,6 +746,11 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, FreeLibrary(dll); xprintf (" %s=load error Configured as native\n", dllname); nr_native_dlls++; + if (actctx != INVALID_HANDLE_VALUE) + { + pDeactivateActCtx(0, cookie); + pReleaseActCtx(actctx); + } return TRUE; } FreeLibrary(dll); @@ -728,6 +765,12 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, { xprintf (" %s=load error %u\n", dllname, err); } + + if (actctx != INVALID_HANDLE_VALUE) + { + pDeactivateActCtx(0, cookie); + pReleaseActCtx(actctx); + } return TRUE; } @@ -740,6 +783,7 @@ run_tests (char *logname, char *outdir) SECURITY_ATTRIBUTES sa; char tmppath[MAX_PATH], tempdir[MAX_PATH+4]; DWORD needed; + HMODULE kernel32; /* Get the current PATH only once */ needed = GetEnvironmentVariableA("PATH", NULL, 0); @@ -831,6 +875,11 @@ run_tests (char *logname, char *outdir) pLoadLibraryShim = NULL; if (hmscoree) pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim"); + kernel32 = GetModuleHandleA("kernel32.dll"); + pCreateActCtxA = (void *)GetProcAddress(kernel32, "CreateActCtxA"); + pActivateActCtx = (void *)GetProcAddress(kernel32, "ActivateActCtx"); + pDeactivateActCtx = (void *)GetProcAddress(kernel32, "DeactivateActCtx"); + pReleaseActCtx = (void *)GetProcAddress(kernel32, "ReleaseActCtx"); report (R_STATUS, "Extracting tests"); report (R_PROGRESS, 0, nr_of_files);

1 0

Andrew Eikum : oleaut32: Don't fail if member is missing in ITypeComp::Bind .
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 3173305e887775624d46f7cc65283723886930c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3173305e887775624d46f7cc6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jul 16 12:27:27 2010 -0500 oleaut32: Don't fail if member is missing in ITypeComp::Bind. --- dlls/oleaut32/tests/typelib.c | 12 ++++++++++++ dlls/oleaut32/typelib.c | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ff7defb..5487632 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -107,6 +107,7 @@ static void test_TypeComp(void) static WCHAR wszOLE_COLOR[] = {'O','L','E','_','C','O','L','O','R',0}; static WCHAR wszClone[] = {'C','l','o','n','e',0}; static WCHAR wszclone[] = {'c','l','o','n','e',0}; + static WCHAR wszJunk[] = {'J','u','n','k',0}; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -282,6 +283,17 @@ static void test_TypeComp(void) ITypeInfo_ReleaseFuncDesc(pTypeInfo, bindptr.lpfuncdesc); ITypeInfo_Release(pTypeInfo); + /* tests non-existent members */ + desckind = 0xdeadbeef; + bindptr.lptcomp = (ITypeComp*)0xdeadbeef; + pTypeInfo = (ITypeInfo*)0xdeadbeef; + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszJunk); + hr = ITypeComp_Bind(pTypeComp, wszJunk, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + ok(desckind == DESCKIND_NONE, "desckind should have been DESCKIND_NONE, was: %d\n", desckind); + ok(pTypeInfo == NULL, "pTypeInfo should have been NULL, was: %p\n", pTypeInfo); + ok(bindptr.lptcomp == NULL, "bindptr should have been NULL, was: %p\n", bindptr.lptcomp); + ITypeComp_Release(pTypeComp); ITypeInfo_Release(pFontTypeInfo); ITypeLib_Release(pTypeLib); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7a56e93..b310a4b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7654,9 +7654,9 @@ static HRESULT WINAPI ITypeComp_fnBind( ITypeInfoImpl *This = info_impl_from_ITypeComp(iface); const TLBFuncDesc *pFDesc; const TLBVarDesc *pVDesc; - HRESULT hr = DISP_E_MEMBERNOTFOUND; + HRESULT hr = S_OK; - TRACE("(%s, %x, 0x%x, %p, %p, %p)\n", debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); + TRACE("(%p)->(%s, %x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); *pDescKind = DESCKIND_NONE; pBindPtr->lpfuncdesc = NULL; @@ -7716,7 +7716,7 @@ static HRESULT WINAPI ITypeComp_fnBind( } WARN("Could not search inherited interface!\n"); } - WARN("did not find member with name %s, flags 0x%x!\n", debugstr_w(szName), wFlags); + TRACE("did not find member with name %s, flags 0x%x\n", debugstr_w(szName), wFlags); return hr; }

1 0

Austin English : winscard: Add stubs for SCardIsValidContext/ SCardReleaseContext.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: f146fa0f81fe441620e0379d08d8c9602d973244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f146fa0f81fe441620e0379d0… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 16 13:20:52 2010 -0500 winscard: Add stubs for SCardIsValidContext/SCardReleaseContext. --- dlls/winscard/winscard.c | 14 ++++++++++++++ dlls/winscard/winscard.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index b9d5d46..bbf1d72 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -95,9 +95,23 @@ LONG WINAPI SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1, return SCARD_F_INTERNAL_ERROR; } +LONG WINAPI SCardIsValidContext(SCARDCONTEXT context) +{ + FIXME("(%lx) stub\n", context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} + LONG WINAPI SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr, LPCGUID rgguidInterfaces, DWORD cguidInterfaceCount, LPSTR mszCards, LPDWORD pcchCards) { FIXME(": stub\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } + +LONG WINAPI SCardReleaseContext(SCARDCONTEXT context) +{ + FIXME("(%lx) stub\n", context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index 67c0d9f..116cb04 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -33,7 +33,7 @@ @ stub SCardIntroduceReaderGroupA @ stub SCardIntroduceReaderGroupW @ stub SCardIntroduceReaderW -@ stub SCardIsValidContext +@ stdcall SCardIsValidContext(long) @ stdcall SCardListCardsA(long ptr ptr long str long) @ stub SCardListCardsW @ stub SCardListInterfacesA @@ -47,7 +47,7 @@ @ stub SCardLocateCardsByATRW @ stub SCardLocateCardsW @ stub SCardReconnect -@ stub SCardReleaseContext +@ stdcall SCardReleaseContext(long) @ stub SCardReleaseStartedEvent @ stub SCardRemoveReaderFromGroupA @ stub SCardRemoveReaderFromGroupW

1 0

Andrew Nguyen : ddraw: Don' t permit the enumeration of the Direct3D reference device in IDirect3D1:: FindDevice.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 14744c44b1e35694771810d11a19db615be2bff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14744c44b1e35694771810d11… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 16:26:57 2010 -0500 ddraw: Don't permit the enumeration of the Direct3D reference device in IDirect3D1::FindDevice. --- dlls/ddraw/direct3d.c | 1 - dlls/ddraw/tests/d3d.c | 25 ++++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index edbcc28..15c30a5 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -684,7 +684,6 @@ IDirect3DImpl_3_FindDevice(IDirect3D3 *iface, TRACE(" trying to match guid %s.\n", debugstr_guid(&(D3DDFS->guid))); if ((IsEqualGUID(&IID_D3DDEVICE_WineD3D, &(D3DDFS->guid)) == 0) && (IsEqualGUID(&IID_IDirect3DHALDevice, &(D3DDFS->guid)) == 0) && - (IsEqualGUID(&IID_IDirect3DRefDevice, &(D3DDFS->guid)) == 0) && (IsEqualGUID(&IID_IDirect3DRGBDevice, &(D3DDFS->guid)) == 0)) { TRACE(" no match for this GUID.\n"); diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 069bc96..aa87ca6 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3403,6 +3403,11 @@ static void FindDevice(void) {&IID_IDirect3DRGBDevice}, }; + static const GUID *nonexistent_deviceGUIDs[] = {&IID_IDirect3DMMXDevice, + &IID_IDirect3DRefDevice, + &IID_IDirect3DTnLHalDevice, + &IID_IDirect3DNullDevice}; + D3DFINDDEVICESEARCH search = {0}; D3DFINDDEVICERESULT result = {0}; HRESULT hr; @@ -3454,16 +3459,18 @@ static void FindDevice(void) ok(hr == DDERR_NOTFOUND, "Expected IDirect3D1::FindDevice to return DDERR_NOTFOUND, got 0x%08x\n", hr); - /* The reference device GUID can't be enumerated. */ - search.dwSize = sizeof(search); - search.dwFlags = D3DFDS_GUID; - search.guid = IID_IDirect3DRefDevice; - result.dwSize = sizeof(result); + /* These GUIDs appear to be never present. */ + for (i = 0; i < sizeof(nonexistent_deviceGUIDs)/sizeof(nonexistent_deviceGUIDs[0]); i++) + { + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_GUID; + search.guid = *nonexistent_deviceGUIDs[i]; + result.dwSize = sizeof(result); - hr = IDirect3D_FindDevice(Direct3D1, &search, &result); - todo_wine - ok(hr == DDERR_NOTFOUND, - "Expected IDirect3D1::FindDevice to return DDERR_NOTFOUND, got 0x%08x\n", hr); + hr = IDirect3D_FindDevice(Direct3D1, &search, &result); + ok(hr == DDERR_NOTFOUND, + "[%d] Expected IDirect3D1::FindDevice to return DDERR_NOTFOUND, got 0x%08x\n", i, hr); + } /* These GUIDs appear to be always present. */ for (i = 0; i < sizeof(deviceGUIDs)/sizeof(deviceGUIDs[0]); i++)

1 0

Thomas Mullaly : urlmon: Implemented functionality for retrieving the RAW_URI property of a IUri.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: fe41d09d7530d37a4846328d295a97a0d26a02e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe41d09d7530d37a4846328d2… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Jul 6 16:19:58 2010 -0400 urlmon: Implemented functionality for retrieving the RAW_URI property of a IUri. --- dlls/urlmon/tests/uri.c | 24 ++++++++-------- dlls/urlmon/uri.c | 67 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 69 insertions(+), 22 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 31f22a5..a89e5c6 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -104,7 +104,7 @@ static const uri_properties uri_tests[] = { {"/",S_OK,TRUE}, /* PATH */ {"/",S_OK,TRUE}, /* PATH_AND_QUERY */ {"",S_FALSE,TRUE}, /* QUERY */ - {"http://www.winehq.org/tests/../tests/../..",S_OK,TRUE}, /* RAW_URI */ + {"http://www.winehq.org/tests/../tests/../..",S_OK,FALSE}, /* RAW_URI */ {"http",S_OK,TRUE}, /* SCHEME_NAME */ {"",S_FALSE,TRUE}, /* USER_INFO */ {"",S_FALSE,TRUE} /* USER_NAME */ @@ -133,7 +133,7 @@ static const uri_properties uri_tests[] = { {"/tests",S_OK,TRUE}, {"/tests",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"http://winehq.org/tests/.././tests",S_OK,TRUE}, + {"http://winehq.org/tests/.././tests",S_OK,FALSE}, {"http",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -162,7 +162,7 @@ static const uri_properties uri_tests[] = { {"/",S_OK,TRUE}, {"/?query=x&return=y",S_OK,TRUE}, {"?query=x&return=y",S_OK,TRUE}, - {"HtTp://www.winehq.org/tests/..?query=x&return=y",S_OK,TRUE}, + {"HtTp://www.winehq.org/tests/..?query=x&return=y",S_OK,FALSE}, {"http",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -191,7 +191,7 @@ static const uri_properties uri_tests[] = { {"/path/a/Forbidden'%3C%7C%3E%20Characters",S_OK,TRUE}, {"/path/a/Forbidden'%3C%7C%3E%20Characters",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"hTTp://us%45r%3Ainfo(a)examp%4CE.com:80/path/a/b/./c/../%2E%2E/Forbidden'<|> Characters",S_OK,TRUE}, + {"hTTp://us%45r%3Ainfo(a)examp%4CE.com:80/path/a/b/./c/../%2E%2E/Forbidden'<|> Characters",S_OK,FALSE}, {"http",S_OK,TRUE}, {"usEr%3Ainfo",S_OK,TRUE}, {"usEr%3Ainfo",S_OK,TRUE} @@ -221,7 +221,7 @@ static const uri_properties uri_tests[] = { {"/dir/foo%20bar.txt",S_OK,TRUE}, {"/dir/foo%20bar.txt",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"ftp://winepass:wine(a)ftp.winehq.org:9999/dir/foo bar.txt",S_OK,TRUE}, + {"ftp://winepass:wine(a)ftp.winehq.org:9999/dir/foo bar.txt",S_OK,FALSE}, {"ftp",S_OK,TRUE}, {"winepass:wine",S_OK,TRUE}, {"winepass",S_OK,TRUE} @@ -249,7 +249,7 @@ static const uri_properties uri_tests[] = { {"/c:/tests/foo%2520bar.mp3",S_OK,TRUE}, {"/c:/tests/foo%2520bar.mp3",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"file://c:\\tests\\../tests/foo%20bar.mp3",S_OK,TRUE}, + {"file://c:\\tests\\../tests/foo%20bar.mp3",S_OK,FALSE}, {"file",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -277,7 +277,7 @@ static const uri_properties uri_tests[] = { {"/tests/test%20file.README.txt",S_OK,TRUE}, {"/tests/test%20file.README.txt",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"FILE://localhost/test dir\\../tests/test%20file.README.txt",S_OK,TRUE}, + {"FILE://localhost/test dir\\../tests/test%20file.README.txt",S_OK,FALSE}, {"file",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -305,7 +305,7 @@ static const uri_properties uri_tests[] = { {"nothing:should:happen here",S_OK,TRUE}, {"nothing:should:happen here",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"urn:nothing:should:happen here",S_OK,TRUE}, + {"urn:nothing:should:happen here",S_OK,FALSE}, {"urn",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -334,7 +334,7 @@ static const uri_properties uri_tests[] = { {"/test%20dir/test.txt",S_OK,TRUE}, {"/test%20dir/test.txt",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"http://127.0.0.1/tests/../test dir/./test.txt",S_OK,TRUE}, + {"http://127.0.0.1/tests/../test dir/./test.txt",S_OK,FALSE}, {"http",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -363,7 +363,7 @@ static const uri_properties uri_tests[] = { {"/",S_OK,TRUE}, {"/",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]",S_OK,TRUE}, + {"http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]",S_OK,FALSE}, {"http",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -392,7 +392,7 @@ static const uri_properties uri_tests[] = { {"/",S_OK,TRUE}, {"/",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"ftp://[::13.1.68.3]",S_OK,TRUE}, + {"ftp://[::13.1.68.3]",S_OK,FALSE}, {"ftp",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -421,7 +421,7 @@ static const uri_properties uri_tests[] = { {"/",S_OK,TRUE}, {"/",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"http://[FEDC:BA98:0:0:0:0:0:3210]",S_OK,TRUE}, + {"http://[FEDC:BA98:0:0:0:0:0:3210]",S_OK,FALSE}, {"http",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index df5ca8b..732ec44 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -25,6 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { const IUriVtbl *lpIUriVtbl; LONG ref; + + BSTR raw_uri; } Uri; typedef struct { @@ -74,8 +76,10 @@ static ULONG WINAPI Uri_Release(IUri *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + SysFreeString(This->raw_uri); heap_free(This); + } return ref; } @@ -83,7 +87,8 @@ static ULONG WINAPI Uri_Release(IUri *iface) static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BSTR *pbstrProperty, DWORD dwFlags) { Uri *This = URI_THIS(iface); - FIXME("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); + HRESULT hres; + TRACE("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); if(!pbstrProperty) return E_POINTER; @@ -99,13 +104,33 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST return S_OK; } - return E_NOTIMPL; + /* Don't have support for flags yet. */ + if(dwFlags) { + FIXME("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); + return E_NOTIMPL; + } + + switch(uriProp) { + case Uri_PROPERTY_RAW_URI: + *pbstrProperty = SysAllocString(This->raw_uri); + if(!(*pbstrProperty)) + hres = E_OUTOFMEMORY; + else + hres = S_OK; + break; + default: + FIXME("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); + hres = E_NOTIMPL; + } + + return hres; } static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, DWORD *pcchProperty, DWORD dwFlags) { Uri *This = URI_THIS(iface); - FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + HRESULT hres; + TRACE("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); if(!pcchProperty) return E_INVALIDARG; @@ -114,7 +139,23 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D if(uriProp > Uri_PROPERTY_STRING_LAST) return E_INVALIDARG; - return E_NOTIMPL; + /* Don't have support for flags yet. */ + if(dwFlags) { + FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + return E_NOTIMPL; + } + + switch(uriProp) { + case Uri_PROPERTY_RAW_URI: + *pcchProperty = SysStringLen(This->raw_uri); + hres = S_OK; + break; + default: + FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + hres = E_NOTIMPL; + } + + return hres; } static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DWORD *pcchProperty, DWORD dwFlags) @@ -278,12 +319,10 @@ static HRESULT WINAPI Uri_GetQuery(IUri *iface, BSTR *pstrQuery) static HRESULT WINAPI Uri_GetRawUri(IUri *iface, BSTR *pstrRawUri) { Uri *This = URI_THIS(iface); - FIXME("(%p)->(%p)\n", This, pstrRawUri); - - if(!pstrRawUri) - return E_POINTER; + TRACE("(%p)->(%p)\n", This, pstrRawUri); - return E_NOTIMPL; + /* Just forward the call to GetPropertyBSTR. */ + return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_RAW_URI, pstrRawUri, 0); } static HRESULT WINAPI Uri_GetSchemeName(IUri *iface, BSTR *pstrSchemeName) @@ -454,6 +493,14 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU ret->lpIUriVtbl = &UriVtbl; ret->ref = 1; + /* Create a copy of pwzURI and store it as the raw_uri. */ + ret->raw_uri = SysAllocString(pwzURI); + + if(!ret->raw_uri) { + heap_free(ret); + return E_OUTOFMEMORY; + } + *ppURI = URI(ret); return S_OK; }

1 0

Igor Paliychuk : appwiz.cpl: Add Ukrainian translation.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 15f36468de04c66703b9808fa079386b842b95fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f36468de04c66703b9808fa… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jul 18 23:43:03 2010 +0300 appwiz.cpl: Add Ukrainian translation. --- dlls/appwiz.cpl/Makefile.in | 1 + dlls/appwiz.cpl/Uk.rc | 88 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 1bc8808..079c1e0 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -27,6 +27,7 @@ RC_SRCS = \ Ru.rc \ Si.rc \ Sv.rc \ + Uk.rc \ Zh.rc \ appwiz.rc diff --git a/dlls/appwiz.cpl/Uk.rc b/dlls/appwiz.cpl/Uk.rc new file mode 100644 index 0000000..c133f81 --- /dev/null +++ b/dlls/appwiz.cpl/Uk.rc @@ -0,0 +1,88 @@ +/* +* Add/Remove Programs Ukrainian resources +* +* Copyright 2001-2002, 2008 Owen Rudge +* Copyright 2010 Igor Paliychuk +* +* 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 +* +*/ + +#include "res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CPL_TITLE, "Встановлення/Видалення Програм" + IDS_CPL_DESC, "Дозволяє встановити нове ПЗ та видалити наявне з вашого комп'ютера." + IDS_TAB1_TITLE, "Програми" + + IDS_UNINSTALL_FAILED, "Неможливо виконати видалення, '%s'. Вилучити дані про встановлену програму з реєстру?" + IDS_NOT_SPECIFIED, "Не зазначено" + + IDS_COLUMN_NAME, "Назва" + IDS_COLUMN_PUBLISHER, "Видавець" + IDS_COLUMN_VERSION, "Версія" + IDS_INSTALL_FILTER, "Програми встановлення\0*instal*.exe;*setup*.exe;*.msi\0Програми (*.exe)\0*.exe\0Всі Файли (*.*)\0*.*\0\0" + + IDS_REMOVE, "&Видалити..." + IDS_MODIFY_REMOVE, "&Змінити/Видалити..." +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Встановлення/Видалення" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Щоб встановити нову програму з дискети, CD-ROM, чи жорсткого диску, натисніть Встановити.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Встановити...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "Дане ПЗ може бути видалене автоматично. Щоб видалити програму чи змінити її склад, виберіть її зі списку та натисніть Змінити/Видалити.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "&Дані підтримки...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 100, 198, 64, 14 + CONTROL "&Змінити...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 168, 198, 68, 14 + CONTROL "Ви&далити...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 198, 72, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Дані підтримки" +FONT 8, "MS Shell Dlg" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Ці дані можуть бути використані для отримання тех. підтримки для %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Видавець:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Версія:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Контактна особа:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Дані підтримки:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Телефон підтримки:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Файл Readme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Оновлення:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Коментарі:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +}

1 0

Igor Paliychuk : notepad: Add Ukrainian translation.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: efe7fbd20b49109963695158db24b2aea0d9fafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe7fbd20b49109963695158d… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jul 18 23:44:12 2010 +0300 notepad: Add Ukrainian translation. --- programs/notepad/Makefile.in | 1 + programs/notepad/Uk.rc | 144 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index 773c63e..79c8416 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -40,6 +40,7 @@ RC_SRCS = \ Sv.rc \ Th.rc \ Tr.rc \ + Uk.rc \ Wa.rc \ Zh.rc \ rsrc.rc diff --git a/programs/notepad/Uk.rc b/programs/notepad/Uk.rc new file mode 100644 index 0000000..95938e9 --- /dev/null +++ b/programs/notepad/Uk.rc @@ -0,0 +1,144 @@ +/* + * Notepad (Ukrainian resources) + * + * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> + * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2010 Igor Paliychuk + * + * 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 + */ + +#include "notepad_res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "&Файл" { + MENUITEM "&Новий\tCtrl+N", CMD_NEW + MENUITEM "&Відкрити...\tCtrl+O", CMD_OPEN + MENUITEM "&Зберегти\tCtrl+S", CMD_SAVE + MENUITEM "Зберегти &як...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Друк...\tCtrl+P", CMD_PRINT + MENUITEM "Параметри &сторінки...", CMD_PAGE_SETUP + MENUITEM "Налаштування &принтера...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "Ви&хід", CMD_EXIT + } +POPUP "&Редагування" { + MENUITEM "&Назад\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Ви&різати\tCtrl+X", CMD_CUT + MENUITEM "&Копіювати\tCtrl+C", CMD_COPY + MENUITEM "&Вставити\tCtrl+V", CMD_PASTE + MENUITEM "Ви&далити\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Виділити в&се\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Час/Дата\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&Перенос слів", CMD_WRAP + MENUITEM "&Шрифт...", CMD_FONT + } +POPUP "&Пошук" { + MENUITEM "&Знайти...\tCtrl+F", CMD_SEARCH + MENUITEM "Знайти &далі\tF3", CMD_SEARCH_NEXT + MENUITEM "За&мінити...\tCtrl+H", CMD_REPLACE + } +POPUP "&Довідка" { + MENUITEM "&Зміст", CMD_HELP_CONTENTS + MENUITEM "&Пошук...", CMD_HELP_SEARCH + MENUITEM "&Використання Довідки", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Про Notepad", CMD_HELP_ABOUT_NOTEPAD + } +} + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Параметри сторінки" +{ +LTEXT "&Верхній колонтитул:", 0x140, 10, 07, 40, 15 +EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "&Нижній колонтитул:", 0x142, 10, 24, 40, 15 +EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "&Поля (мм):", 0x144, 10, 43,160, 45 +LTEXT "&Ліве:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Верхнє:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Праве:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Нижнє:", 0x14E,100, 73, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Скасувати", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Довідка", IDHELP, 180, 39, 40, 15, WS_TABSTOP +} + +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Кодування:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + +STRINGTABLE DISCARDABLE +{ +STRING_PAGESETUP_HEADERVALUE, "&f" +STRING_PAGESETUP_FOOTERVALUE, "Сторінка &p" + +STRING_NOTEPAD, "Блокнот" +STRING_ERROR, "ПОМИЛКА" +STRING_WARNING, "УВАГА" +STRING_INFO, "Інформація" + +STRING_UNTITLED, "Без назви" + +STRING_ALL_FILES, "Всі файли (*.*)" +STRING_TEXT_FILES_TXT, "Текстові файли (*.txt)" + +STRING_TOOLARGE, "Файл '%s' завеликий для блокноту.\n\ +Використайте інший редактор." +STRING_NOTEXT, "Ви не ввели жодного тексту.\ +\nНапишіть щось і спробуйте знов" +STRING_DOESNOTEXIST, "Файл '%s' не існує.\n\n\ +Створити новий файл?" +STRING_NOTSAVED, "Файл '%s' було змінено.\n\n\ +Хочете зберегти зміни?" +STRING_NOTFOUND, "'%s' не знайдений." +STRING_OUT_OF_MEMORY, "Замало пам'яті для завершення цього \ +завдання.\nЗакрийте одну чи кілька програм щоб звільнити пам'ять." + +STRING_UNICODE_LE, "Юнікод (UTF-16)" +STRING_UNICODE_BE, "Юнікод (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Файл містить Юнікод-текст, який буде втрачено при збереженні файлу\n\ +в кодуванні %s .\n\ +Щоб не втратити цей текст, натисніть Скасувати, та\n\ +виберіть зі списку один з варіантів Юнікод.\n\ +Продовжити?" +}

1 0