December 2006 - Wine-commits

Roderick Colenbrander : wgl: (W)GL_NV_vertex_array_range.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 74663901436b4dda91dcdd32d5a762aac1635300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74663901436b4dda91dcdd32d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Dec 3 22:40:24 2006 +0100 wgl: (W)GL_NV_vertex_array_range. --- dlls/winex11.drv/opengl.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 94739bb..465f2ef 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -244,6 +244,10 @@ static BOOL (*pglXReleaseTexImageARB)(D static BOOL (*pglXDrawableAttribARB)(Display *dpy, GLXDrawable draw, const int *attribList); static int (*pglXSwapIntervalSGI)(int); +/* NV GLX Extension */ +static void* (*pglXAllocateMemoryNV)(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority); +static void (*pglXFreeMemoryNV)(GLvoid *pointer); + /* Standard OpenGL */ MAKE_FUNCPTR(glBindTexture) MAKE_FUNCPTR(glBitmap) @@ -370,6 +374,10 @@ LOAD_FUNCPTR(glXMakeContextCurrent) LOAD_FUNCPTR(glXGetCurrentReadDrawable) LOAD_FUNCPTR(glXGetFBConfigs) +/* NV GLX Extension */ +LOAD_FUNCPTR(glXAllocateMemoryNV) +LOAD_FUNCPTR(glXFreeMemoryNV) + /* Standard OpenGL calls */ LOAD_FUNCPTR(glBindTexture) LOAD_FUNCPTR(glBitmap) @@ -2589,6 +2597,32 @@ static BOOL WINAPI X11DRV_wglSwapInterva } /** + * X11DRV_wglAllocateMemoryNV + * + * WGL_NV_vertex_array_range: wglAllocateMemoryNV + */ +static void* WINAPI X11DRV_wglAllocateMemoryNV(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority) { + TRACE("(%d, %f, %f, %f)\n", size, readfreq, writefreq, priority ); + if (pglXAllocateMemoryNV == NULL) + return NULL; + + return pglXAllocateMemoryNV(size, readfreq, writefreq, priority); +} + +/** + * X11DRV_wglFreeMemoryNV + * + * WGL_NV_vertex_array_range: wglFreeMemoryNV + */ +static void WINAPI X11DRV_wglFreeMemoryNV(GLvoid* pointer) { + TRACE("(%p)\n", pointer); + if (pglXFreeMemoryNV == NULL) + return; + + pglXFreeMemoryNV(pointer); +} + +/** * glxRequireVersion (internal) * * Check if the supported GLX version matches requiredVersion. @@ -2709,6 +2743,14 @@ static const WineGLExtension WGL_EXT_swa } }; +static const WineGLExtension WGL_NV_vertex_array_range = +{ + "WGL_NV_vertex_array_range", + { + { "wglAllocateMemoryNV", X11DRV_wglAllocateMemoryNV }, + { "wglFreeMemoryNV", X11DRV_wglFreeMemoryNV }, + } +}; /** * X11DRV_WineGL_LoadExtensions @@ -2745,6 +2787,10 @@ static void X11DRV_WineGL_LoadExtensions if (glxRequireExtension("GLX_SGI_swap_control")) register_extension(&WGL_EXT_swap_control); + + /* The OpenGL extension GL_NV_vertex_array_range adds wgl/glX functions which aren't exported as 'real' wgl/glX extensions. */ + if(strstr(WineGLInfo.glExtensions, "GL_NV_vertex_array_range") != NULL) + register_extension(&WGL_NV_vertex_array_range); }

1 0

Andrew Talbot : winedump: Cast-qual warnings fix.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 696eddca8c2b09fa1934c52448eb38a8480035b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=696eddca8c2b09fa1934c5244… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Dec 3 18:31:21 2006 +0000 winedump: Cast-qual warnings fix. --- tools/winedump/msc.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 6c9ba58..5285a86 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -716,8 +716,8 @@ int codeview_dump_types(const void* tabl case LF_METHODLIST_V1: { - unsigned short* pattr = (unsigned short*)((const char*)type + 4); - + const unsigned short* pattr = (const unsigned short*)((const char*)type + 4); + printf("\t%x => Method list\n", curr_type); while ((const char*)pattr < (const char*)type + type->generic.len + 2) { @@ -726,7 +726,7 @@ int codeview_dump_types(const void* tabl case 4: case 6: printf("\t\t\tattr:%s type:%x vtab-offset:%x\n", get_attr(pattr[0]), pattr[1], - *(unsigned*)(&pattr[2])); + *(const unsigned*)(&pattr[2])); pattr += 3; break; default: @@ -740,8 +740,8 @@ int codeview_dump_types(const void* tabl case LF_METHODLIST_V2: { - unsigned* pattr = (unsigned*)((const char*)type + 4); - + const unsigned* pattr = (const unsigned*)((const char*)type + 4); + printf("\t%x => Method list\n", curr_type); while ((const char*)pattr < (const char*)type + type->generic.len + 2) { @@ -763,7 +763,7 @@ int codeview_dump_types(const void* tabl case LF_VTSHAPE_V1: { - int count = *(unsigned short*)((const char*)type + 4); + int count = *(const unsigned short*)((const char*)type + 4); int shift = 0; const char* ptr = (const char*)type + 6; const char* desc[] = {"Near", "Far", "Thin", "Disp to outtermost", @@ -799,9 +799,9 @@ int codeview_dump_types(const void* tabl int codeview_dump_symbols(const void* root, unsigned long size) { - int i, length; - const char* curr_func = NULL; - int nest_block = 0; + int i, length; + char* curr_func = NULL; + int nest_block = 0; /* * Loop over the different types of records and whenever we * find something we are interested in, record it and move on. @@ -1002,7 +1002,7 @@ int codeview_dump_symbols(const void* ro else { printf("\tS-End-Of %s\n", curr_func); - free((void*)curr_func); + free(curr_func); curr_func = NULL; } break; @@ -1141,8 +1141,8 @@ int codeview_dump_symbols(const void* ro pname = PSTRING(sym, length); length += (pname->namelen + 1 + 3) & ~3; - printf("\t%08x %08x %08x '%s'\n", - *(((DWORD*)sym) + 1), *(((DWORD*)sym) + 2), *(((DWORD*)sym) + 3), + printf("\t%08x %08x %08x '%s'\n", + *(((const DWORD*)sym) + 1), *(((const DWORD*)sym) + 2), *(((const DWORD*)sym) + 3), p_string(pname)); } break; @@ -1151,9 +1151,9 @@ int codeview_dump_symbols(const void* ro const unsigned short* ptr = ((const unsigned short*)sym) + 2; /* FIXME: what are all those values for ? */ - printf("\tTool V3 ??? %x-%x-%x-%x-%x-%x-%x-%x-%x %s\n", - ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7], - ptr[8], (char*)(&ptr[9])); + printf("\tTool V3 ??? %x-%x-%x-%x-%x-%x-%x-%x-%x %s\n", + ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7], + ptr[8], (const char*)(&ptr[9])); dump_data((const void*)sym, sym->generic.len + 2, "\t\t"); } break;

1 0

Peter Beutner : ntdll: Fix single stepping over popf instruction.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 6f88a7b7d432f3d80f74d392fbabceba196f4b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f88a7b7d432f3d80f74d392f… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Sun Dec 3 20:30:06 2006 +0100 ntdll: Fix single stepping over popf instruction. --- dlls/ntdll/signal_i386.c | 12 ++++++++---- dlls/ntdll/tests/exception.c | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 8166124..28824fc 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1019,11 +1019,15 @@ static void WINAPI raise_trap_exception( { context->ContextFlags = CONTEXT_DEBUG_REGISTERS; NtGetContextThread(GetCurrentThread(), context); - /* do we really have a bp from a debug register ? - * if not, then someone did a kill(SIGTRAP) on us, and we - * shall return a breakpoint, not a single step exception + /* we have either: + * - a bp from a debug register + * - a single step interrupt at popf instruction, which just has + * removed the TF. + * - someone did a kill(SIGTRAP) on us, and we shall return + * a breakpoint, not a single step exception */ - if (!(context->Dr6 & 0xf)) rec->ExceptionCode = EXCEPTION_BREAKPOINT; + if ( !(context->Dr6 & 0xf) && !(context->Dr6 & 0x4000) ) + rec->ExceptionCode = EXCEPTION_BREAKPOINT; context->ContextFlags |= CONTEXT_FULL; /* restore flags */ } } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index ec86579..9e729a4 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -265,8 +265,8 @@ static DWORD single_step_handler( EXCEPT else { /* show that the last single step exception on the popf instruction * (which removed the TF bit), still is a EXCEPTION_SINGLE_STEP exception */ - todo_wine { ok( rec->ExceptionCode == EXCEPTION_SINGLE_STEP, - "exception is not EXCEPTION_SINGLE_STEP: %x\n", rec->ExceptionCode); }; + ok( rec->ExceptionCode == EXCEPTION_SINGLE_STEP, + "exception is not EXCEPTION_SINGLE_STEP: %x\n", rec->ExceptionCode); } return ExceptionContinueExecution;

1 0

Marcus Meissner : shell32: Forward SHDeleteKeyA directly to SHDeleteKeyW.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 1ce977d6721669b80d5995541868bdda6f8d6f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce977d6721669b80d5995541… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Dec 3 16:09:24 2006 +0100 shell32: Forward SHDeleteKeyA directly to SHDeleteKeyW. --- dlls/shlwapi/reg.c | 47 ++++++----------------------------------------- 1 files changed, 6 insertions(+), 41 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 8d4e4c1..e1182ff 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1491,6 +1491,9 @@ DWORD WINAPI SHQueryValueExW(HKEY hKey, * * Delete a registry key and any sub keys/values present * + * This function forwards to the unicode version directly, to avoid + * handling subkeys that are not representable in ASCII. + * * PARAMS * hKey [I] Handle to registry key * lpszSubKey [I] Name of sub key to delete @@ -1502,48 +1505,10 @@ DWORD WINAPI SHQueryValueExW(HKEY hKey, */ DWORD WINAPI SHDeleteKeyA(HKEY hKey, LPCSTR lpszSubKey) { - DWORD dwRet, dwMaxSubkeyLen = 0, dwSize; - CHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; - HKEY hSubKey = 0; - - TRACE("(hkey=%p,%s)\n", hKey, debugstr_a(lpszSubKey)); - - dwRet = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); - if(!dwRet) - { - /* Find the maximum subkey length so that we can allocate a buffer */ - dwRet = RegQueryInfoKeyA(hSubKey, NULL, NULL, NULL, NULL, - &dwMaxSubkeyLen, NULL, NULL, NULL, NULL, NULL, NULL); - if(!dwRet) - { - dwMaxSubkeyLen++; - if (dwMaxSubkeyLen > sizeof(szNameBuf)) - /* Name too big: alloc a buffer for it */ - lpszName = HeapAlloc(GetProcessHeap(), 0, dwMaxSubkeyLen*sizeof(CHAR)); - - if(!lpszName) - dwRet = ERROR_NOT_ENOUGH_MEMORY; - else - { - while (dwRet == ERROR_SUCCESS) - { - dwSize = dwMaxSubkeyLen; - dwRet = RegEnumKeyExA(hSubKey, 0, lpszName, &dwSize, NULL, NULL, NULL, NULL); - if (dwRet == ERROR_SUCCESS || dwRet == ERROR_MORE_DATA) - dwRet = SHDeleteKeyA(hSubKey, lpszName); - } - if (dwRet == ERROR_NO_MORE_ITEMS) - dwRet = ERROR_SUCCESS; - if (lpszName != szNameBuf) - HeapFree(GetProcessHeap(), 0, lpszName); /* Free buffer if allocated */ - } - } + WCHAR subkeyW[MAX_PATH]; - RegCloseKey(hSubKey); - if(!dwRet) - dwRet = RegDeleteKeyA(hKey, lpszSubKey); - } - return dwRet; + MultiByteToWideChar (CP_ACP, 0, lpszSubKey, -1, subkeyW, sizeof(subkeyW)/sizeof(WCHAR)); + return SHDeleteKeyW(hKey, subkeyW); } /*************************************************************************

1 0

Andrew Talbot : winedump: Cast-qual warnings fix.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 25d1dc81d6834bcfdf7ddda1136b46cead3ecf74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d1dc81d6834bcfdf7ddda11… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Dec 3 18:24:25 2006 +0000 winedump: Cast-qual warnings fix. --- tools/winedump/lnk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index fcdd7b3..13f3542 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -211,7 +211,7 @@ static int dump_location(void) printf("Volume ofs = %08x ", loc->dwVolTableOfs); if (loc->dwVolTableOfs && (loc->dwVolTableOfs<loc->dwTotalSize)) { - LOCAL_VOLUME_INFO *vol = (LOCAL_VOLUME_INFO *) &p[loc->dwVolTableOfs]; + const LOCAL_VOLUME_INFO *vol = (const LOCAL_VOLUME_INFO *)&p[loc->dwVolTableOfs]; printf("size %d type %d serial %08x label %d ", vol->dwSize, vol->dwType, vol->dwVolSerial, vol->dwVolLabelOfs);

1 0

Eric Pouech : imagehlp: MapAndLoad should do some useful stuff now.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 8ca3ca5a562d3c179f9eba187b394dbe59cf6c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca3ca5a562d3c179f9eba187… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Dec 1 21:56:31 2006 +0100 imagehlp: MapAndLoad should do some useful stuff now. --- dlls/imagehlp/access.c | 132 +++++++++++++++++++++--------------------------- 1 files changed, 57 insertions(+), 75 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index aa87e67..e303896 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -145,96 +145,76 @@ BOOL WINAPI ImageUnload(PLOADED_IMAGE pL /*********************************************************************** * MapAndLoad (IMAGEHLP.@) */ -BOOL WINAPI MapAndLoad( - LPSTR pszImageName, LPSTR pszDllPath, PLOADED_IMAGE pLoadedImage, - BOOL bDotDll, BOOL bReadOnly) +BOOL WINAPI MapAndLoad(LPSTR pszImageName, LPSTR pszDllPath, PLOADED_IMAGE pLoadedImage, + BOOL bDotDll, BOOL bReadOnly) { - CHAR szFileName[MAX_PATH]; - HANDLE hFile = NULL; - HANDLE hFileMapping = NULL; - HMODULE hModule = NULL; - PIMAGE_NT_HEADERS pNtHeader = NULL; + CHAR szFileName[MAX_PATH]; + HANDLE hFile = INVALID_HANDLE_VALUE; + HANDLE hFileMapping = NULL; + PVOID mapping = NULL; + PIMAGE_NT_HEADERS pNtHeader = NULL; - TRACE("(%s, %s, %p, %d, %d)\n", pszImageName, pszDllPath, pLoadedImage, - bDotDll, bReadOnly); - - /* PathCombine(&szFileName, pszDllPath, pszImageName); */ - /* PathRenameExtension(&szFileName, bDotDll?:"dll":"exe"); */ + TRACE("(%s, %s, %p, %d, %d)\n", + pszImageName, pszDllPath, pLoadedImage, bDotDll, bReadOnly); - /* FIXME: Check if the file already loaded (use IMAGEHLP_pFirstLoadedImage) */ - if(!(hFile = CreateFileA( - szFileName, GENERIC_READ, 1, /* FIXME: FILE_SHARE_READ not defined */ - NULL, OPEN_EXISTING, 0, NULL))) + if (!SearchPathA(pszDllPath, pszImageName, bDotDll ? ".DLL" : ".EXE", + sizeof(szFileName), szFileName, NULL)) { - SetLastError(ERROR_FILE_NOT_FOUND); - goto Error; + SetLastError(ERROR_FILE_NOT_FOUND); + goto Error; } - if(!(hFileMapping = CreateFileMappingA( - hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL))) + hFile = CreateFileA(szFileName, GENERIC_READ, 1, /* FIXME: FILE_SHARE_READ not defined */ + NULL, OPEN_EXISTING, 0, NULL); + if (hFile == INVALID_HANDLE_VALUE) { - DWORD dwLastError = GetLastError(); - WARN("CreateFileMapping: Error = %d\n", dwLastError); - SetLastError(dwLastError); - goto Error; + WARN("CreateFile: Error = %d\n", GetLastError()); + goto Error; } - CloseHandle(hFile); - hFile = NULL; - if(!(hModule = (HMODULE) MapViewOfFile( - hFileMapping, FILE_MAP_READ, 0, 0, 0))) + hFileMapping = CreateFileMappingA(hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL); + if (!hFileMapping) { - DWORD dwLastError = GetLastError(); - WARN("MapViewOfFile: Error = %d\n", dwLastError); - SetLastError(dwLastError); - goto Error; + WARN("CreateFileMapping: Error = %d\n", GetLastError()); + goto Error; } - CloseHandle(hFileMapping); - hFileMapping=NULL; - - pLoadedImage = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(LOADED_IMAGE)); + mapping = MapViewOfFile(hFileMapping, FILE_MAP_READ, 0, 0, 0); + CloseHandle(hFileMapping); + if (!mapping) + { + WARN("MapViewOfFile: Error = %d\n", GetLastError()); + goto Error; + } - pNtHeader = RtlImageNtHeader(hModule); + pNtHeader = RtlImageNtHeader(mapping); - pLoadedImage->ModuleName = HeapAlloc(IMAGEHLP_hHeap, 0, strlen(pszDllPath)+1); /* FIXME: Correct? */ - strcpy( pLoadedImage->ModuleName, pszDllPath ); - pLoadedImage->hFile = hFile; - pLoadedImage->MappedAddress = (PUCHAR) hModule; - pLoadedImage->FileHeader = pNtHeader; - pLoadedImage->Sections = (PIMAGE_SECTION_HEADER) - ((LPBYTE) &pNtHeader->OptionalHeader + - pNtHeader->FileHeader.SizeOfOptionalHeader); - pLoadedImage->NumberOfSections = - pNtHeader->FileHeader.NumberOfSections; - pLoadedImage->SizeOfImage = - pNtHeader->OptionalHeader.SizeOfImage; - pLoadedImage->Characteristics = - pNtHeader->FileHeader.Characteristics; - pLoadedImage->LastRvaSection = pLoadedImage->Sections; + pLoadedImage->ModuleName = HeapAlloc(GetProcessHeap(), 0, + strlen(szFileName) + 1); + if (pLoadedImage->ModuleName) strcpy(pLoadedImage->ModuleName, szFileName); + pLoadedImage->hFile = hFile; + pLoadedImage->MappedAddress = mapping; + pLoadedImage->FileHeader = pNtHeader; + pLoadedImage->Sections = (PIMAGE_SECTION_HEADER) + ((LPBYTE) &pNtHeader->OptionalHeader + + pNtHeader->FileHeader.SizeOfOptionalHeader); + pLoadedImage->NumberOfSections = pNtHeader->FileHeader.NumberOfSections; + pLoadedImage->SizeOfImage = pNtHeader->OptionalHeader.SizeOfImage; + pLoadedImage->Characteristics = pNtHeader->FileHeader.Characteristics; + pLoadedImage->LastRvaSection = pLoadedImage->Sections; - pLoadedImage->fSystemImage = FALSE; /* FIXME */ - pLoadedImage->fDOSImage = FALSE; /* FIXME */ + pLoadedImage->fSystemImage = FALSE; /* FIXME */ + pLoadedImage->fDOSImage = FALSE; /* FIXME */ - /* FIXME: Make thread safe */ - pLoadedImage->Links.Flink = NULL; - pLoadedImage->Links.Blink = &IMAGEHLP_pLastLoadedImage->Links; - if(IMAGEHLP_pLastLoadedImage) - IMAGEHLP_pLastLoadedImage->Links.Flink = &pLoadedImage->Links; - IMAGEHLP_pLastLoadedImage = pLoadedImage; - if(!IMAGEHLP_pFirstLoadedImage) - IMAGEHLP_pFirstLoadedImage = pLoadedImage; + pLoadedImage->Links.Flink = &pLoadedImage->Links; + pLoadedImage->Links.Blink = &pLoadedImage->Links; - return TRUE; + return TRUE; Error: - if(hModule) - UnmapViewOfFile((PVOID) hModule); - if(hFileMapping) - CloseHandle(hFileMapping); - if(hFile) - CloseHandle(hFile); - return FALSE; + if (mapping) UnmapViewOfFile(mapping); + if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); + return FALSE; } /*********************************************************************** @@ -254,9 +234,11 @@ BOOL WINAPI SetImageConfigInformation( /*********************************************************************** * UnMapAndLoad (IMAGEHLP.@) */ -BOOL WINAPI UnMapAndLoad(PLOADED_IMAGE LoadedImage) +BOOL WINAPI UnMapAndLoad(PLOADED_IMAGE pLoadedImage) { - FIXME("(%p): stub\n", LoadedImage); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + HeapFree(GetProcessHeap(), 0, pLoadedImage->ModuleName); + /* FIXME: MSDN states that a new checksum is computed and stored into the file */ + if (pLoadedImage->MappedAddress) UnmapViewOfFile(pLoadedImage->MappedAddress); + if (pLoadedImage->hFile != INVALID_HANDLE_VALUE) CloseHandle(pLoadedImage->hFile); + return TRUE; }

1 0

James Hawkins : msi: Add handling for the StartServices action.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 58bb3571defcde50770dc214608b890ab932b8f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58bb3571defcde50770dc2146… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 1 13:22:59 2006 -0800 msi: Add handling for the StartServices action. --- dlls/msi/action.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--- include/msidefs.h | 10 ++++ 2 files changed, 136 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 436b06c..cd5bf4b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4164,6 +4164,132 @@ static UINT ACTION_InstallServices( MSIP return rc; } +/* converts arg1[~]arg2[~]arg3 to a list of ptrs to the strings */ +static LPCWSTR *msi_service_args_to_vector(LPCWSTR name, LPWSTR args, DWORD *numargs) +{ + LPCWSTR *vector; + LPWSTR p, q; + DWORD sep_len; + + static const WCHAR separator[] = {'[','~',']',0}; + + *numargs = 0; + sep_len = sizeof(separator) / sizeof(WCHAR) - 1; + + if (!args) + return NULL; + + vector = msi_alloc(sizeof(LPWSTR)); + if (!vector) + return NULL; + + p = args; + do + { + (*numargs)++; + vector[*numargs - 1] = p; + + if ((q = strstrW(p, separator))) + { + *q = '\0'; + + vector = msi_realloc(vector, (*numargs + 1) * sizeof(LPWSTR)); + if (!vector) + return NULL; + + p = q + sep_len; + } + } while (q); + + return vector; +} + +static MSICOMPONENT *msi_find_component( MSIPACKAGE *package, LPCWSTR component ) +{ + MSICOMPONENT *comp; + + LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry) + { + if (!lstrcmpW(comp->Component, component)) + return comp; + } + + return NULL; +} + +static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) +{ + MSIPACKAGE *package = (MSIPACKAGE *)param; + MSICOMPONENT *comp; + SC_HANDLE scm, service = NULL; + LPCWSTR name, *vector = NULL; + LPWSTR args; + DWORD event, numargs; + UINT r = ERROR_FUNCTION_FAILED; + + comp = msi_find_component(package, MSI_RecordGetString(rec, 6)); + if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) + return ERROR_SUCCESS; + + name = MSI_RecordGetString(rec, 2); + event = MSI_RecordGetInteger(rec, 3); + args = strdupW(MSI_RecordGetString(rec, 4)); + + if (!(event & msidbServiceControlEventStart)) + return ERROR_SUCCESS; + + scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + if (!scm) + { + ERR("Failed to open the service control manager\n"); + goto done; + } + + service = OpenServiceW(scm, name, SERVICE_START); + if (!service) + { + ERR("Failed to open service '%s'\n", debugstr_w(name)); + goto done; + } + + vector = msi_service_args_to_vector(name, args, &numargs); + + if (!StartServiceW(service, numargs, vector)) + { + ERR("Failed to start service '%s'\n", debugstr_w(name)); + goto done; + } + + r = ERROR_SUCCESS; + +done: + CloseServiceHandle(service); + CloseServiceHandle(scm); + + msi_free(args); + msi_free(vector); + return r; +} + +static UINT ACTION_StartServices( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'S','e','r','v','i','c','e','C','o','n','t','r','o','l',0 }; + + rc = MSI_DatabaseOpenViewW(package->db, query, &view); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords(view, NULL, ITERATE_StartService, package); + msiobj_release(&view->hdr); + + return rc; +} + static MSIFILE *msi_find_file( MSIPACKAGE *package, LPCWSTR filename ) { MSIFILE *file; @@ -4336,13 +4462,6 @@ static UINT ACTION_SelfUnregModules( MSI return msi_unimplemented_action_stub( package, "SelfUnregModules", table ); } -static UINT ACTION_StartServices( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { - 'S','e','r','v','i','c','e','C','o','n','t','r','o','l',0 }; - return msi_unimplemented_action_stub( package, "StartServices", table ); -} - static UINT ACTION_StopServices( MSIPACKAGE *package ) { static const WCHAR table[] = { diff --git a/include/msidefs.h b/include/msidefs.h index 083005b..b99537f 100644 --- a/include/msidefs.h +++ b/include/msidefs.h @@ -184,6 +184,16 @@ enum msidbLocatorType msidbLocatorType64bit = 0x010, }; +enum msidbServiceControlEvent +{ + msidbServiceControlEventStart = 0x00000001, + msidbServiceControlEventStop = 0x00000002, + msidbServiceControlEventDelete = 0x00000008, + msidbServiceControlEventUninstallStart = 0x00000010, + msidbServiceControlEventUninstallStop = 0x00000020, + msidbServiceControlEventUninstallDelete = 0x00000080, +}; + /* * Windows SDK braindamage alert *

1 0

James Hawkins : shell32: Move a NULL pointer check before the place where we dereference the pointer .
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 44b0b462cbbc118ce4b372dfecfb4f5f902b4e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b0b462cbbc118ce4b372dfe… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 1 14:30:13 2006 -0800 shell32: Move a NULL pointer check before the place where we dereference the pointer. --- dlls/shell32/shlexec.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 44166bb..940ce40 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -578,16 +578,19 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath TRACE("%s\n", (lpFile != NULL) ? debugstr_w(lpFile) : "-"); + if (!lpResult) + return ERROR_INVALID_PARAMETER; + xlpFile[0] = '\0'; lpResult[0] = '\0'; /* Start off with an empty return string */ if (key) *key = '\0'; /* trap NULL parameters on entry */ - if ((lpFile == NULL) || (lpResult == NULL)) + if (!lpFile) { WARN("(lpFile=%s,lpResult=%s): NULL parameter\n", debugstr_w(lpFile), debugstr_w(lpResult)); - return 2; /* File not found. Close enough, I guess. */ + return ERROR_FILE_NOT_FOUND; /* File not found. Close enough, I guess. */ } if (SHELL_TryAppPathW( lpFile, lpResult, env ))

1 0

Rob Shearman : ole32: Fill in the xExt and yExt fields in OleMetafilePictFromIconAndLabel.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: cdb86c6c90ca37884f64e39473d7d8a77bd53ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb86c6c90ca37884f64e3947… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 1 15:05:30 2006 +0000 ole32: Fill in the xExt and yExt fields in OleMetafilePictFromIconAndLabel. --- dlls/ole32/ole32_main.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index 377aa4d..493d246 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +#define HIMETRIC_INCHES 2540 + /*********************************************************************** * OleMetafilePictFromIconAndLabel (OLE32.@) */ @@ -120,7 +122,10 @@ HGLOBAL WINAPI OleMetafilePictFromIconAn } mfp.mm = MM_ANISOTROPIC; - mfp.xExt = mfp.yExt = 0; /* FIXME ? */ + hdcScreen = GetDC(NULL); + mfp.xExt = MulDiv(width, HIMETRIC_INCHES, GetDeviceCaps(hdcScreen, LOGPIXELSX)); + mfp.yExt = MulDiv(label_offset + text_size.cy, HIMETRIC_INCHES, GetDeviceCaps(hdcScreen, LOGPIXELSY)); + ReleaseDC(NULL, hdcScreen); mfp.hMF = CloseMetaFile(hdc); DeleteObject(font); if( !mfp.hMF )

1 0

Rob Shearman : ole32: The width of the metafile drawn should be 3 times the icon width in OleMetafilePictFromIconAndLabel .
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: d7d3309e0aed9065af19c908c91db6bedd01cf68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d3309e0aed9065af19c908c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 1 15:05:38 2006 +0000 ole32: The width of the metafile drawn should be 3 times the icon width in OleMetafilePictFromIconAndLabel. --- dlls/ole32/ole32_main.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index 493d246..c15c3e8 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -91,8 +91,11 @@ HGLOBAL WINAPI OleMetafilePictFromIconAn GetTextExtentPoint32W(hdcScreen, lpszLabel, lstrlenW(lpszLabel), &text_size); SelectObject(hdcScreen, screen_old_font); ReleaseDC(NULL, hdcScreen); + + width = 3 * icon_width; } - width = max(text_size.cx, icon_width); + else + width = icon_width; SetWindowOrgEx(hdc, 0, 0, NULL); SetWindowExtEx(hdc, width, label_offset + text_size.cy, NULL);

1 0