March 2007 - Wine-Commits - list.winehq.org

James Hawkins : setupapi: Correct the Inf output position.
by Alexandre Julliard March 28, 2007

March 28, 2007

Module: wine Branch: master Commit: 672952d2b6abf525d3ccd73b68ee418f51f8eae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=672952d2b6abf525d3ccd73b6… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 28 01:56:39 2007 -0500 setupapi: Correct the Inf output position. --- dlls/setupapi/misc.c | 2 +- dlls/setupapi/tests/misc.c | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index eb3c3a1..4c7786f 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -978,7 +978,7 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, } } - if (component) *component = p; + if (component) *component = p + 1; if (required_size) *required_size = size; return ret; diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 27dcc77..d566816 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -92,7 +92,7 @@ static BOOL check_format(LPSTR path, LPSTR inf) GetWindowsDirectory(check, MAX_PATH); lstrcat(check, format); - res = !strncmp(check, path, lstrlen(check)) && + res = !strncasecmp(check, path, lstrlen(check)) && path[lstrlen(check)] != '\\'; return (!inf) ? res : res && (inf == path + lstrlen(check) - 3); @@ -196,10 +196,7 @@ static void test_SetupCopyOEMInf(void) ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(lstrlen(dest) != 0, "Expected a non-zero length string\n"); ok(file_exists(dest), "Expected destination inf to exist\n"); - todo_wine - { - ok(check_format(dest, NULL), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); - } + ok(check_format(dest, NULL), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); ok(file_exists(path), "Expected source inf to exist\n"); lstrcpy(dest_save, dest); @@ -227,10 +224,7 @@ static void test_SetupCopyOEMInf(void) ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(lstrlen(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlen(dest), size); ok(file_exists(dest), "Expected destination inf to exist\n"); - todo_wine - { - ok(check_format(dest, NULL), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); - } + ok(check_format(dest, NULL), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); ok(file_exists(path), "Expected source inf to exist\n"); ok(size == lstrlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); @@ -241,10 +235,7 @@ static void test_SetupCopyOEMInf(void) ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(lstrlen(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlen(dest), size); ok(file_exists(dest), "Expected destination inf to exist\n"); - todo_wine - { - ok(check_format(dest, inf), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); - } + ok(check_format(dest, inf), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); ok(file_exists(path), "Expected source inf to exist\n"); ok(size == lstrlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n");

1 0

James Hawkins : setupapi: The Inf file should be copied regardless of the destination buffer, with tests.
by Alexandre Julliard March 28, 2007

March 28, 2007

Module: wine Branch: master Commit: ff326fd0ffd4ad017634d6d068781d8a0736d4a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff326fd0ffd4ad017634d6d06… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 28 01:55:46 2007 -0500 setupapi: The Inf file should be copied regardless of the destination buffer, with tests. --- dlls/setupapi/misc.c | 26 ++++++++++-------- dlls/setupapi/tests/misc.c | 61 +++++++++++++++++++++++-------------------- 2 files changed, 47 insertions(+), 40 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 8257828..eb3c3a1 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -887,20 +887,21 @@ BOOL WINAPI SetupCopyOEMInfA( PCSTR source, PCSTR location, { BOOL ret = FALSE; LPWSTR destW = NULL, sourceW = NULL, locationW = NULL; - INT size = MAX_PATH; + DWORD size; TRACE("%s, %s, %d, %d, %p, %d, %p, %p\n", debugstr_a(source), debugstr_a(location), media_type, style, dest, buffer_size, required_size, component); - if (dest && !(destW = MyMalloc( MAX_PATH * sizeof(WCHAR) ))) return FALSE; + if (dest && !(destW = MyMalloc( buffer_size * sizeof(WCHAR) ))) return FALSE; if (source && !(sourceW = strdupAtoW( source ))) goto done; if (location && !(locationW = strdupAtoW( location ))) goto done; - if (!(ret = SetupCopyOEMInfW( sourceW, locationW, media_type, style, destW, size, NULL, NULL ))) + if (!(ret = SetupCopyOEMInfW( sourceW, locationW, media_type, style, destW, + buffer_size, &size, NULL ))) + { + if (required_size) *required_size = size; goto done; - - size = WideCharToMultiByte( CP_ACP, 0, destW, -1, NULL, 0, NULL, NULL ); - if (required_size) *required_size = size; + } if (dest) { @@ -957,17 +958,18 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, if ((p = strrchrW( source, '\\' ))) strcatW( target, p + 1 ); + if (!(ret = CopyFileW( source, target, (style & SP_COPY_NOOVERWRITE) != 0 ))) + return ret; + + if (style & SP_COPY_DELETESOURCE) + DeleteFileW( source ); + size = strlenW( target ) + 1; if (dest) { if (buffer_size >= size) { - /* FIXME: honour style flags */ - if ((ret = CopyFileW( source, target, (style & SP_COPY_NOOVERWRITE) != 0 ))) - { - if (style & SP_COPY_DELETESOURCE) DeleteFileW( source ); - strcpyW( dest, target ); - } + strcpyW( dest, target ); } else { diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index ea11a6c..27dcc77 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -102,7 +102,7 @@ static void test_SetupCopyOEMInf(void) { CHAR toolong[MAX_PATH * 2]; CHAR path[MAX_PATH], dest[MAX_PATH]; - CHAR tmpfile[MAX_PATH]; + CHAR tmpfile[MAX_PATH], dest_save[MAX_PATH]; LPSTR inf; DWORD size; BOOL res; @@ -134,11 +134,8 @@ static void test_SetupCopyOEMInf(void) SetLastError(0xdeadbeef); res = SetupCopyOEMInf(path, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); - todo_wine - { - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); /* try a long SourceInfFileName */ memset(toolong, 'a', MAX_PATH * 2); @@ -164,11 +161,8 @@ static void test_SetupCopyOEMInf(void) SetLastError(0xdeadbeef); res = SetupCopyOEMInf(path, NULL, SPOST_NONE, SP_COPY_REPLACEONLY, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); - todo_wine - { - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); ok(file_exists(tmpfile), "Expected source inf to exist\n"); /* try an absolute SourceInfFileName, without DestinationInfFileName */ @@ -177,32 +171,23 @@ static void test_SetupCopyOEMInf(void) lstrcat(path, tmpfile); SetLastError(0xdeadbeef); res = SetupCopyOEMInf(path, NULL, SPOST_NONE, 0, NULL, 0, NULL, NULL); - todo_wine - { - ok(res == TRUE, "Expected TRUE, got %d\n", res); - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - } + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(file_exists(path), "Expected source inf to exist\n"); /* try SP_COPY_REPLACEONLY, dest exists */ SetLastError(0xdeadbeef); res = SetupCopyOEMInf(path, NULL, SPOST_NONE, SP_COPY_REPLACEONLY, NULL, 0, NULL, NULL); - todo_wine - { - ok(res == TRUE, "Expected TRUE, got %d\n", res); - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - } + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(file_exists(path), "Expected source inf to exist\n"); /* try SP_COPY_NOOVERWRITE */ SetLastError(0xdeadbeef); res = SetupCopyOEMInf(path, NULL, SPOST_NONE, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); - todo_wine - { - ok(GetLastError() == ERROR_FILE_EXISTS, - "Expected ERROR_FILE_EXISTS, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_FILE_EXISTS, + "Expected ERROR_FILE_EXISTS, got %d\n", GetLastError()); /* get the DestinationInfFileName */ SetLastError(0xdeadbeef); @@ -217,6 +202,24 @@ static void test_SetupCopyOEMInf(void) } ok(file_exists(path), "Expected source inf to exist\n"); + lstrcpy(dest_save, dest); + DeleteFile(dest_save); + + /* get the DestinationInfFileName, DestinationInfFileNameSize is too small + * - inf is still copied + */ + lstrcpy(dest, "aaa"); + size = 0; + SetLastError(0xdeadbeef); + res = SetupCopyOEMInf(path, NULL, SPOST_NONE, 0, dest, 5, &size, NULL); + ok(res == FALSE, "Expected FALSE, got %d\n", res); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(file_exists(path), "Expected source inf to exist\n"); + ok(file_exists(dest_save), "Expected dest inf to exist\n"); + ok(!lstrcmp(dest, "aaa"), "Expected dest to be unchanged\n"); + ok(size == lstrlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); + /* get the DestinationInfFileName and DestinationInfFileNameSize */ SetLastError(0xdeadbeef); res = SetupCopyOEMInf(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, &size, NULL); @@ -229,6 +232,7 @@ static void test_SetupCopyOEMInf(void) ok(check_format(dest, NULL), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); } ok(file_exists(path), "Expected source inf to exist\n"); + ok(size == lstrlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); /* get the DestinationInfFileName, DestinationInfFileNameSize, and DestinationInfFileNameComponent */ SetLastError(0xdeadbeef); @@ -242,15 +246,16 @@ static void test_SetupCopyOEMInf(void) ok(check_format(dest, inf), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); } ok(file_exists(path), "Expected source inf to exist\n"); + ok(size == lstrlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); /* try SP_COPY_DELETESOURCE */ SetLastError(0xdeadbeef); res = SetupCopyOEMInf(path, NULL, SPOST_NONE, SP_COPY_DELETESOURCE, NULL, 0, NULL, NULL); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(!file_exists(path), "Expected source inf to not exist\n"); todo_wine { - ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(!file_exists(path), "Expected source inf to not exist\n"); } }

1 0

James Hawkins : setupapi: Don't allow relative paths in SetupCopyOEMInf.
by Alexandre Julliard March 28, 2007

March 28, 2007

Module: wine Branch: master Commit: efa6591fff772c7fc88f3dd26500610f55d6b551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efa6591fff772c7fc88f3dd26… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 28 01:53:57 2007 -0500 setupapi: Don't allow relative paths in SetupCopyOEMInf. --- dlls/setupapi/misc.c | 7 +++++++ dlls/setupapi/tests/misc.c | 32 ++++++++++++++++---------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index b1845b7..8257828 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -944,6 +944,13 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, return FALSE; } + /* check for a relative path */ + if (!(*source == '\\' || (*source && source[1] == ':'))) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + if (!GetWindowsDirectoryW( target, sizeof(target)/sizeof(WCHAR) )) return FALSE; strcatW( target, inf_oem ); diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index cee4823..ea11a6c 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -118,16 +118,22 @@ static void test_SetupCopyOEMInf(void) SetLastError(0xdeadbeef); res = SetupCopyOEMInf("", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); - todo_wine - { - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - /* try nonexistent SourceInfFileName */ + /* try a relative nonexistent SourceInfFileName */ SetLastError(0xdeadbeef); res = SetupCopyOEMInf("nonexistent", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + /* try an absolute nonexistent SourceInfFileName */ + lstrcpy(path, CURR_DIR); + lstrcat(path, "\\nonexistent"); + SetLastError(0xdeadbeef); + res = SetupCopyOEMInf(path, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + ok(res == FALSE, "Expected FALSE, got %d\n", res); todo_wine { ok(GetLastError() == ERROR_FILE_NOT_FOUND, @@ -140,11 +146,8 @@ static void test_SetupCopyOEMInf(void) SetLastError(0xdeadbeef); res = SetupCopyOEMInf(toolong, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); - todo_wine - { - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); get_temp_filename(tmpfile); create_inf_file(tmpfile); @@ -153,11 +156,8 @@ static void test_SetupCopyOEMInf(void) SetLastError(0xdeadbeef); res = SetupCopyOEMInf(tmpfile, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); - todo_wine - { - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); ok(file_exists(tmpfile), "Expected tmpfile to exist\n"); /* try SP_COPY_REPLACEONLY, dest does not exist */

1 0

James Hawkins : setupapi: Handle the SP_COPY_NOOVERWRITE flag.
by Alexandre Julliard March 28, 2007

March 28, 2007

Module: wine Branch: master Commit: 3e5f62b2d8d7353f890ca6e4fb27809c9f7dae8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5f62b2d8d7353f890ca6e4f… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 28 01:52:53 2007 -0500 setupapi: Handle the SP_COPY_NOOVERWRITE flag. --- dlls/setupapi/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index f00cd2d..b1845b7 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -956,7 +956,7 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, if (buffer_size >= size) { /* FIXME: honour style flags */ - if ((ret = CopyFileW( source, target, FALSE ))) + if ((ret = CopyFileW( source, target, (style & SP_COPY_NOOVERWRITE) != 0 ))) { if (style & SP_COPY_DELETESOURCE) DeleteFileW( source ); strcpyW( dest, target );

1 0

Marcin Grześkowiak : user32: Use charset of currently selected font in DrawTextExA.
by Alexandre Julliard March 28, 2007

March 28, 2007

Module: wine Branch: master Commit: b5ee7aee23e886e8cde842cf05e2c742e8ca18f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ee7aee23e886e8cde842cf0… Author: Marcin Grześkowiak <mgrzeskowiak(a)tlen.pl> Date: Mon Mar 26 22:58:20 2007 +0200 user32: Use charset of currently selected font in DrawTextExA. --- dlls/user32/text.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index e03130e..cd1cc75 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1030,6 +1030,7 @@ INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count, DWORD wcount; DWORD wmax; DWORD amax; + UINT cp; if (!count) return 0; if( !str || ((count == -1) && !(count = strlen(str)))) @@ -1041,7 +1042,8 @@ INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count, } return 0; } - wcount = MultiByteToWideChar( CP_ACP, 0, str, count, NULL, 0 ); + cp = GdiGetCodePage( hdc ); + wcount = MultiByteToWideChar( cp, 0, str, count, NULL, 0 ); wmax = wcount; amax = count; if (flags & DT_MODIFYSTRING) @@ -1052,7 +1054,7 @@ INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count, wstr = HeapAlloc(GetProcessHeap(), 0, wmax * sizeof(WCHAR)); if (wstr) { - MultiByteToWideChar( CP_ACP, 0, str, count, wstr, wcount ); + MultiByteToWideChar( cp, 0, str, count, wstr, wcount ); if (flags & DT_MODIFYSTRING) for (i=4, p=wstr+wcount; i--; p++) *p=0xFFFE; /* Initialise the extra characters so that we can see which ones @@ -1066,7 +1068,7 @@ INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count, * and so we need to measure it ourselves. */ for (i=4, p=wstr+wcount; i-- && *p != 0xFFFE; p++) wcount++; - WideCharToMultiByte( CP_ACP, 0, wstr, wcount, str, amax, NULL, NULL ); + WideCharToMultiByte( cp, 0, wstr, wcount, str, amax, NULL, NULL ); } HeapFree(GetProcessHeap(), 0, wstr); }

1 0

Jan Zerebecki : wined3d: Print lastpixel state fixme only once.
by Alexandre Julliard March 28, 2007

March 28, 2007

Module: wine Branch: master Commit: 09e7791cbad79f0cbcb7db9d84ac6b98beee396e URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e7791cbad79f0cbcb7db9d8… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Tue Mar 27 09:27:52 2007 +0200 wined3d: Print lastpixel state fixme only once. --- dlls/wined3d/state.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e4d10e2..8e563fb 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1254,7 +1254,13 @@ static void state_lastpixel(DWORD state, IWineD3DStateBlockImpl *stateblock, Win if(stateblock->renderState[WINED3DRS_LASTPIXEL]) { TRACE("Last Pixel Drawing Enabled\n"); } else { - FIXME("Last Pixel Drawing Disabled, not handled yet\n"); + static BOOL first = TRUE; + if(first) { + FIXME("Last Pixel Drawing Disabled, not handled yet\n"); + first = FALSE; + } else { + TRACE("Last Pixel Drawing Disabled, not handled yet\n"); + } } }

1 0

Francois Gouget : Remove unneeded checks on the GetModuleHandle() return value for cases where we are linked with the dll.
by Alexandre Julliard March 28, 2007

March 28, 2007

Module: wine Branch: master Commit: d9e8a0f63e7331355634f81e42a2373564ce934c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e8a0f63e7331355634f81e4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 28 10:00:28 2007 +0200 Remove unneeded checks on the GetModuleHandle() return value for cases where we are linked with the dll. --- dlls/advapi32/tests/crypt.c | 63 ++++++++++++++++++-------------------- dlls/advapi32/tests/crypt_md5.c | 2 +- dlls/advapi32/tests/lsa.c | 18 +++++------ dlls/advapi32/tests/security.c | 9 ++++-- dlls/comctl32/tests/dpa.c | 6 ---- dlls/comctl32/tests/mru.c | 2 - dlls/crypt32/tests/crl.c | 6 +--- dlls/ddraw/tests/d3d.c | 6 +--- dlls/ddraw/tests/refcount.c | 6 +--- dlls/kernel32/tests/locale.c | 16 ++++------ dlls/localspl/tests/localmon.c | 2 +- dlls/msi/tests/db.c | 2 - dlls/ntdll/tests/change.c | 12 +++++-- dlls/ntdll/tests/file.c | 18 ++++++----- dlls/ntdll/tests/om.c | 49 ++++++++++++++++-------------- dlls/ole32/tests/stg_prop.c | 10 ++---- dlls/shell32/tests/shlfileop.c | 4 +-- dlls/shell32/tests/shlfolder.c | 18 ++++------- dlls/shlwapi/tests/shreg.c | 7 +--- dlls/shlwapi/tests/string.c | 2 - dlls/user32/tests/input.c | 7 +++- dlls/user32/tests/monitor.c | 14 +++----- dlls/user32/tests/resource.c | 4 +-- 23 files changed, 123 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9e8a0f63e7331355634f…

1 0

Francois Gouget : cmd: Spelling fix.
by Alexandre Julliard March 28, 2007

March 28, 2007

Module: wine Branch: master Commit: ebfeb41e99d93b08c78f7ecd4f20667efef5bea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebfeb41e99d93b08c78f7ecd4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 28 10:01:52 2007 +0200 cmd: Spelling fix. --- programs/cmd/directory.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 076a6fe..79d755a 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -63,7 +63,7 @@ static ULONGLONG byte_total; static DISPLAYTIME dirTime; static DISPLAYORDER dirOrder; static BOOL orderReverse, orderGroupDirs, orderGroupDirsReverse, orderByCol; -static BOOL seperator; +static BOOL separator; static ULONG showattrs, attrsbits; /***************************************************************************** @@ -104,7 +104,7 @@ void WCMD_directory (void) { shortname = FALSE; usernames = FALSE; orderByCol = FALSE; - seperator = TRUE; + separator = TRUE; dirTime = Written; dirOrder = Name; orderReverse = FALSE; @@ -152,8 +152,8 @@ void WCMD_directory (void) { case 'D': if (negate) orderByCol = !orderByCol; else orderByCol = TRUE; break; - case 'C': if (negate) seperator = !seperator; - else seperator = TRUE; + case 'C': if (negate) separator = !separator; + else separator = TRUE; break; case 'T': p = p + 1; if (*p==':') p++; /* Skip optional : */ @@ -566,7 +566,7 @@ char * WCMD_filesize64 (ULONGLONG n) { p = buff; i = -3; do { - if (seperator && ((++i)%3 == 1)) *p++ = ','; + if (separator && ((++i)%3 == 1)) *p++ = ','; q = n / 10; r = n - (q * 10); *p++ = r + '0';

1 0

Francois Gouget : gdi32: Remove a space before '\n' in a trace.
by Alexandre Julliard March 28, 2007

March 28, 2007

Module: wine Branch: master Commit: 8d9fbef94f1d673590f30a39258e12e5e03dd613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9fbef94f1d673590f30a392… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 28 10:01:23 2007 +0200 gdi32: Remove a space before '\n' in a trace. --- dlls/gdi32/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 59b4da9..af756b3 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1845,7 +1845,7 @@ static BOOL PATH_WidenPath(DC *dc) break; case PT_BEZIERTO: /* should never happen because of the FlattenPath call */ - ERR("Should never happen \n"); + ERR("Should never happen\n"); break; default: ERR("Got path flag %c\n", pPath->pFlags[i]);

1 0

Francois Gouget : netapi32/tests: Add a missing '\n' to a trace().
by Alexandre Julliard March 28, 2007

March 28, 2007

Module: wine Branch: master Commit: 45827fb404b5bb4e10decd9f3f25119208a998dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=45827fb404b5bb4e10decd9f3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 28 10:00:58 2007 +0200 netapi32/tests: Add a missing '\n' to a trace(). --- dlls/netapi32/tests/access.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index c92c9f8..3861768 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -164,7 +164,7 @@ static void run_usergetinfo_tests(void) ok(rc == ERROR_INVALID_NAME,"Invalid Server Name: rc=%d\n",rc); if(delete_test_user() != NERR_Success) - trace("Deleting the test user failed. You might have to manually delete it."); + trace("Deleting the test user failed. You might have to manually delete it.\n"); } /* checks Level 1 of NetQueryDisplayInformation

1 0