October 2008 - Wine-commits

Alexandre Julliard : kernel32: Delete the . windows-label file if the label is empty.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 1873ebdddc9d0656c593fd1aa2b3cd1df4dc2b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1873ebdddc9d0656c593fd1aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 14:12:19 2008 +0200 kernel32: Delete the .windows-label file if the label is empty. Add a trailing \n to the label file. --- dlls/kernel32/volume.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 4214cca..823d163 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -723,6 +723,10 @@ BOOL WINAPI SetVolumeLabelW( LPCWSTR root, LPCWSTR label ) WCHAR labelW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; labelW[0] = device[4]; + + if (!label[0]) /* delete label file when setting an empty label */ + return DeleteFileW( labelW ) || GetLastError() == ERROR_FILE_NOT_FOUND; + handle = CreateFileW( labelW, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0 ); if (handle != INVALID_HANDLE_VALUE) @@ -730,8 +734,9 @@ BOOL WINAPI SetVolumeLabelW( LPCWSTR root, LPCWSTR label ) char buffer[64]; DWORD size; - if (!WideCharToMultiByte( CP_UNIXCP, 0, label, -1, buffer, sizeof(buffer), NULL, NULL )) - buffer[sizeof(buffer)-1] = 0; + if (!WideCharToMultiByte( CP_UNIXCP, 0, label, -1, buffer, sizeof(buffer)-1, NULL, NULL )) + buffer[sizeof(buffer)-2] = 0; + strcat( buffer, "\n" ); WriteFile( handle, buffer, strlen(buffer), &size, NULL ); CloseHandle( handle ); return TRUE;

1 0

Austin English : gdi32: Quiet a noisy fixme.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 3b6daf251272f2c5d445e4a4616bb287be95ea66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6daf251272f2c5d445e4a46… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 16 19:09:56 2008 -0500 gdi32: Quiet a noisy fixme. --- dlls/gdi32/font.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 21d2ebb..7b8d97d 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1648,14 +1648,17 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, DWORD type; DC * dc = get_dc_ptr( hdc ); INT breakRem; + static int quietfixme = 0; if (!dc) return FALSE; breakRem = dc->breakRem; - if (flags & (ETO_NUMERICSLOCAL | ETO_NUMERICSLATIN | ETO_PDY)) + if (quietfixme == 0 && flags & (ETO_NUMERICSLOCAL | ETO_NUMERICSLATIN | ETO_PDY)) + { FIXME("flags ETO_NUMERICSLOCAL | ETO_NUMERICSLATIN | ETO_PDY unimplemented\n"); - + quietfixme = 1; + } if (!dc->funcs->pExtTextOut && !PATH_IsPathOpen(dc->path)) { release_dc_ptr( dc );

1 0

Alexandre Julliard : winecfg: Store the drive serial number as a number instead of a string.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 6483f2f201c15b650c5e0e1996cf40d2bb6e057f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6483f2f201c15b650c5e0e199… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 13:37:04 2008 +0200 winecfg: Store the drive serial number as a number instead of a string. --- programs/winecfg/drive.c | 35 ++++++++++++++--------------------- programs/winecfg/drivedetect.c | 8 ++++---- programs/winecfg/driveui.c | 16 +++++++--------- programs/winecfg/winecfg.h | 4 ++-- 4 files changed, 27 insertions(+), 36 deletions(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index dd3befd..8be9b43 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -87,20 +87,20 @@ long drive_available_mask(char letter) return result; } -BOOL add_drive(const char letter, const char *targetpath, const char *label, const char *serial, unsigned int type) +BOOL add_drive(const char letter, const char *targetpath, const char *label, DWORD serial, unsigned int type) { int driveIndex = letter_to_index(letter); if(drives[driveIndex].in_use) return FALSE; - WINE_TRACE("letter == '%c', unixpath == '%s', label == '%s', serial == '%s', type == %d\n", + WINE_TRACE("letter == '%c', unixpath == '%s', label == '%s', serial == %08x, type == %d\n", letter, targetpath, label, serial, type); drives[driveIndex].letter = toupper(letter); drives[driveIndex].unixpath = strdupA(targetpath); drives[driveIndex].label = strdupA(label); - drives[driveIndex].serial = strdupA(serial); + drives[driveIndex].serial = serial; drives[driveIndex].type = type; drives[driveIndex].in_use = TRUE; @@ -114,9 +114,7 @@ void delete_drive(struct drive *d) d->unixpath = NULL; HeapFree(GetProcessHeap(), 0, d->label); d->label = NULL; - HeapFree(GetProcessHeap(), 0, d->serial); - d->serial = NULL; - + d->serial = 0; d->in_use = FALSE; } @@ -198,20 +196,22 @@ static void set_drive_label( char letter, const char *label ) } /* set the drive serial number via a .windows-serial file */ -static void set_drive_serial( char letter, const char *serial ) +static void set_drive_serial( char letter, DWORD serial ) { char filename[] = "a:\\.windows-serial"; HANDLE hFile; filename[0] = letter; - WINE_TRACE("Putting serial number of '%s' into file '%s'\n", serial, filename); + WINE_TRACE("Putting serial number of %08x into file '%s'\n", serial, filename); hFile = CreateFile(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile != INVALID_HANDLE_VALUE) { DWORD w; - WriteFile(hFile, serial, strlen(serial), &w, NULL); - WriteFile(hFile, "\n", 1, &w, NULL); + char buffer[16]; + + sprintf( buffer, "%X\n", serial ); + WriteFile(hFile, buffer, strlen(buffer), &w, NULL); CloseHandle(hFile); } } @@ -281,15 +281,13 @@ void load_drives(void) { drives[i].letter = 'A' + i; drives[i].in_use = FALSE; + drives[i].serial = 0; HeapFree(GetProcessHeap(), 0, drives[i].unixpath); drives[i].unixpath = NULL; HeapFree(GetProcessHeap(), 0, drives[i].label); drives[i].label = NULL; - - HeapFree(GetProcessHeap(), 0, drives[i].serial); - drives[i].serial = NULL; } /* work backwards through the result of GetLogicalDriveStrings */ @@ -297,7 +295,6 @@ void load_drives(void) { char volname[512]; /* volume name */ DWORD serial; - char serialstr[256]; char rootpath[256]; char simplepath[3]; int pathlen; @@ -346,9 +343,7 @@ void load_drives(void) c = targetpath; do if (*c == '\\') *c = '/'; while (*c++); - snprintf(serialstr, sizeof(serialstr), "%X", serial); - WINE_TRACE("serialstr: '%s'\n", serialstr); - add_drive(*devices, targetpath, volname, serialstr, get_drive_type(devices[0]) ); + add_drive(*devices, targetpath, volname, serial, get_drive_type(devices[0]) ); len -= strlen(devices); devices += strlen(devices); @@ -386,7 +381,7 @@ void load_drives(void) buff[cnt] = '\0'; WINE_TRACE("found broken symlink %s -> %s\n", path, buff); - add_drive('A' + i, buff, "", "0", DRIVE_UNKNOWN); + add_drive('A' + i, buff, "", 0, DRIVE_UNKNOWN); drivecount++; } @@ -410,7 +405,6 @@ void apply_drive_changes(void) DWORD maxComponentLength; DWORD fileSystemFlags; CHAR fileSystemName[128]; - char newSerialNumberText[32]; int retval; BOOL defineDevice; @@ -517,8 +511,7 @@ void apply_drive_changes(void) if (drives[i].label && strcmp(drives[i].label, volumeNameBuffer)) set_drive_label( drives[i].letter, drives[i].label ); - snprintf(newSerialNumberText, sizeof(newSerialNumberText), "%X", serialNumber); - if (drives[i].serial && drives[i].serial[0] && strcmp(drives[i].serial, newSerialNumberText)) + if (drives[i].serial != serialNumber) set_drive_serial( drives[i].letter, drives[i].serial ); set_drive_type( drives[i].letter, drives[i].type ); diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index e8c843a..161fad0 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -233,7 +233,7 @@ static void ensure_root_is_mapped(void) { if (!drives[letter - 'A'].in_use) { - add_drive(letter, "/", "System", "0", DRIVE_FIXED); + add_drive(letter, "/", "System", 0, DRIVE_FIXED); WINE_TRACE("allocated drive %c as the root drive\n", letter); break; } @@ -262,7 +262,7 @@ static void ensure_home_is_mapped(void) { if (!drives[letter - 'A'].in_use) { - add_drive(letter, home, "Home", "0", DRIVE_FIXED); + add_drive(letter, home, "Home", 0, DRIVE_FIXED); WINE_TRACE("allocated drive %c as the user's home directory\n", letter); break; } @@ -287,7 +287,7 @@ static void ensure_drive_c_is_mapped(void) if (stat(drive_c_dir, &buf) == 0) { - add_drive('C', "../drive_c", "Virtual Windows Drive", "0", DRIVE_FIXED); + add_drive('C', "../drive_c", "Virtual Windows Drive", 0, DRIVE_FIXED); } else { @@ -356,7 +356,7 @@ int autodetect_drives(void) WINE_TRACE("adding drive %c for %s, type %s with label %s\n", letter, ent->mnt_dir, ent->mnt_type,label); - add_drive(letter, ent->mnt_dir, label, "0", type); + add_drive(letter, ent->mnt_dir, label, 0, type); /* working_mask is a map of the drive letters still available. */ working_mask &= ~DRIVE_MASK_BIT(letter); diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index fb37a20..47ada76 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -314,9 +314,9 @@ static void on_add_click(HWND dialog) char label[64]; LoadStringA (GetModuleHandle (NULL), IDS_SYSTEM_DRIVE_LABEL, label, sizeof(label)/sizeof(label[0])); - add_drive(new, "../drive_c", label, "", DRIVE_FIXED); + add_drive(new, "../drive_c", label, 0, DRIVE_FIXED); } - else add_drive(new, "/", "", "", DRIVE_UNKNOWN); + else add_drive(new, "/", "", 0, DRIVE_UNKNOWN); fill_drives_list(dialog); @@ -378,7 +378,7 @@ static void update_controls(HWND dialog) char *path; unsigned int type; char *label; - char *serial; + char serial[16]; const char *device; int i, selection = -1; LVITEM item; @@ -437,7 +437,7 @@ static void update_controls(HWND dialog) set_text(dialog, IDC_EDIT_LABEL, label); /* set serial edit text */ - serial = current_drive->serial; + sprintf( serial, "%X", current_drive->serial ); set_text(dialog, IDC_EDIT_SERIAL, serial); /* TODO: get the device here to put into the edit box */ @@ -518,10 +518,9 @@ static void on_edit_changed(HWND dialog, WORD id) char *serial; serial = get_text(dialog, id); - HeapFree(GetProcessHeap(), 0, current_drive->serial); - current_drive->serial = serial ? serial : strdupA(""); + current_drive->serial = strtoul( serial, NULL, 16 ); - WINE_TRACE("set serial to %s\n", current_drive->serial); + WINE_TRACE("set serial to %08x\n", current_drive->serial); /* enable the apply button */ SendMessage(GetParent(dialog), PSM_CHANGED, (WPARAM) dialog, 0); @@ -760,8 +759,7 @@ DriveDlgProc (HWND dialog, UINT msg, WPARAM wParam, LPARAM lParam) current_drive->label = str ? str : strdupA(""); str = get_text(dialog, IDC_EDIT_SERIAL); - HeapFree(GetProcessHeap(), 0, current_drive->serial); - current_drive->serial = str ? str : strdupA(""); + current_drive->serial = strtoul( str, NULL, 16 ); /* TODO: we don't have a device at this point */ diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index f18b75c..181f591 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -98,7 +98,7 @@ struct drive char letter; char *unixpath; char *label; - char *serial; + DWORD serial; DWORD type; /* one of the DRIVE_ constants from winbase.h */ BOOL in_use; @@ -107,7 +107,7 @@ struct drive #define DRIVE_MASK_BIT(B) (1 << (toupper(B) - 'A')) long drive_available_mask(char letter); -BOOL add_drive(const char letter, const char *targetpath, const char *label, const char *serial, unsigned int type); +BOOL add_drive(const char letter, const char *targetpath, const char *label, DWORD serial, unsigned int type); void delete_drive(struct drive *pDrive); void apply_drive_changes(void); BOOL browse_for_unix_folder(HWND dialog, WCHAR *pszPath);

1 0

Rob Shearman : kernel32: Convert NLS resource files using hex-encoded UTF-16 strings into UTF-8.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: d7944ae1776ce2132d5982b09b0abab15b2e19ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7944ae1776ce2132d5982b09… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Oct 17 11:14:42 2008 +0100 kernel32: Convert NLS resource files using hex-encoded UTF-16 strings into UTF-8. --- dlls/kernel32/nls/div.nls | 260 ++++++++++++++++++++++---------------------- dlls/kernel32/nls/eox.nls | 260 ++++++++++++++++++++++---------------------- dlls/kernel32/nls/guj.nls | 260 ++++++++++++++++++++++---------------------- dlls/kernel32/nls/hin.nls | 260 ++++++++++++++++++++++---------------------- dlls/kernel32/nls/hye.nls | 260 ++++++++++++++++++++++---------------------- dlls/kernel32/nls/kan.nls | 260 ++++++++++++++++++++++---------------------- dlls/kernel32/nls/kat.nls | 260 ++++++++++++++++++++++---------------------- dlls/kernel32/nls/knk.nls | 260 ++++++++++++++++++++++---------------------- dlls/kernel32/nls/mar.nls | 260 ++++++++++++++++++++++---------------------- dlls/kernel32/nls/pan.nls | 260 ++++++++++++++++++++++---------------------- dlls/kernel32/nls/san.nls | 260 ++++++++++++++++++++++---------------------- dlls/kernel32/nls/syr.nls | 260 ++++++++++++++++++++++---------------------- dlls/kernel32/nls/tam.nls | 260 ++++++++++++++++++++++---------------------- dlls/kernel32/nls/tel.nls | 260 ++++++++++++++++++++++---------------------- 14 files changed, 1820 insertions(+), 1820 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7944ae1776ce2132d598…

1 0

Alexandre Julliard : dsound: Avoid use of stdint types.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 80f39e61197e4eb5ac4ef0ba37457155acc3781d URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f39e61197e4eb5ac4ef0ba3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 13:02:32 2008 +0200 dsound: Avoid use of stdint types. --- dlls/dsound/dsound_convert.c | 86 ++++++++++++++++++++--------------------- 1 files changed, 42 insertions(+), 44 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 4b5ff4b..d149b7d 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -34,9 +34,7 @@ */ #include "config.h" -#ifdef HAVE_STDINT_H -#include <stdint.h> -#endif + #include <stdarg.h> #define NONAMELESSSTRUCT @@ -62,20 +60,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); static void convert_8_to_8 (const void *src, void *dst) { - uint8_t *dest = dst; - *dest = *(uint8_t*)src; + BYTE *dest = dst; + *dest = *(BYTE*)src; } static void convert_8_to_16 (const void *src, void *dst) { - uint16_t dest = *(uint8_t*)src, *dest16 = dst; + WORD dest = *(BYTE*)src, *dest16 = dst; *dest16 = le16(dest * 257 - 32768); } static void convert_8_to_24 (const void *src, void *dst) { - uint8_t dest = *(uint8_t*)src; - uint8_t *dest24 = dst; + BYTE dest = *(BYTE*)src; + BYTE *dest24 = dst; dest24[0] = dest; dest24[1] = dest; dest24[2] = dest - 0x80; @@ -83,27 +81,27 @@ static void convert_8_to_24 (const void *src, void *dst) static void convert_8_to_32 (const void *src, void *dst) { - uint32_t dest = *(uint8_t*)src, *dest32 = dst; + DWORD dest = *(BYTE*)src, *dest32 = dst; *dest32 = le32(dest * 16843009 - 2147483648U); } static void convert_16_to_8 (const void *src, void *dst) { - uint8_t *dst8 = dst; - *dst8 = (le16(*(uint16_t*)src)) / 256; + BYTE *dst8 = dst; + *dst8 = (le16(*(WORD*)src)) / 256; *dst8 -= 0x80; } static void convert_16_to_16 (const void *src, void *dst) { - uint16_t *dest = dst; - *dest = *(uint16_t*)src; + WORD *dest = dst; + *dest = *(WORD*)src; } static void convert_16_to_24 (const void *src, void *dst) { - uint16_t dest = le16(*(uint16_t*)src); - uint8_t *dest24 = dst; + WORD dest = le16(*(WORD*)src); + BYTE *dest24 = dst; dest24[0] = dest / 256; dest24[1] = dest; @@ -112,27 +110,27 @@ static void convert_16_to_24 (const void *src, void *dst) static void convert_16_to_32 (const void *src, void *dst) { - uint32_t dest = *(uint16_t*)src, *dest32 = dst; + DWORD dest = *(WORD*)src, *dest32 = dst; *dest32 = dest * 65537; } static void convert_24_to_8 (const void *src, void *dst) { - uint8_t *dst8 = dst; - *dst8 = ((uint8_t *)src)[2]; + BYTE *dst8 = dst; + *dst8 = ((BYTE *)src)[2]; } static void convert_24_to_16 (const void *src, void *dst) { - uint16_t *dest16 = dst; - const uint8_t *source = src; + WORD *dest16 = dst; + const BYTE *source = src; *dest16 = le16(source[2] * 256 + source[1]); } static void convert_24_to_24 (const void *src, void *dst) { - uint8_t *dest24 = dst; - const uint8_t *src24 = src; + BYTE *dest24 = dst; + const BYTE *src24 = src; dest24[0] = src24[0]; dest24[1] = src24[1]; @@ -141,28 +139,28 @@ static void convert_24_to_24 (const void *src, void *dst) static void convert_24_to_32 (const void *src, void *dst) { - uint32_t *dest32 = dst; - const uint8_t *source = src; + DWORD *dest32 = dst; + const BYTE *source = src; *dest32 = le32(source[2] * 16777217 + source[1] * 65536 + source[0] * 256); } static void convert_32_to_8 (const void *src, void *dst) { - uint8_t *dst8 = dst; - *dst8 = (le32(*(uint32_t *)src) / 16777216); + BYTE *dst8 = dst; + *dst8 = (le32(*(DWORD *)src) / 16777216); *dst8 -= 0x80; } static void convert_32_to_16 (const void *src, void *dst) { - uint16_t *dest16 = dst; - *dest16 = le16(le32(*(uint32_t*)src) / 65536); + WORD *dest16 = dst; + *dest16 = le16(le32(*(DWORD*)src) / 65536); } static void convert_32_to_24 (const void *src, void *dst) { - uint32_t dest = le32(*(uint32_t*)dst); - uint8_t *dest24 = dst; + DWORD dest = le32(*(DWORD*)dst); + BYTE *dest24 = dst; dest24[0] = dest / 256; dest24[1] = dest / 65536; @@ -171,8 +169,8 @@ static void convert_32_to_24 (const void *src, void *dst) static void convert_32_to_32 (const void *src, void *dst) { - uint32_t *dest = dst; - *dest = *(uint32_t*)src; + DWORD *dest = dst; + *dest = *(DWORD*)src; } const bitsconvertfunc convertbpp[4][4] = { @@ -182,15 +180,15 @@ const bitsconvertfunc convertbpp[4][4] = { { convert_32_to_8, convert_32_to_16, convert_32_to_24, convert_32_to_32 }, }; -static void mix8(int8_t *src, int32_t *dst, unsigned len) +static void mix8(signed char *src, INT *dst, unsigned len) { TRACE("%p - %p %d\n", src, dst, len); while (len--) /* 8-bit WAV is unsigned, it's here converted to signed, normalize function will convert it back again */ - *(dst++) += (int8_t)((uint8_t)*(src++) - (uint8_t)0x80); + *(dst++) += (signed char)((BYTE)*(src++) - (BYTE)0x80); } -static void mix16(int16_t *src, int32_t *dst, unsigned len) +static void mix16(SHORT *src, INT *dst, unsigned len) { TRACE("%p - %p %d\n", src, dst, len); len /= 2; @@ -201,14 +199,14 @@ static void mix16(int16_t *src, int32_t *dst, unsigned len) } } -static void mix24(uint8_t *src, int32_t *dst, unsigned len) +static void mix24(BYTE *src, INT *dst, unsigned len) { TRACE("%p - %p %d\n", src, dst, len); len /= 3; while (len--) { - uint32_t field; - field = ((unsigned)src[2] << 16) + ((unsigned)src[1] << 8) + (unsigned)src[0]; + DWORD field; + field = ((DWORD)src[2] << 16) + ((DWORD)src[1] << 8) + (DWORD)src[0]; if (src[2] & 0x80) field |= 0xFF000000U; *(dst++) += field; @@ -216,7 +214,7 @@ static void mix24(uint8_t *src, int32_t *dst, unsigned len) } } -static void mix32(int32_t *src, int64_t *dst, unsigned len) +static void mix32(INT *src, LONGLONG *dst, unsigned len) { TRACE("%p - %p %d\n", src, dst, len); len /= 4; @@ -231,7 +229,7 @@ const mixfunc mixfunctions[4] = { (mixfunc)mix32 }; -static void norm8(int32_t *src, int8_t *dst, unsigned len) +static void norm8(INT *src, signed char *dst, unsigned len) { TRACE("%p - %p %d\n", src, dst, len); while (len--) @@ -246,7 +244,7 @@ static void norm8(int32_t *src, int8_t *dst, unsigned len) } } -static void norm16(int32_t *src, int16_t *dst, unsigned len) +static void norm16(INT *src, SHORT *dst, unsigned len) { TRACE("%p - %p %d\n", src, dst, len); len /= 2; @@ -262,7 +260,7 @@ static void norm16(int32_t *src, int16_t *dst, unsigned len) } } -static void norm24(int32_t *src, uint8_t *dst, unsigned len) +static void norm24(INT *src, BYTE *dst, unsigned len) { TRACE("%p - %p %d\n", src, dst, len); len /= 3; @@ -291,14 +289,14 @@ static void norm24(int32_t *src, uint8_t *dst, unsigned len) } } -static void norm32(int64_t *src, int32_t *dst, unsigned len) +static void norm32(LONGLONG *src, INT *dst, unsigned len) { TRACE("%p - %p %d\n", src, dst, len); len /= 4; while (len--) { *dst = le32(*src); - if (*src <= -(int64_t)0x80000000) + if (*src <= -(LONGLONG)0x80000000) *dst = le32(0x80000000); else if (*src > 0x7fffffff) *dst = le32(0x7fffffff);

1 0

Henri Verbeet : dxgi: Add the IDXGIDeviceSubObject interface.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 69b32d71d6163ef499fffde9067f02f9c27813cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b32d71d6163ef499fffde90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 17 09:54:55 2008 +0200 dxgi: Add the IDXGIDeviceSubObject interface. --- include/dxgi.idl | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index a4bf802..e82c5be 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -44,3 +44,16 @@ interface IDXGIObject : IUnknown [out] void **parent ); } + +[ + object, + local, + uuid(3d3e0379-f9de-4d58-bb6c-18d62992f1a6) +] +interface IDXGIDeviceSubObject : IDXGIObject +{ + HRESULT GetDevice( + [in] REFIID riid, + [out] void **device + ); +}

1 0

Henri Verbeet : dxgi: Add the IDXGIObject interface.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 40b9eab409b271c8833f45120151dfce51655dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b9eab409b271c8833f45120… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 17 09:54:55 2008 +0200 dxgi: Add the IDXGIObject interface. --- include/dxgi.idl | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index 85f561f..a4bf802 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -17,3 +17,30 @@ */ import "dxgitype.idl"; + +[ + object, + local, + uuid(aec22fb8-76f3-4639-9be0-28eb43a67a2e) +] +interface IDXGIObject : IUnknown +{ + HRESULT SetPrivateData( + [in] REFGUID guid, + [in] UINT data_size, + [in] const void *data + ); + HRESULT SetPrivateDataInterface( + [in] REFGUID guid, + [in] const IUnknown *object + ); + HRESULT GetPrivateData( + [in] REFGUID guid, + [in, out] UINT data_size, + [out] void *data + ); + HRESULT GetParent( + [in] REFIID riid, + [out] void **parent + ); +}

1 0

Henri Verbeet : dxguid: Add d3d10 GUIDs.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: d7e30dba229bc4e05cae480eb40dd41d53b23071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e30dba229bc4e05cae480eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 17 09:54:55 2008 +0200 dxguid: Add d3d10 GUIDs. --- dlls/dxguid/Makefile.in | 5 +++-- dlls/dxguid/dx10guid.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/dxguid/Makefile.in b/dlls/dxguid/Makefile.in index 8659ba1..e3806ac 100644 --- a/dlls/dxguid/Makefile.in +++ b/dlls/dxguid/Makefile.in @@ -5,8 +5,9 @@ VPATH = @srcdir@ MODULE = dxguid C_SRCS = \ - dx8guid.c \ - dx9guid.c \ + dx8guid.c \ + dx9guid.c \ + dx10guid.c \ dxguid.c @MAKE_IMPLIB_RULES@ diff --git a/dlls/dxguid/dx10guid.c b/dlls/dxguid/dx10guid.c new file mode 100644 index 0000000..de6490f --- /dev/null +++ b/dlls/dxguid/dx10guid.c @@ -0,0 +1,34 @@ +/* + * DirectX 10 GUID definitions + * + * Copyright 2000 Alexandre Julliard + * Copyright 2000 Francois Gouget + * Copyright 2003 Raphael Junqueira + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" + +#include "objbase.h" +#include "olectl.h" +#include "initguid.h" + +#include "d3d10.h"

1 0

Henri Verbeet : d3d10: Create an importlib.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 3a8a4b6e56cf2ca276545a0088db55b072cb767e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a8a4b6e56cf2ca276545a008… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 17 09:54:55 2008 +0200 d3d10: Create an importlib. --- dlls/Makefile.in | 5 +++++ dlls/d3d10/Makefile.in | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 1ac4ee0..12f6584 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -197,6 +197,7 @@ IMPORT_LIBS = \ cryptnet/libcryptnet.$(IMPLIBEXT) \ cryptui/libcryptui.$(IMPLIBEXT) \ ctl3d32/libctl3d32.$(IMPLIBEXT) \ + d3d10/libd3d10.$(IMPLIBEXT) \ d3d8/libd3d8.$(IMPLIBEXT) \ d3d9/libd3d9.$(IMPLIBEXT) \ d3dim/libd3dim.$(IMPLIBEXT) \ @@ -335,6 +336,7 @@ CROSS_IMPLIBS = \ cryptnet/libcryptnet.a \ cryptui/libcryptui.a \ ctl3d32/libctl3d32.a \ + d3d10/libd3d10.a \ d3d8/libd3d8.a \ d3d9/libd3d9.a \ d3dim/libd3dim.a \ @@ -516,6 +518,9 @@ cryptui/libcryptui.def cryptui/libcryptui.a: cryptui/cryptui.spec $(WINEBUILD) ctl3d32/libctl3d32.def ctl3d32/libctl3d32.a: ctl3d32/ctl3d32.spec $(WINEBUILD) @cd ctl3d32 && $(MAKE) `basename $@` +d3d10/libd3d10.def d3d10/libd3d10.a: d3d10/d3d10.spec $(WINEBUILD) + @cd d3d10 && $(MAKE) `basename $@` + d3d8/libd3d8.def d3d8/libd3d8.a: d3d8/d3d8.spec $(WINEBUILD) @cd d3d8 && $(MAKE) `basename $@` diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index 5ee45c1..d9bb511 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3d10.dll +IMPORTLIB = d3d10 IMPORTS = dxguid uuid wined3d kernel32 C_SRCS = \

1 0

Paul Bryan Roberts : advapi32: ConvertStringSecurityDescriptorToSecurityDescriptor - more tests (pass).
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 7e0932d627c34a25c630e743f28c1496a83eeddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e0932d627c34a25c630e743f… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Mon Oct 13 22:02:06 2008 +0100 advapi32: ConvertStringSecurityDescriptorToSecurityDescriptor - more tests (pass). --- dlls/advapi32/security.c | 8 +++++- dlls/advapi32/tests/security.c | 47 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 832e6fa..3c26654 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3833,6 +3833,7 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, return TRUE; lerr: + SetLastError(ERROR_INVALID_ACL); WARN("Invalid ACE string format\n"); return FALSE; } @@ -4025,6 +4026,11 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW( SetLastError(ERROR_CALL_NOT_IMPLEMENTED); goto lend; } + else if (!StringSecurityDescriptor || !SecurityDescriptor) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } else if (StringSDRevision != SID_REVISION) { SetLastError(ERROR_UNKNOWN_REVISION); @@ -4476,7 +4482,6 @@ BOOL WINAPI ConvertStringSidToSidW(LPCWSTR StringSid, PSID* Sid) if (!bret) LocalFree(*Sid); } - TRACE("returning %s\n", bret ? "TRUE" : "FALSE"); return bret; } @@ -4502,7 +4507,6 @@ BOOL WINAPI ConvertStringSidToSidA(LPCSTR StringSid, PSID* Sid) bret = ConvertStringSidToSidW(wStringSid, Sid); HeapFree(GetProcessHeap(), 0, wStringSid); } - TRACE("returning %s\n", bret ? "TRUE" : "FALSE"); return bret; } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 45c8fd5..f0d7ade 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -81,6 +81,8 @@ typedef BOOL (WINAPI *fnConvertSidToStringSidA)( PSID pSid, LPSTR *str ); typedef BOOL (WINAPI *fnConvertStringSidToSidA)( LPCSTR str, PSID pSid ); static BOOL (WINAPI *pConvertStringSecurityDescriptorToSecurityDescriptorA)(LPCSTR, DWORD, PSECURITY_DESCRIPTOR*, PULONG ); +static BOOL (WINAPI *pConvertStringSecurityDescriptorToSecurityDescriptorW)(LPCWSTR, DWORD, + PSECURITY_DESCRIPTOR*, PULONG ); static BOOL (WINAPI *pConvertSecurityDescriptorToStringSecurityDescriptorA)(PSECURITY_DESCRIPTOR, DWORD, SECURITY_INFORMATION, LPSTR *, PULONG ); typedef BOOL (WINAPI *fnGetFileSecurityA)(LPCSTR, SECURITY_INFORMATION, @@ -144,6 +146,8 @@ static void init(void) pAddAuditAccessAceEx = (void *)GetProcAddress(hmod, "AddAuditAccessAceEx"); pConvertStringSecurityDescriptorToSecurityDescriptorA = (void *)GetProcAddress(hmod, "ConvertStringSecurityDescriptorToSecurityDescriptorA" ); + pConvertStringSecurityDescriptorToSecurityDescriptorW = + (void *)GetProcAddress(hmod, "ConvertStringSecurityDescriptorToSecurityDescriptorW" ); pConvertSecurityDescriptorToStringSecurityDescriptorA = (void *)GetProcAddress(hmod, "ConvertSecurityDescriptorToStringSecurityDescriptorA" ); pCreateWellKnownSid = (fnCreateWellKnownSid)GetProcAddress( hmod, "CreateWellKnownSid" ); @@ -2175,6 +2179,7 @@ static void test_ConvertStringSecurityDescriptor(void) { BOOL ret; PSECURITY_DESCRIPTOR pSD; + static const WCHAR Blank[] = { 0 }; if (!pConvertStringSecurityDescriptorToSecurityDescriptorA) { @@ -2255,11 +2260,51 @@ static void test_ConvertStringSecurityDescriptor(void) SetLastError(0xdeadbeef); ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;ROB;;;WD)", SDDL_REVISION_1, &pSD, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_ACL, "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_ACL instead of %d\n", GetLastError()); + /* test behaviour with NULL parameters */ + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + NULL, 0xdeadbeef, &pSD, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_PARAMETER instead of %d\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorW( + NULL, 0xdeadbeef, &pSD, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_PARAMETER instead of %d\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + "D:(A;;ROB;;;WD)", 0xdeadbeef, NULL, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_PARAMETER instead of %d\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + "D:(A;;ROB;;;WD)", SDDL_REVISION_1, NULL, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_PARAMETER instead of %d\n", + GetLastError()); + + /* test behaviour with empty strings */ + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + "", SDDL_REVISION_1, &pSD, NULL); + ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorW( + Blank, SDDL_REVISION_1, &pSD, NULL); + ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); + /* test ACE string SID */ SetLastError(0xdeadbeef); ret = pConvertStringSecurityDescriptorToSecurityDescriptorA(

1 0