April 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : setupapi: Add support for creating directories from the FakeDlls section.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 0ed9db27c55b666b3ab80e281cc30a06f576729a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed9db27c55b666b3ab80e281… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 17 20:34:06 2008 +0200 setupapi: Add support for creating directories from the FakeDlls section. --- dlls/setupapi/fakedll.c | 50 +++++++++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index ca9e069..e46a821 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -276,6 +276,27 @@ static BOOL is_fake_dll( HANDLE h ) return !memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) ); } +/* create directories leading to a given file */ +static void create_directories( const WCHAR *name ) +{ + WCHAR *path, *p; + + /* create the directory/directories */ + path = HeapAlloc(GetProcessHeap(), 0, (strlenW(name) + 1)*sizeof(WCHAR)); + strcpyW(path, name); + + p = strchrW(path, '\\'); + while (p != NULL) + { + *p = 0; + if (!CreateDirectoryW(path, NULL)) + TRACE("Couldn't create directory %s - error: %d\n", wine_dbgstr_w(path), GetLastError()); + *p = '\\'; + p = strchrW(p+1, '\\'); + } + HeapFree(GetProcessHeap(), 0, path); +} + /*********************************************************************** * create_fake_dll */ @@ -285,6 +306,13 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) HMODULE module; BOOL ret; + /* check for empty name which means to only create the directory */ + if (name[strlenW(name) - 1] == '\\') + { + create_directories( name ); + return TRUE; + } + /* first check for an existing file */ h = CreateFileW( name, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL ); if (h != INVALID_HANDLE_VALUE) @@ -301,27 +329,7 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) } else { - if (GetLastError() == ERROR_PATH_NOT_FOUND) - { - WCHAR *path; - WCHAR *pathel; - - /* create the directory/directories */ - path = HeapAlloc(GetProcessHeap(), 0, (strlenW(name) + 1)*sizeof(WCHAR)); - strcpyW(path, name); - - pathel = strchrW(path, '\\'); - while (pathel != NULL) - { - *pathel = 0; - if (!CreateDirectoryW(path, NULL)) - TRACE("Couldn't create directory %s - error: %d\n", wine_dbgstr_w(path), GetLastError()); - *pathel = '\\'; - pathel = strchrW(pathel+1, '\\'); - } - - HeapFree(GetProcessHeap(), 0, path); - } + if (GetLastError() == ERROR_PATH_NOT_FOUND) create_directories( name ); h = CreateFileW( name, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL ); if (h == INVALID_HANDLE_VALUE)

1 0

Alexandre Julliard : wineprefixcreate: Moved creation of directories to wine.inf.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 89d63f0bfbc214733b322049268015a270079153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d63f0bfbc214733b3220492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 17 20:37:00 2008 +0200 wineprefixcreate: Moved creation of directories to wine.inf. --- tools/wine.inf.in | 5 +++++ tools/wineprefixcreate.in | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 2600a47..7f02284 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2215,6 +2215,11 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,wintrust.dll,1 [FakeDllsSection] +; create some directories first +10,inf, +10,system, +10,temp, +11,spool\drivers\color, 10,,explorer.exe 10,,hh.exe 10,,notepad.exe diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index af8a5f9..7eed546 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -139,15 +139,7 @@ CROOT="$WINEPREFIX/dosdevices/c:" for i in \ "$CROOT/windows" \ - "$CROOT/windows/command" \ - "$CROOT/windows/fonts" \ - "$CROOT/windows/inf" \ - "$CROOT/windows/system" \ - "$CROOT/windows/system32" \ - "$CROOT/windows/system32/spool" \ - "$CROOT/windows/system32/spool/drivers" \ - "$CROOT/windows/system32/spool/drivers/color" \ - "$CROOT/windows/temp" + "$CROOT/windows/inf" do [ -d "$i" ] || mkdir "$i" done

1 0

Alexandre Julliard : ntdll: Don't create a temporary dir, run wineprefixcreate directly in the final dir.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 4c6d2b01cc842ac13af6257a0c41f67ae49c992a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6d2b01cc842ac13af6257a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 17 20:40:25 2008 +0200 ntdll: Don't create a temporary dir, run wineprefixcreate directly in the final dir. --- dlls/ntdll/server.c | 89 ++++++--------------------------------------------- 1 files changed, 10 insertions(+), 79 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index ddabb67..c5146e2 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -839,47 +839,6 @@ static int server_connect( const char *serverdir ) /*********************************************************************** - * rm_rf - * - * Remove a directory and all its contents; helper for create_config_dir. - */ -static void rm_rf( const char *path ) -{ - int err = errno; /* preserve errno */ - DIR *dir; - char *buffer, *p; - struct stat st; - struct dirent *de; - - if (!(buffer = malloc( strlen(path) + 256 + 1 ))) goto done; - strcpy( buffer, path ); - p = buffer + strlen(buffer); - *p++ = '/'; - - if ((dir = opendir( path ))) - { - while ((de = readdir( dir ))) - { - if (!strcmp( de->d_name, "." ) || !strcmp( de->d_name, ".." )) continue; - strcpy( p, de->d_name ); - if (unlink( buffer ) != -1) continue; - if (errno == EISDIR || - (errno == EPERM && !lstat( buffer, &st ) && S_ISDIR(st.st_mode))) - { - /* recurse in the sub-directory */ - rm_rf( buffer ); - } - } - closedir( dir ); - } - free( buffer ); - rmdir( path ); -done: - errno = err; -} - - -/*********************************************************************** * create_config_dir * * Create the wine configuration dir (~/.wine). @@ -887,55 +846,38 @@ done: static void create_config_dir(void) { const char *p, *config_dir = wine_get_config_dir(); - char *tmp_dir; - int fd; pid_t pid, wret; - if (!(tmp_dir = malloc( strlen(config_dir) + sizeof("-XXXXXX") ))) - fatal_error( "out of memory\n" ); - if ((p = strrchr( config_dir, '/' )) && p != config_dir) { struct stat st; + char *tmp_dir; + if (!(tmp_dir = malloc( p + 1 - config_dir ))) fatal_error( "out of memory\n" ); memcpy( tmp_dir, config_dir, p - config_dir ); tmp_dir[p - config_dir] = 0; if (!stat( tmp_dir, &st ) && st.st_uid != getuid()) fatal_error( "'%s' is not owned by you, refusing to create a configuration directory there\n", tmp_dir ); + free( tmp_dir ); } - strcpy( tmp_dir, config_dir ); - strcat( tmp_dir, "-XXXXXX" ); - if ((fd = mkstemps( tmp_dir, 0 )) == -1) - fatal_perror( "can't get temp file name for %s", config_dir ); - close( fd ); - unlink( tmp_dir ); - if (mkdir( tmp_dir, 0777 ) == -1) - fatal_perror( "cannot create temp dir %s", tmp_dir ); + if (mkdir( config_dir, 0777 ) == -1 && errno != EEXIST) + fatal_perror( "cannot create directory %s", config_dir ); MESSAGE( "wine: creating configuration directory '%s'...\n", config_dir ); pid = fork(); - if (pid == -1) - { - rmdir( tmp_dir ); - fatal_perror( "fork" ); - } + if (pid == -1) fatal_perror( "fork" ); + if (!pid) { - char *argv[6]; + char *argv[3]; static char argv0[] = "tools/wineprefixcreate", - argv1[] = "--quiet", - argv2[] = "--wait", - argv3[] = "--prefix"; + argv1[] = "--quiet"; argv[0] = argv0; argv[1] = argv1; - argv[2] = argv2; - argv[3] = argv3; - argv[4] = tmp_dir; - argv[5] = NULL; + argv[2] = NULL; wine_exec_wine_binary( argv[0], argv, NULL ); - rmdir( tmp_dir ); fatal_perror( "could not exec wineprefixcreate" ); } else @@ -947,19 +889,8 @@ static void create_config_dir(void) if (wret == -1 && errno != EINTR) fatal_perror( "wait4" ); } if (!WIFEXITED(status) || WEXITSTATUS(status)) - { - rm_rf( tmp_dir ); fatal_error( "wineprefixcreate failed while creating '%s'.\n", config_dir ); - } - } - if (rename( tmp_dir, config_dir ) == -1) - { - rm_rf( tmp_dir ); - if (errno != EEXIST && errno != ENOTEMPTY) - fatal_perror( "rename '%s' to '%s'", tmp_dir, config_dir ); - /* else it was probably created by a concurrent wine process */ } - free( tmp_dir ); MESSAGE( "wine: '%s' created successfully.\n", config_dir ); }

1 0

Rhys McGuckin : wintrust: Check for null CleanupPolicy function pointer.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 890c3fd0f62153fc4b6043d2a9b148e5f59da7ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=890c3fd0f62153fc4b6043d2a… Author: Rhys McGuckin <rhysmcguckin(a)yahoo.com.au> Date: Fri Apr 18 03:41:22 2008 +1000 wintrust: Check for null CleanupPolicy function pointer. --- dlls/wintrust/wintrust_main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index b7788b1..c5b1612 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -151,7 +151,9 @@ static LONG WINTRUST_DefaultClose(HWND hwnd, GUID *actionID, if (provData) { - err = provData->psPfns->pfnCleanupPolicy(provData); + if (provData->psPfns->pfnCleanupPolicy) + err = provData->psPfns->pfnCleanupPolicy(provData); + WINTRUST_Free(provData->padwTrustStepErrors); WINTRUST_Free(provData->u.pPDSip); WINTRUST_Free(provData->psPfns);

1 0

Alexandre Julliard : kernel32: Create the windows and system directories if necessary.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 05e55edd82eb818c3945ccd4e27c28690ddc4f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e55edd82eb818c3945ccd4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 17 20:33:47 2008 +0200 kernel32: Create the windows and system directories if necessary. --- dlls/kernel32/process.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8d040bd..fe523d6 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -715,12 +715,12 @@ static void init_windows_dirs(void) DIR_System = buffer; } - if (GetFileAttributesW( DIR_Windows ) == INVALID_FILE_ATTRIBUTES) - MESSAGE( "Warning: the specified Windows directory %s is not accessible.\n", - debugstr_w(DIR_Windows) ); - if (GetFileAttributesW( DIR_System ) == INVALID_FILE_ATTRIBUTES) - MESSAGE( "Warning: the specified System directory %s is not accessible.\n", - debugstr_w(DIR_System) ); + if (!CreateDirectoryW( DIR_Windows, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) + ERR( "directory %s could not be created, error %u\n", + debugstr_w(DIR_Windows), GetLastError() ); + if (!CreateDirectoryW( DIR_System, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) + ERR( "directory %s could not be created, error %u\n", + debugstr_w(DIR_System), GetLastError() ); TRACE_(file)( "WindowsDir = %s\n", debugstr_w(DIR_Windows) ); TRACE_(file)( "SystemDir = %s\n", debugstr_w(DIR_System) );

1 0

Alexander Morozov : setupapi: SetupDiGetDeviceRegistryProperty should return ERROR_INVALID_DATA when buffer size is not 0 but buffer is NULL .
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: af5e168f169a6024c5d618a5696f47faf27a4505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5e168f169a6024c5d618a56… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Apr 17 20:28:14 2008 +0400 setupapi: SetupDiGetDeviceRegistryProperty should return ERROR_INVALID_DATA when buffer size is not 0 but buffer is NULL. --- dlls/setupapi/devinst.c | 10 ++++++++++ dlls/setupapi/tests/devinst.c | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 25fa0b5..2b0f920 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3110,6 +3110,11 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + if (PropertyBufferSize && PropertyBuffer == NULL) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) && PropertyMap[Property].nameA) @@ -3166,6 +3171,11 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + if (PropertyBufferSize && PropertyBuffer == NULL) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) && PropertyMap[Property].nameW) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index b55565d..f3f6c99 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -917,7 +917,6 @@ static void testDeviceRegistryPropertyA() SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, NULL, NULL, buflen, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_DATA, "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); @@ -1011,7 +1010,6 @@ static void testDeviceRegistryPropertyW() SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME, NULL, NULL, buflen, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_DATA, "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Alexander Morozov : setupapi: SetupDiGetDeviceRegistryProperty should return ERROR_INSUFFICIENT_BUFFER when buffer size is insufficient .
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 85861a4999e724bdb24ffa8a7262d329fb8fe035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85861a4999e724bdb24ffa8a7… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Apr 17 20:28:09 2008 +0400 setupapi: SetupDiGetDeviceRegistryProperty should return ERROR_INSUFFICIENT_BUFFER when buffer size is insufficient. --- dlls/setupapi/devinst.c | 16 ++++++++-------- dlls/setupapi/tests/devinst.c | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index bf952ef..25fa0b5 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3118,14 +3118,14 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( LONG l = RegQueryValueExA(devInfo->key, PropertyMap[Property].nameA, NULL, PropertyRegDataType, PropertyBuffer, &size); - if (RequiredSize) - *RequiredSize = size; - if (!PropertyBuffer) - ; /* do nothing, ret is already FALSE, last error is already set */ + if (l == ERROR_MORE_DATA || !PropertyBufferSize) + SetLastError(ERROR_INSUFFICIENT_BUFFER); else if (!l) ret = TRUE; else SetLastError(l); + if (RequiredSize) + *RequiredSize = size; } return ret; } @@ -3174,14 +3174,14 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( LONG l = RegQueryValueExW(devInfo->key, PropertyMap[Property].nameW, NULL, PropertyRegDataType, PropertyBuffer, &size); - if (RequiredSize) - *RequiredSize = size; - if (!PropertyBuffer) - ; /* do nothing, ret is already FALSE, last error is already set */ + if (l == ERROR_MORE_DATA || !PropertyBufferSize) + SetLastError(ERROR_INSUFFICIENT_BUFFER); else if (!l) ret = TRUE; else SetLastError(l); + if (RequiredSize) + *RequiredSize = size; } return ret; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 6edfd2d..b55565d 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -923,7 +923,6 @@ static void testDeviceRegistryPropertyA() SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, NULL, NULL, 0, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %08x\n", GetLastError()); ok(buflen == size, "Unexpected size: %d\n", size); @@ -1018,7 +1017,6 @@ static void testDeviceRegistryPropertyW() SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME, NULL, NULL, 0, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %08x\n", GetLastError()); ok(buflen == size, "Unexpected size: %d\n", size);

1 0

Dmitry Timoshkov : winedump: Decipher contents of a couple EMF records.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: f348a9309bf3a10c376f2f8ac48b907e740e9bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f348a9309bf3a10c376f2f8ac… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 17 21:11:16 2008 +0900 winedump: Decipher contents of a couple EMF records. --- tools/winedump/emf.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 2 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 7975e21..f539ea6 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -36,6 +36,28 @@ #include "winbase.h" #include "wingdi.h" +static const char *debugstr_wn(const WCHAR *wstr, int n) +{ + static char buf[80]; + char *p; + int i; + + if (!wstr) return "(null)"; + + i = 0; + p = buf; + *p++ = '\"'; + while (i < n && i < sizeof(buf) - 2 && wstr[i]) + { + if (wstr[i] < 127) *p++ = wstr[i]; + else *p++ = '.'; + i++; + } + *p++ = '\"'; + *p = 0; + return buf; +} + static unsigned int read_int(const unsigned char *buffer) { return buffer[0] @@ -141,9 +163,42 @@ static int dump_emfrecord(void) EMRCASE(EMR_PLGBLT); EMRCASE(EMR_SETDIBITSTODEVICE); EMRCASE(EMR_STRETCHDIBITS); - EMRCASE(EMR_EXTCREATEFONTINDIRECTW); + + case EMR_EXTCREATEFONTINDIRECTW: + { + const EMREXTCREATEFONTINDIRECTW *pf = (const EMREXTCREATEFONTINDIRECTW *)PRD(offset, 4); + const LOGFONTW *plf = &pf->elfw.elfLogFont; + + printf("%-20s %08x\n", "EMR_EXTCREATEFONTINDIRECTW", length); + printf("(%d %d %d %d %x out %d clip %x quality %d charset %d) %s %s %s %s\n", + plf->lfHeight, plf->lfWidth, + plf->lfEscapement, plf->lfOrientation, + plf->lfPitchAndFamily, + plf->lfOutPrecision, plf->lfClipPrecision, + plf->lfQuality, plf->lfCharSet, + debugstr_wn(plf->lfFaceName, LF_FACESIZE), + plf->lfWeight > 400 ? "Bold" : "", + plf->lfItalic ? "Italic" : "", + plf->lfUnderline ? "Underline" : ""); + break; + } + EMRCASE(EMR_EXTTEXTOUTA); - EMRCASE(EMR_EXTTEXTOUTW); + + case EMR_EXTTEXTOUTW: + { + const EMREXTTEXTOUTW *etoW = (const EMREXTTEXTOUTW *)PRD(offset, 4); + + printf("%-20s %08x\n", "EMR_EXTTEXTOUTW", length); + printf("pt (%d,%d) rect (%d,%d - %d,%d) flags %#x, %s\n", + etoW->emrtext.ptlReference.x, etoW->emrtext.ptlReference.y, + etoW->emrtext.rcl.left, etoW->emrtext.rcl.top, + etoW->emrtext.rcl.right, etoW->emrtext.rcl.bottom, + etoW->emrtext.fOptions, + debugstr_wn((LPCWSTR)((const BYTE *)etoW + etoW->emrtext.offString), etoW->emrtext.nChars)); + break; + } + EMRCASE(EMR_POLYBEZIER16); EMRCASE(EMR_POLYGON16); EMRCASE(EMR_POLYLINE16);

1 0

Andrew Talbot : gdi32: Remove unused variable.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: c3c219c9059ee57a910856db0a413e93fffd96f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c219c9059ee57a910856db0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Apr 17 17:39:36 2008 +0100 gdi32: Remove unused variable. --- dlls/gdi32/path.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index a8977eb..56036f9 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1851,7 +1851,7 @@ static BOOL PATH_StrokePath(DC *dc, GdiPath *pPath) static BOOL PATH_WidenPath(DC *dc) { - INT i, j, numStrokes, nLinePts, penWidth, penWidthIn, penWidthOut, size, penStyle; + INT i, j, numStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle; BOOL ret = FALSE; GdiPath *pPath, *pNewPath, **pStrokes, *pUpPath, *pDownPath; EXTLOGPEN *elp; @@ -1907,7 +1907,6 @@ static BOOL PATH_WidenPath(DC *dc) penWidthOut++; numStrokes = 0; - nLinePts = 0; pStrokes = HeapAlloc(GetProcessHeap(), 0, numStrokes * sizeof(GdiPath*)); pStrokes[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath));

1 0

Andrew Talbot : gphoto2.ds: Remove unused variable.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: ee7ef9e90104fed72b00a1019ee27f4d3e9e26fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee7ef9e90104fed72b00a1019… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Apr 17 17:39:39 2008 +0100 gphoto2.ds: Remove unused variable. --- dlls/gphoto2.ds/ui.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index 6e8ecc0..d36d7de 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -114,7 +114,6 @@ static void PopulateListView(HWND List) static void PopulateImageList(HIMAGELIST *iList, HWND list) { struct gphoto2_file *file; - INT rc; HWND progress_dialog; progress_dialog = @@ -143,8 +142,8 @@ static void PopulateImageList(HIMAGELIST *iList, HWND list) SendMessageW(list, LVM_SETICONSPACING, 0, MAKELONG(bmpInfo.bmWidth+6, bmpInfo.bmHeight+15) ); } - - rc = ImageList_Add(*iList, bitmap, 0); + + ImageList_Add(*iList, bitmap, 0); DeleteObject(static_bitmap); static_bitmap = bitmap;

1 0