January 2008 - Wine-commits

Gerald Pfeifer : msi: Complete initializers.
by Alexandre Julliard 10 Jan '08

10 Jan '08

Module: wine Branch: master Commit: 388edd1086b8fca2bced6c7d82561550ea8c50b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=388edd1086b8fca2bced6c7d8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jan 10 02:58:48 2008 +0100 msi: Complete initializers. --- dlls/msi/table.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 97f0298..c7fbcc2 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -105,13 +105,13 @@ static WCHAR szType[] = { 'T','y','p','e',0 }; * Do not mark them const. */ static MSICOLUMNINFO _Columns_cols[4] = { - { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0 }, - { szColumns, 2, szNumber, MSITYPE_VALID | MSITYPE_KEY | 2, 2 }, - { szColumns, 3, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 4 }, - { szColumns, 4, szType, MSITYPE_VALID | 2, 6 }, + { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, NULL }, + { szColumns, 2, szNumber, MSITYPE_VALID | MSITYPE_KEY | 2, 2, 0, NULL }, + { szColumns, 3, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 4, 0, NULL }, + { szColumns, 4, szType, MSITYPE_VALID | 2, 6, 0, NULL }, }; static MSICOLUMNINFO _Tables_cols[1] = { - { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 0 }, + { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 0, 0, NULL }, }; #define MAX_STREAM_NAME 0x1f

1 0

Louis Lenders : user32: Add stub for GetLayeredWindowAttributes.
by Alexandre Julliard 10 Jan '08

10 Jan '08

Module: wine Branch: master Commit: a467feae39d1fe7d49d9df0d46700fff86cb02e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a467feae39d1fe7d49d9df0d4… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jan 10 08:36:39 2008 +0000 user32: Add stub for GetLayeredWindowAttributes. --- dlls/user32/user32.spec | 2 +- dlls/user32/win.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 168ac80..6b0fc0a 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -304,7 +304,7 @@ @ stdcall GetKeyboardType(long) @ stdcall GetLastActivePopup(long) @ stdcall GetLastInputInfo(ptr) -# @ stub GetLayeredWindowAttributes +@ stdcall GetLayeredWindowAttributes(long ptr ptr ptr) # @ stub GetListBoxInfo @ stdcall GetMenu(long) @ stdcall GetMenuBarInfo(long long long ptr) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 72f3cfc..e55fe20 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3084,6 +3084,16 @@ BOOL WINAPI SetLayeredWindowAttributes( HWND hWnd, COLORREF rgbKey, } /***************************************************************************** + * GetLayeredWindowAttributes (USER32.@) + */ +BOOL WINAPI GetLayeredWindowAttributes( HWND hWnd, COLORREF *prgbKey, + BYTE *pbAlpha, DWORD *pdwFlags ) +{ + FIXME("(%p,%p,%p,%p): stub!\n", hWnd, prgbKey, pbAlpha, pdwFlags); + return FALSE; +} + +/***************************************************************************** * UpdateLayeredWindow (USER32.@) */ BOOL WINAPI UpdateLayeredWindow( HWND hwnd, HDC hdcDst, POINT *pptDst, SIZE *psize,

1 0

Paul Vriens : kernel32/tests: Skip not implemented functions.
by Alexandre Julliard 10 Jan '08

10 Jan '08

Module: wine Branch: master Commit: 7b7838289f4a2581bef8bb04e9473b065db1d9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7838289f4a2581bef8bb04e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jan 10 11:05:26 2008 +0100 kernel32/tests: Skip not implemented functions. --- dlls/kernel32/tests/format_msg.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index e7b012c..23b0a09 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -233,6 +233,12 @@ static void test_message_null_buffer(void) SetLastError(0xdeadbeef); ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 0, NULL); error = GetLastError(); + if (!ret && error == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("FormatMessageW is not implemented\n"); + return; + } + ok(!ret, "FormatMessageW returned %u\n", ret); ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error); }

1 0

Paul Vriens : kernel32/tests: Skip not implemented functions.
by Alexandre Julliard 10 Jan '08

10 Jan '08

Module: wine Branch: master Commit: c9434956d5b098df19a133dcc9022ce97fc86447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9434956d5b098df19a133dcc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jan 10 11:05:35 2008 +0100 kernel32/tests: Skip not implemented functions. --- dlls/kernel32/tests/path.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 4de58c2..05111a8 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -972,7 +972,14 @@ static void test_GetShortPathNameW(void) WCHAR name[] = { 't', 'e', 's', 't', 0 }; WCHAR backSlash[] = { '\\', 0 }; + SetLastError(0xdeadbeef); GetTempPathW( MAX_PATH, path ); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("GetTempPathW is not implemented\n"); + return; + } + lstrcatW( path, test_path ); lstrcatW( path, backSlash ); ret = CreateDirectoryW( path, NULL );

1 0

Marcus Meissner : server: Remove superflous check (value-> data is dereferenced before check).
by Alexandre Julliard 10 Jan '08

10 Jan '08

Module: wine Branch: master Commit: 368d935350d64ab97970a6ca3caad1065c51aae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=368d935350d64ab97970a6ca3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 9 22:56:06 2008 +0100 server: Remove superflous check (value->data is dereferenced before check). --- server/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/registry.c b/server/registry.c index d402f2c..5084892 100644 --- a/server/registry.c +++ b/server/registry.c @@ -204,7 +204,7 @@ static void dump_value( const struct key_value *value, FILE *f ) if (((WCHAR *)value->data)[value->len / sizeof(WCHAR) - 1]) break; if (value->type != REG_SZ) fprintf( f, "str(%x):", value->type ); fputc( '\"', f ); - if (value->data) dump_strW( (WCHAR *)value->data, value->len / sizeof(WCHAR), f, "\"\"" ); + dump_strW( (WCHAR *)value->data, value->len / sizeof(WCHAR), f, "\"\"" ); fprintf( f, "\"\n" ); return;

1 0

Paul Chitescu : advapi32: Accept a NULL lpServiceStatus in ControlService.
by Alexandre Julliard 10 Jan '08

10 Jan '08

Module: wine Branch: master Commit: 038c3a264bc28721026c5df3dc76dcd26d8ef5df URL: http://source.winehq.org/git/wine.git/?a=commit;h=038c3a264bc28721026c5df3d… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Jan 9 19:58:48 2008 +0200 advapi32: Accept a NULL lpServiceStatus in ControlService. --- dlls/advapi32/service.c | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 4c03c1e..7cfd9ea 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1037,26 +1037,29 @@ BOOL WINAPI ControlService( SC_HANDLE hService, DWORD dwControl, return FALSE; } - ret = QueryServiceStatus(hService, lpServiceStatus); - if (!ret) + if (lpServiceStatus) { - ERR("failed to query service status\n"); - SetLastError(ERROR_SERVICE_NOT_ACTIVE); - return FALSE; - } + ret = QueryServiceStatus(hService, lpServiceStatus); + if (!ret) + { + ERR("failed to query service status\n"); + SetLastError(ERROR_SERVICE_NOT_ACTIVE); + return FALSE; + } - switch (lpServiceStatus->dwCurrentState) - { - case SERVICE_STOPPED: - SetLastError(ERROR_SERVICE_NOT_ACTIVE); - return FALSE; - case SERVICE_START_PENDING: - if (dwControl==SERVICE_CONTROL_STOP) - break; - /* fall thru */ - case SERVICE_STOP_PENDING: - SetLastError(ERROR_SERVICE_CANNOT_ACCEPT_CTRL); - return FALSE; + switch (lpServiceStatus->dwCurrentState) + { + case SERVICE_STOPPED: + SetLastError(ERROR_SERVICE_NOT_ACTIVE); + return FALSE; + case SERVICE_START_PENDING: + if (dwControl==SERVICE_CONTROL_STOP) + break; + /* fall thru */ + case SERVICE_STOP_PENDING: + SetLastError(ERROR_SERVICE_CANNOT_ACCEPT_CTRL); + return FALSE; + } } handle = service_open_pipe(hsvc->name);

1 0

Marcus Meissner : msvcrt: Remove strange condition which might lead to crash.
by Alexandre Julliard 10 Jan '08

10 Jan '08

Module: wine Branch: master Commit: a54150bc531aa5a3ea9828fdb194bf261d0ff0d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54150bc531aa5a3ea9828fdb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jan 10 09:49:47 2008 +0100 msvcrt: Remove strange condition which might lead to crash. --- dlls/msvcrt/process.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index ee044aa..87a29f4 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -189,7 +189,7 @@ static MSVCRT_wchar_t* msvcrt_argvtos(const MSVCRT_wchar_t* const* arg, MSVCRT_w MSVCRT_wchar_t* p; MSVCRT_wchar_t* ret; - if (!arg && !delim) + if (!arg) { /* Return NULL for an empty environment list */ return NULL; @@ -233,7 +233,7 @@ static MSVCRT_wchar_t *msvcrt_argvtos_aw(const char * const *arg, MSVCRT_wchar_t unsigned long len; MSVCRT_wchar_t *p, *ret; - if (!arg && !delim) + if (!arg) { /* Return NULL for an empty environment list */ return NULL;

1 0

Paul Romanyszyn : comdlg32: Filter change should not update filename.
by Alexandre Julliard 10 Jan '08

10 Jan '08

Module: wine Branch: master Commit: 95fa37ff84def4438902a3fe44912768d389877a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95fa37ff84def4438902a3fe4… Author: Paul Romanyszyn <pgr(a)arcelectronicsinc.com> Date: Thu Jan 10 00:27:40 2008 -0500 comdlg32: Filter change should not update filename. --- dlls/comdlg32/filedlg31.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 6e8cdcb..10238de 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -588,7 +588,6 @@ static LRESULT FD31_FileTypeChange( const FD31_DATA *lfs ) return TRUE; pstr = (LPWSTR)SendDlgItemMessageW(lfs->hwnd, cmb1, CB_GETITEMDATA, lRet, 0); TRACE("Selected filter : %s\n", debugstr_w(pstr)); - SetDlgItemTextW( lfs->hwnd, edt1, pstr ); return FD31_Validate( lfs, NULL, cmb1, lRet, TRUE ); }

1 0

Lei Zhang : shlwapi: Fix a return value in UrlEscapeA.
by Alexandre Julliard 10 Jan '08

10 Jan '08

Module: wine Branch: master Commit: ea05a257df88e54f8cf6f27721d34bcabdfed02d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea05a257df88e54f8cf6f2772… Author: Lei Zhang <thestig(a)google.com> Date: Wed Jan 9 14:03:47 2008 -0800 shlwapi: Fix a return value in UrlEscapeA. --- dlls/shlwapi/tests/url.c | 4 +--- dlls/shlwapi/url.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index b7549bd..87b8b1d 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -480,9 +480,7 @@ static void test_UrlEscape(void) size = 1; ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); - todo_wine { - ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); - } + ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); ok(size == 34, "got %d, expected %d\n", size, 34); for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) { diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index ac150e6..fed9a9f 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -860,7 +860,7 @@ HRESULT WINAPI UrlEscapeA( *pcchEscaped = lenA; } else { *pcchEscaped = lenA + 1; - ret = E_INVALIDARG; + ret = E_POINTER; } } if(escapedW != bufW) HeapFree(GetProcessHeap(), 0, escapedW);

1 0

Lei Zhang : mapi32: Fix UrlEscapeA usage in MAPISendMail.
by Alexandre Julliard 10 Jan '08

10 Jan '08

Module: wine Branch: master Commit: 992c891c8fc9b8dbb2abe706204e2d6e058def44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992c891c8fc9b8dbb2abe7062… Author: Lei Zhang <thestig(a)google.com> Date: Wed Jan 9 14:05:29 2008 -0800 mapi32: Fix UrlEscapeA usage in MAPISendMail. --- dlls/mapi32/sendmail.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 6968f7d..4103117 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -67,6 +67,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, static const char format[] = "mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\""; char *mailto = NULL, *escape = NULL; + char empty_string[] = ""; HRESULT res; DWORD size; @@ -178,8 +179,8 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, sprintf( mailto, format, to ? to : "", subject, cc ? cc : "", bcc ? bcc : "", body ); - size = 0; - res = UrlEscapeA( mailto, NULL, &size, URL_ESCAPE_SPACES_ONLY ); + size = 1; + res = UrlEscapeA( mailto, empty_string, &size, URL_ESCAPE_SPACES_ONLY ); if (res != E_POINTER) goto exit; escape = HeapAlloc( GetProcessHeap(), 0, size );

1 0