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

Misha Koshelev : urlmon: Fix HttpProtocol_Start and strndupW to work properly with native wininet.
by Alexandre Julliard July 12, 2007

July 12, 2007

Module: wine Branch: master Commit: 213bfd27776ac453689e3bd4864f6077c3169faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=213bfd27776ac453689e3bd48… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jul 12 00:38:20 2007 -0500 urlmon: Fix HttpProtocol_Start and strndupW to work properly with native wininet. --- dlls/urlmon/http.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index c501f05..ff79334 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -190,8 +190,9 @@ static void CALLBACK HTTPPROTOCOL_InternetStatusCallback( static inline LPWSTR strndupW(LPWSTR string, int len) { - LPWSTR ret = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); - if (ret) + LPWSTR ret = NULL; + if (string && + (ret = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR))) != NULL) { memcpy(ret, string, len*sizeof(WCHAR)); ret[len] = 0; @@ -304,7 +305,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl url.dwStructSize = sizeof(url); url.dwSchemeLength = url.dwHostNameLength = url.dwUrlPathLength = url.dwUserNameLength = url.dwPasswordLength = 1; - if (!InternetCrackUrlW(szUrl, 0, ICU_ESCAPE, &url)) + if (!InternetCrackUrlW(szUrl, 0, 0, &url)) { hres = MK_E_SYNTAX; goto done;

1 0

Vitaliy Margolen : dinput: Convert IDirectInput into multi-interface object .
by Alexandre Julliard July 12, 2007

July 12, 2007

Module: wine Branch: master Commit: efdee19d90db0f0ca2ca415f04893b3e88324623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efdee19d90db0f0ca2ca415f0… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Jul 11 22:51:32 2007 -0600 dinput: Convert IDirectInput into multi-interface object. --- dlls/dinput/dinput_main.c | 467 +++++++++++++++++++++++++++--------------- dlls/dinput/dinput_private.h | 6 +- 2 files changed, 311 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efdee19d90db0f0ca2ca4…

1 0

Ken Thomases : winecoreaudio: Improve safety of iterations when returning WAVEHDRs to client.
by Alexandre Julliard July 12, 2007

July 12, 2007

Module: wine Branch: master Commit: 438c748953b4b9dc33d5c6f04925a6be2b5a9161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=438c748953b4b9dc33d5c6f04… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 11 20:34:45 2007 -0500 winecoreaudio: Improve safety of iterations when returning WAVEHDRs to client. --- dlls/winecoreaudio.drv/audio.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 15322df..26a8c8a 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1059,12 +1059,16 @@ static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo) */ static void wodHelper_NotifyDoneForList(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr) { - for ( ; lpWaveHdr; lpWaveHdr = lpWaveHdr->lpNext) + while (lpWaveHdr) { + LPWAVEHDR lpNext = lpWaveHdr->lpNext; + + lpWaveHdr->lpNext = NULL; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); + + lpWaveHdr = lpNext; } } @@ -1670,12 +1674,17 @@ static void widHelper_NotifyCompletions(WINE_WAVEIN* wwi) OSSpinLockUnlock(&wwi->lock); /* Now, send the "done" notification for each header in our list. */ - for (lpWaveHdr = lpFirstDoneWaveHdr; lpWaveHdr; lpWaveHdr = lpWaveHdr->lpNext) + lpWaveHdr = lpFirstDoneWaveHdr; + while (lpWaveHdr) { + LPWAVEHDR lpNext = lpWaveHdr->lpNext; + + lpWaveHdr->lpNext = NULL; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); + + lpWaveHdr = lpNext; } } @@ -2074,6 +2083,7 @@ static DWORD widStop(WORD wDevID) if (lpWaveHdr) { + lpWaveHdr->lpNext = NULL; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); @@ -2130,6 +2140,7 @@ static DWORD widReset(WORD wDevID) { WAVEHDR* lpNext = lpWaveHdr->lpNext; + lpWaveHdr->lpNext = NULL; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0);

1 0

Ken Thomases : winecoreaudio: Enable DirectSound HEL mode for input.
by Alexandre Julliard July 12, 2007

July 12, 2007

Module: wine Branch: master Commit: 1b4ad056b3f3a098eacee9b5b3b77924fcc4a7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4ad056b3f3a098eacee9b5b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 11 20:34:38 2007 -0500 winecoreaudio: Enable DirectSound HEL mode for input. --- dlls/winecoreaudio.drv/audio.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index dbd8295..15322df 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -2180,6 +2180,35 @@ static DWORD widDevInterface(UINT wDevID, PWCHAR dwParam1, DWORD dwParam2) /************************************************************************** + * widDsCreate [internal] + */ +static DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv) +{ + TRACE("(%d,%p)\n",wDevID,drv); + + FIXME("DirectSoundCapture not implemented\n"); + FIXME("The (slower) DirectSound HEL mode will be used instead.\n"); + return MMSYSERR_NOTSUPPORTED; +} + +/************************************************************************** + * widDsDesc [internal] + */ +static DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc) +{ + /* The DirectSound HEL will automatically wrap a non-DirectSound-capable + * driver in a DirectSound adaptor, thus allowing the driver to be used by + * DirectSound clients. However, it only does this if we respond + * successfully to the DRV_QUERYDSOUNDDESC message. It's enough to fill in + * the driver and device names of the description output parameter. */ + memset(desc, 0, sizeof(*desc)); + lstrcpynA(desc->szDrvname, "winecoreaudio.drv", sizeof(desc->szDrvname) - 1); + lstrcpynA(desc->szDesc, WInDev[wDevID].interface_name, sizeof(desc->szDesc) - 1); + return MMSYSERR_NOERROR; +} + + +/************************************************************************** * widMessage (WINECOREAUDIO.6) */ DWORD WINAPI CoreAudio_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, @@ -2208,6 +2237,8 @@ DWORD WINAPI CoreAudio_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, case WIDM_STOP: return widStop (wDevID); case DRV_QUERYDEVICEINTERFACESIZE: return widDevInterfaceSize (wDevID, (LPDWORD)dwParam1); case DRV_QUERYDEVICEINTERFACE: return widDevInterface (wDevID, (PWCHAR)dwParam1, dwParam2); + case DRV_QUERYDSOUNDIFACE: return widDsCreate (wDevID, (PIDSCDRIVER*)dwParam1); + case DRV_QUERYDSOUNDDESC: return widDsDesc (wDevID, (PDSDRIVERDESC)dwParam1); default: FIXME("unknown message %d!\n", wMsg); }

1 0

Paul Vriens : advapi/service: Check if we have enough access rights to create a service.
by Alexandre Julliard July 12, 2007

July 12, 2007

Module: wine Branch: master Commit: c011369aab8087882ac1535448cc1c806c512761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c011369aab8087882ac153544… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jul 11 21:22:21 2007 +0200 advapi/service: Check if we have enough access rights to create a service. --- dlls/advapi32/service.c | 6 ++++++ dlls/advapi32/tests/service.c | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 54bfc8e..d95796f 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1315,6 +1315,12 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, return NULL; } + if (!(hscm->dwAccess & SC_MANAGER_CREATE_SERVICE)) + { + SetLastError(ERROR_ACCESS_DENIED); + return NULL; + } + r = RegCreateKeyExW(hscm->hkey, lpServiceName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &dp); if (r!=ERROR_SUCCESS) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index be526bd..0003db5 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -137,6 +137,7 @@ static void test_create_delete_svc(void) SC_HANDLE scm_handle, svc_handle1; static const CHAR servicename [] = "Winetest"; static const CHAR pathname [] = "we_dont_care.exe"; + static const CHAR empty [] = ""; /* All NULL */ SetLastError(0xdeadbeef); @@ -173,13 +174,19 @@ static void test_create_delete_svc(void) /* Both servicename and binary name (We only have connect rights) */ SetLastError(0xdeadbeef); svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, 0, 0, 0, 0, pathname, NULL, NULL, NULL, NULL, NULL); - todo_wine - { ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); - DeleteService(svc_handle1); /* Wine doesn't care (yet) about access rights, line can be removed when fixed */ - CloseServiceHandle(svc_handle1); /* Wine doesn't care (yet) about access rights, line can be removed when fixed */ - } + + /* They can even be empty at this stage of parameter checking */ + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, empty, NULL, 0, 0, 0, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, 0, 0, 0, 0, empty, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); CloseServiceHandle(scm_handle); }

1 0

Paul Vriens : advapi/service: Fix possible handle leak.
by Alexandre Julliard July 12, 2007

July 12, 2007

Module: wine Branch: master Commit: 13b3b724c6cf9f4dc01749a84a1048e382f8346c URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b3b724c6cf9f4dc01749a84… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jul 11 20:43:01 2007 +0200 advapi/service: Fix possible handle leak. --- dlls/advapi32/service.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 462abdb..55e9716 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1262,7 +1262,10 @@ SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, sizeof (struct sc_service) + len*sizeof(WCHAR), sc_handle_destroy_service ); if (!hsvc) + { + RegCloseKey(hKey); return NULL; + } strcpyW( hsvc->name, lpServiceName ); hsvc->hkey = hKey; hsvc->dwAccess = dwDesiredAccess;

1 0

Paul Vriens : advapi/service: Check for empty servicename and binaryname.
by Alexandre Julliard July 12, 2007

July 12, 2007

Module: wine Branch: master Commit: 137eb037b935d48e4f4cc2b2874f8be82d948a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=137eb037b935d48e4f4cc2b28… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jul 11 21:39:45 2007 +0200 advapi/service: Check for empty servicename and binaryname. --- dlls/advapi32/service.c | 12 ++++++++++++ dlls/advapi32/tests/service.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index d95796f..802dcaa 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1321,6 +1321,18 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, return NULL; } + if (!lpServiceName[0]) + { + SetLastError(ERROR_INVALID_NAME); + return NULL; + } + + if (!lpBinaryPathName[0]) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + r = RegCreateKeyExW(hscm->hkey, lpServiceName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &dp); if (r!=ERROR_SUCCESS) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 0003db5..d383fee 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -188,6 +188,38 @@ static void test_create_delete_svc(void) ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + /* Open the Service Control Manager with minimal rights for creation (verified with 'SC_MANAGER_ALL_ACCESS &~ SC_MANAGER_CREATE_SERVICE') */ + CloseServiceHandle(scm_handle); + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CREATE_SERVICE); + if (!scm_handle && (GetLastError() == ERROR_ACCESS_DENIED)) + { + skip("Not enough rights to get a handle to the manager\n"); + return; + } + + /* Empty strings for servicename and binary name are checked */ + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, empty, NULL, 0, 0, 0, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, 0, 0, 0, 0, empty, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, empty, NULL, 0, 0, 0, 0, empty, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %d\n", GetLastError()); + + /* Valid call (as we will see later) except for the empty binary name (to proof it's indeed an ERROR_INVALID_PARAMETER */ + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, 0, SERVICE_WIN32_OWN_PROCESS, SERVICE_DISABLED, 0, empty, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + CloseServiceHandle(scm_handle); }

1 0

Ken Thomases : winecoreaudio: Enable DirectSound HEL mode for output.
by Alexandre Julliard July 12, 2007

July 12, 2007

Module: wine Branch: master Commit: 631f306c3eb7364fb06ddecaf3f999356db71243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=631f306c3eb7364fb06ddecaf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 11 20:34:34 2007 -0500 winecoreaudio: Enable DirectSound HEL mode for output. --- dlls/winecoreaudio.drv/audio.c | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index bc7482c..dbd8295 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1424,6 +1424,32 @@ static DWORD wodDevInterface(UINT wDevID, PWCHAR dwParam1, DWORD dwParam2) } /************************************************************************** + * widDsCreate [internal] + */ +static DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv) +{ + TRACE("(%d,%p)\n",wDevID,drv); + + FIXME("DirectSound not implemented\n"); + FIXME("The (slower) DirectSound HEL mode will be used instead.\n"); + return MMSYSERR_NOTSUPPORTED; +} + +/************************************************************************** +* wodDsDesc [internal] +*/ +static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) +{ + /* The DirectSound HEL will automatically wrap a non-DirectSound-capable + * driver in a DirectSound adaptor, thus allowing the driver to be used by + * DirectSound clients. However, it only does this if we respond + * successfully to the DRV_QUERYDSOUNDDESC message. It's enough to fill in + * the driver and device names of the description output parameter. */ + memcpy(desc, &(WOutDev[wDevID].cadev->ds_desc), sizeof(DSDRIVERDESC)); + return MMSYSERR_NOERROR; +} + +/************************************************************************** * wodMessage (WINECOREAUDIO.7) */ DWORD WINAPI CoreAudio_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, @@ -1463,9 +1489,8 @@ DWORD WINAPI CoreAudio_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, case DRV_QUERYDEVICEINTERFACESIZE: return wodDevInterfaceSize (wDevID, (LPDWORD)dwParam1); case DRV_QUERYDEVICEINTERFACE: return wodDevInterface (wDevID, (PWCHAR)dwParam1, dwParam2); - case DRV_QUERYDSOUNDIFACE: - case DRV_QUERYDSOUNDDESC: - return MMSYSERR_NOTSUPPORTED; + case DRV_QUERYDSOUNDIFACE: return wodDsCreate (wDevID, (PIDSDRIVER*)dwParam1); + case DRV_QUERYDSOUNDDESC: return wodDsDesc (wDevID, (PDSDRIVERDESC)dwParam1); default: FIXME("unknown message %d!\n", wMsg);

1 0

Paul Vriens : advapi/service: First tests (and fixes) for CreateService.
by Alexandre Julliard July 12, 2007

July 12, 2007

Module: wine Branch: master Commit: 5dab8935b928c43e1050dffa55bbb37d270bc132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dab8935b928c43e1050dffa5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jul 11 21:10:36 2007 +0200 advapi/service: First tests (and fixes) for CreateService. --- dlls/advapi32/service.c | 6 ++++ dlls/advapi32/tests/service.c | 54 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 55e9716..54bfc8e 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1309,6 +1309,12 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, return NULL; } + if (!lpServiceName || !lpBinaryPathName) + { + SetLastError(ERROR_INVALID_ADDRESS); + return NULL; + } + r = RegCreateKeyExW(hscm->hkey, lpServiceName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &dp); if (r!=ERROR_SUCCESS) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index b3779f9..be526bd 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -132,6 +132,59 @@ static void test_open_svc(void) CloseServiceHandle(scm_handle); } +static void test_create_delete_svc(void) +{ + SC_HANDLE scm_handle, svc_handle1; + static const CHAR servicename [] = "Winetest"; + static const CHAR pathname [] = "we_dont_care.exe"; + + /* All NULL */ + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); + + /* Only a valid handle to the Service Control Manager */ + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_ADDRESS /* W2K, W2K3, XP, Vista */ || + GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, + "Expected ERROR_INVALID_ADDRESS or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Now with a servicename */ + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_ADDRESS /* W2K, W2K3, XP, Vista */ || + GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, + "Expected ERROR_INVALID_ADDRESS or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Or just a binary name */ + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, NULL, NULL, 0, 0, 0, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_ADDRESS /* W2K, W2K3, XP, Vista */ || + GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, + "Expected ERROR_INVALID_ADDRESS or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Both servicename and binary name (We only have connect rights) */ + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, 0, 0, 0, 0, pathname, NULL, NULL, NULL, NULL, NULL); + todo_wine + { + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + DeleteService(svc_handle1); /* Wine doesn't care (yet) about access rights, line can be removed when fixed */ + CloseServiceHandle(svc_handle1); /* Wine doesn't care (yet) about access rights, line can be removed when fixed */ + } + + CloseServiceHandle(scm_handle); +} + + static void test_close(void) { SC_HANDLE handle; @@ -290,6 +343,7 @@ START_TEST(service) /* First some parameter checking */ test_open_scm(); test_open_svc(); + test_create_delete_svc(); test_close(); /* Test the creation, querying and deletion of a service */ test_sequence();

1 0

Lei Zhang : winex11.drv: Remove old dnd code.
by Alexandre Julliard July 12, 2007

July 12, 2007

Module: wine Branch: master Commit: d0e068744a02c6a66685aec8db72a23db9d05962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e068744a02c6a66685aec8d… Author: Lei Zhang <thestig(a)google.com> Date: Wed Jul 11 13:58:25 2007 -0700 winex11.drv: Remove old dnd code. --- dlls/winex11.drv/xdnd.c | 89 +---------------------------------------------- 1 files changed, 1 insertions(+), 88 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 59410c5..02fcae8 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -69,7 +69,6 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd); static void X11DRV_XDND_FreeDragDropOp(void); static unsigned int X11DRV_XDND_UnixToDos(char** lpdest, char* lpsrc, int len); static WCHAR* X11DRV_XDND_URIToDOS(char *encodedURI); -static DROPFILES* X11DRV_XDND_BuildDropFiles(char* filename, unsigned int len, POINT pt); static CRITICAL_SECTION xdnd_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -442,49 +441,15 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) */ static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len) { - char *p = (char*) data; char* dostext; - int count = 0; /* Always suppply plain text */ X11DRV_XDND_UnixToDos(&dostext, (char*)data, len); X11DRV_XDND_InsertXDNDData(property, CF_TEXT, dostext, strlen(dostext)); - count++; TRACE("CF_TEXT (%d): %s\n", CF_TEXT, dostext); - /* Check for additional mappings */ - while (*p != '\0' && *p != ':') /* Advance to end of protocol */ - p++; - - if (*p == ':') - { - if (!strncasecmp(data, "http", 4)) - { - X11DRV_XDND_InsertXDNDData(property, RegisterClipboardFormatA("UniformResourceLocator"), - strdup(dostext), strlen(dostext)); - count++; - - TRACE("UniformResourceLocator: %s\n", dostext); - } - else if (!strncasecmp(data, "file", 4)) - { - DROPFILES* pdf; - - pdf = X11DRV_XDND_BuildDropFiles(p+1, len - 5, XDNDxy); - if (pdf) - { - unsigned int size = HeapSize(GetProcessHeap(), 0, pdf); - - X11DRV_XDND_InsertXDNDData(property, CF_HDROP, pdf, size); - count++; - } - - TRACE("CF_HDROP: %p\n", pdf); - } - } - - return count; + return 1; } @@ -578,57 +543,6 @@ static void X11DRV_XDND_FreeDragDropOp(void) /************************************************************************** - * X11DRV_XDND_BuildDropFiles - */ -static DROPFILES* X11DRV_XDND_BuildDropFiles(char* filename, unsigned int len, POINT pt) -{ - char* pfn; - int pathlen; - char path[MAX_PATH]; - DROPFILES *lpDrop = NULL; - - /* Advance to last starting slash */ - pfn = filename + 1; - while (*pfn && (*pfn == '\\' || *pfn =='/')) - { - pfn++; - filename++; - } - - /* Remove any trailing \r or \n */ - while (*pfn) - { - if (*pfn == '\r' || *pfn == '\n') - { - *pfn = 0; - break; - } - pfn++; - } - - TRACE("%s\n", filename); - - pathlen = GetLongPathNameA(filename, path, MAX_PATH); - if (pathlen) - { - lpDrop = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DROPFILES) + pathlen + 1); - - lpDrop->pFiles = sizeof(DROPFILES); - lpDrop->pt.x = pt.x; - lpDrop->pt.y = pt.y; - lpDrop->fNC = 0; - lpDrop->fWide = FALSE; - - strcpy(((char*)lpDrop)+lpDrop->pFiles, path); - } - - TRACE("resolved %s\n", lpDrop ? filename : NULL); - - return lpDrop; -} - - -/************************************************************************** * X11DRV_XDND_UnixToDos */ static unsigned int X11DRV_XDND_UnixToDos(char** lpdest, char* lpsrc, int len) @@ -741,4 +655,3 @@ static WCHAR* X11DRV_XDND_URIToDOS(char *encodedURI) HeapFree(GetProcessHeap(), 0, uri); return ret; } -

1 0