May 2011 - Wine-commits - list.winehq.org

Austin English : winsta: Add a stub dll.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: 14067ac17fb4b48cea4b63b416952984c4aa14ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=14067ac17fb4b48cea4b63b41… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 21 20:14:37 2011 -0500 winsta: Add a stub dll. --- configure | 1 + configure.ac | 1 + dlls/winsta/Makefile.in | 6 +++ dlls/winsta/main.c | 44 ++++++++++++++++++++++ dlls/winsta/winsta.spec | 95 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 147 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5e0f5d5..5392e78 100755 --- a/configure +++ b/configure @@ -15526,6 +15526,7 @@ wine_fn_config_dll winscard enable_winscard implib wine_fn_config_dll winsock.dll16 enable_win16 wine_fn_config_dll winspool.drv enable_winspool_drv po,implib winspool wine_fn_config_test dlls/winspool.drv/tests winspool.drv_test +wine_fn_config_dll winsta enable_winsta wine_fn_config_dll wintab.dll16 enable_win16 wine_fn_config_dll wintab32 enable_wintab32 implib wine_fn_config_test dlls/wintab32/tests wintab32_test diff --git a/configure.ac b/configure.ac index bec4579..5f75b3e 100644 --- a/configure.ac +++ b/configure.ac @@ -2899,6 +2899,7 @@ WINE_CONFIG_DLL(winscard,,[implib]) WINE_CONFIG_DLL(winsock.dll16,enable_win16) WINE_CONFIG_DLL(winspool.drv,,[po,implib],[winspool]) WINE_CONFIG_TEST(dlls/winspool.drv/tests) +WINE_CONFIG_DLL(winsta) WINE_CONFIG_DLL(wintab.dll16,enable_win16) WINE_CONFIG_DLL(wintab32,,[implib]) WINE_CONFIG_TEST(dlls/wintab32/tests) diff --git a/dlls/winsta/Makefile.in b/dlls/winsta/Makefile.in new file mode 100644 index 0000000..06c2e56 --- /dev/null +++ b/dlls/winsta/Makefile.in @@ -0,0 +1,6 @@ +MODULE = winsta.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c new file mode 100644 index 0000000..b71f110 --- /dev/null +++ b/dlls/winsta/main.c @@ -0,0 +1,44 @@ +/* + * Winstation library implementation + * + * Copyright 2011 Austin English + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winsta); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + default: + break; + } + + return TRUE; +} diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec new file mode 100644 index 0000000..1e5fa0a --- /dev/null +++ b/dlls/winsta/winsta.spec @@ -0,0 +1,95 @@ +@ stub LogonIdFromWinStationNameA +@ stub LogonIdFromWinStationNameW +@ stub RemoteAssistancePrepareSystemRestore +@ stub ServerGetInternetConnectorStatus +@ stub ServerLicensingClose +@ stub ServerLicensingDeactivateCurrentPolicy +@ stub ServerLicensingFreePolicyInformation +@ stub ServerLicensingGetAvailablePolicyIds +@ stub ServerLicensingGetPolicy +@ stub ServerLicensingGetPolicyInformationA +@ stub ServerLicensingGetPolicyInformationW +@ stub ServerLicensingLoadPolicy +@ stub ServerLicensingOpenA +@ stub ServerLicensingOpenW +@ stub ServerLicensingSetPolicy +@ stub ServerLicensingUnloadPolicy +@ stub ServerQueryInetConnectorInformationA +@ stub ServerQueryInetConnectorInformationW +@ stub ServerSetInternetConnectorStatus +@ stub WinStationActivateLicense +@ stub WinStationAutoReconnect +@ stub WinStationBroadcastSystemMessage +@ stub WinStationCheckLoopBack +@ stub WinStationCloseServer +@ stub WinStationConnectA +@ stub WinStationConnectCallback +@ stub WinStationConnectW +@ stub WinStationDisconnect +@ stub WinStationEnumerateA +@ stub WinStationEnumerateLicenses +@ stub WinStationEnumerateProcesses +@ stub WinStationEnumerateW +@ stub WinStationEnumerate_IndexedA +@ stub WinStationEnumerate_IndexedW +@ stub WinStationFreeGAPMemory +@ stub WinStationFreeMemory +@ stub WinStationGenerateLicense +@ stub WinStationGetAllProcesses +@ stub WinStationGetLanAdapterNameA +@ stub WinStationGetLanAdapterNameW +@ stub WinStationGetMachinePolicy +@ stub WinStationGetProcessSid +@ stub WinStationGetTermSrvCountersValue +@ stub WinStationInstallLicense +@ stub WinStationIsHelpAssistantSession +@ stub WinStationNameFromLogonIdA +@ stub WinStationNameFromLogonIdW +@ stub WinStationNtsdDebug +@ stub WinStationOpenServerA +@ stub WinStationOpenServerW +@ stub WinStationQueryInformationA +@ stub WinStationQueryInformationW +@ stub WinStationQueryLicense +@ stub WinStationQueryLogonCredentialsW +@ stub WinStationQueryUpdateRequired +@ stub WinStationRegisterConsoleNotification +@ stub WinStationRemoveLicense +@ stub WinStationRenameA +@ stub WinStationRenameW +@ stub WinStationReset +@ stub WinStationSendMessageA +@ stub WinStationSendMessageW +@ stub WinStationSendWindowMessage +@ stub WinStationServerPing +@ stub WinStationSetInformationA +@ stub WinStationSetInformationW +@ stub WinStationSetPoolCount +@ stub WinStationShadow +@ stub WinStationShadowStop +@ stub WinStationShutdownSystem +@ stub WinStationTerminateProcess +@ stub WinStationUnRegisterConsoleNotification +@ stub WinStationVirtualOpen +@ stub WinStationWaitSystemEvent +@ stub _NWLogonQueryAdmin +@ stub _NWLogonSetAdmin +@ stub _WinStationAnnoyancePopup +@ stub _WinStationBeepOpen +@ stub _WinStationBreakPoint +@ stub _WinStationCallback +@ stub _WinStationCheckForApplicationName +@ stub _WinStationFUSCanRemoteUserDisconnect +@ stub _WinStationGetApplicationInfo +@ stub _WinStationNotifyDisconnectPipe +@ stub _WinStationNotifyLogoff +@ stub _WinStationNotifyLogon +@ stub _WinStationNotifyNewSession +@ stub _WinStationReInitializeSecurity +@ stub _WinStationReadRegistry +@ stub _WinStationShadowTarget +@ stub _WinStationShadowTargetSetup +@ stub _WinStationUpdateClientCachedCredentials +@ stub _WinStationUpdateSettings +@ stub _WinStationUpdateUserConfig +@ stub _WinStationWaitForConnect

1 0

Austin English : regapi: Add a stub dll.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: d8d7780981cdd2c630e69c641b4e6f8550b9afe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d7780981cdd2c630e69c641… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 21 20:17:07 2011 -0500 regapi: Add a stub dll. --- configure | 1 + configure.ac | 1 + dlls/regapi/Makefile.in | 6 ++++ dlls/regapi/main.c | 44 ++++++++++++++++++++++++++++++ dlls/regapi/regapi.spec | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 121 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5392e78..87e0908 100755 --- a/configure +++ b/configure @@ -15391,6 +15391,7 @@ wine_fn_config_dll rasapi16.dll16 enable_win16 wine_fn_config_dll rasapi32 enable_rasapi32 implib wine_fn_config_test dlls/rasapi32/tests rasapi32_test wine_fn_config_dll rasdlg enable_rasdlg implib +wine_fn_config_dll regapi enable_regapi wine_fn_config_dll resutils enable_resutils implib wine_fn_config_dll riched20 enable_riched20 implib wine_fn_config_test dlls/riched20/tests riched20_test diff --git a/configure.ac b/configure.ac index 5f75b3e..5811bc1 100644 --- a/configure.ac +++ b/configure.ac @@ -2764,6 +2764,7 @@ WINE_CONFIG_DLL(rasapi16.dll16,enable_win16) WINE_CONFIG_DLL(rasapi32,,[implib]) WINE_CONFIG_TEST(dlls/rasapi32/tests) WINE_CONFIG_DLL(rasdlg,,[implib]) +WINE_CONFIG_DLL(regapi) WINE_CONFIG_DLL(resutils,,[implib]) WINE_CONFIG_DLL(riched20,,[implib]) WINE_CONFIG_TEST(dlls/riched20/tests) diff --git a/dlls/regapi/Makefile.in b/dlls/regapi/Makefile.in new file mode 100644 index 0000000..fabf9df --- /dev/null +++ b/dlls/regapi/Makefile.in @@ -0,0 +1,6 @@ +MODULE = regapi.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/regapi/main.c b/dlls/regapi/main.c new file mode 100644 index 0000000..1164e92 --- /dev/null +++ b/dlls/regapi/main.c @@ -0,0 +1,44 @@ +/* + * regapi implementation + * + * Copyright 2011 Austin English + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(regapi); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + default: + break; + } + + return TRUE; +} diff --git a/dlls/regapi/regapi.spec b/dlls/regapi/regapi.spec new file mode 100644 index 0000000..3836655 --- /dev/null +++ b/dlls/regapi/regapi.spec @@ -0,0 +1,69 @@ +@ stub RegBuildNumberQuery +@ stub RegCdCreateA +@ stub RegCdCreateW +@ stub RegCdDeleteA +@ stub RegCdDeleteW +@ stub RegCdEnumerateA +@ stub RegCdEnumerateW +@ stub RegCdQueryA +@ stub RegCdQueryW +@ stub RegCloseServer +@ stub RegConsoleShadowQueryA +@ stub RegConsoleShadowQueryW +@ stub RegDefaultUserConfigQueryA +@ stub RegDefaultUserConfigQueryW +@ stub RegDenyTSConnectionsPolicy +@ stub RegFreeUtilityCommandList +@ stub RegGetMachinePolicy +@ stub RegGetMachinePolicyEx +@ stub RegGetTServerVersion +@ stub RegGetUserConfigFromUserParameters +@ stub RegGetUserPolicy +@ stub RegIsMachineInHelpMode +@ stub RegIsMachinePolicyAllowHelp +@ stub RegIsTServer +@ stub RegMergeUserConfigWithUserParameters +@ stub RegOpenServerA +@ stub RegOpenServerW +@ stub RegPdCreateA +@ stub RegPdCreateW +@ stub RegPdDeleteA +@ stub RegPdDeleteW +@ stub RegPdEnumerateA +@ stub RegPdEnumerateW +@ stub RegPdQueryA +@ stub RegPdQueryW +@ stub RegQueryOEMId +@ stub RegQueryUtilityCommandList +@ stub RegSAMUserConfig +@ stub RegUserConfigDelete +@ stub RegUserConfigQuery +@ stub RegUserConfigRename +@ stub RegUserConfigSet +@ stub RegWdCreateA +@ stub RegWdCreateW +@ stub RegWdDeleteA +@ stub RegWdDeleteW +@ stub RegWdEnumerateA +@ stub RegWdEnumerateW +@ stub RegWdQueryA +@ stub RegWdQueryW +@ stub RegWinStationAccessCheck +@ stub RegWinStationCreateA +@ stub RegWinStationCreateW +@ stub RegWinStationDeleteA +@ stub RegWinStationDeleteW +@ stub RegWinStationEnumerateA +@ stub RegWinStationEnumerateW +@ stub RegWinStationQueryA +@ stub RegWinStationQueryDefaultSecurity +@ stub RegWinStationQueryEx +@ stub RegWinStationQueryNumValueW +@ stub RegWinStationQuerySecurityA +@ stub RegWinStationQuerySecurityW +@ stub RegWinStationQueryValueW +@ stub RegWinStationQueryW +@ stub RegWinStationSetNumValueW +@ stub RegWinStationSetSecurityA +@ stub RegWinStationSetSecurityW +@ stub WaitForTSConnectionsPolicyChanges

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: 858e82274de9b0e7ff3b7f6cbf0e45e2469f781c URL: http://source.winehq.org/git/wine.git/?a=commit;h=858e82274de9b0e7ff3b7f6cb… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat May 21 11:04:41 2011 +0900 po: Update Korean translation. --- po/ko.po | 142 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 71 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=858e82274de9b0e7ff3b7…

1 0

Austin English : kernel32: Add a stub for ApplicationRecoveryFinished.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: d7c9723bc145247e9fd9a5dbe0c99e9708070481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c9723bc145247e9fd9a5dbe… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 21 18:31:58 2011 -0500 kernel32: Add a stub for ApplicationRecoveryFinished. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ee4b966..38bd6b7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -146,6 +146,7 @@ @ stub -i386 AllocLSCallback @ stdcall -i386 -private AllocSLCallback(ptr ptr) krnl386.exe16.AllocSLCallback @ stub AllocateUserPhysicalPages +@ stdcall ApplicationRecoveryFinished(long) @ stdcall AreFileApisANSI() @ stdcall AssignProcessToJobObject(ptr ptr) @ stdcall AttachConsole(long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f043b87..d5efb83 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3711,6 +3711,7 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void) FIXME("stub\n"); return OptIn; } + /********************************************************************** * SetProcessDEPPolicy (KERNEL32.@) */ @@ -3720,3 +3721,12 @@ BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** + * ApplicationRecoveryFinished (KERNEL32.@) + */ +VOID WINAPI ApplicationRecoveryFinished(BOOL success) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); +}

1 0

Austin English : kernel32: Add a stub for ApplicationRecoveryInProgress.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: ac2c5039c95bebe30c185943badb69b8a0748249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2c5039c95bebe30c185943b… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 21 18:35:01 2011 -0500 kernel32: Add a stub for ApplicationRecoveryInProgress. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 38bd6b7..4a8437e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -147,6 +147,7 @@ @ stdcall -i386 -private AllocSLCallback(ptr ptr) krnl386.exe16.AllocSLCallback @ stub AllocateUserPhysicalPages @ stdcall ApplicationRecoveryFinished(long) +@ stdcall ApplicationRecoveryInProgress(ptr) @ stdcall AreFileApisANSI() @ stdcall AssignProcessToJobObject(ptr ptr) @ stdcall AttachConsole(long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d5efb83..28133b8 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3730,3 +3730,13 @@ VOID WINAPI ApplicationRecoveryFinished(BOOL success) FIXME(": stub\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } + +/********************************************************************** + * ApplicationRecoveryInProgress (KERNEL32.@) + */ +HRESULT WINAPI ApplicationRecoveryInProgress(PBOOL canceled) +{ + FIXME(":%p stub\n", canceled); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return E_FAIL; +}

1 0

Austin English : kernel32: Add a stub for RegisterApplicationRecoveryCallback.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: e701ca90aa0d9ac3fc2d02fa6eb9add8fa35139a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e701ca90aa0d9ac3fc2d02fa6… Author: Austin English <austinenglish(a)gmail.com> Date: Sun May 22 16:18:06 2011 -0500 kernel32: Add a stub for RegisterApplicationRecoveryCallback. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 2 ++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 4a8437e..8e2a5dd 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -978,6 +978,7 @@ @ stdcall RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW @ stdcall RegUnLoadKeyA(long str) advapi32.RegUnLoadKeyA @ stdcall RegUnLoadKeyW(long wstr) advapi32.RegUnLoadKeyW +@ stdcall RegisterApplicationRecoveryCallback(ptr ptr long long) @ stdcall RegisterApplicationRestart(wstr long) @ stub RegisterConsoleIME @ stub RegisterConsoleOS2 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 28133b8..6b8ff99 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3740,3 +3740,13 @@ HRESULT WINAPI ApplicationRecoveryInProgress(PBOOL canceled) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return E_FAIL; } + +/********************************************************************** + * RegisterApplicationRecoveryCallback (KERNEL32.@) + */ +HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK callback, PVOID param, DWORD pingint, DWORD flags) +{ + FIXME("%p, %p, %d, %d: stub\n", callback, param, pingint, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return E_FAIL; +} diff --git a/include/winbase.h b/include/winbase.h index 2752e12..4cae6ea 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -838,6 +838,8 @@ typedef DWORD (CALLBACK *LPPROGRESS_ROUTINE)(LARGE_INTEGER, LARGE_INTEGER, LARGE LARGE_INTEGER, DWORD, DWORD, HANDLE, HANDLE, LPVOID); +typedef DWORD (WINAPI *APPLICATION_RECOVERY_CALLBACK)(PVOID); + #define CREATE_EVENT_MANUAL_RESET 1 #define CREATE_EVENT_INITIAL_SET 2

1 0

Alexandre Julliard : include: Undefine the nameless union/ struct macros to avoid conflicts with mingw.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: bc26bdea7cd58436eedd5ed32edc721b3f0eb023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc26bdea7cd58436eedd5ed32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 23 12:32:19 2011 +0200 include: Undefine the nameless union/struct macros to avoid conflicts with mingw. --- include/winnt.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 62d5f80..b4aa5a0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -192,6 +192,12 @@ extern "C" { # endif #endif /* NONAMELESSUNION */ +#undef DUMMYSTRUCTNAME +#undef DUMMYSTRUCTNAME1 +#undef DUMMYSTRUCTNAME2 +#undef DUMMYSTRUCTNAME3 +#undef DUMMYSTRUCTNAME4 +#undef DUMMYSTRUCTNAME5 #ifndef NONAMELESSSTRUCT #define DUMMYSTRUCTNAME #define DUMMYSTRUCTNAME1 @@ -208,6 +214,15 @@ extern "C" { #define DUMMYSTRUCTNAME5 s5 #endif /* !defined(NONAMELESSSTRUCT) */ +#undef DUMMYUNIONNAME +#undef DUMMYUNIONNAME1 +#undef DUMMYUNIONNAME2 +#undef DUMMYUNIONNAME3 +#undef DUMMYUNIONNAME4 +#undef DUMMYUNIONNAME5 +#undef DUMMYUNIONNAME6 +#undef DUMMYUNIONNAME7 +#undef DUMMYUNIONNAME8 #ifndef NONAMELESSUNION #define DUMMYUNIONNAME #define DUMMYUNIONNAME1

1 0

Alexandre Julliard : winsta: Add stubs for WinStationQueryInformationA/W.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: 22f5e1f6d7195402fab6ae955807cb3e8fbbedaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f5e1f6d7195402fab6ae955… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 23 13:38:42 2011 +0200 winsta: Add stubs for WinStationQueryInformationA/W. --- dlls/winsta/main.c | 17 +++++++++++++++++ dlls/winsta/winsta.spec | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index b71f110..707e33f 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winsta); @@ -42,3 +43,19 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +BOOLEAN WINAPI WinStationQueryInformationA( HANDLE server, ULONG logon_id, WINSTATIONINFOCLASS class, + void *info, ULONG len, ULONG *ret_len ) +{ + FIXME( "%p %u %u %p %u %p\n", server, logon_id, class, info, len, ret_len ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +BOOLEAN WINAPI WinStationQueryInformationW( HANDLE server, ULONG logon_id, WINSTATIONINFOCLASS class, + void *info, ULONG len, ULONG *ret_len ) +{ + FIXME( "%p %u %u %p %u %p\n", server, logon_id, class, info, len, ret_len ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 1e5fa0a..53d4479 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -48,8 +48,8 @@ @ stub WinStationNtsdDebug @ stub WinStationOpenServerA @ stub WinStationOpenServerW -@ stub WinStationQueryInformationA -@ stub WinStationQueryInformationW +@ stdcall WinStationQueryInformationA(ptr long long ptr long ptr) +@ stdcall WinStationQueryInformationW(ptr long long ptr long ptr) @ stub WinStationQueryLicense @ stub WinStationQueryLogonCredentialsW @ stub WinStationQueryUpdateRequired

1 0

Jacek Caban : wininet: Correctly handle closed socket in HTTP_ReceiveRequestData.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: 193da884ad9b982d9b740b15453aa8d3c19b054f URL: http://source.winehq.org/git/wine.git/?a=commit;h=193da884ad9b982d9b740b154… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 23 16:10:09 2011 +0200 wininet: Correctly handle closed socket in HTTP_ReceiveRequestData. --- dlls/wininet/http.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 883e574..a8dbd3d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2293,7 +2293,7 @@ static BOOL end_of_read_data( http_request_t *req ) } /* fetch some more data into the read buffer (the read section must be held) */ -static DWORD refill_read_buffer(http_request_t *req, read_mode_t read_mode) +static DWORD refill_read_buffer(http_request_t *req, read_mode_t read_mode, DWORD *read_bytes) { DWORD res, read=0; @@ -2311,6 +2311,8 @@ static DWORD refill_read_buffer(http_request_t *req, read_mode_t read_mode) req->read_size += read; TRACE("read %u bytes, read_size %u\n", read, req->read_size); + if(read_bytes) + *read_bytes = read; return res; } @@ -2636,22 +2638,30 @@ static DWORD set_content_length(http_request_t *request, DWORD status_code) static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) { INTERNET_ASYNC_RESULT iar; - DWORD res; + DWORD res, read = 0; + read_mode_t mode; TRACE("%p\n", req); EnterCriticalSection( &req->read_section ); - if ((res = refill_read_buffer(req, READMODE_ASYNC)) == ERROR_SUCCESS) { + + mode = first_notif && req->read_size ? READMODE_NOBLOCK : READMODE_ASYNC; + res = refill_read_buffer(req, mode, &read); + if(res == ERROR_SUCCESS) { iar.dwResult = (DWORD_PTR)req->hdr.hInternet; iar.dwError = first_notif ? 0 : get_avail_data(req); - if(!first_notif && !iar.dwError) - ERR("No data reported!\n"); }else { iar.dwResult = 0; iar.dwError = res; } + LeaveCriticalSection( &req->read_section ); + if(res != ERROR_SUCCESS || (mode != READMODE_NOBLOCK && !read)) { + WARN("res %u read %u, closing connection\n", res, read); + http_release_netconn(req, FALSE); + } + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, sizeof(INTERNET_ASYNC_RESULT)); } @@ -2970,7 +2980,7 @@ static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, /* never wait, if we can't enter the section we queue an async request right away */ if (TryEnterCriticalSection( &req->read_section )) { - refill_read_buffer(req, READMODE_NOBLOCK); + refill_read_buffer(req, READMODE_NOBLOCK, NULL); if ((*available = get_avail_data( req ))) goto done; if (end_of_read_data( req )) goto done; LeaveCriticalSection( &req->read_section ); @@ -2988,7 +2998,7 @@ static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, if (!(*available = get_avail_data( req )) && !end_of_read_data( req )) { - refill_read_buffer( req, READMODE_ASYNC ); + refill_read_buffer( req, READMODE_ASYNC, NULL ); *available = get_avail_data( req ); }

1 0

Michael Stefaniuc : shell32: Finish the COM cleanup in shlview.c.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: 3d172c697846a31f735d8218375824cdab0fba50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d172c697846a31f735d82183… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 23 01:00:43 2011 +0200 shell32: Finish the COM cleanup in shlview.c. --- dlls/shell32/shlview.c | 74 ++++++++++++++++++++++++------------------------ 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index ab71f4c..93077d5 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -80,13 +80,13 @@ typedef struct typedef struct { IShellView2 IShellView2_iface; - LONG ref; - const IOleCommandTargetVtbl* lpvtblOleCommandTarget; - const IDropTargetVtbl* lpvtblDropTarget; - const IDropSourceVtbl* lpvtblDropSource; - const IViewObjectVtbl* lpvtblViewObject; - const IFolderViewVtbl* lpvtblFolderView; - const IShellFolderViewVtbl *lpvtblShellFolderView; + IOleCommandTarget IOleCommandTarget_iface; + IDropTarget IDropTarget_iface; + IDropSource IDropSource_iface; + IViewObject IViewObject_iface; + IFolderView IFolderView_iface; + IShellFolderView IShellFolderView_iface; + LONG ref; IShellFolder* pSFParent; IShellFolder2* pSF2Parent; IShellBrowser* pShellBrowser; @@ -125,34 +125,34 @@ static inline IShellViewImpl *impl_from_IShellView2(IShellView2 *iface) return CONTAINING_RECORD(iface, IShellViewImpl, IShellView2_iface); } -static inline IShellViewImpl *impl_from_IOleCommandTarget( IOleCommandTarget *iface ) +static inline IShellViewImpl *impl_from_IOleCommandTarget(IOleCommandTarget *iface) { - return (IShellViewImpl *)((char*)iface - FIELD_OFFSET(IShellViewImpl, lpvtblOleCommandTarget)); + return CONTAINING_RECORD(iface, IShellViewImpl, IOleCommandTarget_iface); } -static inline IShellViewImpl *impl_from_IDropTarget( IDropTarget *iface ) +static inline IShellViewImpl *impl_from_IDropTarget(IDropTarget *iface) { - return (IShellViewImpl *)((char*)iface - FIELD_OFFSET(IShellViewImpl, lpvtblDropTarget)); + return CONTAINING_RECORD(iface, IShellViewImpl, IDropTarget_iface); } -static inline IShellViewImpl *impl_from_IDropSource( IDropSource *iface ) +static inline IShellViewImpl *impl_from_IDropSource(IDropSource *iface) { - return (IShellViewImpl *)((char*)iface - FIELD_OFFSET(IShellViewImpl, lpvtblDropSource)); + return CONTAINING_RECORD(iface, IShellViewImpl, IDropSource_iface); } -static inline IShellViewImpl *impl_from_IViewObject( IViewObject *iface ) +static inline IShellViewImpl *impl_from_IViewObject(IViewObject *iface) { - return (IShellViewImpl *)((char*)iface - FIELD_OFFSET(IShellViewImpl, lpvtblViewObject)); + return CONTAINING_RECORD(iface, IShellViewImpl, IViewObject_iface); } -static inline IShellViewImpl *impl_from_IFolderView( IFolderView *iface ) +static inline IShellViewImpl *impl_from_IFolderView(IFolderView *iface) { - return (IShellViewImpl *)((char*)iface - FIELD_OFFSET(IShellViewImpl, lpvtblFolderView)); + return CONTAINING_RECORD(iface, IShellViewImpl, IFolderView_iface); } -static inline IShellViewImpl *impl_from_IShellFolderView( IShellFolderView *iface ) +static inline IShellViewImpl *impl_from_IShellFolderView(IShellFolderView *iface) { - return (IShellViewImpl *)((char*)iface - FIELD_OFFSET(IShellViewImpl, lpvtblShellFolderView)); + return CONTAINING_RECORD(iface, IShellViewImpl, IShellFolderView_iface); } /* ListView Header ID's */ @@ -207,12 +207,12 @@ IShellView * IShellView_Constructor( IShellFolder * pFolder) sv=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IShellViewImpl)); sv->ref=1; sv->IShellView2_iface.lpVtbl = &svvt; - sv->lpvtblOleCommandTarget=&ctvt; - sv->lpvtblDropTarget=&dtvt; - sv->lpvtblDropSource=&dsvt; - sv->lpvtblViewObject=&vovt; - sv->lpvtblFolderView=&fviewvt; - sv->lpvtblShellFolderView=&shellfolderviewvt; + sv->IOleCommandTarget_iface.lpVtbl = &ctvt; + sv->IDropTarget_iface.lpVtbl = &dtvt; + sv->IDropSource_iface.lpVtbl = &dsvt; + sv->IViewObject_iface.lpVtbl = &vovt; + sv->IFolderView_iface.lpVtbl = &fviewvt; + sv->IShellFolderView_iface.lpVtbl = &shellfolderviewvt; sv->pSFParent = pFolder; if(pFolder) IShellFolder_AddRef(pFolder); @@ -656,7 +656,7 @@ static INT CALLBACK fill_list( LPVOID ptr, LPVOID arg ) static HRESULT ShellView_FillList(IShellViewImpl *This) { - IShellFolderView *folderview = (IShellFolderView*)&This->lpvtblShellFolderView; + IShellFolderView *folderview = &This->IShellFolderView_iface; LPENUMIDLIST pEnumIDList; LPITEMIDLIST pidl; DWORD fetched; @@ -1469,7 +1469,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn if (SUCCEEDED(IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl, (LPCITEMIDLIST*)This->apidl, &IID_IDataObject,0,(LPVOID *)&pda))) { - IDropSource * pds = (IDropSource*)&(This->lpvtblDropSource); /* own DropSource interface */ + IDropSource *pds = &This->IDropSource_iface; /* own DropSource interface */ if (SUCCEEDED(IShellFolder_GetAttributesOf(This->pSFParent, This->cidl, (LPCITEMIDLIST*)This->apidl, &dwAttributes))) { @@ -1746,27 +1746,27 @@ static HRESULT WINAPI IShellView_fnQueryInterface(IShellView2 *iface, REFIID rii } else if(IsEqualIID(riid, &IID_IShellFolderView)) { - *ppvObj = &This->lpvtblShellFolderView; + *ppvObj = &This->IShellFolderView_iface; } else if(IsEqualIID(riid, &IID_IFolderView)) { - *ppvObj = &This->lpvtblFolderView; + *ppvObj = &This->IFolderView_iface; } else if(IsEqualIID(riid, &IID_IOleCommandTarget)) { - *ppvObj = &This->lpvtblOleCommandTarget; + *ppvObj = &This->IOleCommandTarget_iface; } else if(IsEqualIID(riid, &IID_IDropTarget)) { - *ppvObj = &This->lpvtblDropTarget; + *ppvObj = &This->IDropTarget_iface; } else if(IsEqualIID(riid, &IID_IDropSource)) { - *ppvObj = &This->lpvtblDropSource; + *ppvObj = &This->IDropSource_iface; } else if(IsEqualIID(riid, &IID_IViewObject)) { - *ppvObj = &This->lpvtblViewObject; + *ppvObj = &This->IViewObject_iface; } if(*ppvObj) @@ -2007,7 +2007,7 @@ static HRESULT WINAPI IShellView_fnSaveViewState(IShellView2 *iface) static HRESULT WINAPI IShellView_fnSelectItem(IShellView2 *iface, LPCITEMIDLIST pidl, UINT flags) { IShellViewImpl *This = impl_from_IShellView2(iface); - IFolderView *view = (IFolderView*)&This->lpvtblFolderView; + IFolderView *view = &This->IFolderView_iface; int i; TRACE("(%p)->(pidl=%p, 0x%08x)\n",This, pidl, flags); @@ -3021,7 +3021,7 @@ static HRESULT WINAPI IShellFolderView_fnAutoArrange(IShellFolderView *iface) static HRESULT WINAPI IShellFolderView_fnGetAutoArrange(IShellFolderView *iface) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - IFolderView *view = (IFolderView*)&This->lpvtblFolderView; + IFolderView *view = &This->IFolderView_iface; TRACE("(%p)\n", This); return IFolderView_GetAutoArrange(view); @@ -3043,7 +3043,7 @@ static HRESULT WINAPI IShellFolderView_fnGetObject( UINT item) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - IFolderView *view = (IFolderView*)&This->lpvtblFolderView; + IFolderView *view = &This->IFolderView_iface; TRACE("(%p)->(%p %d)\n", This, pidl, item); return IFolderView_Item(view, item, pidl); @@ -3077,7 +3077,7 @@ static HRESULT WINAPI IShellFolderView_fnGetObjectCount( UINT *count) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - IFolderView *view = (IFolderView*)&This->lpvtblFolderView; + IFolderView *view = &This->IFolderView_iface; TRACE("(%p)->(%p)\n", This, count); return IFolderView_ItemCount(view, SVGIO_ALLVIEW, (INT*)count);

1 0