February 2013 - Wine-Commits

Francois Gouget : testbot/TestAgent: Use the new wait() RPC with the timeout parameter if available.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: 66b8798d53fb28266290a6b731a8f2007b220326 URL: http://source.winehq.org/git/tools.git/?a=commit;h=66b8798d53fb28266290a6b7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 20:29:26 2013 +0100 testbot/TestAgent: Use the new wait() RPC with the timeout parameter if available. This lets us distinguish cases where the child process runs for too long from network issues. Note that when connected to an old testagentd server the old RPC will be used to preserve compatibility. --- testbot/bin/WineRunBuild.pl | 4 +-- testbot/bin/WineRunReconfig.pl | 4 +-- testbot/bin/WineRunTask.pl | 4 +-- testbot/lib/WineTestBot/TestAgent.pm | 35 ++++++++++++++++++++++++++------- testbot/scripts/TestAgent | 2 +- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index d335214..20a43da 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -256,12 +256,10 @@ if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) $FullErrFileName, $Job, $Step, $Task; } my $Pid = $TA->Run(["./task"], 0); -my $OldTimeout = $TA->SetTimeout($Task->Timeout); -if (!$Pid or !defined $TA->Wait($Pid)) +if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) { $ErrMessage = $TA->GetLastError(); } -$TA->SetTimeout($OldTimeout); if (defined($ErrMessage)) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 0618a48..18d8c69 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -209,12 +209,10 @@ if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) $FullErrFileName, $Job, $Step, $Task; } my $Pid = $TA->Run(["./task"], 0); -my $OldTimeout = $TA->SetTimeout($Task->Timeout); -if (!$Pid or !defined $TA->Wait($Pid)) +if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) { $ErrMessage = $TA->GetLastError(); } -$TA->SetTimeout($OldTimeout); if (defined($ErrMessage)) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 9751d3b..73d60ba 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -300,12 +300,10 @@ if (!$TA->SendFileFromString($Script, "script.bat", $TestAgent::SENDFILE_EXE)) } my $Pid = $TA->Run(["./script.bat"], 0); -my $OldTimeout = $TA->SetTimeout($Task->Timeout); -if (!$Pid or !defined $TA->Wait($Pid)) +if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) { $ErrMessage = $TA->GetLastError(); } -$TA->SetTimeout($OldTimeout); my $LogErrMessage; if (!$TA->GetFile($RptFileName, $FullLogFileName)) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index cda83a8..c3326d6 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -35,6 +35,7 @@ my $RPC_SENDFILE = 2; my $RPC_RUN = 3; my $RPC_WAIT = 4; my $RPC_RM = 5; +my $RPC_WAIT2 = 6; my %RpcNames=( $RPC_PING => 'ping', @@ -43,6 +44,7 @@ my %RpcNames=( $RPC_RUN => 'run', $RPC_WAIT => 'wait', $RPC_RM => 'rm', + $RPC_WAIT2 => 'wait2', ); my $Debug = 0; @@ -1053,21 +1055,38 @@ sub Run($$$;$$$) return $self->_RecvList('Q'); } -sub Wait($$) +sub Wait($$$) { - my ($self, $Pid) = @_; - debug("Wait $Pid\n"); + my ($self, $Pid, $Timeout) = @_; + debug("Wait $Pid, ", defined $Timeout ? $Timeout : "<undef>", "\n"); + # Add 1 second for the reply to come back + my $OldTimeout = $self->SetTimeout($Timeout + 1) if ($Timeout); # Send the command - if (!$self->_StartRPC($RPC_WAIT) or - !$self->_SendListSize(1) or - !$self->_SendUInt64($Pid)) + if ($self->{agentversion} =~ / 1\.0$/) { - return undef; + if (!$self->_StartRPC($RPC_WAIT) or + !$self->_SendListSize(1) or + !$self->_SendUInt64($Pid)) + { + return undef; + } + } + else + { + if (!$self->_StartRPC($RPC_WAIT2) or + !$self->_SendListSize(2) or + !$self->_SendUInt64($Pid) or + !$self->_SendUInt32($Timeout)) + { + return undef; + } } # Get the reply - return $self->_RecvList('I'); + my $Result = $self->_RecvList('I'); + $self->SetTimeout($OldTimeout) if ($Timeout); + return $Result; } sub Rm($@) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index d25a3d6..1424998 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -303,7 +303,7 @@ elsif ($Cmd eq "run") print "Started process $Pid\n"; if (!($RunFlags & $TestAgent::RUN_DNT)) { - $Result = $TA->Wait($Pid); + $Result = $TA->Wait($Pid, $Timeout); print "Child exit status: $Result\n" if (defined $Result); } }

1 0

Francois Gouget : testbot/testagentd: Add a wait() RPC that takes a timeout as a parameter.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: 6475b701e628de35c632cecbf30f74e80aa91700 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6475b701e628de35c632cecb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:34:18 2013 +0100 testbot/testagentd: Add a wait() RPC that takes a timeout as a parameter. This is a new RPC which preserves compatibility with old clients. --- testbot/src/testagentd/platform.h | 6 ++-- testbot/src/testagentd/platform_unix.c | 25 ++++++++++++++++-- testbot/src/testagentd/platform_windows.c | 7 ++++- testbot/src/testagentd/testagentd.c | 38 +++++++++++++++++++++++++++- 4 files changed, 66 insertions(+), 10 deletions(-) diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index 3c25271..d2a3934 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -68,12 +68,12 @@ enum run_flags_t { uint64_t platform_run(char** argv, uint32_t flags, char** redirects); /* If a command was started in the background, waits until either that command - * terminates or the client disconnects (typically because it got tired of - * waiting). + * terminates, the specified timeout (in seconds) expires, or the client + * disconnects (typically because it got tired of waiting). * If no command was started in the background, then reports an error * immediately. */ -int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus); +int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *childstatus); /* Returns a string describing the last socket-related error */ int sockeintr(void); diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index cd08c58..6552e05 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -28,6 +28,7 @@ #include <sys/stat.h> #include <sys/wait.h> #include <signal.h> +#include <time.h> #include "platform.h" #include "list.h" @@ -125,9 +126,10 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) return pid; } -int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) +int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *childstatus) { struct child_t* child; + time_t deadline; LIST_FOR_EACH_ENTRY(child, &children, struct child_t, entry) { @@ -140,10 +142,14 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) return 0; } + if (timeout) + deadline = time(NULL) + timeout; while (!child->reaped) { fd_set rfds; char buffer; + struct timeval tv; + int ready; /* select() blocks until either the client disconnects or until, or * the SIGCHLD signal indicates the child has exited. The recv() call @@ -152,8 +158,21 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) debug("Waiting for " U64FMT "\n", pid); FD_ZERO(&rfds); FD_SET(client, &rfds); - if (select(client+1, &rfds, NULL, NULL, NULL) == 1 && - FD_ISSET(client, &rfds) && + if (timeout) + { + tv.tv_sec = deadline - time(NULL); + if (tv.tv_sec < 0) + tv.tv_sec = 0; + tv.tv_usec = 0; + } + ready = select(client+1, &rfds, NULL, NULL, timeout ? &tv : NULL); + if (ready == 0) + { + /* This is the timeout */ + set_status(ST_ERROR, "timed out waiting for the child process"); + return 0; + } + if (ready == 1 && FD_ISSET(client, &rfds) && recv(client, &buffer, 1, MSG_PEEK | MSG_DONTWAIT) <= 0) { set_status(ST_FATAL, "connection closed"); diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index ab4bf7b..55ed51d 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -136,7 +136,7 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) return pi.dwProcessId; } -int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) +int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *childstatus) { struct child_t *child; HANDLE handles[2]; @@ -160,7 +160,7 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) handles[0] = WSACreateEvent(); WSAEventSelect(client, handles[0], FD_CLOSE); handles[1] = child->handle; - r = WaitForMultipleObjects(2, handles, FALSE, INFINITE); + r = WaitForMultipleObjects(2, handles, FALSE, timeout * 1000); success = 0; switch (r) @@ -179,6 +179,9 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) else debug("GetExitCodeProcess() failed (%lu). Giving up!\n", GetLastError()); break; + case WAIT_TIMEOUT: + set_status(ST_ERROR, "timed out waiting for the child process"); + return 0; default: debug("WaitForMultipleObjects() returned %lu (le=%lu). Giving up!\n", r, GetLastError()); break; diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 837ff02..8a8f2bb 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -29,7 +29,13 @@ #include "platform.h" -#define PROTOCOL_VERSION "testagentd 1.0" +/* Increase the major version number when making backward-incompatible changes. + * Otherwise increase the minor version number: + * 1.0: Initial release. + * 1.1: Added the wait2 RPC. + */ +#define PROTOCOL_VERSION "testagentd 1.1" + #define BLOCK_SIZE 4096 const char *name0; @@ -73,6 +79,7 @@ enum rpc_ids_t RPCID_RUN, RPCID_WAIT, RPCID_RM, + RPCID_WAIT2, }; /* This is the RPC currently being processed */ @@ -89,6 +96,7 @@ static const char* rpc_name(uint32_t id) "run", "wait", "rm", + "wait2", }; if (id < sizeof(names) / sizeof(*names)) @@ -761,7 +769,30 @@ static void do_wait(SOCKET client) return; } - if (platform_wait(client, pid, &childstatus)) + if (platform_wait(client, pid, 0, &childstatus)) + { + send_list_size(client, 1); + send_uint32(client, childstatus); + } + else + send_error(client); +} + +static void do_wait2(SOCKET client) +{ + uint64_t pid; + uint32_t timeout; + uint32_t childstatus; + + if (!expect_list_size(client, 2) || + !recv_uint64(client, &pid) || + !recv_uint32(client, &timeout)) + { + send_error(client); + return; + } + + if (platform_wait(client, pid, timeout, &childstatus)) { send_list_size(client, 1); send_uint32(client, childstatus); @@ -906,6 +937,9 @@ static void process_rpc(SOCKET client) case RPCID_WAIT: do_wait(client); break; + case RPCID_WAIT2: + do_wait2(client); + break; case RPCID_RM: do_rm(client); break;

1 0

Francois Gouget : testbot/testagentd: Print the version on startup.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: cbf8daaa998399093b0ca517385caf18784d91f2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cbf8daaa998399093b0ca517… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 16:57:42 2013 +0100 testbot/testagentd: Print the version on startup. --- testbot/src/testagentd/testagentd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 3de9a3c..837ff02 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1139,6 +1139,7 @@ int main(int argc, char** argv) error("listen() failed: %s\n", sockerror()); exit(1); } + printf("Starting %s\n", PROTOCOL_VERSION); while (1) { SOCKET client;

1 0

Francois Gouget : testbot/TestAgent: Fix handling of --run-no-wait.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: 7e6a6a5bcef1d8006817a9c8635a6cb7d0ee0525 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7e6a6a5bcef1d8006817a9c8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:00:18 2013 +0100 testbot/TestAgent: Fix handling of --run-no-wait. --- testbot/scripts/TestAgent | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 02da611..78d9c24 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -299,6 +299,7 @@ elsif ($Cmd eq "run") my $Pid = $TA->Run(\@Run, $RunFlags, $RunIn, $RunOut, $RunErr); if ($Pid) { + $Result = 1; print "Started process $Pid\n"; if (!($RunFlags & $TestAgent::RUN_DNT)) {

1 0

Piotr Caban : oleaut32: Fixed time outputing for dates before 1899 in VarBstrFromDate.
by Alexandre Julliard Feb. 22, 2013

Feb. 22, 2013

Module: wine Branch: master Commit: 8f7d1ed520db23c230efb37601b99900add664db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7d1ed520db23c230efb3760… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 22 18:43:26 2013 +0100 oleaut32: Fixed time outputing for dates before 1899 in VarBstrFromDate. --- dlls/oleaut32/tests/vartype.c | 1 + dlls/oleaut32/vartype.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 8ad549e..e925fa5 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4951,6 +4951,7 @@ static void test_VarBstrFromDate(void) BSTR_DATE(365.25, "12/30/1900 6:00:00 AM"); BSTR_DATE(1461.0, "12/31/1903"); BSTR_DATE(1461.5, "12/31/1903 12:00:00 PM"); + BSTR_DATE(-49192.24, "4/24/1765 5:45:36 AM"); todo_wine { BSTR_DATE(-657434.0, "1/1/100"); } BSTR_DATE(2958465.0, "12/31/9999"); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2d27f9d..8632055 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6619,7 +6619,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst if (whole == 0.0) dwFlags |= VAR_TIMEVALUEONLY; - else if (partial < 1e-12) + else if (partial > -1e-12 && partial < 1e-12) dwFlags |= VAR_DATEVALUEONLY; }

1 0

Dmitry Timoshkov : gdiplus: Remove debug traces from GdipBitmapGetPixel and GdipBitmapSetPixel.
by Alexandre Julliard Feb. 22, 2013

Feb. 22, 2013

Module: wine Branch: master Commit: c5e129a7e40775ca156c94f01a5aa5260451c623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5e129a7e40775ca156c94f01… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 22 19:18:23 2013 +0800 gdiplus: Remove debug traces from GdipBitmapGetPixel and GdipBitmapSetPixel. --- dlls/gdiplus/image.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 59ea41c..ff27334 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -297,7 +297,6 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, BYTE r, g, b, a; BYTE index; BYTE *row; - TRACE("%p %d %d %p\n", bitmap, x, y, color); if(!bitmap || !color || x < 0 || y < 0 || x >= bitmap->width || y >= bitmap->height) @@ -503,7 +502,6 @@ GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, { BYTE a, r, g, b; BYTE *row; - TRACE("bitmap:%p, x:%d, y:%d, color:%08x\n", bitmap, x, y, color); if(!bitmap || x < 0 || y < 0 || x >= bitmap->width || y >= bitmap->height) return InvalidParameter;

1 0

Andrew Talbot : ole32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 22, 2013

Feb. 22, 2013

Module: wine Branch: master Commit: faaeeea9376b16a71f0bdf647aa6200ce2b173d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faaeeea9376b16a71f0bdf647… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 21 22:30:15 2013 +0000 ole32: Avoid signed-unsigned integer comparisons. --- dlls/ole32/compositemoniker.c | 12 ++++++------ dlls/ole32/storage32.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index a6cfd62..ed154f2 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1638,10 +1638,10 @@ static const IEnumMonikerVtbl VT_EnumMonikerImpl = ******************************************************************************/ static HRESULT EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker, ULONG tabSize, - ULONG currentPos, BOOL leftToRigth, IEnumMoniker ** ppmk) + ULONG currentPos, BOOL leftToRight, IEnumMoniker ** ppmk) { EnumMonikerImpl* newEnumMoniker; - int i; + ULONG i; if (currentPos > tabSize) return E_INVALIDARG; @@ -1665,17 +1665,17 @@ EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker, ULONG tabSize, return E_OUTOFMEMORY; } - if (leftToRigth) + if (leftToRight) for (i=0;i<tabSize;i++){ newEnumMoniker->tabMoniker[i]=tabMoniker[i]; IMoniker_AddRef(tabMoniker[i]); } else - for (i=tabSize-1;i>=0;i--){ + for (i = tabSize; i > 0; i--){ - newEnumMoniker->tabMoniker[tabSize-i-1]=tabMoniker[i]; - IMoniker_AddRef(tabMoniker[i]); + newEnumMoniker->tabMoniker[tabSize-i]=tabMoniker[i - 1]; + IMoniker_AddRef(tabMoniker[i - 1]); } *ppmk=&newEnumMoniker->IEnumMoniker_iface; diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f259d24..1d64ab0 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1767,7 +1767,7 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( StorageBaseImpl *This = impl_from_IStorage(iface); BOOL skip_storage = FALSE, skip_stream = FALSE; - int i; + DWORD i; TRACE("(%p, %d, %p, %p, %p)\n", iface, ciidExclude, rgiidExclude, @@ -2822,7 +2822,7 @@ static HRESULT StorageImpl_Construct( { ULONG current_block = This->extBigBlockDepotStart; ULONG cache_size = This->extBigBlockDepotCount * 2; - int i; + ULONG i; This->extBigBlockDepotLocations = HeapAlloc(GetProcessHeap(), 0, sizeof(ULONG) * cache_size); if (!This->extBigBlockDepotLocations)

1 0

Jörg Höhle : winmm: WAVE_OPEN_QUERY causes no WIM /WOM_OPEN notification.
by Alexandre Julliard Feb. 22, 2013

Feb. 22, 2013

Module: wine Branch: master Commit: 4f0743bffabe49db064248881ade24813cbb63ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0743bffabe49db064248881… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 20 22:53:33 2013 +0100 winmm: WAVE_OPEN_QUERY causes no WIM/WOM_OPEN notification. --- dlls/winmm/tests/wave.c | 10 ++++++++++ dlls/winmm/waveform.c | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 9e59e2f..992cca7 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -854,6 +854,16 @@ static void wave_out_test_deviceOut(int device, double duration, rc=WaitForSingleObject(hevent,1500); ok(rc==WAIT_OBJECT_0, "missing WOM_CLOSE notification\n"); + wout = (HWAVEOUT)0xdeadf00d; + rc=waveOutOpen(&wout,device,pwfx,callback,callback_instance,flags|WAVE_FORMAT_QUERY); + ok(rc==MMSYSERR_NOERROR, "WAVE_FORMAT_QUERY(%s): rc=%s\n",dev_name(device), + wave_out_error(rc)); + ok(wout==(HWAVEOUT)0xdeadf00d, "WAVE_FORMAT_QUERY handle %p\n", wout); + + rc=WaitForSingleObject(hevent,20); + ok(rc==WAIT_TIMEOUT, "Notification from %s rc=%x\n", + wave_open_flags(flags|WAVE_FORMAT_QUERY),rc); + HeapFree(GetProcessHeap(), 0, buffer); EXIT: if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) { diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index a5ffbc0..1dceb26 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2726,7 +2726,7 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, info.reset = TRUE; res = SendMessageW(g_devices_hwnd, WODM_OPEN, (DWORD_PTR)&info, 0); - if(res != MMSYSERR_NOERROR) + if(res != MMSYSERR_NOERROR || (dwFlags & WAVE_FORMAT_QUERY)) return res; if(lphWaveOut) @@ -3356,7 +3356,7 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, info.reset = TRUE; res = SendMessageW(g_devices_hwnd, WIDM_OPEN, (DWORD_PTR)&info, 0); - if(res != MMSYSERR_NOERROR) + if(res != MMSYSERR_NOERROR || (dwFlags & WAVE_FORMAT_QUERY)) return res; if(lphWaveIn)

1 0

Daniel Jelinski : comctl32/listview: Implement overlay image support.
by Alexandre Julliard Feb. 22, 2013

Feb. 22, 2013

Module: wine Branch: master Commit: b9fe178f3657b1955d27e9676ef5c2c4a7aed432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9fe178f3657b1955d27e9676… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu Feb 21 21:51:36 2013 +0100 comctl32/listview: Implement overlay image support. --- dlls/comctl32/listview.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 83bdf56..2dc0a95 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -75,7 +75,6 @@ * States * -- LVIS_ACTIVATING (not currently supported by comctl32.dll version 6.0) * -- LVIS_DROPHILITED - * -- LVIS_OVERLAYMASK * * Styles * -- LVS_NOLABELWRAP @@ -4586,7 +4585,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; if (nSubItem == 0) lvItem.mask |= LVIF_STATE; if (infoPtr->uView == LV_VIEW_DETAILS) lvItem.mask |= LVIF_INDENT; - lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT; + lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT | LVIS_OVERLAYMASK; lvItem.iItem = nItem; lvItem.iSubItem = nSubItem; lvItem.state = 0; @@ -4707,7 +4706,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, lvItem.state & LVIS_CUT ? RGB(255, 255, 255) : CLR_DEFAULT, - style); + style | (lvItem.state & LVIS_OVERLAYMASK)); } /* Don't bother painting item being edited */

1 0

Piotr Caban : oleaut32: Fixed VarBstrFromDate behavior on dates before year 1600.
by Alexandre Julliard Feb. 22, 2013

Feb. 22, 2013

Module: wine Branch: master Commit: 209b58c64e6181c9bf448cb4f3130d3ba705c5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=209b58c64e6181c9bf448cb4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 22 18:46:32 2013 +0100 oleaut32: Fixed VarBstrFromDate behavior on dates before year 1600. --- dlls/oleaut32/tests/vartype.c | 2 +- dlls/oleaut32/vartype.c | 120 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 118 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index e925fa5..4411d7d 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4952,7 +4952,7 @@ static void test_VarBstrFromDate(void) BSTR_DATE(1461.0, "12/31/1903"); BSTR_DATE(1461.5, "12/31/1903 12:00:00 PM"); BSTR_DATE(-49192.24, "4/24/1765 5:45:36 AM"); - todo_wine { BSTR_DATE(-657434.0, "1/1/100"); } + BSTR_DATE(-657434.0, "1/1/100"); BSTR_DATE(2958465.0, "12/31/9999"); #undef BSTR_DATE diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 8632055..28795a7 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6576,6 +6576,120 @@ HRESULT WINAPI VarBstrFromCy(CY cyIn, LCID lcid, ULONG dwFlags, BSTR *pbstrOut) return *pbstrOut ? S_OK : E_OUTOFMEMORY; } +static inline int output_int_len(int o, int min_len, WCHAR *date, int date_len) +{ + int len, tmp; + + if(min_len >= date_len) + return -1; + + for(len=0, tmp=o; tmp; tmp/=10) len++; + if(!len) len++; + if(len >= date_len) + return -1; + + for(tmp=min_len-len; tmp>0; tmp--) + *date++ = '0'; + for(tmp=len; tmp>0; tmp--, o/=10) + date[tmp-1] = '0' + o%10; + return min_len>len ? min_len : len; +} + +/* format date string, similar to GetDateFormatW function but works on bigger range of dates */ +static BOOL get_date_format(LCID lcid, DWORD flags, const SYSTEMTIME *st, + const WCHAR *fmt, WCHAR *date, int date_len) +{ + static const LCTYPE dayname[] = { + LOCALE_SDAYNAME7, LOCALE_SDAYNAME1, LOCALE_SDAYNAME2, LOCALE_SDAYNAME3, + LOCALE_SDAYNAME4, LOCALE_SDAYNAME5, LOCALE_SDAYNAME6 + }; + static const LCTYPE sdayname[] = { + LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, + LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, LOCALE_SABBREVDAYNAME5, + LOCALE_SABBREVDAYNAME6 + }; + static const LCTYPE monthname[] = { + LOCALE_SMONTHNAME1, LOCALE_SMONTHNAME2, LOCALE_SMONTHNAME3, LOCALE_SMONTHNAME4, + LOCALE_SMONTHNAME5, LOCALE_SMONTHNAME6, LOCALE_SMONTHNAME7, LOCALE_SMONTHNAME8, + LOCALE_SMONTHNAME9, LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12 + }; + static const LCTYPE smonthname[] = { + LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, LOCALE_SABBREVMONTHNAME3, + LOCALE_SABBREVMONTHNAME4, LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, LOCALE_SABBREVMONTHNAME9, + LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 + }; + + if(flags & ~(LOCALE_NOUSEROVERRIDE|VAR_DATEVALUEONLY)) + FIXME("ignoring flags %x\n", flags); + flags &= LOCALE_NOUSEROVERRIDE; + + while(*fmt && date_len) { + int count = 1; + + switch(*fmt) { + case 'd': + case 'M': + case 'y': + case 'g': + while(*fmt == *(fmt+count)) + count++; + fmt += count-1; + } + + switch(*fmt) { + case 'd': + if(count >= 4) + count = GetLocaleInfoW(lcid, dayname[st->wDayOfWeek] | flags, date, date_len)-1; + else if(count == 3) + count = GetLocaleInfoW(lcid, sdayname[st->wDayOfWeek] | flags, date, date_len)-1; + else + count = output_int_len(st->wDay, count, date, date_len); + break; + case 'M': + if(count >= 4) + count = GetLocaleInfoW(lcid, monthname[st->wMonth-1] | flags, date, date_len)-1; + else if(count == 3) + count = GetLocaleInfoW(lcid, smonthname[st->wMonth-1] | flags, date, date_len)-1; + else + count = output_int_len(st->wMonth, count, date, date_len); + break; + case 'y': + if(count >= 3) + count = output_int_len(st->wYear, 0, date, date_len); + else + count = output_int_len(st->wYear%100, count, date, date_len); + break; + case 'g': + if(count == 2) { + FIXME("Should be using GetCalendarInfo(CAL_SERASTRING), defaulting to 'AD'\n"); + + *date++ = 'A'; + date_len--; + if(date_len) + *date = 'D'; + else + count = -1; + break; + } + /* fall through */ + default: + *date = *fmt; + } + + if(count < 0) + break; + fmt++; + date += count; + date_len -= count; + } + + if(!date_len) + return FALSE; + *date++ = 0; + return TRUE; +} + /****************************************************************************** * VarBstrFromDate [OLEAUT32.114] * @@ -6596,7 +6710,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst { SYSTEMTIME st; DWORD dwFormatFlags = dwFlags & LOCALE_NOUSEROVERRIDE; - WCHAR date[128], *time; + WCHAR date[128], fmt_buff[80], *time; TRACE("(%g,0x%08x,0x%08x,%p)\n", dateIn, lcid, dwFlags, pbstrOut); @@ -6626,8 +6740,8 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst if (dwFlags & VAR_TIMEVALUEONLY) date[0] = '\0'; else - if (!GetDateFormatW(lcid, dwFormatFlags|DATE_SHORTDATE, &st, NULL, date, - sizeof(date)/sizeof(WCHAR))) + if (!GetLocaleInfoW(lcid, LOCALE_SSHORTDATE, fmt_buff, sizeof(fmt_buff)/sizeof(WCHAR)) || + !get_date_format(lcid, dwFlags, &st, fmt_buff, date, sizeof(date)/sizeof(WCHAR))) return E_INVALIDARG; if (!(dwFlags & VAR_DATEVALUEONLY))

1 0

Jacek Caban : urlmon: Use separated variable for InternetQueryDataAvailable to avoid races.
by Alexandre Julliard Feb. 22, 2013

Feb. 22, 2013

Module: wine Branch: master Commit: b6a7cc91123f1c78e02472e8839c4727d27b67bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a7cc91123f1c78e02472e88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 14:13:19 2013 +0100 urlmon: Use separated variable for InternetQueryDataAvailable to avoid races. --- dlls/urlmon/protocol.c | 55 ++++++++++++++++++++++++++------------------ dlls/urlmon/urlmon_main.h | 1 + 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index c7c61da..890d013 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -349,30 +349,35 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) if(data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA)) { if(!protocol->available_bytes) { - BOOL res; - - /* InternetQueryDataAvailable may immediately fork and perform its asynchronous - * read, so clear the flag _before_ calling so it does not incorrectly get cleared - * after the status callback is called */ - protocol->flags &= ~FLAG_REQUEST_COMPLETE; - res = InternetQueryDataAvailable(protocol->request, &protocol->available_bytes, 0, 0); - if(res) { - TRACE("available %u bytes\n", protocol->available_bytes); - if(!protocol->available_bytes) { - if(is_start) { - TRACE("empty file\n"); - all_data_read(protocol); - }else { - WARN("unexpected end of file?\n"); - report_result(protocol, INET_E_DOWNLOAD_FAILURE); + if(protocol->query_available) { + protocol->available_bytes = protocol->query_available; + }else { + BOOL res; + + /* InternetQueryDataAvailable may immediately fork and perform its asynchronous + * read, so clear the flag _before_ calling so it does not incorrectly get cleared + * after the status callback is called */ + protocol->flags &= ~FLAG_REQUEST_COMPLETE; + res = InternetQueryDataAvailable(protocol->request, &protocol->query_available, 0, 0); + if(res) { + TRACE("available %u bytes\n", protocol->query_available); + if(!protocol->query_available) { + if(is_start) { + TRACE("empty file\n"); + all_data_read(protocol); + }else { + WARN("unexpected end of file?\n"); + report_result(protocol, INET_E_DOWNLOAD_FAILURE); + } + return S_OK; } + protocol->available_bytes = protocol->query_available; + }else if(GetLastError() != ERROR_IO_PENDING) { + protocol->flags |= FLAG_REQUEST_COMPLETE; + WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); + report_result(protocol, INET_E_DATA_NOT_AVAILABLE); return S_OK; } - }else if(GetLastError() != ERROR_IO_PENDING) { - protocol->flags |= FLAG_REQUEST_COMPLETE; - WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); - report_result(protocol, INET_E_DATA_NOT_AVAILABLE); - return S_OK; } protocol->flags |= FLAG_REQUEST_COMPLETE; @@ -421,12 +426,14 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret protocol->current_position += len; protocol->available_bytes -= len; + TRACE("current_position %d, available_bytes %d\n", protocol->current_position, protocol->available_bytes); + if(!protocol->available_bytes) { /* InternetQueryDataAvailable may immediately fork and perform its asynchronous * read, so clear the flag _before_ calling so it does not incorrectly get cleared * after the status callback is called */ protocol->flags &= ~FLAG_REQUEST_COMPLETE; - res = InternetQueryDataAvailable(protocol->request, &protocol->available_bytes, 0, 0); + res = InternetQueryDataAvailable(protocol->request, &protocol->query_available, 0, 0); if(!res) { if (GetLastError() == ERROR_IO_PENDING) { hres = E_PENDING; @@ -438,10 +445,12 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret break; } - if(!protocol->available_bytes) { + if(!protocol->query_available) { all_data_read(protocol); break; } + + protocol->available_bytes = protocol->query_available; } } diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 01de984..ba23e74 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -104,6 +104,7 @@ typedef struct { ULONG current_position; ULONG content_length; ULONG available_bytes; + ULONG query_available; IStream *post_stream;

1 0

Jacek Caban : vbscript: Added support for a few more constants.
by Alexandre Julliard Feb. 22, 2013

Feb. 22, 2013

Module: wine Branch: master Commit: 985814599076e591f72c2e019ab8dbb2141826d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985814599076e591f72c2e019… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 12:30:07 2013 +0100 vbscript: Added support for a few more constants. --- dlls/vbscript/global.c | 80 +++++------------------------------------- dlls/vbscript/tests/api.vbs | 10 +++++ dlls/vbscript/vbdisp.c | 2 +- 3 files changed, 21 insertions(+), 71 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1a3dae7..a576f08 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1609,66 +1609,6 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_vbUseDefault(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbBinaryCompare(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbTextCompare(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbDatabaseCompare(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbGeneralDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbLongDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbShortDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbLongTime(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbShortTime(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbObjectError(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Global_vbBlack(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -1826,16 +1766,16 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBARRAY, NULL, BP_GET, VT_ARRAY}, {DISPID_GLOBAL_VBTRUE, NULL, BP_GET, VARIANT_TRUE}, {DISPID_GLOBAL_VBFALSE, NULL, BP_GET, VARIANT_FALSE}, - {DISPID_GLOBAL_VBUSEDEFAULT, Global_vbUseDefault, BP_GET}, - {DISPID_GLOBAL_VBBINARYCOMPARE, Global_vbBinaryCompare, BP_GET}, - {DISPID_GLOBAL_VBTEXTCOMPARE, Global_vbTextCompare, BP_GET}, - {DISPID_GLOBAL_VBDATABASECOMPARE, Global_vbDatabaseCompare, BP_GET}, - {DISPID_GLOBAL_VBGENERALDATE, Global_vbGeneralDate, BP_GET}, - {DISPID_GLOBAL_VBLONGDATE, Global_vbLongDate, BP_GET}, - {DISPID_GLOBAL_VBSHORTDATE, Global_vbShortDate, BP_GET}, - {DISPID_GLOBAL_VBLONGTIME, Global_vbLongTime, BP_GET}, - {DISPID_GLOBAL_VBSHORTTIME, Global_vbShortTime, BP_GET}, - {DISPID_GLOBAL_VBOBJECTERROR, Global_vbObjectError, BP_GET}, + {DISPID_GLOBAL_VBUSEDEFAULT, NULL, BP_GET, -2}, + {DISPID_GLOBAL_VBBINARYCOMPARE, NULL, BP_GET, 0}, + {DISPID_GLOBAL_VBTEXTCOMPARE, NULL, BP_GET, 1}, + {DISPID_GLOBAL_VBDATABASECOMPARE, NULL, BP_GET, 2}, + {DISPID_GLOBAL_VBGENERALDATE, NULL, BP_GET, 0}, + {DISPID_GLOBAL_VBLONGDATE, NULL, BP_GET, 1}, + {DISPID_GLOBAL_VBSHORTDATE, NULL, BP_GET, 2}, + {DISPID_GLOBAL_VBLONGTIME, NULL, BP_GET, 3}, + {DISPID_GLOBAL_VBSHORTTIME, NULL, BP_GET, 4}, + {DISPID_GLOBAL_VBOBJECTERROR, NULL, BP_GET, 0x80040000}, {DISPID_GLOBAL_VBBLACK, Global_vbBlack, BP_GET}, {DISPID_GLOBAL_VBBLUE, Global_vbBlue, BP_GET}, {DISPID_GLOBAL_VBCYAN, Global_vbCyan, BP_GET}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 6472b95..ee68e9e 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -85,6 +85,16 @@ TestConstantI4 "vbMsgBoxHelpButton", vbMsgBoxHelpButton, 16384 TestConstantI4 "vbMsgBoxSetForeground", vbMsgBoxSetForeground, 65536 TestConstantI4 "vbMsgBoxRight", vbMsgBoxRight, 524288 TestConstantI4 "vbMsgBoxRtlReading", vbMsgBoxRtlReading, 1048576 +TestConstant "vbUseDefault", vbUseDefault, -2 +TestConstant "vbBinaryCompare", vbBinaryCompare, 0 +TestConstant "vbTextCompare", vbTextCompare, 1 +TestConstant "vbDatabaseCompare", vbDatabaseCompare, 2 +TestConstant "vbGeneralDate", vbGeneralDate, 0 +TestConstant "vbLongDate", vbLongDate, 1 +TestConstant "vbShortDate", vbShortDate, 2 +TestConstant "vbLongTime", vbLongTime, 3 +TestConstant "vbShortTime", vbShortTime, 4 +TestConstantI4 "vbObjectError", vbObjectError, &h80040000& Sub TestCStr(arg, exval) dim x diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 843d5c8..5a23c71 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -151,7 +151,7 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f case DISPATCH_PROPERTYGET|DISPATCH_METHOD: if(!prop->proc && prop->flags == BP_GET) { int val = prop->min_args; - if(val < 0x4000) { + if(val < 0x4000 && (INT16)val == val) { V_VT(res) = VT_I2; V_I2(res) = val; }else {

1 0

Andrew Talbot : oleaut32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 22, 2013

Feb. 22, 2013

Module: wine Branch: master Commit: eedf2f6fab3756eebd575c42aea45d8251f569fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=eedf2f6fab3756eebd575c42a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 21 22:30:17 2013 +0000 oleaut32: Avoid signed-unsigned integer comparisons. --- dlls/oleaut32/olepicture.c | 4 ++-- dlls/oleaut32/olepropframe.c | 2 +- dlls/oleaut32/typelib.c | 17 +++++++++++------ dlls/oleaut32/typelib2.c | 4 +++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 3fdb1c7..4b3e9dd 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1420,8 +1420,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) } while (!headerisdata); if (statfailed) { /* we don't know the size ... read all we get */ - int sizeinc = 4096; - int origsize = sizeinc; + unsigned int sizeinc = 4096; + unsigned int origsize = sizeinc; ULONG nread = 42; TRACE("Reading all data from stream.\n"); diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index e566266..9a563f1 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -168,7 +168,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) IPropertyPage **property_page; PropertyPageSite *property_page_site; HRESULT res; - int i; + ULONG i; HMODULE hcomctl; HRSRC property_sheet_dialog_find = NULL; HGLOBAL property_sheet_dialog_load = NULL; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0f3ca6b..6d37bd4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4388,7 +4388,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoOfGuid( ITypeInfo **ppTInfo) { ITypeLibImpl *This = impl_from_ITypeLib2(iface); - UINT i; + int i; TRACE("%p %s %p\n", This, debugstr_guid(guid), ppTInfo); @@ -4553,7 +4553,8 @@ static HRESULT WINAPI ITypeLib2_fnIsName( BOOL *pfName) { ITypeLibImpl *This = impl_from_ITypeLib2(iface); - UINT nNameBufLen = (lstrlenW(szNameBuf)+1)*sizeof(WCHAR), tic, fdc, vrc, pc; + int tic; + UINT nNameBufLen = (lstrlenW(szNameBuf)+1)*sizeof(WCHAR), fdc, vrc; TRACE("(%p)->(%s,%08x,%p)\n", This, debugstr_w(szNameBuf), lHashVal, pfName); @@ -4564,6 +4565,8 @@ static HRESULT WINAPI ITypeLib2_fnIsName( if(!memcmp(szNameBuf,pTInfo->Name, nNameBufLen)) goto ITypeLib2_fnIsName_exit; for(fdc = 0; fdc < pTInfo->TypeAttr.cFuncs; ++fdc) { TLBFuncDesc *pFInfo = &pTInfo->funcdescs[fdc]; + int pc; + if(!memcmp(szNameBuf,pFInfo->Name, nNameBufLen)) goto ITypeLib2_fnIsName_exit; for(pc=0; pc < pFInfo->funcdesc.cParams; pc++) if(!memcmp(szNameBuf,pFInfo->pParamDesc[pc].Name, nNameBufLen)) @@ -4599,7 +4602,8 @@ static HRESULT WINAPI ITypeLib2_fnFindName( UINT16 *found) { ITypeLibImpl *This = impl_from_ITypeLib2(iface); - UINT tic, count = 0; + int tic; + UINT count = 0; UINT len; TRACE("(%p)->(%s %u %p %p %p)\n", This, debugstr_w(name), hash, ppTInfo, memid, found); @@ -4616,7 +4620,7 @@ static HRESULT WINAPI ITypeLib2_fnFindName( if(!memcmp(name, pTInfo->Name, len)) goto ITypeLib2_fnFindName_exit; for(fdc = 0; fdc < pTInfo->TypeAttr.cFuncs; ++fdc) { TLBFuncDesc *func = &pTInfo->funcdescs[fdc]; - UINT pc; + int pc; if(!memcmp(name, func->Name, len)) goto ITypeLib2_fnFindName_exit; for(pc = 0; pc < func->funcdesc.cParams; pc++) { @@ -4995,7 +4999,7 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( ITypeComp ** ppTComp) { ITypeLibImpl *This = impl_from_ITypeComp(iface); - UINT i; + int i; TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); @@ -5097,7 +5101,7 @@ static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface) static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) { - UINT i, j; + UINT i; TRACE("destroying ITypeInfo(%p)\n",This); @@ -5112,6 +5116,7 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) for (i = 0; i < This->TypeAttr.cFuncs; ++i) { + int j; TLBFuncDesc *pFInfo = &This->funcdescs[i]; for(j = 0; j < pFInfo->funcdesc.cParams; j++) { diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 689d9af..354ec8a 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2050,8 +2050,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( if(This->dual) This->dual->typedata = This->typedata; } else { + unsigned int j; + iter = This->typedata->next; - for(i=0; i<index; i++) + for (j = 0; j < index; j++) iter = iter->next; insert->next = iter->next;

1 0

Jacek Caban : wininet: Fail in NETCON_secure_connect instead of create_netconn if OpenSSL is not available .
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: 85991a7cddd1bde0480cd981179f8241b5d2d9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=85991a7cddd1bde0480cd9811… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 21 18:08:46 2013 +0100 wininet: Fail in NETCON_secure_connect instead of create_netconn if OpenSSL is not available. --- dlls/wininet/netconnection.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 8d5fc6f..4869d60 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -463,7 +463,6 @@ static long get_tls_option(void) { #endif return tls_option; } -#endif /* SONAME_LIBSSL */ static CRITICAL_SECTION init_ssl_cs; static CRITICAL_SECTION_DEBUG init_ssl_cs_debug = @@ -477,7 +476,7 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; static DWORD init_openssl(void) { -#if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) +#ifdef SONAME_LIBCRYPTO int i; if(OpenSSL_ssl_handle) @@ -600,10 +599,11 @@ static DWORD init_openssl(void) return ERROR_SUCCESS; #else - FIXME("can't use SSL, not compiled in.\n"); + FIXME("can't use SSL, libcrypto not compiled in.\n"); return ERROR_INTERNET_SECURITY_CHANNEL_ERROR; #endif } +#endif /* SONAME_LIBSSL */ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout) { @@ -663,6 +663,7 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m netconn_t *netconn; int result; +#ifdef SONAME_LIBSSL if(useSSL) { DWORD res; @@ -674,6 +675,7 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m if(res != ERROR_SUCCESS) return res; } +#endif netconn = heap_alloc_zero(sizeof(*netconn)); if(!netconn) @@ -910,6 +912,8 @@ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) res = netcon_secure_connect_setup(connection, get_tls_option()|SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); } #endif +#else + FIXME("Cannot connect, OpenSSL not available.\n"); #endif return res; } @@ -943,6 +947,7 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, return ERROR_INTERNET_CONNECTION_ABORTED; return ERROR_SUCCESS; #else + FIXME("not supported on this platform\n"); return ERROR_NOT_SUPPORTED; #endif } @@ -980,6 +985,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, return *recvd > 0 ? ERROR_SUCCESS : ERROR_INTERNET_CONNECTION_ABORTED; #else + FIXME("not supported on this platform\n"); return ERROR_NOT_SUPPORTED; #endif } @@ -1010,6 +1016,9 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) { #ifdef SONAME_LIBSSL *available = connection->ssl_s ? pSSL_pending(connection->ssl_s) : 0; +#else + FIXME("not supported on this platform\n"); + return FALSE; #endif } return TRUE; @@ -1058,6 +1067,7 @@ LPCVOID NETCON_GetCert(netconn_t *connection) r = X509_to_cert_context(cert); return r; #else + FIXME("not supported on this platform\n"); return NULL; #endif } @@ -1080,6 +1090,7 @@ int NETCON_GetCipherStrength(netconn_t *connection) pSSL_CIPHER_get_bits(cipher, &bits); return bits; #else + FIXME("not supported on this platform\n"); return 0; #endif }

1 0

Jacek Caban : winhttp: Removed no longer used netconn_init argument.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: 42750e340e9947e2c48e319bc0f61409d2439fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=42750e340e9947e2c48e319bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 21 18:08:25 2013 +0100 winhttp: Removed no longer used netconn_init argument. --- dlls/winhttp/net.c | 2 +- dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 2 +- dlls/winhttp/winhttp_private.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index d2fdb86..fa8cad0 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -267,7 +267,7 @@ static BOOL ensure_cred_handle(void) return ret; } -BOOL netconn_init( netconn_t *conn, BOOL secure ) +BOOL netconn_init( netconn_t *conn ) { memset(conn, 0, sizeof(*conn)); conn->socket = -1; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 584f27d..301478d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1636,7 +1636,7 @@ static BOOL handle_redirect( request_t *request, DWORD status ) if (!(ret = set_server_for_hostname( connect, hostname, port ))) goto end; netconn_close( &request->netconn ); - if (!(ret = netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE ))) goto end; + if (!(ret = netconn_init( &request->netconn ))) goto end; } if (!(ret = add_host_header( request, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; if (!(ret = open_connection( request ))) goto end; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index d5aa153..41b266a 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -959,7 +959,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->connect = connect; list_add_head( &connect->hdr.children, &request->hdr.entry ); - if (!netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE )) goto end; + if (!netconn_init( &request->netconn )) goto end; request->resolve_timeout = connect->session->resolve_timeout; request->connect_timeout = connect->session->connect_timeout; request->send_timeout = connect->session->send_timeout; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 72605af..963abec 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -231,7 +231,7 @@ BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int ) BOOL netconn_connected( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_create( netconn_t *, int, int, int ) DECLSPEC_HIDDEN; BOOL netconn_get_next_line( netconn_t *, char *, DWORD * ) DECLSPEC_HIDDEN; -BOOL netconn_init( netconn_t *, BOOL ) DECLSPEC_HIDDEN; +BOOL netconn_init( netconn_t * ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : webservices: Add new dll.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: ee9689b4d0f936fdbe89aeb11e699cba16e6a9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9689b4d0f936fdbe89aeb11… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 21 13:53:44 2013 +1100 webservices: Add new dll. --- configure | 1 + configure.ac | 1 + dlls/webservices/Makefile.in | 7 ++ dlls/webservices/main.c | 51 ++++++++++ dlls/webservices/webservices.spec | 193 +++++++++++++++++++++++++++++++++++++ 5 files changed, 253 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2fa08a6..5a29243 100755 --- a/configure +++ b/configure @@ -16175,6 +16175,7 @@ wine_fn_config_dll w32skrnl enable_win16 wine_fn_config_dll w32sys.dll16 enable_win16 wine_fn_config_dll wbemprox enable_wbemprox wine_fn_config_test dlls/wbemprox/tests wbemprox_test +wine_fn_config_dll webservices enable_webservices implib wine_fn_config_dll wer enable_wer implib wine_fn_config_test dlls/wer/tests wer_test wine_fn_config_dll wevtapi enable_wevtapi diff --git a/configure.ac b/configure.ac index fd7d0b7..836c4e7 100644 --- a/configure.ac +++ b/configure.ac @@ -3058,6 +3058,7 @@ WINE_CONFIG_DLL(w32skrnl,enable_win16) WINE_CONFIG_DLL(w32sys.dll16,enable_win16) WINE_CONFIG_DLL(wbemprox) WINE_CONFIG_TEST(dlls/wbemprox/tests) +WINE_CONFIG_DLL(webservices,,[implib]) WINE_CONFIG_DLL(wer,,[implib]) WINE_CONFIG_TEST(dlls/wer/tests) WINE_CONFIG_DLL(wevtapi) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in new file mode 100644 index 0000000..919e9a0 --- /dev/null +++ b/dlls/webservices/Makefile.in @@ -0,0 +1,7 @@ +MODULE = webservices.dll +IMPORTLIB = webservices + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/webservices/main.c b/dlls/webservices/main.c new file mode 100644 index 0000000..f00e6f3 --- /dev/null +++ b/dlls/webservices/main.c @@ -0,0 +1,51 @@ +/* + * Web Services + * + * Copyright 2013 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "wincodec.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(webservices); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec new file mode 100644 index 0000000..7bbf5dd --- /dev/null +++ b/dlls/webservices/webservices.spec @@ -0,0 +1,193 @@ +@ stub WsAbandonCall +@ stub WsAbandonMessage +@ stub WsAbortChannel +@ stub WsAbortListener +@ stub WsAbortServiceHost +@ stub WsAbortServiceProxy +@ stub WsAcceptChannel +@ stub WsAddCustomHeader +@ stub WsAddErrorString +@ stub WsAddMappedHeader +@ stub WsAddressMessage +@ stub WsAlloc +@ stub WsAsyncExecute +@ stub WsCall +@ stub WsCheckMustUnderstandHeaders +@ stub WsCloseChannel +@ stub WsCloseListener +@ stub WsCloseServiceHost +@ stub WsCloseServiceProxy +@ stub WsCombineUrl +@ stub WsCopyError +@ stub WsCopyNode +@ stub WsCreateChannel +@ stub WsCreateChannelForListener +@ stub WsCreateError +@ stub WsCreateFaultFromError +@ stub WsCreateHeap +@ stub WsCreateListener +@ stub WsCreateMessage +@ stub WsCreateMessageForChannel +@ stub WsCreateMetadata +@ stub WsCreateReader +@ stub WsCreateServiceEndpointFromTemplate +@ stub WsCreateServiceHost +@ stub WsCreateServiceProxy +@ stub WsCreateServiceProxyFromTemplate +@ stub WsCreateWriter +@ stub WsCreateXmlBuffer +@ stub WsCreateXmlSecurityToken +@ stub WsDateTimeToFileTime +@ stub WsDecodeUrl +@ stub WsEncodeUrl +@ stub WsEndReaderCanonicalization +@ stub WsEndWriterCanonicalization +@ stub WsFileTimeToDateTime +@ stub WsFillBody +@ stub WsFillReader +@ stub WsFindAttribute +@ stub WsFlushBody +@ stub WsFlushWriter +@ stub WsFreeChannel +@ stub WsFreeError +@ stub WsFreeHeap +@ stub WsFreeListener +@ stub WsFreeMessage +@ stub WsFreeMetadata +@ stub WsFreeReader +@ stub WsFreeSecurityToken +@ stub WsFreeServiceHost +@ stub WsFreeServiceProxy +@ stub WsFreeWriter +@ stub WsGetChannelProperty +@ stub WsGetCustomHeader +@ stub WsGetDictionary +@ stub WsGetErrorProperty +@ stub WsGetErrorString +@ stub WsGetFaultErrorDetail +@ stub WsGetFaultErrorProperty +@ stub WsGetHeader +@ stub WsGetHeaderAttributes +@ stub WsGetHeapProperty +@ stub WsGetListenerProperty +@ stub WsGetMappedHeader +@ stub WsGetMessageProperty +@ stub WsGetMetadataEndpoints +@ stub WsGetMetadataProperty +@ stub WsGetMissingMetadataDocumentAddress +@ stub WsGetNamespaceFromPrefix +@ stub WsGetOperationContextProperty +@ stub WsGetPolicyAlternativeCount +@ stub WsGetPolicyProperty +@ stub WsGetPrefixFromNamespace +@ stub WsGetReaderNode +@ stub WsGetReaderPosition +@ stub WsGetReaderProperty +@ stub WsGetSecurityContextProperty +@ stub WsGetSecurityTokenProperty +@ stub WsGetServiceHostProperty +@ stub WsGetServiceProxyProperty +@ stub WsGetWriterPosition +@ stub WsGetWriterProperty +@ stub WsGetXmlAttribute +@ stub WsInitializeMessage +@ stub WsMarkHeaderAsUnderstood +@ stub WsMatchPolicyAlternative +@ stub WsMoveReader +@ stub WsMoveWriter +@ stub WsOpenChannel +@ stub WsOpenListener +@ stub WsOpenServiceHost +@ stub WsOpenServiceProxy +@ stub WsPullBytes +@ stub WsPushBytes +@ stub WsReadArray +@ stub WsReadAttribute +@ stub WsReadBody +@ stub WsReadBytes +@ stub WsReadChars +@ stub WsReadCharsUtf8 +@ stub WsReadElement +@ stub WsReadEndAttribute +@ stub WsReadEndElement +@ stub WsReadEndpointAddressExtension +@ stub WsReadEnvelopeEnd +@ stub WsReadEnvelopeStart +@ stub WsReadMessageEnd +@ stub WsReadMessageStart +@ stub WsReadMetadata +@ stub WsReadNode +@ stub WsReadQualifiedName +@ stub WsReadStartAttribute +@ stub WsReadStartElement +@ stub WsReadToStartElement +@ stub WsReadType +@ stub WsReadValue +@ stub WsReadXmlBuffer +@ stub WsReadXmlBufferFromBytes +@ stub WsReceiveMessage +@ stub WsRegisterOperationForCancel +@ stub WsRemoveCustomHeader +@ stub WsRemoveHeader +@ stub WsRemoveMappedHeader +@ stub WsRemoveNode +@ stub WsRequestReply +@ stub WsRequestSecurityToken +@ stub WsResetChannel +@ stub WsResetError +@ stub WsResetHeap +@ stub WsResetListener +@ stub WsResetMessage +@ stub WsResetMetadata +@ stub WsResetServiceHost +@ stub WsResetServiceProxy +@ stub WsRevokeSecurityContext +@ stub WsSendFaultMessageForError +@ stub WsSendMessage +@ stub WsSendReplyMessage +@ stub WsSetChannelProperty +@ stub WsSetErrorProperty +@ stub WsSetFaultErrorDetail +@ stub WsSetFaultErrorProperty +@ stub WsSetHeader +@ stub WsSetInput +@ stub WsSetInputToBuffer +@ stub WsSetListenerProperty +@ stub WsSetMessageProperty +@ stub WsSetOutput +@ stub WsSetOutputToBuffer +@ stub WsSetReaderPosition +@ stub WsSetWriterPosition +@ stub WsShutdownSessionChannel +@ stub WsSkipNode +@ stub WsStartReaderCanonicalization +@ stub WsStartWriterCanonicalization +@ stub WsTrimXmlWhitespace +@ stub WsVerifyXmlNCName +@ stub WsWriteArray +@ stub WsWriteAttribute +@ stub WsWriteBody +@ stub WsWriteBytes +@ stub WsWriteChars +@ stub WsWriteCharsUtf8 +@ stub WsWriteElement +@ stub WsWriteEndAttribute +@ stub WsWriteEndCData +@ stub WsWriteEndElement +@ stub WsWriteEndStartElement +@ stub WsWriteEnvelopeEnd +@ stub WsWriteEnvelopeStart +@ stub WsWriteMessageEnd +@ stub WsWriteMessageStart +@ stub WsWriteNode +@ stub WsWriteQualifiedName +@ stub WsWriteStartAttribute +@ stub WsWriteStartCData +@ stub WsWriteStartElement +@ stub WsWriteText +@ stub WsWriteType +@ stub WsWriteValue +@ stub WsWriteXmlBuffer +@ stub WsWriteXmlBufferToBytes +@ stub WsWriteXmlnsAttribute +@ stub WsXmlStringEquals

1 0

Hans Leidekker : wmiutils: Implement IWbemPathKeyList::RemoveAllKeys.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: 612caa5d393c45dd4e3e6491f0835bdeb22df603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=612caa5d393c45dd4e3e6491f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 21 10:46:54 2013 +0100 wmiutils: Implement IWbemPathKeyList::RemoveAllKeys. --- dlls/wmiutils/path.c | 54 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 98f22db..dcade46 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -39,6 +39,14 @@ struct keylist LONG refs; }; +struct key +{ + WCHAR *name; + int len_name; + WCHAR *value; + int len_value; +}; + struct path { IWbemPath IWbemPath_iface; @@ -191,12 +199,37 @@ static HRESULT WINAPI keylist_RemoveKey( return E_NOTIMPL; } +static void free_keys( struct key *keys, unsigned int count ) +{ + unsigned int i; + + for (i = 0; i < count; i++) + { + heap_free( keys[i].name ); + heap_free( keys[i].value ); + } + heap_free( keys ); +} + static HRESULT WINAPI keylist_RemoveAllKeys( IWbemPathKeyList *iface, ULONG uFlags ) { - FIXME("%p, 0x%x\n", iface, uFlags); - return E_NOTIMPL; + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + struct path *parent = impl_from_IWbemPath( keylist->parent ); + + TRACE("%p, 0x%x\n", iface, uFlags); + + if (uFlags) return WBEM_E_INVALID_PARAMETER; + + EnterCriticalSection( &parent->cs ); + + free_keys( parent->keys, parent->num_keys ); + parent->num_keys = 0; + parent->keys = NULL; + + LeaveCriticalSection( &parent->cs ); + return S_OK; } static HRESULT WINAPI keylist_MakeSingleton( @@ -262,14 +295,6 @@ static HRESULT WbemPathKeyList_create( IUnknown *pUnkOuter, IWbemPath *parent, L return S_OK; } -struct key -{ - WCHAR *name; - int len_name; - WCHAR *value; - int len_value; -}; - static void init_path( struct path *path ) { path->text = NULL; @@ -288,19 +313,12 @@ static void init_path( struct path *path ) static void clear_path( struct path *path ) { - unsigned int i; - heap_free( path->text ); heap_free( path->server ); heap_free( path->namespaces ); heap_free( path->len_namespaces ); heap_free( path->class ); - for (i = 0; i < path->num_keys; i++) - { - heap_free( path->keys[i].name ); - heap_free( path->keys[i].value ); - } - heap_free( path->keys ); + free_keys( path->keys, path->num_keys ); init_path( path ); }

1 0

Hans Leidekker : wmiutils: Add support for for parsing and serializing a key list.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: 7b00683d6e4fdaccd5aede140e32a9c84f1dff1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b00683d6e4fdaccd5aede140… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 21 10:45:17 2013 +0100 wmiutils: Add support for for parsing and serializing a key list. --- dlls/wmiutils/path.c | 180 +++++++++++++++++++++++++++++++++----- dlls/wmiutils/tests/path.c | 48 ++++++++++- dlls/wmiutils/wmiutils_private.h | 6 ++ 3 files changed, 210 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b00683d6e4fdaccd5aed…

1 0

Andrew Talbot : ntdll: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: d0d28b96a4ee1c370ee48f12328e91883c77afac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d28b96a4ee1c370ee48f123… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 20 21:25:56 2013 +0000 ntdll: Avoid signed-unsigned integer comparisons. --- dlls/ntdll/directory.c | 2 +- dlls/ntdll/nt.c | 6 +++--- dlls/ntdll/sync.c | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 863a320..c552a8b 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -145,7 +145,7 @@ struct file_identity }; static struct file_identity ignored_files[MAX_IGNORED_FILES]; -static int ignored_files_count; +static unsigned int ignored_files_count; union file_directory_info { diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a2e0716..ee89bb7 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1166,7 +1166,7 @@ void fill_cpu_info(void) static inline BOOL logical_proc_info_add_by_id(SYSTEM_LOGICAL_PROCESSOR_INFORMATION *data, DWORD *len, DWORD max_len, LOGICAL_PROCESSOR_RELATIONSHIP rel, DWORD id, DWORD proc) { - int i; + DWORD i; for(i=0; i<*len; i++) { @@ -1192,7 +1192,7 @@ static inline BOOL logical_proc_info_add_by_id(SYSTEM_LOGICAL_PROCESSOR_INFORMAT static inline BOOL logical_proc_info_add_cache(SYSTEM_LOGICAL_PROCESSOR_INFORMATION *data, DWORD *len, DWORD max_len, ULONG_PTR mask, CACHE_DESCRIPTOR *cache) { - int i; + DWORD i; for(i=0; i<*len; i++) { @@ -1891,7 +1891,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( if (cpus == 0) { static int i = 1; - int n; + unsigned int n; cpus = min(NtCurrentTeb()->Peb->NumberOfProcessors, out_cpus); len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; sppi = RtlAllocateHeap(GetProcessHeap(), 0, len); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 09151a9..58dde65 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1091,7 +1091,8 @@ NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UIN const LARGE_INTEGER *timeout, HANDLE signal_object ) { NTSTATUS ret; - int i, cookie; + UINT i; + int cookie; BOOL user_apc = FALSE; obj_handle_t obj_handles[MAXIMUM_WAIT_OBJECTS]; obj_handle_t apc_handle = 0;

1 0

Jörg Höhle : mmdevapi/tests: Produce audible 16bit output too.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: c771fe923178972dc1a990c6c2bcb08c771b6681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c771fe923178972dc1a990c6c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 15 22:23:34 2012 +0100 mmdevapi/tests: Produce audible 16bit output too. --- dlls/mmdevapi/tests/render.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index e753299..beebfb6 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -75,8 +75,10 @@ static DWORD wave_generate_tone(PWAVEFORMATEX pwfx, BYTE* data, UINT32 frames) DWORD cn, i; double delta, y; - if(!winetest_interactive || wfxe->Format.wFormatTag != WAVE_FORMAT_EXTENSIBLE || - !IsEqualGUID(&wfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) + if(!winetest_interactive) + return AUDCLNT_BUFFERFLAGS_SILENT; + if(wfxe->Format.wBitsPerSample != ((wfxe->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&wfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) ? 8 * sizeof(float) : 16)) return AUDCLNT_BUFFERFLAGS_SILENT; for(delta = phase, cn = 0; cn < wfxe->Format.nChannels; @@ -84,8 +86,10 @@ static DWORD wave_generate_tone(PWAVEFORMATEX pwfx, BYTE* data, UINT32 frames) for(i = 0; i < frames; i++){ y = sin(2*PI*(440.* i / wfxe->Format.nSamplesPerSec + delta)); /* assume alignment is granted */ - ((float*)data)[cn+i*wfxe->Format.nChannels] = y; - /* fixme: 16bit for exclusive mode */ + if(wfxe->Format.wBitsPerSample == 16) + ((short*)data)[cn+i*wfxe->Format.nChannels] = y * 32767.9; + else + ((float*)data)[cn+i*wfxe->Format.nChannels] = y; } } phase += 440.* frames / wfxe->Format.nSamplesPerSec;

1 0

Francois Gouget : d3d9/tests: CheckDeviceType() may also return D3DERR_NOTAVAILABLE for D3DFMT_X1R5G5B5.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: ce34094f5f3f60fe3d4ce0a1b69eb29deedba9a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce34094f5f3f60fe3d4ce0a1b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 21 16:22:42 2013 +0100 d3d9/tests: CheckDeviceType() may also return D3DERR_NOTAVAILABLE for D3DFMT_X1R5G5B5. Spice's QXL driver claims to support X1R5G5B5 but then returns NOTAVAILABLE just like the Windows Standard VGA driver does for R5G6B5 and X8R8G8B8. --- dlls/d3d9/tests/device.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ba8a3ef..bbbcbbc 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2325,7 +2325,7 @@ static void test_display_formats(void) if(r5g6b5_format_list[i].shouldPass) ok(hr == D3D_OK || - broken(hr == D3DERR_NOTAVAILABLE), + broken(hr == D3DERR_NOTAVAILABLE) /* Windows VGA driver */, "format %d %d didn't pass with hr=%#08x\n", r5g6b5_format_list[i].DisplayFormat, r5g6b5_format_list[i].BackBufferFormat, hr); else ok(hr != D3D_OK, "format %d %d didn't pass while it was expected to\n", r5g6b5_format_list[i].DisplayFormat, r5g6b5_format_list[i].BackBufferFormat); @@ -2342,7 +2342,9 @@ static void test_display_formats(void) hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, x1r5g5b5_format_list[i].DisplayFormat, x1r5g5b5_format_list[i].BackBufferFormat, FALSE); if(x1r5g5b5_format_list[i].shouldPass) - ok(hr == D3D_OK, "format %d %d didn't pass with hr=%#08x\n", x1r5g5b5_format_list[i].DisplayFormat, x1r5g5b5_format_list[i].BackBufferFormat, hr); + ok(hr == D3D_OK || + broken(hr == D3DERR_NOTAVAILABLE) /* Spice QXL driver */, + "format %d %d didn't pass with hr=%#08x\n", x1r5g5b5_format_list[i].DisplayFormat, x1r5g5b5_format_list[i].BackBufferFormat, hr); else ok(hr != D3D_OK, "format %d %d didn't pass while it was expected to\n", x1r5g5b5_format_list[i].DisplayFormat, x1r5g5b5_format_list[i].BackBufferFormat); } @@ -2356,10 +2358,11 @@ static void test_display_formats(void) for(i=0; x8r8g8b8_format_list[i].DisplayFormat != 0; i++) { hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, FALSE); + trace("CheckDeviceType(%d %d) = %08x shouldPass = %d\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, hr, x8r8g8b8_format_list[i].shouldPass); if(x8r8g8b8_format_list[i].shouldPass) ok(hr == D3D_OK || - broken(hr == D3DERR_NOTAVAILABLE), + broken(hr == D3DERR_NOTAVAILABLE) /* Windows VGA driver */, "format %d %d didn't pass with hr=%#08x\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, hr); else ok(hr != D3D_OK, "format %d %d didn't pass while it was expected to\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat);

1 0

André Hentschel : comctl32/tests: Mark win8 behaviour as broken.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: 2c966be6c3bd8121ef87f65f9a3e3e7ac446e0af URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c966be6c3bd8121ef87f65f9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 20 23:37:45 2013 +0100 comctl32/tests: Mark win8 behaviour as broken. --- dlls/comctl32/tests/status.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index d8b3dbe..4870910 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -492,7 +492,7 @@ static void test_gettext(void) expect(4, r); /* A size of 0 returns the length of the text */ r = SendMessage(hwndStatus, WM_GETTEXT, 0, 0); - expect(4, r); + ok( r == 4 || broken(r == 2) /* win8 */, "Expected 4 got %d\n", r ); /* A size of 1 only stores the NULL terminator */ buf[0] = 0xa; r = SendMessage(hwndStatus, WM_GETTEXT, 1, (LPARAM)buf);

1 0

Hans Leidekker : rpcrt4: Accept HTTP idle packets while waiting for the second prepare header.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: 164ddbca8c232470c825a0b75e183cef5250490a URL: http://source.winehq.org/git/wine.git/?a=commit;h=164ddbca8c232470c825a0b75… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 21 10:47:45 2013 +0100 rpcrt4: Accept HTTP idle packets while waiting for the second prepare header. --- dlls/rpcrt4/rpc_transport.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 54f0faa..e3e428b 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2324,9 +2324,22 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, if (status != RPC_S_OK) return status; TRACE("received (%d) from first prepare header\n", field1); - status = rpcrt4_http_read_http_packet(out_request, &pkt_from_server, - &data_from_server); - if (status != RPC_S_OK) return status; + for (;;) + { + status = rpcrt4_http_read_http_packet(out_request, &pkt_from_server, + &data_from_server); + if (status != RPC_S_OK) return status; + if (pkt_from_server.http.flags != 0x0001) break; + + TRACE("http idle packet, waiting for real packet\n"); + HeapFree(GetProcessHeap(), 0, data_from_server); + if (pkt_from_server.http.num_data_items != 0) + { + ERR("HTTP idle packet should have no data items instead of %d\n", + pkt_from_server.http.num_data_items); + return RPC_S_PROTOCOL_ERROR; + } + } status = RPCRT4_ParseHttpPrepareHeader2(&pkt_from_server, data_from_server, &field1, flow_control_increment, &field3);

1 0

Hans Leidekker : wmiutils: Implement IWbemPathKeyList::GetCount.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: 13974194709e678e82144e1dc7aa0f8b84e8f2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=13974194709e678e82144e1dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 21 10:46:19 2013 +0100 wmiutils: Implement IWbemPathKeyList::GetCount. --- dlls/wmiutils/path.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 5f64aa0..98f22db 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -116,8 +116,19 @@ static HRESULT WINAPI keylist_GetCount( IWbemPathKeyList *iface, ULONG *puKeyCount ) { - FIXME("%p, %p\n", iface, puKeyCount); - return E_NOTIMPL; + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + struct path *parent = impl_from_IWbemPath( keylist->parent ); + + TRACE("%p, %p\n", iface, puKeyCount); + + if (!puKeyCount) return WBEM_E_INVALID_PARAMETER; + + EnterCriticalSection( &parent->cs ); + + *puKeyCount = parent->num_keys; + + LeaveCriticalSection( &parent->cs ); + return S_OK; } static HRESULT WINAPI keylist_SetKey(

1 0

Daniel Jelinski : comctl32/listview: Fix incorrect message parameters.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: 75d774a43b53c934ae3b848f618a9be21bef655d URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d774a43b53c934ae3b848f6… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed Feb 20 22:36:23 2013 +0100 comctl32/listview: Fix incorrect message parameters. --- dlls/comctl32/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a22b2da..83bdf56 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3549,8 +3549,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) ZeroMemory(&nmlv, sizeof(nmlv)); nmlv.iFrom = nFirst; nmlv.iTo = nLast; - nmlv.uNewState = 0; - nmlv.uOldState = item.state; + nmlv.uOldState = 0; + nmlv.uNewState = item.state; notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); if (!IsWindow(hwndSelf))

1 0

Dmitry Timoshkov : gdiplus: Correct the GdipDrawString .spec entry.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: 668cfb1c5ae75e0e1eed919117a2010f442f03af URL: http://source.winehq.org/git/wine.git/?a=commit;h=668cfb1c5ae75e0e1eed91911… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 21 13:31:44 2013 +0800 gdiplus: Correct the GdipDrawString .spec entry. --- dlls/gdiplus/gdiplus.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ccf47f9..920d78e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -187,7 +187,7 @@ 187 stdcall GdipDrawRectangleI(ptr ptr long long long long) 188 stdcall GdipDrawRectangles(ptr ptr ptr long) 189 stdcall GdipDrawRectanglesI(ptr ptr ptr long) -190 stdcall GdipDrawString(ptr ptr long ptr ptr ptr ptr) +190 stdcall GdipDrawString(ptr wstr long ptr ptr ptr ptr) 191 stdcall GdipEmfToWmfBits(ptr long ptr long long) 192 stdcall GdipEndContainer(ptr ptr) 193 stub GdipEnumerateMetafileDestPoint

1 0

Hans Leidekker : wmiutils: Add a stub implementation of IWbemPathKeyList.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: 39a1b7050f532d37e3db2df25397f3944179ee9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a1b7050f532d37e3db2df25… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 21 10:45:51 2013 +0100 wmiutils: Add a stub implementation of IWbemPathKeyList. --- dlls/wmiutils/path.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 221 insertions(+), 12 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 7b7e46f..5f64aa0 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -32,12 +32,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); -struct key +struct keylist { - WCHAR *name; - int len_name; - WCHAR *value; - int len_value; + IWbemPathKeyList IWbemPathKeyList_iface; + IWbemPath *parent; + LONG refs; }; struct path @@ -59,6 +58,207 @@ struct path ULONGLONG flags; }; +static inline struct keylist *impl_from_IWbemPathKeyList( IWbemPathKeyList *iface ) +{ + return CONTAINING_RECORD(iface, struct keylist, IWbemPathKeyList_iface); +} + +static inline struct path *impl_from_IWbemPath( IWbemPath *iface ) +{ + return CONTAINING_RECORD(iface, struct path, IWbemPath_iface); +} + +static ULONG WINAPI keylist_AddRef( + IWbemPathKeyList *iface ) +{ + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + return InterlockedIncrement( &keylist->refs ); +} + +static ULONG WINAPI keylist_Release( + IWbemPathKeyList *iface ) +{ + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + LONG refs = InterlockedDecrement( &keylist->refs ); + if (!refs) + { + TRACE("destroying %p\n", keylist); + IWbemPath_Release( keylist->parent ); + heap_free( keylist ); + } + return refs; +} + +static HRESULT WINAPI keylist_QueryInterface( + IWbemPathKeyList *iface, + REFIID riid, + void **ppvObject ) +{ + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + + TRACE("%p, %s, %p\n", keylist, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID( riid, &IID_IWbemPathKeyList ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IWbemPathKeyList_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI keylist_GetCount( + IWbemPathKeyList *iface, + ULONG *puKeyCount ) +{ + FIXME("%p, %p\n", iface, puKeyCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_SetKey( + IWbemPathKeyList *iface, + LPCWSTR wszName, + ULONG uFlags, + ULONG uCimType, + LPVOID pKeyVal ) +{ + FIXME("%p, %s, 0x%x, %u, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_SetKey2( + IWbemPathKeyList *iface, + LPCWSTR wszName, + ULONG uFlags, + ULONG uCimType, + VARIANT *pKeyVal ) +{ + FIXME("%p, %s, 0x%x, %u, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetKey( + IWbemPathKeyList *iface, + ULONG uKeyIx, + ULONG uFlags, + ULONG *puNameBufSize, + LPWSTR pszKeyName, + ULONG *puKeyValBufSize, + LPVOID pKeyVal, + ULONG *puApparentCimType ) +{ + FIXME("%p, %u, 0x%x, %p, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, + pszKeyName, puKeyValBufSize, pKeyVal, puApparentCimType); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetKey2( + IWbemPathKeyList *iface, + ULONG uKeyIx, + ULONG uFlags, + ULONG *puNameBufSize, + LPWSTR pszKeyName, + VARIANT *pKeyValue, + ULONG *puApparentCimType ) +{ + FIXME("%p, %u, 0x%x, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, + pszKeyName, pKeyValue, puApparentCimType); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_RemoveKey( + IWbemPathKeyList *iface, + LPCWSTR wszName, + ULONG uFlags ) +{ + FIXME("%p, %s, 0x%x\n", iface, debugstr_w(wszName), uFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_RemoveAllKeys( + IWbemPathKeyList *iface, + ULONG uFlags ) +{ + FIXME("%p, 0x%x\n", iface, uFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_MakeSingleton( + IWbemPathKeyList *iface, + boolean bSet ) +{ + FIXME("%p, %d\n", iface, bSet); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetInfo( + IWbemPathKeyList *iface, + ULONG uRequestedInfo, + ULONGLONG *puResponse ) +{ + FIXME("%p, %u, %p\n", iface, uRequestedInfo, puResponse); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetText( + IWbemPathKeyList *iface, + LONG lFlags, + ULONG *puBuffLength, + LPWSTR pszText ) +{ + FIXME("%p, 0x%x, %p, %p\n", iface, lFlags, puBuffLength, pszText); + return E_NOTIMPL; +} + +static const struct IWbemPathKeyListVtbl keylist_vtbl = +{ + keylist_QueryInterface, + keylist_AddRef, + keylist_Release, + keylist_GetCount, + keylist_SetKey, + keylist_SetKey2, + keylist_GetKey, + keylist_GetKey2, + keylist_RemoveKey, + keylist_RemoveAllKeys, + keylist_MakeSingleton, + keylist_GetInfo, + keylist_GetText +}; + +static HRESULT WbemPathKeyList_create( IUnknown *pUnkOuter, IWbemPath *parent, LPVOID *ppObj ) +{ + struct keylist *keylist; + + TRACE("%p, %p\n", pUnkOuter, ppObj); + + if (!(keylist = heap_alloc( sizeof(*keylist) ))) return E_OUTOFMEMORY; + + keylist->IWbemPathKeyList_iface.lpVtbl = &keylist_vtbl; + keylist->refs = 1; + keylist->parent = parent; + IWbemPath_AddRef( keylist->parent ); + + *ppObj = &keylist->IWbemPathKeyList_iface; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} + +struct key +{ + WCHAR *name; + int len_name; + WCHAR *value; + int len_value; +}; + static void init_path( struct path *path ) { path->text = NULL; @@ -93,11 +293,6 @@ static void clear_path( struct path *path ) init_path( path ); } -static inline struct path *impl_from_IWbemPath( IWbemPath *iface ) -{ - return CONTAINING_RECORD(iface, struct path, IWbemPath_iface); -} - static ULONG WINAPI path_AddRef( IWbemPath *iface ) { @@ -922,8 +1117,22 @@ static HRESULT WINAPI path_GetKeyList( IWbemPath *iface, IWbemPathKeyList **pOut) { - FIXME("%p, %p\n", iface, pOut); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + HRESULT hr; + + TRACE("%p, %p\n", iface, pOut); + + EnterCriticalSection( &path->cs ); + + if (!path->class) + { + LeaveCriticalSection( &path->cs ); + return WBEM_E_INVALID_PARAMETER; + } + hr = WbemPathKeyList_create( NULL, iface, (void **)pOut ); + + LeaveCriticalSection( &path->cs ); + return hr; } static HRESULT WINAPI path_CreateClassPart(

1 0

Nozomi Kodama : d3dx9: Avoid useless computations.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: de852879d1c9c3678307bb94ed2dda4b3a6d66fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=de852879d1c9c3678307bb94e… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Feb 15 23:04:25 2013 -1000 d3dx9: Avoid useless computations. --- dlls/d3dx9_36/math.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 10623f7..69c3297 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -388,10 +388,16 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, const D3DXMATRIX *pm1, c D3DXMATRIX* WINAPI D3DXMatrixMultiplyTranspose(D3DXMATRIX *pout, const D3DXMATRIX *pm1, const D3DXMATRIX *pm2) { + D3DXMATRIX temp; + int i, j; + TRACE("pout %p, pm1 %p, pm2 %p\n", pout, pm1, pm2); - D3DXMatrixMultiply(pout, pm1, pm2); - D3DXMatrixTranspose(pout, pout); + for (i = 0; i < 4; i++) + for (j = 0; j < 4; j++) + temp.u.m[j][i] = pm1->u.m[i][0] * pm2->u.m[0][j] + pm1->u.m[i][1] * pm2->u.m[1][j] + pm1->u.m[i][2] * pm2->u.m[2][j] + pm1->u.m[i][3] * pm2->u.m[3][j]; + + *pout = temp; return pout; }

1 0

Nozomi Kodama : d3dx9: Specify arguments in trace to ease debugging.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: bd5921814003a162edd20f811e48629614974f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5921814003a162edd20f811… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Feb 15 22:43:29 2013 -1000 d3dx9: Specify arguments in trace to ease debugging. --- dlls/d3dx9_36/math.c | 174 +++++++++++++++++++++++++------------------------ 1 files changed, 89 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd5921814003a162edd20…

1 0

Dmitry Timoshkov : gdiplus: Use an off-screen DC to trace a path.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 42a5943598eb908686e27554c2882617b6445bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a5943598eb908686e27554c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 20 14:18:56 2013 +0800 gdiplus: Use an off-screen DC to trace a path. --- dlls/gdiplus/region.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index f7bad57..5583514 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -894,7 +894,7 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) if (!graphics) { - new_hdc = GetDC(0); + new_hdc = CreateCompatibleDC(0); if (!new_hdc) return OutOfMemory; @@ -902,13 +902,13 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) graphics = new_graphics; if (stat != Ok) { - ReleaseDC(0, new_hdc); + DeleteDC(new_hdc); return stat; } } else if (!graphics->hdc) { - graphics->hdc = new_hdc = GetDC(0); + graphics->hdc = new_hdc = CreateCompatibleDC(0); if (!new_hdc) return OutOfMemory; } @@ -929,7 +929,7 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) RestoreDC(graphics->hdc, save_state); if (new_hdc) { - ReleaseDC(0, new_hdc); + DeleteDC(new_hdc); if (new_graphics) GdipDeleteGraphics(new_graphics); else

1 0

Dmitry Timoshkov : gdiplus: Use an off-screen DC as an image surface.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 0553eba08f15a321838f34e7aac15ead64c2cb03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0553eba08f15a321838f34e7a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 20 14:18:13 2013 +0800 gdiplus: Use an off-screen DC as an image surface. --- dlls/gdiplus/image.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9c34333..59ea41c 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -116,10 +116,9 @@ static INT ipicture_pixel_height(IPicture *pic) IPicture_get_Height(pic, &y); - hdcref = GetDC(0); - + hdcref = CreateCompatibleDC(0); y = MulDiv(y, GetDeviceCaps(hdcref, LOGPIXELSY), INCH_HIMETRIC); - ReleaseDC(0, hdcref); + DeleteDC(hdcref); return y; } @@ -131,11 +130,9 @@ static INT ipicture_pixel_width(IPicture *pic) IPicture_get_Width(pic, &x); - hdcref = GetDC(0); - + hdcref = CreateCompatibleDC(0); x = MulDiv(x, GetDeviceCaps(hdcref, LOGPIXELSX), INCH_HIMETRIC); - - ReleaseDC(0, hdcref); + DeleteDC(hdcref); return x; } @@ -1688,7 +1685,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) bih.biClrUsed = 0; bih.biClrImportant = 0; - screendc = GetDC(0); + screendc = CreateCompatibleDC(0); if (iinfo.hbmColor) { GetDIBits(screendc, iinfo.hbmColor, 0, height, lockeddata.Scan0, (BITMAPINFO*)&bih, DIB_RGB_COLORS); @@ -1756,7 +1753,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) } } - ReleaseDC(0, screendc); + DeleteDC(screendc); DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); @@ -1806,14 +1803,14 @@ static void generate_halftone_palette(ARGB *entries, UINT count) static GpStatus get_screen_resolution(REAL *xres, REAL *yres) { - HDC screendc = GetDC(0); + HDC screendc = CreateCompatibleDC(0); if (!screendc) return GenericError; *xres = (REAL)GetDeviceCaps(screendc, LOGPIXELSX); *yres = (REAL)GetDeviceCaps(screendc, LOGPIXELSY); - ReleaseDC(0, screendc); + DeleteDC(screendc); return Ok; }

1 0

Piotr Caban : msvcrt: Mark gmtime32 tests with negative argument as broken on win8.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 61f82d6d02eb34333de9c45561e47f68fb6f1d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f82d6d02eb34333de9c4556… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 20 15:53:24 2013 +0100 msvcrt: Mark gmtime32 tests with negative argument as broken on win8. --- dlls/msvcrt/tests/time.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index b9bc7f1..30d9fa7 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -109,7 +109,7 @@ static void test_gmtime(void) gmt = -1; gmt_tm = p_gmtime32(&gmt); - ok(gmt_tm == NULL, "gmt_tm != NULL\n"); + ok(gmt_tm==NULL || broken(gmt_tm->tm_year==70 && gmt_tm->tm_sec<0), "gmt_tm != NULL\n"); gmt = valid = 0; gmt_tm = p_gmtime32(&gmt); @@ -181,9 +181,12 @@ static void test_gmtime(void) errno = 0; gmt = -1; err = p_gmtime32_s(&gmt_tm_s, &gmt); - ok(err == EINVAL, "err = %d\n", err); - ok(errno == EINVAL, "errno = %d\n", errno); - ok(gmt_tm_s.tm_year == -1, "tm_year = %d\n", gmt_tm_s.tm_year); + ok(gmt_tm_s.tm_year==-1 || broken(gmt_tm_s.tm_year==70 && gmt_tm->tm_sec<0), + "tm_year = %d\n", gmt_tm_s.tm_year); + if(gmt_tm_s.tm_year == -1) { + ok(err==EINVAL, "err = %d\n", err); + ok(errno==EINVAL, "errno = %d\n", errno); + } } static void test_mktime(void)

1 0

Jacek Caban : urlmon: Added a few more forward to propsys.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: fa5075f7de7358aaebac915cd7981a47a6a12361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5075f7de7358aaebac915cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:17:40 2013 +0100 urlmon: Added a few more forward to propsys. --- dlls/urlmon/urlmon.spec | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 069421f..e66fff7 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -96,11 +96,14 @@ @ stub ZonesReInit 111 stdcall @(wstr) IsProtectedModeURL +328 stdcall @(ptr ptr) propsys.VariantCompare 329 stdcall @(ptr ptr) propsys.VariantToGUID 331 stdcall @(ptr long ptr) propsys.InitPropVariantFromBuffer 335 stdcall @(ptr long ptr) propsys.InitVariantFromBuffer 350 stdcall @(ptr ptr) propsys.PropVariantToGUID 362 stdcall @(ptr ptr) propsys.InitVariantFromGUIDAsString +363 stdcall @(long long ptr) propsys.InitVariantFromResource +387 stdcall @(ptr long) propsys.VariantToUInt32WithDefault 410 stdcall @(long long) LogSqmBits 423 stdcall @(long long long long) LogSqmUXCommandOffsetInternal 444 stdcall @(long long long) MapUriToBrowserEmulationState

1 0

Jacek Caban : winhttp: Get cert store directly from cert in netconn_verify_cert.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 3fd046b460d5ee784899c0fe4177975e923652c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd046b460d5ee784899c0fe4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 11:14:18 2013 +0100 winhttp: Get cert store directly from cert in netconn_verify_cert. --- dlls/winhttp/net.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index a51e919..d2fdb86 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -139,9 +139,9 @@ static int sock_get_error( int err ) return err; } -static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, - WCHAR *server, DWORD security_flags ) +static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags ) { + HCERTSTORE store = cert->hCertStore; BOOL ret; CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; PCCERT_CHAIN_CONTEXT chain; @@ -468,7 +468,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) status = QueryContextAttributesW(&ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); if(status == SEC_E_OK) { - res = netconn_verify_cert(cert, cert->hCertStore, hostname, conn->security_flags); + res = netconn_verify_cert(cert, hostname, conn->security_flags); CertFreeCertificateContext(cert); if(res != ERROR_SUCCESS) { WARN("cert verify failed: %u\n", res);

1 0

Alexandre Julliard : psapi/tests: Define the required Windows version before including anything.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: ab2eb34a823e1c9af39dd1c26e218e140ec5b3d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2eb34a823e1c9af39dd1c26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 20 13:17:12 2013 +0100 psapi/tests: Define the required Windows version before including anything. --- dlls/psapi/tests/psapi_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 130c33e..b91add6 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - /* 0x0600 makes PROCESS_ALL_ACCESS not compatible with pre-Vista versions */ #define _WIN32_WINNT 0x0500 +#include <stdarg.h> + #include "ntstatus.h" #define WIN32_NO_STATUS

1 0

Michael Stefaniuc : ddraw/tests: Simplify some equality comparisons between bools.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 54a1504c57c032274e0e2f134751570513edd9de URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a1504c57c032274e0e2f134… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 20 00:11:36 2013 +0100 ddraw/tests: Simplify some equality comparisons between bools. --- dlls/ddraw/tests/dsurface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 4e08224..eb39801 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4724,7 +4724,7 @@ static void partial_block_lock_test(void) { SetRect(&rect, formats[i].block_width >> 1, 0, formats[i].block_width, formats[i].block_height); hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); - ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)), "Partial block lock %s, expected %s, format %s, pool %s\n", SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); @@ -4736,7 +4736,7 @@ static void partial_block_lock_test(void) SetRect(&rect, 0, 0, formats[i].block_width >> 1, formats[i].block_height); hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); - ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)), "Partial block lock %s, expected %s, format %s, pool %s\n", SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); @@ -4751,7 +4751,7 @@ static void partial_block_lock_test(void) { SetRect(&rect, 0, formats[i].block_height >> 1, formats[i].block_width, formats[i].block_height); hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); - ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)), "Partial block lock %s, expected %s, format %s, pool %s\n", SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); @@ -4763,7 +4763,7 @@ static void partial_block_lock_test(void) SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height >> 1); hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); - ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)), "Partial block lock %s, expected %s, format %s, pool %s\n", SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", formats[i].name, pools[j].name);

1 0

Jacek Caban : mshtml: Added IHTMLDocument5::createAttribute tests.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 5ffeb458d864ef50b2778145c5f04edef277dc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffeb458d864ef50b2778145c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:21:38 2013 +0100 mshtml: Added IHTMLDocument5::createAttribute tests. --- dlls/mshtml/tests/dom.c | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5ee0261..2013b53 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2609,6 +2609,18 @@ static void test_dynamic_properties(IHTMLElement *elem) SysFreeString(attr1); } +#define test_attr_node_name(a,b) _test_attr_node_name(__LINE__,a,b) +static void _test_attr_node_name(unsigned line, IHTMLDOMAttribute *attr, const char *exname) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLDOMAttribute_get_nodeName(attr, &str); + ok_(__FILE__,line)(hres == S_OK, "get_nodeName failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(str, exname), "node name is %s, expected %s\n", wine_dbgstr_w(str), exname); + SysFreeString(str); +} + static void test_attr_collection_disp(IDispatch *disp) { IDispatchEx *dispex; @@ -2647,10 +2659,9 @@ static void test_attr_collection_disp(IDispatch *disp) ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(var) == NULL\n"); hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLDOMAttribute, (void**)&attr); ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); - hres = IHTMLDOMAttribute_get_nodeName(attr, &bstr); - ok(hres == S_OK, "get_nodeName failed: %08x\n", hres); - ok(!strcmp_wa(bstr, "attr1"), "node name is %s, expected attr1\n", wine_dbgstr_w(bstr)); - SysFreeString(bstr); + + test_attr_node_name(attr, "attr1"); + IHTMLDOMAttribute_Release(attr); VariantClear(&var); @@ -6399,6 +6410,7 @@ static void test_create_elems(IHTMLDocument2 *doc) { IHTMLElement *elem, *body, *elem2; IHTMLDOMNode *node, *node2, *node3, *comment; + IHTMLDOMAttribute *attr; IHTMLDocument5 *doc5; IDispatch *disp; VARIANT var; @@ -6490,6 +6502,20 @@ static void test_create_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(comment); } + str = a2bstr("Test"); + hres = IHTMLDocument5_createAttribute(doc5, str, &attr); + ok(hres == S_OK, "createAttribute dailed: %08x\n", hres); + SysFreeString(str); + if(SUCCEEDED(hres)) { + test_disp((IUnknown*)attr, &DIID_DispHTMLDOMAttribute, "[object]"); + test_ifaces((IUnknown*)attr, attr_iids); + test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); + + test_attr_node_name(attr, "Test"); + + IHTMLDOMAttribute_Release(attr); + } + IHTMLDocument5_Release(doc5); }

1 0

Jacek Caban : mshtml: Added support for IHTMLDOMAttribute:: get_nodeName in detached attributes.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 06666c266d4ae59d62deea1cbaed0f8db3b760bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=06666c266d4ae59d62deea1cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:21:27 2013 +0100 mshtml: Added support for IHTMLDOMAttribute::get_nodeName in detached attributes. --- dlls/mshtml/htmlattr.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 4c4d8a4..1b01662 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -126,8 +126,13 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BS TRACE("(%p)->(%p)\n", This, p); if(!This->elem) { - FIXME("NULL This->elem\n"); - return E_UNEXPECTED; + if(!This->name) { + FIXME("No name available\n"); + return E_FAIL; + } + + *p = SysAllocString(This->name); + return *p ? S_OK : E_OUTOFMEMORY; } return IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, p);

1 0

Andrew Talbot : msvcrt: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: d8efcc9cb341e0ad7df2dad63a2a422d1dc42e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8efcc9cb341e0ad7df2dad63… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 19 22:24:42 2013 +0000 msvcrt: Avoid signed-unsigned integer comparisons. --- dlls/msvcrt/file.c | 9 +++++---- dlls/msvcrt/locale.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index fc4154c..612f470 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -363,7 +363,7 @@ static int msvcrt_alloc_fd(HANDLE hand, int flag) /* caller must hold the files lock */ static MSVCRT_FILE* msvcrt_alloc_fp(void) { - unsigned int i; + int i; MSVCRT_FILE *file; for (i = 3; i < MSVCRT_max_streams; i++) @@ -1047,7 +1047,8 @@ int CDECL MSVCRT__fcloseall(void) /* free everything on process exit */ void msvcrt_free_io(void) { - int i; + unsigned int i; + int j; MSVCRT__fcloseall(); /* The Win32 _fcloseall() function explicitly doesn't close stdin, @@ -1061,9 +1062,9 @@ void msvcrt_free_io(void) for(i=0; i<sizeof(MSVCRT___pioinfo)/sizeof(MSVCRT___pioinfo[0]); i++) MSVCRT_free(MSVCRT___pioinfo[i]); - for(i=0; i<MSVCRT_stream_idx; i++) + for(j=0; j<MSVCRT_stream_idx; j++) { - MSVCRT_FILE *file = msvcrt_get_file(i); + MSVCRT_FILE *file = msvcrt_get_file(j); if(file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) { ((file_crit*)file)->crit.DebugInfo->Spare[0] = 0; diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 4540e9a..7fa4882 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -492,7 +492,7 @@ char* CDECL _Getmonths(void) void* CDECL _Gettnames(void) { MSVCRT___lc_time_data *ret, *cur = get_locinfo()->lc_time_curr; - int i, size = sizeof(MSVCRT___lc_time_data); + unsigned int i, size = sizeof(MSVCRT___lc_time_data); TRACE("\n");

1 0

Andrew Talbot : msxml3: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 5360780a9b412def4cbf17f64cebff042549aa52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5360780a9b412def4cbf17f64… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 19 22:24:44 2013 +0000 msxml3: Avoid signed-unsigned integer comparisons. --- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/factory.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 49e6168..7a3543f 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -3245,7 +3245,7 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * ConnectionPoint *This = impl_from_IConnectionPoint(iface); IUnknown *sink; HRESULT hr; - int i; + DWORD i; TRACE("(%p)->(%p %p)\n", This, unk_sink, cookie); diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 1ad3a1e..d308c12 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -98,7 +98,7 @@ static const struct clsid_version_t clsid_versions_table[] = static MSXML_VERSION get_msxml_version(const GUID *clsid) { - int i; + unsigned int i; for (i = 0; i < sizeof(clsid_versions_table)/sizeof(struct clsid_version_t); i++) if (IsEqualGUID(clsid, clsid_versions_table[i].clsid))

1 0

Francois Gouget : ddraw/tests: Fix the refresh rate test when running with the Windows 'Standard VGA' driver.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 3e6d0a373d38b84efe26506348005346838fd702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6d0a373d38b84efe2650634… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 20 00:14:40 2013 +0100 ddraw/tests: Fix the refresh rate test when running with the Windows 'Standard VGA' driver. --- dlls/ddraw/tests/ddrawmodes.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 82fae5b..68deea4a 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -473,7 +473,10 @@ static void enumdisplaymodes(void) modes16bpp_cnt = 0; ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_REFRESHRATE; - U2(ddsd).dwRefreshRate = 1; + /* Ask for a refresh rate that could not possibly be used. But note that + * the Windows 'Standard VGA' driver claims to run the display at 1Hz! + */ + U2(ddsd).dwRefreshRate = 2; rc = IDirectDraw_EnumDisplayModes(lpDD, 0, &ddsd, 0, enummodescallback_16bit); ok(rc==DD_OK,"EnumDisplayModes returned: %x\n",rc);

1 0

Nozomi Kodama : d3dx9: Add a missing trace.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: f9347a8f0ea4c356d8cbed7b2c2e3f35f57d87c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9347a8f0ea4c356d8cbed7b2… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Feb 15 22:52:42 2013 -1000 d3dx9: Add a missing trace. --- dlls/d3dx9_36/math.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 0afb36b..10623f7 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1743,6 +1743,9 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray(D3DXVECTOR2* out, UINT outstride D3DXVECTOR2* WINAPI D3DXVec2TransformNormal(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv, const D3DXMATRIX *pm) { const D3DXVECTOR2 v = *pv; + + TRACE("pout %p, pv %p, pm %p", pout, pv, pm); + pout->x = pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y; pout->y = pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y; return pout;

1 0

Dmitry Timoshkov : gdiplus: Use an off-screen DC for font enumeration.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 97b92fe12c35673a9234f990b8f66797cc58c603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b92fe12c35673a9234f990b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 20 14:17:36 2013 +0800 gdiplus: Use an off-screen DC for font enumeration. --- dlls/gdiplus/font.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6e31331..51c7aec 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -979,12 +979,12 @@ GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily* family, *IsStyleAvailable = FALSE; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); if(!EnumFontFamiliesW(hdc, family->FamilyName, font_has_style_proc, (LPARAM)style)) *IsStyleAvailable = TRUE; - ReleaseDC(0, hdc); + DeleteDC(hdc); return Ok; } @@ -1276,7 +1276,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, HDC hdc; LOGFONTW lfw; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); lfw.lfCharSet = DEFAULT_CHARSET; lstrcpyW(lfw.lfFaceName, name); @@ -1288,7 +1288,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, return OutOfMemory; } - ReleaseDC(0, hdc); + DeleteDC(hdc); } return Ok; } @@ -1403,7 +1403,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( HDC hdc; LOGFONTW lfw; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); lfw.lfCharSet = DEFAULT_CHARSET; lfw.lfFaceName[0] = 0; @@ -1416,7 +1416,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( return OutOfMemory; } - ReleaseDC(0, hdc); + DeleteDC(hdc); } *fontCollection = &installedFontCollection;

1 0

Jacek Caban : mshtml: Addeed IHTMLDocument5::createAttribute implementation .
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: a9136b56f7b65ebe94d64e7ec0c1e9cbb73f0203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9136b56f7b65ebe94d64e7ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:21:15 2013 +0100 mshtml: Addeed IHTMLDocument5::createAttribute implementation. --- dlls/mshtml/htmlattr.c | 48 ++++++++++++++++++++++++++++------------- dlls/mshtml/htmldoc5.c | 13 +++++++++- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/mshtml_private.h | 6 +++- 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 5d4c2b4..4c4d8a4 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -81,6 +81,7 @@ static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface) if(!ref) { assert(!This->elem); release_dispex(&This->dispex); + heap_free(This->name); heap_free(This); } @@ -124,6 +125,11 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BS TRACE("(%p)->(%p)\n", This, p); + if(!This->elem) { + FIXME("NULL This->elem\n"); + return E_UNEXPECTED; + } + return IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, p); } @@ -163,16 +169,16 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V TRACE("(%p)->(%p)\n", This, p); - if(get_dispid_type(This->dispid) != DISPEXPROP_BUILTIN) { - *p = VARIANT_TRUE; - return S_OK; - } - if(!This->elem || !This->elem->nselem) { FIXME("NULL This->elem\n"); return E_UNEXPECTED; } + if(get_dispid_type(This->dispid) != DISPEXPROP_BUILTIN) { + *p = VARIANT_TRUE; + return S_OK; + } + hres = IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, &name); if(FAILED(hres)) return hres; @@ -221,7 +227,7 @@ static dispex_static_data_t HTMLDOMAttribute_dispex = { HTMLDOMAttribute_iface_tids }; -HRESULT HTMLDOMAttribute_Create(HTMLElement *elem, DISPID dispid, HTMLDOMAttribute **attr) +HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dispid, HTMLDOMAttribute **attr) { HTMLAttributeCollection *col; HTMLDOMAttribute *ret; @@ -231,23 +237,35 @@ HRESULT HTMLDOMAttribute_Create(HTMLElement *elem, DISPID dispid, HTMLDOMAttribu if(!ret) return E_OUTOFMEMORY; - hres = HTMLElement_get_attr_col(&elem->node, &col); - if(FAILED(hres)) { - heap_free(ret); - return hres; - } - IHTMLAttributeCollection_Release(&col->IHTMLAttributeCollection_iface); - ret->IHTMLDOMAttribute_iface.lpVtbl = &HTMLDOMAttributeVtbl; ret->ref = 1; - ret->dispid = dispid; ret->elem = elem; - list_add_tail(&elem->attrs->attrs, &ret->entry); init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMAttribute_iface, &HTMLDOMAttribute_dispex); + /* For attributes attached to an element, (elem,dispid) pair should be valid used for its operation. */ + if(elem) { + hres = HTMLElement_get_attr_col(&elem->node, &col); + if(FAILED(hres)) { + IHTMLDOMAttribute_Release(&ret->IHTMLDOMAttribute_iface); + return hres; + } + IHTMLAttributeCollection_Release(&col->IHTMLAttributeCollection_iface); + + list_add_tail(&elem->attrs->attrs, &ret->entry); + } + + /* For detached attributes we may still do most operations if we have its name available. */ + if(name) { + ret->name = heap_strdupW(name); + if(!ret->name) { + IHTMLDOMAttribute_Release(&ret->IHTMLDOMAttribute_iface); + return E_OUTOFMEMORY; + } + } + *attr = ret; return S_OK; } diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index edf8109..8871934 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -120,8 +120,17 @@ static HRESULT WINAPI HTMLDocument5_createAttribute(IHTMLDocument5 *iface, BSTR IHTMLDOMAttribute **ppattribute) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrattrName), ppattribute); - return E_NOTIMPL; + HTMLDOMAttribute *attr; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrattrName), ppattribute); + + hres = HTMLDOMAttribute_Create(bstrattrName, NULL, 0, &attr); + if(FAILED(hres)) + return hres; + + *ppattribute = &attr->IHTMLDOMAttribute_iface; + return S_OK; } static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bstrdata, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6867a17..8239973 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2246,7 +2246,7 @@ static inline HRESULT get_domattr(HTMLAttributeCollection *This, DISPID id, LONG return E_UNEXPECTED; } - hres = HTMLDOMAttribute_Create(This->elem, id, attr); + hres = HTMLDOMAttribute_Create(NULL, This->elem, id, attr); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 75200c4..38aaa24 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -852,12 +852,14 @@ typedef struct { LONG ref; - DISPID dispid; + WCHAR *name; + HTMLElement *elem; + DISPID dispid; struct list entry; } HTMLDOMAttribute; -HRESULT HTMLDOMAttribute_Create(HTMLElement*,DISPID,HTMLDOMAttribute**) DECLSPEC_HIDDEN; +HRESULT HTMLDOMAttribute_Create(const WCHAR*,HTMLElement*,DISPID,HTMLDOMAttribute**) DECLSPEC_HIDDEN; HRESULT HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLElement**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::onfocus property implementation.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 2a0fd1c95606c7fa0c2a619d130543a83d4477cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0fd1c95606c7fa0c2a619d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:20:59 2013 +0100 mshtml: Added IHTMLWindow2::onfocus property implementation. --- dlls/mshtml/htmlwindow.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9e3cb72..2a2b5ca 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -949,15 +949,19 @@ static HRESULT WINAPI HTMLWindow2_navigate(IHTMLWindow2 *iface, BSTR url) static HRESULT WINAPI HTMLWindow2_put_onfocus(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_FOCUS, &v); } static HRESULT WINAPI HTMLWindow2_get_onfocus(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_FOCUS, p); } static HRESULT WINAPI HTMLWindow2_put_onblur(IHTMLWindow2 *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Forward IHTMLDocument3:: get_childNodes to IHTMLDOMNode implemnentation.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: c2cfc4cf8b25a2ac3f155725ffffdbcf806282cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cfc4cf8b25a2ac3f155725f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:20:51 2013 +0100 mshtml: Forward IHTMLDocument3::get_childNodes to IHTMLDOMNode implemnentation. --- dlls/mshtml/htmldoc3.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index e1efa7a..4b9b12e 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -496,8 +496,10 @@ static HRESULT WINAPI HTMLDocument3_get_baseUrl(IHTMLDocument3 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument3_get_childNodes(IHTMLDocument3 *iface, IDispatch **p) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLDOMNode_get_childNodes(&This->doc_node->node.IHTMLDOMNode_iface, p); } static HRESULT WINAPI HTMLDocument3_put_inheritStyleSheets(IHTMLDocument3 *iface,

1 0

Huw Davies : usp10: Clusters are represented by glyph indices not character positions.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 5e5d8d215b60c83d3919711c17a73fa719b6bb41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5d8d215b60c83d3919711c1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 20 09:51:10 2013 +0000 usp10: Clusters are represented by glyph indices not character positions. --- dlls/usp10/usp10.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8bfe156..5287556 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2534,8 +2534,9 @@ HRESULT WINAPI ScriptCPtoX(int iCP, if (check >= cChars && !iMaxPos) { - for (check = clust; check < cChars; check++) - special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, check, 1); + int glyph; + for (glyph = clust; glyph < cGlyphs; glyph++) + special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, glyph, 1); iSpecial = item; special_size /= (cChars - item); iPosX += special_size; @@ -2666,8 +2667,9 @@ HRESULT WINAPI ScriptXtoCP(int iX, if (check >= cChars && direction > 0) { - for (check = clust; check < cChars; check++) - special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, check, direction); + int glyph; + for (glyph = clust; glyph < cGlyphs; glyph++) + special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, glyph, direction); iSpecial = item; special_size /= (cChars - item); iPosX += special_size;

1 0

Michael Stefaniuc : shell32: COM clean up for the inner IUnknown of ShellFSFolder.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: df56b233e0ce02c9b48fe5f8f7c80ad5b19c5a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df56b233e0ce02c9b48fe5f8f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 20 00:13:49 2013 +0100 shell32: COM clean up for the inner IUnknown of ShellFSFolder. --- dlls/shell32/shfldr_fs.c | 89 +++++++++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 44 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 8439da1..1ccd2ef 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -59,14 +59,13 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); */ typedef struct { - const IUnknownVtbl *lpVtbl; - LONG ref; + IUnknown IUnknown_inner; + LONG ref; const IShellFolder2Vtbl *lpvtblShellFolder; const IPersistFolder3Vtbl *lpvtblPersistFolder3; const IDropTargetVtbl *lpvtblDropTarget; const ISFHelperVtbl *lpvtblSFHelper; - - IUnknown *pUnkOuter; /* used for aggregation */ + IUnknown *outer_unk; CLSID *pclsid; @@ -79,12 +78,16 @@ typedef struct { BOOL fAcceptFmt; /* flag for pending Drop */ } IGenericSFImpl; -static const IUnknownVtbl unkvt; static const IShellFolder2Vtbl sfvt; static const IPersistFolder3Vtbl vt_FSFldr_PersistFolder3; /* IPersistFolder3 for a FS_Folder */ static const IDropTargetVtbl dtvt; static const ISFHelperVtbl shvt; +static inline IGenericSFImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, IGenericSFImpl, IUnknown_inner); +} + static inline IGenericSFImpl *impl_from_IShellFolder2( IShellFolder2 *iface ) { return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblShellFolder)); @@ -109,7 +112,6 @@ static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) /* converts This to an interface pointer */ -#define _IUnknown_(This) ((IUnknown*)&(This)->lpVtbl) #define _IShellFolder_(This) ((IShellFolder*)&(This)->lpvtblShellFolder) #define _IShellFolder2_(This) ((IShellFolder2*)&(This)->lpvtblShellFolder) #define _IPersist_(This) (&(This)->lpvtblPersistFolder3) @@ -132,19 +134,18 @@ static void SF_RegisterClipFmt (IGenericSFImpl * This) } /************************************************************************** -* we need a separate IUnknown to handle aggregation -* (inner IUnknown) +* inner IUnknown */ -static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, LPVOID * ppvObj) +static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, void **ppvObj) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; + IGenericSFImpl *This = impl_from_IUnknown(iface); - TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); + TRACE("(%p)->(%s,%p)\n", This, shdebugstr_guid(riid), ppvObj); *ppvObj = NULL; if (IsEqualIID (riid, &IID_IUnknown)) - *ppvObj = _IUnknown_ (This); + *ppvObj = &This->IUnknown_inner; else if (IsEqualIID (riid, &IID_IShellFolder)) *ppvObj = _IShellFolder_ (This); else if (IsEqualIID (riid, &IID_IShellFolder2)) @@ -165,7 +166,7 @@ static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, } if (*ppvObj) { - IUnknown_AddRef ((IUnknown *) (*ppvObj)); + IUnknown_AddRef((IUnknown *)*ppvObj); TRACE ("-- Interface = %p\n", *ppvObj); return S_OK; } @@ -173,31 +174,31 @@ static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, return E_NOINTERFACE; } -static ULONG WINAPI IUnknown_fnAddRef (IUnknown * iface) +static ULONG WINAPI IUnknown_fnAddRef(IUnknown *iface) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); + IGenericSFImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount - 1); + TRACE("(%p) ref=%d\n", This, ref); - return refCount; + return ref; } -static ULONG WINAPI IUnknown_fnRelease (IUnknown * iface) +static ULONG WINAPI IUnknown_fnRelease(IUnknown *iface) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); + IGenericSFImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount + 1); + TRACE("(%p) ref=%d\n", This, ref); - if (!refCount) { - TRACE ("-- destroying IShellFolder(%p)\n", This); + if (!ref) { + TRACE("-- destroying IShellFolder(%p)\n", This); - SHFree (This->pidlRoot); - SHFree (This->sPathTarget); - LocalFree (This); + SHFree(This->pidlRoot); + SHFree(This->sPathTarget); + LocalFree(This); } - return refCount; + return ref; } static const IUnknownVtbl unkvt = @@ -239,16 +240,16 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) return E_OUTOFMEMORY; sf->ref = 0; - sf->lpVtbl = &unkvt; + sf->IUnknown_inner.lpVtbl = &unkvt; sf->lpvtblShellFolder = &sfvt; sf->lpvtblPersistFolder3 = &vt_FSFldr_PersistFolder3; sf->lpvtblDropTarget = &dtvt; sf->lpvtblSFHelper = &shvt; sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; - sf->pUnkOuter = pUnkOuter ? pUnkOuter : _IUnknown_ (sf); + sf->outer_unk = pUnkOuter ? pUnkOuter : &sf->IUnknown_inner; - if (FAILED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) { - IUnknown_Release (_IUnknown_ (sf)); + if (FAILED(IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv))) { + IUnknown_Release(&sf->IUnknown_inner); return E_NOINTERFACE; } @@ -271,7 +272,7 @@ IShellFolder_fnQueryInterface (IShellFolder2 * iface, REFIID riid, TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } /************************************************************************** @@ -284,7 +285,7 @@ static ULONG WINAPI IShellFolder_fnAddRef (IShellFolder2 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } /************************************************************************** @@ -296,7 +297,7 @@ static ULONG WINAPI IShellFolder_fnRelease (IShellFolder2 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } /************************************************************************** @@ -1136,7 +1137,7 @@ ISFHelper_fnQueryInterface (ISFHelper * iface, REFIID riid, LPVOID * ppvObj) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface) @@ -1145,7 +1146,7 @@ static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI ISFHelper_fnRelease (ISFHelper * iface) @@ -1154,7 +1155,7 @@ static ULONG WINAPI ISFHelper_fnRelease (ISFHelper * iface) TRACE ("(%p)\n", This); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } /**************************************************************************** @@ -1450,7 +1451,7 @@ IFSFldr_PersistFolder3_QueryInterface (IPersistFolder3 * iface, REFIID iid, TRACE ("(%p)\n", This); - return IUnknown_QueryInterface (This->pUnkOuter, iid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, iid, ppvObj); } /************************************************************************ @@ -1464,7 +1465,7 @@ IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } /************************************************************************ @@ -1478,7 +1479,7 @@ IFSFldr_PersistFolder3_Release (IPersistFolder3 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } /************************************************************************ @@ -1673,7 +1674,7 @@ ISFDropTarget_QueryInterface (IDropTarget * iface, REFIID riid, LPVOID * ppvObj) TRACE ("(%p)\n", This); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } static ULONG WINAPI ISFDropTarget_AddRef (IDropTarget * iface) @@ -1682,7 +1683,7 @@ static ULONG WINAPI ISFDropTarget_AddRef (IDropTarget * iface) TRACE ("(%p)\n", This); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI ISFDropTarget_Release (IDropTarget * iface) @@ -1691,7 +1692,7 @@ static ULONG WINAPI ISFDropTarget_Release (IDropTarget * iface) TRACE ("(%p)\n", This); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI

1 0

André Hentschel : kernel32: Add stub for GetCurrentPackageId.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 2976b6342fdcf1f4c1e9a4dd38bf14083f5c8ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2976b6342fdcf1f4c1e9a4dd3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 19 23:19:34 2013 +0100 kernel32: Add stub for GetCurrentPackageId. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/version.c | 6 +++ include/winerror.h | 78 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f2f039b..93bfb77 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -498,6 +498,7 @@ @ stdcall GetCurrentConsoleFont(long long ptr) @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) +@ stdcall GetCurrentPackageId(ptr ptr) @ stdcall GetCurrentProcess() @ stdcall GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index 9f21435..b9d13e4 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -201,3 +201,9 @@ BOOL WINAPI GetProductInfo(DWORD dwOSMajorVersion, DWORD dwOSMinorVersion, DWORD return RtlGetProductInfo(dwOSMajorVersion, dwOSMinorVersion, dwSpMajorVersion, dwSpMinorVersion, pdwReturnedProductType); } + +LONG WINAPI GetCurrentPackageId(UINT32 *len, BYTE *buffer) +{ + FIXME("(%p %p): stub\n", len, buffer); + return APPMODEL_ERROR_NO_PACKAGE; +} diff --git a/include/winerror.h b/include/winerror.h index b6281f8..edd8af0 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1934,6 +1934,84 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_RESOURCE_ENUM_USER_STOP 15106 #define ERROR_MUI_INTLSETTINGS_UILANG_NOT_INSTALLED 15107 #define ERROR_MUI_INTLSETTINGS_INVALID_LOCALE_NAME 15108 +#define ERROR_MRM_RUNTIME_NO_DEFAULT_OR_NEUTRAL_RESOURCE 15110 +#define ERROR_MRM_INVALID_PRICONFIG 15111 +#define ERROR_MRM_INVALID_FILE_TYPE 15112 +#define ERROR_MRM_UNKNOWN_QUALIFIER 15113 +#define ERROR_MRM_INVALID_QUALIFIER_VALUE 15114 +#define ERROR_MRM_NO_CANDIDATE 15115 +#define ERROR_MRM_NO_MATCH_OR_DEFAULT_CANDIDATE 15116 +#define ERROR_MRM_RESOURCE_TYPE_MISMATCH 15117 +#define ERROR_MRM_DUPLICATE_MAP_NAME 15118 +#define ERROR_MRM_DUPLICATE_ENTRY 15119 +#define ERROR_MRM_INVALID_RESOURCE_IDENTIFIER 15120 +#define ERROR_MRM_FILEPATH_TOO_LONG 15121 +#define ERROR_MRM_UNSUPPORTED_DIRECTORY_TYPE 15122 +#define ERROR_MRM_INVALID_PRI_FILE 15126 +#define ERROR_MRM_NAMED_RESOURCE_NOT_FOUND 15127 +#define ERROR_MRM_MAP_NOT_FOUND 15135 +#define ERROR_MRM_UNSUPPORTED_PROFILE_TYPE 15136 +#define ERROR_MRM_INVALID_QUALIFIER_OPERATOR 15137 +#define ERROR_MRM_INDETERMINATE_QUALIFIER_VALUE 15138 +#define ERROR_MRM_AUTOMERGE_ENABLED 15139 +#define ERROR_MRM_TOO_MANY_RESOURCES 15140 +#define ERROR_MCA_INVALID_CAPABILITIES_STRING 15200 +#define ERROR_MCA_INVALID_VCP_VERSION 15201 +#define ERROR_MCA_MONITOR_VIOLATES_MCCS_SPECIFICATION 15202 +#define ERROR_MCA_MCCS_VERSION_MISMATCH 15203 +#define ERROR_MCA_UNSUPPORTED_MCCS_VERSION 15204 +#define ERROR_MCA_INTERNAL_ERROR 15205 +#define ERROR_MCA_INVALID_TECHNOLOGY_TYPE_RETURNED 15206 +#define ERROR_MCA_UNSUPPORTED_COLOR_TEMPERATURE 15207 +#define ERROR_AMBIGUOUS_SYSTEM_DEVICE 15250 +#define ERROR_SYSTEM_DEVICE_NOT_FOUND 15299 +#define ERROR_HASH_NOT_SUPPORTED 15300 +#define ERROR_HASH_NOT_PRESENT 15301 +#define ERROR_SECONDARY_IC_PROVIDER_NOT_REGISTERED 15321 +#define ERROR_GPIO_CLIENT_INFORMATION_INVALID 15322 +#define ERROR_GPIO_VERSION_NOT_SUPPORTED 15323 +#define ERROR_GPIO_INVALID_REGISTRATION_PACKET 15324 +#define ERROR_GPIO_OPERATION_DENIED 15325 +#define ERROR_GPIO_INCOMPATIBLE_CONNECT_MODE 15326 +#define ERROR_GPIO_INTERRUPT_ALREADY_UNMASKED 15327 +#define ERROR_CANNOT_SWITCH_RUNLEVEL 15400 +#define ERROR_INVALID_RUNLEVEL_SETTING 15401 +#define ERROR_RUNLEVEL_SWITCH_TIMEOUT 15402 +#define ERROR_RUNLEVEL_SWITCH_AGENT_TIMEOUT 15403 +#define ERROR_RUNLEVEL_SWITCH_IN_PROGRESS 15404 +#define ERROR_SERVICES_FAILED_AUTOSTART 15405 +#define ERROR_COM_TASK_STOP_PENDING 15501 +#define ERROR_INSTALL_OPEN_PACKAGE_FAILED 15600 +#define ERROR_INSTALL_PACKAGE_NOT_FOUND 15601 +#define ERROR_INSTALL_INVALID_PACKAGE 15602 +#define ERROR_INSTALL_RESOLVE_DEPENDENCY_FAILED 15603 +#define ERROR_INSTALL_OUT_OF_DISK_SPACE 15604 +#define ERROR_INSTALL_NETWORK_FAILURE 15605 +#define ERROR_INSTALL_REGISTRATION_FAILURE 15606 +#define ERROR_INSTALL_DEREGISTRATION_FAILURE 15607 +#define ERROR_INSTALL_CANCEL 15608 +#define ERROR_INSTALL_FAILED 15609 +#define ERROR_REMOVE_FAILED 15610 +#define ERROR_PACKAGE_ALREADY_EXISTS 15611 +#define ERROR_NEEDS_REMEDIATION 15612 +#define ERROR_INSTALL_PREREQUISITE_FAILED 15613 +#define ERROR_PACKAGE_REPOSITORY_CORRUPTED 15614 +#define ERROR_INSTALL_POLICY_FAILURE 15615 +#define ERROR_PACKAGE_UPDATING 15616 +#define ERROR_DEPLOYMENT_BLOCKED_BY_POLICY 15617 +#define ERROR_PACKAGES_IN_USE 15618 +#define ERROR_RECOVERY_FILE_CORRUPT 15619 +#define ERROR_INVALID_STAGED_SIGNATURE 15620 +#define ERROR_DELETING_EXISTING_APPLICATIONDATA_STORE_FAILED 15621 +#define ERROR_INSTALL_PACKAGE_DOWNGRADE 15622 +#define ERROR_SYSTEM_NEEDS_REMEDIATION 15623 +#define ERROR_APPX_INTEGRITY_FAILURE_CLR_NGEN 15624 +#define ERROR_RESILIENCY_FILE_CORRUPT 15625 +#define ERROR_INSTALL_FIREWALL_SERVICE_NOT_RUNNING 15626 +#define APPMODEL_ERROR_NO_PACKAGE 15700 +#define APPMODEL_ERROR_PACKAGE_RUNTIME_CORRUPT 15701 +#define APPMODEL_ERROR_PACKAGE_IDENTITY_CORRUPT 15702 +#define APPMODEL_ERROR_NO_APPLICATION 15703 /* HRESULT values for OLE, SHELL and other Interface stuff */ /* the codes 4000-40ff are reserved for OLE */

1 0

Lucas Zawacki : Portuguese translation for release 1.5.24
by Jeremy Newman Feb. 20, 2013

Feb. 20, 2013

Module: website Branch: master Commit: 75bffd54131db74adb0ee7380c6c95a6f9fea6c8 URL: http://source.winehq.org/git/website.git/?a=commit;h=75bffd54131db74adb0ee7… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Feb 19 13:50:05 2013 -0300 Portuguese translation for release 1.5.24 --- news/pt/2013021501.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/pt/2013021501.xml b/news/pt/2013021501.xml new file mode 100644 index 0000000..884e9ed --- /dev/null +++ b/news/pt/2013021501.xml @@ -0,0 +1,14 @@ +<news> +<date>15 de Fevereiro de 2013</date> +<title>Wine 1.5.24 lançado</title> +<body> + A versão de desenvolvimento 1.5.24 já está disponível agora. + <a href="{$root}/announce/1.5.24">Novidades</a> desta versão: +<ul> + <li>Suporte a teclado e rodinha do mouse no driver de Mac.</li> + <li>Suporte a expressões regulares em VB Script.</li> + <li>Diversas limpezas no código do RichEdit.</li> + <li>Várias correções de bugs</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.24.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0