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

Mariusz Pluciński : shell32: Add IKnownFolder:: GetFolderDefinition() implementation.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: dfa35a529f1233d2e3e52f7bcff227be5416ff97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa35a529f1233d2e3e52f7bc… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jul 19 16:19:28 2011 +0200 shell32: Add IKnownFolder::GetFolderDefinition() implementation. --- dlls/shell32/shellpath.c | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 4407056..13d50e0 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3175,6 +3175,15 @@ static HRESULT get_known_folder_redirection_place( static HRESULT get_known_folder_path_by_id(REFKNOWNFOLDERID folderId, LPWSTR lpRegistryPath, DWORD dwFlags, LPWSTR *ppszPath); +static HRESULT get_known_folder_category( + LPWSTR registryPath, + KF_CATEGORY* pCategory) +{ + DWORD dwSize = sizeof(DWORD); + DWORD dwType; + return HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, registryPath, szCategory, RRF_RT_DWORD, &dwType, pCategory, &dwSize)); +} + static HRESULT redirect_known_folder( REFKNOWNFOLDERID rfid, HWND hwnd, @@ -3372,8 +3381,6 @@ static HRESULT WINAPI knownfolder_GetCategory( { struct knownfolder *knownfolder = impl_from_IKnownFolder(iface); HRESULT hr = S_OK; - DWORD dwSize = sizeof(DWORD); - DWORD dwType; TRACE("%p, %p\n", knownfolder, pCategory); @@ -3382,7 +3389,7 @@ static HRESULT WINAPI knownfolder_GetCategory( hr = E_FAIL; if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szCategory, RRF_RT_DWORD, &dwType, pCategory, &dwSize)); + hr = get_known_folder_category(knownfolder->registryPath, pCategory); return hr; } @@ -3585,8 +3592,30 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition( IKnownFolder *iface, KNOWNFOLDER_DEFINITION *pKFD) { - FIXME("%p\n", pKFD); - return E_NOTIMPL; + struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); + HRESULT hr; + DWORD dwSize; + TRACE("(%p, %p)\n", knownfolder, pKFD); + + if(!pKFD) return E_INVALIDARG; + + ZeroMemory(pKFD, sizeof(*pKFD)); + + hr = get_known_folder_category(knownfolder->registryPath, &pKFD->category); + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szName, RRF_RT_REG_SZ, NULL, NULL, &dwSize)); + + if(SUCCEEDED(hr)) + { + pKFD->pszName = CoTaskMemAlloc(dwSize); + if(!pKFD->pszName) hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szName, RRF_RT_REG_SZ, NULL, pKFD->pszName, &dwSize)); + + return hr; } static const struct IKnownFolderVtbl knownfolder_vtbl =

1 0

Mariusz Pluciński : shell32/tests: Add checking known folders' names.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: fa4ba100837ad2db4ba89886e268c5cb18012857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4ba100837ad2db4ba89886e… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jul 19 16:17:54 2011 +0200 shell32/tests: Add checking known folders' names. --- dlls/shell32/tests/shellpath.c | 233 ++++++++++++++++++++++------------------ 1 files changed, 129 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa4ba100837ad2db4ba89…

1 0

Frédéric Delanoy : cmd/tests: Add tests for NUL handling.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: 5d22f3aa145795af0137f580959671c046f3d37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d22f3aa145795af0137f5809… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 19 09:49:24 2011 +0200 cmd/tests: Add tests for NUL handling. --- programs/cmd/tests/test_builtins.cmd | 31 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 +++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 764697b..195afca 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -104,6 +104,37 @@ type foobaz echo *** del foobaz +echo ------------ Testing NUL ------------ +md foobar && cd foobar +rem NUL file (non) creation + case insensitivity +rem Note: "if exist" does not work with NUL, so to check for file existence we use a kludgy workaround +echo > bar +echo foo > NUL +dir /b /a-d +echo foo > nul +dir /b /a-d +echo foo > NuL +dir /b /a-d +del bar +rem NUL not special everywhere +call :setError 123 +echo NUL> foo +if not exist foo (echo foo should have been created) else ( + type foo + del foo +) +rem Empty file creation +copy nul foo > nul +if exist foo ( + echo foo created + del foo + type foo +) else ( + echo *** +) +cd .. +rd foobar + echo ------------ Testing if/else -------------- echo if/else should work with blocks if 0 == 0 ( diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 07a503ec..67f25a4 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -99,6 +99,12 @@ bar *** bar *** +------------ Testing NUL ------------ +bar +bar +bar +NUL +(a)todo_wine@foo created ------------ Testing if/else -------------- if/else should work with blocks if seems to work

1 0

Matteo Bruni : d3dx9: Fix an error check in D3DXLoadMeshFromXResource.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: c4d29bdb18e93a042c41610d335112d5872b6450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d29bdb18e93a042c41610d3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 19 16:15:36 2011 +0200 d3dx9: Fix an error check in D3DXLoadMeshFromXResource. --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 94a291f..0d17941 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3376,7 +3376,7 @@ HRESULT WINAPI D3DXLoadMeshFromXResource(HMODULE module, if (!resinfo) return D3DXERR_INVALIDDATA; hr = load_resource_into_memory(module, resinfo, &buffer, &size); - if (!FAILED(hr)) return D3DXERR_INVALIDDATA; + if (FAILED(hr)) return D3DXERR_INVALIDDATA; return D3DXLoadMeshFromXInMemory(buffer, size, options, device, adjacency, materials, effect_instances, num_materials, mesh);

1 0

Mariusz Pluciński : include: Add FOLDERTYPEID types and values definitions.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: 310ab8a22cf43b622a2ccae034ff999f4ad303af URL: http://source.winehq.org/git/wine.git/?a=commit;h=310ab8a22cf43b622a2ccae03… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jul 19 16:15:57 2011 +0200 include: Add FOLDERTYPEID types and values definitions. --- include/shlguid.h | 31 +++++++++++++++++++++++++++++++ include/shtypes.idl | 13 ++++++++++++- 2 files changed, 43 insertions(+), 1 deletions(-) diff --git a/include/shlguid.h b/include/shlguid.h index a19b70c..f01ec73 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -162,6 +162,37 @@ DEFINE_GUID(VID_Thumbnails, 0x8bebb290, 0x52d0, 0x11d0, 0xb7, 0xf4, 0x00, 0xc0, DEFINE_GUID(VID_Tile, 0x65f125e5, 0x7be1, 0x4810, 0xba, 0x9d, 0xd2, 0x71, 0xc8, 0x43, 0x2c, 0xe3); DEFINE_GUID(VID_ThumbStrip, 0x8eefa624, 0xd1e9, 0x445b, 0x94, 0xb7, 0x74, 0xfb, 0xce, 0x2e, 0xa1, 0x1a); +/* FOLDERTYPEID */ +DEFINE_GUID(FOLDERTYPEID_Communications, 0x91475fe5, 0x586b, 0x4eba, 0x8d, 0x75, 0xd1, 0x74, 0x34, 0xb8, 0xcd, 0xf6); +DEFINE_GUID(FOLDERTYPEID_CompressedFolder, 0x80213e82, 0xbcfd, 0x4c4f, 0x88, 0x17, 0xbb, 0x27, 0x60, 0x12, 0x67, 0xa9); +DEFINE_GUID(FOLDERTYPEID_Contacts, 0xde2b70ec, 0x9bf7, 0x4a93, 0xbd, 0x3d, 0x24, 0x3f, 0x78, 0x81, 0xd4, 0x92); +DEFINE_GUID(FOLDERTYPEID_ControlPanelCategory, 0xde4f0660, 0xfa10, 0x4b8f, 0xa4, 0x94, 0x06, 0x8b, 0x20, 0xb2, 0x23, 0x07); +DEFINE_GUID(FOLDERTYPEID_ControlPanelClassic, 0x0c3794f3, 0xb545, 0x43aa, 0xa3, 0x29, 0xc3, 0x74, 0x30, 0xc5, 0x8d, 0x2a); +DEFINE_GUID(FOLDERTYPEID_Documents, 0x7d49d726, 0x3c21, 0x4f05, 0x99, 0xaa, 0xfd, 0xc2, 0xc9, 0x47, 0x46, 0x56); +DEFINE_GUID(FOLDERTYPEID_Games, 0xb689b0d0, 0x76d3, 0x4cbb, 0x87, 0xf7, 0x58, 0x5d, 0x0e, 0x0c, 0xe0, 0x70); +DEFINE_GUID(FOLDERTYPEID_Generic, 0x5c4f28b5, 0xf869, 0x4e84, 0x8e, 0x60, 0xf1, 0x1d, 0xb9, 0x7c, 0x5c, 0xc7); +DEFINE_GUID(FOLDERTYPEID_GenericLibrary, 0x5f4eab9a, 0x6833, 0x4f61, 0x89, 0x9d, 0x31, 0xcf, 0x46, 0x97, 0x9d, 0x49); +DEFINE_GUID(FOLDERTYPEID_GenericSearchResults, 0x7fde1a1e, 0x8b31, 0x49a5, 0x93, 0xb8, 0x6b, 0xe1, 0x4c, 0xfa, 0x49, 0x43); +DEFINE_GUID(FOLDERTYPEID_Invalid, 0x57807898, 0x8c4f, 0x4462, 0xbb, 0x63, 0x71, 0x04, 0x23, 0x80, 0xb1, 0x09); +DEFINE_GUID(FOLDERTYPEID_Music, 0x94d6ddcc, 0x4a68, 0x4175, 0xa3, 0x74, 0xbd, 0x58, 0x4a, 0x51, 0x0b, 0x78); +DEFINE_GUID(FOLDERTYPEID_NetworkExplorer, 0x25cc242b, 0x9a7c, 0x4f51, 0x80, 0xe0, 0x7a, 0x29, 0x28, 0xfe, 0xbe, 0x42); +DEFINE_GUID(FOLDERTYPEID_OpenSearch, 0x8faf9629, 0x1980, 0x46ff, 0x80, 0x23, 0x9d, 0xce, 0xab, 0x9c, 0x3e, 0xe3); +DEFINE_GUID(FOLDERTYPEID_OtherUsers, 0xb337fd00, 0x9dd5, 0x4635, 0xa6, 0xd4, 0xda, 0x33, 0xfd, 0x10, 0x2b, 0x7a); +DEFINE_GUID(FOLDERTYPEID_Pictures, 0xb3690e58, 0xe961, 0x423b, 0xb6, 0x87, 0x38, 0x6e, 0xbf, 0xd8, 0x32, 0x39); +DEFINE_GUID(FOLDERTYPEID_Printers, 0x2c7bbec6, 0xc844, 0x4a0a, 0x91, 0xfa, 0xce, 0xf6, 0xf5, 0x9c, 0xfd, 0xa1); +DEFINE_GUID(FOLDERTYPEID_PublishedItems, 0x7f2f5b96, 0xff74, 0x41da, 0xaf, 0xd8, 0x1c, 0x78, 0xa5, 0xf3, 0xae, 0xa2); +DEFINE_GUID(FOLDERTYPEID_RecordedTV, 0x5557a28f, 0x5da6, 0x4f83, 0x88, 0x09, 0xc2, 0xc9, 0x8a, 0x11, 0xa6, 0xfa); +DEFINE_GUID(FOLDERTYPEID_RecycleBin, 0xd6d9e004, 0xcd87, 0x442b, 0x9d, 0x57, 0x5e, 0x0a, 0xeb, 0x4f, 0x6f, 0x72); +DEFINE_GUID(FOLDERTYPEID_SavedGames, 0xd0363307, 0x28cb, 0x4106, 0x9f, 0x23, 0x29, 0x56, 0xe3, 0xe5, 0xe0, 0xe7); +DEFINE_GUID(FOLDERTYPEID_SearchConnector, 0x982725ee, 0x6f47, 0x479e, 0xb4, 0x47, 0x81, 0x2b, 0xfa, 0x7d, 0x2e, 0x8f); +DEFINE_GUID(FOLDERTYPEID_Searches, 0x0b0ba2e3, 0x405f, 0x415e, 0xa6, 0xee, 0xca, 0xd6, 0x25, 0x20, 0x78, 0x53); +DEFINE_GUID(FOLDERTYPEID_SearchHome, 0x834d8a44, 0x0974, 0x4ed6, 0x86, 0x6e, 0xf2, 0x03, 0xd8, 0x0b, 0x38, 0x10); +DEFINE_GUID(FOLDERTYPEID_SoftwareExplorer, 0xd674391b, 0x52d9, 0x4e07, 0x83, 0x4e, 0x67, 0xc9, 0x86, 0x10, 0xf3, 0x9d); +DEFINE_GUID(FOLDERTYPEID_StartMenu, 0xef87b4cb, 0xf2ce, 0x4785, 0x86, 0x58, 0x4c, 0xa6, 0xc6, 0x3e, 0x38, 0xc6); +DEFINE_GUID(FOLDERTYPEID_UserFiles, 0xcd0fc69b, 0x71e2, 0x46e5, 0x96, 0x90, 0x5b, 0xcd, 0x9f, 0x57, 0xaa, 0xb3); +DEFINE_GUID(FOLDERTYPEID_UsersLibraries, 0xc4d98f09, 0x6124, 0x4fe0, 0x99, 0x42, 0x82, 0x64, 0x16, 0x08, 0x2d, 0xa9); +DEFINE_GUID(FOLDERTYPEID_Videos, 0x5fa96407, 0x7e77, 0x483c, 0xac, 0x93, 0x69, 0x1d, 0x05, 0x85, 0x0d, 0xe8); + /* IExplorerBrowser */ DEFINE_GUID(EP_NavPane, 0xCB316B22, 0x25F7, 0x42B8, 0x8A, 0x09, 0x54, 0x0D, 0x23, 0xA4, 0x3C, 0x2F); DEFINE_GUID(EP_Commands,0xD9745868, 0xCA5F, 0x4A76, 0x91, 0xCD, 0xF5, 0xA1, 0x29, 0xFB, 0xB0, 0x76); diff --git a/include/shtypes.idl b/include/shtypes.idl index 94b0c61..d8d7bad 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -113,7 +113,6 @@ typedef [v1_enum] enum tagSHCOLSTATE typedef DWORD SHCOLSTATEF; typedef GUID KNOWNFOLDERID; -typedef GUID FOLDERTYPEID; cpp_quote("#if 0") typedef KNOWNFOLDERID *REFKNOWNFOLDERID; @@ -124,3 +123,15 @@ cpp_quote("#define REFKNOWNFOLDERID const KNOWNFOLDERID &") cpp_quote("#else") cpp_quote("#define REFKNOWNFOLDERID const KNOWNFOLDERID * __MIDL_CONST") cpp_quote("#endif") + +typedef GUID FOLDERTYPEID; + +cpp_quote("#if 0") +typedef FOLDERTYPEID *REFFOLDERTYPEID; +cpp_quote("#endif") + +cpp_quote("#ifdef __cplusplus") +cpp_quote("#define REFFOLDERTYPEID const FOLDERTYPEID &") +cpp_quote("#else") +cpp_quote("#define REFFOLDERTYPEID const FOLDERTYPEID * __MIDL_CONST") +cpp_quote("#endif")

1 0

Michael Stefaniuc : explorer: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: 8ec442f510d223909d8719ae903d738aa0a0d439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec442f510d223909d8719ae9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 15:09:12 2011 +0200 explorer: Use FAILED instead of !SUCCEEDED. --- programs/explorer/explorer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 5c9cad2..1b3fa90 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -326,7 +326,7 @@ static void make_explorer_window(IShellFolder* startFolder) } hres = CoCreateInstance(&CLSID_ExplorerBrowser,NULL,CLSCTX_INPROC_SERVER, &IID_IExplorerBrowser,(LPVOID*)&info->browser); - if(!SUCCEEDED(hres)) + if(FAILED(hres)) { WINE_ERR("Could not obtain an instance of IExplorerBrowser\n"); HeapFree(GetProcessHeap(),0,info); @@ -739,7 +739,7 @@ int WINAPI wWinMain(HINSTANCE hinstance, explorer_hInstance = hinstance; parse_command_line(cmdline,&parameters); hres = OleInitialize(NULL); - if(!SUCCEEDED(hres)) + if(FAILED(hres)) { WINE_ERR("Could not initialize COM\n"); ExitProcess(EXIT_FAILURE);

1 0

Michael Stefaniuc : shell32: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: 5ab5042183d7461fb64ba6c4c4b8d9a2b2a4536e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab5042183d7461fb64ba6c4c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 15:06:09 2011 +0200 shell32: Use FAILED instead of !SUCCEEDED. --- dlls/shell32/shellpath.c | 4 ++-- dlls/shell32/tests/brsfolder.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 4b14739..4407056 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3423,10 +3423,10 @@ static HRESULT get_known_folder_path( { /* get parent's known folder path (recursive) */ hr = get_known_folder_registry_path(NULL, parentGuid, &parentRegistryPath); - if(!SUCCEEDED(hr)) return hr; + if(FAILED(hr)) return hr; hr = get_known_folder_path(parentGuid, parentRegistryPath, &parentPath); - if(!SUCCEEDED(hr)) { + if(FAILED(hr)) { HeapFree(GetProcessHeap(), 0, parentRegistryPath); return hr; } diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index 4dea03e..7b87967 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -204,7 +204,7 @@ static void test_click_make_new_folder_button(void) test_folder_pathW, MAX_PATH); hr = SHGetDesktopFolder(&test_folder_object); ok (SUCCEEDED(hr), "SHGetDesktopFolder failed with hr 0x%08x\n", hr); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { skip("SHGetDesktopFolder failed - skipping\n"); return; } @@ -331,7 +331,7 @@ static void test_selection(void) hr = SHGetDesktopFolder(&desktop_object); ok (SUCCEEDED(hr), "SHGetDesktopFolder failed with hr 0x%08x\n", hr); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { skip("SHGetDesktopFolder failed - skipping\n"); return; }

1 0

Michael Stefaniuc : comctl32/tests: Don't cast NULL to an int.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: 11e780ea07f370957cd1f5595a2d39842701948f URL: http://source.winehq.org/git/wine.git/?a=commit;h=11e780ea07f370957cd1f5595… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 15:25:35 2011 +0200 comctl32/tests: Don't cast NULL to an int. --- dlls/comctl32/tests/propsheet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index c6e3e9f..f6b4c7d 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -650,7 +650,7 @@ static LRESULT CALLBACK sheet_callback_messages_proc (HWND hwnd, UINT msg, WPARA static int CALLBACK sheet_callback_messages(HWND hwnd, UINT msg, LPARAM lParam) { - save_message(hwnd, msg, (WPARAM)NULL, lParam, RECEIVER_SHEET_CALLBACK); + save_message(hwnd, msg, 0, lParam, RECEIVER_SHEET_CALLBACK); switch (msg) {

1 0

Jacek Caban : mshtml: Implement nsIURI::SetUserPass on top of IUri.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: 0289530f073f0ca9150d4c6b2d152903abf0dbb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0289530f073f0ca9150d4c6b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 16:01:44 2011 +0200 mshtml: Implement nsIURI::SetUserPass on top of IUri. --- dlls/mshtml/nsio.c | 62 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 875abe9..e9f7092 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1747,28 +1747,74 @@ static nsresult NSAPI nsURI_SetScheme(nsIURL *iface, const nsACString *aScheme) static nsresult NSAPI nsURI_GetUserPass(nsIURL *iface, nsACString *aUserPass) { nsWineURI *This = impl_from_nsIURL(iface); + BSTR user, pass; + HRESULT hres; TRACE("(%p)->(%p)\n", This, aUserPass); - if(This->nsuri) - return nsIURI_GetUserPass(This->nsuri, aUserPass); + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = IUri_GetUserName(This->uri, &user); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + hres = IUri_GetPassword(This->uri, &pass); + if(FAILED(hres)) { + SysFreeString(user); + return NS_ERROR_FAILURE; + } + + if(*user || *pass) { + FIXME("Construct user:pass string\n"); + }else { + nsACString_SetData(aUserPass, ""); + } - return get_uri_string(This, Uri_PROPERTY_USER_INFO, aUserPass); + SysFreeString(user); + SysFreeString(pass); + return NS_OK; } static nsresult NSAPI nsURI_SetUserPass(nsIURL *iface, const nsACString *aUserPass) { nsWineURI *This = impl_from_nsIURL(iface); + WCHAR *user = NULL, *pass = NULL, *buf = NULL; + const char *user_pass; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aUserPass)); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetUserPass(This->nsuri, aUserPass); + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; + + nsACString_GetData(aUserPass, &user_pass); + if(*user_pass) { + WCHAR *ptr; + + buf = heap_strdupAtoW(user_pass); + if(!buf) + return NS_ERROR_OUT_OF_MEMORY; + + ptr = strchrW(buf, ':'); + if(!ptr) { + user = buf; + }else if(ptr != buf) { + *ptr++ = 0; + user = buf; + if(*ptr) + pass = ptr; + }else { + pass = buf+1; + } } - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + hres = IUriBuilder_SetUserName(This->uri_builder, user); + if(SUCCEEDED(hres)) + hres = IUriBuilder_SetPassword(This->uri_builder, pass); + + heap_free(buf); + return SUCCEEDED(hres) ? NS_OK : NS_ERROR_FAILURE; } static nsresult NSAPI nsURI_GetUsername(nsIURL *iface, nsACString *aUsername)

1 0

Alexandre Julliard : wineps: Remove unneeded GetTransform prototype.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: 49cb530ee38210fd6851e187b91eed8a6d7c4a59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49cb530ee38210fd6851e187b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 19 14:53:31 2011 +0200 wineps: Remove unneeded GetTransform prototype. --- dlls/wineps.drv/download.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index c3ea79f..a09f97a 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); -BOOL WINAPI GetTransform( HDC hdc, DWORD which, XFORM *xform ); - #define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ ( ( (DWORD)_x4 << 24 ) | \ ( (DWORD)_x3 << 16 ) | \

1 0