December 2008 - Wine-Commits

Vincent Povirk : winedbg: Fix string format warnings.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 8f6736cf133aacbb955ef4d84ff6bc49f903067b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6736cf133aacbb955ef4d84… Author: Vincent Povirk <madewokherd+d41d(a)gmail.com> Date: Thu Dec 4 21:59:30 2008 -0600 winedbg: Fix string format warnings. --- programs/winedbg/db_disasm.c | 8 ++++---- programs/winedbg/memory.c | 2 +- programs/winedbg/symbol.c | 2 +- programs/winedbg/types.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index 1677bc9..dc1cc3d 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -1261,7 +1261,7 @@ static void db_disasm_esc( ADDRESS64* addr, int inst, int short_addr, * Normal address modes. */ db_read_address( addr, short_addr, regmodrm, &address); - dbg_printf(fp->f_name); + dbg_printf("%s", fp->f_name); switch(fp->f_size) { case SNGL: p = "s"; break; case DBLR: p = "l"; break; @@ -1463,15 +1463,15 @@ void be_i386_disasm_one_insn(ADDRESS64 *addr, int display) if( db_display ) { if (size == WORD) - dbg_printf(i_name); + dbg_printf("%s", i_name); else - dbg_printf(ip->i_extra); + dbg_printf("%s", ip->i_extra); } } else { if( db_display ) { - dbg_printf(i_name); + dbg_printf("%s", i_name); } if (i_size != NONE) { if (i_size == BYTE) { diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index c6174fe..c103c18 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -677,7 +677,7 @@ BOOL memory_get_register(DWORD regno, DWORD** value, char* buffer, int len) else *value = div->pval; - if (buffer) snprintf(buffer, len, div->name); + if (buffer) lstrcpynA(buffer, div->name, len); return TRUE; } } diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 90c5510..c4b09a3 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -650,7 +650,7 @@ void symbol_print_local(const SYMBOL_INFO* sym, ULONG base, } else { - dbg_printf(buffer); + dbg_printf("%s", buffer); if (detailed) dbg_printf(" (%s)", (sym->Flags & SYMFLAG_PARAMETER) ? "parameter" : "local"); diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index fd13dac..19fe68e 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -716,7 +716,7 @@ int types_print_type(const struct dbg_type* type, BOOL details) dbg_printf(")"); break; case SymTagTypedef: - dbg_printf(name); + dbg_printf("%s", name); break; default: WINE_ERR("Unknown type %u for %s\n", tag, name);

1 0

Vincent Povirk : dinput/tests: Fix string format warning.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 6ff83ba5913ffac5f1ac433ec4fef618f88bfbee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ff83ba5913ffac5f1ac433ec… Author: Vincent Povirk <madewokherd+d41d(a)gmail.com> Date: Thu Dec 4 21:33:56 2008 -0600 dinput/tests: Fix string format warning. --- dlls/dinput/tests/joystick.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 9bafd30..b318323 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -384,7 +384,7 @@ static BOOL CALLBACK EnumJoysticks( js.rgbButtons[9]>>7, js.rgbButtons[10]>>7, js.rgbButtons[11]>>7); if (strcmp(oldstate, curstate) != 0) { - trace(curstate); + trace("%s\n", curstate); strcpy(oldstate, curstate); } Sleep(100);

1 0

Vincent Povirk : msxml3/tests: Fix string format warnings.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 445588ba10d10f39cd81c246f88726827daf9927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=445588ba10d10f39cd81c246f… Author: Vincent Povirk <madewokherd+d41d(a)gmail.com> Date: Thu Dec 4 21:40:28 2008 -0600 msxml3/tests: Fix string format warnings. --- dlls/msxml3/tests/xmldoc.c | 21 +++++++-------------- dlls/msxml3/tests/xmlelem.c | 21 +++++++-------------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 2058d7d..5c1c4f8 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -31,27 +31,20 @@ /* Deprecated Error Code */ #define XML_E_INVALIDATROOTLEVEL 0xc00ce556 -static void append_str(char **str, const char *data) -{ - sprintf(*str, data); - *str += strlen(*str); -} - static void create_xml_file(LPCSTR filename) { - char data[1024]; - char *ptr = data; DWORD dwNumberOfBytesWritten; HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - append_str(&ptr, "<?xml version=\"1.0\" ?>\n"); - append_str(&ptr, "<BankAccount>\n"); - append_str(&ptr, " <Number>1234</Number>\n"); - append_str(&ptr, " <Name>Captain Ahab</Name>\n"); - append_str(&ptr, "</BankAccount>"); + static const char data[] = + "<?xml version=\"1.0\" ?>\n" + "<BankAccount>\n" + " <Number>1234</Number>\n" + " <Name>Captain Ahab</Name>\n" + "</BankAccount>"; - WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); + WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL); CloseHandle(hf); } diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index 27c09c7..f0b195d 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -228,27 +228,20 @@ static void test_xmlelem(void) IXMLDocument_Release(doc); } -static void append_str(char **str, const char *data) -{ - sprintf(*str, data); - *str += strlen(*str); -} - static void create_xml_file(LPCSTR filename) { - char data[1024]; - char *ptr = data; DWORD dwNumberOfBytesWritten; HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - append_str(&ptr, "<?xml version=\"1.0\" ?>\n"); - append_str(&ptr, "<BankAccount>\n"); - append_str(&ptr, " <Number>1234</Number>\n"); - append_str(&ptr, " <Name>Captain Ahab</Name>\n"); - append_str(&ptr, "</BankAccount>\n"); + static const char data[] = + "<?xml version=\"1.0\" ?>\n" + "<BankAccount>\n" + " <Number>1234</Number>\n" + " <Name>Captain Ahab</Name>\n" + "</BankAccount>\n"; - WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); + WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL); CloseHandle(hf); }

1 0

Vincent Povirk : setupapi/tests: Fix string format warnings.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 022a8439e01089cbf7a12c291221f146076eccd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=022a8439e01089cbf7a12c291… Author: Vincent Povirk <madewokherd+d41d(a)gmail.com> Date: Thu Dec 4 21:49:40 2008 -0600 setupapi/tests: Fix string format warnings. --- dlls/setupapi/tests/devinst.c | 29 ++++++++------------ dlls/setupapi/tests/misc.c | 25 ++++++----------- dlls/setupapi/tests/query.c | 58 +++++++++++++++++----------------------- 3 files changed, 45 insertions(+), 67 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 4e11bc0..37c3acd 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -320,30 +320,23 @@ static void test_SetupDiOpenClassRegKeyExA(void) trace("failed to open classes key\n"); } -static void append_str(char **str, const char *data) -{ - sprintf(*str, data); - *str += strlen(*str); -} - static void create_inf_file(LPCSTR filename) { - char data[1024]; - char *ptr = data; DWORD dwNumberOfBytesWritten; HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - append_str(&ptr, "[Version]\n"); - append_str(&ptr, "Signature=\"$Chicago$\"\n"); - append_str(&ptr, "Class=Bogus\n"); - append_str(&ptr, "ClassGUID={6a55b5a4-3f65-11db-b704-0011955c2bdb}\n"); - append_str(&ptr, "[ClassInstall32]\n"); - append_str(&ptr, "AddReg=BogusClass.NT.AddReg\n"); - append_str(&ptr, "[BogusClass.NT.AddReg]\n"); - append_str(&ptr, "HKR,,,,\"Wine test devices\"\n"); - - WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); + static const char data[] = + "[Version]\n" + "Signature=\"$Chicago$\"\n" + "Class=Bogus\n" + "ClassGUID={6a55b5a4-3f65-11db-b704-0011955c2bdb}\n" + "[ClassInstall32]\n" + "AddReg=BogusClass.NT.AddReg\n" + "[BogusClass.NT.AddReg]\n" + "HKR,,,,\"Wine test devices\"\n"; + + WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL); CloseHandle(hf); } diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 7164e7d..7d0d2ea 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -47,29 +47,22 @@ static BOOL (WINAPI *pSetupGetFileCompressionInfoExA)(PCSTR, PSTR, DWORD, PDWORD static BOOL (WINAPI *pSetupCopyOEMInfA)(PCSTR, PCSTR, DWORD, DWORD, PSTR, DWORD, PDWORD, PSTR *); static BOOL (WINAPI *pSetupQueryInfOriginalFileInformationA)(PSP_INF_INFORMATION, UINT, PSP_ALTPLATFORM_INFO, PSP_ORIGINAL_FILE_INFO_A); -static void append_str(char **str, const char *data) -{ - sprintf(*str, data); - *str += strlen(*str); -} - static void create_inf_file(LPCSTR filename) { - char data[1024]; - char *ptr = data; DWORD dwNumberOfBytesWritten; HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - append_str(&ptr, "[Version]\n"); - append_str(&ptr, "Signature=\"$Chicago$\"\n"); - append_str(&ptr, "AdvancedINF=2.5\n"); - append_str(&ptr, "[DefaultInstall]\n"); - append_str(&ptr, "RegisterOCXs=RegisterOCXsSection\n"); - append_str(&ptr, "[RegisterOCXsSection]\n"); - append_str(&ptr, "%%11%%\\ole32.dll\n"); + static const char data[] = + "[Version]\n" + "Signature=\"$Chicago$\"\n" + "AdvancedINF=2.5\n" + "[DefaultInstall]\n" + "RegisterOCXs=RegisterOCXsSection\n" + "[RegisterOCXsSection]\n" + "%%11%%\\ole32.dll\n"; - WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); + WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL); CloseHandle(hf); } diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 167727a..a1b7bd5 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -43,56 +43,48 @@ static void get_directories(void) WIN_DIR[len-1] = 0; } -static void append_str(char **str, const char *data) -{ - sprintf(*str, data); - *str += strlen(*str); -} - static void create_inf_file(LPSTR filename) { - char data[1024]; - char *ptr = data; DWORD dwNumberOfBytesWritten; HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - append_str(&ptr, "[Version]\n"); - append_str(&ptr, "Signature=\"$Chicago$\"\n"); - append_str(&ptr, "AdvancedINF=2.5\n"); - append_str(&ptr, "[SourceDisksNames]\n"); - append_str(&ptr, "2 = %%SrcDiskName%%, LANCOM\\LANtools\\lanconf.cab\n"); - append_str(&ptr, "[SourceDisksFiles]\n"); - append_str(&ptr, "lanconf.exe = 2\n"); - append_str(&ptr, "[DestinationDirs]\n"); - append_str(&ptr, "DefaultDestDir = 24, %%DefaultDest%%\n"); - append_str(&ptr, "[Strings]\n"); - append_str(&ptr, "LangDir = english\n"); - append_str(&ptr, "DefaultDest = LANCOM\n"); - append_str(&ptr, "SrcDiskName = \"LANCOM Software CD\"\n"); - - WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); + static const char data[] = + "[Version]\n" + "Signature=\"$Chicago$\"\n" + "AdvancedINF=2.5\n" + "[SourceDisksNames]\n" + "2 = %SrcDiskName%, LANCOM\\LANtools\\lanconf.cab\n" + "[SourceDisksFiles]\n" + "lanconf.exe = 2\n" + "[DestinationDirs]\n" + "DefaultDestDir = 24, %DefaultDest%\n" + "[Strings]\n" + "LangDir = english\n" + "DefaultDest = LANCOM\n" + "SrcDiskName = \"LANCOM Software CD\"\n"; + + WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL); CloseHandle(hf); } static void create_inf_file2(LPSTR filename) { - char data[1024]; - char *ptr = data; DWORD dwNumberOfBytesWritten; HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - append_str(&ptr, "[SourceFileInfo]\n"); - append_str(&ptr, "sp1qfe\\bitsinst.exe=250B3702C7CCD7C2F9E4DAA1555C933E,000600060A28062C,27136,SP1QFE\n"); - append_str(&ptr, "sp1qfe\\bitsprx2.dll=4EBEA67F4BB4EB402E725CA7CA2857AE,000600060A280621,7680,SP1QFE\n"); - append_str(&ptr, "sp1qfe\\bitsprx3.dll=C788A1D9330DA011EF25E95D3BC7BDE5,000600060A280621,7168,SP1QFE\n"); - append_str(&ptr, "sp1qfe\\qmgr.dll=696AC82FB290A03F205901442E0E9589,000600060A280621,361984,SP1QFE\n"); - append_str(&ptr, "sp1qfe\\qmgrprxy.dll=8B5848144829E1BC985EA4C3D8CA7E3F,000600060A280621,17408,SP1QFE\n"); - append_str(&ptr, "sp1qfe\\winhttp.dll=3EC6F518114606CA59D4160322077437,000500010A280615,331776,SP1QFE\n"); - append_str(&ptr, "sp1qfe\\xpob2res.dll=DB83156B9F496F20D1EA70E4ABEC0166,000500010A280622,158720,SP1QFE\n"); - - WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); + static const char data[] = + "[SourceFileInfo]\n" + "sp1qfe\\bitsinst.exe=250B3702C7CCD7C2F9E4DAA1555C933E,000600060A28062C,27136,SP1QFE\n" + "sp1qfe\\bitsprx2.dll=4EBEA67F4BB4EB402E725CA7CA2857AE,000600060A280621,7680,SP1QFE\n" + "sp1qfe\\bitsprx3.dll=C788A1D9330DA011EF25E95D3BC7BDE5,000600060A280621,7168,SP1QFE\n" + "sp1qfe\\qmgr.dll=696AC82FB290A03F205901442E0E9589,000600060A280621,361984,SP1QFE\n" + "sp1qfe\\qmgrprxy.dll=8B5848144829E1BC985EA4C3D8CA7E3F,000600060A280621,17408,SP1QFE\n" + "sp1qfe\\winhttp.dll=3EC6F518114606CA59D4160322077437,000500010A280615,331776,SP1QFE\n" + "sp1qfe\\xpob2res.dll=DB83156B9F496F20D1EA70E4ABEC0166,000500010A280622,158720,SP1QFE\n"; + + WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL); CloseHandle(hf); }

1 0

Vincent Povirk : advpack/tests: Fix string format warning.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: e4271d8736fc7687c8d01021947455b0763a8673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4271d8736fc7687c8d010219… Author: Vincent Povirk <madewokherd+d41d(a)gmail.com> Date: Thu Dec 4 21:26:48 2008 -0600 advpack/tests: Fix string format warning. --- dlls/advpack/tests/install.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 854ede6..3b0954f 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -55,27 +55,20 @@ static BOOL is_spapi_err(DWORD err) return (((err & SPAPI_MASK) ^ SPAPI_PREFIX) == 0); } -static void append_str(char **str, const char *data) -{ - sprintf(*str, data); - *str += strlen(*str); -} - static void create_inf_file(LPCSTR filename) { - char data[1024]; - char *ptr = data; DWORD dwNumberOfBytesWritten; HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - append_str(&ptr, "[Version]\n"); - append_str(&ptr, "Signature=\"$Chicago$\"\n"); - append_str(&ptr, "AdvancedINF=2.5\n"); - append_str(&ptr, "[DefaultInstall]\n"); - append_str(&ptr, "CheckAdminRights=1\n"); + static const char data[] = + "[Version]\n" + "Signature=\"$Chicago$\"\n" + "AdvancedINF=2.5\n" + "[DefaultInstall]\n" + "CheckAdminRights=1\n"; - WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); + WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL); CloseHandle(hf); }

1 0

Vincent Povirk : winex11.drv: Fix string format warning.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 75b53222422c71e80d916c4c4af243a2010f5768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75b53222422c71e80d916c4c4… Author: Vincent Povirk <madewokherd+d41d(a)gmail.com> Date: Thu Dec 4 21:18:52 2008 -0600 winex11.drv: Fix string format warning. --- dlls/winex11.drv/xrender.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 08bb71f..3bad0a3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -746,8 +746,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) for(j = 0; j < pitch * 8; j++) { strcat(output, (line[j / 8] & (1 << (7 - (j % 8)))) ? "#" : " "); } - strcat(output, "\n"); - TRACE(output); + TRACE("%s\n", output); } } else { static const char blks[] = " .:;!o*#"; @@ -762,8 +761,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) str[0] = blks[line[j] >> 5]; strcat(output, str); } - strcat(output, "\n"); - TRACE(output); + TRACE("%s\n", output); } } }

1 0

Andrew Talbot : winex11.drv: Sign-compare warnings fix.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: dd8e833db23b53292b910411b68b74e96739db41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd8e833db23b53292b910411b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 4 22:26:05 2008 +0000 winex11.drv: Sign-compare warnings fix. --- dlls/winex11.drv/desktop.c | 2 +- dlls/winex11.drv/dib.c | 4 ++-- dlls/winex11.drv/ime.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 9b92a0e..c8b202c 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -45,7 +45,7 @@ static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 1024 /* create the mode structures */ static void make_modes(void) { - int i; + unsigned int i; /* original specified desktop size */ X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 60); for (i=0; i<NUM_DESKTOP_MODES; i++) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index f017943..be38d89 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -441,7 +441,7 @@ static int *X11DRV_DIB_BuildColorMap( X11DRV_PDEVICE *physDev, WORD coloruse, WO */ static int X11DRV_DIB_MapColor( int *physMap, int nPhysMap, int phys, int oldcol ) { - unsigned int color; + int color; if ((oldcol < nPhysMap) && (physMap[oldcol] == phys)) return oldcol; @@ -4314,7 +4314,7 @@ void X11DRV_DIB_CopyDIBSection(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physD freeColorMap = FALSE; } else { const BITMAPINFO* info = (BITMAPINFO*)&dib.dsBmih; - int i; + unsigned int i; nColorMap = X11DRV_DIB_GetColorCount(info); x11ColorMap = HeapAlloc(GetProcessHeap(), 0, nColorMap * sizeof(int)); diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 56dcaa7..6ca3f9e 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -505,7 +505,7 @@ static void GenerateIMECHARMessages(HIMC hIMC, LPWSTR String, DWORD length) { LPINPUTCONTEXT lpIMC; LPTRANSMSG lpTransMsg; - INT i; + DWORD i; if (length <= 0) return;

1 0

Vincent Povirk : gdiplus: Add stub for GdipSetPenCompoundArray.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 3e54840225a6aedff00772d52af469dd8820fe29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e54840225a6aedff00772d52… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 4 14:30:47 2008 -0600 gdiplus: Add stub for GdipSetPenCompoundArray. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 11 +++++++++++ dlls/gdiplus/tests/pen.c | 28 ++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b5a5aab..1b3f307 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -564,7 +564,7 @@ @ stdcall GdipSetPathMarker(ptr) @ stdcall GdipSetPenBrushFill(ptr ptr) @ stdcall GdipSetPenColor(ptr long) -@ stub GdipSetPenCompoundArray +@ stdcall GdipSetPenCompoundArray(ptr ptr long) @ stdcall GdipSetPenCustomEndCap(ptr ptr) @ stdcall GdipSetPenCustomStartCap(ptr ptr) @ stdcall GdipSetPenDashArray(ptr ptr long) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 2804b14..f41185a 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -409,6 +409,17 @@ GpStatus WINGDIPAPI GdipSetPenColor(GpPen *pen, ARGB argb) return GdipSetSolidFillColor(((GpSolidFill*)pen->brush), argb); } +GpStatus WINGDIPAPI GdipSetPenCompoundArray(GpPen *pen, GDIPCONST REAL *dash, + INT count) +{ + FIXME("(%p, %p, %i): stub", pen, dash, count); + + if (!pen || !dash || count < 2 || count%2 == 1) + return InvalidParameter; + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen *pen, GpCustomLineCap* customCap) { GpCustomLineCap * cap; diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 263d0a7..d2f33f0 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -325,6 +325,33 @@ static void test_penfilltype(void) GdipDeleteBrush((GpBrush*)line); } +static void test_compoundarray(void) +{ + GpStatus status; + GpPen *pen; + static const REAL testvalues[] = {0.2, 0.4, 0.6, 0.8}; + + status = GdipSetPenCompoundArray(NULL, testvalues, 4); + expect(InvalidParameter, status); + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + + status = GdipSetPenCompoundArray(pen, NULL, 4); + expect(InvalidParameter, status); + status = GdipSetPenCompoundArray(pen, testvalues, 3); + expect(InvalidParameter, status); + status = GdipSetPenCompoundArray(pen, testvalues, 0); + expect(InvalidParameter, status); + status = GdipSetPenCompoundArray(pen, testvalues, -2); + expect(InvalidParameter, status); + + status = GdipSetPenCompoundArray(pen, testvalues, 4); + todo_wine expect(Ok, status); + + GdipDeletePen(pen); +} + START_TEST(pen) { struct GdiplusStartupInput gdiplusStartupInput; @@ -345,6 +372,7 @@ START_TEST(pen) test_dasharray(); test_customcap(); test_penfilltype(); + test_compoundarray(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 3219cb0..1f93258 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -480,6 +480,7 @@ GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); GpStatus WINGDIPAPI GdipSetPenColor(GpPen*,ARGB); +GpStatus WINGDIPAPI GdipSetPenCompoundArray(GpPen*,GDIPCONST REAL*,INT); GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen*,GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetPenCustomStartCap(GpPen*,GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen*,GDIPCONST REAL*,INT);

1 0

Vincent Povirk : shell32: Add test for localized filenames in desktop.ini.
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 53c1c8a8a5bf8e482f552ed1f9dd0929765e686e URL: http://source.winehq.org/git/wine.git/?a=commit;h=53c1c8a8a5bf8e482f552ed1f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Dec 2 16:12:08 2008 -0600 shell32: Add test for localized filenames in desktop.ini. --- dlls/shell32/tests/Makefile.in | 2 + dlls/shell32/tests/rsrc.rc | 28 ++++++++++ dlls/shell32/tests/shlfolder.c | 118 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index 0fc8d74..dd0587c 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -18,6 +18,8 @@ CTESTS = \ string.c \ systray.c +RC_SRCS = rsrc.rc + @MAKE_TEST_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/shell32/tests/rsrc.rc b/dlls/shell32/tests/rsrc.rc new file mode 100644 index 0000000..00c949b --- /dev/null +++ b/dlls/shell32/tests/rsrc.rc @@ -0,0 +1,28 @@ +/* String resource for shlfolder test. + * + * Copyright 2008 Vincent Povirk for CodeWeavers + * + * 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 "windef.h" +#include "winuser.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +STRINGTABLE +{ + 1 "Folder Name Resource" +} diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 30768b0..f374070 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1488,6 +1488,123 @@ static void testSHGetFolderPathAndSubDirA(void) RemoveDirectoryA(testpath); } +static const char *wine_dbgstr_w(LPCWSTR str) +{ + static char buf[512]; + if (!str) + return "(null)"; + WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); + return buf; +} + +static void test_LocalizedNames(void) +{ + static char cCurrDirA[MAX_PATH]; + WCHAR cCurrDirW[MAX_PATH], tempbufW[25]; + IShellFolder *IDesktopFolder, *testIShellFolder; + ITEMIDLIST *newPIDL; + int len; + HRESULT hr; + static char resourcefile[MAX_PATH]; + DWORD res; + HANDLE file; + STRRET strret; + + static const char desktopini_contents1[] = + "[.ShellClassInfo]\r\n" + "LocalizedResourceName=@"; + static const char desktopini_contents2[] = + ",-1\r\n"; + static WCHAR foldernameW[] = {'t','e','s','t','f','o','l','d','e','r',0}; + static const WCHAR folderdisplayW[] = {'F','o','l','d','e','r',' ','N','a','m','e',' ','R','e','s','o','u','r','c','e',0}; + + /* create folder with desktop.ini and localized name in GetModuleFileNameA(NULL) */ + CreateDirectoryA(".\\testfolder", NULL); + + SetFileAttributesA(".\\testfolder", GetFileAttributesA(".\\testfolder")|FILE_ATTRIBUTE_SYSTEM); + + GetModuleFileNameA(NULL, resourcefile, MAX_PATH); + + file = CreateFileA(".\\testfolder\\desktop.ini", GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %i\n", GetLastError()); + ok(WriteFile(file, desktopini_contents1, strlen(desktopini_contents1), &res, NULL) && + WriteFile(file, resourcefile, strlen(resourcefile), &res, NULL) && + WriteFile(file, desktopini_contents2, strlen(desktopini_contents2), &res, NULL), + "WriteFile failed %i\n", GetLastError()); + CloseHandle(file); + + /* get IShellFolder for parent */ + GetCurrentDirectoryA(MAX_PATH, cCurrDirA); + len = lstrlenA(cCurrDirA); + + if (len == 0) { + trace("GetCurrentDirectoryA returned empty string. Skipping test_LocalizedNames\n"); + goto cleanup; + } + if(cCurrDirA[len-1] == '\\') + cCurrDirA[len-1] = 0; + + MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH); + + hr = SHGetDesktopFolder(&IDesktopFolder); + ok(hr == S_OK, "SHGetDesktopfolder failed %08x\n", hr); + + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cCurrDirW, NULL, &newPIDL, 0); + ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr); + + hr = IShellFolder_BindToObject(IDesktopFolder, newPIDL, NULL, (REFIID)&IID_IShellFolder, (LPVOID *)&testIShellFolder); + ok(hr == S_OK, "BindToObject failed %08x\n", hr); + + IMalloc_Free(ppM, newPIDL); + + /* windows reads the display name from the resource */ + hr = IShellFolder_ParseDisplayName(testIShellFolder, NULL, NULL, foldernameW, NULL, &newPIDL, 0); + ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr); + + hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER, &strret); + ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr); + + if (SUCCEEDED(hr) && pStrRetToBufW) + { + hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + ok (SUCCEEDED(hr), "StrRetToBufW failed! hr = %08x\n", hr); + todo_wine ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); + } + + /* editing name is also read from the resource */ + hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FOREDITING, &strret); + ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr); + + if (SUCCEEDED(hr) && pStrRetToBufW) + { + hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + ok (SUCCEEDED(hr), "StrRetToBufW failed! hr = %08x\n", hr); + todo_wine ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); + } + + /* parsing name is unchanged */ + hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FORPARSING, &strret); + ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr); + + if (SUCCEEDED(hr) && pStrRetToBufW) + { + hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + ok (SUCCEEDED(hr), "StrRetToBufW failed! hr = %08x\n", hr); + ok (!lstrcmpiW(tempbufW, foldernameW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); + } + + IShellFolder_Release(IDesktopFolder); + IShellFolder_Release(testIShellFolder); + + IMalloc_Free(ppM, newPIDL); + +cleanup: + DeleteFileA(".\\testfolder\\desktop.ini"); + SetFileAttributesA(".\\testfolder", GetFileAttributesA(".\\testfolder")&~FILE_ATTRIBUTE_SYSTEM); + RemoveDirectoryA(".\\testfolder"); +} + START_TEST(shlfolder) { @@ -1509,6 +1626,7 @@ START_TEST(shlfolder) testSHGetFolderPathAndSubDirA(); else skip("SHGetFolderPathAndSubDirA not present\n"); + test_LocalizedNames(); OleUninitialize(); }

1 0

Henri Verbeet : wined3d: Explicitly pass the shader version to shader_dump_decl_usage().
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: wine Branch: master Commit: 71a8a77cf9af7c3aecae2a7c853d1ba2df677235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a8a77cf9af7c3aecae2a7c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 4 17:41:31 2008 +0100 wined3d: Explicitly pass the shader version to shader_dump_decl_usage(). --- dlls/wined3d/baseshader.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 5cc992f..87a7022 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -491,11 +491,8 @@ HRESULT shader_get_registers_used( return WINED3D_OK; } -static void shader_dump_decl_usage( - IWineD3DBaseShaderImpl* This, - DWORD decl, - DWORD param) { - +static void shader_dump_decl_usage(DWORD decl, DWORD param, DWORD shader_version) +{ DWORD regtype = shader_get_regtype(param); TRACE("dcl"); @@ -516,8 +513,7 @@ static void shader_dump_decl_usage( DWORD idx = (decl & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; /* Pixel shaders 3.0 don't have usage semantics */ - char pshader = shader_is_pshader_version(This->baseShader.hex_version); - if (pshader && This->baseShader.hex_version < WINED3DPS_VERSION(3,0)) + if (shader_is_pshader_version(shader_version) && shader_version < WINED3DPS_VERSION(3,0)) return; else TRACE("_"); @@ -1027,7 +1023,7 @@ void shader_trace_init( DWORD usage = *pToken; DWORD param = *(pToken + 1); - shader_dump_decl_usage(This, usage, param); + shader_dump_decl_usage(usage, param, This->baseShader.hex_version); shader_dump_ins_modifiers(param); TRACE(" "); shader_dump_param(iface, param, 0, 0);

1 0