September 2010 - Wine-Commits

Luca Bennati : notepad: Update Italian translation.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: 22d15e6075be5ebfdbd6d2d1b878e29e62d32242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d15e6075be5ebfdbd6d2d1b… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 23 12:08:33 2010 +0200 notepad: Update Italian translation. --- programs/notepad/It.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/notepad/It.rc b/programs/notepad/It.rc index 8c6f9e7..a113a60 100644 --- a/programs/notepad/It.rc +++ b/programs/notepad/It.rc @@ -110,7 +110,7 @@ END STRINGTABLE { STRING_PAGESETUP_HEADERVALUE, "&f" -STRING_PAGESETUP_FOOTERVALUE, "Page &p" +STRING_PAGESETUP_FOOTERVALUE, "Pagina &p" STRING_NOTEPAD, "Blocco Note" STRING_ERROR, "ERRORE" @@ -122,7 +122,7 @@ STRING_UNTITLED, "(senza nome)" STRING_ALL_FILES, "Tutti i file (*.*)" STRING_TEXT_FILES_TXT, "File di testo (*.txt)" -STRING_TOOLARGE, "Il file '%s' è troppo grande per il blocco note.\n \ +STRING_TOOLARGE, "Il file '%s' è troppo grande per il Blocco Note.\n \ Per favore usare un altro editor." STRING_NOTEXT, "Non è stato inserito alcun testo. \ \nPer favore digitare qualcosa e riprovare" @@ -142,6 +142,6 @@ STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ Questo file contiene caratteri Unicode che andranno persi se\n\ salvi questo file nella codifica %s.\n\ Per mantenere questi caratteri, clicca Annulla e scegli\n\ -una delle opzioni Unicode nel menu a tendina Codifica.\n\ +una delle opzioni Unicode nel menù a tendina Codifica.\n\ Continuare?" }

1 0

Henri Verbeet : wininet: Check URLCache_LocalFileNameToPathW() return values in CreateUrlCacheEntryW().
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: 7782e8188795ddc4cbdb51d81e1d5aa7200f6a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7782e8188795ddc4cbdb51d81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 23 11:48:04 2010 +0200 wininet: Check URLCache_LocalFileNameToPathW() return values in CreateUrlCacheEntryW(). It would be unfortunate if a long file name would cause us to open a file based on mostly uninitialized data and write the contents of some random webpage into it. --- dlls/wininet/urlcache.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 2fe488a..a220e33 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2330,7 +2330,13 @@ BOOL WINAPI CreateUrlCacheEntryW( CacheDir = (BYTE)(rand() % pHeader->DirectoryCount); lBufferSize = MAX_PATH * sizeof(WCHAR); - URLCache_LocalFileNameToPathW(pContainer, pHeader, szFile, CacheDir, lpszFileName, &lBufferSize); + if (!URLCache_LocalFileNameToPathW(pContainer, pHeader, szFile, CacheDir, lpszFileName, &lBufferSize)) + { + WARN("Failed to get full path for filename %s, needed %u bytes.\n", + debugstr_a(szFile), lBufferSize); + URLCacheContainer_UnlockIndex(pContainer, pHeader); + return FALSE; + } URLCacheContainer_UnlockIndex(pContainer, pHeader);

1 0

Peter Oberndorfer : kernel32: Fix WaitForMultipleObjectsEx for handles with lower 2 bits set.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: f30b7089162f4eee3b2e39bc02f2df9259136fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30b7089162f4eee3b2e39bc0… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Wed Sep 22 19:53:16 2010 +0200 kernel32: Fix WaitForMultipleObjectsEx for handles with lower 2 bits set. --- dlls/kernel32/sync.c | 7 ++----- dlls/kernel32/tests/sync.c | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index eac08c8..b65b626 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -180,11 +180,8 @@ DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, */ if (is_console_handle(hloc[i])) { - if (!VerifyConsoleIoHandle(hloc[i])) - { - return FALSE; - } - hloc[i] = GetConsoleInputWaitHandle(); + if (VerifyConsoleIoHandle(hloc[i])) + hloc[i] = GetConsoleInputWaitHandle(); } } diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 095c935..30811b5 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -978,7 +978,7 @@ static void test_WaitForSingleObject(void) SetLastError(0xdeadbeef); ret = WaitForSingleObject(modify_handle(invalid, 3), 0); - todo_wine ok(ret == WAIT_FAILED, "expected WAIT_FAILED, got %d\n", ret); + ok(ret == WAIT_FAILED, "expected WAIT_FAILED, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); /* valid handle with different values for lower 2 bits */ @@ -999,7 +999,7 @@ static void test_WaitForSingleObject(void) SetLastError(0xdeadbeef); ret = WaitForSingleObject(modify_handle(nonsignaled, 3), 0); - todo_wine ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %d\n", ret); + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %d\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); /* valid handle with different values for lower 2 bits */

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to is_invalid_op().
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: 478a0aae389dca74b2378a3f71dc2a9d9ad09c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=478a0aae389dca74b2378a3f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 23 11:48:02 2010 +0200 wined3d: Pass a wined3d_state structure to is_invalid_op(). Instead of an entire device. --- dlls/wined3d/nvidia_texture_shader.c | 3 ++- dlls/wined3d/state.c | 3 ++- dlls/wined3d/utils.c | 12 ++++++++---- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 380986a..cc25c42 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -144,7 +144,8 @@ void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEX /* If a texture stage references an invalid texture unit the stage just * passes through the result from the previous stage */ - if (is_invalid_op(This, stage, op, arg1, arg2, arg3)) { + if (is_invalid_op(&This->stateBlock->state, stage, op, arg1, arg2, arg3)) + { arg1 = WINED3DTA_CURRENT; op = WINED3DTOP_SELECTARG1; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 772f5f5..2d31fb4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2109,7 +2109,8 @@ static void set_tex_op(const struct wined3d_context *context, IWineD3DDevice *if /* If a texture stage references an invalid texture unit the stage just * passes through the result from the previous stage */ - if (is_invalid_op(This, Stage, op, arg1, arg2, arg3)) { + if (is_invalid_op(&This->stateBlock->state, Stage, op, arg1, arg2, arg3)) + { arg1 = WINED3DTA_CURRENT; op = WINED3DTOP_SELECTARG1; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9457bf4..01ca1f9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2366,9 +2366,11 @@ GLenum CompareFunc(DWORD func) { } } -BOOL is_invalid_op(IWineD3DDeviceImpl *This, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) { +BOOL is_invalid_op(const struct wined3d_state *state, int stage, + WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) +{ if (op == WINED3DTOP_DISABLE) return FALSE; - if (This->stateBlock->state.textures[stage]) return FALSE; + if (state->textures[stage]) return FALSE; if ((arg1 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE && op != WINED3DTOP_SELECTARG2) return TRUE; @@ -2785,7 +2787,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting carg2 = (args[cop] & ARG2) ? stateblock->state.texture_states[i][WINED3DTSS_COLORARG2] : ARG_UNUSED; carg0 = (args[cop] & ARG0) ? stateblock->state.texture_states[i][WINED3DTSS_COLORARG0] : ARG_UNUSED; - if(is_invalid_op(device, i, cop, carg1, carg2, carg0)) { + if (is_invalid_op(&stateblock->state, i, cop, carg1, carg2, carg0)) + { carg0 = ARG_UNUSED; carg2 = ARG_UNUSED; carg1 = WINED3DTA_CURRENT; @@ -2846,7 +2849,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting } } - if(is_invalid_op(device, i, aop, aarg1, aarg2, aarg0)) { + if (is_invalid_op(&stateblock->state, i, aop, aarg1, aarg2, aarg0)) + { aarg0 = ARG_UNUSED; aarg2 = ARG_UNUSED; aarg1 = WINED3DTA_CURRENT; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 337e91f..842923f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2639,8 +2639,8 @@ const char *debug_surflocation(DWORD flag) DECLSPEC_HIDDEN; /* Routines for GL <-> D3D values */ GLenum StencilOp(DWORD op) DECLSPEC_HIDDEN; GLenum CompareFunc(DWORD func) DECLSPEC_HIDDEN; -BOOL is_invalid_op(IWineD3DDeviceImpl *This, int stage, WINED3DTEXTUREOP op, - DWORD arg1, DWORD arg2, DWORD arg3) DECLSPEC_HIDDEN; +BOOL is_invalid_op(const struct wined3d_state *state, int stage, + WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) DECLSPEC_HIDDEN; void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst) DECLSPEC_HIDDEN; void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords,

1 0

Hans Leidekker : include: Add IKnownFolder and IKnownFolderManager interfaces.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: 12261fefd4bd2baff82e29cd0407e6c36c6c06bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=12261fefd4bd2baff82e29cd0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 23 09:25:42 2010 +0200 include: Add IKnownFolder and IKnownFolderManager interfaces. --- include/shobjidl.idl | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/shtypes.idl | 1 + 2 files changed, 165 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 7e2dde2..62f9cd0 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2811,6 +2811,162 @@ interface IFileDialogControlEvents : IUnknown [in] DWORD dwIDCtl); } +typedef [v1_enum] enum tagKF_CATEGORY +{ + KF_CATEGORY_VIRTUAL = 0x00000001, + KF_CATEGORY_FIXED = 0x00000002, + KF_CATEGORY_COMMON = 0x00000003, + KF_CATEGORY_PERUSER = 0x00000004 +} KF_CATEGORY; + +typedef [v1_enum] enum tagKF_REDIRECTION_CAPABILITIES +{ + KF_REDIRECTION_CAPABILITIES_ALLOW_ALL = 0x000000ff, + KF_REDIRECTION_CAPABILITIES_REDIRECTABLE = 0x00000001, + KF_REDIRECTION_CAPABILITIES_DENY_ALL = 0x000fff00, + KF_REDIRECTION_CAPABILITIES_DENY_POLICY_REDIRECTED = 0x00000100, + KF_REDIRECTION_CAPABILITIES_DENY_POLICY = 0x00000200, + KF_REDIRECTION_CAPABILITIES_DENY_PERMISSIONS = 0x00000400 +} KF_REDIRECTION_CAPABILITIES; + +typedef [v1_enum] enum tagKF_DEFINITION_FLAGS +{ + KFDF_LOCAL_REDIRECT_ONLY = 0x00000002, + KFDF_ROAMABLE = 0x00000004, + KFDF_PRECREATE = 0x00000008 +} KF_DEFINITION_FLAGS; + +typedef struct tagKNOWNFOLDER_DEFINITION +{ + KF_CATEGORY category; + LPWSTR pszName; + LPWSTR pszDescription; + KNOWNFOLDERID fidParent; + LPWSTR pszRelativePath; + LPWSTR pszParsingName; + LPWSTR pszTooltip; + LPWSTR pszLocalizedName; + LPWSTR pszIcon; + LPWSTR pszSecurity; + DWORD dwAttributes; + KF_DEFINITION_FLAGS kfdFlags; + FOLDERTYPEID ftidType; +} KNOWNFOLDER_DEFINITION; + +[ + object, + uuid(3aa7af7e-9b36-420C-a8e3-f77d4674a488), + pointer_default(ref) +] +interface IKnownFolder : IUnknown +{ + HRESULT GetId( + [out] KNOWNFOLDERID *pkfid); + + HRESULT GetCategory( + [out] KF_CATEGORY *pCategory); + + HRESULT GetShellItem( + [in] DWORD dwFlags, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetPath( + [in] DWORD dwFlags, + [out, string] LPWSTR *ppszPath); + + HRESULT SetPath( + [in] DWORD dwFlags, + [in, string] LPCWSTR pszPath); + + HRESULT GetIDList( + [in] DWORD dwFlags, + [out] PIDLIST_ABSOLUTE *ppidl); + + HRESULT GetFolderType( + [out] FOLDERTYPEID *pftid); + + HRESULT GetRedirectionCapabilities( + [out] KF_REDIRECTION_CAPABILITIES *pCapabilities); + + HRESULT GetFolderDefinition( + [out] KNOWNFOLDER_DEFINITION *pKFD); +} + +typedef [v1_enum] enum tagKF_REDIRECT_FLAGS +{ + KF_REDIRECT_USER_EXCLUSIVE = 0x00000001, + KF_REDIRECT_COPY_SOURCE_DACL = 0x00000002, + KF_REDIRECT_OWNER_USER = 0x00000004, + KF_REDIRECT_SET_OWNER_EXPLICIT = 0x00000008, + KF_REDIRECT_CHECK_ONLY = 0x00000010, + KF_REDIRECT_WITH_UI = 0x00000020, + KF_REDIRECT_UNPIN = 0x00000040, + KF_REDIRECT_PIN = 0x00000080, + KF_REDIRECT_COPY_CONTENTS = 0x00000200, + KF_REDIRECT_DEL_SOURCE_CONTENTS = 0x00000400, + KF_REDIRECT_EXCLUDE_ALL_KNOWN_SUBFOLDERS = 0x00000800 +} KF_REDIRECT_FLAGS; + +[ + object, + uuid(8BE2D872-86AA-4d47-B776-32CCA40C7018), + pointer_default(ref) +] +interface IKnownFolderManager : IUnknown +{ + typedef [v1_enum] enum tagFFFP_MODE + { + FFFP_EXACTMATCH, + FFFP_NEARESTPARENTMATCH + } FFFP_MODE; + + HRESULT FolderIdFromCsidl( + [in] int nCsidl, + [out] KNOWNFOLDERID *pfid); + + HRESULT FolderIdToCsidl( + [in] REFKNOWNFOLDERID rfid, + [out] int *pnCsidl); + + HRESULT GetFolderIds( + [out, size_is(, *pCount)] KNOWNFOLDERID **ppKFId, + [in, out] UINT *pCount); + + HRESULT GetFolder( + [in] REFKNOWNFOLDERID rfid, + [out] IKnownFolder **ppkf); + + HRESULT GetFolderByName( + [in, string] LPCWSTR pszCanonicalName, + [out] IKnownFolder **ppkf); + + HRESULT RegisterFolder( + [in] REFKNOWNFOLDERID rfid, + [in] KNOWNFOLDER_DEFINITION const *pKFD); + + HRESULT UnregisterFolder( + [in] REFKNOWNFOLDERID rfid); + + HRESULT FindFolderFromPath( + [in, string] LPCWSTR pszPath, + [in] FFFP_MODE mode, + [out] IKnownFolder **ppkf); + + HRESULT FindFolderFromIDList( + [in] PCIDLIST_ABSOLUTE pidl, + [out] IKnownFolder **ppkf); + + HRESULT Redirect( + [in] REFKNOWNFOLDERID rfid, + [in, unique] HWND hwnd, + [in] KF_REDIRECT_FLAGS flags, + [in, unique, string] LPCWSTR pszTargetPath, + [in] UINT cFolders, + [in, size_is(cFolders), unique] KNOWNFOLDERID const *pExclusion, + [out, string] LPWSTR *ppszError); +} + /***************************************************************************** * ShellObjects typelibrary */ @@ -2852,4 +3008,12 @@ library ShellObjects { interface INameSpaceTreeControl2; } + + [ + uuid(4df0c730-df9d-4ae3-9153-aa6b82e9795a) + ] + coclass KnownFolderManager + { + interface IKnownFolderManager; + } } diff --git a/include/shtypes.idl b/include/shtypes.idl index 091e509..94b0c61 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -113,6 +113,7 @@ typedef [v1_enum] enum tagSHCOLSTATE typedef DWORD SHCOLSTATEF; typedef GUID KNOWNFOLDERID; +typedef GUID FOLDERTYPEID; cpp_quote("#if 0") typedef KNOWNFOLDERID *REFKNOWNFOLDERID;

1 0

Peter Oberndorfer : kernel32: VerifyConsoleIoHandle does not set last error value.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: 297b054e74bb0f0e5b6be65b7e6df57902fdf9e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=297b054e74bb0f0e5b6be65b7… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Wed Sep 22 19:54:36 2010 +0200 kernel32: VerifyConsoleIoHandle does not set last error value. --- dlls/kernel32/console.c | 2 +- dlls/kernel32/tests/console.c | 53 +++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/sync.c | 4 +- 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 064cd53..45e6089 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -441,7 +441,7 @@ BOOL WINAPI VerifyConsoleIoHandle(HANDLE handle) SERVER_START_REQ(get_console_mode) { req->handle = console_handle_unmap(handle); - ret = !wine_server_call_err( req ); + ret = !wine_server_call( req ); } SERVER_END_REQ; return ret; diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 3d8ae93..1bc0d34 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -27,6 +27,7 @@ static BOOL (WINAPI *pGetConsoleInputExeNameA)(DWORD, LPSTR); static DWORD (WINAPI *pGetConsoleProcessList)(LPDWORD, DWORD); static HANDLE (WINAPI *pOpenConsoleW)(LPCWSTR,DWORD,BOOL,DWORD); static BOOL (WINAPI *pSetConsoleInputExeNameA)(LPCSTR); +static BOOL (WINAPI *pVerifyConsoleIoHandle)(HANDLE handle); /* DEFAULT_ATTRIB is used for all initial filling of the console. * all modifications are made with TEST_ATTRIB so that we could check @@ -68,6 +69,7 @@ static void init_function_pointers(void) KERNEL32_GET_PROC(GetConsoleProcessList); KERNEL32_GET_PROC(OpenConsoleW); KERNEL32_GET_PROC(SetConsoleInputExeNameA); + KERNEL32_GET_PROC(VerifyConsoleIoHandle); #undef KERNEL32_GET_PROC } @@ -1083,6 +1085,56 @@ static void test_OpenConsoleW(void) CloseHandle(ret); } +static void test_VerifyConsoleIoHandle(void) +{ + BOOL ret; + DWORD error; + HANDLE handle; + + if (!pVerifyConsoleIoHandle) + { + win_skip("VerifyConsoleIoHandle is not available\n"); + return; + } + + /* invalid handle */ + SetLastError(0xdeadbeef); + ret = pVerifyConsoleIoHandle((HANDLE)0xdeadbee0); + error = GetLastError(); + ok(!ret, "expected VerifyConsoleIoHandle to fail\n"); + ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); + + /* invalid handle + 1 */ + SetLastError(0xdeadbeef); + ret = pVerifyConsoleIoHandle((HANDLE)0xdeadbee1); + error = GetLastError(); + ok(!ret, "expected VerifyConsoleIoHandle to fail\n"); + ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); + + /* invalid handle + 2 */ + SetLastError(0xdeadbeef); + ret = pVerifyConsoleIoHandle((HANDLE)0xdeadbee2); + error = GetLastError(); + ok(!ret, "expected VerifyConsoleIoHandle to fail\n"); + ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); + + /* invalid handle + 3 */ + SetLastError(0xdeadbeef); + ret = pVerifyConsoleIoHandle((HANDLE)0xdeadbee3); + error = GetLastError(); + ok(!ret, "expected VerifyConsoleIoHandle to fail\n"); + ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); + + handle = GetStdHandle(STD_INPUT_HANDLE); + /* valid handle */ + SetLastError(0xdeadbeef); + ret = pVerifyConsoleIoHandle(handle); + error = GetLastError(); + ok(ret, "expected VerifyConsoleIoHandle to succeed\n"); + ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); +} + + START_TEST(console) { HANDLE hConIn, hConOut; @@ -1134,4 +1186,5 @@ START_TEST(console) test_GetConsoleProcessList(); test_OpenConsoleW(); + test_VerifyConsoleIoHandle(); } diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 30811b5..94b2963 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1000,7 +1000,7 @@ static void test_WaitForSingleObject(void) SetLastError(0xdeadbeef); ret = WaitForSingleObject(modify_handle(nonsignaled, 3), 0); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %d\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); /* valid handle with different values for lower 2 bits */ SetLastError(0xdeadbeef); @@ -1021,7 +1021,7 @@ static void test_WaitForSingleObject(void) SetLastError(0xdeadbeef); ret = WaitForSingleObject(modify_handle(signaled, 3), 0); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %d\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); CloseHandle(signaled); CloseHandle(nonsignaled);

1 0

Sven Baars : shell32: Update the Dutch translation.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: 577fb4d1f94ff2a4ddffcbe96210025ad4586fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=577fb4d1f94ff2a4ddffcbe96… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Sep 22 20:55:57 2010 +0200 shell32: Update the Dutch translation. --- dlls/shell32/shell32_Nl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index 259c6b8..688ff9d 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -306,6 +306,7 @@ STRINGTABLE IDS_COMMON_OEM_LINKS "OEM Links" IDS_DOCUMENTS "Documenten" IDS_DOWNLOADS "Downloads" + IDS_LOCAL_APPDATA_LOW "AppData\\LocalLow" IDS_NEWFOLDER "Nieuwe Map"

1 0

Peter Oberndorfer : kernel32: Add test for WaitForSingleObject with lower 2 bits of handles set.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: 4f2afdd0ac5a49699f36fdc5808335cd73f6c8b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2afdd0ac5a49699f36fdc58… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Wed Sep 22 21:06:22 2010 +0200 kernel32: Add test for WaitForSingleObject with lower 2 bits of handles set. --- dlls/kernel32/tests/sync.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index ea36fc6..095c935 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -939,6 +939,94 @@ static void test_timer_queue(void) GetLastError()); } +static HANDLE modify_handle(HANDLE handle, DWORD modify) +{ + DWORD tmp = HandleToULong(handle); + tmp |= modify; + return ULongToHandle(tmp); +} + +static void test_WaitForSingleObject(void) +{ + HANDLE signaled, nonsignaled, invalid; + DWORD ret; + + signaled = CreateEventW(NULL, TRUE, TRUE, NULL); + if(signaled == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Handles work differently on win9x\n"); + return; + } + nonsignaled = CreateEventW(NULL, TRUE, FALSE, NULL); + invalid = (HANDLE) 0xdeadbee0; + + /* invalid handle with different values for lower 2 bits */ + SetLastError(0xdeadbeef); + ret = WaitForSingleObject(invalid, 0); + ok(ret == WAIT_FAILED, "expected WAIT_FAILED, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForSingleObject(modify_handle(invalid, 1), 0); + ok(ret == WAIT_FAILED, "expected WAIT_FAILED, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForSingleObject(modify_handle(invalid, 2), 0); + ok(ret == WAIT_FAILED, "expected WAIT_FAILED, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForSingleObject(modify_handle(invalid, 3), 0); + todo_wine ok(ret == WAIT_FAILED, "expected WAIT_FAILED, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + /* valid handle with different values for lower 2 bits */ + SetLastError(0xdeadbeef); + ret = WaitForSingleObject(nonsignaled, 0); + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForSingleObject(modify_handle(nonsignaled, 1), 0); + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForSingleObject(modify_handle(nonsignaled, 2), 0); + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForSingleObject(modify_handle(nonsignaled, 3), 0); + todo_wine ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %d\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + + /* valid handle with different values for lower 2 bits */ + SetLastError(0xdeadbeef); + ret = WaitForSingleObject(signaled, 0); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForSingleObject(modify_handle(signaled, 1), 0); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForSingleObject(modify_handle(signaled, 2), 0); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForSingleObject(modify_handle(signaled, 3), 0); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %d\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + + CloseHandle(signaled); + CloseHandle(nonsignaled); +} + START_TEST(sync) { HMODULE hdll = GetModuleHandle("kernel32"); @@ -958,4 +1046,5 @@ START_TEST(sync) test_waitable_timer(); test_iocp_callback(); test_timer_queue(); + test_WaitForSingleObject(); }

1 0

Peter Oberndorfer : kernel32: Fix last error value of GetStdHandle/ SetStdHandle when called with wrong std handle.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: 9d74a70ad5c41ffc83bc3ca91431ad1fbe7bbb60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d74a70ad5c41ffc83bc3ca91… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Wed Sep 22 19:54:38 2010 +0200 kernel32: Fix last error value of GetStdHandle/SetStdHandle when called with wrong std handle. --- dlls/kernel32/environ.c | 4 ++-- dlls/kernel32/tests/console.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 39c1470..e6634a2 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -396,7 +396,7 @@ HANDLE WINAPI GetStdHandle( DWORD std_handle ) case STD_OUTPUT_HANDLE: return NtCurrentTeb()->Peb->ProcessParameters->hStdOutput; case STD_ERROR_HANDLE: return NtCurrentTeb()->Peb->ProcessParameters->hStdError; } - SetLastError( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_HANDLE ); return INVALID_HANDLE_VALUE; } @@ -412,7 +412,7 @@ BOOL WINAPI SetStdHandle( DWORD std_handle, HANDLE handle ) case STD_OUTPUT_HANDLE: NtCurrentTeb()->Peb->ProcessParameters->hStdOutput = handle; return TRUE; case STD_ERROR_HANDLE: NtCurrentTeb()->Peb->ProcessParameters->hStdError = handle; return TRUE; } - SetLastError( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 1bc0d34..072bd01 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1134,6 +1134,41 @@ static void test_VerifyConsoleIoHandle(void) ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); } +static void test_GetSetStdHandle(void) +{ + HANDLE handle; + DWORD error; + BOOL ret; + + /* get invalid std handle */ + SetLastError(0xdeadbeef); + handle = GetStdHandle(42); + error = GetLastError(); + ok(error == ERROR_INVALID_HANDLE || broken(error == ERROR_INVALID_FUNCTION)/* Win9x */, + "wrong GetLastError() %d\n", error); + ok(handle == INVALID_HANDLE_VALUE, "expected INVALID_HANDLE_VALUE\n"); + + /* get valid */ + SetLastError(0xdeadbeef); + handle = GetStdHandle(STD_INPUT_HANDLE); + error = GetLastError(); + ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); + + /* set invalid std handle */ + SetLastError(0xdeadbeef); + ret = SetStdHandle(42, handle); + error = GetLastError(); + ok(!ret, "expected SetStdHandle to fail\n"); + ok(error == ERROR_INVALID_HANDLE || broken(error == ERROR_INVALID_FUNCTION)/* Win9x */, + "wrong GetLastError() %d\n", error); + + /* set valid (restore old value) */ + SetLastError(0xdeadbeef); + ret = SetStdHandle(STD_INPUT_HANDLE, handle); + error = GetLastError(); + ok(ret, "expected SetStdHandle to succeed\n"); + ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); +} START_TEST(console) { @@ -1187,4 +1222,5 @@ START_TEST(console) test_GetConsoleProcessList(); test_OpenConsoleW(); test_VerifyConsoleIoHandle(); + test_GetSetStdHandle(); }

1 0

Austin Lund : comctl32/tests: Default listview width appears to be 1 inch.
by Alexandre Julliard Sept. 23, 2010

Sept. 23, 2010

Module: wine Branch: master Commit: e1a0a66f2727cfc084254aad92ff5eef74f271a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a0a66f2727cfc084254aad9… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Sep 22 16:28:31 2010 +1000 comctl32/tests: Default listview width appears to be 1 inch. --- dlls/comctl32/tests/listview.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4297e0b..3f02f6b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3269,6 +3269,7 @@ static void test_getitemrect(void) LVCOLUMNA col; INT order[2]; POINT pt; + HDC hdc; /* rectangle isn't empty for empty text items */ hwnd = create_listview_control(LVS_LIST); @@ -3282,7 +3283,9 @@ static void test_getitemrect(void) expect(TRUE, r); expect(0, rect.left); expect(0, rect.top); - todo_wine expect(96, rect.right); + hdc = GetDC(hwnd); + todo_wine expect(GetDeviceCaps(hdc, LOGPIXELSX), rect.right); + ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); hwnd = create_listview_control(LVS_REPORT); @@ -4110,6 +4113,7 @@ static void test_getcolumnwidth(void) DWORD_PTR style; LVCOLUMNA col; LVITEMA itema; + HDC hdc; /* default column width */ hwnd = create_listview_control(LVS_ICON); @@ -4133,7 +4137,9 @@ static void test_getcolumnwidth(void) memset(&itema, 0, sizeof(itema)); SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); - todo_wine expect(96, ret); + hdc = GetDC(hwnd); + todo_wine expect(GetDeviceCaps(hdc, LOGPIXELSX), ret); + ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); }

1 0