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

Stefan Dösinger : d3d: Move clippers from DDraw to wined3d.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: d93e161b1f78dfc0e2fd12d5c2a4b5753472e563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93e161b1f78dfc0e2fd12d5c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 28 17:59:37 2007 +0200 d3d: Move clippers from DDraw to wined3d. --- dlls/ddraw/clipper.c | 76 ++++---------- dlls/ddraw/ddraw.c | 8 +- dlls/ddraw/ddraw_private.h | 11 +- dlls/ddraw/main.c | 3 + dlls/wined3d/Makefile.in | 1 + dlls/wined3d/clipper.c | 203 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 21 ++++ dlls/wined3d/surface_gdi.c | 2 + dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 18 ++++ include/wine/wined3d_interface.h | 58 +++++++++++ 11 files changed, 340 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d93e161b1f78dfc0e2fd1…

1 0

Rob Shearman : setupapi: Improve the stub for SetupQueryInfOriginalFileInformation
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 04fada9035664df57c5a1219dd9ec62d9c15c65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=04fada9035664df57c5a1219d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 8 16:37:43 2007 +0100 setupapi: Improve the stub for SetupQueryInfOriginalFileInformation to return information for OriginalCatalogName based on information in the installed inf file. --- dlls/setupapi/query.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 1961375..cd50dee 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -652,8 +652,12 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW( PSP_ORIGINAL_FILE_INFO_W OriginalFileInfo) { LPCWSTR inf_name; + LPCWSTR inf_path; + HINF hinf; + static const WCHAR wszVersion[] = { 'V','e','r','s','i','o','n',0 }; + static const WCHAR wszCatalogFile[] = { 'C','a','t','a','l','o','g','F','i','l','e',0 }; - FIXME("(%p, %d, %p, %p): stub\n", InfInformation, InfIndex, + FIXME("(%p, %d, %p, %p): semi-stub\n", InfInformation, InfIndex, AlternativePlatformInfo, OriginalFileInfo); if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo)) @@ -662,18 +666,30 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW( return ERROR_INVALID_USER_BUFFER; } + inf_path = (LPWSTR)&InfInformation->VersionData[0]; + /* FIXME: we should get OriginalCatalogName from CatalogFile line in * the original inf file and cache it, but that would require building a * .pnf file. */ - OriginalFileInfo->OriginalCatalogName[0] = '\0'; + hinf = SetupOpenInfFileW(inf_path, NULL, INF_STYLE_WIN4, NULL); + if (!hinf) return FALSE; + + if (!SetupGetLineTextW(NULL, hinf, wszVersion, wszCatalogFile, + OriginalFileInfo->OriginalCatalogName, + sizeof(OriginalFileInfo->OriginalCatalogName)/sizeof(OriginalFileInfo->OriginalCatalogName[0]), + NULL)) + { + OriginalFileInfo->OriginalCatalogName[0] = '\0'; + } + SetupCloseInfFile(hinf); /* FIXME: not quite correct as we just return the same file name as * destination (copied) inf file, not the source (original) inf file. * to fix it properly would require building a .pnf file */ /* file name is stored in VersionData field of InfInformation */ - inf_name = strrchrW((LPWSTR)&InfInformation->VersionData[0], '\\'); + inf_name = strrchrW(inf_path, '\\'); if (inf_name) inf_name++; - else inf_name = (LPWSTR)&InfInformation->VersionData[0]; + else inf_name = inf_path; strcpyW(OriginalFileInfo->OriginalInfName, inf_name);

1 0

Rob Shearman : setupapi: Don' t copy an OEM inf file if the exact same OEM inf file already exists.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 672a6113795f8c696d6c6d8395b6d94b272438f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=672a6113795f8c696d6c6d839… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 8 16:35:14 2007 +0100 setupapi: Don't copy an OEM inf file if the exact same OEM inf file already exists. --- dlls/setupapi/misc.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index b79c0e6..2a91b17 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -919,6 +919,29 @@ done: return ret; } +static int compare_files( HANDLE file1, HANDLE file2 ) +{ + char buffer1[2048]; + char buffer2[2048]; + DWORD size1; + DWORD size2; + + while( ReadFile(file1, buffer1, sizeof(buffer1), &size1, NULL) && + ReadFile(file2, buffer2, sizeof(buffer2), &size2, NULL) ) + { + int ret; + if (size1 != size2) + return size1 > size2 ? 1 : -1; + if (!size1) + return 0; + ret = memcmp( buffer1, buffer2, size1 ); + if (ret) + return ret; + } + + return 0; +} + /*********************************************************************** * SetupCopyOEMInfW (SETUPAPI.@) */ @@ -959,6 +982,20 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, { static const WCHAR oem[] = { 'o','e','m',0 }; unsigned int i; + LARGE_INTEGER source_file_size; + HANDLE source_file; + + source_file = CreateFileW( source, FILE_READ_DATA | FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, NULL ); + if (source_file == INVALID_HANDLE_VALUE) + return FALSE; + + if (!GetFileSizeEx( source_file, &source_file_size )) + { + CloseHandle( source_file ); + return FALSE; + } p = strrchrW( target, '\\' ) + 1; memcpy( p, oem, sizeof(oem) ); @@ -968,12 +1005,30 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, for (i = 0; i < OEM_INDEX_LIMIT; i++) { static const WCHAR format[] = { '%','u','.','i','n','f',0 }; + HANDLE dest_file; + LARGE_INTEGER dest_file_size; + wsprintfW( p, format, i ); + dest_file = CreateFileW( target, FILE_READ_DATA | FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, NULL ); /* if we found a file name that doesn't exist then we're done */ - if (GetFileAttributesW( target ) == INVALID_FILE_ATTRIBUTES) + if (dest_file == INVALID_HANDLE_VALUE) break; + /* now check if the same inf file has already been copied to the inf + * directory. if so, use that file and don't create a new one */ + if (!GetFileSizeEx( dest_file, &dest_file_size ) || + (dest_file_size.QuadPart != source_file_size.QuadPart) || + compare_files( source_file, dest_file )) + { + CloseHandle( dest_file ); + continue; + } + CloseHandle( dest_file ); + break; } + CloseHandle( source_file ); if (i == OEM_INDEX_LIMIT) { SetLastError( ERROR_FILENAME_EXCED_RANGE );

1 0

Rob Shearman : ole32: Don' t release the drop target on process uninitialisation if not revoked, just release the memory.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 4cd064aeb40e6639e2e2daa1e5cb4fcd7b83127f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd064aeb40e6639e2e2daa1e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 8 16:33:46 2007 +0100 ole32: Don't release the drop target on process uninitialisation if not revoked, just release the memory. --- dlls/ole32/ole2.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 127ef87..8ad9953 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -149,7 +149,7 @@ extern void OLEClipbrd_Initialize(void); static void OLEDD_Initialize(void); static DropTargetNode* OLEDD_FindDropTarget( HWND hwndOfTarget); -static void OLEDD_FreeDropTarget(DropTargetNode*); +static void OLEDD_FreeDropTarget(DropTargetNode*, BOOL); static LRESULT WINAPI OLEDD_DragTrackerWindowProc( HWND hwnd, UINT uMsg, @@ -355,7 +355,7 @@ HRESULT WINAPI RevokeDragDrop( if (dropTargetInfo==NULL) return DRAGDROP_E_NOTREGISTERED; - OLEDD_FreeDropTarget(dropTargetInfo); + OLEDD_FreeDropTarget(dropTargetInfo, TRUE); return S_OK; } @@ -1896,10 +1896,10 @@ static void OLEDD_Initialize(void) * * Frees the drag and drop data structure */ -static void OLEDD_FreeDropTarget(DropTargetNode *dropTargetInfo) +static void OLEDD_FreeDropTarget(DropTargetNode *dropTargetInfo, BOOL release_drop_target) { list_remove(&dropTargetInfo->entry); - IDropTarget_Release(dropTargetInfo->dropTarget); + if (release_drop_target) IDropTarget_Release(dropTargetInfo->dropTarget); HeapFree(GetProcessHeap(), 0, dropTargetInfo); } @@ -1915,9 +1915,8 @@ void OLEDD_UnInitialize(void) */ while (!list_empty(&targetListHead)) { - DropTargetNode* curNode; - curNode = LIST_ENTRY(list_head(&targetListHead), DropTargetNode, entry); - OLEDD_FreeDropTarget(curNode); + DropTargetNode* curNode = LIST_ENTRY(list_head(&targetListHead), DropTargetNode, entry); + OLEDD_FreeDropTarget(curNode, FALSE); } }

1 0

Misha Koshelev : msi: automation: Display an error on create_session failure.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: d5c6c64bfc8f9143e7baff4cafdb4850456b267e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c6c64bfc8f9143e7baff4ca… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Tue May 8 07:40:06 2007 -0500 msi: automation: Display an error on create_session failure. --- dlls/msi/automation.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index c732163..e8cb887 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1026,11 +1026,13 @@ static HRESULT WINAPI InstallerImpl_Invoke( V_VT(pVarResult) = VT_DISPATCH; if ((ret = MsiOpenPackageExW(V_BSTR(&varg0), V_I4(&varg1), &msiHandle)) == ERROR_SUCCESS) { - if (SUCCEEDED(create_session(msiHandle, (IDispatch *)This, &pDispatch))) + if (SUCCEEDED(hr = create_session(msiHandle, (IDispatch *)This, &pDispatch))) { IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; } + else + ERR("Failed to create Session object, hresult 0x%08x\n", hr); } else {

1 0

Alexandre Julliard : configure: Fixed typo in libicu check.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: d3d344be78fe3add1e0eb625facad81adf192d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d344be78fe3add1e0eb625f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 17:52:57 2007 +0200 configure: Fixed typo in libicu check. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1117a7b..4bfe022 100755 --- a/configure +++ b/configure @@ -10410,7 +10410,7 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_ICU 1 _ACEOF - ICULIBS="icu_libs" + ICULIBS="$icu_libs" { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } diff --git a/configure.ac b/configure.ac index e65f812..52323c7 100644 --- a/configure.ac +++ b/configure.ac @@ -603,7 +603,7 @@ then AC_TRY_RUN([#include <unicode/ubidi.h> main () { ubidi_open(); return 0; }], [AC_DEFINE(HAVE_ICU,1,[Define to 1 if the ICU libraries are installed]) - AC_SUBST(ICULIBS,"icu_libs") + AC_SUBST(ICULIBS,"$icu_libs") AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)]) LIBS="$saved_libs"

1 0

Misha Koshelev : msi: automation: Move VariantClears out of specific case statements when possible.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 3909a499e055f3d8baab921ffb53e2af7c005038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3909a499e055f3d8baab921ff… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Tue May 8 07:39:38 2007 -0500 msi: automation: Move VariantClears out of specific case statements when possible. --- dlls/msi/automation.c | 50 ++++++++++++++++++++++++++++-------------------- 1 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 6325e4c..c732163 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -560,10 +560,9 @@ static HRESULT WINAPI RecordImpl_Invoke( if (FAILED(hr)) return hr; hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BSTR, &varg1, puArgErr); if (FAILED(hr)) return hr; - ret = MsiRecordSetStringW(This->msiHandle, V_I4(&varg0), V_BSTR(&varg1)); - VariantClear(&varg1); - if (ret != ERROR_SUCCESS) + if ((ret = MsiRecordSetStringW(This->msiHandle, V_I4(&varg0), V_BSTR(&varg1))) != ERROR_SUCCESS) { + VariantClear(&varg1); ERR("MsiRecordSetString returned %d\n", ret); return DISP_E_EXCEPTION; } @@ -574,6 +573,9 @@ static HRESULT WINAPI RecordImpl_Invoke( return DISP_E_MEMBERNOTFOUND; } + VariantClear(&varg1); + VariantClear(&varg0); + return S_OK; } @@ -618,6 +620,8 @@ static HRESULT WINAPI StringListImpl_Invoke( return DISP_E_MEMBERNOTFOUND; } + VariantClear(&varg0); + return S_OK; } @@ -699,6 +703,9 @@ static HRESULT WINAPI ViewImpl_Invoke( return DISP_E_MEMBERNOTFOUND; } + VariantClear(&varg1); + VariantClear(&varg0); + return S_OK; } @@ -730,9 +737,7 @@ static HRESULT WINAPI DatabaseImpl_Invoke( hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; V_VT(pVarResult) = VT_DISPATCH; - ret = MsiDatabaseOpenViewW(This->msiHandle, V_BSTR(&varg0), &msiHandle); - VariantClear(&varg0); - if (ret == ERROR_SUCCESS) + if ((ret = MsiDatabaseOpenViewW(This->msiHandle, V_BSTR(&varg0), &msiHandle)) == ERROR_SUCCESS) { if (SUCCEEDED(hr = create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_View, ViewImpl_Invoke, NULL, 0))) { @@ -744,6 +749,7 @@ static HRESULT WINAPI DatabaseImpl_Invoke( } else { + VariantClear(&varg0); ERR("MsiDatabaseOpenView returned %d\n", ret); return DISP_E_EXCEPTION; } @@ -754,6 +760,9 @@ static HRESULT WINAPI DatabaseImpl_Invoke( return DISP_E_MEMBERNOTFOUND; } + VariantClear(&varg1); + VariantClear(&varg0); + return S_OK; } @@ -811,7 +820,6 @@ static HRESULT WINAPI SessionImpl_Invoke( } if (ret != ERROR_SUCCESS) ERR("MsiGetProperty returned %d\n", ret); - VariantClear(&varg0); } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; @@ -820,11 +828,10 @@ static HRESULT WINAPI SessionImpl_Invoke( VariantClear(&varg0); return hr; } - ret = MsiSetPropertyW(This->msiHandle, V_BSTR(&varg0), V_BSTR(&varg1)); - VariantClear(&varg0); - VariantClear(&varg1); - if (ret != ERROR_SUCCESS) + if ((ret = MsiSetPropertyW(This->msiHandle, V_BSTR(&varg0), V_BSTR(&varg1))) != ERROR_SUCCESS) { + VariantClear(&varg0); + VariantClear(&varg1); ERR("MsiSetProperty returned %d\n", ret); return DISP_E_EXCEPTION; } @@ -884,7 +891,6 @@ static HRESULT WINAPI SessionImpl_Invoke( hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; ret = MsiDoActionW(This->msiHandle, V_BSTR(&varg0)); - VariantClear(&varg0); V_VT(pVarResult) = VT_I4; switch (ret) { @@ -913,6 +919,7 @@ static HRESULT WINAPI SessionImpl_Invoke( V_I4(pVarResult) = msiDoActionStatusBadActionData; break; default: + VariantClear(&varg0); FIXME("MsiDoAction returned unhandled value %d\n", ret); return DISP_E_EXCEPTION; } @@ -941,7 +948,6 @@ static HRESULT WINAPI SessionImpl_Invoke( ERR("MsiGetFeatureState returned %d\n", ret); V_I4(pVarResult) = msiInstallStateUnknown; } - VariantClear(&varg0); } break; @@ -957,7 +963,6 @@ static HRESULT WINAPI SessionImpl_Invoke( ERR("MsiGetFeatureState returned %d\n", ret); V_I4(pVarResult) = msiInstallStateUnknown; } - VariantClear(&varg0); } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; @@ -966,10 +971,9 @@ static HRESULT WINAPI SessionImpl_Invoke( VariantClear(&varg0); return hr; } - ret = MsiSetFeatureStateW(This->msiHandle, V_BSTR(&varg0), V_I4(&varg1)); - VariantClear(&varg0); - if (ret != ERROR_SUCCESS) + if ((ret = MsiSetFeatureStateW(This->msiHandle, V_BSTR(&varg0), V_I4(&varg1))) != ERROR_SUCCESS) { + VariantClear(&varg0); ERR("MsiSetFeatureState returned %d\n", ret); return DISP_E_EXCEPTION; } @@ -980,6 +984,9 @@ static HRESULT WINAPI SessionImpl_Invoke( return DISP_E_MEMBERNOTFOUND; } + VariantClear(&varg1); + VariantClear(&varg0); + return S_OK; } @@ -1017,9 +1024,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( return hr; } V_VT(pVarResult) = VT_DISPATCH; - ret = MsiOpenPackageExW(V_BSTR(&varg0), V_I4(&varg1), &msiHandle); - VariantClear(&varg0); - if (ret == ERROR_SUCCESS) + if ((ret = MsiOpenPackageExW(V_BSTR(&varg0), V_I4(&varg1), &msiHandle)) == ERROR_SUCCESS) { if (SUCCEEDED(create_session(msiHandle, (IDispatch *)This, &pDispatch))) { @@ -1029,6 +1034,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( } else { + VariantClear(&varg0); ERR("MsiOpenPackageEx returned %d\n", ret); return DISP_E_EXCEPTION; } @@ -1041,7 +1047,6 @@ static HRESULT WINAPI InstallerImpl_Invoke( if (FAILED(hr)) return hr; V_VT(pVarResult) = VT_I4; V_I4(pVarResult) = MsiQueryProductStateW(V_BSTR(&varg0)); - VariantClear(&varg0); } break; @@ -1089,6 +1094,9 @@ static HRESULT WINAPI InstallerImpl_Invoke( return DISP_E_MEMBERNOTFOUND; } + VariantClear(&varg1); + VariantClear(&varg0); + return S_OK; }

1 0

Rolf Kalbermatter : advapi32: Implement GetServiceDisplayNameW.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: d0790f1bfe092dfe4bc214dd54f4c71160f752e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0790f1bfe092dfe4bc214dd5… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Mon May 7 21:56:31 2007 +0200 advapi32: Implement GetServiceDisplayNameW. --- dlls/advapi32/service.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 5f36215..22489a9 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2073,9 +2073,36 @@ BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName, BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, LPWSTR lpDisplayName, LPDWORD lpcchBuffer) { - FIXME("%p %s %p %p\n", hSCManager, + struct sc_manager *hscm; + DWORD type, size; + LONG ret; + + TRACE("%p %s %p %p\n", hSCManager, debugstr_w(lpServiceName), lpDisplayName, lpcchBuffer); - return FALSE; + + hscm = sc_handle_get_handle_data(hSCManager, SC_HTYPE_MANAGER); + if (!hscm) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + size = *lpcchBuffer * sizeof(WCHAR); + ret = RegGetValueW(hscm->hkey, lpServiceName, szDisplayName, RRF_RT_REG_SZ, &type, lpDisplayName, &size); + if (ret) + { + if (lpDisplayName && *lpcchBuffer) *lpDisplayName = 0; + + if (ret == ERROR_MORE_DATA) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + *lpcchBuffer = (size / sizeof(WCHAR)) - 1; + } + else + SetLastError(ret); + return FALSE; + } + return TRUE; } /******************************************************************************

1 0

Rolf Kalbermatter : advapi32: Implement GetServiceDisplayNameA.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 7af5a9d87f0c5c23a4a5d442f27e154a3d0a06ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af5a9d87f0c5c23a4a5d442f… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Mon May 7 21:54:56 2007 +0200 advapi32: Implement GetServiceDisplayNameA. --- dlls/advapi32/service.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 69f38fb..5f36215 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2035,9 +2035,36 @@ BOOL WINAPI QueryServiceLockStatusW( SC_HANDLE hSCManager, BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName, LPSTR lpDisplayName, LPDWORD lpcchBuffer) { - FIXME("%p %s %p %p\n", hSCManager, + struct sc_manager *hscm; + DWORD type, size; + LONG ret; + + TRACE("%p %s %p %p\n", hSCManager, debugstr_a(lpServiceName), lpDisplayName, lpcchBuffer); - return FALSE; + + hscm = sc_handle_get_handle_data(hSCManager, SC_HTYPE_MANAGER); + if (!hscm) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + size = *lpcchBuffer; + ret = RegGetValueA(hscm->hkey, lpServiceName, "DisplayName", RRF_RT_REG_SZ, &type, lpDisplayName, &size); + if (ret) + { + if (lpDisplayName && *lpcchBuffer) *lpDisplayName = 0; + + if (ret == ERROR_MORE_DATA) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + *lpcchBuffer = size - 1; + } + else + SetLastError(ret); + return FALSE; + } + return TRUE; } /******************************************************************************

1 0

Rolf Kalbermatter : advapi32: Add prototypes for EnumServicesStatusExA/W.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 46fed9f1ef22a978fbea0868983338e80e1458f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fed9f1ef22a978fbea08689… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Mon May 7 22:29:58 2007 +0200 advapi32: Add prototypes for EnumServicesStatusExA/W. --- include/winsvc.h | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/include/winsvc.h b/include/winsvc.h index 617b9f4..8f6184d 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -185,13 +185,28 @@ typedef struct _ENUM_SERVICE_STATUSW { SERVICE_STATUS ServiceStatus; } ENUM_SERVICE_STATUSW, *LPENUM_SERVICE_STATUSW; +DECL_WINELIB_TYPE_AW(ENUM_SERVICE_STATUS) +DECL_WINELIB_TYPE_AW(LPENUM_SERVICE_STATUS) + +typedef struct _ENUM_SERVICE_STATUS_PROCESSA { + LPSTR lpServiceName; + LPSTR lpDisplayName; + SERVICE_STATUS_PROCESS ServiceStatusProcess; +} ENUM_SERVICE_STATUS_PROCESSA, *LPENUM_SERVICE_STATUS_PROCESSA; + +typedef struct _ENUM_SERVICE_STATUS_PROCESSW { + LPWSTR lpServiceName; + LPWSTR lpDisplayName; + SERVICE_STATUS_PROCESS ServiceStatusProcess; +} ENUM_SERVICE_STATUS_PROCESSW, *LPENUM_SERVICE_STATUS_PROCESSW; + +DECL_WINELIB_TYPE_AW(ENUM_SERVICE_STATUS_PROCESS) +DECL_WINELIB_TYPE_AW(LPENUM_SERVICE_STATUS_PROCESS) + typedef enum _SC_ENUM_TYPE { SC_ENUM_PROCESS_INFO = 0 } SC_ENUM_TYPE; -DECL_WINELIB_TYPE_AW(ENUM_SERVICE_STATUS) -DECL_WINELIB_TYPE_AW(LPENUM_SERVICE_STATUS) - typedef struct _QUERY_SERVICE_CONFIGA { DWORD dwServiceType; DWORD dwStartType; @@ -307,6 +322,11 @@ BOOL WINAPI EnumServicesStatusA(SC_HANDLE,DWORD,DWORD,LPENUM_SERVICE_STAT BOOL WINAPI EnumServicesStatusW(SC_HANDLE,DWORD,DWORD,LPENUM_SERVICE_STATUSW, DWORD,LPDWORD,LPDWORD,LPDWORD); #define EnumServicesStatus WINELIB_NAME_AW(EnumServicesStatus) +BOOL WINAPI EnumServicesStatusExA(SC_HANDLE,SC_ENUM_TYPE,DWORD,DWORD,LPBYTE, + DWORD,LPDWORD,LPDWORD,LPDWORD,LPCSTR); +BOOL WINAPI EnumServicesStatusExW(SC_HANDLE,SC_ENUM_TYPE,DWORD,DWORD,LPBYTE, + DWORD,LPDWORD,LPDWORD,LPDWORD,LPCWSTR); +#define EnumServicesStatus WINELIB_NAME_AW(EnumServicesStatus) BOOL WINAPI GetServiceDisplayNameA(SC_HANDLE,LPCSTR,LPSTR,LPDWORD); BOOL WINAPI GetServiceDisplayNameW(SC_HANDLE,LPCWSTR,LPWSTR,LPDWORD); #define GetServiceDisplayName WINELIB_NAME_AW(GetServiceDisplayName)

1 0