wine-commits November 2006

wine-commits@winehq.org

3 participants
792 discussions

Louis Lenders : shell32: Define a few more icon resources.
by Alexandre Julliard 16 Nov '06

16 Nov '06

Module: wine Branch: master Commit: d14d772f800c6ca9474a5bebe53854cb598e4874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d14d772f800c6ca9474a5bebe… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Nov 16 09:50:50 2006 +0000 shell32: Define a few more icon resources. --- dlls/shell32/shres.rc | 5 +++++ dlls/shell32/shresdef.h | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index c9757dd..9e01c65 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -732,6 +732,11 @@ IDI_SHELL_FOLDER_OPEN ICON folder_open.i '00 00 C0 7F A0 9A E0 FF 00 00 FF FF 9A A0' } */ +/* FIXME: Following three resources are not yet added */ +IDI_SHELL_FOLDER_OPEN_SMALL ICON folder_open.ico +IDI_SHELL_FOLDER_OPEN_LARGE ICON folder_open.ico +IDI_SHELL_FOLDER_SMALL_XP ICON folder_open.ico + /* BINRES floppy.ico */ IDI_SHELL_FLOPPY ICON floppy.ico /* { diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index ab475eb..eafd650 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -118,9 +118,12 @@ #define IDI_SHELL_PRINTER 17 #define IDI_SHELL_MY_NETWORK_PLACES 18 #define IDI_SHELL_COMPUTERS_NEAR_ME 19 +#define IDI_SHELL_FOLDER_SMALL_XP 20 #define IDI_SHELL_SEARCH 23 #define IDI_SHELL_HELP 24 +#define IDI_SHELL_FOLDER_OPEN_LARGE 29 #define IDI_SHELL_SHORTCUT 30 +#define IDI_SHELL_FOLDER_OPEN_SMALL 31 #define IDI_SHELL_EMPTY_RECYCLE_BIN 32 #define IDI_SHELL_FULL_RECYCLE_BIN 33 #define IDI_SHELL_DESKTOP 35

1 0

Mike McCormack : oleaut32: Remove incorrect references to malloc.
by Alexandre Julliard 16 Nov '06

16 Nov '06

Module: wine Branch: master Commit: efc8317bb249a464e952ee91c3df777c4b18ac7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc8317bb249a464e952ee91c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 16 17:39:33 2006 +0900 oleaut32: Remove incorrect references to malloc. --- dlls/oleaut32/ungif.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/ungif.h b/dlls/oleaut32/ungif.h index 649534e..6b54a1b 100644 --- a/dlls/oleaut32/ungif.h +++ b/dlls/oleaut32/ungif.h @@ -88,7 +88,7 @@ typedef struct GifColorType { typedef struct ColorMapObject { int ColorCount; int BitsPerPixel; - GifColorType *Colors; /* on malloc(3) heap */ + GifColorType *Colors; } ColorMapObject; typedef struct GifImageDesc { @@ -153,17 +153,17 @@ int DGifCloseFile(GifFileType * GifFile) /* This is the in-core version of an extension record */ typedef struct { int ByteCount; - char *Bytes; /* on malloc(3) heap */ + char *Bytes; int Function; /* Holds the type of the Extension block. */ } ExtensionBlock; /* This holds an image header, its unpacked raster bits, and extensions */ typedef struct SavedImage { GifImageDesc ImageDesc; - unsigned char *RasterBits; /* on malloc(3) heap */ + unsigned char *RasterBits; int Function; /* DEPRECATED: Use ExtensionBlocks[x].Function instead */ int ExtensionBlockCount; - ExtensionBlock *ExtensionBlocks; /* on malloc(3) heap */ + ExtensionBlock *ExtensionBlocks; } SavedImage; #endif /* _UNGIF_H_ */

1 0

Mike McCormack : kernel32: Downgrade a FIXME to a WARN.
by Alexandre Julliard 16 Nov '06

16 Nov '06

Module: wine Branch: master Commit: f8829297dac380f754b1d613c4a0012cad28b29a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8829297dac380f754b1d613c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 16 17:37:40 2006 +0900 kernel32: Downgrade a FIXME to a WARN. --- dlls/kernel32/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 48c6787..4a55e0d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2646,7 +2646,7 @@ DWORD WINAPI GetProcessVersion( DWORD pr BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess, SIZE_T minset, SIZE_T maxset) { - FIXME("(%p,%ld,%ld): stub - harmless\n",hProcess,minset,maxset); + WARN("(%p,%ld,%ld): stub - harmless\n",hProcess,minset,maxset); if(( minset == (SIZE_T)-1) && (maxset == (SIZE_T)-1)) { /* Trim the working set to zero */ /* Swap the process out of physical RAM */

1 0

Detlef Riekenberg : localspl: Replace number with a defined value ( static buffer size).
by Alexandre Julliard 16 Nov '06

16 Nov '06

Module: wine Branch: master Commit: 3b8929b9e828644a976e5b51ae4317e624953647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b8929b9e828644a976e5b51a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Nov 15 21:02:26 2006 +0100 localspl: Replace number with a defined value (static buffer size). --- dlls/localspl/localmon.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index b50c90f..72b6b35 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -83,8 +83,8 @@ static DWORD get_ports_from_reg(DWORD le LPWSTR ptr; LPPORT_INFO_2W out; WCHAR portname[MAX_PATH]; - WCHAR res_PortW[32]; - WCHAR res_MonitorW[32]; + WCHAR res_PortW[IDS_LOCALPORT_MAXLEN]; + WCHAR res_MonitorW[IDS_LOCALMONITOR_MAXLEN]; INT reslen_PortW; INT reslen_MonitorW; DWORD len; @@ -113,8 +113,8 @@ static DWORD get_ports_from_reg(DWORD le } /* "+1" for '\0' */ - reslen_MonitorW = LoadStringW(LOCALSPL_hInstance, IDS_LOCALMONITOR, res_MonitorW, 32) + 1; - reslen_PortW = LoadStringW(LOCALSPL_hInstance, IDS_LOCALPORT, res_PortW, 32) + 1; + reslen_MonitorW = LoadStringW(LOCALSPL_hInstance, IDS_LOCALMONITOR, res_MonitorW, IDS_LOCALMONITOR_MAXLEN) + 1; + reslen_PortW = LoadStringW(LOCALSPL_hInstance, IDS_LOCALPORT, res_PortW, IDS_LOCALPORT_MAXLEN) + 1; res = RegOpenKeyW(HKEY_LOCAL_MACHINE, WinNT_CV_PortsW, &hroot); if (res == ERROR_SUCCESS) {

1 0

Detlef Riekenberg : localspl: Implement ConfigurePort.
by Alexandre Julliard 16 Nov '06

16 Nov '06

Module: wine Branch: master Commit: 3c287f2049e021b628e84c8e98d34eee4c67dad6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c287f2049e021b628e84c8e9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Nov 15 20:41:06 2006 +0100 localspl: Implement ConfigurePort. --- dlls/localspl/localmon.c | 54 +++++++++++++++++++++++++++++++++++++- dlls/localspl/localspl_private.h | 6 ++++ dlls/localspl/spl_De.rc | 3 +- dlls/localspl/spl_En.rc | 1 + dlls/localspl/spl_Ko.rc | 1 + 5 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 30681fe..b50c90f 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -49,6 +49,24 @@ static const WCHAR WinNT_CV_PortsW[] = { 'P','o','r','t','s',0}; /****************************************************************** + * display the Dialog "Nothing to configure" + * + */ + +static void dlg_nothingtoconfig(HWND hWnd) +{ + WCHAR res_PortW[IDS_LOCALPORT_MAXLEN]; + WCHAR res_nothingW[IDS_NOTHINGTOCONFIG_MAXLEN]; + + res_PortW[0] = '\0'; + res_nothingW[0] = '\0'; + LoadStringW(LOCALSPL_hInstance, IDS_LOCALPORT, res_PortW, IDS_LOCALPORT_MAXLEN); + LoadStringW(LOCALSPL_hInstance, IDS_NOTHINGTOCONFIG, res_nothingW, IDS_NOTHINGTOCONFIG_MAXLEN); + + MessageBoxW(hWnd, res_nothingW, res_PortW, MB_OK | MB_ICONINFORMATION); +} + +/****************************************************************** * enumerate the local Ports from the Registry (internal) * * See localmon_EnumPortsW. @@ -155,6 +173,30 @@ getports_cleanup: } /***************************************************** + * localmon_ConfigurePortW [exported through MONITOREX] + * + * Display the Configuration-Dialog for a specific Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box + * pPortName [I] Name of the Port, that should be configured + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +BOOL WINAPI localmon_ConfigurePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName) +{ + TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); + /* ToDo: Dialogs by Portname ("LPTx:", "COMx:") */ + + dlg_nothingtoconfig(hWnd); + return ROUTER_SUCCESS; +} + +/***************************************************** * localmon_EnumPortsW [exported through MONITOREX] * * Enumerate all local Ports @@ -238,7 +280,17 @@ LPMONITOREX WINAPI InitializePrintMonito { sizeof(MONITOREX) - sizeof(DWORD), { - localmon_EnumPortsW + localmon_EnumPortsW, + NULL, /* localmon_OpenPortW */ + NULL, /* localmon_OpenPortExW */ + NULL, /* localmon_StartDocPortW */ + NULL, /* localmon_WritePortW */ + NULL, /* localmon_ReadPortW */ + NULL, /* localmon_EndDocPortW */ + NULL, /* localmon_ClosePortW */ + NULL, /* localmon_AddPortW */ + NULL, /* localmon_AddPortExW */ + localmon_ConfigurePortW } }; diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 00d697a..ad396c2 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -28,5 +28,11 @@ extern HINSTANCE LOCALSPL_hInstance; /* ## Resource-ID ## */ #define IDS_LOCALPORT 500 #define IDS_LOCALMONITOR 507 +#define IDS_NOTHINGTOCONFIG 508 + +/* ## Reserved memorysize for the strings (in WCHAR) ## */ +#define IDS_LOCALMONITOR_MAXLEN 64 +#define IDS_LOCALPORT_MAXLEN 32 +#define IDS_NOTHINGTOCONFIG_MAXLEN 80 #endif /* __WINE_LOCALSPL_PRIVATE__ */ diff --git a/dlls/localspl/spl_De.rc b/dlls/localspl/spl_De.rc index 0501c4e..acc4776 100644 --- a/dlls/localspl/spl_De.rc +++ b/dlls/localspl/spl_De.rc @@ -23,6 +23,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - IDS_LOCALPORT "Lokaler Anschlu�" + IDS_LOCALPORT "Lokaler Anschluss" IDS_LOCALMONITOR "Lokaler Monitor" + IDS_NOTHINGTOCONFIG "Dieser Anschluss hat keine Optionen zum Konfigurieren" } diff --git a/dlls/localspl/spl_En.rc b/dlls/localspl/spl_En.rc index c9d12f4..3e54f88 100644 --- a/dlls/localspl/spl_En.rc +++ b/dlls/localspl/spl_En.rc @@ -25,4 +25,5 @@ STRINGTABLE DISCARDABLE { IDS_LOCALPORT "Local Port" IDS_LOCALMONITOR "Local Monitor" + IDS_NOTHINGTOCONFIG "This port has no options to configure" } diff --git a/dlls/localspl/spl_Ko.rc b/dlls/localspl/spl_Ko.rc index b46be3a..6a0f2d2 100644 --- a/dlls/localspl/spl_Ko.rc +++ b/dlls/localspl/spl_Ko.rc @@ -26,4 +26,5 @@ STRINGTABLE DISCARDABLE { IDS_LOCALPORT "�� Ʈ" IDS_LOCALMONITOR "�� " + IDS_NOTHINGTOCONFIG "This port has no options to configure" }

1 0

Dmitry Timoshkov : user: Use DDE critical section exclusively for instance list protection.
by Alexandre Julliard 16 Nov '06

16 Nov '06

Module: wine Branch: master Commit: a3722bf494bcbb95238b9459b55870c74ac80d2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3722bf494bcbb95238b9459b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 15 21:22:35 2006 +0800 user: Use DDE critical section exclusively for instance list protection. --- dlls/user/dde_client.c | 76 ++++++------------------------------------ dlls/user/dde_misc.c | 83 ++++++++++++++++------------------------------ dlls/user/dde_private.h | 2 - dlls/user/dde_server.c | 43 +++++++----------------- 4 files changed, 52 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3722bf494bcbb95238b9…

1 0

Dmitry Timoshkov : user: Set DDE errors in some failing cases.
by Alexandre Julliard 16 Nov '06

16 Nov '06

Module: wine Branch: master Commit: 5ef324ee898ed6045f47c3ac0564c8dad3a355b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef324ee898ed6045f47c3ac0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 15 21:21:44 2006 +0800 user: Set DDE errors in some failing cases. --- dlls/user/dde_client.c | 11 +++++++++-- dlls/user/dde_misc.c | 7 +++++-- dlls/user/dde_server.c | 2 ++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/user/dde_client.c b/dlls/user/dde_client.c index ecd3b3b..bcf8b33 100644 --- a/dlls/user/dde_client.c +++ b/dlls/user/dde_client.c @@ -1166,7 +1166,7 @@ HDDEDATA WINAPI DdeClientTransaction(LPB pXAct = WDML_ClientQueueRequest(pConv, wFmt, hszItem); break; default: - FIXME("Unknown transation\n"); + FIXME("Unknown transaction type %04x\n", wType); /* unknown transaction type */ pConv->instance->lastError = DMLERR_INVALIDPARAMETER; goto theError; @@ -1187,6 +1187,7 @@ HDDEDATA WINAPI DdeClientTransaction(LPB pConv->wStatus &= ~ST_CONNECTED; WDML_UnQueueTransaction(pConv, pXAct); WDML_FreeTransaction(pConv->instance, pXAct, TRUE); + pConv->instance->lastError = DMLERR_POSTMSG_FAILED; goto theError; } pXAct->dwTimeout = dwTimeout; @@ -1393,10 +1394,16 @@ BOOL WINAPI DdeDisconnect(HCONV hConv) LeaveCriticalSection(&WDML_CritSect); if (PostMessageW(pConv->hwndServer, pXAct->ddeMsg, (WPARAM)pConv->hwndClient, pXAct->lParam)) + { WDML_SyncWaitTransactionReply(hConv, 10000, pXAct, NULL); + ret = TRUE; + } for (i = 0; i < count; i++) EnterCriticalSection(&WDML_CritSect); - ret = TRUE; + + if (!ret) + pConv->instance->lastError = DMLERR_POSTMSG_FAILED; + WDML_FreeTransaction(pConv->instance, pXAct, TRUE); /* still have to destroy data assosiated with conversation */ WDML_RemoveConv(pConv, WDML_CLIENT_SIDE); diff --git a/dlls/user/dde_misc.c b/dlls/user/dde_misc.c index 506f2df..e707c09 100644 --- a/dlls/user/dde_misc.c +++ b/dlls/user/dde_misc.c @@ -1924,12 +1924,14 @@ WDML_CONV* WDML_GetConv(HCONV hConv, BOO if (checkConnected && !(pConv->wStatus & ST_CONNECTED)) { - FIXME("found conv but ain't connected\n"); + WARN("found conv but ain't connected\n"); + pConv->instance->lastError = DMLERR_NO_CONV_ESTABLISHED; return NULL; } if (!pConv->instance || GetCurrentThreadId() != pConv->instance->threadID) { - FIXME("wrong thread ID\n"); + WARN("wrong thread ID\n"); + pConv->instance->lastError = DMLERR_INVALIDPARAMETER; /* FIXME: check */ return NULL; } @@ -1980,6 +1982,7 @@ BOOL WDML_PostAck(WDML_CONV* pConv, WDM if (!PostMessageW(to, WM_DDE_ACK, (WPARAM)from, lParam)) { pConv->wStatus &= ~ST_CONNECTED; + pConv->instance->lastError = DMLERR_POSTMSG_FAILED; FreeDDElParam(WM_DDE_ACK, lParam); return FALSE; } diff --git a/dlls/user/dde_server.c b/dlls/user/dde_server.c index e12980e..5f0f5ee 100644 --- a/dlls/user/dde_server.c +++ b/dlls/user/dde_server.c @@ -136,6 +136,7 @@ BOOL WINAPI DdePostAdvise(DWORD idInst, { ERR("post message failed\n"); pConv->wStatus &= ~ST_CONNECTED; + pConv->instance->lastError = DMLERR_POSTMSG_FAILED; if (!WDML_IsAppOwned(hDdeData)) DdeFreeDataHandle(hDdeData); GlobalFree(hItemData); goto theError; @@ -587,6 +588,7 @@ static WDML_QUEUE_STATE WDML_ServerHandl ReuseDDElParam(pXAct->lParam, WM_DDE_REQUEST, WM_DDE_DATA, (UINT_PTR)hMem, (UINT_PTR)pXAct->atom))) { + pConv->instance->lastError = DMLERR_POSTMSG_FAILED; DdeFreeDataHandle(hDdeData); GlobalFree(hMem); fAck = FALSE;

1 0

Clinton Stimpson : riched20: Fix key handling in dialogs.
by Alexandre Julliard 15 Nov '06

15 Nov '06

Module: wine Branch: master Commit: 4b292b0cb52c8a86a77999f5a0a77a6e704ff82c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b292b0cb52c8a86a77999f5a… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Mon Nov 13 21:33:42 2006 -0700 riched20: Fix key handling in dialogs. --- dlls/riched20/editor.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 07aa4e0..779a6bc 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1465,8 +1465,20 @@ LRESULT WINAPI RichEditANSIWndProc(HWND case WM_GETDLGCODE: { UINT code = DLGC_WANTCHARS|DLGC_WANTARROWS; - if (GetWindowLongW(hWnd, GWL_STYLE)&ES_WANTRETURN) - code |= 0; /* FIXME what can we do here ? ask for messages and censor them ? */ + if(lParam && (((LPMSG)lParam)->message == WM_KEYDOWN)) + { + int vk = (int)((LPMSG)lParam)->wParam; + /* if style says we want return key */ + if((vk == VK_RETURN) && (GetWindowLongW(hWnd, GWL_STYLE) & ES_WANTRETURN)) + { + code |= DLGC_WANTMESSAGE; + } + /* we always handle ctrl-tab */ + if((vk == VK_TAB) && (GetKeyState(VK_CONTROL) & 0x8000)) + { + code |= DLGC_WANTMESSAGE; + } + } return code; } case WM_NCCREATE:

1 0

Hans Leidekker : setupapi: Implement SetupGetSourceInfo{A,W}.
by Alexandre Julliard 15 Nov '06

15 Nov '06

Module: wine Branch: master Commit: ae64a62241ce8868c5cd0420792217549e2f2145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae64a62241ce8868c5cd04207… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Nov 14 15:16:04 2006 +0100 setupapi: Implement SetupGetSourceInfo{A,W}. --- dlls/setupapi/query.c | 91 +++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 +- dlls/setupapi/stubs.c | 22 ---------- include/setupapi.h | 7 +++ 4 files changed, 100 insertions(+), 24 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index e11ea59..bda2f3a 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -425,3 +425,94 @@ BOOL WINAPI SetupGetSourceFileLocationW( } return TRUE; } + +/*********************************************************************** + * SetupGetSourceInfoA (SETUPAPI.@) + */ + +BOOL WINAPI SetupGetSourceInfoA( HINF hinf, UINT source_id, UINT info, + PSTR buffer, DWORD buffer_size, LPDWORD required_size ) +{ + BOOL ret = FALSE; + WCHAR *bufferW = NULL; + DWORD required; + INT size; + + TRACE("%p, %d, %d, %p, %d, %p\n", hinf, source_id, info, buffer, buffer_size, + required_size); + + if (!SetupGetSourceInfoW( hinf, source_id, info, NULL, 0, &required )) + return FALSE; + + if (!(bufferW = HeapAlloc( GetProcessHeap(), 0, required * sizeof(WCHAR) ))) + return FALSE; + + if (!SetupGetSourceInfoW( hinf, source_id, info, bufferW, required, NULL )) + goto done; + + size = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); + if (required_size) *required_size = size; + + if (buffer) + { + if (buffer_size >= size) + WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, buffer_size, NULL, NULL ); + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + goto done; + } + } + ret = TRUE; + + done: + HeapFree( GetProcessHeap(), 0, bufferW ); + return ret; +} + +/*********************************************************************** + * SetupGetSourceInfoW (SETUPAPI.@) + */ + +BOOL WINAPI SetupGetSourceInfoW( HINF hinf, UINT source_id, UINT info, + PWSTR buffer, DWORD buffer_size, LPDWORD required_size ) +{ + INFCONTEXT ctx; + WCHAR source_id_str[11]; + static const WCHAR fmt[] = {'%','d',0}; + DWORD index; + + TRACE("%p, %d, %d, %p, %d, %p\n", hinf, source_id, info, buffer, buffer_size, + required_size); + + sprintfW( source_id_str, fmt, source_id ); + + if (!SetupFindFirstLineW( hinf, source_disks_names_platform, source_id_str, &ctx ) && + !SetupFindFirstLineW( hinf, source_disks_names, source_id_str, &ctx )) + return FALSE; + + switch (info) + { + case SRCINFO_PATH: index = 4; break; + case SRCINFO_TAGFILE: index = 2; break; + case SRCINFO_DESCRIPTION: index = 1; break; + default: + WARN("unknown info level: %d\n", info); + return FALSE; + } + + if (SetupGetStringFieldW( &ctx, index, buffer, buffer_size, required_size )) + return TRUE; + + if (required_size) *required_size = 1; + if (buffer) + { + if (buffer_size >= 1) buffer[0] = 0; + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + } + return TRUE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 4ea80f5..0575339 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -417,8 +417,8 @@ # Yes, Microsoft really misspelled this @ stdcall SetupGetSourceFileLocationW(ptr ptr wstr ptr ptr long ptr) @ stub SetupGetSourceFileSizeA @ stub SetupGetSourceFileSizeW -@ stdcall SetupGetSourceInfoA(ptr long long str long ptr) -@ stdcall SetupGetSourceInfoW(ptr long long wstr long ptr) +@ stdcall SetupGetSourceInfoA(ptr long long ptr long ptr) +@ stdcall SetupGetSourceInfoW(ptr long long ptr long ptr) @ stdcall SetupGetStringFieldA(ptr long ptr long ptr) @ stdcall SetupGetStringFieldW(ptr long ptr long ptr) @ stub SetupGetTargetPathA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index a250924..faf6a1f 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -140,28 +140,6 @@ BOOL WINAPI SetupCopyOEMInfW(PCWSTR sour } /*********************************************************************** - * SetupGetSourceInfoA (SETUPAPI.@) - */ -BOOL WINAPI SetupGetSourceInfoA(HINF InfHandle, UINT SourceId, UINT InfoDesired, - PSTR ReturnBuffer, DWORD ReturnBufferSize, LPDWORD RequiredSize) -{ - FIXME("(%p, %d, %d, %p, %d, %p): stub\n", InfHandle, SourceId, InfoDesired, - ReturnBuffer, ReturnBufferSize, RequiredSize); - return FALSE; -} - -/*********************************************************************** - * SetupGetSourceInfoW (SETUPAPI.@) - */ -BOOL WINAPI SetupGetSourceInfoW(HINF InfHandle, UINT SourceId, UINT InfoDesired, - PWSTR ReturnBuffer, DWORD ReturnBufferSize, LPDWORD RequiredSize) -{ - FIXME("(%p, %d, %d, %p, %d, %p): stub\n", InfHandle, SourceId, InfoDesired, - ReturnBuffer, ReturnBufferSize, RequiredSize); - return FALSE; -} - -/*********************************************************************** * SetupInitializeFileLogW(SETUPAPI.@) */ HANDLE WINAPI SetupInitializeFileLogW(LPWSTR LogFileName, DWORD Flags) diff --git a/include/setupapi.h b/include/setupapi.h index f74bd5b..74faf64 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -692,6 +692,10 @@ #define LogSevError 0x00000002 #define LogSevFatalError 0x00000003 #define LogSevMaximum 0x00000004 +#define SRCINFO_PATH 1 +#define SRCINFO_TAGFILE 2 +#define SRCINFO_DESCRIPTION 3 + LONG WINAPI AddTagToGroupOrderList(PCWSTR lpGroupName, DWORD dwUnknown2, DWORD dwUnknown3); DWORD WINAPI CaptureAndConvertAnsiArg(PCSTR lpSrc, PWSTR *lpDst); DWORD WINAPI CaptureStringArg(PCWSTR lpSrc, PWSTR *lpDst); @@ -817,6 +821,9 @@ #define SetupGetMultiSzField WIN BOOL WINAPI SetupGetSourceFileLocationA( HINF hinf, PINFCONTEXT context, PCSTR filename, PUINT source_id, PSTR buffer, DWORD buffer_size, PDWORD required_size ); BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR filename, PUINT source_id, PWSTR buffer, DWORD buffer_size, PDWORD required_size ); #define SetupGetSourceFileLocation WINELIB_NAME_AW(SetupGetSourceFileLocation) +BOOL WINAPI SetupGetSourceInfoA( HINF hinf, UINT source_id, UINT info, PSTR buffer, DWORD buffer_size, LPDWORD required_size ); +BOOL WINAPI SetupGetSourceInfoW( HINF hinf, UINT source_id, UINT info, PWSTR buffer, DWORD buffer_size, LPDWORD required_size ); +#define SetupGetSourceInfo WINELIB_NAME_AW(SetupGetSourceInfo) BOOL WINAPI SetupGetStringFieldA( PINFCONTEXT context, DWORD index, PSTR buffer, DWORD size, PDWORD required ); BOOL WINAPI SetupGetStringFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer, DWORD size, PDWORD required ); #define SetupGetStringField WINELIB_NAME_AW(SetupGetStringField)

1 0

Rob Shearman : include: Add security QOS flags to winbase.h.
by Alexandre Julliard 15 Nov '06

15 Nov '06

Module: wine Branch: master Commit: 167323e6f8d86a1c4d0950b2cbc4d8e13bac186f URL: http://source.winehq.org/git/wine.git/?a=commit;h=167323e6f8d86a1c4d0950b2c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 15 01:01:32 2006 +0000 include: Add security QOS flags to winbase.h. --- include/winbase.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index aa38013..7e29103 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -710,6 +710,18 @@ #define NMPWAIT_WAIT_FOREVER 0xffffffff #define NMPWAIT_NOWAIT 0x00000001 #define NMPWAIT_USE_DEFAULT_WAIT 0x00000000 +/* Security flags for dwFlagsAndAttributes of CreateFile */ +#define SECURITY_ANONYMOUS (SecurityAnonymous << 16) +#define SECURITY_IDENTIFICATION (SecurityIdentification << 16) +#define SECURITY_IMPERSONATION (SecurityImpersonation << 16) +#define SECURITY_DELEGATION (SecurityDelegation << 16) + +#define SECURITY_CONTEXT_TRACKING 0x00040000 +#define SECURITY_EFFECTIVE_ONLY 0x00080000 + +#define SECURITY_SQOS_PRESENT 0x00100000 +#define SECURITY_VALID_SQOS_FLAGS 0x001f0000 + typedef struct _SYSTEM_POWER_STATUS { BYTE ACLineStatus;

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2006