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

Francois Gouget : cmd: Add full stops to some parameter descriptions in the usage.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 8067f7606c67a68233b2142a1d9a4d23f44aac9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8067f7606c67a68233b2142a1… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:24:04 2011 +0100 cmd: Add full stops to some parameter descriptions in the usage. --- programs/cmd/cmd.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/cmd.rc b/programs/cmd/cmd.rc index 0cf96fe..4a45922 100644 --- a/programs/cmd/cmd.rc +++ b/programs/cmd/cmd.rc @@ -155,7 +155,7 @@ action, and can therefore be used as a comment in a batch file.\n" WCMD_REN, "REN <filename> is the short version of RENAME. It renames a file.\n" - WCMD_RENAME, "RENAME <filename> renames a file\n" + WCMD_RENAME, "RENAME <filename> renames a file.\n" WCMD_RD, "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" WCMD_RMDIR, "RMDIR <dir> deletes a subdirectory.\n" @@ -201,7 +201,7 @@ VERIFY\t\tDisplays ON or OFF as appropriate.\n\ The verify flag has no function in Wine.\n" WCMD_VER, -"VER displays the version of cmd you are running\n" +"VER displays the version of cmd you are running.\n" WCMD_VOL, "VOL shows the volume label of a disk device.\n"

1 0

Francois Gouget : user32/tests: Use NULL instead of casting 0.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 4f7fc170a732e8b371856f02cd39d85dbf21cc37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f7fc170a732e8b371856f02c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:06:03 2011 +0100 user32/tests: Use NULL instead of casting 0. --- dlls/user32/tests/cursoricon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index d6a437d..0fc3cb7 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1478,7 +1478,7 @@ static void test_GetCursorFrameInfo(void) /* Check GetCursorFrameInfo behavior on a single-frame animated cursor */ unk1 = unk2 = unk3 = unk4 = 0xdead; - h2 = pGetCursorFrameInfo(h1, &unk1, (VOID*)0, &unk3, &unk4); + h2 = pGetCursorFrameInfo(h1, &unk1, NULL, &unk3, &unk4); ok(h1 == h2, "GetCursorFrameInfo() failed: (%p != %p).\n", h1, h2); ok(unk1 == 0xdead, "GetCursorFrameInfo() unexpected param 2 value (0x%x != 0xdead).\n", unk1); ok(unk2 == 0xdead, "GetCursorFrameInfo() unexpected param 3 value (0x%x != 0xdead).\n", unk2); @@ -1560,7 +1560,7 @@ static void test_GetCursorFrameInfo(void) /* Check GetCursorFrameInfo behavior on rate 0 for a multi-frame animated cursor (with num_steps == 1) */ unk1 = unk2 = unk3 = unk4 = 0xdead; - h2 = pGetCursorFrameInfo(h1, &unk1, (VOID*)0, &unk3, &unk4); + h2 = pGetCursorFrameInfo(h1, &unk1, NULL, &unk3, &unk4); ok(h2 != 0, "GetCursorFrameInfo() failed for cursor %p: (%p == 0).\n", h1, h2); ok(unk1 == 0xdead, "GetCursorFrameInfo() unexpected param 2 value (0x%x != 0xdead).\n", unk1); ok(unk2 == 0xdead, "GetCursorFrameInfo() unexpected param 3 value (0x%x != 0xdead).\n", unk2);

1 0

Francois Gouget : wined3d: Make IWineD3DVolumeImpl_GetResource() static.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 60b63fea4e56e007b79ef88a3a7528b21e92f737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b63fea4e56e007b79ef88a3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:29:58 2011 +0100 wined3d: Make IWineD3DVolumeImpl_GetResource() static. --- dlls/wined3d/volume.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a0baef3..9528b15 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -220,7 +220,7 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa return resource_get_type(&((IWineD3DVolumeImpl *)iface)->resource); } -struct wined3d_resource * WINAPI IWineD3DVolumeImpl_GetResource(IWineD3DVolume *iface) +static struct wined3d_resource * WINAPI IWineD3DVolumeImpl_GetResource(IWineD3DVolume *iface) { TRACE("iface %p.\n", iface);

1 0

Francois Gouget : services: Make find_service_by_group() static.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: ba3542bca7a2743c6ead7956050a2c6c66fb8b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba3542bca7a2743c6ead79560… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:29:47 2011 +0100 services: Make find_service_by_group() static. --- programs/services/rpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 82dc8c6..cf1f814 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1212,7 +1212,7 @@ DWORD svcctl_EnumServicesStatusW( return ERROR_SUCCESS; } -struct service_entry *find_service_by_group(struct scmdatabase *db, const WCHAR *group) +static struct service_entry *find_service_by_group(struct scmdatabase *db, const WCHAR *group) { struct service_entry *service; LIST_FOR_EACH_ENTRY(service, &db->services, struct service_entry, entry)

1 0

Francois Gouget : wordpad: Fix the background color menu label.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 3ec2b59f804995dc07fa152663dcfc9eef2f297c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec2b59f804995dc07fa15266… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:05:45 2011 +0100 wordpad: Fix the background color menu label. --- programs/wordpad/wordpad.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.rc b/programs/wordpad/wordpad.rc index a1107c9..1e83b1b 100644 --- a/programs/wordpad/wordpad.rc +++ b/programs/wordpad/wordpad.rc @@ -85,7 +85,7 @@ BEGIN POPUP "Backgroun&d" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 - MENUITEM "&PostThat yellowish\tCtrl+2", ID_BACK_2 + MENUITEM "&Pale yellow\tCtrl+2", ID_BACK_2 END END POPUP "&Help"

1 0

Francois Gouget : advapi32: Make trustee_name_A_to_W() and free_trustee_name() static.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 5b4f0dfc4c030014d32c1cf19a5ba42210dac429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4f0dfc4c030014d32c1cf19… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:25:36 2011 +0100 advapi32: Make trustee_name_A_to_W() and free_trustee_name() static. --- dlls/advapi32/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 1aa7990..cd76fb5 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3471,7 +3471,7 @@ BOOL WINAPI SetAclInformation( PACL pAcl, LPVOID pAclInformation, return TRUE; } -DWORD trustee_name_A_to_W(TRUSTEE_FORM form, char *trustee_nameA, WCHAR **ptrustee_nameW) +static DWORD trustee_name_A_to_W(TRUSTEE_FORM form, char *trustee_nameA, WCHAR **ptrustee_nameW) { DWORD len; @@ -3552,7 +3552,7 @@ error: } } -void free_trustee_name(TRUSTEE_FORM form, WCHAR *trustee_nameW) +static void free_trustee_name(TRUSTEE_FORM form, WCHAR *trustee_nameW) { switch (form) {

1 0

Francois Gouget : msi: Small tweak to the usage for readability.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: cadd7389db760ef32bbe72f150475c5a1c8dbae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cadd7389db760ef32bbe72f15… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:07:37 2011 +0100 msi: Small tweak to the usage for readability. --- dlls/msi/msi.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index c9ec5dc..c980fa8 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -31,19 +31,19 @@ STRINGTABLE "Usage:\n" \ "msiexec command {required parameter} [optional parameter]\n\n" \ "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ + "\t/i {package|product_code} [property]\n" \ + "\t/package {package|product_code} [property]\n" \ "\t/a package [property]\n" \ "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ + "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" \ "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ + "\t/uninstall {package|product_code} [property]\n" \ + "\t/x {package|product_code} [property]\n" \ "Advertise a product:\n" \ "\t/j[u|m] package [/t transform] [/g languageid]\n" \ "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ + "\t/p patch_package [property]\n" \ + "\t/p patch_package /a package [property]\n" \ "Log and UI Modifiers for above commands:\n" \ "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ "\t/q{|n|b|r|f|n+|b+|b-}\n" \

1 0

Francois Gouget : comctl32/tests: Make init_tbsize_result() and tbsize_addbutton() static.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: cc70cd9de10a68aa0116acae829b5b8b283821d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc70cd9de10a68aa0116acae8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:25:57 2011 +0100 comctl32/tests: Make init_tbsize_result() and tbsize_addbutton() static. --- dlls/comctl32/tests/toolbar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 280a333..6be6769 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -707,7 +707,7 @@ typedef struct RECT *prcButtons; } tbsize_result_t; -tbsize_result_t init_tbsize_result(int nButtonsAlloc, int cleft, int ctop, int cright, int cbottom, int minx, int miny) { +static tbsize_result_t init_tbsize_result(int nButtonsAlloc, int cleft, int ctop, int cright, int cbottom, int minx, int miny) { tbsize_result_t ret; SetRect(&ret.rcClient, cleft, ctop, cright, cbottom); @@ -719,7 +719,7 @@ tbsize_result_t init_tbsize_result(int nButtonsAlloc, int cleft, int ctop, int c return ret; } -void tbsize_addbutton(tbsize_result_t *tbsr, int left, int top, int right, int bottom) { +static void tbsize_addbutton(tbsize_result_t *tbsr, int left, int top, int right, int bottom) { SetRect(&tbsr->prcButtons[tbsr->nButtons], left, top, right, bottom); tbsr->nButtons++; }

1 0

Francois Gouget : gdiplus: Make load_ttf_name_id() static.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 769dcd8447417cba0d18c656433c860e354d7422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=769dcd8447417cba0d18c6564… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:26:11 2011 +0100 gdiplus: Make load_ttf_name_id() static. --- dlls/gdiplus/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 242a857..e092b43 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -974,7 +974,7 @@ typedef struct _tagTT_NAME_RECORD { * Code based off of code located here * http://www.codeproject.com/gdi/fontnamefromfile.asp */ -WCHAR *load_ttf_name_id( const char *mem, DWORD_PTR size, DWORD id, WCHAR *ret, DWORD len ) +static WCHAR *load_ttf_name_id( const char *mem, DWORD_PTR size, DWORD id, WCHAR *ret, DWORD len ) { const TT_TABLE_DIRECTORY *tblDir; TT_OFFSET_TABLE ttOffsetTable;

1 0

Francois Gouget : gdiplus: Remove GdiplusShutdown() as it is redudant with GdiplusShutdown_wrapper().
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: ca988fa4019e52d94799d69305b03b8612e7b1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca988fa4019e52d94799d6930… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:26:52 2011 +0100 gdiplus: Remove GdiplusShutdown() as it is redudant with GdiplusShutdown_wrapper(). --- dlls/gdiplus/gdiplus.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index fb159be..8c08660 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -116,16 +116,17 @@ void WINAPI GdiplusNotificationUnhook(ULONG_PTR token) /***************************************************** * GdiplusShutdown [GDIPLUS.@] */ -void WINAPI GdiplusShutdown(ULONG_PTR token) -{ - /* FIXME: no object tracking */ -} - -/* "bricksntiles" expects a return value of 0, which native coincidentally gives */ ULONG WINAPI GdiplusShutdown_wrapper(ULONG_PTR token) { - GdiplusShutdown(token); + /* Notice the slightly different prototype from the official + * signature which forces us to use the the _wrapper suffix. + */ + + /* FIXME: no object tracking */ + /* "bricksntiles" expects a return value of 0, which native + * coincidentally gives. + */ return 0; }

1 0