February 2006 - Wine-Commits

Ulrich Czekalla : oleaut32: Prevent freeing of random memory.
by Alexandre Julliard Feb. 2, 2006

Feb. 2, 2006

Module: wine Branch: refs/heads/master Commit: 37f1d4cb54d568bdb3bdc5a00752e62419628d67 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=37f1d4cb54d568bdb3bdc5a… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Thu Feb 2 13:18:43 2006 +0100 oleaut32: Prevent freeing of random memory. Don't assign type to variant until we're sure we are assigning a value. --- dlls/oleaut32/variant.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 4a2dd90..a40f3d0 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2952,7 +2952,6 @@ HRESULT WINAPI VarAdd(LPVARIANT left, LP /* Do the math */ hres = S_OK; - V_VT(&tv) = tvt; V_VT(result) = resvt; switch (tvt) { case VT_DECIMAL: @@ -2973,10 +2972,13 @@ HRESULT WINAPI VarAdd(LPVARIANT left, LP V_VT(result) = VT_R8; V_R8(result) = r8res; goto end; - } else + } else { + V_VT(&tv) = tvt; V_I8(&tv) = V_I8(&lv) + V_I8(&rv); + } break; case VT_R8: + V_VT(&tv) = tvt; /* FIXME: overflow detection */ V_R8(&tv) = V_R8(&lv) + V_R8(&rv); break;

1 0

Juan Lang : crypt32: Implement CertRDNValueToStrW and CertNameToStrW, with tests.
by Alexandre Julliard Feb. 2, 2006

Feb. 2, 2006

Module: wine Branch: refs/heads/master Commit: ede2e24a6af7677217486cc2f213dfebac15314a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ede2e24a6af7677217486cc… Author: Juan Lang <juan(a)codeweavers.com> Date: Thu Feb 2 13:19:30 2006 +0100 crypt32: Implement CertRDNValueToStrW and CertNameToStrW, with tests. --- dlls/crypt32/str.c | 139 +++++++++++++++++++++++++++++- dlls/crypt32/tests/str.c | 211 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 335 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ede2e24a6af76772174…

1 0

Kevin Koltzau : riched20: Handle context menu.
by Alexandre Julliard Feb. 2, 2006

Feb. 2, 2006

Module: wine Branch: refs/heads/master Commit: fc2ce6779eaf8bcda42be384a93daacd0cdfdb19 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc2ce6779eaf8bcda42be38… Author: Kevin Koltzau <kevin(a)plop.org> Date: Thu Feb 2 13:18:20 2006 +0100 riched20: Handle context menu. --- dlls/riched20/editor.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9b741a8..5111807 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -852,6 +852,29 @@ ME_KeyDown(ME_TextEditor *editor, WORD n return FALSE; } +static void ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) +{ + CHARRANGE selrange; + HMENU menu; + int seltype = 0; + if(!editor->lpOleCallback) + return; + ME_GetSelection(editor, (int *)&selrange.cpMin, (int *)&selrange.cpMax); + if(selrange.cpMin == selrange.cpMax) + seltype |= SEL_EMPTY; + else + { + /* FIXME: Handle objects */ + seltype |= SEL_TEXT; + if(selrange.cpMax-selrange.cpMin > 1) + seltype |= SEL_MULTICHAR; + } + if(SUCCEEDED(IRichEditOleCallback_GetContextMenu(editor->lpOleCallback, seltype, NULL, &selrange, &menu))) + { + TrackPopupMenu(menu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, GetParent(editor->hWnd), NULL); + DestroyMenu(menu); + } +} ME_TextEditor *ME_MakeEditor(HWND hWnd) { ME_TextEditor *ed = ALLOC_OBJ(ME_TextEditor); @@ -1842,6 +1865,9 @@ LRESULT WINAPI RichEditANSIWndProc(HWND case WM_LBUTTONDBLCLK: ME_SelectWord(editor); break; + case WM_CONTEXTMENU: + ME_ShowContextMenu(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); + break; case WM_PAINT: if (editor->bRedraw) {

1 0

Fatih Aşıcı : start.exe: build_args now returns the correct string when no parameter
by Alexandre Julliard Feb. 1, 2006

Feb. 1, 2006

Module: wine Branch: refs/heads/master Commit: 1c9e1f3473c7f29998d03c42e88c0fab6d5c69cb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1c9e1f3473c7f29998d03c4… Author: Fatih Aşıcı <fasici(a)linux-sevenler.org> Date: Wed Feb 1 13:50:52 2006 +0100 start.exe: build_args now returns the correct string when no parameter is passed. --- programs/start/start.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 3effed6..0aee916 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -109,6 +109,7 @@ static char *build_args( int argc, char for (i = 0; i < argc; i++ ) len += strlen(argv[i]) + 1; ret = HeapAlloc( GetProcessHeap(), 0, len ); + ret[0] = 0; for (i = 0, p = ret; i < argc; i++ ) p += sprintf(p, " %s", argv[i]);

1 0

Fatih Aşıcı : x11drv: Added Turkish F keyboard layout.
by Alexandre Julliard Feb. 1, 2006

Feb. 1, 2006

Module: wine Branch: refs/heads/master Commit: a8ef244b89d37d2cfd084f07ce56460706a48725 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a8ef244b89d37d2cfd084f0… Author: Fatih Aşıcı <fasici(a)linux-sevenler.org> Date: Wed Feb 1 13:50:37 2006 +0100 x11drv: Added Turkish F keyboard layout. --- dlls/x11drv/keyboard.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index 3df4162..f645b70 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -799,6 +799,16 @@ static const char main_key_TR[MAIN_LEN][ "<>" }; +/*** Turkish F keyboard layout (setxkbmap trf) */ +static const char main_key_TR_F[MAIN_LEN][4] = +{ +"+*","1!","2\"","3^#","4$","5%","6&","7'","8(","9)","0=","/?","-_", +"fF","gG","��","�I","oO","dD","rR","nN","hH","pP","qQ","wW", +"uU","i�","eE","aA","��","tT","kK","mM","lL","yY","��","xX", +"jJ","��","vV","cC","��","zZ","sS","bB",".:",",;", +"<>" +}; + /*** Israelian keyboard layout (setxkbmap us,il) */ static const char main_key_IL[MAIN_LEN][4] = { @@ -948,6 +958,7 @@ static const struct { {0x0427, "Lithuanian (Baltic) keyboard layout", &main_key_LT_B, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x041f, "Turkish keyboard layout", &main_key_TK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x041f, "Turkish keyboard layout tr", &main_key_TR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x041f, "Turkish keyboard layout trf", &main_key_TR_F, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x040d, "Israelian keyboard layout", &main_key_IL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x040d, "Israelian phonetic keyboard layout", &main_key_IL_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x040d, "Israelian Saharon keyboard layout", &main_key_IL_saharon, &main_key_scan_qwerty, &main_key_vkey_qwerty},

1 0

Juan Lang : crypt32: Implement CertRDNValueToStrA and CertNameToStrA, with tests.
by Alexandre Julliard Feb. 1, 2006

Feb. 1, 2006

Module: wine Branch: refs/heads/master Commit: 6a3b3f8635669ddf6fdae8d2d6a1b7c1a9ab3771 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a3b3f8635669ddf6fdae8d… Author: Juan Lang <juan(a)codeweavers.com> Date: Wed Feb 1 13:50:18 2006 +0100 crypt32: Implement CertRDNValueToStrA and CertNameToStrA, with tests. --- dlls/crypt32/Makefile.in | 1 dlls/crypt32/crypt32.spec | 8 + dlls/crypt32/str.c | 176 +++++++++++++++++++++++++++++ dlls/crypt32/tests/.gitignore | 1 dlls/crypt32/tests/Makefile.in | 3 dlls/crypt32/tests/str.c | 245 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 429 insertions(+), 5 deletions(-) create mode 100644 dlls/crypt32/str.c create mode 100644 dlls/crypt32/tests/str.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6a3b3f8635669ddf6fd…

1 0

Kevin Koltzau : riched20: Implement EM_SETOLECALLBACK.
by Alexandre Julliard Feb. 1, 2006

Feb. 1, 2006

Module: wine Branch: refs/heads/master Commit: 7f84cc48f3c6b12cc64416a28e35577e3db405df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f84cc48f3c6b12cc64416a… Author: Kevin Koltzau <kevin(a)plop.org> Date: Wed Feb 1 13:05:40 2006 +0100 riched20: Implement EM_SETOLECALLBACK. --- dlls/riched20/editor.c | 13 ++++++++++--- dlls/riched20/editstr.h | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 19c7b3f..9b741a8 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -223,8 +223,6 @@ #include "editor.h" #include "commdlg.h" -#include "ole2.h" -#include "richole.h" #include "winreg.h" #define NO_SHLWAPI_STREAM #include "shlwapi.h" @@ -889,6 +887,7 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) ed->bRedraw = TRUE; ed->nInvalidOfs = -1; ed->pfnWordBreak = NULL; + ed->lpOleCallback = NULL; GetClientRect(hWnd, &ed->rcFormat); for (i=0; i<HFONT_CACHE_SIZE; i++) { @@ -985,6 +984,8 @@ void ME_DestroyEditor(ME_TextEditor *edi DeleteObject(editor->pFontCache[i].hFont); } DeleteObject(editor->hbrBackground); + if(editor->lpOleCallback) + IUnknown_Release(editor->lpOleCallback); FREE_OBJ(editor); } @@ -1206,7 +1207,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND UNSUPPORTED_MSG(EM_SETEDITSTYLE) UNSUPPORTED_MSG(EM_SETFONTSIZE) UNSUPPORTED_MSG(EM_SETLANGOPTIONS) - UNSUPPORTED_MSG(EM_SETOLECALLBACK) UNSUPPORTED_MSG(EM_SETOPTIONS) UNSUPPORTED_MSG(EM_SETPALETTE) UNSUPPORTED_MSG(EM_SETPASSWORDCHAR) @@ -2043,6 +2043,13 @@ LRESULT WINAPI RichEditANSIWndProc(HWND FIXME("EM_GETOLEINTERFACE %p: stub\n", ppvObj); return CreateIRichEditOle(ppvObj); } + case EM_SETOLECALLBACK: + if(editor->lpOleCallback) + IUnknown_Release(editor->lpOleCallback); + editor->lpOleCallback = (LPRICHEDITOLECALLBACK)lParam; + if(editor->lpOleCallback) + IUnknown_AddRef(editor->lpOleCallback); + return TRUE; case EM_GETWORDBREAKPROC: return (LRESULT)editor->pfnWordBreak; case EM_SETWORDBREAKPROC: diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 919dd02..d27eab9 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -38,6 +38,9 @@ #include <winuser.h> #include <richedit.h> #include <commctrl.h> +#define COBJMACROS +#include <ole2.h> +#include <richole.h> #include "wine/debug.h" @@ -289,6 +292,7 @@ typedef struct tagME_TextEditor BOOL bRedraw; int nInvalidOfs; EDITWORDBREAKPROCW pfnWordBreak; + LPRICHEDITOLECALLBACK lpOleCallback; } ME_TextEditor; typedef struct tagME_Context

1 0

Dmitry Timoshkov : wine.inf: Remove %1 from [http|htmlfile]\shell\open\command.
by Alexandre Julliard Feb. 1, 2006

Feb. 1, 2006

Module: wine Branch: refs/heads/master Commit: f03c86a27387cd1dc27c371d52a7c72d83b70481 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f03c86a27387cd1dc27c371… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Feb 1 12:32:21 2006 +0100 wine.inf: Remove %1 from [http|htmlfile]\shell\open\command. --- tools/wine.inf | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 5b6e8d6..8a81989 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -97,7 +97,7 @@ HKCR,exefile\shell\open\command,,,"""%1" HKCR,folder\shell\open\ddeexec,,,"[ViewFolder("%l", %I, %S)]" HKCR,folder\shell\open\ddeexec,"NoActivateHandler",,"" HKCR,folder\shell\open\ddeexec\application,,,"Folders" -HKCR,htmlfile\shell\open\command,,,"winebrowser %1" +HKCR,htmlfile\shell\open\command,,,"winebrowser" HKCR,lnkfile,"NeverShowExt",,"" HKCR,lnkfile,"IsShortcut",,"yes" HKCR,lnkfile\CLSID,,,"{00021401-0000-0000-C000-000000000046}" @@ -109,7 +109,7 @@ HKCR,Msi.Package\shell\Repair\command,,, HKCR,Msi.Package\shell\Uninstall\command,,,"msiexec /x %1" HKCR,txtfile\shell\open\command,,,"%11%\notepad.exe %1" HKCR,txtfile\shell\print\command,,,"%11%\notepad.exe /p %1" -HKCR,http\shell\open\command,,,"winebrowser %1" +HKCR,http\shell\open\command,,,"winebrowser" HKCR,mailto\shell\open\command,,,"winebrowser %1" ; FIXME: the following should be done by the dll registration HKCR,AVIFile\Compressors\auds,,,"{0002000F-0000-0000-C000-000000000046}"

1 0

Detlef Riekenberg : winspool: Empty string as environment is valid, with tests.
by Alexandre Julliard Feb. 1, 2006

Feb. 1, 2006

Module: wine Branch: refs/heads/master Commit: 366f452b91e9399217e90a3a441aa91e50fd4c61 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=366f452b91e9399217e90a3… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 1 12:32:10 2006 +0100 winspool: Empty string as environment is valid, with tests. --- dlls/winspool/info.c | 9 ++++----- dlls/winspool/tests/info.c | 28 +++++++++++++++++++++------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index d0f51aa..15f0c48 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -204,6 +204,7 @@ static DWORD WINSPOOL_GetOpenedPrinterRe * Success: PTR to printenv_t * * NOTES + * An empty string is handled the same way as NULL. * SetLastEror(ERROR_INVALID_ENVIRONMENT) is called on Failure * */ @@ -218,7 +219,7 @@ static const printenv_t * validate_envW unsigned int i; TRACE("testing %s\n", debugstr_w(env)); - if (env) + if (env && env[0]) { for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) { @@ -3399,9 +3400,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPr * "%winsysdir%" is the Value from GetSystemDirectoryW() * * FIXME - *- pName != NULL not supported - *- pEnvironment != NULL not supported - *- Current Implementation returns always "%winsysdir%" + *- Only NULL or "" is supported for pName * */ BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment, @@ -3413,7 +3412,7 @@ BOOL WINAPI GetPrinterDriverDirectoryW(L TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded); - if(pName != NULL) { + if(pName != NULL && pName[0]) { FIXME("pName unsupported: %s\n", debugstr_w(pName)); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index 4b11829..8041f5c 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -94,7 +94,7 @@ static LPSTR find_default_printer(VOID) } -static void test_default_printer(void) +static void test_GetDefaultPrinter(void) { BOOL retval; DWORD exact = DEFAULT_PRINTER_SIZE; @@ -171,8 +171,9 @@ static void test_default_printer(void) exact, size); } -static void test_printer_directory(void) -{ LPBYTE buffer = NULL; +static void test_GetPrinterDriverDirectory(void) +{ + LPBYTE buffer = NULL; DWORD cbBuf = 0, pcbNeeded = 0; BOOL res; @@ -305,10 +306,23 @@ static void test_printer_directory(void) "'len > 0' or '0' with ERROR_INVALID_ENVIRONMENT)\n", res, GetLastError(), lstrlenA((char *)buffer)); + /* A Setup-Programm (PDFCreator_0.8.0) use empty strings */ + SetLastError(MAGIC_DEAD); + res = GetPrinterDriverDirectoryA("", "", 1, buffer, cbBuf*2, &pcbNeeded); + ok(res, "returned %d with %ld (expected '!=0')\n", res, GetLastError() ); + + SetLastError(MAGIC_DEAD); + res = GetPrinterDriverDirectoryA(NULL, "", 1, buffer, cbBuf*2, &pcbNeeded); + ok(res, "returned %d with %ld (expected '!=0')\n", res, GetLastError() ); + + SetLastError(MAGIC_DEAD); + res = GetPrinterDriverDirectoryA("", NULL, 1, buffer, cbBuf*2, &pcbNeeded); + ok(res, "returned %d with %ld (expected '!=0')\n", res, GetLastError() ); + HeapFree( GetProcessHeap(), 0, buffer); } -static void test_openprinter(void) +static void test_OpenPrinter(void) { PRINTER_DEFAULTSA defaults; HANDLE hprinter; @@ -458,7 +472,7 @@ START_TEST(info) find_default_printer(); - test_default_printer(); - test_printer_directory(); - test_openprinter(); + test_GetDefaultPrinter(); + test_GetPrinterDriverDirectory(); + test_OpenPrinter(); }

1 0

Detlef Riekenberg : winspool.h: Add missing declarations.
by Alexandre Julliard Feb. 1, 2006

Feb. 1, 2006

Module: wine Branch: refs/heads/master Commit: c30ac0772d08b57f060f921037d15648f7b9fd77 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c30ac0772d08b57f060f921… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 1 12:31:55 2006 +0100 winspool.h: Add missing declarations. --- include/winspool.h | 172 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 159 insertions(+), 13 deletions(-) diff --git a/include/winspool.h b/include/winspool.h index 884da16..6b551aa 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -28,20 +28,20 @@ extern "C" { /* DEFINES */ -#define PRINTER_ATTRIBUTE_QUEUED 0x00000001 -#define PRINTER_ATTRIBUTE_DIRECT 0x00000002 -#define PRINTER_ATTRIBUTE_DEFAULT 0x00000004 -#define PRINTER_ATTRIBUTE_SHARED 0x00000008 -#define PRINTER_ATTRIBUTE_NETWORK 0x00000010 -#define PRINTER_ATTRIBUTE_HIDDEN 0x00000020 -#define PRINTER_ATTRIBUTE_LOCAL 0x00000040 - +#define PRINTER_ATTRIBUTE_QUEUED 0x00000001 +#define PRINTER_ATTRIBUTE_DIRECT 0x00000002 +#define PRINTER_ATTRIBUTE_DEFAULT 0x00000004 +#define PRINTER_ATTRIBUTE_SHARED 0x00000008 +#define PRINTER_ATTRIBUTE_NETWORK 0x00000010 +#define PRINTER_ATTRIBUTE_HIDDEN 0x00000020 +#define PRINTER_ATTRIBUTE_LOCAL 0x00000040 #define PRINTER_ATTRIBUTE_ENABLE_DEVQ 0x00000080 #define PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS 0x00000100 #define PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST 0x00000200 - -#define PRINTER_ATTRIBUTE_WORK_OFFLINE 0x00000400 -#define PRINTER_ATTRIBUTE_ENABLE_BIDI 0x00000800 +#define PRINTER_ATTRIBUTE_WORK_OFFLINE 0x00000400 +#define PRINTER_ATTRIBUTE_ENABLE_BIDI 0x00000800 +#define PRINTER_ATTRIBUTE_RAW_ONLY 0x00001000 +#define PRINTER_ATTRIBUTE_PUBLISHED 0x00002000 #define PRINTER_CONTROL_PAUSE 1 #define PRINTER_CONTROL_RESUME 2 @@ -69,6 +69,7 @@ extern "C" { #define PRINTER_ENUM_ICON6 0x00200000 #define PRINTER_ENUM_ICON7 0x00400000 #define PRINTER_ENUM_ICON8 0x00800000 +#define PRINTER_ENUM_HIDE 0x01000000 /* various printer statuses */ @@ -301,7 +302,7 @@ DECL_WINELIB_TYPE_AW(PDRIVER_INFO_1) DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_1) typedef struct _DRIVER_INFO_2A { - DWORD cVersion; + DWORD cVersion; LPSTR pName; LPSTR pEnvironment; LPSTR pDriverPath; @@ -310,7 +311,7 @@ typedef struct _DRIVER_INFO_2A { } DRIVER_INFO_2A, *PDRIVER_INFO_2A, *LPDRIVER_INFO_2A; typedef struct _DRIVER_INFO_2W { - DWORD cVersion; + DWORD cVersion; LPWSTR pName; LPWSTR pEnvironment; LPWSTR pDriverPath; @@ -352,6 +353,112 @@ DECL_WINELIB_TYPE_AW(DRIVER_INFO_3) DECL_WINELIB_TYPE_AW(PDRIVER_INFO_3) DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_3) +typedef struct _DRIVER_INFO_4A { + DWORD cVersion; + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDriverPath; + LPSTR pDataFile; + LPSTR pConfigFile; + LPSTR pHelpFile; + LPSTR pDependentFiles; + LPSTR pMonitorName; + LPSTR pDefaultDataType; + LPSTR pszzPreviousNames; +} DRIVER_INFO_4A, *PDRIVER_INFO_4A, *LPDRIVER_INFO_4A; + +typedef struct _DRIVER_INFO_4W { + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + LPWSTR pHelpFile; + LPWSTR pDependentFiles; + LPWSTR pMonitorName; + LPWSTR pDefaultDataType; + LPWSTR pszzPreviousNames; +} DRIVER_INFO_4W, *PDRIVER_INFO_4W, *LPDRIVER_INFO_4W; + +DECL_WINELIB_TYPE_AW(DRIVER_INFO_4) +DECL_WINELIB_TYPE_AW(PDRIVER_INFO_4) +DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_4) + + +typedef struct _DRIVER_INFO_5A { + DWORD cVersion; + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDriverPath; + LPSTR pDataFile; + LPSTR pConfigFile; + DWORD dwDriverAttributes; + DWORD dwConfigVersion; + DWORD dwDriverVersion; +} DRIVER_INFO_5A, *PDRIVER_INFO_5A, *LPDRIVER_INFO_5A; + +typedef struct _DRIVER_INFO_5W { + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + DWORD dwDriverAttributes; + DWORD dwConfigVersion; + DWORD dwDriverVersion; +} DRIVER_INFO_5W, *PDRIVER_INFO_5W, *LPDRIVER_INFO_5W; + +DECL_WINELIB_TYPE_AW(DRIVER_INFO_5) +DECL_WINELIB_TYPE_AW(PDRIVER_INFO_5) +DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_5) + +typedef struct _DRIVER_INFO_6A { + DWORD cVersion; + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDriverPath; + LPSTR pDataFile; + LPSTR pConfigFile; + LPSTR pHelpFile; + LPSTR pDependentFiles; + LPSTR pMonitorName; + LPSTR pDefaultDataType; + LPSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPSTR pszMfgName; + LPSTR pszOEMUrl; + LPSTR pszHardwareID; + LPSTR pszProvider; +} DRIVER_INFO_6A, *PDRIVER_INFO_6A, *LPDRIVER_INFO_6A; + +typedef struct _DRIVER_INFO_6W { + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + LPWSTR pHelpFile; + LPWSTR pDependentFiles; + LPWSTR pMonitorName; + LPWSTR pDefaultDataType; + LPWSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPWSTR pszMfgName; + LPWSTR pszOEMUrl; + LPWSTR pszHardwareID; + LPWSTR pszProvider; +} DRIVER_INFO_6W, *PDRIVER_INFO_6W, *LPDRIVER_INFO_6W; + +DECL_WINELIB_TYPE_AW(DRIVER_INFO_6) +DECL_WINELIB_TYPE_AW(PDRIVER_INFO_6) +DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_6) + + typedef struct _PRINTER_INFO_1A { DWORD Flags; LPSTR pDescription; @@ -471,6 +578,45 @@ typedef struct _PRINTER_INFO_6 { DWORD dwStatus; } PRINTER_INFO_6, *PPRINTER_INFO_6, *LPPRINTER_INFO_6; +typedef struct _PRINTER_INFO_7A { + LPSTR pszObjectGUID; + DWORD dwAction; +} PRINTER_INFO_7A, *PPRINTER_INFO_7A, *LPPRINTER_INFO_7A; + +typedef struct _PRINTER_INFO_7W { + LPWSTR pszObjectGUID; + DWORD dwAction; +} PRINTER_INFO_7W, *PPRINTER_INFO_7W, *LPPRINTER_INFO_7W; + +DECL_WINELIB_TYPE_AW(PRINTER_INFO_7) +DECL_WINELIB_TYPE_AW(PPRINTER_INFO_7) +DECL_WINELIB_TYPE_AW(LPPRINTER_INFO_7) + +typedef struct _PRINTER_INFO_8A { + LPDEVMODEA pDevMode; +} PRINTER_INFO_8A, *PPRINTER_INFO_8A, *LPPRINTER_INFO_8A; + +typedef struct _PRINTER_INFO_8W { + LPDEVMODEW pDevMode; +} PRINTER_INFO_8W, *PPRINTER_INFO_8W, *LPPRINTER_INFO_8W; + +DECL_WINELIB_TYPE_AW(PRINTER_INFO_8) +DECL_WINELIB_TYPE_AW(PPRINTER_INFO_8) +DECL_WINELIB_TYPE_AW(LPPRINTER_INFO_8) + +typedef struct _PRINTER_INFO_9A { + LPDEVMODEA pDevMode; +} PRINTER_INFO_9A, *PPRINTER_INFO_9A, *LPPRINTER_INFO_9A; + +typedef struct _PRINTER_INFO_9W { + LPDEVMODEW pDevMode; +} PRINTER_INFO_9W, *PPRINTER_INFO_9W, *LPPRINTER_INFO_9W; + +DECL_WINELIB_TYPE_AW(PRINTER_INFO_9) +DECL_WINELIB_TYPE_AW(PPRINTER_INFO_9) +DECL_WINELIB_TYPE_AW(LPPRINTER_INFO_9) + + typedef struct _JOB_INFO_1A { DWORD JobId; LPSTR pPrinterName;

1 0