September 2008 - Wine-Commits

Michael Stefaniuc : wordpad: Fix the Hungarian translation by removing an untranslated and incomplete STRINGTABLE .
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: d94a90273ef85525faf4a85ef5e57c5e223657a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94a90273ef85525faf4a85ef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Sep 6 00:15:03 2008 +0200 wordpad: Fix the Hungarian translation by removing an untranslated and incomplete STRINGTABLE. --- programs/wordpad/Hu.rc | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 254f435..b5ea2d7 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -222,16 +222,3 @@ STRINGTABLE DISCARDABLE BEGIN STRING_UNITS_CM, "cm" END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_DEFAULT_FILENAME, "Document" - STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" - STRING_SEARCH_FINISHED, "Finished searching the document." - STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." - STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, " \ - "which will cause all formatting to be lost. " \ - "Are you sure that you wish to do this?" - STRING_INVALID_NUMBER, "Invalid number format" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" -END

1 0

Michael Stefaniuc : shell32: Fix the Ca, Hu, Ro, Sk, Sv and Wa translations by removing an untranslated string.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: c425b431929235f05ed8a9d4f86f47bb9d62465a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c425b431929235f05ed8a9d4f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Sep 6 00:14:34 2008 +0200 shell32: Fix the Ca, Hu, Ro, Sk, Sv and Wa translations by removing an untranslated string. --- dlls/shell32/shell32_Ca.rc | 1 - dlls/shell32/shell32_Hu.rc | 1 - dlls/shell32/shell32_Ro.rc | 1 - dlls/shell32/shell32_Sk.rc | 1 - dlls/shell32/shell32_Sv.rc | 1 - dlls/shell32/shell32_Wa.rc | 1 - 6 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_Ca.rc b/dlls/shell32/shell32_Ca.rc index 930d6a9..44e4e05 100644 --- a/dlls/shell32/shell32_Ca.rc +++ b/dlls/shell32/shell32_Ca.rc @@ -94,7 +94,6 @@ FONT 8, "MS Shell Dlg" STRINGTABLE { - IDS_CPANEL_TITLE "Wine Control Panel" IDS_CPANEL_NAME "Name" IDS_CPANEL_DESCRIPTION "Description" } diff --git a/dlls/shell32/shell32_Hu.rc b/dlls/shell32/shell32_Hu.rc index 814e0c6..9b1c198 100644 --- a/dlls/shell32/shell32_Hu.rc +++ b/dlls/shell32/shell32_Hu.rc @@ -93,7 +93,6 @@ FONT 8, "MS Shell Dlg" STRINGTABLE { - IDS_CPANEL_TITLE "Wine Control Panel" IDS_CPANEL_NAME "Name" IDS_CPANEL_DESCRIPTION "Description" } diff --git a/dlls/shell32/shell32_Ro.rc b/dlls/shell32/shell32_Ro.rc index 25b4565..e1a652e 100644 --- a/dlls/shell32/shell32_Ro.rc +++ b/dlls/shell32/shell32_Ro.rc @@ -232,7 +232,6 @@ STRINGTABLE IDS_PERSONAL "Documentele mele" IDS_FAVORITES "Favorite" - IDS_CPANEL_TITLE "Wine Control Panel" IDS_CPANEL_NAME "Name" IDS_CPANEL_DESCRIPTION "Description" } diff --git a/dlls/shell32/shell32_Sk.rc b/dlls/shell32/shell32_Sk.rc index 2df139d..6ce1f54 100644 --- a/dlls/shell32/shell32_Sk.rc +++ b/dlls/shell32/shell32_Sk.rc @@ -104,7 +104,6 @@ BEGIN IDS_SHV_COLUMN8 "Name" /*FIXME*/ IDS_SHV_COLUMN9 "Comments" /*FIXME*/ - IDS_CPANEL_TITLE "Wine Control Panel" IDS_CPANEL_NAME "Name" IDS_CPANEL_DESCRIPTION "Description" END diff --git a/dlls/shell32/shell32_Sv.rc b/dlls/shell32/shell32_Sv.rc index c65af34..3cd7591 100644 --- a/dlls/shell32/shell32_Sv.rc +++ b/dlls/shell32/shell32_Sv.rc @@ -93,7 +93,6 @@ FONT 8, "MS Shell Dlg" STRINGTABLE { - IDS_CPANEL_TITLE "Wine Control Panel" IDS_CPANEL_NAME "Name" IDS_CPANEL_DESCRIPTION "Description" } diff --git a/dlls/shell32/shell32_Wa.rc b/dlls/shell32/shell32_Wa.rc index 393d65d..c92e7d2 100644 --- a/dlls/shell32/shell32_Wa.rc +++ b/dlls/shell32/shell32_Wa.rc @@ -98,7 +98,6 @@ FONT 8, "MS Shell Dlg" STRINGTABLE { - IDS_CPANEL_TITLE "Wine Control Panel" IDS_CPANEL_NAME "Name" IDS_CPANEL_DESCRIPTION "Description" }

1 0

Rob Shearman : rpcrt4: Fix typo in unescape_string_binding_componentW.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: f2e47cc2a20b6976e4d6345ab78407bde0d8c580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e47cc2a20b6976e4d6345ab… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 5 22:08:42 2008 +0100 rpcrt4: Fix typo in unescape_string_binding_componentW. string_binding is of type "const WCHAR *" so we shouldn't be calling strlen on it, we should be calling strlenW on it. --- dlls/rpcrt4/rpc_binding.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 6a17a8c..db46b8c 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -435,7 +435,7 @@ static RPC_WSTR unescape_string_binding_componentW( { RPC_WSTR component, p; - if (len == -1) len = strlen((const char *)string_binding); + if (len == -1) len = strlenW(string_binding); component = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(*component)); if (!component) return NULL;

1 0

Rob Shearman : rpcrt4: Only start the RpcSs process for handles to the local server.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 170dd5ff8dc4cc167e1de02df5c9f11d6ed64e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=170dd5ff8dc4cc167e1de02df… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 5 22:09:11 2008 +0100 rpcrt4: Only start the RpcSs process for handles to the local server. --- dlls/rpcrt4/rpc_epmap.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 6f77475..5776d22 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -114,6 +114,17 @@ static BOOL start_rpcss(void) return rslt; } +static inline BOOL is_epm_destination_local(RPC_BINDING_HANDLE handle) +{ + RpcBinding *bind = (RpcBinding *)handle; + const char *protseq = bind->Protseq; + const char *network_addr = bind->NetworkAddr; + + return ((!strcmp(protseq, "ncalrpc") && !network_addr) || + (!strcmp(protseq, "ncacn_np") && + (!network_addr || !strcmp(network_addr, ".")))); +} + static RPC_STATUS get_epm_handle_client(RPC_BINDING_HANDLE handle, RPC_BINDING_HANDLE *epm_handle) { RpcBinding *bind = (RpcBinding *)handle; @@ -243,7 +254,8 @@ RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *Bind status2 = GetExceptionCode(); } __ENDTRY - if (status2 == RPC_S_SERVER_UNAVAILABLE) + if (status2 == RPC_S_SERVER_UNAVAILABLE && + is_epm_destination_local(handle)) { if (start_rpcss()) continue; @@ -407,7 +419,8 @@ RPC_STATUS WINAPI RpcEpResolveBinding( RPC_BINDING_HANDLE Binding, RPC_IF_HANDLE status2 = GetExceptionCode(); } __ENDTRY - if (status2 == RPC_S_SERVER_UNAVAILABLE) + if (status2 == RPC_S_SERVER_UNAVAILABLE && + is_epm_destination_local(handle)) { if (start_rpcss()) continue;

1 0

Rob Shearman : shell32: Remove defines for WINE_FILEVERSION and WINE_FILEVERSION_STR.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 55f12a3b63323bdc16ea2ccdf9806dfc05b15f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f12a3b63323bdc16ea2ccdf… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 5 22:07:37 2008 +0100 shell32: Remove defines for WINE_FILEVERSION and WINE_FILEVERSION_STR. These are now constructed automatically from the major, minor, build and platform ID numbers defined in version.h. --- dlls/shell32/version.h | 4 ---- dlls/shell32/version.rc | 1 - 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/version.h b/dlls/shell32/version.h index cd0d8db..aedf231 100644 --- a/dlls/shell32/version.h +++ b/dlls/shell32/version.h @@ -22,7 +22,3 @@ #define WINE_FILEVERSION_MINOR 0 #define WINE_FILEVERSION_BUILD 3900 #define WINE_FILEVERSION_PLATFORMID 6975 - -/* FIXME: when libs/wpp gets fixed to support concatenation we can remove - * this and define it in version.rc */ -#define WINE_FILEVERSION_STR "5.0.3900.6975" diff --git a/dlls/shell32/version.rc b/dlls/shell32/version.rc index a5e23dd..046387a 100644 --- a/dlls/shell32/version.rc +++ b/dlls/shell32/version.rc @@ -21,7 +21,6 @@ #include "version.h" #define WINE_OLESELFREGISTER -#define WINE_FILEVERSION WINE_FILEVERSION_MAJOR,WINE_FILEVERSION_MINOR,WINE_FILEVERSION_BUILD,WINE_FILEVERSION_PLATFORMID #define WINE_FILENAME_STR "shell32.dll" #include <wine/wine_common_ver.rc>

1 0

Rob Shearman : wine_common_ver.rc: Allow the file version number and string to be automatically constructed from major , minor, build and platform ID numbers.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 0b2e574273d419cce155cb97ab16bcce5e0a2bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b2e574273d419cce155cb97a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 5 22:07:32 2008 +0100 wine_common_ver.rc: Allow the file version number and string to be automatically constructed from major, minor, build and platform ID numbers. --- include/wine/wine_common_ver.rc | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 8a4ae3b..f1a4644 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -27,12 +27,32 @@ to make sure that programs, relying on the version numbers, will never complain. */ +#ifndef WINE_FILEVERSION_MAJOR +#define WINE_FILEVERSION_MAJOR 10 +#endif + +#ifndef WINE_FILEVERSION_MINOR +#define WINE_FILEVERSION_MINOR 0 +#endif + +#ifndef WINE_FILEVERSION_BUILD +#define WINE_FILEVERSION_BUILD 0 +#endif + +#ifndef WINE_FILEVERSION_PLATFORMID +#define WINE_FILEVERSION_PLATFORMID 0 +#endif + #ifndef WINE_FILEVERSION -#define WINE_FILEVERSION 10,0,0,0 +#define WINE_FILEVERSION WINE_FILEVERSION_MAJOR,WINE_FILEVERSION_MINOR,\ + WINE_FILEVERSION_BUILD,WINE_FILEVERSION_PLATFORMID #endif +#define WINE_VER_STRINGIZE2(x) #x +#define WINE_VER_STRINGIZE(x) WINE_VER_STRINGIZE2(x) + #ifndef WINE_FILEVERSION_STR -#define WINE_FILEVERSION_STR "10.0" +#define WINE_FILEVERSION_STR WINE_VER_STRINGIZE(WINE_FILEVERSION_MAJOR.WINE_FILEVERSION_MINOR.WINE_FILEVERSION_BUILD.WINE_FILEVERSION_PLATFORMID) #endif #ifndef WINE_FILEDESCRIPTION_STR

1 0

Andrew Talbot : qcap: Sign-compare warning fix.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: a4dc5ba3cb44593b2b6b3307c7bb630a087b7a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4dc5ba3cb44593b2b6b3307c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 5 20:26:44 2008 +0100 qcap: Sign-compare warning fix. --- dlls/qcap/enummedia.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/enummedia.c b/dlls/qcap/enummedia.c index 87a6e2d..a4df6b3 100644 --- a/dlls/qcap/enummedia.c +++ b/dlls/qcap/enummedia.c @@ -167,7 +167,7 @@ static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) if (!refCount) { - int i; + ULONG i; for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) if (This->enumMediaDetails.pMediaTypes[i].pbFormat) CoTaskMemFree(This->enumMediaDetails.pMediaTypes[i].pbFormat);

1 0

Andrew Talbot : qmgr: Sign-compare warnings fix.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 201cbd3efa1860c9f5aec394c3e0a34c05b0e932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=201cbd3efa1860c9f5aec394c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 5 20:26:47 2008 +0100 qmgr: Sign-compare warnings fix. --- dlls/qmgr/qmgr_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c index 5094874..9c6b345 100644 --- a/dlls/qmgr/qmgr_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -76,7 +76,7 @@ static HRESULT init_register_strtable(STRTABLEA *strtable) }; #undef CLSID_EXPANSION_ENTRY static STRENTRYA pse[sizeof expns / sizeof expns[0]]; - int i; + DWORD i; strtable->cEntries = sizeof pse / sizeof pse[0]; strtable->pse = pse; @@ -98,7 +98,7 @@ static HRESULT init_register_strtable(STRTABLEA *strtable) static void cleanup_register_strtable(STRTABLEA *strtable) { - int i; + DWORD i; for (i = 0; i < strtable->cEntries; i++) { HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName); HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue);

1 0

Michael Stefaniuc : user32/tests: Remove unreachable break after return ( Smatch).
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: a38d47f27fccffe171bb2ac8733430e9bb660c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38d47f27fccffe171bb2ac87… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 5 22:02:57 2008 +0200 user32/tests: Remove unreachable break after return (Smatch). --- dlls/user32/tests/dde.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index cc5e47c..968cd26 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2143,7 +2143,6 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ok(msg_index == 1 || msg_index == 7 || msg_index == 13 || msg_index == 19, "Expected 1, 7, 13 or 19, got %d\n", msg_index); return (HDDEDATA)TRUE; - break; } case XTYP_CONNECT: @@ -2167,7 +2166,6 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ok(size == 14, "Expected 14, got %d, msg_index=%d\n", size, msg_index); return (HDDEDATA) TRUE; - break; } case XTYP_CONNECT_CONFIRM: { @@ -2262,10 +2260,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV return (HDDEDATA) DDE_FACK; } case XTYP_DISCONNECT: - { return (HDDEDATA) TRUE; - break; - } default: ok(FALSE, "Unhandled msg: %08x, msg_index=%d\n", uType, msg_index); @@ -2281,10 +2276,7 @@ static HDDEDATA CALLBACK client_end_to_end_callback(UINT uType, UINT uFmt, HCONV switch (uType) { case XTYP_DISCONNECT: - { return (HDDEDATA) TRUE; - break; - } default: ok(FALSE, "Unhandled msg: %08x\n", uType);

1 0

Jeff Zaroyko : wined3d: Add missing HeapFree.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 6a14bcc824bf8aea4ca806edbfe356356d08f4c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a14bcc824bf8aea4ca806edb… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Sat Sep 6 02:17:34 2008 +1000 wined3d: Add missing HeapFree. --- dlls/wined3d/arb_program_shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7fa88c0..a8d5633 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2897,6 +2897,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB FIXME("Vertex program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } + HeapFree(GetProcessHeap(), 0, buffer.buffer); return ret; }

1 0