May 2008 - Wine-Commits - list.winehq.org

Paul Vriens : setupapi/tests: Turn guid into a global variable.
by Alexandre Julliard May 26, 2008

May 26, 2008

Module: wine Branch: master Commit: d9b673f91a3828f3a9a570db9cc7787e470501a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9b673f91a3828f3a9a570db9… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon May 26 11:45:25 2008 +0200 setupapi/tests: Turn guid into a global variable. --- dlls/setupapi/tests/devinst.c | 24 +++--------------------- 1 files changed, 3 insertions(+), 21 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index f29ce34..4b8dd5a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -57,6 +57,9 @@ static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVIN static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); +/* This is a unique guid for testing purposes */ +static GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; + static void init_function_pointers(void) { hSetupAPI = GetModuleHandleA("setupapi.dll"); @@ -194,9 +197,6 @@ static void test_SetupDiCreateDeviceInfoListEx(void) static void test_SetupDiOpenClassRegKeyExA(void) { - /* This is a unique guid for testing purposes */ - GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, - 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; static const CHAR guidString[] = "{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; HKEY hkey; @@ -340,8 +340,6 @@ static void testCreateDeviceInfo(void) { BOOL ret; HDEVINFO set; - GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, - 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; if (!pSetupDiCreateDeviceInfoList || !pSetupDiEnumDeviceInfo || !pSetupDiDestroyDeviceInfoList || !pSetupDiCreateDeviceInfoA) @@ -424,8 +422,6 @@ static void testGetDeviceInstanceId(void) { BOOL ret; HDEVINFO set; - GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, - 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; SP_DEVINFO_DATA devInfo = { 0 }; if (!pSetupDiCreateDeviceInfoList || !pSetupDiDestroyDeviceInfoList || @@ -494,8 +490,6 @@ static void testGetDeviceInstanceId(void) static void testRegisterDeviceInfo(void) { BOOL ret; - GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, - 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; HDEVINFO set; if (!pSetupDiCreateDeviceInfoList || !pSetupDiDestroyDeviceInfoList || @@ -550,8 +544,6 @@ static void testRegisterDeviceInfo(void) static void testCreateDeviceInterface(void) { BOOL ret; - GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, - 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; HDEVINFO set; if (!pSetupDiCreateDeviceInfoList || !pSetupDiDestroyDeviceInfoList || @@ -623,8 +615,6 @@ static void testCreateDeviceInterface(void) static void testGetDeviceInterfaceDetail(void) { BOOL ret; - GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, - 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; HDEVINFO set; if (!pSetupDiCreateDeviceInfoList || !pSetupDiDestroyDeviceInfoList || @@ -736,8 +726,6 @@ static void testDevRegKey(void) '1','1','d','b','-','b','7','0','4','-', '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; BOOL ret; - GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, - 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; HDEVINFO set; if (!pSetupDiCreateDeviceInfoList || !pSetupDiDestroyDeviceInfoList || @@ -837,8 +825,6 @@ static void testRegisterAndGetDetail(void) { HDEVINFO set; BOOL ret; - GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, - 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; SP_DEVINFO_DATA devInfo = { sizeof(SP_DEVINFO_DATA), { 0 } }; SP_DEVICE_INTERFACE_DATA interfaceData = { sizeof(interfaceData), { 0 } }; DWORD dwSize = 0; @@ -899,8 +885,6 @@ static void testRegisterAndGetDetail(void) static void testDeviceRegistryPropertyA() { HDEVINFO set; - GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, - 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; SP_DEVINFO_DATA devInfo = { sizeof(SP_DEVINFO_DATA), { 0 } }; CHAR devName[] = "LEGACY_BOGUS"; CHAR friendlyName[] = "Bogus"; @@ -990,8 +974,6 @@ static void testDeviceRegistryPropertyA() static void testDeviceRegistryPropertyW() { HDEVINFO set; - GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, - 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; SP_DEVINFO_DATA devInfo = { sizeof(SP_DEVINFO_DATA), { 0 } }; WCHAR devName[] = {'L','E','G','A','C','Y','_','B','O','G','U','S',0}; WCHAR friendlyName[] = {'B','o','g','u','s',0};

1 0

Paul Vriens : setupapi/tests: Fix a test on NT4.
by Alexandre Julliard May 26, 2008

May 26, 2008

Module: wine Branch: master Commit: b1b4063c0ba95ef9177a144cb021041486986a2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b4063c0ba95ef9177a144cb… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon May 26 11:32:37 2008 +0200 setupapi/tests: Fix a test on NT4. --- dlls/setupapi/tests/devinst.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 6896646..f29ce34 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -760,8 +760,9 @@ static void testDevRegKey(void) ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); key = pSetupDiOpenDevRegKey(NULL, NULL, 0, 0, 0, 0); - ok(key == INVALID_HANDLE_VALUE && - GetLastError() == ERROR_INVALID_HANDLE, + ok(!key || key == INVALID_HANDLE_VALUE, + "Expected INVALID_HANDLE_VALUE or a NULL key (NT4)\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); SetLastError(0xdeadbeef); key = pSetupDiOpenDevRegKey(set, NULL, 0, 0, 0, 0);

1 0

Dan Kegel : winmm: Use HeapAlloc in the capture test instead of using strdup.
by Alexandre Julliard May 26, 2008

May 26, 2008

Module: wine Branch: master Commit: b608e39e1f3eeae36b190d07e14ec2a22ae14591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b608e39e1f3eeae36b190d07e… Author: Dan Kegel <dank(a)kegel.com> Date: Mon May 26 10:12:46 2008 -0700 winmm: Use HeapAlloc in the capture test instead of using strdup. --- dlls/winmm/tests/capture.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index e0975df..fb02d40 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -385,7 +385,8 @@ static void wave_in_test_device(int device) } HeapFree(GetProcessHeap(), 0, nameW); } else if (rc==MMSYSERR_NOTSUPPORTED) { - nameA=strdup("not supported"); + nameA=HeapAlloc(GetProcessHeap(), 0, sizeof("not supported")); + strcpy(nameA, "not supported"); } trace(" %s: \"%s\" (%s) %d.%d (%d:%d)\n",dev_name(device),capsA.szPname,

1 0

Paul Vriens : setupapi/tests: Cleanup after testDevRegKey.
by Alexandre Julliard May 26, 2008

May 26, 2008

Module: wine Branch: master Commit: 82fcb7a5c3c9d21345f6faf8ec87dfd386a469be URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fcb7a5c3c9d21345f6faf8e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon May 26 15:41:31 2008 +0200 setupapi/tests: Cleanup after testDevRegKey. --- dlls/setupapi/tests/devinst.c | 84 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 986d1ae..0078dfb 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -89,6 +89,33 @@ static void init_function_pointers(void) pSetupDiGetDeviceRegistryPropertyW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceRegistryPropertyW"); } +static BOOL remove_device(void) +{ + HDEVINFO set; + SP_DEVINFO_DATA devInfo = { sizeof(devInfo), { 0 } }; + BOOL ret; + + SetLastError(0xdeadbeef); + set = pSetupDiGetClassDevsA(&guid, NULL, 0, 0); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsA failed: %08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ok(pSetupDiEnumDeviceInfo(set, 0, &devInfo), + "SetupDiEnumDeviceInfo failed: %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetupDiCallClassInstaller(DIF_REMOVE, set, &devInfo); + todo_wine + ok(ret, "SetupDiCallClassInstaller(DIF_REMOVE...) failed: %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ok(pSetupDiDestroyDeviceInfoList(set), + "SetupDiDestroyDeviceInfoList failed: %08x\n", GetLastError()); + + return ret; +} + /* RegDeleteTreeW from dlls/advapi32/registry.c */ LSTATUS WINAPI devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) { @@ -725,6 +752,10 @@ static void testDevRegKey(void) '{','6','a','5','5','b','5','a','4','-','3','f','6','5','-', '1','1','d','b','-','b','7','0','4','-', '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; + static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'E','n','u','m','\\','R','o','o','t','\\', + 'L','E','G','A','C','Y','_','B','O','G','U','S',0}; BOOL ret; HDEVINFO set; HKEY key = NULL; @@ -756,10 +787,24 @@ static void testDevRegKey(void) if (set) { SP_DEVINFO_DATA devInfo = { sizeof(devInfo), { 0 } }; + LONG res; + /* The device info key shouldn't be there */ + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key); + /* Due to old winetests we could have leftovers and hence the + * todo_wine. + */ + todo_wine + ok(res != ERROR_SUCCESS, "Expected key to not exist\n"); + RegCloseKey(key); + /* Create the device information */ ret = pSetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &devInfo); ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); + /* The device info key should have been created */ + ok(!RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key), + "Expected registry key to exist\n"); + RegCloseKey(key); SetLastError(0xdeadbeef); key = pSetupDiOpenDevRegKey(NULL, NULL, 0, 0, 0, 0); ok(!key || key == INVALID_HANDLE_VALUE, @@ -812,11 +857,21 @@ static void testDevRegKey(void) GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Expected ERROR_KEY_DOES_NOT_EXIST_EXIST, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); + /* The class key shouldn't be there */ + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, classKey, &key); + todo_wine + ok(res != ERROR_SUCCESS, "Expected key to not exist\n"); + RegCloseKey(key); + /* Create the device reg key */ key = pSetupDiCreateDevRegKeyW(set, &devInfo, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); ok(key != INVALID_HANDLE_VALUE, "SetupDiCreateDevRegKey failed: %08x\n", GetLastError()); RegCloseKey(key); + /* The class key should have been created */ + ok(!RegOpenKeyW(HKEY_LOCAL_MACHINE, classKey, &key), + "Expected registry key to exist\n"); + RegCloseKey(key); SetLastError(0xdeadbeef); key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); @@ -829,10 +884,31 @@ static void testDevRegKey(void) DIREG_DRV, KEY_READ); ok(key != INVALID_HANDLE_VALUE, "SetupDiOpenDevRegKey failed: %08x\n", GetLastError()); - ret = pSetupDiCallClassInstaller(DIF_REMOVE, set, &devInfo); + ret = remove_device(); + todo_wine + ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); pSetupDiDestroyDeviceInfoList(set); + + /* FIXME: Only do the RegDeleteKey, once Wine is fixed */ + if (!ret) + { + /* Wine doesn't delete the information currently */ + trace("We are most likely on Wine\n"); + devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); + devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, classKey); + } + else + { + /* There should only be a class key entry, so a simple + * RegDeleteKey should work + * + * This could fail if it's the first time for this new test + * after running the old tests. + */ + ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey), + "Couldn't delete classkey\n"); + } } - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, classKey); } static void testRegisterAndGetDetail(void) @@ -887,6 +963,10 @@ static void testRegisterAndGetDetail(void) ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, dwSize, &dwSize, NULL); ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %08x\n", GetLastError()); + /* FIXME: This one only worked because old data wasn't removed properly. As soon + * as all the tests are cleaned up correctly this has to be (or should be) fixed + */ + todo_wine ok(!lstrcmpiA(path, detail->DevicePath), "Unexpected path %s\n", detail->DevicePath); HeapFree(GetProcessHeap(), 0, detail);

1 0

Paul Vriens : setupapi/tests: Close registry key after use.
by Alexandre Julliard May 26, 2008

May 26, 2008

Module: wine Branch: master Commit: ee975a56117a4fc90befe02e555dd222990f790f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee975a56117a4fc90befe02e5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon May 26 10:47:08 2008 +0200 setupapi/tests: Close registry key after use. --- dlls/setupapi/tests/devinst.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index f3d7415..6896646 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -226,6 +226,8 @@ static void test_SetupDiOpenClassRegKeyExA(void) } else trace("failed to create registry key for test\n"); + + RegCloseKey(hkey); } else trace("failed to open classes key\n");

1 0

Paul Vriens : setupapi/tests: Cleanup after testRegisterAndGetDetail.
by Alexandre Julliard May 26, 2008

May 26, 2008

Module: wine Branch: master Commit: 7609581cf540e7d9fa2cc12d170af6abe72ccd87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7609581cf540e7d9fa2cc12d1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon May 26 16:42:17 2008 +0200 setupapi/tests: Cleanup after testRegisterAndGetDetail. --- dlls/setupapi/tests/devinst.c | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 0078dfb..1545455 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -884,10 +884,12 @@ static void testDevRegKey(void) DIREG_DRV, KEY_READ); ok(key != INVALID_HANDLE_VALUE, "SetupDiOpenDevRegKey failed: %08x\n", GetLastError()); + pSetupDiDestroyDeviceInfoList(set); + + /* Cleanup */ ret = remove_device(); todo_wine ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); - pSetupDiDestroyDeviceInfoList(set); /* FIXME: Only do the RegDeleteKey, once Wine is fixed */ if (!ret) @@ -918,6 +920,16 @@ static void testRegisterAndGetDetail(void) SP_DEVINFO_DATA devInfo = { sizeof(SP_DEVINFO_DATA), { 0 } }; SP_DEVICE_INTERFACE_DATA interfaceData = { sizeof(interfaceData), { 0 } }; DWORD dwSize = 0; + static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'E','n','u','m','\\','R','o','o','t','\\', + 'L','E','G','A','C','Y','_','B','O','G','U','S',0}; + static const WCHAR devclass[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\','D','e','v','i','c','e','C','l','a','s','s','e','s','\\', + '{','6','a','5','5','b','5','a','4','-','3','f','6','5','-', + '1','1','d','b','-','b','7','0','4','-', + '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; SetLastError(0xdeadbeef); set = pSetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_ALLCLASSES); @@ -974,6 +986,28 @@ static void testRegisterAndGetDetail(void) } pSetupDiDestroyDeviceInfoList(set); + + /* Cleanup */ + ret = remove_device(); + todo_wine + ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); + + /* FIXME: Only do the RegDeleteKey, once Wine is fixed */ + if (!ret) + { + /* Wine doesn't delete the information currently */ + trace("We are most likely on Wine\n"); + devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); + devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, devclass); + } + else + { + /* There should only be a class key entry, so a simple + * RegDeleteKey should work + */ + ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, devclass), + "Couldn't delete classkey\n"); + } } static void testDeviceRegistryPropertyA()

1 0

Jacek Caban : mshtml: Fixed copy&paste typo.
by Alexandre Julliard May 26, 2008

May 26, 2008

Module: wine Branch: master Commit: e787f84b012440de7bb37d88ef0ce5051c488f77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e787f84b012440de7bb37d88e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 26 18:47:10 2008 +0200 mshtml: Fixed copy&paste typo. --- dlls/mshtml/htmldoc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c7d9eb8..fa9e16f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1347,21 +1347,21 @@ static HRESULT WINAPI DocDispatchEx_QueryInterface(IDispatchEx *iface, REFIID ri { HTMLDocument *This = DISPEX_THIS(iface); - return IHTMLWindow2_QueryInterface(HTMLDOC(This), riid, ppv); + return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppv); } static ULONG WINAPI DocDispatchEx_AddRef(IDispatchEx *iface) { HTMLDocument *This = DISPEX_THIS(iface); - return IHTMLWindow2_AddRef(HTMLDOC(This)); + return IHTMLDocument2_AddRef(HTMLDOC(This)); } static ULONG WINAPI DocDispatchEx_Release(IDispatchEx *iface) { HTMLDocument *This = DISPEX_THIS(iface); - return IHTMLWindow2_Release(HTMLDOC(This)); + return IHTMLDocument2_Release(HTMLDOC(This)); } static HRESULT WINAPI DocDispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo)

1 0

Francois Gouget : ws2_32: Make sure INVALID_SOCKET is correctly typed.
by Alexandre Julliard May 26, 2008

May 26, 2008

Module: wine Branch: master Commit: 2a4aea0918c26c4574f661cf66932cf719d4f017 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a4aea0918c26c4574f661cf6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 26 17:38:53 2008 +0200 ws2_32: Make sure INVALID_SOCKET is correctly typed. --- include/winsock.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index 9187f41..dd202ea 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -395,7 +395,7 @@ typedef UINT_PTR SOCKET; * This is used instead of -1, since the * SOCKET type is unsigned. */ -#define INVALID_SOCKET (~0) +#define INVALID_SOCKET (SOCKET)(~0) #define SOCKET_ERROR (-1) typedef struct WS(sockaddr)

1 0

Dmitry Timoshkov : msi: Mark some data as constant.
by Alexandre Julliard May 26, 2008

May 26, 2008

Module: wine Branch: master Commit: 76d6b767373bdcba3758009775dc5c81cb285f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d6b767373bdcba375800977… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 26 13:06:47 2008 +0900 msi: Mark some data as constant. --- dlls/msi/action.c | 2 +- dlls/msi/automation.c | 2 +- dlls/msi/database.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 02beb0c..ee9a13b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2003,7 +2003,7 @@ static LPWSTR msi_get_disk_file_version( LPCWSTR filename ) { static const WCHAR name_fmt[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; - static WCHAR name[] = {'\\',0}; + static const WCHAR name[] = {'\\',0}; VS_FIXEDFILEINFO *lpVer; WCHAR filever[0x100]; LPVOID version; diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 7f59b4e..e919b0d 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -405,7 +405,7 @@ static HRESULT WINAPI AutomationObject_Invoke( (hr == DISP_E_PARAMNOTFOUND || hr == DISP_E_EXCEPTION)) { static const WCHAR szComma[] = { ',',0 }; - static WCHAR szExceptionSource[] = {'M','s','i',' ','A','P','I',' ','E','r','r','o','r',0}; + static const WCHAR szExceptionSource[] = {'M','s','i',' ','A','P','I',' ','E','r','r','o','r',0}; WCHAR szExceptionDescription[MAX_PATH]; BSTR bstrParamNames[MAX_FUNC_PARAMS]; unsigned namesNo, i; diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 875d2d0..eaf8ebd 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -83,7 +83,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) WCHAR path[MAX_PATH]; static const WCHAR backslash[] = {'\\',0}; - static WCHAR szTables[] = { '_','T','a','b','l','e','s',0 }; + static const WCHAR szTables[] = { '_','T','a','b','l','e','s',0 }; TRACE("%s %s\n",debugstr_w(szDBPath),debugstr_w(szPersist) );

1 0

Dmitry Timoshkov : wininet: INTERNET_InternetOpenUrlW is an internal helper .
by Alexandre Julliard May 26, 2008

May 26, 2008

Module: wine Branch: master Commit: 8f75f51c3f7adae8d2578d69285d0076954a4644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f75f51c3f7adae8d2578d692… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 26 13:06:00 2008 +0900 wininet: INTERNET_InternetOpenUrlW is an internal helper. --- dlls/wininet/internet.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 856f302..d4734a4 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -83,9 +83,6 @@ typedef struct CHAR response[MAX_REPLY_LEN]; } WITHREADERROR, *LPWITHREADERROR; -HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUrl, - LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext); - static DWORD g_dwTlsErrIndex = TLS_OUT_OF_INDEXES; static HMODULE WININET_hModule; @@ -2734,7 +2731,7 @@ BOOL WINAPI InternetCheckConnectionA(LPCSTR lpszUrl, DWORD dwFlags, DWORD dwRese * RETURNS * handle of connection or NULL on failure */ -HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUrl, +static HINTERNET INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUrl, LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext) { URL_COMPONENTSW urlComponents;

1 0