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

Francois Gouget : shdoclc: Don't duplicate menu separators.
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: 9988fc54cb692ad819ca1222063f5e1085f6a44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9988fc54cb692ad819ca12220… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 13 16:07:08 2011 +0200 shdoclc: Don't duplicate menu separators. --- dlls/shdoclc/shdoclc.rc | 7 -- po/ar.po | 156 +++++++++++++++++++++++----------------------- po/bg.po | 156 +++++++++++++++++++++++----------------------- po/ca.po | 156 +++++++++++++++++++++++----------------------- po/cs.po | 156 +++++++++++++++++++++++----------------------- po/da.po | 156 +++++++++++++++++++++++----------------------- po/de.po | 156 +++++++++++++++++++++++----------------------- po/el.po | 156 +++++++++++++++++++++++----------------------- po/en.po | 156 +++++++++++++++++++++++----------------------- po/en_US.po | 156 +++++++++++++++++++++++----------------------- po/eo.po | 156 +++++++++++++++++++++++----------------------- po/es.po | 156 +++++++++++++++++++++++----------------------- po/fa.po | 156 +++++++++++++++++++++++----------------------- po/fi.po | 156 +++++++++++++++++++++++----------------------- po/fr.po | 156 +++++++++++++++++++++++----------------------- po/he.po | 156 +++++++++++++++++++++++----------------------- po/hi.po | 156 +++++++++++++++++++++++----------------------- po/hu.po | 156 +++++++++++++++++++++++----------------------- po/it.po | 156 +++++++++++++++++++++++----------------------- po/ja.po | 156 +++++++++++++++++++++++----------------------- po/ko.po | 156 +++++++++++++++++++++++----------------------- po/lt.po | 156 +++++++++++++++++++++++----------------------- po/ml.po | 156 +++++++++++++++++++++++----------------------- po/nb_NO.po | 156 +++++++++++++++++++++++----------------------- po/nl.po | 156 +++++++++++++++++++++++----------------------- po/or.po | 156 +++++++++++++++++++++++----------------------- po/pa.po | 156 +++++++++++++++++++++++----------------------- po/pl.po | 156 +++++++++++++++++++++++----------------------- po/pt_BR.po | 156 +++++++++++++++++++++++----------------------- po/pt_PT.po | 156 +++++++++++++++++++++++----------------------- po/rm.po | 156 +++++++++++++++++++++++----------------------- po/ro.po | 156 +++++++++++++++++++++++----------------------- po/ru.po | 156 +++++++++++++++++++++++----------------------- po/sk.po | 156 +++++++++++++++++++++++----------------------- po/sl.po | 156 +++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 156 +++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 156 +++++++++++++++++++++++----------------------- po/sv.po | 156 +++++++++++++++++++++++----------------------- po/te.po | 156 +++++++++++++++++++++++----------------------- po/th.po | 156 +++++++++++++++++++++++----------------------- po/tr.po | 156 +++++++++++++++++++++++----------------------- po/uk.po | 156 +++++++++++++++++++++++----------------------- po/wa.po | 156 +++++++++++++++++++++++----------------------- po/wine.pot | 156 +++++++++++++++++++++++----------------------- po/zh_CN.po | 156 +++++++++++++++++++++++----------------------- po/zh_TW.po | 156 +++++++++++++++++++++++----------------------- 46 files changed, 3510 insertions(+), 3517 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9988fc54cb692ad819ca1…

1 0

Francois Gouget : shdoclc: One of the 'Add to Favorites' menu was missing an ellipsis.
by Alexandre Julliard June 13, 2011

June 13, 2011

1 0

Mariusz Pluciński : shell32/tests: Add test of IKnownFolderManager::GetFolderByName.
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: 304796ba0df0a9905cca73ac81591621b5690c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=304796ba0df0a9905cca73ac8… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Mon Jun 13 12:36:50 2011 +0200 shell32/tests: Add test of IKnownFolderManager::GetFolderByName. --- dlls/shell32/tests/shellpath.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 2d710dc..add59db 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -963,6 +963,19 @@ static void test_knownFolders(void) ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); } + hr = IKnownFolderManager_GetFolderByName(mgr, sWindows, &folder); + todo_wine + ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IKnownFolder_GetId(folder, &folderId); + ok(hr == S_OK, "failed to get folder id: 0x%08x\n", hr); + ok(IsEqualGUID(&folderId, &FOLDERID_Windows)==TRUE, "invalid KNOWNFOLDERID returned\n"); + + hr = IKnownFolder_Release(folder); + ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); + } + hr = IKnownFolderManager_Release(mgr); ok(hr == S_OK, "failed to release KnownFolderManager instance: 0x%08x\n", hr); }

1 0

Andrew Nguyen : dxdiag: Improve the command-line parsing.
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: 1cd007fa99278a97cec5c05f06b6914a4ed407ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd007fa99278a97cec5c05f0… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jun 13 07:13:12 2011 -0500 dxdiag: Improve the command-line parsing. --- programs/dxdiag/main.c | 151 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 104 insertions(+), 47 deletions(-) diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index 4e73b4b..3b89b19 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -25,71 +25,128 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); +struct command_line_info +{ + WCHAR outfile[MAX_PATH]; + BOOL whql_check; +}; + +static void usage(void) +{ + WINE_FIXME("Usage message box is not implemented\n"); + ExitProcess(0); +} + +static BOOL process_file_name(const WCHAR *cmdline, WCHAR *filename, size_t filename_len) +{ + const WCHAR *endptr; + size_t len; + + /* Skip any intervening spaces. */ + while (*cmdline == ' ') + cmdline++; + + /* Ignore filename quoting, if any. */ + if (*cmdline == '"' && (endptr = strrchrW(cmdline, '"'))) + { + /* Reject a string with only one quote. */ + if (cmdline == endptr) + return FALSE; + + cmdline++; + } + else + endptr = cmdline + strlenW(cmdline); + + len = endptr - cmdline; + if (len == 0 || len >= filename_len) + return FALSE; + + memcpy(filename, cmdline, len * sizeof(WCHAR)); + filename[len] = '\0'; + + return TRUE; +} + /* - Process options [/WHQL:ON|OFF][/X outfile][/T outfile] + Process options [/WHQL:ON|OFF][/X outfile|/T outfile] Returns TRUE if options were present, FALSE otherwise - FIXME: Native behavior seems to be: Only one of /X and /T is allowed, /WHQL must come before /X and /T, - quotes are optional around the filename, even if it contains spaces. + and the rest of the command line after /X or /T is interpreted as a + filename. If a non-option portion of the command line is encountered, + dxdiag assumes that the string is a filename for the /T option. + + Native does not interpret quotes, but quotes are parsed here because of how + Wine handles the command line. */ -static BOOL ProcessCommandLine(const WCHAR *s) +static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info *info) { - WCHAR outfile[MAX_PATH+1]; - int opt_t = FALSE; - int opt_x = FALSE; - int opt_help = FALSE; - int opt_given = FALSE; - int want_arg = FALSE; - - outfile[0] = 0; - while (*s) { + static const WCHAR whql_colonW[] = {'w','h','q','l',':',0}; + static const WCHAR offW[] = {'o','f','f',0}; + static const WCHAR onW[] = {'o','n',0}; + + info->whql_check = FALSE; + + while (*cmdline) + { /* Skip whitespace before arg */ - while (*s == ' ') - s++; - /* Check for option */ - if (*s != '-' && *s != '/') - return FALSE; - s++; - switch (*s++) { + while (*cmdline == ' ') + cmdline++; + + /* If no option is specified, treat the command line as a filename. */ + if (*cmdline != '-' && *cmdline != '/') + return process_file_name(cmdline, info->outfile, sizeof(info->outfile)/sizeof(WCHAR)); + + cmdline++; + + switch (*cmdline) + { case 'T': - case 't': opt_t = TRUE; want_arg = TRUE; opt_given = TRUE; break; + case 't': + return process_file_name(cmdline + 1, info->outfile, sizeof(info->outfile)/sizeof(WCHAR)); case 'X': - case 'x': opt_x = TRUE; want_arg = TRUE; opt_given = TRUE; break; + case 'x': + return process_file_name(cmdline + 1, info->outfile, sizeof(info->outfile)/sizeof(WCHAR)); case 'W': case 'w': - opt_given = TRUE; - while (isalphaW(*s) || *s == ':') - s++; - break; - default: opt_help = TRUE; opt_given = TRUE; break; - } - /* Skip any spaces before next option or filename */ - while (*s == ' ') - s++; - if (want_arg) { - int i; - if (*s == '"') - s++; - for (i=0; i < MAX_PATH && *s && *s != '"'; i++, s++) - outfile[i] = *s; - outfile[i] = 0; + if (strncmpiW(cmdline, whql_colonW, 5)) + return FALSE; + + cmdline += 5; + + if (!strncmpiW(cmdline, offW, 3)) + { + info->whql_check = FALSE; + cmdline += 2; + } + else if (!strncmpiW(cmdline, onW, 2)) + { + info->whql_check = TRUE; + cmdline++; + } + else + return FALSE; + break; + default: + return FALSE; } + + cmdline++; } - if (opt_help) - WINE_FIXME("help unimplemented\n"); - if (opt_t) - WINE_FIXME("/t unimplemented\n"); - if (opt_x) - WINE_FIXME("/x unimplemented\n"); - return opt_given; + + return TRUE; } int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { - if (ProcessCommandLine(cmdline)) - return 0; + struct command_line_info info; + + if (!process_command_line(cmdline, &info)) + usage(); + + WINE_TRACE("WHQL check: %s\n", info.whql_check ? "TRUE" : "FALSE"); return 0; }

1 0

Jacek Caban : shobjidl.idl: Added IApplicationAssociationRegistration declaration.
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: d8cac6ff579801d4721721c4fbb67cdc16b14ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8cac6ff579801d4721721c4f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 13 14:39:54 2011 +0200 shobjidl.idl: Added IApplicationAssociationRegistration declaration. --- include/shobjidl.idl | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 86f5ecb..40bca76 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3071,6 +3071,55 @@ cpp_quote(" CoTaskMemFree(pKFD->pszIcon);") cpp_quote(" CoTaskMemFree(pKFD->pszSecurity);") cpp_quote("}") +typedef [v1_enum] enum ASSOCIATIONLEVEL { + AL_MACHINE, + AL_EFFECTIVE, + AL_USER +} ASSOCIATIONLEVEL; + +typedef [v1_enum] enum ASSOCIATIONTYPE { + AT_FILEEXTENSION, + AT_URLPROTOCOL, + AT_STARTMENUCLIENT, + AT_MIMETYPE +} ASSOCIATIONTYPE; + +[ + object, + uuid(4e530b0a-e611-4c77-a3ac-9031d022281b), + pointer_default(unique) +] +interface IApplicationAssociationRegistration : IUnknown +{ + HRESULT QueryCurrentDefault( + [in, string] LPCWSTR pszQuery, + [in] ASSOCIATIONTYPE atQueryType, + [in] ASSOCIATIONLEVEL alQueryLevel, + [out, string] LPWSTR *ppszAssociation); + + HRESULT QueryAppIsDefault( + [in, string] LPCWSTR pszQuery, + [in] ASSOCIATIONTYPE atQueryType, + [in] ASSOCIATIONLEVEL alQueryLevel, + [in, string] LPCWSTR pszAppRegistryName, + [out] BOOL *pfDefault); + + HRESULT QueryAppIsDefaultAll( + [in] ASSOCIATIONLEVEL alQueryLevel, + [in, string] LPCWSTR pszAppRegistryName, + [out] BOOL* pfDefault); + + HRESULT SetAppAsDefault( + [in, string] LPCWSTR pszAppRegistryName, + [in, string] LPCWSTR pszSet, + [in] ASSOCIATIONTYPE atSetType); + + HRESULT SetAppAsDefaultAll( + [in, string] LPCWSTR pszAppRegistryName); + + HRESULT ClearUserAssociations(); +} + /***************************************************************************** * ShellObjects typelibrary */

1 0

Lauri Kenttä : ws2_32/tests: Make sure that a structure is initialized (LLVM/Clang).
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: 69ab564f5d4195c4205a28cf6a3077f3f055b35d URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ab564f5d4195c4205a28cf6… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Jun 10 23:38:38 2011 +0300 ws2_32/tests: Make sure that a structure is initialized (LLVM/Clang). --- dlls/ws2_32/tests/sock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 44539a8..ef01ed2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3937,6 +3937,8 @@ static void test_WSARecv(void) DWORD dwret; BOOL bret; + memset(&ov, 0, sizeof(ov)); + tcp_socketpair(&src, &dest); if (src == INVALID_SOCKET || dest == INVALID_SOCKET) { @@ -3948,7 +3950,6 @@ static void test_WSARecv(void) bufs.buf = buf; flags = 0; - memset(&ov, 0, sizeof(ov)); ov.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError()); if (!ov.hEvent)

1 0

Alexandre Julliard : widl: Default to the cdecl calling convention in client/server functions.
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: 717bd66440522c8ed16af3ca58d822281c5479b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=717bd66440522c8ed16af3ca5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 13:40:05 2011 +0200 widl: Default to the cdecl calling convention in client/server functions. --- dlls/rpcrt4/tests/server.c | 225 +++++++++++++++----------------------------- programs/rpcss/epmp.c | 76 ++++++++-------- programs/rpcss/irotp.c | 14 ++-- programs/services/rpc.c | 109 +++++++++------------- tools/widl/client.c | 4 +- tools/widl/header.c | 4 +- 6 files changed, 170 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=717bd66440522c8ed16af…

1 0

Alexandre Julliard : kernel32: Fix some 64-bit issues in GlobalSize().
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: 4b12e9c5a033d214831d9aa80ba986b04faf43b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b12e9c5a033d214831d9aa80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 11:40:53 2011 +0200 kernel32: Fix some 64-bit issues in GlobalSize(). --- dlls/kernel32/heap.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 4ade995..598bfe4 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -808,7 +808,7 @@ HGLOBAL WINAPI GlobalFree(HGLOBAL hmem) */ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) { - DWORD retval; + SIZE_T retval; PGLOBAL32_INTERN pintern; if (!((ULONG_PTR)hmem >> 16)) @@ -821,10 +821,10 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) { retval=HeapSize(GetProcessHeap(), 0, hmem); - if (retval == (DWORD)-1) /* It might be a GMEM_MOVEABLE data pointer */ + if (retval == ~0ul) /* It might be a GMEM_MOVEABLE data pointer */ { - retval = HeapSize(GetProcessHeap(), 0, (char*)(hmem) - HGLOBAL_STORAGE); - if (retval != (DWORD)-1) retval -= HGLOBAL_STORAGE; + retval = HeapSize(GetProcessHeap(), 0, (char*)hmem - HGLOBAL_STORAGE); + if (retval != ~0ul) retval -= HGLOBAL_STORAGE; } } else @@ -838,9 +838,8 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) retval = 0; else { - retval = HeapSize(GetProcessHeap(), 0, - (char *)(pintern->Pointer) - HGLOBAL_STORAGE ); - if (retval != (DWORD)-1) retval -= HGLOBAL_STORAGE; + retval = HeapSize(GetProcessHeap(), 0, (char *)pintern->Pointer - HGLOBAL_STORAGE ); + if (retval != ~0ul) retval -= HGLOBAL_STORAGE; } } else @@ -851,8 +850,7 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) } RtlUnlockHeap(GetProcessHeap()); } - /* HeapSize returns 0xffffffff on failure */ - if (retval == 0xffffffff) retval = 0; + if (retval == ~0ul) retval = 0; return retval; }

1 0

Francois Gouget : d3dx9_36/tests: Add a '\n' to a trace() call.
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: 07436dd465a84dbff7a64a7f07d8cb4a1957be5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=07436dd465a84dbff7a64a7f0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 20:20:44 2011 +0200 d3dx9_36/tests: Add a '\n' to a trace() call. --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 9b924fd..668097f 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1855,7 +1855,7 @@ static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_CreateMeshContainer(ID3DXAllo } else { ok(mesh_data->Type == D3DXMESHTYPE_PATCHMESH, "Unknown mesh type %u\n", mesh_data->Type); if (mesh_data->Type == D3DXMESHTYPE_PATCHMESH) - trace("FIXME: copying adjacency data for patch mesh not implemented"); + trace("FIXME: copying adjacency data for patch mesh not implemented\n"); } }

1 0

Alexandre Julliard : rpcrt4: Fix handling of complex types of return values on the server side.
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: 1c632ffe8e6f153b1d2f413d8d16daad82c3e4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c632ffe8e6f153b1d2f413d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 15:11:40 2011 +0200 rpcrt4: Fix handling of complex types of return values on the server side. --- dlls/rpcrt4/ndr_stubless.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 0f54211..436dccf 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1078,10 +1078,6 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, TRACE("\tbase type: 0x%02x\n", *pTypeFormat); - /* make a note of the address of the return value parameter for later */ - if (pParam->param_attributes.IsReturn) - retval_ptr = (LONG_PTR *)pArg; - switch (phase) { case STUBLESS_MARSHAL: @@ -1222,6 +1218,9 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, current_offset += sizeof(NDR_PARAM_OIF_OTHER); } TRACE("\tmemory addr (after): %p -> %p\n", pArg, *(unsigned char **)pArg); + + /* make a note of the address of the return value parameter for later */ + if (pParam->param_attributes.IsReturn) retval_ptr = (LONG_PTR *)pArg; } return retval_ptr;

1 0