Author: dchapyshev Date: Thu May 29 09:30:26 2008 New Revision: 33756
URL: http://svn.reactos.org/svn/reactos?rev=33756&view=rev Log: - Add Russian translation - Fixed parameters functions - Add debug functions - Add stubs for some functions
Added: trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc (with props) Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc trunk/reactos/dll/win32/shimgvw/shimgvw.c trunk/reactos/dll/win32/shimgvw/shimgvw.spec
Added: trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/ru-R... ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc [iso-8859-1] Thu May 29 09:30:26 2008 @@ -1,0 +1,17 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_APPTITLE "Ïðîãðàììà ïðîñìîòðà èçîáðàæåíèé è ôàêñîâ" + IDS_SETASDESKBG "Óñòàíîâèòü êàê ôîí ðàáî÷åãî ñòîëà" + + /* Tooltips */ + IDS_TOOLTIP_NEXT_PIC "Ñëåäóþùåå èçîáðàæåíèå" + IDS_TOOLTIP_PREV_PIC "Ïðåäûäóùåå èçîáðàæåíèå" + IDS_TOOLTIP_ZOOM_IN "Óâåëè÷èòü (+)" + IDS_TOOLTIP_ZOOM_OUT "Óìåíüøèòü (-)" + IDS_TOOLTIP_ROT_CLOCKW "Ïîâåðíóòü ïî ÷àñîâîé ñòðåëêå (Ctrl+K)" + IDS_TOOLTIP_ROT_COUNCW "Ïîâåðíóòü ïðîòèâ ÷àñîâîé ñòðåëêè (Ctrl+L)" + IDS_TOOLTIP_PRINT "Ïå÷àòü (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Ñîõðàíèòü êàê... (Ctrl+S)" +END
Propchange: trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?r... ============================================================================== --- trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] Thu May 29 09:30:26 2008 @@ -2,3 +2,4 @@ #include "resource.h"
#include "lang/en-US.rc" +#include "lang/ru-RU.rc"
Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.c... ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Thu May 29 09:30:26 2008 @@ -17,6 +17,7 @@ #include <commctrl.h> #include <gdiplus.h> #include <tchar.h> +#include <debug.h>
#include "shimgvw.h"
@@ -55,12 +56,34 @@ HDC hdc;
if (GetFileAttributesW(szOpenFileName) == 0xFFFFFFFF) + { + DPRINT1("File %s not found!\n", szOpenFileName); return; + }
hdc = BeginPaint(hwnd, &ps); + if (!hdc) + { + DPRINT1("BeginPaint() failed\n"); + return; + }
GdipCreateFromHDC(hdc, &graphics); + if (!graphics) + { + DPRINT1("GdipCreateFromHDC() failed\n"); + DeleteDC(hdc); + return; + } + GdipLoadImageFromFile(szOpenFileName, &image); + if (!image) + { + DPRINT1("GdipLoadImageFromFile() failed\n"); + DeleteDC(hdc); + return; + } + GdipGetImageWidth(image, &uImgWidth); GdipGetImageHeight(image, &uImgHeight);
@@ -128,9 +151,7 @@ } }
- //TCHAR szBuf[MAX_PATH]; - //wsprintf(szBuf, _T("x = %d\ny = %d\nWidth = %d\nHeight = %d\n\nrect.right = %d\nrect.bottom = %d\n\nuImgWidth = %d\nuImgHeight = %d"), x, y, width, height, rect.right, rect.bottom, uImgWidth, uImgHeight); - //MessageBox(0, szBuf, NULL, MB_OK); + DPRINT1("x = %d\ny = %d\nWidth = %d\nHeight = %d\n\nrect.right = %d\nrect.bottom = %d\n\nuImgWidth = %d\nuImgHeight = %d", x, y, width, height, rect.right, rect.bottom, uImgWidth, uImgHeight); GdipDrawImageRect(graphics, image, x, y, width, height); }
@@ -443,39 +464,51 @@ return -1; }
-LONG -CALLBACK -ImageView_FullscreenW(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) -{ - return ImageView_CreateWindow(hwnd, (LPWSTR)lParam1); -} - -LONG -CALLBACK -ImageView_Fullscreen(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +VOID +ImageView_FullscreenW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) +{ + ImageView_CreateWindow(hwnd, (LPWSTR)path); +} + +VOID +ImageView_Fullscreen(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) +{ + ImageView_CreateWindow(hwnd, (LPWSTR)path); +} + +VOID +ImageView_FullscreenA(HWND hwnd, HINSTANCE hInst, LPCSTR path, int nShow) { WCHAR szFile[MAX_PATH];
- if (MultiByteToWideChar(CP_ACP, 0, (char*)lParam1, strlen((char*)lParam1)+1, szFile, MAX_PATH)) - { - return ImageView_CreateWindow(hwnd, (LPWSTR)szFile); - } - - return -1; -} - -LONG -CALLBACK -ImageView_FullscreenA(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) -{ - WCHAR szFile[MAX_PATH]; - - if (MultiByteToWideChar(CP_ACP, 0, (char*)lParam1, strlen((char*)lParam1)+1, szFile, MAX_PATH)) - { - return ImageView_CreateWindow(hwnd, (LPWSTR)szFile); - } - - return -1; + if (MultiByteToWideChar(CP_ACP, 0, (char*)path, strlen((char*)path)+1, szFile, MAX_PATH)) + { + ImageView_CreateWindow(hwnd, (LPWSTR)szFile); + } +} + +VOID +ImageView_PrintTo(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) +{ + DPRINT("ImageView_PrintTo() not implemented\n"); +} + +VOID +ImageView_PrintToA(HWND hwnd, HINSTANCE hInst, LPCSTR path, int nShow) +{ + DPRINT("ImageView_PrintToA() not implemented\n"); +} + +VOID +ImageView_PrintToW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) +{ + DPRINT("ImageView_PrintToW() not implemented\n"); +} + +VOID +imageview_fullscreenW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) +{ + DPRINT("ImageView_fullscreenW() not implemented\n"); }
BOOL WINAPI
Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.s... ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.spec [iso-8859-1] Thu May 29 09:30:26 2008 @@ -1,11 +1,11 @@ @ stub ImageView_COMServer -@ stdcall ImageView_Fullscreen(ptr long ptr ptr) -@ stdcall ImageView_FullscreenA(ptr long ptr ptr) -@ stdcall ImageView_FullscreenW(ptr long ptr ptr) -@ stub ImageView_PrintTo -@ stub ImageView_PrintToA -@ stub ImageView_PrintToW -@ stub imageview_fullscreenW +@ stdcall ImageView_Fullscreen(ptr ptr wstr long) +@ stdcall ImageView_FullscreenA(ptr ptr str long) +@ stdcall ImageView_FullscreenW(ptr ptr wstr long) +@ stdcall ImageView_PrintTo(ptr ptr wstr long) +@ stdcall ImageView_PrintToA(ptr ptr str long) +@ stdcall ImageView_PrintToW(ptr ptr wstr long) +@ stdcall imageview_fullscreenW(ptr ptr wstr long) @ stub ConvertDIBSECTIONToThumbnail @ stub DllCanUnloadNow @ stub DllGetClassObject