October 2007 - Wine-commits

Bang Jun-young : ole32: Include wine/port.h for snprintf().
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 9f3b5ae89c67b4a810004431e27ba4a92a0d08ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f3b5ae89c67b4a810004431e… Author: Bang Jun-young <junyoung(a)mogua.com> Date: Wed Oct 17 17:08:17 2007 +0900 ole32: Include wine/port.h for snprintf(). --- dlls/ole32/ole32_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index 1d58d55..89878b7 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <stdio.h>

1 0

Marcus Meissner : oleaut32/tests: Insert the decimal seperator, if it is just 1 char.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 2e2720fe63be02532303edec7384644cc958165b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2720fe63be02532303edec7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 16 22:00:45 2007 +0200 oleaut32/tests: Insert the decimal seperator, if it is just 1 char. --- dlls/oleaut32/tests/vartest.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 511fe47..b409dd4 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1777,7 +1777,7 @@ static HRESULT (WINAPI *pVarAbs)(LPVARIANT,LPVARIANT); static void test_VarAbs(void) { - static const WCHAR szNum[] = {'-','1','.','1','\0' }; + static WCHAR szNum[] = {'-','1','.','1','\0' }; char buff[8]; HRESULT hres; VARIANT v, vDst, exp; @@ -1851,10 +1851,12 @@ static void test_VarAbs(void) ok(hres == S_OK && V_VT(&vDst) == VT_CY && V_CY(&vDst).int64 == 10000, "VarAbs(CY): expected 0x0 got 0x%X\n", hres); GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, sizeof(buff)/sizeof(char)); - if (buff[0] != '.' || buff[1]) + if (buff[1]) { trace("Skipping VarAbs(BSTR) as decimal separator is '%s'\n", buff); return; + } else { + szNum[2] = buff[0]; } V_VT(&v) = VT_BSTR; V_BSTR(&v) = (BSTR)szNum; @@ -3102,8 +3104,8 @@ static void test_Round( int line, VARIANT *arg, int deci, VARIANT *expected ) static void test_VarRound(void) { - static const WCHAR szNumMin[] = {'-','1','.','4','5','\0' }; - static const WCHAR szNum[] = {'1','.','4','5','\0' }; + static WCHAR szNumMin[] = {'-','1','.','4','5','\0' }; + static WCHAR szNum[] = {'1','.','4','5','\0' }; HRESULT hres; VARIANT v, exp, vDst; CY *pcy = &V_CY(&v); @@ -3139,13 +3141,16 @@ static void test_VarRound(void) * compare the first few digits. */ VARROUND(DATE,1.451,1,DATE,1.5); VARROUND(DATE,-1.45,1,DATE,-1.4); + + /* replace the decimal seperator */ GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, sizeof(buff)/sizeof(char)); - if (buff[0] != '.' || buff[1]) - skip("Skipping VarRound(BSTR) as decimal separator is '%s'\n", buff); - else - { + if (!buff[1]) { + szNumMin[2] = buff[0]; + szNum[1] = buff[0]; VARROUND(BSTR,(BSTR)szNumMin,1,R8,-1.40); if (0) { VARROUND(BSTR,(BSTR)szNum,1,R8,1.50); } + } else { + skip("Skipping VarRound(BSTR) as decimal separator is '%s'\n", buff); } VARROUND(R4,1.23456f,0,R4,1.0f);

1 0

Mikolaj Zalewski : ntdll: Add some tests for RtlIsTextUnicode.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 323f09b02241eaf32d982752b40a48459e14dafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=323f09b02241eaf32d982752b… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Tue Oct 16 17:35:02 2007 -0700 ntdll: Add some tests for RtlIsTextUnicode. --- dlls/ntdll/tests/rtlstr.c | 48 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 3d85aff..65b9b52 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -62,6 +62,7 @@ static NTSTATUS (WINAPI *pRtlUpperString)(STRING *, const STRING *); static NTSTATUS (WINAPI *pRtlValidateUnicodeString)(long, UNICODE_STRING *); static NTSTATUS (WINAPI *pRtlGUIDFromString)(const UNICODE_STRING*,GUID*); static NTSTATUS (WINAPI *pRtlStringFromGUID)(const GUID*, UNICODE_STRING*); +static BOOLEAN (WINAPI *pRtlIsTextUnicode)(LPVOID, INT, INT *); /*static VOID (WINAPI *pRtlFreeOemString)(PSTRING);*/ /*static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING);*/ @@ -82,7 +83,6 @@ static NTSTATUS (WINAPI *pRtlStringFromGUID)(const GUID*, UNICODE_STRING*); /*static NTSTATUS (WINAPI *pRtlUpcaseUnicodeToOemN)(LPSTR, DWORD, LPDWORD, LPCWSTR, DWORD);*/ /*static UINT (WINAPI *pRtlOemToUnicodeSize)(const STRING *);*/ /*static DWORD (WINAPI *pRtlAnsiStringToUnicodeSize)(const STRING *);*/ -/*static DWORD (WINAPI *pRtlIsTextUnicode)(LPVOID, DWORD, DWORD *);*/ static WCHAR* AtoW( const char* p ) @@ -130,6 +130,7 @@ static void InitFunctionPtrs(void) pRtlValidateUnicodeString = (void *)GetProcAddress(hntdll, "RtlValidateUnicodeString"); pRtlGUIDFromString = (void *)GetProcAddress(hntdll, "RtlGUIDFromString"); pRtlStringFromGUID = (void *)GetProcAddress(hntdll, "RtlStringFromGUID"); + pRtlIsTextUnicode = (void *)GetProcAddress(hntdll, "RtlIsTextUnicode"); } } @@ -1668,6 +1669,49 @@ static void test_RtlIntegerToChar(void) int2str[0].value, int2str[0].base, int2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION); } +static void test_RtlIsTextUnicode(void) +{ + char ascii[] = "A simple string"; + WCHAR unicode[] = {'A',' ','U','n','i','c','o','d','e',' ','s','t','r','i','n','g',0}; + WCHAR *be_unicode; + int flags; + int i; + + todo_wine ok(!pRtlIsTextUnicode(ascii, sizeof(ascii), NULL), "ASCII text detected as Unicode\n"); + + ok(pRtlIsTextUnicode(unicode, sizeof(unicode), NULL), "Text should be Unicode\n"); + ok(!pRtlIsTextUnicode(unicode, sizeof(unicode) - 1, NULL), "Text should be Unicode\n"); + + flags = IS_TEXT_UNICODE_UNICODE_MASK; + ok(pRtlIsTextUnicode(unicode, sizeof(unicode), &flags), "Text should not pass a Unicode\n"); + todo_wine ok(flags == 0x6, "Expected flags 0x6, obtained %d\n", flags); + + flags = IS_TEXT_UNICODE_REVERSE_MASK; + ok(!pRtlIsTextUnicode(unicode, sizeof(unicode), &flags), "Text should not pass reverse Unicode tests\n"); + ok(flags == 0, "Expected flags 0, obtained %d\n", flags); + + flags = IS_TEXT_UNICODE_ODD_LENGTH; + ok(!pRtlIsTextUnicode(unicode, sizeof(unicode) - 1, &flags), "Odd length test should have passed\n"); + ok(flags == IS_TEXT_UNICODE_ODD_LENGTH, "Expected flags 0x200, obtained %d\n", flags); + + be_unicode = HeapAlloc(GetProcessHeap(), 0, sizeof(unicode) + sizeof(WCHAR)); + be_unicode[0] = 0xfffe; + for (i = 0; i < sizeof(unicode)/sizeof(unicode[0]); i++) + { + be_unicode[i + 1] = (unicode[i] >> 8) | ((unicode[i] & 0xff) << 8); + } + ok(!pRtlIsTextUnicode(be_unicode, sizeof(unicode) + 2, NULL), "Reverse endian should not be Unicode\n"); + todo_wine ok(!pRtlIsTextUnicode(&be_unicode[1], sizeof(unicode), NULL), "Reverse endian should not be Unicode\n"); + + flags = IS_TEXT_UNICODE_REVERSE_MASK; + ok(!pRtlIsTextUnicode(&be_unicode[1], sizeof(unicode), &flags), "Reverse endian should be Unicode\n"); + todo_wine ok(flags == 0x70, "Expected flags 0x70, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_REVERSE_MASK; + ok(!pRtlIsTextUnicode(be_unicode, sizeof(unicode) + 2, &flags), "Reverse endian should be Unicode\n"); + todo_wine ok(flags == 0xc0, "Expected flags 0x70, obtained %x\n", flags); +} + static const WCHAR szGuid[] = { '{','0','1','0','2','0','3','0','4','-', '0','5','0','6','-' ,'0','7','0','8','-','0','9','0','A','-', '0','B','0','C','0','D','0','E','0','F','0','A','}','\0' }; @@ -1740,6 +1784,8 @@ START_TEST(rtlstr) test_RtlGUIDFromString(); if (pRtlStringFromGUID) test_RtlStringFromGUID(); + if (pRtlIsTextUnicode) + test_RtlIsTextUnicode(); if(0) { test_RtlUpcaseUnicodeChar();

1 0

Juan Lang : crypt32: Always set pPolicyStatus->dwError.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 7a0905128d9ba3b9f52483eccb16be71e53ccb34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0905128d9ba3b9f52483ecc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 16 08:39:53 2007 -0700 crypt32: Always set pPolicyStatus->dwError. --- dlls/crypt32/chain.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index a64d951..ff555bb 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1447,6 +1447,8 @@ static BOOL WINAPI verify_base_policy(LPCSTR szPolicyOID, /* For a cyclic chain, which element is a cycle isn't meaningful */ pPolicyStatus->lElementIndex = -1; } + else + pPolicyStatus->dwError = NO_ERROR; return TRUE; } @@ -1520,6 +1522,8 @@ static BOOL WINAPI verify_basic_constraints_policy(LPCSTR szPolicyOID, CERT_TRUST_INVALID_BASIC_CONSTRAINTS, &pPolicyStatus->lChainIndex, &pPolicyStatus->lElementIndex); } + else + pPolicyStatus->dwError = NO_ERROR; return TRUE; }

1 0

Andrey Turkin : imm32: ImmDisableIme is an alias to ImmDisableIME.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 57a2a8629ad4a4d6111a42bd9a7b98e25a02f427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a2a8629ad4a4d6111a42bd9… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Oct 16 21:25:21 2007 +0400 imm32: ImmDisableIme is an alias to ImmDisableIME. --- dlls/imm32/imm32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 5c10a5f..ee2ca0a 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -10,7 +10,7 @@ @ stdcall ImmDestroyIMCC(long) @ stub ImmDestroySoftKeyboard @ stdcall ImmDisableIME(long) -@ stub ImmDisableIme +@ stdcall ImmDisableIme(long) ImmDisableIME @ stub ImmEnumInputContext @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr) @ stdcall ImmEnumRegisterWordW(long ptr wstr long wstr ptr)

1 0

Marcus Meissner : msi: Marked two variables static.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 9684c9fee64111b7ba99db9885188b8bbe6d196c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9684c9fee64111b7ba99db988… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 16 21:26:13 2007 +0200 msi: Marked two variables static. --- dlls/msi/tests/install.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index f3de7e7..0c50156 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -40,8 +40,8 @@ static UINT (WINAPI *pMsiSourceListGetInfoA) static const char *msifile = "msitest.msi"; static const char *msifile2 = "winetest2.msi"; static const char *mstfile = "winetest.mst"; -CHAR CURR_DIR[MAX_PATH]; -CHAR PROG_FILES_DIR[MAX_PATH]; +static CHAR CURR_DIR[MAX_PATH]; +static CHAR PROG_FILES_DIR[MAX_PATH]; /* msi database data */

1 0

Marcus Meissner : msi: Common Files is translated to current language.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 6f865b949739bfe786bc05ae13a0d5494486a012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f865b949739bfe786bc05ae1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 16 21:41:39 2007 +0200 msi: Common Files is translated to current language. --- dlls/msi/tests/install.c | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 0c50156..b169886 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -42,6 +42,7 @@ static const char *msifile2 = "winetest2.msi"; static const char *mstfile = "winetest.mst"; static CHAR CURR_DIR[MAX_PATH]; static CHAR PROG_FILES_DIR[MAX_PATH]; +static CHAR COMMON_FILES_DIR[MAX_PATH]; /* msi database data */ @@ -995,10 +996,10 @@ static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) ok(res, "Failed to destroy the cabinet\n"); } -static BOOL get_program_files_dir(LPSTR buf) +static BOOL get_program_files_dir(LPSTR buf, LPSTR buf2) { HKEY hkey; - DWORD type = REG_EXPAND_SZ, size; + DWORD type, size; if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) @@ -1008,6 +1009,10 @@ static BOOL get_program_files_dir(LPSTR buf) if (RegQueryValueEx(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)buf, &size)) return FALSE; + size = MAX_PATH; + if (RegQueryValueEx(hkey, "CommonFilesDir", 0, &type, (LPBYTE)buf2, &size)) + return FALSE; + RegCloseKey(hkey); return TRUE; } @@ -1064,6 +1069,20 @@ static BOOL delete_pf(const CHAR *rel_path, BOOL is_file) return RemoveDirectoryA(path); } +static BOOL delete_cf(const CHAR *rel_path, BOOL is_file) +{ + CHAR path[MAX_PATH]; + + lstrcpyA(path, COMMON_FILES_DIR); + lstrcatA(path, "\\"); + lstrcatA(path, rel_path); + + if (is_file) + return DeleteFileA(path); + else + return RemoveDirectoryA(path); +} + static void delete_test_files(void) { DeleteFileA("msitest.msi"); @@ -1620,8 +1639,8 @@ static void test_setdirproperty(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("Common Files\\msitest\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("Common Files\\msitest", FALSE), "File not installed\n"); + ok(delete_cf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_cf("msitest", FALSE), "File not installed\n"); /* Delete the files in the temp (current) folder */ DeleteFile(msifile); @@ -2889,7 +2908,7 @@ START_TEST(install) if(len && (CURR_DIR[len - 1] == '\\')) CURR_DIR[len - 1] = 0; - get_program_files_dir(PROG_FILES_DIR); + get_program_files_dir(PROG_FILES_DIR, COMMON_FILES_DIR); test_MsiInstallProduct(); test_MsiSetComponentState();

1 0

Alexandre Julliard : ntdll: Fixed typo in RTL_GetKeyHandle ( spotted by Sean Chu).
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 89b4872805c129e615da1fe43135aceed4efead2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b4872805c129e615da1fe43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 12:37:44 2007 +0200 ntdll: Fixed typo in RTL_GetKeyHandle (spotted by Sean Chu). --- dlls/ntdll/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index d03925f..85297e3 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -1031,7 +1031,7 @@ static NTSTATUS RTL_GetKeyHandle(ULONG RelativeTo, PCWSTR Path, PHANDLE handle) static const WCHAR empty[] = {0}; static const WCHAR control[] = {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e', - '\\','S','y','s','t','e','m','\\','C','u','r','r','e','n','t',' ','C','o','n','t','r','o','l','S','e','t','\\', + '\\','S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\',0}; static const WCHAR devicemap[] = {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\',

1 0

Alexandre Julliard : winex11: Process all types of messages while moving/ resizing a window.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 7fa032d1a4d34b0cb41add32235d122b10bd2734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa032d1a4d34b0cb41add322… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 12:40:24 2007 +0200 winex11: Process all types of messages while moving/resizing a window. --- dlls/winex11.drv/winpos.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 71c05f5..02e6151 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -1353,7 +1353,7 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) { int dx = 0, dy = 0; - if (!GetMessageW( &msg, 0, WM_KEYFIRST, WM_MOUSELAST )) break; + if (!GetMessageW( &msg, 0, 0, 0 )) break; if (CallMsgFilterW( &msg, MSGF_SIZE )) continue; /* Exit on button-up, Return, or Esc */ @@ -1362,7 +1362,11 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) ((msg.wParam == VK_RETURN) || (msg.wParam == VK_ESCAPE)))) break; if ((msg.message != WM_KEYDOWN) && (msg.message != WM_MOUSEMOVE)) + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); continue; /* We are not interested in other messages */ + } pt = msg.pt;

1 0

Dmitry Timoshkov : wordpad: Refuse to load OLE compound storage files like Windows does.
by Alexandre Julliard 17 Oct '07

17 Oct '07

Module: wine Branch: master Commit: 6b8ee0e41f0333de11cf837b21fba580a641c0f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8ee0e41f0333de11cf837b2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 16 22:07:31 2007 +0900 wordpad: Refuse to load OLE compound storage files like Windows does. --- programs/wordpad/De.rc | 1 + programs/wordpad/En.rc | 1 + programs/wordpad/Fr.rc | 1 + programs/wordpad/Hu.rc | 1 + programs/wordpad/Ko.rc | 1 + programs/wordpad/Nl.rc | 1 + programs/wordpad/No.rc | 1 + programs/wordpad/Pl.rc | 1 + programs/wordpad/Ru.rc | 1 + programs/wordpad/Tr.rc | 1 + programs/wordpad/resource.h | 1 + programs/wordpad/wordpad.c | 9 +++++++++ 12 files changed, 20 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 1b333fd..7175fa7 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -229,4 +229,5 @@ BEGIN "which will cause all formatting to be lost. " \ "Are you sure that you wish to do this?" STRING_INVALID_NUMBER, "Invalid number format" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" END diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index e0724fb..a14ec7f 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -229,4 +229,5 @@ BEGIN "which will cause all formatting to be lost. " \ "Are you sure that you wish to do this?" STRING_INVALID_NUMBER, "Invalid number format" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" END diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index dcf80ec..2448c3c 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -229,4 +229,5 @@ BEGIN "which will cause all formatting to be lost. " \ "Are you sure that you wish to do this?" STRING_INVALID_NUMBER, "Invalid number format" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" END diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index feca301..7b72a7f 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -229,4 +229,5 @@ BEGIN "which will cause all formatting to be lost. " \ "Are you sure that you wish to do this?" STRING_INVALID_NUMBER, "Invalid number format" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" END diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 7ec919e..800f2cf 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -223,4 +223,5 @@ BEGIN "�̰�� Ư�� ٹ�� Դϴ�. " \ "�� ϱ⸦ ��մϱ�?" STRING_INVALID_NUMBER, "�ùٸ�� " + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" END diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index d6c5346..04042d8 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -229,4 +229,5 @@ BEGIN "which will cause all formatting to be lost. " \ "Are you sure that you wish to do this?" STRING_INVALID_NUMBER, "Invalid number format" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" END diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 3bebdf9..0c203ed 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -229,4 +229,5 @@ BEGIN "vil f�re til at all formatering g�r tapt. Er du " \ "sikker p� at du vil fortsette?" STRING_INVALID_NUMBER, "Ugyldig tallformat" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" END diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 3b05326..3ed7e81 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -230,4 +230,5 @@ BEGIN "which will cause all formatting to be lost. " \ "Are you sure that you wish to do this?" STRING_INVALID_NUMBER, "Invalid number format" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" END diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 17828cc..3eaf438 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -228,4 +228,5 @@ BEGIN "which will cause all formatting to be lost. " \ "Are you sure that you wish to do this?" STRING_INVALID_NUMBER, "Invalid number format" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" END diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index 65cb31f..b3463f0 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -232,4 +232,5 @@ BEGIN "which will cause all formatting to be lost. " \ "Are you sure that you wish to do this?" STRING_INVALID_NUMBER, "Invalid number format" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" END diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index 2c2cc98..130eb94 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -180,3 +180,4 @@ #define STRING_LOAD_RICHED_FAILED 1703 #define STRING_SAVE_LOSEFORMATTING 1704 #define STRING_INVALID_NUMBER 1705 +#define STRING_OLE_STORAGE_NOT_SUPPORTED 1706 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 5e1d0dc..a117a75 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1092,8 +1092,17 @@ static void DoOpenFile(LPCWSTR szOpenFileName) } else if(readOut >= 5) { static const char header[] = "{\\rtf"; + static const BYTE STG_magic[] = { 0xd0,0xcf,0x11,0xe0 }; + if(!memcmp(header, fileStart, 5)) format = SF_RTF; + else if (!memcmp(STG_magic, fileStart, sizeof(STG_magic))) + { + CloseHandle(hFile); + MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_OLE_STORAGE_NOT_SUPPORTED), wszAppTitle, + MB_OK | MB_ICONEXCLAMATION); + return; + } } es.dwCookie = (DWORD_PTR)hFile;

1 0