December 2013 - Wine-Commits

Frédéric Delanoy : msxml3: Constify a character string.
by Alexandre Julliard Dec. 18, 2013

Dec. 18, 2013

Module: wine Branch: master Commit: 1c972c598716cd06b6ff3d18af6505a3214379db URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c972c598716cd06b6ff3d18a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 17 22:17:39 2013 +0100 msxml3: Constify a character string. --- dlls/msxml3/text.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index fd8e33a..411f6eb 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -616,7 +616,7 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); - static WCHAR rnW[] = {'\r','\n',0}; + static const WCHAR rnW[] = {'\r','\n',0}; TRACE("(%p)->(%s)\n", This, debugstr_w(data));

1 0

Stefan Leichter : setupapi/tests: Test signature $Windows NT$ in SetupDiGetINFClassA too.
by Alexandre Julliard Dec. 18, 2013

Dec. 18, 2013

Module: wine Branch: master Commit: adbc691d209ffcb198f8f2d3b7d04f83f97d91e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adbc691d209ffcb198f8f2d3b… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 17 21:42:11 2013 +0100 setupapi/tests: Test signature $Windows NT$ in SetupDiGetINFClassA too. --- dlls/setupapi/tests/devinst.c | 154 +++++++++++++++++++++-------------------- 1 files changed, 80 insertions(+), 74 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index ccb6b68..319bb31 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1370,6 +1370,7 @@ static void testSetupDiGetINFClassA(void) { static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; + static const char* signatures[] = {"\"$CHICAGO$\"", "\"$Windows NT$\""}; char cn[MAX_PATH]; char filename[MAX_PATH]; @@ -1377,6 +1378,7 @@ static void testSetupDiGetINFClassA(void) BOOL retval; GUID guid; HANDLE h; + int i; if(!pSetupDiGetINFClassA) { @@ -1444,96 +1446,100 @@ static void testSetupDiGetINFClassA(void) retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) + for(i=0; i < sizeof(signatures)/sizeof(char*); i++) { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - WriteFile( h, content, sizeof(content), &count, NULL); - CloseHandle( h); - - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - - WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); + trace("testing signarture %s\n", signatures[i]); + h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(h == INVALID_HANDLE_VALUE) + { + win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); + return; + } + WriteFile( h, content, sizeof(content), &count, NULL); + CloseHandle( h); - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - WritePrivateProfileStringA("Version", "Class", "WINE", filename); + WritePrivateProfileStringA("Version", "Signature", signatures[i], filename); - count = 0xdeadbeef; - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); - ok(count == 5, "expected count==5, got %u\n", count); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - count = 0xdeadbeef; - retval = SetupDiGetINFClassA(filename, &guid, cn, 5, &count); - ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); - ok(count == 5, "expected count==5, got %u\n", count); + WritePrivateProfileStringA("Version", "Class", "WINE", filename); - count = 0xdeadbeef; - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, cn, 4, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(count == 5, "expected count==5, got %u\n", count); + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); - /* invalid parameter */ - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(NULL, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, 5, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 4, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + /* invalid parameter */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(NULL, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - DeleteFileA(filename); + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); - WritePrivateProfileStringA("Version", "ClassGUID", "WINE", filename); + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(RPC_S_INVALID_STRING_UUID == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + DeleteFileA(filename); - /* network adapter guid */ - WritePrivateProfileStringA("Version", "ClassGUID", - "{4d36e972-e325-11ce-bfc1-08002be10318}", filename); + WritePrivateProfileStringA("Version", "Signature", signatures[i], filename); + WritePrivateProfileStringA("Version", "ClassGUID", "WINE", filename); - /* this test succeeds only if the guid is known to the system */ - count = 0xdeadbeef; - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); - todo_wine - ok(count == 4, "expected count==4, got %u(%s)\n", count, cn); + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(RPC_S_INVALID_STRING_UUID == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); + + /* network adapter guid */ + WritePrivateProfileStringA("Version", "ClassGUID", + "{4d36e972-e325-11ce-bfc1-08002be10318}", filename); + + /* this test succeeds only if the guid is known to the system */ + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + todo_wine + ok(count == 4, "expected count==4, got %u(%s)\n", count, cn); - DeleteFileA(filename); + DeleteFileA(filename); + } } START_TEST(devinst)

1 0

Frédéric Delanoy : msi: Constify a character string.
by Alexandre Julliard Dec. 18, 2013

Dec. 18, 2013

Module: wine Branch: master Commit: 198344894230ae982911824af54db4023b64c84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=198344894230ae982911824af… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 17 22:17:37 2013 +0100 msi: Constify a character string. --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index c1f4fcc..f8a1874 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -359,7 +359,7 @@ static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWS BOOL succeeded = FALSE; static const WCHAR fmt[] = {'%','s',' ','P','A','T','C','H','=','"','%','s','"',0}; - static WCHAR empty[] = {0}; + static const WCHAR empty[] = {0}; if (!szPatchPackage || !szPatchPackage[0]) return ERROR_INVALID_PARAMETER;

1 0

Dmitry Timoshkov : include: Add more Task Scheduler interface definitions.
by Alexandre Julliard Dec. 18, 2013

Dec. 18, 2013

Module: wine Branch: master Commit: 0ff6879f91103b3de66ee069a56c8a0272505f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff6879f91103b3de66ee069a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 18 18:01:26 2013 +0900 include: Add more Task Scheduler interface definitions. --- include/taskschd.idl | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/include/taskschd.idl b/include/taskschd.idl index 110732f..d736788 100644 --- a/include/taskschd.idl +++ b/include/taskschd.idl @@ -93,6 +93,17 @@ typedef enum _TASK_COMPATIBILITY TASK_COMPATIBILITY_V2_1 } TASK_COMPATIBILITY; +typedef enum _TASK_CREATION +{ + TASK_VALIDATE_ONLY = 1, + TASK_CREATE = 2, + TASK_UPDATE = 4, + TASK_CREATE_OR_UPDATE = 6, + TASK_DISABLE = 8, + TASK_DONT_ADD_PRINCIPAL_ACE = 16, + TASK_IGNORE_REGISTRATION_TRIGGERS = 32 +} TASK_CREATION; + interface ITaskService; interface IRegisteredTask; interface IRegisteredTaskCollection; @@ -106,9 +117,11 @@ interface IRunningTask; interface IRunningTaskCollection; interface ITrigger; interface ITriggerCollection; +interface ITimeTrigger; interface IRepetitionPattern; interface IAction; interface IActionCollection; +interface IExecAction; interface INetworkSettings; interface IPrincipal; @@ -391,6 +404,17 @@ interface ITriggerCollection : IDispatch [ object, oleautomation, + uuid(b45747e0-eba7-4276-9f29-85c5bb300006) +] +interface ITimeTrigger : ITrigger +{ + [propget] HRESULT RandomDelay([out, retval] BSTR *delay); + [propput] HRESULT RandomDelay([in] BSTR delay); +} + +[ + object, + oleautomation, uuid(7fb9acf1-26be-400e-85b5-294b9c75dfd6) ] interface IRepetitionPattern : IDispatch @@ -437,6 +461,21 @@ interface IActionCollection : IDispatch [ object, oleautomation, + uuid(4c3d624d-fd6b-49a3-b9b7-09cb3cd3f047) +] +interface IExecAction : IAction +{ + [propget] HRESULT Path([out, retval] BSTR *path); + [propput] HRESULT Path([in] BSTR path); + [propget] HRESULT Arguments([out, retval] BSTR *argument); + [propput] HRESULT Arguments([in] BSTR argument); + [propget] HRESULT WorkingDirectory([out, retval] BSTR *directory); + [propput] HRESULT WorkingDirectory([in] BSTR directory); +} + +[ + object, + oleautomation, uuid(9f7dea84-c30b-4245-80b6-00e9f646f1b4) ] interface INetworkSettings : IDispatch

1 0

Stefan Leichter : setupapi: Support signature $Windows NT$ in SetupDiGetINFClassA/W too.
by Alexandre Julliard Dec. 18, 2013

Dec. 18, 2013

Module: wine Branch: master Commit: 6aace3014d355d355e802299d62a34e8865951ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aace3014d355d355e802299d… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 17 21:42:00 2013 +0100 setupapi: Support signature $Windows NT$ in SetupDiGetINFClassA/W too. --- dlls/setupapi/devinst.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index b1d6be0..5eaffd6 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -58,6 +58,7 @@ static const WCHAR NtPlatformExtension[] = {'.','N','T','x','8','6',0}; static const WCHAR Signature[] = {'S','i','g','n','a','t','u','r','e',0}; static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; static const WCHAR WinExtension[] = {'.','W','i','n',0}; +static const WCHAR WindowsNT[] = {'$','W','i','n','d','o','w','s',' ','N','T','$',0}; /* Registry key and value names */ static const WCHAR ControlClass[] = {'S','y','s','t','e','m','\\', @@ -4073,7 +4074,7 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, if (!GetPrivateProfileStringW(Version, Signature, NULL, buffer, MAX_PATH, inf)) return FALSE; - if (lstrcmpiW(buffer, Chicago)) + if (lstrcmpiW(buffer, Chicago) && lstrcmpiW(buffer, WindowsNT)) return FALSE; buffer[0] = '\0';

1 0

Alexandre Julliard : msvcp90: Add MSVCP_ prefix on more of the string iterator functions.
by Alexandre Julliard Dec. 17, 2013

Dec. 17, 2013

Module: wine Branch: master Commit: 0da244851fb405b06ac5596ceae6dd9a85f3fec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da244851fb405b06ac5596ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 16 21:42:05 2013 +0100 msvcp90: Add MSVCP_ prefix on more of the string iterator functions. --- dlls/msvcp80/msvcp80.spec | 144 ++++++++++++++++++++++---------------------- dlls/msvcp90/msvcp90.spec | 144 ++++++++++++++++++++++---------------------- dlls/msvcp90/string.c | 108 +++++++++++++++++----------------- 3 files changed, 198 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0da244851fb405b06ac55…

1 0

Alexandre Julliard : msvcp71: Share the string. c implementation with msvcp90.
by Alexandre Julliard Dec. 17, 2013

Dec. 17, 2013

Module: wine Branch: master Commit: 40f175f926e5bc98882c845775510f656c58eb83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40f175f926e5bc98882c84577… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 16 21:55:33 2013 +0100 msvcp71: Share the string.c implementation with msvcp90. --- dlls/msvcp71/msvcp71.spec | 6 +- dlls/msvcp71/string.c | 4226 --------------------------------------------- dlls/msvcp90/string.c | 433 +++++ 3 files changed, 436 insertions(+), 4229 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40f175f926e5bc98882c8…

1 0

Frédéric Delanoy : joy.cpl: Constify some character strings.
by Alexandre Julliard Dec. 17, 2013

Dec. 17, 2013

Module: wine Branch: master Commit: 37d1753a5d8b59ded8e8b2c1f640e8e11aeb52f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d1753a5d8b59ded8e8b2c1f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Dec 16 23:26:10 2013 +0100 joy.cpl: Constify some character strings. --- dlls/joy.cpl/main.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index d294e35..53c0eae 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(joycpl); DECLSPEC_HIDDEN HMODULE hcpl; +static const WCHAR button_class[] = {'B','u','t','t','o','n','\0'}; + /********************************************************************* * DllMain */ @@ -476,7 +478,6 @@ static void draw_joystick_buttons(HWND hwnd, struct JoystickData* data) int row = 0, col = 0; WCHAR button_label[3]; HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE); - static WCHAR button_class[] = {'B','u','t','t','o','n','\0'}; for (i = 0; i < TEST_MAX_BUTTONS; i++) { @@ -508,7 +509,6 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data) { int i; HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE); - static const WCHAR button_class[] = {'B','u','t','t','o','n','\0'}; static const WCHAR axes_names[TEST_MAX_AXES][7] = { {'X',',','Y','\0'}, {'R','x',',','R','y','\0'}, {'Z',',','R','z','\0'}, {'P','O','V','\0'} }; static const DWORD axes_idc[TEST_MAX_AXES] = { IDC_TESTGROUPXY, IDC_TESTGROUPRXRY, @@ -613,7 +613,6 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM static void draw_ff_axis(HWND hwnd, struct JoystickData *data) { HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE); - static WCHAR button_class[] = {'B','u','t','t','o','n','\0'}; RECT r; r.left = FF_AXIS_X;

1 0

Frédéric Delanoy : inetcomm: Constify some character strings.
by Alexandre Julliard Dec. 17, 2013

Dec. 17, 2013

Module: wine Branch: master Commit: c4ba190ba3a28db477e79a3a91318d35f3892624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ba190ba3a28db477e79a3a9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Dec 16 23:26:09 2013 +0100 inetcomm: Constify some character strings. --- dlls/inetcomm/pop3transport.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index d275f21..1c8bc91 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -633,7 +633,7 @@ static void POP3Transport_CallbackRecvPASSResp(IInternetTransport *iface, char * static void POP3Transport_CallbackProcessUSERResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) { - static char pass[] = "PASS "; + static const char pass[] = "PASS "; POP3Transport *This = (POP3Transport *)iface; POP3RESPONSE response; char *command; @@ -674,7 +674,7 @@ static void POP3Transport_CallbackRecvUSERResp(IInternetTransport *iface, char * static void POP3Transport_CallbackSendUSERCmd(IInternetTransport *iface, char *pBuffer, int cbBuffer) { - static char user[] = "USER "; + static const char user[] = "USER "; POP3Transport *This = (POP3Transport *)iface; char *command; int len; @@ -870,7 +870,7 @@ static HRESULT WINAPI POP3Transport_CommandAUTH(IPOP3Transport *iface, LPSTR psz static HRESULT WINAPI POP3Transport_CommandUSER(IPOP3Transport *iface, LPSTR username) { - static char user[] = "USER "; + static const char user[] = "USER "; POP3Transport *This = (POP3Transport *)iface; char *command; int len; @@ -893,7 +893,7 @@ static HRESULT WINAPI POP3Transport_CommandUSER(IPOP3Transport *iface, LPSTR use static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR password) { - static char pass[] = "PASS "; + static const char pass[] = "PASS "; POP3Transport *This = (POP3Transport *)iface; char *command; int len; @@ -917,7 +917,7 @@ static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR pas static HRESULT WINAPI POP3Transport_CommandLIST( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) { - static char list[] = "LIST %u\r\n"; + static const char list[] = "LIST %u\r\n"; static char list_all[] = "LIST\r\n"; POP3Transport *This = (POP3Transport *)iface; char *command; @@ -944,7 +944,7 @@ static HRESULT WINAPI POP3Transport_CommandLIST( static HRESULT WINAPI POP3Transport_CommandTOP( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId, DWORD cPreviewLines) { - static char top[] = "TOP %u %u\r\n"; + static const char top[] = "TOP %u %u\r\n"; POP3Transport *This = (POP3Transport *)iface; char *command; int len; @@ -966,7 +966,7 @@ static HRESULT WINAPI POP3Transport_CommandTOP( static HRESULT WINAPI POP3Transport_CommandQUIT(IPOP3Transport *iface) { - static char command[] = "QUIT\r\n"; + static const char command[] = "QUIT\r\n"; POP3Transport *This = (POP3Transport *)iface; TRACE("()\n"); @@ -979,7 +979,7 @@ static HRESULT WINAPI POP3Transport_CommandQUIT(IPOP3Transport *iface) static HRESULT WINAPI POP3Transport_CommandSTAT(IPOP3Transport *iface) { - static char stat[] = "STAT\r\n"; + static const char stat[] = "STAT\r\n"; POP3Transport *This = (POP3Transport *)iface; TRACE("\n"); @@ -991,7 +991,7 @@ static HRESULT WINAPI POP3Transport_CommandSTAT(IPOP3Transport *iface) static HRESULT WINAPI POP3Transport_CommandNOOP(IPOP3Transport *iface) { - static char noop[] = "NOOP\r\n"; + static const char noop[] = "NOOP\r\n"; POP3Transport *This = (POP3Transport *)iface; TRACE("\n"); @@ -1003,7 +1003,7 @@ static HRESULT WINAPI POP3Transport_CommandNOOP(IPOP3Transport *iface) static HRESULT WINAPI POP3Transport_CommandRSET(IPOP3Transport *iface) { - static char rset[] = "RSET\r\n"; + static const char rset[] = "RSET\r\n"; POP3Transport *This = (POP3Transport *)iface; TRACE("\n"); @@ -1016,7 +1016,7 @@ static HRESULT WINAPI POP3Transport_CommandRSET(IPOP3Transport *iface) static HRESULT WINAPI POP3Transport_CommandUIDL( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) { - static char uidl[] = "UIDL %u\r\n"; + static const char uidl[] = "UIDL %u\r\n"; static char uidl_all[] = "UIDL\r\n"; POP3Transport *This = (POP3Transport *)iface; char *command; @@ -1043,7 +1043,7 @@ static HRESULT WINAPI POP3Transport_CommandUIDL( static HRESULT WINAPI POP3Transport_CommandDELE( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) { - static char dele[] = "DELE %u\r\n"; + static const char dele[] = "DELE %u\r\n"; POP3Transport *This = (POP3Transport *)iface; char *command; int len; @@ -1065,7 +1065,7 @@ static HRESULT WINAPI POP3Transport_CommandDELE( static HRESULT WINAPI POP3Transport_CommandRETR( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) { - static char retr[] = "RETR %u\r\n"; + static const char retr[] = "RETR %u\r\n"; POP3Transport *This = (POP3Transport *)iface; char *command; int len;

1 0

Frédéric Delanoy : advapi32: Constify a character string.
by Alexandre Julliard Dec. 17, 2013

Dec. 17, 2013

Module: wine Branch: master Commit: b160c733a8d4ed72b2c76dc11d30e9a1833733b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b160c733a8d4ed72b2c76dc11… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Dec 16 23:26:07 2013 +0100 advapi32: Constify a character string. --- dlls/advapi32/cred.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 58dd72d..038eefa 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -1960,7 +1960,7 @@ BOOL WINAPI CredMarshalCredentialA( CRED_MARSHAL_TYPE type, PVOID cred, LPSTR *o static UINT cred_encode( const char *bin, unsigned int len, WCHAR *cred ) { - static char enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789#-"; + static const char enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789#-"; UINT n = 0, x; while (len > 0)

1 0