August 2006 - Wine-commits - list.winehq.org

Juan Lang : crypt32: Support more types in CertRDNToStr.
by Alexandre Julliard 02 Aug '06

02 Aug '06

Module: wine Branch: refs/heads/master Commit: 5af2b06d477ca192f9506e9a4088f8d5a78cdf58 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5af2b06d477ca192f9506e9… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Aug 1 17:15:14 2006 -0700 crypt32: Support more types in CertRDNToStr. --- dlls/crypt32/str.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 5888aef..415cc43 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -37,8 +37,14 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dw { case CERT_RDN_ANY_TYPE: break; + case CERT_RDN_NUMERIC_STRING: case CERT_RDN_PRINTABLE_STRING: + case CERT_RDN_TELETEX_STRING: + case CERT_RDN_VIDEOTEX_STRING: case CERT_RDN_IA5_STRING: + case CERT_RDN_GRAPHIC_STRING: + case CERT_RDN_VISIBLE_STRING: + case CERT_RDN_GENERAL_STRING: if (!psz || !csz) ret = pValue->cbData; else @@ -79,8 +85,14 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dw { case CERT_RDN_ANY_TYPE: break; + case CERT_RDN_NUMERIC_STRING: case CERT_RDN_PRINTABLE_STRING: + case CERT_RDN_TELETEX_STRING: + case CERT_RDN_VIDEOTEX_STRING: case CERT_RDN_IA5_STRING: + case CERT_RDN_GRAPHIC_STRING: + case CERT_RDN_VISIBLE_STRING: + case CERT_RDN_GENERAL_STRING: if (!psz || !csz) ret = pValue->cbData; else

1 0

Hwang YunSong(황윤성) : msvfw32: Updated Korean resource.
by Alexandre Julliard 02 Aug '06

02 Aug '06

Module: wine Branch: refs/heads/master Commit: d93a1c1e05e920ad22b4260e46b5269952c8d9ab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d93a1c1e05e920ad22b4260… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Aug 2 08:45:09 2006 +0900 msvfw32: Updated Korean resource. --- dlls/msvfw32/msvfw32_Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Ko.rc b/dlls/msvfw32/msvfw32_Ko.rc index cfe105f..346f714 100644 --- a/dlls/msvfw32/msvfw32_Ko.rc +++ b/dlls/msvfw32/msvfw32_Ko.rc @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg" LTEXT "��(&C):",-1,9,6,105,8 COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "��(&f)...",882,129,36,49,14 + PUSHBUTTON "��(&F)...",882,129,36,49,14 PUSHBUTTON "��(&A)...",883,129,52,49,14 SCROLLBAR 884,9,44,111,9,WS_TABSTOP

1 0

Stefan Leichter : shell32: Fix the file version string of the version resource.
by Alexandre Julliard 02 Aug '06

02 Aug '06

Module: wine Branch: refs/heads/master Commit: 999b48d8b5f05b243adc7409c5d3729924c71c1f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=999b48d8b5f05b243adc740… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Aug 1 22:53:25 2006 +0200 shell32: Fix the file version string of the version resource. --- dlls/shell32/version.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/version.h b/dlls/shell32/version.h index 2f9a3f9..cd0d8db 100644 --- a/dlls/shell32/version.h +++ b/dlls/shell32/version.h @@ -25,4 +25,4 @@ #define WINE_FILEVERSION_PLATFORMID 6975 /* FIXME: when libs/wpp gets fixed to support concatenation we can remove * this and define it in version.rc */ -#define WINE_FILEVERSION "5.0.3900.6975" +#define WINE_FILEVERSION_STR "5.0.3900.6975"

1 0

Andrew Talbot : kernel/tests: Write-strings warnings fix.
by Alexandre Julliard 02 Aug '06

02 Aug '06

Module: wine Branch: refs/heads/master Commit: cb1930cf791f29811a36f28578745a61149d97e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb1930cf791f29811a36f28… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Aug 1 20:16:41 2006 +0100 kernel/tests: Write-strings warnings fix. --- dlls/kernel/tests/process.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/tests/process.c b/dlls/kernel/tests/process.c index 4007483..4b269b2 100644 --- a/dlls/kernel/tests/process.c +++ b/dlls/kernel/tests/process.c @@ -795,6 +795,7 @@ static void test_Directory(void) PROCESS_INFORMATION info; STARTUPINFOA startup; char windir[MAX_PATH]; + static CHAR cmdline[] = "winver.exe"; memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -816,13 +817,13 @@ static void test_Directory(void) assert(DeleteFileA(resfile) != 0); /* search PATH for the exe if directory is NULL */ - ok(CreateProcessA(NULL, "winver.exe", NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); + ok(CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(TerminateProcess(info.hProcess, 0), "Child process termination\n"); /* if any directory is provided, don't search PATH, error on bad directory */ SetLastError(0xdeadbeef); memset(&info, 0, sizeof(info)); - ok(!CreateProcessA(NULL, "winver.exe", NULL, NULL, FALSE, 0L, + ok(!CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, "non\\existent\\directory", &startup, &info), "CreateProcess\n"); ok(GetLastError() == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %ld\n", GetLastError()); ok(!TerminateProcess(info.hProcess, 0), "Child process should not exist\n");

1 0

Andrew Talbot : kernel: Write-strings warnings fixes.
by Alexandre Julliard 02 Aug '06

02 Aug '06

Module: wine Branch: refs/heads/master Commit: b20a8916a9e90b30dc713d27e1049eef35a3eae6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b20a8916a9e90b30dc713d2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Aug 1 19:38:40 2006 +0100 kernel: Write-strings warnings fixes. --- dlls/kernel/oldconfig.c | 2 +- dlls/kernel/thunk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/oldconfig.c b/dlls/kernel/oldconfig.c index 0eb5554..c386450 100644 --- a/dlls/kernel/oldconfig.c +++ b/dlls/kernel/oldconfig.c @@ -96,7 +96,7 @@ static ULONG allocate_default_keys(void) * NOTE: programs usually read these registry entries after sending the * IOCTL_SCSI_GET_ADDRESS ioctl to the cdrom */ -static void create_scsi_entry( PSCSI_ADDRESS scsi_addr, LPSTR lpDriver, UINT uDriveType, +static void create_scsi_entry( PSCSI_ADDRESS scsi_addr, LPCSTR lpDriver, UINT uDriveType, LPSTR lpDriveName, LPSTR lpUnixDeviceName ) { static UCHAR uCdromNumber = 0; diff --git a/dlls/kernel/thunk.c b/dlls/kernel/thunk.c index 8da6cbe..62ee48a 100644 --- a/dlls/kernel/thunk.c +++ b/dlls/kernel/thunk.c @@ -323,7 +323,7 @@ static LPVOID _loadthunk(LPCSTR module, /*********************************************************************** * GetThunkStuff (KERNEL32.53) */ -LPVOID WINAPI GetThunkStuff(LPSTR module, LPSTR func) +LPVOID WINAPI GetThunkStuff(LPCSTR module, LPCSTR func) { return _loadthunk(module, func, "<kernel>", NULL, 0L); }

1 0

Dan Hipschman : oleview: Initialize TVITEM.lParam to NULL in EnumFuncs.
by Alexandre Julliard 02 Aug '06

02 Aug '06

Module: wine Branch: refs/heads/master Commit: 10d552b22ef60a755584cf9e980c52beb8e50731 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=10d552b22ef60a755584cf9… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Aug 1 10:49:25 2006 -0700 oleview: Initialize TVITEM.lParam to NULL in EnumFuncs. --- programs/oleview/typelib.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 7f32cfe..db28545 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -243,6 +243,7 @@ int EnumFuncs(ITypeInfo *pTypeInfo, int U(tvis).item.cchTextMax = SysStringLen(bstrName); U(tvis).item.pszText = bstrName; + U(tvis).item.lParam = 0; SendMessage(typelib.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis); SysFreeString(bstrName);

1 0

Francois Gouget : mshtml: Remove unwarranted REG_EXPAND_SZ flags.
by Alexandre Julliard 02 Aug '06

02 Aug '06

Module: wine Branch: refs/heads/master Commit: 26baab35646e77b7ed540d14e10eb1ee1ec88c57 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=26baab35646e77b7ed540d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 1 21:14:40 2006 +0200 mshtml: Remove unwarranted REG_EXPAND_SZ flags. --- dlls/mshtml/mshtml.inf | 64 ++++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=26baab35646e77b7ed5…

1 0

Alexandre Julliard : libport: Fixed invalid lvalue accesses in memmove.
by Alexandre Julliard 01 Aug '06

01 Aug '06

Module: wine Branch: refs/heads/master Commit: eb2bedc56d83990499a77a7d17cad810822230e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb2bedc56d83990499a77a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 1 19:35:52 2006 +0200 libport: Fixed invalid lvalue accesses in memmove. --- libs/port/memmove.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/port/memmove.c b/libs/port/memmove.c index f8402de..7be9638 100644 --- a/libs/port/memmove.c +++ b/libs/port/memmove.c @@ -22,25 +22,26 @@ #include "config.h" #include "wine/port.h" #ifndef HAVE_MEMMOVE -void *memmove( void *dest, const void *src, size_t len ) +void *memmove( void *dest, const void *source, size_t len ) { register char *dst = dest; + register const char *src = source; /* Use memcpy if not overlapping */ - if ((dst + len <= (char *)src) || ((char *)src + len <= dst)) + if ((dst + len <= src) || (src + len <= dst)) { memcpy( dst, src, len ); } /* Otherwise do it the hard way (FIXME: could do better than this) */ - else if (dst < (char *)src) + else if (dst < src) { - while (len--) *dst++ = *((char *)src)++; + while (len--) *dst++ = *src++; } else { dst += len - 1; - src = (char *)src + len - 1; - while (len--) *dst-- = *((char *)src)--; + src += len - 1; + while (len--) *dst-- = *src--; } return dest; }

1 0

Hwang YunSong(황윤성) : view: Updated Korean resource.
by Alexandre Julliard 01 Aug '06

01 Aug '06

Module: wine Branch: refs/heads/master Commit: 5d73cfdae8c2c6a397a3d7b74dd6840a1b10049b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d73cfdae8c2c6a397a3d7b… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Aug 1 17:54:06 2006 +0900 view: Updated Korean resource. --- programs/view/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/view/Ko.rc b/programs/view/Ko.rc index 1b56f83..90d801c 100644 --- a/programs/view/Ko.rc +++ b/programs/view/Ko.rc @@ -34,7 +34,7 @@ BEGIN POPUP "��(&F)" BEGIN MENUITEM "��(&O)", IDM_OPEN - MENUITEM "��(&x)", IDM_EXIT + MENUITEM "��(&X)", IDM_EXIT END POPUP "ȸ��(&P)" BEGIN

1 0

Huw Davies : comctl32: Limit the width of the watermark to 164 pixels.
by Alexandre Julliard 01 Aug '06

01 Aug '06

Module: wine Branch: refs/heads/master Commit: 650c9c42deea8723bcd6403755c06b10ea3cd483 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=650c9c42deea8723bcd6403… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 1 12:22:59 2006 +0100 comctl32: Limit the width of the watermark to 164 pixels. --- dlls/comctl32/propsheet.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 8fead28..972f862 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3348,6 +3348,8 @@ static LRESULT PROPSHEET_Paint(HWND hwnd GetObjectW(psInfo->ppshheader.u4.hbmWatermark, sizeof(BITMAP), (LPVOID)&bm); hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u4.hbmWatermark); + /* The watermark is truncated to a width of 164 pixels */ + r.right = min(r.right, 164); BitBlt(hdc, 0, offsety, min(bm.bmWidth, r.right), min(bm.bmHeight, r.bottom), hdcSrc, 0, 0, SRCCOPY);

1 0