November 2008 - Wine-commits

Maarten Lankhorst : quartz: Fix FilterGraph2_Connect to be thread-safe and not recurse infinitely.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 8699661e969fb966da937fcb4be2163dbcbe7327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8699661e969fb966da937fcb4… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Fri Nov 14 16:42:41 2008 +0100 quartz: Fix FilterGraph2_Connect to be thread-safe and not recurse infinitely. --- dlls/quartz/filtergraph.c | 40 ++++++++++++++++++++++++++++------------ 1 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7b773ef..c53771e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -204,6 +204,7 @@ typedef struct _IFilterGraphImpl { LONGLONG start_time; LONGLONG position; LONGLONG stop_position; + LONG recursioncount; } IFilterGraphImpl; static HRESULT WINAPI Filtergraph_QueryInterface(IFilterGraphImpl *This, @@ -898,9 +899,18 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IBaseFilter_Release(PinInfo.pFilter); } + EnterCriticalSection(&This->cs); + ++This->recursioncount; + if (This->recursioncount >= 5) + { + WARN("Recursion count has reached %d\n", This->recursioncount); + hr = VFW_E_CANNOT_CONNECT; + goto out; + } + hr = IPin_QueryDirection(ppinOut, &dir); if (FAILED(hr)) - return hr; + goto out; if (dir == PINDIR_INPUT) { @@ -913,42 +923,44 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, hr = CheckCircularConnection(This, ppinOut, ppinIn); if (FAILED(hr)) - return hr; + goto out; /* Try direct connection first */ hr = IPin_Connect(ppinOut, ppinIn, NULL); - if (SUCCEEDED(hr)) { - return S_OK; - } + if (SUCCEEDED(hr)) + goto out; + TRACE("Direct connection failed, trying to render using extra filters\n"); hr = IPin_QueryPinInfo(ppinIn, &PinInfo); if (FAILED(hr)) - return hr; + goto out; hr = IBaseFilter_GetClassID(PinInfo.pFilter, &FilterCLSID); IBaseFilter_Release(PinInfo.pFilter); if (FAILED(hr)) - return hr; + goto out; /* Find the appropriate transform filter than can transform the minor media type of output pin of the upstream * filter to the minor mediatype of input pin of the renderer */ hr = IPin_EnumMediaTypes(ppinOut, &penummt); - if (FAILED(hr)) { + if (FAILED(hr)) + { WARN("EnumMediaTypes (%x)\n", hr); - return hr; + goto out; } hr = IEnumMediaTypes_Next(penummt, 1, &mt, &nbmt); if (FAILED(hr)) { WARN("IEnumMediaTypes_Next (%x)\n", hr); - return hr; + goto out; } if (!nbmt) { WARN("No media type found!\n"); - return S_OK; + hr = VFW_E_INVALIDMEDIATYPE; + goto out; } TRACE("MajorType %s\n", debugstr_guid(&mt->majortype)); TRACE("SubType %s\n", debugstr_guid(&mt->subtype)); @@ -959,7 +971,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); if (FAILED(hr)) { WARN("Unable to enum filters (%x)\n", hr); - return hr; + goto out; } hr = VFW_E_CANNOT_RENDER; @@ -1086,6 +1098,9 @@ error: IEnumMediaTypes_Release(penummt); DeleteMediaType(mt); +out: + --This->recursioncount; + LeaveCriticalSection(&This->cs); TRACE("--> %08x\n", hr); return SUCCEEDED(hr) ? S_OK : hr; } @@ -5432,6 +5447,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->start_time = fimpl->position = 0; fimpl->stop_position = -1; fimpl->punkFilterMapper2 = NULL; + fimpl->recursioncount = 0; /* create Filtermapper aggregated. */ hr = CoCreateInstance(&CLSID_FilterMapper2, pUnkOuter ? pUnkOuter : (IUnknown*)&fimpl->IInner_vtbl, CLSCTX_INPROC_SERVER,

1 0

Juan Lang : crypt32: Add tests for encoding/ decoding CERT_POLICY_QUALIFIER_USER_NOTICE.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 94de420810088fc6c94834e6dda46d42446a4e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=94de420810088fc6c94834e6d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 13 13:45:07 2008 -0800 crypt32: Add tests for encoding/decoding CERT_POLICY_QUALIFIER_USER_NOTICE. --- dlls/crypt32/tests/encode.c | 127 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 127 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9a0eff5..74c329d 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7037,6 +7037,131 @@ static void test_decodeNameConstraints(DWORD dwEncoding) } } +static WCHAR noticeText[] = { 'T','h','i','s',' ','i','s',' ','a',' ', + 'n','o','t','i','c','e',0 }; +static const BYTE noticeWithDisplayText[] = { + 0x30,0x22,0x1e,0x20,0x00,0x54,0x00,0x68,0x00,0x69,0x00,0x73,0x00,0x20,0x00, + 0x69,0x00,0x73,0x00,0x20,0x00,0x61,0x00,0x20,0x00,0x6e,0x00,0x6f,0x00,0x74, + 0x00,0x69,0x00,0x63,0x00,0x65 +}; +static char org[] = "Wine"; +static int noticeNumbers[] = { 2,3 }; +static BYTE noticeWithReference[] = { + 0x30,0x32,0x30,0x0e,0x16,0x04,0x57,0x69,0x6e,0x65,0x30,0x06,0x02,0x01,0x02, + 0x02,0x01,0x03,0x1e,0x20,0x00,0x54,0x00,0x68,0x00,0x69,0x00,0x73,0x00,0x20, + 0x00,0x69,0x00,0x73,0x00,0x20,0x00,0x61,0x00,0x20,0x00,0x6e,0x00,0x6f,0x00, + 0x74,0x00,0x69,0x00,0x63,0x00,0x65 +}; + +static void test_encodePolicyQualifierUserNotice(DWORD dwEncoding) +{ + BOOL ret; + LPBYTE buf; + DWORD size; + CERT_POLICY_QUALIFIER_USER_NOTICE notice; + CERT_POLICY_QUALIFIER_NOTICE_REFERENCE reference; + + memset(&notice, 0, sizeof(notice)); + ret = pCryptEncodeObjectEx(dwEncoding, + X509_PKIX_POLICY_QUALIFIER_USERNOTICE, &notice, CRYPT_ENCODE_ALLOC_FLAG, + NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(sizeof(emptySequence) == size, "unexpected size %d\n", size); + ok(!memcmp(buf, emptySequence, size), "unexpected value\n"); + LocalFree(buf); + } + notice.pszDisplayText = noticeText; + ret = pCryptEncodeObjectEx(dwEncoding, + X509_PKIX_POLICY_QUALIFIER_USERNOTICE, &notice, CRYPT_ENCODE_ALLOC_FLAG, + NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(sizeof(noticeWithDisplayText) == size, "unexpected size %d\n", size); + ok(!memcmp(buf, noticeWithDisplayText, size), "unexpected value\n"); + LocalFree(buf); + } + reference.pszOrganization = org; + reference.cNoticeNumbers = 2; + reference.rgNoticeNumbers = noticeNumbers; + notice.pNoticeReference = &reference; + ret = pCryptEncodeObjectEx(dwEncoding, + X509_PKIX_POLICY_QUALIFIER_USERNOTICE, &notice, CRYPT_ENCODE_ALLOC_FLAG, + NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(sizeof(noticeWithReference) == size, "unexpected size %d\n", size); + ok(!memcmp(buf, noticeWithReference, size), "unexpected value\n"); + LocalFree(buf); + } +} + +static void test_decodePolicyQualifierUserNotice(DWORD dwEncoding) +{ + BOOL ret; + CERT_POLICY_QUALIFIER_USER_NOTICE *notice; + DWORD size; + + ret = pCryptDecodeObjectEx(dwEncoding, + X509_PKIX_POLICY_QUALIFIER_USERNOTICE, + emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, + &notice, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(notice->pszDisplayText == NULL, "unexpected display text\n"); + ok(notice->pNoticeReference == NULL, "unexpected notice reference\n"); + LocalFree(notice); + } + ret = pCryptDecodeObjectEx(dwEncoding, + X509_PKIX_POLICY_QUALIFIER_USERNOTICE, + noticeWithDisplayText, sizeof(noticeWithDisplayText), + CRYPT_DECODE_ALLOC_FLAG, NULL, &notice, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(!lstrcmpW(notice->pszDisplayText, noticeText), + "unexpected display text\n"); + ok(notice->pNoticeReference == NULL, "unexpected notice reference\n"); + LocalFree(notice); + } + ret = pCryptDecodeObjectEx(dwEncoding, + X509_PKIX_POLICY_QUALIFIER_USERNOTICE, + noticeWithReference, sizeof(noticeWithReference), + CRYPT_DECODE_ALLOC_FLAG, NULL, &notice, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(!lstrcmpW(notice->pszDisplayText, noticeText), + "unexpected display text\n"); + ok(notice->pNoticeReference != NULL, "expected a notice reference\n"); + if (notice->pNoticeReference) + { + ok(!strcmp(notice->pNoticeReference->pszOrganization, org), + "unexpected organization\n"); + ok(notice->pNoticeReference->cNoticeNumbers == 2, + "expected 2 notice numbers, got %d\n", + notice->pNoticeReference->cNoticeNumbers); + ok(notice->pNoticeReference->rgNoticeNumbers[0] == noticeNumbers[0], + "unexpected notice number %d\n", + notice->pNoticeReference->rgNoticeNumbers[0]); + ok(notice->pNoticeReference->rgNoticeNumbers[1] == noticeNumbers[1], + "unexpected notice number %d\n", + notice->pNoticeReference->rgNoticeNumbers[1]); + } + LocalFree(notice); + } +} + /* Free *pInfo with HeapFree */ static void testExportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO *pInfo) { @@ -7303,6 +7428,8 @@ START_TEST(encode) test_decodeCMSSignerInfo(encodings[i]); test_encodeNameConstraints(encodings[i]); test_decodeNameConstraints(encodings[i]); + test_encodePolicyQualifierUserNotice(encodings[i]); + test_decodePolicyQualifierUserNotice(encodings[i]); } testPortPublicKeyInfo(); }

1 0

Paul Vriens : msi/tests: Skip tests on win9x by checking functionality instead of registry keys.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 3c533397e94e2e48fc201587b588ed373854178d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c533397e94e2e48fc201587b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Nov 16 14:35:50 2008 +0100 msi/tests: Skip tests on win9x by checking functionality instead of registry keys. --- dlls/msi/tests/install.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index bc98840..56d36e1 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -44,6 +44,8 @@ static HMODULE hsrclient = 0; static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); static BOOL (WINAPI *pSRSetRestorePointA)(RESTOREPOINTINFOA*, STATEMGRSTATUS*); +static BOOL on_win9x = FALSE; + static const char *msifile = "msitest.msi"; static const char *msifile2 = "winetest2.msi"; static const char *mstfile = "winetest.mst"; @@ -1331,6 +1333,19 @@ static void init_functionpointers(void) #undef GET_PROC } +static BOOL check_win9x(void) +{ + SC_HANDLE scm; + + scm = OpenSCManager(NULL, NULL, GENERIC_ALL); + if (!scm && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + return TRUE; + + CloseServiceHandle(scm); + + return FALSE; +} + static void get_user_sid(LPSTR *usersid) { HANDLE token; @@ -1698,15 +1713,12 @@ static void test_MsiInstallProduct(void) LONG res; HKEY hkey; DWORD num, size, type; - SC_HANDLE scm; - scm = OpenSCManager(NULL, NULL, GENERIC_ALL); - if (!scm && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + if (on_win9x) { - skip("Services are not implemented, we are most likely on win9x\n"); + win_skip("Services are not implemented on Win9x and WinMe\n"); return; } - CloseServiceHandle(scm); create_test_files(); create_database(msifile, tables, sizeof(tables) / sizeof(msi_table)); @@ -5185,16 +5197,11 @@ static void test_MsiConfigureProductEx(void) CHAR keypath[MAX_PATH * 2]; CHAR localpack[MAX_PATH]; - /* skip these tests if we are on Win9x or WinMe */ - lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\"); - lstrcatA(keypath, "Installer\\UserData"); - res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &props); - if (res == ERROR_FILE_NOT_FOUND) + if (on_win9x) { win_skip("Different registry keys on Win9x and WinMe\n"); return; } - RegCloseKey(props); CreateDirectoryA("msitest", NULL); create_file("msitest\\hydrogen", 500); @@ -5613,6 +5620,8 @@ START_TEST(install) init_functionpointers(); + on_win9x = check_win9x(); + GetCurrentDirectoryA(MAX_PATH, prev_path); GetTempPath(MAX_PATH, temp_path); SetCurrentDirectoryA(temp_path);

1 0

Marcus Meissner : shdocvw: Fixed buffer size to GetPrivateProfileStringW.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: bc295ef8b4978e384a57e33c731cfc09e0cc706e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc295ef8b4978e384a57e33c7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 16 10:32:37 2008 +0100 shdocvw: Fixed buffer size to GetPrivateProfileStringW. --- dlls/shdocvw/intshcut.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index 01da03e..fd5e5bf 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -329,7 +329,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam { DWORD len = 128; DWORD r; - WCHAR *url = CoTaskMemAlloc(len); + WCHAR *url = CoTaskMemAlloc(len*sizeof(WCHAR)); if (url != NULL) { r = GetPrivateProfileStringW(str_header, str_URL, NULL, url, len, pszFileName);

1 0

Dylan Smith : user32: Added message spy string for IME Status messages.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: fe1f3c52930a611e1405233e30521a5233287dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1f3c52930a611e1405233e3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Nov 15 21:01:44 2008 -0500 user32: Added message spy string for IME Status messages. --- dlls/user32/spy.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 9fbd74b..2aed057 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -236,7 +236,9 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = "EM_GETLIMITTEXT", /* 0x00d5 */ "EM_POSFROMCHAR", /* 0x00d6 */ "EM_CHARFROMPOS", /* 0x00d7 */ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "EM_SETIMESTATUS", /* 0x00d8 */ + "EM_GETIMESTATUS", /* 0x00d9 */ + NULL, NULL, NULL, NULL, NULL, NULL, /* 0x00E0 - Win32 Scrollbars */ "SBM_SETPOS", /* 0x00e0 */

1 0

Dylan Smith : richedit: Update strings and comments regarding IME Status messages.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: ea9f343c334eeccc90680c257cf67afd72b43769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9f343c334eeccc90680c257… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Nov 15 21:01:48 2008 -0500 richedit: Update strings and comments regarding IME Status messages. --- dlls/riched20/editor.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2e44663..6ee5fae 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -99,6 +99,7 @@ - EM_SETFONTSIZE - EM_SETIMECOLOR 1.0asian - EM_SETIMEOPTIONS 1.0asian + - EM_SETIMESTATUS - EM_SETLANGOPTIONS 2.0 - EM_SETLIMITTEXT - EM_SETMARGINS @@ -2507,7 +2508,9 @@ static const char * const edit_messages[] = { "EM_GETMARGINS", "EM_GETLIMITTEXT", "EM_POSFROMCHAR", - "EM_CHARFROMPOS" + "EM_CHARFROMPOS", + "EM_SETIMESTATUS", + "EM_GETIMESTATUS" }; static const char * const richedit_messages[] = { @@ -2623,7 +2626,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, UNSUPPORTED_MSG(EM_GETBIDIOPTIONS) UNSUPPORTED_MSG(EM_GETEDITSTYLE) UNSUPPORTED_MSG(EM_GETIMECOMPMODE) - /* UNSUPPORTED_MSG(EM_GETIMESTATUS) missing in Wine headers */ + UNSUPPORTED_MSG(EM_GETIMESTATUS) + UNSUPPORTED_MSG(EM_SETIMESTATUS) UNSUPPORTED_MSG(EM_GETLANGOPTIONS) /* UNSUPPORTED_MSG(EM_GETOLEINTERFACE) separate stub */ UNSUPPORTED_MSG(EM_GETREDONAME)

1 0

Dylan Smith : include: Fixed a typo for ITextHost:: TxSetCaretPos declaration.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 5a30418a81b91c45636bd59276eda3f57455c7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a30418a81b91c45636bd5927… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Nov 15 22:06:56 2008 -0500 include: Fixed a typo for ITextHost::TxSetCaretPos declaration. --- include/textserv.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/textserv.h b/include/textserv.h index 1c262ac..977b742 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -252,7 +252,7 @@ DECLARE_INTERFACE_(ITextHost,IUnknown) STDMETHOD_(BOOL,TxShowCaret)( THIS_ BOOL fShow) PURE; - STDMETHOD_(BOOL,TxSetCarentPos)( THIS_ + STDMETHOD_(BOOL,TxSetCaretPos)( THIS_ INT x, INT y) PURE;

1 0

Hirofumi Katayama : wordpad: Update resources for date and time dialog.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 1b8f4b9e483b7321432420a658630603fd6dac6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8f4b9e483b7321432420a65… Author: Hirofumi Katayama <katayama.hirofumi.mz(a)gmail.com> Date: Sat Nov 15 09:10:57 2008 +0900 wordpad: Update resources for date and time dialog. --- programs/wordpad/Da.rc | 2 +- programs/wordpad/De.rc | 2 +- programs/wordpad/Fr.rc | 2 +- programs/wordpad/Hu.rc | 2 +- programs/wordpad/Ko.rc | 2 +- programs/wordpad/Nl.rc | 2 +- programs/wordpad/No.rc | 2 +- programs/wordpad/Pl.rc | 2 +- programs/wordpad/Pt.rc | 2 +- programs/wordpad/Ru.rc | 2 +- programs/wordpad/Si.rc | 2 +- programs/wordpad/Tr.rc | 2 +- programs/wordpad/Zh.rc | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/wordpad/Da.rc b/programs/wordpad/Da.rc index 0ae3e29..c9f132c 100644 --- a/programs/wordpad/Da.rc +++ b/programs/wordpad/Da.rc @@ -110,7 +110,7 @@ CAPTION "Dato og tid" FONT 10, "MS Sans Serif" BEGIN LTEXT "Tilg�ngelige formater",0,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Annuller",IDCANCEL,87,26,40,12 END diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 69244f6..b2f8e61 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -112,7 +112,7 @@ CAPTION "Datum und Uhrzeit" FONT 10, "MS Sans Serif" BEGIN LTEXT "Verfügbare Formate",0,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "A&bbrechen",IDCANCEL,87,26,40,12 END diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index c423a7f..1345586 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -110,7 +110,7 @@ CAPTION "Date et heure" FONT 10, "MS Sans Serif" BEGIN LTEXT "Formats disponibles",0,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Annuler",IDCANCEL,87,26,40,12 END diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 78f069b..c6d8df9 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -110,7 +110,7 @@ CAPTION "Date and time" FONT 10, "MS Sans Serif" BEGIN LTEXT "Available formats",0,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 END diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index ac246eb..c0a9ffb 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -112,7 +112,7 @@ CAPTION " FONT 10, "MS Shell Dlg" BEGIN LTEXT "�� ",0,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "Ȯ��(&O)",IDOK,87,12,40,12 PUSHBUTTON "��(&C)",IDCANCEL,87,26,40,12 END diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index 0a53658..7186861 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -111,7 +111,7 @@ CAPTION "Datum en tijd" FONT 10, "MS Sans Serif" BEGIN LTEXT "Beschikbare formaten",0,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Annuleren",IDCANCEL,87,26,40,12 END diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index b162926..66a6701 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -110,7 +110,7 @@ CAPTION "Dato og klokkeslett" FONT 10, "MS Sans Serif" BEGIN LTEXT "Tilgjengelige formater",0,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Avbryt",IDCANCEL,87,26,40,12 END diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 7c6cdaa..3f430c6 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -111,7 +111,7 @@ CAPTION "Data i godzina" FONT 10, "MS Sans Serif" BEGIN LTEXT "Dost�pne formaty",0,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Anuluj",IDCANCEL,87,26,40,12 END diff --git a/programs/wordpad/Pt.rc b/programs/wordpad/Pt.rc index ce15326..f539a44 100644 --- a/programs/wordpad/Pt.rc +++ b/programs/wordpad/Pt.rc @@ -112,7 +112,7 @@ CAPTION "Data e hora" FONT 10, "MS Sans Serif" BEGIN LTEXT "Formatos Dispon�veis",0,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Cancelar",IDCANCEL,87,26,40,12 END diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 7628554..4504ac3 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -110,7 +110,7 @@ CAPTION " FONT 10, "MS Sans Serif" BEGIN LTEXT "�� ",0,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&��",IDOK,87,12,40,12 PUSHBUTTON "�&��",IDCANCEL,87,26,40,12 END diff --git a/programs/wordpad/Si.rc b/programs/wordpad/Si.rc index 448541e..23a7294 100644 --- a/programs/wordpad/Si.rc +++ b/programs/wordpad/Si.rc @@ -112,7 +112,7 @@ CAPTION "Datum in čas" FONT 10, "MS Sans Serif" BEGIN LTEXT "Razpoložljive oblike",0,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&V redu",IDOK,87,12,40,12 PUSHBUTTON "&Prekliči",IDCANCEL,87,26,40,12 END diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index f03b68d..d5475e5 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -112,7 +112,7 @@ CAPTION "Date and time" FONT 10, "MS Sans Serif" BEGIN LTEXT "Available formats",0,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 END diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc index 3b87316..3380447 100644 --- a/programs/wordpad/Zh.rc +++ b/programs/wordpad/Zh.rc @@ -115,7 +115,7 @@ CAPTION "日期和时间" FONT 9, "MS Song" BEGIN LTEXT "可用格式",0,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "确定(&O)",IDOK,87,12,40,12 PUSHBUTTON "取消(&C)",IDCANCEL,87,26,40,12 END

1 0

Andrew Talbot : widl: Remove superfluous semicolons.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 08c6f507b8e805a28ba691840351117bd98aa23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c6f507b8e805a28ba691840… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 15 07:53:38 2008 +0000 widl: Remove superfluous semicolons. --- tools/widl/proxy.c | 2 +- tools/widl/server.c | 2 +- tools/widl/typegen.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 6f1d0ee..3d0a766 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -113,7 +113,7 @@ static void init_proxy(const statement_list_t *stmts) print_proxy( "\n"); print_proxy( "struct __proxy_frame\n"); print_proxy( "{\n"); - print_proxy( " __DECL_EXCEPTION_FRAME;\n"); + print_proxy( " __DECL_EXCEPTION_FRAME\n"); print_proxy( " MIDL_STUB_MESSAGE _StubMsg;\n"); print_proxy( " void *This;\n"); print_proxy( "};\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index db2d6c2..04e268b 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -383,7 +383,7 @@ static void init_server(void) print_server("\n"); print_server("struct __server_frame\n"); print_server("{\n"); - print_server(" __DECL_EXCEPTION_FRAME;\n"); + print_server(" __DECL_EXCEPTION_FRAME\n"); print_server(" MIDL_STUB_MESSAGE _StubMsg;\n"); print_server("};\n"); print_server("\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 775bef6..fcb141e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3405,7 +3405,7 @@ void write_exceptions( FILE *file ) fprintf( file, " unsigned char finally_level;\n"); fprintf( file, "\n"); fprintf( file, "struct __exception_frame\n{\n"); - fprintf( file, " __DECL_EXCEPTION_FRAME;\n"); + fprintf( file, " __DECL_EXCEPTION_FRAME\n"); fprintf( file, "};\n"); fprintf( file, "\n"); fprintf( file, "static DWORD __widl_exception_handler( EXCEPTION_RECORD *record,\n");

1 0

Dylan Smith : richedit: Removed comment in header for non-existent wintest. c.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: f9b31fc964a4c0bd3f020c05d017460f9c61bb2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b31fc964a4c0bd3f020c05d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Nov 15 21:01:36 2008 -0500 richedit: Removed comment in header for non-existent wintest.c. --- dlls/riched20/editor.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 2c68378..d786e0a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -268,8 +268,6 @@ void ME_GetOLEObjectSize(ME_Context *c, ME_Run *run, SIZE *pSize); void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src); void ME_DeleteReObject(REOBJECT* reo); -/* wintest.c */ - /* editor.c */ ME_TextEditor *ME_MakeEditor(HWND hWnd); void ME_DestroyEditor(ME_TextEditor *editor);

1 0