March 2011 - wine-commits

Francois Gouget : wined3d: Make IWineD3DVolumeImpl_GetResource() static.
by Alexandre Julliard 16 Mar '11

16 Mar '11

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 16 Mar '11

16 Mar '11

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 : gdiplus: Remove GdiplusShutdown() as it is redudant with GdiplusShutdown_wrapper().
by Alexandre Julliard 16 Mar '11

16 Mar '11

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

Francois Gouget : gdiplus: Make load_ttf_name_id() static.
by Alexandre Julliard 16 Mar '11

16 Mar '11

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 : comctl32/tests: Make init_tbsize_result() and tbsize_addbutton() static.
by Alexandre Julliard 16 Mar '11

16 Mar '11

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 : advapi32: Make trustee_name_A_to_W() and free_trustee_name() static.
by Alexandre Julliard 16 Mar '11

16 Mar '11

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 : winecfg: Add a full stop to an error message.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 11bbb80dc94e52d91b9e85f501978946713129b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bbb80dc94e52d91b9e85f50… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:25:21 2011 +0100 winecfg: Add a full stop to an error message. --- programs/winecfg/winecfg.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index f98a14d..652fc47 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -83,7 +83,7 @@ BEGIN IDS_DRIVE_REMOTE "Network share" IDS_DRIVE_REMOVABLE "Floppy disk" IDS_DRIVE_CDROM "CD-ROM" - IDS_DRIVE_LETTERS_EXCEEDED "You cannot add any more drives.\n\nEach drive must have a letter, from A to Z, so you cannot have more than 26" + IDS_DRIVE_LETTERS_EXCEEDED "You cannot add any more drives.\n\nEach drive must have a letter, from A to Z, so you cannot have more than 26." IDS_SYSTEM_DRIVE_LABEL "System drive" IDS_CONFIRM_DELETE_C "Are you sure you want to delete drive C?\n\nMost Windows applications expect drive C to exist, and will die messily if it doesn't. If you proceed remember to recreate it!" IDS_COL_DRIVELETTER "Letter"

1 0

Francois Gouget : cmd: Add full stops to some parameter descriptions in the usage.
by Alexandre Julliard 16 Mar '11

16 Mar '11

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 : winmm: Add full stops to some error messages.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 74a75e479b8888d9e3ca6b6a0732a1b5b11ef829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a75e479b8888d9e3ca6b6a0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:23:33 2011 +0100 winmm: Add full stops to some error messages. --- dlls/winmm/winmm.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winmm.rc b/dlls/winmm/winmm.rc index f529dff..6b5d800 100644 --- a/dlls/winmm/winmm.rc +++ b/dlls/winmm/winmm.rc @@ -39,7 +39,7 @@ MMSYSERR_INVALFLAG, "An invalid flag was passed to a system function." MMSYSERR_INVALPARAM, "An invalid parameter was passed to a system function." /* WAVE errors */ -WAVERR_BADFORMAT, "The specified format is not supported or cannot be translated. Use the Capabilities function to determine the supported formats" +WAVERR_BADFORMAT, "The specified format is not supported or cannot be translated. Use the Capabilities function to determine the supported formats." WAVERR_STILLPLAYING, "Cannot perform this operation while media data is still playing. Reset the device, or wait until the data is finished playing." WAVERR_UNPREPARED, "The wave header was not prepared. Use the Prepare function to prepare the header, and then try again." WAVERR_SYNC, "Cannot open the device without using the WAVE_ALLOWSYNC flag. Use the flag, and then try again." @@ -74,7 +74,7 @@ MCIERR_DEVICE_NOT_READY, "The device driver is not ready." MCIERR_INTERNAL, "A problem occurred in initializing MCI. Try restarting Windows." MCIERR_DRIVER, "There is a problem with the device driver. The driver has closed. Cannot access error." MCIERR_CANNOT_USE_ALL, "Cannot use 'all' as the device name with the specified command." -MCIERR_MULTIPLE, "Errors occurred in more than one device. Specify each command and device separately to determine which devices caused the error" +MCIERR_MULTIPLE, "Errors occurred in more than one device. Specify each command and device separately to determine which devices caused the error." MCIERR_EXTENSION_NOT_FOUND, "Cannot determine the device type from the given filename extension." MCIERR_OUTOFRANGE, "The specified parameter is out of range for the specified command." MCIERR_FLAGS_NOT_COMPATIBLE, "The specified parameters cannot be used together."

1 0

Francois Gouget : msi: Small tweak to the usage for readability.
by Alexandre Julliard 16 Mar '11

16 Mar '11

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 : user32/tests: Use NULL instead of casting 0.
by Alexandre Julliard 16 Mar '11

16 Mar '11

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 : wordpad: Fix the background color menu label.
by Alexandre Julliard 16 Mar '11

16 Mar '11

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

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 0a4c91d73c3a7fc852f0277771e19f44c2cf414a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4c91d73c3a7fc852f027777… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Mar 15 12:49:41 2011 +0100 po: Update Polish translation. --- po/pl.po | 657 ++++++++++++++++++------------------------------------------- 1 files changed, 194 insertions(+), 463 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a4c91d73c3a7fc852f02…

1 0

Austin Lund : user32/tests: Output error information in cursoricon tests.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 5d0783bc0d9149015fcbfd1375f64104d039ff0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0783bc0d9149015fcbfd137… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Mar 16 19:59:26 2011 +1000 user32/tests: Output error information in cursoricon tests. --- dlls/user32/tests/cursoricon.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 1127f13..d6a437d 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1452,7 +1452,7 @@ static void test_GetCursorFrameInfo(void) /* Creating a static cursor. */ SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) hotspot, CRSR_RES_SIZE, FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %d).\n", GetLastError()); /* Check GetCursorFrameInfo behavior on a static cursor */ unk1 = unk2 = unk3 = unk4 = 0xdead; @@ -1464,15 +1464,17 @@ static void test_GetCursorFrameInfo(void) ok(unk4 == 1, "GetCursorFrameInfo() unexpected param 5 value (%d != 1).\n", unk4); /* Clean up static cursor. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); /* Creating a single-frame animated cursor. */ empty_anicursor.frames[0].data.icon_info.idType = 2; /* type: cursor */ empty_anicursor.frames[0].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor.frames[0].data.icon_info.idEntries[0].yHotspot = 3; + SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor, sizeof(empty_anicursor), FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %d).\n", GetLastError()); /* Check GetCursorFrameInfo behavior on a single-frame animated cursor */ unk1 = unk2 = unk3 = unk4 = 0xdead; @@ -1485,8 +1487,9 @@ static void test_GetCursorFrameInfo(void) "GetCursorFrameInfo() unexpected param 5 value (%d != 1).\n", unk4); /* Clean up single-frame animated cursor. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); /* Creating a multi-frame animated cursor. */ for (i=0; i<empty_anicursor3.header.header.num_frames; i++) @@ -1495,8 +1498,9 @@ static void test_GetCursorFrameInfo(void) empty_anicursor3.frames[i].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor3.frames[i].data.icon_info.idEntries[0].yHotspot = 3; } + SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor3, sizeof(empty_anicursor3), FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %d).\n", GetLastError()); /* Check number of steps in multi-frame animated cursor */ i=0; @@ -1536,13 +1540,15 @@ static void test_GetCursorFrameInfo(void) "GetCursorFrameInfo() unexpected param 5 value (0x%x != 0xdead).\n", unk4); /* Clean up multi-frame animated cursor. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); /* Create a multi-frame animated cursor with num_steps == 1 */ empty_anicursor3.header.header.num_steps = 1; + SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor3, sizeof(empty_anicursor3), FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %d).\n", GetLastError()); /* Check number of steps in multi-frame animated cursor (mismatch between steps and frames) */ i=0; @@ -1578,8 +1584,9 @@ static void test_GetCursorFrameInfo(void) "GetCursorFrameInfo() unexpected param 5 value (%d != 0xdead).\n", unk4); /* Clean up multi-frame animated cursor. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); /* Creating a multi-frame animated cursor with rate data. */ for (i=0; i<empty_anicursor3_rate.header.header.num_frames; i++) @@ -1588,8 +1595,9 @@ static void test_GetCursorFrameInfo(void) empty_anicursor3_rate.frames[i].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor3_rate.frames[i].data.icon_info.idEntries[0].yHotspot = 3; } + SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor3_rate, sizeof(empty_anicursor3_rate), FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %x).\n", GetLastError()); /* Check number of steps in multi-frame animated cursor with rate data */ i=0; @@ -1616,8 +1624,9 @@ static void test_GetCursorFrameInfo(void) } /* Clean up multi-frame animated cursor with rate data. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); cleanup: if(bmpOld) SelectObject(hdc, bmpOld);

1 0

Hans Leidekker : msi: Let the InstallFiles action determine which private assembly files to install .
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: bb40bebd2b62a8a6e8dd8fdf34aa8a3908a91a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb40bebd2b62a8a6e8dd8fdf3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 16 09:22:59 2011 +0100 msi: Let the InstallFiles action determine which private assembly files to install. --- dlls/msi/assembly.c | 7 +++++-- dlls/msi/files.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index fcca6b8..ad5e3a5 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -282,8 +282,11 @@ MSIASSEMBLY *load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) if (a->application) { - FIXME("we should probably check the manifest file here\n"); - a->installed = (msi_get_property_int( package->db, szInstalled, 0 ) != 0); + /* We can't check the manifest here because the target path may still change. + So we assume that the assembly is not installed and lean on the InstallFiles + action to determine which files need to be installed. + */ + a->installed = FALSE; } else { diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 7f71d1a..1f61873 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -74,7 +74,7 @@ static msi_file_state calculate_install_state( MSIFILE *file ) TRACE("file %s is not scheduled for install\n", debugstr_w(file->File)); return msifs_skipped; } - if ((comp->assembly && !comp->assembly->installed) || + if ((comp->assembly && !comp->assembly->application && !comp->assembly->installed) || GetFileAttributesW( file->TargetPath ) == INVALID_FILE_ATTRIBUTES) { TRACE("file %s is missing\n", debugstr_w(file->File));

1 0

Hans Leidekker : msi: Skip reference counting for assembly components.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 12135acb70bb7a05b4421db89e31e95044452f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12135acb70bb7a05b4421db89… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 16 09:22:48 2011 +0100 msi: Skip reference counting for assembly components. --- dlls/msi/action.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7567f5d..f806f18 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3151,9 +3151,6 @@ static UINT ACTION_WriteSharedDLLsCount(LPCWSTR path, UINT count) return count; } -/* - * Return TRUE if the count should be written out and FALSE if not - */ static void ACTION_RefCountComponent( MSIPACKAGE* package, MSICOMPONENT *comp ) { MSIFEATURE *feature; @@ -3162,6 +3159,7 @@ static void ACTION_RefCountComponent( MSIPACKAGE* package, MSICOMPONENT *comp ) /* only refcount DLLs */ if (comp->KeyPath == NULL || + comp->assembly || comp->Attributes & msidbComponentAttributesRegistryKeyPath || comp->Attributes & msidbComponentAttributesODBCDataSource) write = FALSE;

1 0

Huw Davies : include: Uncomment EMRGRADIENTFILL.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 58442c1b50e11644924779f5cf2ac149e4fdd851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58442c1b50e11644924779f5c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 16 10:07:40 2011 +0000 include: Uncomment EMRGRADIENTFILL. --- include/wingdi.h | 86 +++++++++++++++++++++++++++--------------------------- 1 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index 29fb351..ca6df30 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1966,6 +1966,49 @@ typedef struct #define STOCK_LAST 19 #define CLR_INVALID 0xffffffff + +typedef USHORT COLOR16; + +typedef struct _TRIVERTEX +{ + LONG x; + LONG y; + COLOR16 Red; + COLOR16 Green; + COLOR16 Blue; + COLOR16 Alpha; +} TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX; + +typedef struct _GRADIENT_TRIANGLE +{ + ULONG Vertex1; + ULONG Vertex2; + ULONG Vertex3; +} GRADIENT_TRIANGLE, *PGRADIENT_TRIANGLE, *LPGRADIENT_TRIANGLE; + +typedef struct _GRADIENT_RECT +{ + ULONG UpperLeft; + ULONG LowerRight; +} GRADIENT_RECT, *PGRADIENT_RECT, *LPGRADIENT_RECT; + +#define AC_SRC_OVER 0x00 +#define AC_SRC_ALPHA 0x01 + +typedef struct _BLENDFUNCTION +{ + BYTE BlendOp; + BYTE BlendFlags; + BYTE SourceConstantAlpha; + BYTE AlphaFormat; +} BLENDFUNCTION, *PBLENDFUNCTION; + +#define GRADIENT_FILL_RECT_H 0x00000000 +#define GRADIENT_FILL_RECT_V 0x00000001 +#define GRADIENT_FILL_TRIANGLE 0x00000002 +#define GRADIENT_FILL_OP_FLAG 0x000000ff + + /* Metafile header structure */ #include <pshpack2.h> typedef struct @@ -2347,7 +2390,6 @@ typedef struct { BYTE Data[1]; } EMRGDICOMMENT, *PEMRGDICOMMENT; -#if 0 typedef struct { EMR emr; RECTL rclBounds; @@ -2356,7 +2398,6 @@ typedef struct { ULONG ulMode; TRIVERTEX Ver[1]; } EMRGRADIENTFILL, *PEMRGRADIENTFILL; -#endif typedef struct { EMR emr; @@ -3255,47 +3296,6 @@ DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE) #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 -typedef USHORT COLOR16; - -typedef struct _TRIVERTEX -{ - LONG x; - LONG y; - COLOR16 Red; - COLOR16 Green; - COLOR16 Blue; - COLOR16 Alpha; -} TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX; - -typedef struct _GRADIENT_TRIANGLE -{ - ULONG Vertex1; - ULONG Vertex2; - ULONG Vertex3; -} GRADIENT_TRIANGLE, *PGRADIENT_TRIANGLE, *LPGRADIENT_TRIANGLE; - -typedef struct _GRADIENT_RECT -{ - ULONG UpperLeft; - ULONG LowerRight; -} GRADIENT_RECT, *PGRADIENT_RECT, *LPGRADIENT_RECT; - -#define AC_SRC_OVER 0x00 -#define AC_SRC_ALPHA 0x01 - -typedef struct _BLENDFUNCTION -{ - BYTE BlendOp; - BYTE BlendFlags; - BYTE SourceConstantAlpha; - BYTE AlphaFormat; -} BLENDFUNCTION, *PBLENDFUNCTION; - -#define GRADIENT_FILL_RECT_H 0x00000000 -#define GRADIENT_FILL_RECT_V 0x00000001 -#define GRADIENT_FILL_TRIANGLE 0x00000002 -#define GRADIENT_FILL_OP_FLAG 0x000000ff - #define GDI_ERROR (~0u) #define HGDI_ERROR ((HANDLE)~(ULONG_PTR)0)

1 0

Roderick Colenbrander : wined3d: Add latest Nvidia GPUs.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: d003215ab4e54537440d77297588b4dd9f3ea9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d003215ab4e54537440d77297… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 15 22:07:40 2011 -0700 wined3d: Add latest Nvidia GPUs. --- dlls/wined3d/directx.c | 17 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 7 +++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c5a9ef3..43f445e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1066,10 +1066,18 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT330, "NVIDIA GeForce GT 330", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT420, "NVIDIA GeForce GT 420", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT430, "NVIDIA GeForce GT 430", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT440, "NVIDIA GeForce GT 440", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS450, "NVIDIA GeForce GTS 450", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX460, "NVIDIA GeForce GTX 460", DRIVER_NVIDIA_GEFORCE6, 768 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX465, "NVIDIA GeForce GTX 465", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560 TI", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, + /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_7200, "ATI RADEON 7200 SERIES", DRIVER_AMD_R100, 32 }, @@ -1405,10 +1413,17 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl } cards[] = { + {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ + {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ + {"GTX 560 TI", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ {"GTX 470", CARD_NVIDIA_GEFORCE_GTX470}, /* Geforce 400 - midend high */ {"GTX 465", CARD_NVIDIA_GEFORCE_GTX465}, /* Geforce 400 - midend */ {"GTX 460", CARD_NVIDIA_GEFORCE_GTX460}, /* Geforce 400 - midend */ + {"GTS 450", CARD_NVIDIA_GEFORCE_GTS450}, /* Geforce 400 - midend low */ + {"GT 440", CARD_NVIDIA_GEFORCE_GT440}, /* Geforce 400 - lowend */ + {"GT 430", CARD_NVIDIA_GEFORCE_GT430}, /* Geforce 400 - lowend */ + {"GT 420", CARD_NVIDIA_GEFORCE_GT420}, /* Geforce 400 - lowend */ {"GT 330", CARD_NVIDIA_GEFORCE_GT330}, /* Geforce 300 - highend */ {"GTS 360M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ {"GTS 350M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ @@ -1864,7 +1879,9 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i } cards[] = { + {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, {"NVC4", CARD_NVIDIA_GEFORCE_GTX460}, + {"NVC3", CARD_NVIDIA_GEFORCE_GT440}, {"NVC0", CARD_NVIDIA_GEFORCE_GTX480}, {"NVAF", CARD_NVIDIA_GEFORCE_GT320M}, {"NVAC", CARD_NVIDIA_GEFORCE_8200}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8726e2d..ec5c203 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1405,10 +1405,17 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, CARD_NVIDIA_GEFORCE_GT330 = 0x0ca0, CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, + CARD_NVIDIA_GEFORCE_GT420 = 0x0de2, + CARD_NVIDIA_GEFORCE_GT430 = 0x0de1, + CARD_NVIDIA_GEFORCE_GT440 = 0x0de0, + CARD_NVIDIA_GEFORCE_GTS450 = 0x0dc4, CARD_NVIDIA_GEFORCE_GTX460 = 0x0e22, CARD_NVIDIA_GEFORCE_GTX465 = 0x06c4, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0, + CARD_NVIDIA_GEFORCE_GTX560 = 0x1200, + CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, + CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, CARD_INTEL_845G = 0x2562, CARD_INTEL_I830G = 0x3577,

1 0

Roderick Colenbrander : wined3d: Update Nvidia Geforce6+ driver version.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: b1a97099e7983e77479a450a573c268542924a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a97099e7983e77479a450a5… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 15 22:07:39 2011 -0700 wined3d: Update Nvidia Geforce6+ driver version. --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c607d99..c5a9ef3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1009,8 +1009,8 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_NVIDIA_TNT, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 10, 7186}, {DRIVER_NVIDIA_GEFORCE2MX, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 10, 9371}, {DRIVER_NVIDIA_GEFORCEFX, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 11, 7516}, - {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT5X, "nv4_disp.dll", 15, 11, 9745}, - {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 15, 11, 9745}, + {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT5X, "nv4_disp.dll", 15, 12, 6658}, + {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 15, 12, 6658}, }; struct gpu_description

1 0

Nikolay Sivov : msxml3: Support VT_BSTR|VT_BYREF as source in load().
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: cde8e6c8cc69ca0b3542779a5cdf5e88475c7465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde8e6c8cc69ca0b3542779a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 16 00:35:55 2011 +0300 msxml3: Support VT_BSTR|VT_BYREF as source in load(). --- dlls/msxml3/domdoc.c | 24 ++++++++++-------- dlls/msxml3/main.c | 3 ++ dlls/msxml3/tests/domdoc.c | 57 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 7d1b352..43bcb77 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2104,7 +2104,7 @@ static HRESULT doread( domdoc *This, LPWSTR filename ) static HRESULT WINAPI domdoc_load( IXMLDOMDocument3 *iface, - VARIANT xmlSource, + VARIANT source, VARIANT_BOOL* isSuccessful ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); @@ -2114,19 +2114,23 @@ static HRESULT WINAPI domdoc_load( IStream *pStream = NULL; xmlDocPtr xmldoc; - TRACE("(%p)->type %d\n", This, V_VT(&xmlSource) ); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&source)); *isSuccessful = VARIANT_FALSE; assert( &This->node ); - switch( V_VT(&xmlSource) ) + switch( V_VT(&source) ) { case VT_BSTR: - filename = V_BSTR(&xmlSource); + filename = V_BSTR(&source); + break; + case VT_BSTR|VT_BYREF: + if (!V_BSTRREF(&source)) return E_INVALIDARG; + filename = *V_BSTRREF(&source); break; case VT_UNKNOWN: - hr = IUnknown_QueryInterface(V_UNKNOWN(&xmlSource), &IID_IXMLDOMDocument3, (void**)&pNewDoc); + hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IXMLDOMDocument3, (void**)&pNewDoc); if(hr == S_OK) { if(pNewDoc) @@ -2141,7 +2145,7 @@ static HRESULT WINAPI domdoc_load( return hr; } } - hr = IUnknown_QueryInterface(V_UNKNOWN(&xmlSource), &IID_IStream, (void**)&pStream); + hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IStream, (void**)&pStream); if(hr == S_OK) { IPersistStream *pDocStream; @@ -2170,14 +2174,12 @@ static HRESULT WINAPI domdoc_load( else { /* ISequentialStream */ - FIXME("Unknown type not supported (%d) (%p)(%p)\n", hr, pNewDoc, V_UNKNOWN(&xmlSource)->lpVtbl); + FIXME("Unknown type not supported (%d) (%p)(%p)\n", hr, pNewDoc, V_UNKNOWN(&source)->lpVtbl); } break; default: - FIXME("VT type not supported (%d)\n", V_VT(&xmlSource)); - } - - TRACE("filename (%s)\n", debugstr_w(filename)); + FIXME("VT type not supported (%d)\n", V_VT(&source)); + } if ( filename ) { diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 6cbdd99..01eabab 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -286,6 +286,9 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_UNKNOWN: %p}", V_UNKNOWN(v)); case VT_UINT: return wine_dbg_sprintf("{VT_UINT: %u}", V_UINT(v)); + case VT_BSTR|VT_BYREF: + return wine_dbg_sprintf("{VT_BSTR|VT_BYREF: ptr %p, data %s}", + V_BSTRREF(v), V_BSTRREF(v) ? debugstr_w(*V_BSTRREF(v)) : NULL); default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6948201..3e60e24 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5686,7 +5686,7 @@ static void test_save(void) IXMLDOMDocument_Release(doc); - hfile = CreateFile("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + hfile = CreateFileA("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); ok(hfile != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); if(hfile == INVALID_HANDLE_VALUE) return; @@ -6097,7 +6097,7 @@ static void test_TransformWithLoadingLocalFile(void) GetTempPathA(MAX_PATH, lpPathBuffer); strcat(lpPathBuffer, "customers.xml" ); - file = CreateFile(lpPathBuffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + file = CreateFileA(lpPathBuffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); if(file == INVALID_HANDLE_VALUE) return; @@ -8609,6 +8609,58 @@ static void test_selection(void) free_bstrs(); } +static void test_load(void) +{ + IXMLDOMDocument *doc; + VARIANT_BOOL b; + HANDLE hfile; + VARIANT src; + HRESULT hr; + BOOL ret; + BSTR path; + DWORD written; + + /* prepare a file */ + hfile = CreateFileA("test.xml", GENERIC_WRITE|GENERIC_READ, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create test file\n"); + if(hfile == INVALID_HANDLE_VALUE) return; + + ret = WriteFile(hfile, szNonUnicodeXML, sizeof(szNonUnicodeXML)-1, &written, NULL); + ok(ret, "WriteFile failed\n"); + + CloseHandle(hfile); + + doc = create_document(&IID_IXMLDOMDocument); + + path = _bstr_("test.xml"); + + /* load from path: VT_BSTR */ + V_VT(&src) = VT_BSTR; + V_BSTR(&src) = path; + hr = IXMLDOMDocument_load(doc, src, &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); + + /* load from a path: VT_BSTR|VT_BYREF */ + V_VT(&src) = VT_BSTR | VT_BYREF; + V_BSTRREF(&src) = &path; + hr = IXMLDOMDocument_load(doc, src, &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); + + /* load from a path: VT_BSTR|VT_BYREF, null ptr */ + V_VT(&src) = VT_BSTR | VT_BYREF; + V_BSTRREF(&src) = NULL; + hr = IXMLDOMDocument_load(doc, src, &b); + EXPECT_HR(hr, E_INVALIDARG); + ok(b == VARIANT_FALSE, "got %d\n", b); + + IXMLDOMDocument_Release(doc); + + DeleteFileA("test.xml"); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -8680,6 +8732,7 @@ START_TEST(domdoc) test_get_nodeTypeString(); test_get_attributes(); test_selection(); + test_load(); test_xsltemplate();

1 0

Nikolay Sivov : msxml3: Merge save() tests to a single function.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 59f64b2896cfed6a0d00553cb1c4db6cf5b1be8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f64b2896cfed6a0d00553cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 15 23:26:55 2011 +0300 msxml3: Merge save() tests to a single function. --- dlls/msxml3/tests/domdoc.c | 103 ++++++++++++++++---------------------------- 1 files changed, 37 insertions(+), 66 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 108d610..6948201 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5629,10 +5629,15 @@ static void test_nodeTypeTests( void ) free_bstrs(); } -static void test_DocumentSaveToDocument(void) +static void test_save(void) { IXMLDOMDocument *doc, *doc2; - IXMLDOMElement *pRoot; + IXMLDOMElement *root; + VARIANT file, vDoc; + BSTR sOrig, sNew; + char buffer[100]; + DWORD read = 0; + HANDLE hfile; HRESULT hr; doc = create_document(&IID_IXMLDOMDocument); @@ -5645,86 +5650,53 @@ static void test_DocumentSaveToDocument(void) return; } - hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)pRoot, NULL); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - VARIANT vDoc; - BSTR sOrig; - BSTR sNew; - - V_VT(&vDoc) = VT_UNKNOWN; - V_UNKNOWN(&vDoc) = (IUnknown*)doc2; - - hr = IXMLDOMDocument_save(doc, vDoc); - ok(hr == S_OK, "ret %08x\n", hr ); + /* save to IXMLDOMDocument */ + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &root); + EXPECT_HR(hr, S_OK); - hr = IXMLDOMDocument_get_xml(doc, &sOrig); - ok(hr == S_OK, "ret %08x\n", hr ); + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); + EXPECT_HR(hr, S_OK); - hr = IXMLDOMDocument_get_xml(doc2, &sNew); - ok(hr == S_OK, "ret %08x\n", hr ); + V_VT(&vDoc) = VT_UNKNOWN; + V_UNKNOWN(&vDoc) = (IUnknown*)doc2; - ok( !lstrcmpW( sOrig, sNew ), "New document is not the same as origial\n"); + hr = IXMLDOMDocument_save(doc, vDoc); + EXPECT_HR(hr, S_OK); - SysFreeString(sOrig); - SysFreeString(sNew); - } - IXMLDOMElement_Release(pRoot); - } + hr = IXMLDOMDocument_get_xml(doc, &sOrig); + EXPECT_HR(hr, S_OK); - IXMLDOMDocument_Release(doc2); - IXMLDOMDocument_Release(doc); -} + hr = IXMLDOMDocument_get_xml(doc2, &sNew); + EXPECT_HR(hr, S_OK); -static void test_DocumentSaveToFile(void) -{ - IXMLDOMDocument *doc; - IXMLDOMElement *pRoot; - HANDLE file; - char buffer[100]; - DWORD read = 0; - HRESULT hr; + ok( !lstrcmpW( sOrig, sNew ), "New document is not the same as origial\n"); - doc = create_document(&IID_IXMLDOMDocument); - if (!doc) return; + SysFreeString(sOrig); + SysFreeString(sNew); - hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)pRoot, NULL); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - VARIANT vFile; + IXMLDOMElement_Release(root); + IXMLDOMDocument_Release(doc2); - V_VT(&vFile) = VT_BSTR; - V_BSTR(&vFile) = _bstr_("test.xml"); + /* save to path */ + V_VT(&file) = VT_BSTR; + V_BSTR(&file) = _bstr_("test.xml"); - hr = IXMLDOMDocument_save(doc, vFile); - ok(hr == S_OK, "ret %08x\n", hr ); - } - } + hr = IXMLDOMDocument_save(doc, file); + EXPECT_HR(hr, S_OK); - IXMLDOMElement_Release(pRoot); IXMLDOMDocument_Release(doc); - file = CreateFile("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); - ok(file != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); - if(file == INVALID_HANDLE_VALUE) - return; + hfile = CreateFile("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(hfile != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); + if(hfile == INVALID_HANDLE_VALUE) return; - ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ReadFile(hfile, buffer, sizeof(buffer), &read, NULL); ok(read != 0, "could not read file\n"); ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); - CloseHandle(file); + CloseHandle(hfile); DeleteFile("test.xml"); + free_bstrs(); } static void test_testTransforms(void) @@ -8678,8 +8650,7 @@ START_TEST(domdoc) test_cloneNode(); test_xmlTypes(); test_nodeTypeTests(); - test_DocumentSaveToDocument(); - test_DocumentSaveToFile(); + test_save(); test_testTransforms(); test_Namespaces(); test_FormattingXML();

1 0

Eric Pouech : winedbg: Display a valid source file when reporting an error about a missing source file .
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 1adbe826012f13cf0208a384adecb9afd41ed22f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1adbe826012f13cf0208a384a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 15 22:26:55 2011 +0100 winedbg: Display a valid source file when reporting an error about a missing source file. --- programs/winedbg/source.c | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/programs/winedbg/source.c b/programs/winedbg/source.c index e341d48..e564815 100644 --- a/programs/winedbg/source.c +++ b/programs/winedbg/source.c @@ -199,31 +199,39 @@ static int source_display(const char* sourcefile, int start, int end) if (dbg_interactiveP) { char zbuf[256]; - /* - * Still couldn't find it. Ask user for path to add. - */ - snprintf(zbuf, sizeof(zbuf), "Enter path to file '%s': ", sourcefile); - input_read_line(zbuf, tmppath, sizeof(tmppath)); - if (tmppath[strlen(tmppath) - 1] != '/') + for (;;) { - strcat(tmppath, "/"); + size_t len; + /* + * Still couldn't find it. Ask user for path to add. + */ + snprintf(zbuf, sizeof(zbuf), "Enter path to file '%s' (<cr> to end search): ", sourcefile); + input_read_line(zbuf, tmppath, sizeof(tmppath)); + if (!(len = strlen(tmppath))) break; + + /* append '/' if missing at the end */ + if (tmppath[len - 1] != '/' && tmppath[len - 1] != '\\') + tmppath[len++] = '/'; + strcpy(&tmppath[len], basename); + if (GetFileAttributesA(tmppath) != INVALID_FILE_ATTRIBUTES) + break; + dbg_printf("Unable to access file '%s'\n", tmppath); } - /* - * Now append the base file name. - */ - strcat(tmppath, basename); } - else tmppath[0] = '\0'; + else + { + dbg_printf("Unable to access file '%s'\n", sourcefile); + tmppath[0] = '\0'; + } - if (GetFileAttributesA(tmppath) == INVALID_FILE_ATTRIBUTES) + if (!tmppath[0]) { /* * OK, I guess the user doesn't really want to see it * after all. */ ol = source_add_file(sourcefile, NULL); - dbg_printf("Unable to open file '%s'\n", tmppath); return FALSE; } }

1 0

Eric Pouech : winedbg: Also get rid of trailing \r in input_read_line.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 77eefaed583ad3f6c53378c63b364d0dcc6912c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77eefaed583ad3f6c53378c63… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 15 22:26:49 2011 +0100 winedbg: Also get rid of trailing \r in input_read_line. --- programs/winedbg/dbg.y | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index c7e2c3b..4f2da25 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -507,8 +507,8 @@ int input_read_line(const char* pfx, char* buf, int size) int len = input_fetch_entire_line(pfx, &line); if (len < 0) return 0; - /* remove trailing \n */ - if (len > 0 && line[len - 1] == '\n') len--; + /* remove trailing \n and \r */ + while (len > 0 && (line[len - 1] == '\n' || line[len - 1] == '\r')) len--; len = min(size - 1, len); memcpy(buf, line, len); buf[len] = '\0';

1 0

Eric Pouech : winegcc: Correctly manage the -V option ( gcc expects to be among the first ones, with -b).
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 34acd88a2ecea59c7adf760d69b6c033baaa20d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34acd88a2ecea59c7adf760d6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 15 21:17:48 2011 +0100 winegcc: Correctly manage the -V option (gcc expects to be among the first ones, with -b). --- tools/winegcc/winegcc.c | 49 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index dcfe778..9849afd 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -185,6 +185,7 @@ struct options enum target_cpu target_cpu; enum target_platform target_platform; const char *target; + const char *version; int shared; int use_msvcrt; int nostdinc; @@ -283,30 +284,49 @@ static char* get_temp_file(const char* prefix, const char* suffix) return tmp; } +static char* build_tool_name(struct options *opts, const char* base, const char* deflt) +{ + char* str; + + if (opts->target && opts->version) + { + str = strmake("%s-%s-%s", opts->target, base, opts->version); + } + else if (opts->target) + { + str = strmake("%s-%s", opts->target, base); + } + else if (opts->version) + { + str = strmake("%s-%s", base, opts->version); + } + else + str = xstrdup(deflt); + return str; +} + static const strarray* get_translator(struct options *opts) { - const char *str = NULL; + char *str = NULL; strarray *ret; switch(opts->processor) { case proc_cpp: - if (opts->target) str = strmake( "%s-cpp", opts->target ); - else str = CPP; + str = build_tool_name(opts, "cpp", CPP); break; case proc_cc: case proc_as: - if (opts->target) str = strmake( "%s-gcc", opts->target ); - else str = CC; + str = build_tool_name(opts, "gcc", CC); break; case proc_cxx: - if (opts->target) str = strmake( "%s-g++", opts->target ); - else str = CXX; + str = build_tool_name(opts, "g++", CXX); break; default: assert(0); } ret = strarray_fromstring( str, " " ); + free(str); if (opts->force_pointer_size) strarray_add( ret, strmake("-m%u", 8 * opts->force_pointer_size )); return ret; @@ -379,6 +399,8 @@ static void compile(struct options* opts, const char* lang) strarray* comp_args = strarray_alloc(); unsigned int j; int gcc_defs = 0; + char* gcc; + char* gpp; strarray_addall(comp_args, get_translator(opts)); switch(opts->processor) @@ -389,12 +411,16 @@ static void compile(struct options* opts, const char* lang) /* mixing different C and C++ compilers isn't supported in configure anyway */ case proc_cc: case proc_cxx: + gcc = build_tool_name(opts, "gcc", CC); + gpp = build_tool_name(opts, "g++", CXX); for ( j = 0; !gcc_defs && j < comp_args->size; j++ ) { const char *cc = comp_args->base[j]; - gcc_defs = strendswith(cc, "gcc") || strendswith(cc, "g++"); + gcc_defs = strendswith(cc, gcc) || strendswith(cc, gpp); } + free(gcc); + free(gpp); break; } @@ -1114,7 +1140,7 @@ static int is_linker_arg(const char* arg) */ static int is_target_arg(const char* arg) { - return arg[1] == 'b' || arg[2] == 'V'; + return arg[1] == 'b' || arg[1] == 'V'; } @@ -1291,7 +1317,7 @@ int main(int argc, char **argv) raw_linker_arg = 0; if (argv[i][1] == 'c' || argv[i][1] == 'L') raw_compiler_arg = 0; - if (argv[i][1] == 'o' || argv[i][1] == 'b') + if (argv[i][1] == 'o' || argv[i][1] == 'b' || argv[i][1] == 'V') raw_compiler_arg = raw_linker_arg = 0; /* do a bit of semantic analysis */ @@ -1314,6 +1340,9 @@ int main(int argc, char **argv) case 'b': parse_target_option( &opts, option_arg ); break; + case 'V': + opts.version = xstrdup( option_arg ); + break; case 'c': /* compile or assemble */ if (argv[i][2] == 0) opts.compile_only = 1; /* fall through */

1 0

Eric Pouech : winedbg: Added support for printing WCHAR in print_typed_basic.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: acac3cced4e4cb5621aa25e8802990b0fe34cd3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=acac3cced4e4cb5621aa25e88… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 15 21:18:21 2011 +0100 winedbg: Added support for printing WCHAR in print_typed_basic. --- programs/winedbg/memory.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 1c1567b..5a54ec1 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -29,6 +29,7 @@ #include "debugger.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(winedbg); @@ -393,18 +394,23 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) dbg_printf("%Lf", val_real); break; case btChar: + case btWChar: + /* sometimes WCHAR is defined as btChar with size = 2, so discrimate + * Ansi/Unicode based on size, not on basetype + */ if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return; - /* FIXME: should do the same for a Unicode character (size == 2) */ print_char: - if (size == 1 && (val_int < 0x20 || val_int > 0x80)) - dbg_printf("%d", (int)val_int); - else if (size == 2) + if (size == 1 && isprint((char)val_int)) + dbg_printf("'%c'", (char)val_int); + else if (size == 2 && isprintW((WCHAR)val_int)) { WCHAR wch = (WCHAR)val_int; + dbg_printf("'"); dbg_outputW(&wch, 1); + dbg_printf("'"); } else - dbg_printf("'%c'", (char)val_int); + dbg_printf("%d", (int)val_int); break; case btBool: if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return;

1 0

Andrew Eikum : include: Add defines for KSDATAFORMAT_SUBTYPE_ALAW and _MULAW.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: b14e4e584102df82e52af19bb2fc16f43db3fe1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14e4e584102df82e52af19bb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 15 15:06:47 2011 -0500 include: Add defines for KSDATAFORMAT_SUBTYPE_ALAW and _MULAW. --- include/ksmedia.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/ksmedia.h b/include/ksmedia.h index da69b31..4027596 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -25,6 +25,8 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); #define KSAUDIO_SPEAKER_DIRECTOUT 0 #define KSAUDIO_SPEAKER_MONO SPEAKER_FRONT_CENTER

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DVolumeTextureImpl.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: f77c0e36a43e23028548ed1021ec0c1bcf19c0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f77c0e36a43e23028548ed102… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 18:19:34 2011 +0100 wined3d: Get rid of IWineD3DVolumeTextureImpl. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/volume.c | 2 +- dlls/wined3d/volumetexture.c | 26 ++++++++++++-------------- dlls/wined3d/wined3d_private.h | 20 ++++++-------------- 4 files changed, 21 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b009b83..735cbca 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1139,8 +1139,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, enum wined3d_format_id Format, WINED3DPOOL Pool, void *parent, const struct wined3d_parent_ops *parent_ops, IWineD3DBaseTexture **ppVolumeTexture) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DVolumeTextureImpl *object; + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DBaseTextureImpl *object; HRESULT hr; TRACE("(%p) : W(%u) H(%u) D(%u), Lvl(%u) Usage(%#x), Fmt(%u,%s), Pool(%s)\n", This, Width, Height, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3f7090c..a0baef3 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -85,7 +85,7 @@ void volume_add_dirty_box(struct IWineD3DVolumeImpl *volume, const WINED3DBOX *d } } -void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DVolumeTextureImpl *container) +void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DBaseTextureImpl *container) { TRACE("volume %p, container %p.\n", volume, container); diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 22f6c27..07a83c3 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -1,6 +1,4 @@ /* - * IWineD3DVolumeTexture implementation - * * Copyright 2002-2005 Jason Edmeades * Copyright 2002-2005 Raphael Junqueira * Copyright 2005 Oliver Stieber @@ -113,7 +111,7 @@ static const struct wined3d_resource_ops volumetexture_resource_ops = volumetexture_unload, }; -static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) +static void volumetexture_cleanup(IWineD3DBaseTextureImpl *This) { unsigned int i; @@ -141,7 +139,7 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) static HRESULT WINAPI IWineD3DVolumeTextureImpl_QueryInterface(IWineD3DBaseTexture *iface, REFIID riid, LPVOID *ppobj) { - IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IWineD3DBase) @@ -158,7 +156,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_QueryInterface(IWineD3DBaseTextu static ULONG WINAPI IWineD3DVolumeTextureImpl_AddRef(IWineD3DBaseTexture *iface) { - IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; TRACE("(%p) : AddRef increasing from %d\n", This, This->resource.ref); return InterlockedIncrement(&This->resource.ref); } @@ -166,7 +164,7 @@ static ULONG WINAPI IWineD3DVolumeTextureImpl_AddRef(IWineD3DBaseTexture *iface) /* Do not call while under the GL lock. */ static ULONG WINAPI IWineD3DVolumeTextureImpl_Release(IWineD3DBaseTexture *iface) { - IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; + IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; ULONG ref; TRACE("(%p) : Releasing from %d\n", This, This->resource.ref); ref = InterlockedDecrement(&This->resource.ref); @@ -182,28 +180,28 @@ static ULONG WINAPI IWineD3DVolumeTextureImpl_Release(IWineD3DBaseTexture *iface static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetPrivateData(IWineD3DBaseTexture *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data(&((IWineD3DVolumeTextureImpl *)iface)->resource, riid, data, data_size, flags); + return resource_set_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, riid, data, data_size, flags); } static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetPrivateData(IWineD3DBaseTexture *iface, REFGUID guid, void *data, DWORD *data_size) { - return resource_get_private_data(&((IWineD3DVolumeTextureImpl *)iface)->resource, guid, data, data_size); + return resource_get_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, guid, data, data_size); } static HRESULT WINAPI IWineD3DVolumeTextureImpl_FreePrivateData(IWineD3DBaseTexture *iface, REFGUID refguid) { - return resource_free_private_data(&((IWineD3DVolumeTextureImpl *)iface)->resource, refguid); + return resource_free_private_data(&((IWineD3DBaseTextureImpl *)iface)->resource, refguid); } static DWORD WINAPI IWineD3DVolumeTextureImpl_SetPriority(IWineD3DBaseTexture *iface, DWORD priority) { - return resource_set_priority(&((IWineD3DVolumeTextureImpl *)iface)->resource, priority); + return resource_set_priority(&((IWineD3DBaseTextureImpl *)iface)->resource, priority); } static DWORD WINAPI IWineD3DVolumeTextureImpl_GetPriority(IWineD3DBaseTexture *iface) { - return resource_get_priority(&((IWineD3DVolumeTextureImpl *)iface)->resource); + return resource_get_priority(&((IWineD3DBaseTextureImpl *)iface)->resource); } static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DBaseTexture *iface) @@ -213,14 +211,14 @@ static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DBaseTexture *iface) static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeTextureImpl_GetType(IWineD3DBaseTexture *iface) { - return resource_get_type(&((IWineD3DVolumeTextureImpl *)iface)->resource); + return resource_get_type(&((IWineD3DBaseTextureImpl *)iface)->resource); } static void * WINAPI IWineD3DVolumeTextureImpl_GetParent(IWineD3DBaseTexture *iface) { TRACE("iface %p\n", iface); - return ((IWineD3DVolumeTextureImpl *)iface)->resource.parent; + return ((IWineD3DBaseTextureImpl *)iface)->resource.parent; } static DWORD WINAPI IWineD3DVolumeTextureImpl_SetLOD(IWineD3DBaseTexture *iface, DWORD LODNew) @@ -318,7 +316,7 @@ static const IWineD3DBaseTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_AddDirtyRegion, }; -HRESULT volumetexture_init(IWineD3DVolumeTextureImpl *texture, UINT width, UINT height, +HRESULT volumetexture_init(IWineD3DBaseTextureImpl *texture, UINT width, UINT height, UINT depth, UINT levels, IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f45e9e9..8726e2d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1965,6 +1965,10 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +HRESULT volumetexture_init(IWineD3DBaseTextureImpl *texture, UINT width, UINT height, + UINT depth, UINT levels, IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, + WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + /***************************************************************************** * IWineD3DCubeTexture implementation structure (extends IWineD3DBaseTextureImpl) */ @@ -1986,7 +1990,7 @@ typedef struct IWineD3DVolumeImpl const IWineD3DVolumeVtbl *lpVtbl; struct wined3d_resource resource; - struct IWineD3DVolumeTextureImpl *container; + struct IWineD3DBaseTextureImpl *container; BOOL lockable; BOOL locked; WINED3DBOX lockedBox; @@ -2004,19 +2008,7 @@ HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT UINT height, UINT depth, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; void volume_load(IWineD3DVolumeImpl *volume, UINT level, BOOL srgb_mode) DECLSPEC_HIDDEN; -void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DVolumeTextureImpl *container) DECLSPEC_HIDDEN; - -typedef struct IWineD3DVolumeTextureImpl -{ - /* IUnknown & WineD3DResource/WineD3DBaseTexture Information */ - const IWineD3DBaseTextureVtbl *lpVtbl; - struct wined3d_resource resource; - IWineD3DBaseTextureClass baseTexture; -} IWineD3DVolumeTextureImpl; - -HRESULT volumetexture_init(IWineD3DVolumeTextureImpl *texture, UINT width, UINT height, - UINT depth, UINT levels, IWineD3DDeviceImpl *device, DWORD usage, enum wined3d_format_id format_id, - WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DBaseTextureImpl *container) DECLSPEC_HIDDEN; /***************************************************************************** * Structure for DIB Surfaces (GetDC and GDI surfaces)

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DVolumeTexture.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: ed0037854a20beeef2ad4deb47d4a5537f4715b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0037854a20beeef2ad4deb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 18:19:33 2011 +0100 wined3d: Get rid of IWineD3DVolumeTexture. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/texture.c | 11 +++--- dlls/d3d8/d3d8_private.h | 9 +---- dlls/d3d8/volumetexture.c | 36 +++++++++--------- dlls/d3d9/d3d9_private.h | 9 +---- dlls/d3d9/volumetexture.c | 68 +++++++++++------------------------- dlls/wined3d/device.c | 4 +- dlls/wined3d/volumetexture.c | 56 ++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 5 +-- include/wine/wined3d.idl | 11 +----- 10 files changed, 80 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed0037854a20beeef2ad4…

1 0

Henri Verbeet : wined3d: Use the correct resource_ops in cubetexture_unload ().
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 6110fe3a823ac4f0e67746cd1113485d12604777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6110fe3a823ac4f0e67746cd1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 18:19:32 2011 +0100 wined3d: Use the correct resource_ops in cubetexture_unload(). --- dlls/wined3d/cubetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 4171d55..9a27f5b 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -151,7 +151,7 @@ static void cubetexture_unload(struct wined3d_resource *resource) struct wined3d_resource *sub_resource = texture->baseTexture.sub_resources[i]; IWineD3DSurfaceImpl *surface = surface_from_resource(sub_resource); - resource->resource_ops->resource_unload(sub_resource); + sub_resource->resource_ops->resource_unload(sub_resource); surface_set_texture_name(surface, 0, TRUE); surface_set_texture_name(surface, 0, FALSE); }

1 0

Henri Verbeet : d3d8: Fix IDirect3DCubeTexture8Impl_GetLOD().
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 235dbbb5d7c23b1709244a03194096fe2d5f8056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=235dbbb5d7c23b1709244a031… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 18:19:31 2011 +0100 d3d8: Fix IDirect3DCubeTexture8Impl_GetLOD(). --- dlls/d3d8/cubetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 7b5305c..0c7295a 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -229,7 +229,7 @@ static DWORD WINAPI IDirect3DCubeTexture8Impl_GetLOD(IDirect3DCubeTexture8 *ifac TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - lod = IWineD3DCubeTexture_GetLOD((LPDIRECT3DBASETEXTURE8) This); + lod = IWineD3DCubeTexture_GetLOD(This->wineD3DCubeTexture); wined3d_mutex_unlock(); return lod;

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the text functions.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 1fc5603cc958a9b112b6bca23f0c1fe472b4fd2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc5603cc958a9b112b6bca23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 15 20:42:49 2011 +0100 gdi32: Add null driver entry points for the text functions. --- dlls/gdi32/driver.c | 38 ++++++++++++++++-- dlls/gdi32/font.c | 95 +++++++++++++++++++++++----------------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 81 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fc5603cc958a9b112b6b…

1 0

Alexandre Julliard : gdi32: Don't allocate a GDI handle for saved DCs.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 7b970a165778833f8d7cd4ffd877b9b14d2c4938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b970a165778833f8d7cd4ffd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 16 11:41:49 2011 +0100 gdi32: Don't allocate a GDI handle for saved DCs. --- dlls/gdi32/dc.c | 76 ++++++++++++++++----------------------------- dlls/gdi32/gdi_private.h | 4 +- 2 files changed, 29 insertions(+), 51 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index b0a7151..d70d2c2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -160,18 +160,27 @@ DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) /*********************************************************************** - * free_dc_ptr + * free_dc_state */ -BOOL free_dc_ptr( DC *dc ) +static void free_dc_state( DC *dc ) { - assert( dc->refcount == 1 ); - if (free_gdi_handle( dc->hSelf ) != dc) return FALSE; /* shouldn't happen */ if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); if (dc->hMetaClipRgn) DeleteObject( dc->hMetaClipRgn ); if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); PATH_DestroyGdiPath( &dc->path ); - return HeapFree( GetProcessHeap(), 0, dc ); + HeapFree( GetProcessHeap(), 0, dc ); +} + + +/*********************************************************************** + * free_dc_ptr + */ +void free_dc_ptr( DC *dc ) +{ + assert( dc->refcount == 1 ); + free_gdi_handle( dc->hSelf ); + free_dc_state( dc ); } @@ -373,7 +382,6 @@ void DC_UpdateXforms( DC *dc ) INT CDECL nulldrv_SaveDC( PHYSDEV dev ) { DC *newdc, *dc = get_nulldrv_dc( dev ); - INT ret; if (!(newdc = HeapAlloc( GetProcessHeap(), 0, sizeof(*newdc )))) return 0; newdc->flags = dc->flags | DC_SAVED; @@ -422,22 +430,8 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->BoundsRect = dc->BoundsRect; newdc->gdiFont = dc->gdiFont; - newdc->thread = GetCurrentThreadId(); - newdc->refcount = 1; - newdc->saveLevel = 0; - newdc->saved_dc = 0; - PATH_InitGdiPath( &newdc->path ); - newdc->pAbortProc = NULL; - newdc->hookProc = NULL; - - if (!(newdc->hSelf = alloc_gdi_handle( &newdc->header, dc->header.type, &dc_funcs ))) - { - HeapFree( GetProcessHeap(), 0, newdc ); - return 0; - } - /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */ newdc->hVisRgn = 0; @@ -454,20 +448,19 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->hMetaRgn = CreateRectRgn( 0, 0, 0, 0 ); CombineRgn( newdc->hMetaRgn, dc->hMetaRgn, 0, RGN_COPY ); } + /* don't bother recomputing hMetaClipRgn, we'll do that in SetDCState */ if (!PATH_AssignGdiPath( &newdc->path, &dc->path )) { release_dc_ptr( dc ); - free_dc_ptr( newdc ); + free_dc_state( newdc ); return 0; } newdc->saved_dc = dc->saved_dc; - dc->saved_dc = newdc->hSelf; - ret = ++dc->saveLevel; - release_dc_ptr( newdc ); - return ret; + dc->saved_dc = newdc; + return ++dc->saveLevel; } @@ -476,8 +469,7 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) */ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) { - DC *dcs, *dc = get_nulldrv_dc( dev ); - HDC hdcs, first_dcs; + DC *dcs, *first_dcs, *dc = get_nulldrv_dc( dev ); INT save_level; /* find the state level to restore */ @@ -485,21 +477,12 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) if (abs(level) > dc->saveLevel || level == 0) return FALSE; if (level < 0) level = dc->saveLevel + level + 1; first_dcs = dc->saved_dc; - for (hdcs = first_dcs, save_level = dc->saveLevel; save_level > level; save_level--) - { - if (!(dcs = get_dc_ptr( hdcs ))) return FALSE; - hdcs = dcs->saved_dc; - release_dc_ptr( dcs ); - } + for (dcs = first_dcs, save_level = dc->saveLevel; save_level > level; save_level--) + dcs = dcs->saved_dc; /* restore the state */ - if (!(dcs = get_dc_ptr( hdcs ))) return FALSE; - if (!PATH_AssignGdiPath( &dc->path, &dcs->path )) - { - release_dc_ptr( dcs ); - return FALSE; - } + if (!PATH_AssignGdiPath( &dc->path, &dcs->path )) return FALSE; dc->flags = dcs->flags & ~DC_SAVED; dc->layout = dcs->layout; @@ -577,16 +560,13 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dcs->saved_dc = 0; dc->saveLevel = save_level - 1; - release_dc_ptr( dcs ); - /* now destroy all the saved DCs */ while (first_dcs) { - if (!(dcs = get_dc_ptr( first_dcs ))) break; - hdcs = dcs->saved_dc; - free_dc_ptr( dcs ); - first_dcs = hdcs; + DC *next = first_dcs->saved_dc; + free_dc_state( first_dcs ); + first_dcs = next; } return TRUE; } @@ -841,12 +821,10 @@ BOOL WINAPI DeleteDC( HDC hdc ) while (dc->saveLevel) { - DC * dcs; - HDC hdcs = dc->saved_dc; - if (!(dcs = get_dc_ptr( hdcs ))) break; + DC *dcs = dc->saved_dc; dc->saved_dc = dcs->saved_dc; dc->saveLevel--; - free_dc_ptr( dcs ); + free_dc_state( dcs ); } if (!(dc->flags & DC_SAVED)) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 996a435..c9f653e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -253,7 +253,7 @@ typedef struct tagDC LONG refcount; /* thread refcount */ LONG dirty; /* dirty flag */ INT saveLevel; - HDC saved_dc; + struct tagDC *saved_dc; DWORD_PTR dwHookData; DCHOOKPROC hookProc; /* DC hook */ @@ -376,7 +376,7 @@ extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN; /* dc.c */ extern DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) DECLSPEC_HIDDEN; -extern BOOL free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; +extern void free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern DC *get_dc_ptr( HDC hdc ) DECLSPEC_HIDDEN; extern void release_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern void update_dc( DC *dc ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the DC state functions.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: e6d153bbf6e767d2ecea0289827188a19929acbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d153bbf6e767d2ecea02898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 15 20:17:58 2011 +0100 gdi32: Add null driver entry points for the DC state functions. --- dlls/gdi32/dc.c | 116 +++++++++++++++++----------------------------- dlls/gdi32/driver.c | 11 +++- dlls/gdi32/enhmfdrv/dc.c | 9 ++-- dlls/gdi32/gdi_private.h | 4 +- 4 files changed, 58 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6d153bbf6e767d2ecea0…

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the bitmap functions.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 122b5bf7841c6717894f22c951c5285feda7779b URL: http://source.winehq.org/git/wine.git/?a=commit;h=122b5bf7841c6717894f22c95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 15 19:51:06 2011 +0100 gdi32: Add null driver entry points for the bitmap functions. --- dlls/gdi32/bitmap.c | 127 ++++++++++++++++++++++++++++------------------ dlls/gdi32/brush.c | 2 +- dlls/gdi32/dib.c | 40 +++------------ dlls/gdi32/driver.c | 22 ++++++-- dlls/gdi32/gdi_private.h | 6 ++- 5 files changed, 107 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=122b5bf7841c6717894f2…

1 0

Jacek Caban : mshtml: Notify parser about script evaluation.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: dc96c688d397eb4ef1392ee6a98f3eb6b176dc56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc96c688d397eb4ef1392ee6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 13:45:46 2011 +0100 mshtml: Notify parser about script evaluation. --- dlls/mshtml/mutation.c | 22 ++++++++++++++++- dlls/mshtml/nsiface.idl | 49 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/exectest.html | 4 +- 3 files changed, 70 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 94217e9..2117e49 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -310,9 +310,10 @@ static nsresult run_end_load(HTMLDocumentNode *This, nsISupports *arg1, nsISuppo return NS_OK; } -static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_iface, nsISupports *arg) +static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_iface, nsISupports *parser_iface) { nsIDOMHTMLScriptElement *nsscript; + nsIParser *nsparser = NULL; nsresult nsres; TRACE("(%p)->(%p)\n", doc, script_iface); @@ -323,7 +324,24 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa return nsres; } + if(parser_iface) { + nsres = nsISupports_QueryInterface(parser_iface, &IID_nsIParser, (void**)&nsparser); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIParser iface: %08x\n", nsres); + nsparser = NULL; + } + } + + if(nsparser) + nsIParser_BeginEvaluatingParserInsertedScript(nsparser); + doc_insert_script(doc->basedoc.window, nsscript); + + if(nsparser) { + nsIParser_EndEvaluatingParserInsertedScript(nsparser); + nsIParser_Release(nsparser); + } + nsIDOMHTMLScriptElement_Release(nsscript); return NS_OK; } @@ -649,7 +667,7 @@ static nsresult NSAPI nsDocumentObserver_DoneAddingChildren(nsIDocumentObserver if(NS_SUCCEEDED(nsres)) { TRACE("script node\n"); - add_script_runner(This, run_insert_script, (nsISupports*)nsscript, NULL); + add_script_runner(This, run_insert_script, (nsISupports*)nsscript, (nsISupports*)aParser); nsIDOMHTMLScriptElement_Release(nsscript); } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 1df22b3..b6367b4 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -150,7 +150,9 @@ typedef nsISupports nsIControllers; typedef nsISupports nsIDOMValidityState; typedef nsISupports nsIPluginInstanceOwner; typedef nsISupports nsIPluginStreamListener; -typedef nsISupports nsIParser; +typedef nsISupports nsIContentSink; +typedef nsISupports nsIParserFilter; +typedef nsISupports nsIDTD; [ object, @@ -2960,6 +2962,51 @@ interface nsIMutationObserver : nsISupports [ object, + uuid(cbc0cbd8-bbb7-46d6-a551-378a6953a714), + local +] +interface nsIParser : nsISupports +{ + typedef int nsDTDMode; + typedef int eParserCommands; + + void SetContentSink(nsIContentSink *aSink); + nsIContentSink *GetContentSink(); + void GetCommand(nsACString *aCommand); + void SetCommand2(const char *aCommand); + void SetCommand(eParserCommands aParserCommand); + void SetDocumentCharset(const nsACString *aCharset, PRInt32 aSource); + void GetDocumentCharset(nsACString *oCharset, PRInt32 *oSource); + void SetParserFilter(nsIParserFilter *aFilter); + nsresult GetChannel(nsIChannel **aChannel); + nsresult GetDTD(nsIDTD **aDTD); + nsresult GetStreamListener(nsIStreamListener **aListener); + nsresult ContinueInterruptedParsing(); + void BlockParser(); + void UnblockParser(); + PRBool IsParserEnabled(); + PRBool IsComplete(); + nsresult Parse(nsIURI *aURL, nsIRequestObserver *aListener, void *aKey, nsDTDMode aMode); + nsresult Parse2(const nsAString *aSourceBuffer, void *aKey, const nsACString *aMimeType, PRBool aLastCall, nsDTDMode aMode); + void *GetRootContextKey(); + nsresult Terminate(); + nsresult ParseFragment(const nsAString *aSourceBuffer, void *aKey, void /*nsTArray<nsString>*/ *aTagStack, + PRBool aXMLMode, const nsACString *aContentType, nsDTDMode aMode); + nsresult ParseFragment2(const nsAString *aSourceBuffer, nsIContent *aTargetNode, nsIAtom *aContextLocalName, + PRInt32 aContextNamespace, PRBool aQuirks); + nsresult BuildModel(); + nsresult CancelParsingEvents(); + void Reset(); + PRBool CanInterrupt(); + PRBool IsInsertionPointDefined(); + void BeginEvaluatingParserInsertedScript(); + void EndEvaluatingParserInsertedScript(); + void MarkAsNotScriptCreated(); + PRBool IsScriptCreated(); +} + +[ + object, uuid(3d005225-210f-4b07-b1d9-96020574c437), local ] diff --git a/dlls/mshtml/tests/exectest.html b/dlls/mshtml/tests/exectest.html index 65d3701..1d84917 100644 --- a/dlls/mshtml/tests/exectest.html +++ b/dlls/mshtml/tests/exectest.html @@ -15,12 +15,12 @@ ok(len === 3, "init length = " + len); document.write("<script>" + "var len = document.getElementsByTagName('div').length;" - + "external.todo_wine_ok(len === 3, 'unexpected length ' + len);" + + "ok(len === 3, 'unexpected length ' + len);" + "executed = true;" + "<" + "/script>"); len = document.getElementsByTagName('script').length; -external.todo_wine_ok(len === 2, "script col length = " + len); +ok(len === 2, "script col length = " + len); ok(executed, "writen script not executed"); external.reportSuccess();

1 0

Jacek Caban : mshtml: Wine Gecko 1.2.0 release.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 699e41cdd8bcda1276c98cb6d9dd0503e9465099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=699e41cdd8bcda1276c98cb6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 13:45:29 2011 +0100 mshtml: Wine Gecko 1.2.0 release. --- dlls/appwiz.cpl/addons.c | 8 ++-- dlls/mshtml/htmldoc.c | 4 +- dlls/mshtml/mshtml_private.h | 5 +- dlls/mshtml/mutation.c | 75 +++++++++++++++++++---------- dlls/mshtml/nsembed.c | 9 ++- dlls/mshtml/nsiface.idl | 110 +++++++++++++++++++++++++++++++++-------- dlls/mshtml/nsio.c | 22 ++++++++- 7 files changed, 174 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=699e41cdd8bcda1276c98…

1 0

Jörg Höhle : winealsa: Favour HeapAlloc() over malloc().
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: e52f5773e11af076d07f8573fe20fd48cbbf9b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52f5773e11af076d07f8573f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 9 02:23:10 2011 +0100 winealsa: Favour HeapAlloc() over malloc(). --- dlls/winealsa.drv/wavein.c | 22 +++++++++++----------- dlls/winealsa.drv/waveout.c | 32 +++++++++++++------------------- 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 2075805..32442fa 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -369,7 +369,6 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_ALLOCATED; } - wwi->pcm = 0; flags = SND_PCM_NONBLOCK; if ( (err=snd_pcm_open(&pcm, wwi->pcmname, SND_PCM_STREAM_CAPTURE, flags)) < 0 ) @@ -393,7 +392,11 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) hw_params = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_hw_params_sizeof() ); sw_params = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_sw_params_sizeof() ); - + if (!hw_params || !sw_params) + { + ret = MMSYSERR_NOMEM; + goto error; + } snd_pcm_hw_params_any(pcm, hw_params); #define EXIT_ON_ERROR(f,e,txt) do \ @@ -488,14 +491,9 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) ALSA_TraceParameters(hw_params, sw_params, FALSE); /* now, we can save all required data for later use... */ - if ( wwi->hw_params ) - snd_pcm_hw_params_free(wwi->hw_params); - snd_pcm_hw_params_malloc(&(wwi->hw_params)); - snd_pcm_hw_params_copy(wwi->hw_params, hw_params); wwi->dwBufferSize = snd_pcm_frames_to_bytes(pcm, buffer_size); wwi->lpQueuePtr = wwi->lpPlayPtr = wwi->lpLoopPtr = NULL; - wwi->pcm = pcm; ALSA_InitRingMessage(&wwi->msgRing); @@ -519,8 +517,10 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) CloseHandle(wwi->hStartUpEvent); wwi->hStartUpEvent = NULL; - HeapFree( GetProcessHeap(), 0, hw_params ); HeapFree( GetProcessHeap(), 0, sw_params ); + wwi->hw_params = hw_params; + wwi->pcm = pcm; + widNotifyClient(wwi, WIM_OPEN, 0L, 0L); return MMSYSERR_NOERROR; @@ -548,12 +548,12 @@ static DWORD widClose(WORD wDevID) return MMSYSERR_BADDEVICEID; } - if (WInDev[wDevID].pcm == NULL) { + wwi = &WInDev[wDevID]; + if (wwi->pcm == NULL) { WARN("Requested to close already closed device %d!\n", wDevID); return MMSYSERR_BADDEVICEID; } - wwi = &WInDev[wDevID]; if (wwi->lpQueuePtr) { WARN("buffers still playing !\n"); return WAVERR_STILLPLAYING; @@ -563,7 +563,7 @@ static DWORD widClose(WORD wDevID) } ALSA_DestroyRingMessage(&wwi->msgRing); - snd_pcm_hw_params_free(wwi->hw_params); + HeapFree( GetProcessHeap(), 0, wwi->hw_params ); wwi->hw_params = NULL; snd_pcm_close(wwi->pcm); diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 6c50f89..ac3db1a 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -576,7 +576,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) WINE_WAVEDEV* wwo; snd_pcm_t * pcm = NULL; snd_hctl_t * hctl = NULL; - snd_pcm_hw_params_t * hw_params = NULL; + snd_pcm_hw_params_t * hw_params; snd_pcm_sw_params_t * sw_params; snd_pcm_access_t access; snd_pcm_format_t format = -1; @@ -680,8 +680,8 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) } while(0) sw_params = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_sw_params_sizeof() ); - snd_pcm_hw_params_malloc(&hw_params); - if (! hw_params) + hw_params = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_hw_params_sizeof() ); + if (!hw_params || !sw_params) { retcode = MMSYSERR_NOMEM; goto errexit; @@ -797,11 +797,9 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwo->format.Format.nBlockAlign); HeapFree( GetProcessHeap(), 0, sw_params ); - wwo->pcm = pcm; - wwo->hctl = hctl; - if ( wwo->hw_params ) - snd_pcm_hw_params_free(wwo->hw_params); wwo->hw_params = hw_params; + wwo->hctl = hctl; + wwo->pcm = pcm; wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); return MMSYSERR_NOERROR; @@ -816,9 +814,7 @@ errexit: snd_hctl_close(hctl); } - if ( hw_params ) - snd_pcm_hw_params_free(hw_params); - + HeapFree( GetProcessHeap(), 0, hw_params ); HeapFree( GetProcessHeap(), 0, sw_params ); if (wwo->msgRing.ring_buffer_size > 0) ALSA_DestroyRingMessage(&wwo->msgRing); @@ -841,12 +837,12 @@ static DWORD wodClose(WORD wDevID) return MMSYSERR_BADDEVICEID; } - if (WOutDev[wDevID].pcm == NULL) { + wwo = &WOutDev[wDevID]; + if (wwo->pcm == NULL) { WARN("Requested to close already closed device %d!\n", wDevID); return MMSYSERR_BADDEVICEID; } - wwo = &WOutDev[wDevID]; if (wwo->lpQueuePtr) { WARN("buffers still playing !\n"); return WAVERR_STILLPLAYING; @@ -856,20 +852,18 @@ static DWORD wodClose(WORD wDevID) } ALSA_DestroyRingMessage(&wwo->msgRing); - if (wwo->hw_params) - snd_pcm_hw_params_free(wwo->hw_params); + HeapFree( GetProcessHeap(), 0, wwo->hw_params ); wwo->hw_params = NULL; - if (wwo->pcm) - snd_pcm_close(wwo->pcm); - wwo->pcm = NULL; - if (wwo->hctl) { snd_hctl_free(wwo->hctl); snd_hctl_close(wwo->hctl); + wwo->hctl = NULL; } - wwo->hctl = NULL; + + snd_pcm_close(wwo->pcm); + wwo->pcm = NULL; wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); }

1 0

Jörg Höhle : winealsa: Ignore failure to notify winmm wave clients.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 8df872535ec4757c318adbcff9a001b6522c214e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df872535ec4757c318adbcff… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 9 02:45:31 2011 +0100 winealsa: Ignore failure to notify winmm wave clients. --- dlls/winealsa.drv/wavein.c | 15 ++++++--------- dlls/winealsa.drv/waveout.c | 17 +++++++---------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index f92f18d..2075805 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -68,7 +68,7 @@ DWORD ALSA_WidNumDevs; /************************************************************************** * widNotifyClient [internal] */ -static DWORD widNotifyClient(WINE_WAVEDEV* wwi, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +static void widNotifyClient(WINE_WAVEDEV* wwi, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { TRACE("wMsg = 0x%04x dwParm1 = %04lX dwParam2 = %04lX\n", wMsg, dwParam1, dwParam2); @@ -80,14 +80,11 @@ static DWORD widNotifyClient(WINE_WAVEDEV* wwi, WORD wMsg, DWORD_PTR dwParam1, D !DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, (HDRVR)wwi->waveDesc.hWave, wMsg, wwi->waveDesc.dwInstance, dwParam1, dwParam2)) { WARN("can't notify client !\n"); - return MMSYSERR_ERROR; } break; default: FIXME("Unknown callback message %u\n", wMsg); - return MMSYSERR_INVALPARAM; } - return MMSYSERR_NOERROR; } /************************************************************************** @@ -524,7 +521,8 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) HeapFree( GetProcessHeap(), 0, hw_params ); HeapFree( GetProcessHeap(), 0, sw_params ); - return widNotifyClient(wwi, WIM_OPEN, 0L, 0L); + widNotifyClient(wwi, WIM_OPEN, 0L, 0L); + return MMSYSERR_NOERROR; error: snd_pcm_close(pcm); @@ -541,7 +539,6 @@ error: */ static DWORD widClose(WORD wDevID) { - DWORD ret = MMSYSERR_NOERROR; WINE_WAVEDEV* wwi; TRACE("(%u);\n", wDevID); @@ -559,7 +556,7 @@ static DWORD widClose(WORD wDevID) wwi = &WInDev[wDevID]; if (wwi->lpQueuePtr) { WARN("buffers still playing !\n"); - ret = WAVERR_STILLPLAYING; + return WAVERR_STILLPLAYING; } else { if (wwi->hThread) { ALSA_AddRingMessage(&wwi->msgRing, WINE_WM_CLOSING, 0, TRUE); @@ -572,10 +569,10 @@ static DWORD widClose(WORD wDevID) snd_pcm_close(wwi->pcm); wwi->pcm = NULL; - ret = widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); + widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); } - return ret; + return MMSYSERR_NOERROR; } /************************************************************************** diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 6dcd80f..6c50f89 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -69,7 +69,7 @@ DWORD ALSA_WodNumDevs; /************************************************************************** * wodNotifyClient [internal] */ -static DWORD wodNotifyClient(WINE_WAVEDEV* wwo, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +static void wodNotifyClient(WINE_WAVEDEV* wwo, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { TRACE("wMsg = 0x%04x dwParm1 = %lx dwParam2 = %lx\n", wMsg, dwParam1, dwParam2); @@ -81,14 +81,11 @@ static DWORD wodNotifyClient(WINE_WAVEDEV* wwo, WORD wMsg, DWORD_PTR dwParam1, D !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2)) { WARN("can't notify client !\n"); - return MMSYSERR_ERROR; } break; default: FIXME("Unknown callback message %u\n", wMsg); - return MMSYSERR_INVALPARAM; } - return MMSYSERR_NOERROR; } /************************************************************************** @@ -364,7 +361,7 @@ static void wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset) ((LPWAVEHDR)param)->dwFlags &= ~WHDR_INQUEUE; ((LPWAVEHDR)param)->dwFlags |= WHDR_DONE; - wodNotifyClient(wwo, WOM_DONE, param, 0); + wodNotifyClient(wwo, WOM_DONE, param, 0); } ALSA_ResetRingMessage(&wwo->msgRing); LeaveCriticalSection(&wwo->msgRing.msg_crst); @@ -806,7 +803,8 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) snd_pcm_hw_params_free(wwo->hw_params); wwo->hw_params = hw_params; - return wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); + wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); + return MMSYSERR_NOERROR; errexit: if (pcm) @@ -834,7 +832,6 @@ errexit: */ static DWORD wodClose(WORD wDevID) { - DWORD ret = MMSYSERR_NOERROR; WINE_WAVEDEV* wwo; TRACE("(%u);\n", wDevID); @@ -852,7 +849,7 @@ static DWORD wodClose(WORD wDevID) wwo = &WOutDev[wDevID]; if (wwo->lpQueuePtr) { WARN("buffers still playing !\n"); - ret = WAVERR_STILLPLAYING; + return WAVERR_STILLPLAYING; } else { if (wwo->hThread) { ALSA_AddRingMessage(&wwo->msgRing, WINE_WM_CLOSING, 0, TRUE); @@ -874,10 +871,10 @@ static DWORD wodClose(WORD wDevID) } wwo->hctl = NULL; - ret = wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); + wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); } - return ret; + return MMSYSERR_NOERROR; }

1 0

Jörg Höhle : winealsa: Open must fail when recorder thread creation fails.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 04e3bda4104d7151cf0c1e676e7ffe39c3430f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e3bda4104d7151cf0c1e676… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 6 23:03:52 2011 +0100 winealsa: Open must fail when recorder thread creation fails. --- dlls/winealsa.drv/wavein.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index daf73be..f92f18d 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -511,8 +511,13 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->hStartUpEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wwi->hThread = CreateThread(NULL, 0, widRecorder, (LPVOID)(DWORD_PTR)wDevID, 0, &(wwi->dwThreadID)); - if (wwi->hThread) - SetThreadPriority(wwi->hThread, THREAD_PRIORITY_TIME_CRITICAL); + if (!wwi->hThread) { + ERR("Thread creation for the widRecorder failed!\n"); + CloseHandle(wwi->hStartUpEvent); + ret = MMSYSERR_NOMEM; + goto error; + } + SetThreadPriority(wwi->hThread, THREAD_PRIORITY_TIME_CRITICAL); WaitForSingleObject(wwi->hStartUpEvent, INFINITE); CloseHandle(wwi->hStartUpEvent); wwi->hStartUpEvent = NULL; @@ -525,6 +530,8 @@ error: snd_pcm_close(pcm); HeapFree( GetProcessHeap(), 0, hw_params ); HeapFree( GetProcessHeap(), 0, sw_params ); + if (wwi->msgRing.ring_buffer_size > 0) + ALSA_DestroyRingMessage(&wwi->msgRing); return ret; }

1 0

Jörg Höhle : winealsa: CreateEvent and CreateThread return NULL on error, not INVALID_HANDLE_VALUE.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 56f2c5800f731e4c5e2ca38fec62e19598752985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f2c5800f731e4c5e2ca38fe… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 6 22:13:18 2011 +0100 winealsa: CreateEvent and CreateThread return NULL on error, not INVALID_HANDLE_VALUE. --- dlls/winealsa.drv/alsa.c | 6 +++--- dlls/winealsa.drv/wavein.c | 4 ++-- dlls/winealsa.drv/waveout.c | 10 ++++------ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index ca775a2..122817c 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -127,7 +127,7 @@ void ALSA_WaitRingMessage(ALSA_MSG_RING* omr, DWORD sleep) */ int ALSA_AddRingMessage(ALSA_MSG_RING* omr, enum win_wm_message msg, DWORD_PTR param, BOOL wait) { - HANDLE hEvent = INVALID_HANDLE_VALUE; + HANDLE hEvent = NULL; EnterCriticalSection(&omr->msg_crst); if ((omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size))) @@ -151,7 +151,7 @@ int ALSA_AddRingMessage(ALSA_MSG_RING* omr, enum win_wm_message msg, DWORD_PTR p if (wait) { hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (hEvent == INVALID_HANDLE_VALUE) + if (!hEvent) { ERR("can't create event !?\n"); LeaveCriticalSection(&omr->msg_crst); @@ -173,7 +173,7 @@ int ALSA_AddRingMessage(ALSA_MSG_RING* omr, enum win_wm_message msg, DWORD_PTR p { omr->messages[omr->msg_tosave].msg = msg; omr->messages[omr->msg_tosave].param = param; - omr->messages[omr->msg_tosave].hEvent = INVALID_HANDLE_VALUE; + omr->messages[omr->msg_tosave].hEvent = NULL; omr->msg_tosave = (omr->msg_tosave + 1) % omr->ring_buffer_size; } LeaveCriticalSection(&omr->msg_crst); diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 2b0630b..daf73be 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -515,7 +515,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) SetThreadPriority(wwi->hThread, THREAD_PRIORITY_TIME_CRITICAL); WaitForSingleObject(wwi->hStartUpEvent, INFINITE); CloseHandle(wwi->hStartUpEvent); - wwi->hStartUpEvent = INVALID_HANDLE_VALUE; + wwi->hStartUpEvent = NULL; HeapFree( GetProcessHeap(), 0, hw_params ); HeapFree( GetProcessHeap(), 0, sw_params ); @@ -554,7 +554,7 @@ static DWORD widClose(WORD wDevID) WARN("buffers still playing !\n"); ret = WAVERR_STILLPLAYING; } else { - if (wwi->hThread != INVALID_HANDLE_VALUE) { + if (wwi->hThread) { ALSA_AddRingMessage(&wwi->msgRing, WINE_WM_CLOSING, 0, TRUE); } ALSA_DestroyRingMessage(&wwi->msgRing); diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 6ab1515..6dcd80f 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -782,18 +782,16 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwo->hStartUpEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wwo->hThread = CreateThread(NULL, 0, wodPlayer, (LPVOID)(DWORD_PTR)wDevID, 0, &(wwo->dwThreadID)); - if (wwo->hThread) - SetThreadPriority(wwo->hThread, THREAD_PRIORITY_TIME_CRITICAL); - else - { + if (!wwo->hThread) { ERR("Thread creation for the wodPlayer failed!\n"); CloseHandle(wwo->hStartUpEvent); retcode = MMSYSERR_NOMEM; goto errexit; } + SetThreadPriority(wwo->hThread, THREAD_PRIORITY_TIME_CRITICAL); WaitForSingleObject(wwo->hStartUpEvent, INFINITE); CloseHandle(wwo->hStartUpEvent); - wwo->hStartUpEvent = INVALID_HANDLE_VALUE; + wwo->hStartUpEvent = NULL; TRACE("handle=%p\n", pcm); TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%u, nSamplesPerSec=%u, nChannels=%u nBlockAlign=%u!\n", @@ -856,7 +854,7 @@ static DWORD wodClose(WORD wDevID) WARN("buffers still playing !\n"); ret = WAVERR_STILLPLAYING; } else { - if (wwo->hThread != INVALID_HANDLE_VALUE) { + if (wwo->hThread) { ALSA_AddRingMessage(&wwo->msgRing, WINE_WM_CLOSING, 0, TRUE); } ALSA_DestroyRingMessage(&wwo->msgRing);

1 0

Jörg Höhle : wineoss: Fix 64-bits incompatibilities.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 3a5c79fac2f31571f0e690c0d27b4603ac405b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5c79fac2f31571f0e690c0d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 9 02:14:09 2011 +0100 wineoss: Fix 64-bits incompatibilities. --- dlls/wineoss.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 6f29dcc..73d0826 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -399,14 +399,14 @@ static LRESULT OSS_MidiExit(void) * MIDI_NotifyClient [internal] */ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, - DWORD dwParam1, DWORD dwParam2) + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { DWORD dwCallBack; UINT uFlags; HANDLE hDev; DWORD dwInstance; - TRACE("wDevID = %04X wMsg = %d dwParm1 = %04X dwParam2 = %04X\n", + TRACE("wDevID = %04X wMsg = %d dwParm1 = %04lX dwParam2 = %04lX\n", wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) {

1 0

Jörg Höhle : wineoss: Ignore failure to notify winmm wave clients.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: e7b07680c5cccccc03c1b6fe63d9f0624dde37b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b07680c5cccccc03c1b6fe6… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 9 01:49:22 2011 +0100 wineoss: Ignore failure to notify winmm wave clients. --- dlls/wineoss.drv/audio.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 76f49ae..a4367fc 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1427,7 +1427,7 @@ static int OSS_PeekRingMessage(OSS_MSG_RING* omr, /************************************************************************** * wodNotifyClient [internal] */ -static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +static void wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { TRACE("wMsg = 0x%04x (%s) dwParm1 = %04lx dwParam2 = %04lx\n", wMsg, wMsg == WOM_OPEN ? "WOM_OPEN" : wMsg == WOM_CLOSE ? "WOM_CLOSE" : @@ -1442,14 +1442,11 @@ static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD_PTR dwParam1, D (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2)) { WARN("can't notify client !\n"); - return MMSYSERR_ERROR; } break; default: FIXME("Unknown callback message %u\n", wMsg); - return MMSYSERR_INVALPARAM; } - return MMSYSERR_NOERROR; } /************************************************************************** @@ -1665,7 +1662,7 @@ static DWORD wodPlayer_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); + wodNotifyClient(wwo, WOM_DONE, (DWORD_PTR)lpWaveHdr, 0); } #else for (;;) @@ -2128,7 +2125,8 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwo->waveFormat.Format.nSamplesPerSec, wwo->waveFormat.Format.nChannels, wwo->waveFormat.Format.nBlockAlign); - return wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); + wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); + return MMSYSERR_NOERROR; } /************************************************************************** @@ -2136,7 +2134,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) */ static DWORD wodClose(WORD wDevID) { - DWORD ret = MMSYSERR_NOERROR; WINE_WAVEOUT* wwo; TRACE("(%u);\n", wDevID); @@ -2149,7 +2146,7 @@ static DWORD wodClose(WORD wDevID) wwo = &WOutDev[wDevID]; if (wwo->lpQueuePtr) { WARN("buffers still playing !\n"); - ret = WAVERR_STILLPLAYING; + return WAVERR_STILLPLAYING; } else { if (wwo->hThread != INVALID_HANDLE_VALUE) { OSS_AddRingMessage(&wwo->msgRing, WINE_WM_CLOSING, 0, TRUE); @@ -2160,9 +2157,9 @@ static DWORD wodClose(WORD wDevID) OSS_CloseDevice(&wwo->ossdev); wwo->state = WINE_WS_CLOSED; wwo->dwFragmentSize = 0; - ret = wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); + wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); } - return ret; + return MMSYSERR_NOERROR; } /************************************************************************** @@ -2464,7 +2461,7 @@ DWORD WINAPI OSS_wodMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, /************************************************************************** * widNotifyClient [internal] */ -static DWORD widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +static void widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { TRACE("wMsg = 0x%04x (%s) dwParm1 = %04lx dwParam2 = %04lx\n", wMsg, wMsg == WIM_OPEN ? "WIM_OPEN" : wMsg == WIM_CLOSE ? "WIM_CLOSE" : @@ -2479,14 +2476,11 @@ static DWORD widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DW (HDRVR)wwi->waveDesc.hWave, wMsg, wwi->waveDesc.dwInstance, dwParam1, dwParam2)) { WARN("can't notify client !\n"); - return MMSYSERR_ERROR; } break; default: FIXME("Unknown callback message %u\n", wMsg); - return MMSYSERR_INVALPARAM; } - return MMSYSERR_NOERROR; } /************************************************************************** @@ -2998,7 +2992,8 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) CloseHandle(wwi->hStartUpEvent); wwi->hStartUpEvent = INVALID_HANDLE_VALUE; - return widNotifyClient(wwi, WIM_OPEN, 0L, 0L); + widNotifyClient(wwi, WIM_OPEN, 0L, 0L); + return MMSYSERR_NOERROR; } /************************************************************************** @@ -3026,7 +3021,8 @@ static DWORD widClose(WORD wDevID) wwi->state = WINE_WS_CLOSED; wwi->dwFragmentSize = 0; OSS_DestroyRingMessage(&wwi->msgRing); - return widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); + widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); + return MMSYSERR_NOERROR; } /**************************************************************************

1 0

Dmitry Timoshkov : kernel32: Add dumping of GENERIC_EXECUTE flag in CreateFile.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: efeea9cf107ff85382d162f3bb3876837edf9a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efeea9cf107ff85382d162f3b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 15 19:06:19 2011 +0800 kernel32: Add dumping of GENERIC_EXECUTE flag in CreateFile. --- dlls/kernel32/file.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 67c886e..6ee243e 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1272,9 +1272,10 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, return INVALID_HANDLE_VALUE; } - TRACE("%s %s%s%s%s%s%s creation %d attributes 0x%x\n", debugstr_w(filename), + TRACE("%s %s%s%s%s%s%s%s creation %d attributes 0x%x\n", debugstr_w(filename), (access & GENERIC_READ)?"GENERIC_READ ":"", (access & GENERIC_WRITE)?"GENERIC_WRITE ":"", + (access & GENERIC_EXECUTE)?"GENERIC_EXECUTE ":"", (!access)?"QUERY_ACCESS ":"", (sharing & FILE_SHARE_READ)?"FILE_SHARE_READ ":"", (sharing & FILE_SHARE_WRITE)?"FILE_SHARE_WRITE ":"",

1 0

Michael Stefaniuc : oleaut32/tests: COM cleanup in olepicture.c.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 160c4f96a7f939774c68f29a7da80c85732c06af URL: http://source.winehq.org/git/wine.git/?a=commit;h=160c4f96a7f939774c68f29a7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 15 11:35:36 2011 +0100 oleaut32/tests: COM cleanup in olepicture.c. --- dlls/oleaut32/tests/olepicture.c | 40 +++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 5cc078c..54de1cb 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -25,6 +25,7 @@ #include <float.h> #define COBJMACROS +#define CONST_VTABLE #define NONAMELESSUNION #include "wine/test.h" @@ -169,17 +170,17 @@ static const unsigned char enhmetafile[] = { }; -struct NoStatStreamImpl +typedef struct NoStatStreamImpl { - const IStreamVtbl *lpVtbl; + IStream IStream_iface; LONG ref; HGLOBAL supportHandle; ULARGE_INTEGER streamSize; ULARGE_INTEGER currentPosition; -}; -typedef struct NoStatStreamImpl NoStatStreamImpl; -static NoStatStreamImpl* NoStatStreamImpl_Construct(HGLOBAL hGlobal); +} NoStatStreamImpl; + +static IStream* NoStatStream_Construct(HGLOBAL hGlobal); static void test_pic_with_stream(LPSTREAM stream, unsigned int imgsize) @@ -282,7 +283,7 @@ test_pic(const unsigned char *imgdata, unsigned int imgsize) IStream_Release(stream); /* again with Non Statable and Non Seekable stream */ - stream = (LPSTREAM)NoStatStreamImpl_Construct(hglob); + stream = NoStatStream_Construct(hglob); hglob = 0; /* Non-statable impl always deletes on release */ test_pic_with_stream(stream, 0); @@ -313,7 +314,7 @@ test_pic(const unsigned char *imgdata, unsigned int imgsize) IStream_Release(stream); /* again with Non Statable and Non Seekable stream */ - stream = (LPSTREAM)NoStatStreamImpl_Construct(hglob); + stream = NoStatStream_Construct(hglob); hglob = 0; /* Non-statable impl always deletes on release */ test_pic_with_stream(stream, 0); @@ -1002,6 +1003,11 @@ START_TEST(olepicture) /* Helper functions only ... */ +static inline NoStatStreamImpl *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, NoStatStreamImpl, IStream_iface); +} + static void NoStatStreamImpl_Destroy(NoStatStreamImpl* This) { GlobalFree(This->supportHandle); @@ -1012,7 +1018,7 @@ static void NoStatStreamImpl_Destroy(NoStatStreamImpl* This) static ULONG WINAPI NoStatStreamImpl_AddRef( IStream* iface) { - NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; + NoStatStreamImpl* const This = impl_from_IStream(iface); return InterlockedIncrement(&This->ref); } @@ -1021,7 +1027,7 @@ static HRESULT WINAPI NoStatStreamImpl_QueryInterface( REFIID riid, /* [in] */ void** ppvObject) /* [iid_is][out] */ { - NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; + NoStatStreamImpl* const This = impl_from_IStream(iface); if (ppvObject==0) return E_INVALIDARG; *ppvObject = 0; if (IsEqualIID(&IID_IUnknown, riid)) @@ -1042,7 +1048,7 @@ static HRESULT WINAPI NoStatStreamImpl_QueryInterface( static ULONG WINAPI NoStatStreamImpl_Release( IStream* iface) { - NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; + NoStatStreamImpl* const This = impl_from_IStream(iface); ULONG newRef = InterlockedDecrement(&This->ref); if (newRef==0) NoStatStreamImpl_Destroy(This); @@ -1055,7 +1061,7 @@ static HRESULT WINAPI NoStatStreamImpl_Read( ULONG cb, /* [in] */ ULONG* pcbRead) /* [out] */ { - NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; + NoStatStreamImpl* const This = impl_from_IStream(iface); void* supportBuffer; ULONG bytesReadBuffer; ULONG bytesToReadFromBuffer; @@ -1079,7 +1085,7 @@ static HRESULT WINAPI NoStatStreamImpl_Write( ULONG cb, /* [in] */ ULONG* pcbWritten) /* [out] */ { - NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; + NoStatStreamImpl* const This = impl_from_IStream(iface); void* supportBuffer; ULARGE_INTEGER newSize; ULONG bytesWritten = 0; @@ -1107,7 +1113,7 @@ static HRESULT WINAPI NoStatStreamImpl_Seek( DWORD dwOrigin, /* [in] */ ULARGE_INTEGER* plibNewPosition) /* [out] */ { - NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; + NoStatStreamImpl* const This = impl_from_IStream(iface); ULARGE_INTEGER newPosition; switch (dwOrigin) { @@ -1136,7 +1142,7 @@ static HRESULT WINAPI NoStatStreamImpl_SetSize( IStream* iface, ULARGE_INTEGER libNewSize) /* [in] */ { - NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; + NoStatStreamImpl* const This = impl_from_IStream(iface); HGLOBAL supportHandle; if (libNewSize.u.HighPart != 0) return STG_E_INVALIDFUNCTION; @@ -1249,14 +1255,14 @@ static const IStreamVtbl NoStatStreamImpl_Vtbl; In any case the object takes ownership of memory handle and will free it on object release. */ -static NoStatStreamImpl* NoStatStreamImpl_Construct(HGLOBAL hGlobal) +static IStream* NoStatStream_Construct(HGLOBAL hGlobal) { NoStatStreamImpl* newStream; newStream = HeapAlloc(GetProcessHeap(), 0, sizeof(NoStatStreamImpl)); if (newStream!=0) { - newStream->lpVtbl = &NoStatStreamImpl_Vtbl; + newStream->IStream_iface.lpVtbl = &NoStatStreamImpl_Vtbl; newStream->ref = 1; newStream->supportHandle = hGlobal; @@ -1268,7 +1274,7 @@ static NoStatStreamImpl* NoStatStreamImpl_Construct(HGLOBAL hGlobal) newStream->streamSize.u.HighPart = 0; newStream->streamSize.u.LowPart = GlobalSize(newStream->supportHandle); } - return newStream; + return &newStream->IStream_iface; }

1 0

Rico Schüller : d3dx9_36: Start effect parsing.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 0dc91c4975245aa4b2634c6f4ca62e5efbf15dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc91c4975245aa4b2634c6f4… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Mar 14 22:53:08 2011 +0100 d3dx9_36: Start effect parsing. --- dlls/d3dx9_36/effect.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 94 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8c3c756..2697782 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -31,8 +31,35 @@ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl; typedef struct ID3DXEffectImpl { ID3DXEffect ID3DXEffect_iface; LONG ref; + + UINT parameter_count; + UINT technique_count; } ID3DXEffectImpl; +static inline void read_dword(const char **ptr, DWORD *d) +{ + memcpy(d, *ptr, sizeof(*d)); + *ptr += sizeof(*d); +} + +static void skip_dword_unknown(const char **ptr, unsigned int count) +{ + unsigned int i; + DWORD d; + + FIXME("Skipping %u unknown DWORDs:\n", count); + for (i = 0; i < count; ++i) + { + read_dword(ptr, &d); + FIXME("\t0x%08x\n", d); + } +} + +static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor) +{ + return (0xfeff0000 | ((major) << 8) | (minor)); +} + static inline ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) { return CONTAINING_RECORD(iface, ID3DXEffectImpl, ID3DXEffect_iface); @@ -853,6 +880,61 @@ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl = ID3DXEffectImpl_SetRawValue }; +static HRESULT d3dx9_parse_effect(ID3DXEffectImpl *effect, const char *data, UINT data_size, DWORD start) +{ + const char *ptr = data + start; + + read_dword(&ptr, &effect->parameter_count); + TRACE("Parameter count: %u\n", effect->parameter_count); + + read_dword(&ptr, &effect->technique_count); + TRACE("Technique count: %u\n", effect->technique_count); + + skip_dword_unknown(&ptr, 2); + + /* todo: Parse parameter */ + + /* todo: Parse techniques */ + + return S_OK; +} + +static HRESULT d3dx9_effect_init(ID3DXEffectImpl *effect, const char *data, SIZE_T data_size) +{ + DWORD tag, offset; + const char *ptr = data; + HRESULT hr; + + effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; + effect->ref = 1; + + read_dword(&ptr, &tag); + TRACE("Tag: %x\n", tag); + + if (tag != d3dx9_effect_version(9, 1)) + { + /* todo: compile hlsl ascii code */ + FIXME("HLSL ascii effects not supported, yet\n"); + + /* Show the start of the shader for debugging info. */ + TRACE("effect:\n%s\n", debugstr_an(data, data_size > 40 ? 40 : data_size)); + } + else + { + read_dword(&ptr, &offset); + TRACE("Offset: %x\n", offset); + + hr = d3dx9_parse_effect(effect, ptr, data_size, offset); + if (hr != S_OK) + { + FIXME("Failed to parse effect.\n"); + return hr; + } + } + + return S_OK; +} + HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, LPCVOID srcdata, UINT srcdatalen, @@ -864,7 +946,8 @@ HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, LPD3DXEFFECT* effect, LPD3DXBUFFER* compilation_errors) { - ID3DXEffectImpl* object; + ID3DXEffectImpl *object; + HRESULT hr; FIXME("(%p, %p, %u, %p, %p, %p, %#x, %p, %p, %p): semi-stub\n", device, srcdata, srcdatalen, defines, include, skip_constants, flags, pool, effect, compilation_errors); @@ -879,18 +962,25 @@ HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, if (!effect) return D3D_OK; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXEffectImpl)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { ERR("Out of memory\n"); return E_OUTOFMEMORY; } - object->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; - object->ref = 1; + hr = d3dx9_effect_init(object, srcdata, srcdatalen); + if (FAILED(hr)) + { + WARN("Failed to initialize shader reflection\n"); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } *effect = &object->ID3DXEffect_iface; + TRACE("Created ID3DXEffect %p\n", object); + return D3D_OK; }

1 0

Alexandre Julliard : gdi32: Add null driver entry point for world transform functions, and move them to mapping.c.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 29c3c528db49af80ed476dfc798c3caa535f8fa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c3c528db49af80ed476dfc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 15 14:03:02 2011 +0100 gdi32: Add null driver entry point for world transform functions, and move them to mapping.c. --- dlls/gdi32/dc.c | 110 ---------------------------------------------- dlls/gdi32/driver.c | 4 +- dlls/gdi32/enhmfdrv/dc.c | 8 +++- dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/mapping.c | 83 ++++++++++++++++++++++++++++++++++ 5 files changed, 93 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29c3c528db49af80ed476…

1 0

Michael Stefaniuc : rpcrt4/tests: COM cleanup in cstub.c.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 64d18bc1f0fce5f9baa97cba96a828f221a88c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d18bc1f0fce5f9baa97cba9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 15 11:35:17 2011 +0100 rpcrt4/tests: COM cleanup in cstub.c. --- dlls/rpcrt4/tests/cstub.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 7517a6d..7882e20 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -691,10 +691,15 @@ static IUnknownVtbl create_stub_test_fail_vtbl = struct dummy_unknown { - const IUnknownVtbl *vtbl; + IUnknown IUnknown_iface; LONG ref; }; +static inline struct dummy_unknown *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct dummy_unknown, IUnknown_iface); +} + static HRESULT WINAPI dummy_QueryInterface(IUnknown *This, REFIID iid, void **ppv) { *ppv = NULL; @@ -703,13 +708,13 @@ static HRESULT WINAPI dummy_QueryInterface(IUnknown *This, REFIID iid, void **pp static ULONG WINAPI dummy_AddRef(LPUNKNOWN iface) { - struct dummy_unknown *this = (struct dummy_unknown *)iface; + struct dummy_unknown *this = impl_from_IUnknown(iface); return InterlockedIncrement( &this->ref ); } static ULONG WINAPI dummy_Release(LPUNKNOWN iface) { - struct dummy_unknown *this = (struct dummy_unknown *)iface; + struct dummy_unknown *this = impl_from_IUnknown(iface); return InterlockedDecrement( &this->ref ); } @@ -719,7 +724,7 @@ static IUnknownVtbl dummy_unknown_vtbl = dummy_AddRef, dummy_Release }; -static struct dummy_unknown dummy_unknown = { &dummy_unknown_vtbl, 0 }; +static struct dummy_unknown dummy_unknown = { { &dummy_unknown_vtbl }, 0 }; static void create_proxy_test( IPSFactoryBuffer *ppsf, REFIID iid, const void *expected_vtbl ) { @@ -737,7 +742,8 @@ static void create_proxy_test( IPSFactoryBuffer *ppsf, REFIID iid, const void *e ok( count == 0, "wrong refcount %u\n", count ); dummy_unknown.ref = 4; - r = IPSFactoryBuffer_CreateProxy(ppsf, (IUnknown *)&dummy_unknown, iid, &proxy, (void **)&iface); + r = IPSFactoryBuffer_CreateProxy(ppsf, &dummy_unknown.IUnknown_iface, iid, &proxy, + (void **)&iface); ok( r == S_OK, "IPSFactoryBuffer_CreateProxy failed %x\n", r ); ok( dummy_unknown.ref == 5, "wrong refcount %u\n", dummy_unknown.ref ); ok( *(void **)iface == expected_vtbl, "wrong iface pointer %p/%p\n", *(void **)iface, expected_vtbl );

1 0

Marcus Meissner : comctl32: Removed array NULL check (Coverity).
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 2cd225b793d510fd67fc2864a342772743e30bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd225b793d510fd67fc2864a… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Mar 15 02:37:02 2011 +0100 comctl32: Removed array NULL check (Coverity). --- dlls/comctl32/tooltips.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index a2e58e0..2b29790 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -2051,7 +2051,7 @@ TOOLTIPS_OnWMGetText (const TOOLTIPS_INFO *infoPtr, WPARAM size, LPWSTR pszText) { LRESULT res; - if(!infoPtr->szTipText || !size) + if(!size) return 0; res = min(strlenW(infoPtr->szTipText)+1, size);

1 0

Marcus Meissner : comdlg32: Removed useless NULL check (Coverity).
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 0bd55f9df1192220be564f259f87f913857ae948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd55f9df1192220be564f259… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Mar 15 02:26:04 2011 +0100 comdlg32: Removed useless NULL check (Coverity). --- dlls/comdlg32/filedlg.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 2fb0969..c65c1f7 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3219,10 +3219,7 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) ILD_TRANSPARENT ); /* Draw the associated text */ - if(sfi.szDisplayName) - TextOutW(pDIStruct->hDC,rectText.left,rectText.top,sfi.szDisplayName,lstrlenW(sfi.szDisplayName)); - - + TextOutW(pDIStruct->hDC,rectText.left,rectText.top,sfi.szDisplayName,lstrlenW(sfi.szDisplayName)); return NOERROR; }

1 0

Marcus Meissner : user32: Remove useless NULL checks (Coverity).
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: f3aab0c0e92ddaf4f66ead936836bec5edd4b2a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3aab0c0e92ddaf4f66ead936… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Mar 15 02:21:56 2011 +0100 user32: Remove useless NULL checks (Coverity). --- dlls/user32/dde_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index 0d62c49..a5b7430 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -72,7 +72,7 @@ BOOL WINAPI DdePostAdvise(DWORD idInst, HSZ hszTopic, HSZ hszItem) pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL || pInstance->links == NULL) + if (pInstance == NULL) return FALSE; atom = WDML_MakeAtomFromHsz(hszItem);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011