January 2009 - Wine-Commits

Alexandre Julliard : gdi32: Use the official constants instead of the old Win9x magic numbers for GDI object types .
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 5811a2ccb44c59bc481c5db0ab9c51a8cb429b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5811a2ccb44c59bc481c5db0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 28 16:20:56 2009 +0100 gdi32: Use the official constants instead of the old Win9x magic numbers for GDI object types. --- dlls/gdi32/bitmap.c | 19 +++---- dlls/gdi32/brush.c | 12 ++-- dlls/gdi32/clipping.c | 2 +- dlls/gdi32/dc.c | 18 +++--- dlls/gdi32/dib.c | 14 +++--- dlls/gdi32/enhmetafile.c | 8 +-- dlls/gdi32/enhmfdrv/init.c | 4 +- dlls/gdi32/font.c | 14 +++--- dlls/gdi32/gdi_private.h | 30 +---------- dlls/gdi32/gdiobj.c | 121 ++++++++++---------------------------------- dlls/gdi32/metafile.c | 7 +-- dlls/gdi32/mfdrv/init.c | 4 +- dlls/gdi32/palette.c | 21 ++++---- dlls/gdi32/pen.c | 16 +++--- dlls/gdi32/region.c | 37 +++++++------- dlls/gdi32/wing.c | 2 +- 16 files changed, 114 insertions(+), 215 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5811a2ccb44c59bc481c5…

1 0

Uwe Bonnes : msvcrt/tests: Test case to show Wine still mishandles file text mode.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: d0e77f8a47016c6f69e3a6b5a8bed8f620f1a8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e77f8a47016c6f69e3a6b5a… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Sun Jan 25 18:56:04 2009 +0100 msvcrt/tests: Test case to show Wine still mishandles file text mode. --- dlls/msvcrt/tests/file.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 44ca961..b783b51 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -306,6 +306,7 @@ static void test_asciimode(void) { FILE *fp; char buf[64]; + int c, i, j; /* Simple test of CR CR LF handling. Test both fgets and fread code paths, they're different! */ fp = fopen("ascii.tst", "wb"); @@ -334,6 +335,45 @@ static void test_asciimode(void) ok((fread(buf, 1, sizeof(buf), fp) == 0), "fread after logical EOF\n"); fclose(fp); + /* Show ASCII mode handling*/ + fp= fopen("ascii.tst","wb"); + fputs("0\r\n1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n8\r\n9\r\n", fp); + fclose(fp); + + fp = fopen("ascii.tst", "r"); + c= fgetc(fp); + c= fgetc(fp); + fseek(fp,0,SEEK_CUR); + todo_wine { + for(i=1; i<10; i++) { + ok((j = ftell(fp)) == i*3, "ftell fails in TEXT mode\n"); + fseek(fp,0,SEEK_CUR); + ok((c = fgetc(fp)) == '0'+ i, "fgetc after fseek failed in line %d\n", i); + c= fgetc(fp); + } + /* Show that fseek doesn't skip \\r !*/ + rewind(fp); + c= fgetc(fp); + fseek(fp, 2 ,SEEK_CUR); + for(i=1; i<10; i++) { + ok((c = fgetc(fp)) == '0'+ i, "fgetc after fseek with pos Offset failed in line %d\n", i); + fseek(fp, 2 ,SEEK_CUR); + } + fseek(fp, 9*3 ,SEEK_SET); + c = fgetc(fp); + fseek(fp, -4 ,SEEK_CUR); + for(i= 8; i>=0; i--) { + ok((c = fgetc(fp)) == '0'+ i, "fgetc after fseek with neg Offset failed in line %d\n", i); + fseek(fp, -4 ,SEEK_CUR); + } + } + /* Show what happens is fseek positions filepointer on \\r */ + fclose(fp); + fp = fopen("ascii.tst", "r"); + fseek(fp, 3 ,SEEK_SET); + ok((c = fgetc(fp)) == '1', "fgetc fails to read nect char when positioned on \\r \n"); + fclose(fp); + unlink("ascii.tst"); }

1 0

Aric Stewart : reg.exe: Implement DELETE.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 45824821ff4d68459dc31219e820f2a53466f701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45824821ff4d68459dc31219e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 28 07:14:18 2009 -0600 reg.exe: Implement DELETE. --- programs/reg/En.rc | 1 + programs/reg/reg.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++- programs/reg/reg.h | 1 + 3 files changed, 121 insertions(+), 1 deletions(-) diff --git a/programs/reg/En.rc b/programs/reg/En.rc index 5a3945a..e713416 100644 --- a/programs/reg/En.rc +++ b/programs/reg/En.rc @@ -31,4 +31,5 @@ STRINGTABLE STRING_INVALID_KEY, "Error: Invalid key name\n" STRING_INVALID_CMDLINE, "Error: Invalid command line parameters\n" STRING_NO_REMOTE, "Error: Unable to add keys to remote machine\n" + STRING_CANNOT_FIND, "Error: The system was unable to find the specified registry key or value\n" } diff --git a/programs/reg/reg.c b/programs/reg/reg.c index ff87a2d..4a278d4 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -209,11 +209,129 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL value_all, BOOL force) { - static const WCHAR stubW[] = {'S','T','U','B',' ','D','E','L','E','T','E', + LPWSTR p; + HKEY root,subkey; + + static const WCHAR stubW[] = {'D','E','L','E','T','E', ' ','-',' ','%','s',' ','%','s',' ','%','d',' ','%','d',' ','%','d','\n' ,0}; reg_printfW(stubW, key_name, value_name, value_empty, value_all, force); + if (key_name[0]=='\\' && key_name[1]=='\\') + { + reg_message(STRING_NO_REMOTE); + return 0; + } + + p = strchrW(key_name,'\\'); + if (!p) + { + reg_message(STRING_INVALID_KEY); + return 0; + } + p++; + + root = get_rootkey(key_name); + if (!root) + { + reg_message(STRING_INVALID_KEY); + return 0; + } + + if (value_name && value_empty) + { + RegCloseKey(subkey); + reg_message(STRING_INVALID_CMDLINE); + return 0; + } + + if (value_empty && value_all) + { + RegCloseKey(subkey); + reg_message(STRING_INVALID_CMDLINE); + return 0; + } + + if (!force) + { + /* FIXME: Prompt for delete */ + } + + if (!value_name) + { + if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) + { + reg_message(STRING_CANNOT_FIND); + return 0; + } + reg_message(STRING_SUCCESS); + return 1; + } + + if(RegOpenKeyW(root,p,&subkey)!=ERROR_SUCCESS) + { + reg_message(STRING_CANNOT_FIND); + return 0; + } + + if (value_all) + { + LPWSTR szValue; + DWORD maxValue; + DWORD count; + LONG rc; + + if (value_name) + { + RegCloseKey(subkey); + reg_message(STRING_INVALID_CMDLINE); + return 0; + } + + rc = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + &maxValue, NULL, NULL, NULL); + if (rc != ERROR_SUCCESS) + { + /* FIXME: failure */ + RegCloseKey(subkey); + return 0; + } + maxValue++; + szValue = HeapAlloc(GetProcessHeap(),0,maxValue*sizeof(WCHAR)); + + while (1) + { + count = maxValue; + rc = RegEnumValueW(subkey, 0, value_name, &count, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + { + rc = RegDeleteValueW(subkey,value_name); + if (rc != ERROR_SUCCESS) + break; + } + else break; + } + if (rc != ERROR_SUCCESS) + { + /* FIXME delete failed */ + } + } + else if (value_name) + { + if (RegDeleteValueW(subkey,value_name) != ERROR_SUCCESS) + { + RegCloseKey(subkey); + reg_message(STRING_CANNOT_FIND); + return 0; + } + } + else if (value_empty) + { + RegSetValueExW(subkey,NULL,0,REG_SZ,NULL,0); + } + + RegCloseKey(subkey); + reg_message(STRING_SUCCESS); return 1; } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index f1d4020..6d4ae47 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -27,3 +27,4 @@ #define STRING_INVALID_KEY 106 #define STRING_INVALID_CMDLINE 107 #define STRING_NO_REMOTE 108 +#define STRING_CANNOT_FIND 109

1 0

Aric Stewart : reg.exe: Implement ADD for REG_SZ.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 647a087e8a20073c32e0865f67fe1a8b11586617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=647a087e8a20073c32e0865f6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 28 07:14:07 2009 -0600 reg.exe: Implement ADD for REG_SZ. --- programs/reg/En.rc | 4 ++ programs/reg/reg.c | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++- programs/reg/reg.h | 4 ++ 3 files changed, 142 insertions(+), 1 deletions(-) diff --git a/programs/reg/En.rc b/programs/reg/En.rc index cd26cc1..5a3945a 100644 --- a/programs/reg/En.rc +++ b/programs/reg/En.rc @@ -27,4 +27,8 @@ STRINGTABLE STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n" + STRING_SUCCESS, "The operation completed successfully\n" + STRING_INVALID_KEY, "Error: Invalid key name\n" + STRING_INVALID_CMDLINE, "Error: Invalid command line parameters\n" + STRING_NO_REMOTE, "Error: Unable to add keys to remote machine\n" } diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 7ce787d..ff87a2d 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -63,13 +63,146 @@ static int reg_message(int msg) return reg_printfW(formatW, msg_buffer); } +static HKEY get_rootkey(LPWSTR key) +{ + static const WCHAR szHKLM[] = {'H','K','L','M',0}; + static const WCHAR szHKCU[] = {'H','K','C','U',0}; + static const WCHAR szHKCR[] = {'H','K','C','R',0}; + static const WCHAR szHKU[] = {'H','K','U',0}; + static const WCHAR szHKCC[] = {'H','K','C','C',0}; + + if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==2) + return HKEY_LOCAL_MACHINE; + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==2) + return HKEY_CURRENT_USER; + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==2) + return HKEY_CLASSES_ROOT; + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==2) + return HKEY_USERS; + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==2) + return HKEY_CURRENT_CONFIG; + else return NULL; +} + +static DWORD get_regtype(LPWSTR type) +{ + static const WCHAR szREG_SZ[] = {'R','E','G','_','S','Z',0}; + static const WCHAR szREG_MULTI_SZ[] = {'R','E','G','_','M','U','L','T','I','_','S','Z',0}; + static const WCHAR szREG_DWORD_BIG_ENDIAN[] = {'R','E','G','_','D','W','O','R','D','_','B','I','G','_','E','N','D','I','A','N',0}; + static const WCHAR szREG_DWORD[] = {'R','E','G','_','D','W','O','R','D',0}; + static const WCHAR szREG_BINARY[] = {'R','E','G','_','B','I','N','A','R','Y',0}; + static const WCHAR szREG_DWORD_LITTLE_ENDIAN[] = {'R','E','G','_','D','W','O','R','D','_','L','I','T','T','L','E','_','E','N','D','I','A','N',0}; + static const WCHAR szREG_NONE[] = {'R','E','G','_','N','O','N','E',0}; + static const WCHAR szREG_EXPAND_SZ[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; + + if (!type) + return REG_SZ; + + if (lstrcmpiW(type,szREG_SZ)==0) return REG_SZ; + if (lstrcmpiW(type,szREG_DWORD)==0) return REG_DWORD; + if (lstrcmpiW(type,szREG_MULTI_SZ)==0) return REG_MULTI_SZ; + if (lstrcmpiW(type,szREG_EXPAND_SZ)==0) return REG_EXPAND_SZ; + if (lstrcmpiW(type,szREG_DWORD_BIG_ENDIAN)==0) return REG_DWORD_BIG_ENDIAN; + if (lstrcmpiW(type,szREG_DWORD_LITTLE_ENDIAN)==0) return REG_DWORD_LITTLE_ENDIAN; + if (lstrcmpiW(type,szREG_BINARY)==0) return REG_BINARY; + if (lstrcmpiW(type,szREG_NONE)==0) return REG_NONE; + + return -1; +} + +static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *reg_count) +{ + LPBYTE out_data = NULL; + *reg_count = 0; + + switch (reg_type) + { + case REG_SZ: + { + *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR); + out_data = HeapAlloc(GetProcessHeap(),0,*reg_count); + lstrcpyW((LPWSTR)out_data,data); + break; + } + default: + { + static const WCHAR unhandled[] = {'U','n','h','a','n','d','l','e','d',' ','T','y','p','e',' ','0','x','%','x',' ',' ','d','a','t','a',' ','%','s','\n',0}; + reg_printfW(unhandled, reg_type,data); + } + } + + return out_data; +} + static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { - static const WCHAR stubW[] = {'S','T','U','B',' ','A','D','D',' ','-',' ','%','s', + static const WCHAR stubW[] = {'A','D','D',' ','-',' ','%','s', ' ','%','s',' ','%','d',' ','%','s',' ','%','s',' ','%','d','\n',0}; + LPWSTR p; + HKEY root,subkey; + reg_printfW(stubW, key_name, value_name, value_empty, type, data, force); + if (key_name[0]=='\\' && key_name[1]=='\\') + { + reg_message(STRING_NO_REMOTE); + return 0; + } + + p = strchrW(key_name,'\\'); + if (!p) + { + reg_message(STRING_INVALID_KEY); + return 0; + } + p++; + + root = get_rootkey(key_name); + if (!root) + { + reg_message(STRING_INVALID_KEY); + return 0; + } + + if(RegCreateKeyW(root,p,&subkey)!=ERROR_SUCCESS) + { + reg_message(STRING_INVALID_KEY); + return 0; + } + + if (value_name || data) + { + DWORD reg_type; + DWORD reg_count = 0; + BYTE* reg_data = NULL; + + if (!force) + { + if (RegQueryValueW(subkey,value_name,NULL,NULL)==ERROR_SUCCESS) + { + /* FIXME: Prompt for overwrite */ + } + } + + reg_type = get_regtype(type); + if (reg_type == -1) + { + RegCloseKey(subkey); + reg_message(STRING_INVALID_CMDLINE); + return 0; + } + + if (data) + reg_data = get_regdata(data,reg_type,separator,&reg_count); + + RegSetValueExW(subkey,value_name,0,reg_type,reg_data,reg_count); + HeapFree(GetProcessHeap(),0,reg_data); + } + + RegCloseKey(subkey); + reg_message(STRING_SUCCESS); + return 1; } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 80dea3e..f1d4020 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -23,3 +23,7 @@ #define STRING_ADD_USAGE 102 #define STRING_DELETE_USAGE 103 #define STRING_QUERY_USAGE 104 +#define STRING_SUCCESS 105 +#define STRING_INVALID_KEY 106 +#define STRING_INVALID_CMDLINE 107 +#define STRING_NO_REMOTE 108

1 0

Igor Tarasov : gdi32: Add logcal points to device points conversion for source bitmap before bit stretching .
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 1b17c8d057417ec66e1513877292f87e9f9e1cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b17c8d057417ec66e1513877… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Tue Jan 27 21:28:11 2009 +0400 gdi32: Add logcal points to device points conversion for source bitmap before bit stretching. --- dlls/gdi32/bitblt.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index cff45be..4270f51 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -174,6 +174,17 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, HBITMAP hbm; LPVOID bits; INT lines; + POINT pts[2]; + + pts[0].x = xSrc; + pts[0].y = ySrc; + pts[1].x = xSrc + widthSrc; + pts[1].y = ySrc + heightSrc; + LPtoDP(hdcSrc, pts, 2); + xSrc = pts[0].x; + ySrc = pts[0].y; + widthSrc = pts[1].x - pts[0].x; + heightSrc = pts[1].y - pts[0].y; release_dc_ptr( dcDst );

1 0

Rob Shearman : rpcrt4: Add tests for NdrGetUserMarshalInfo.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 47adeb0525c6d5539840fe8bc8e681a7c6a8758a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47adeb0525c6d5539840fe8bc… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jan 28 12:58:42 2009 +0000 rpcrt4: Add tests for NdrGetUserMarshalInfo. --- dlls/rpcrt4/tests/ndr_marshall.c | 208 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 208 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 5356c43..cba135a 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -2055,6 +2055,213 @@ static void test_NdrMapCommAndFaultStatus(void) } } +static void test_NdrGetUserMarshalInfo(void) +{ + RPC_STATUS status; + MIDL_STUB_MESSAGE stubmsg; + USER_MARSHAL_CB umcb; + NDR_USER_MARSHAL_INFO umi; + unsigned char buffer[16]; + void *rpc_channel_buffer = (void *)(ULONG_PTR)0xcafebabe; + RPC_MESSAGE rpc_msg; + RPC_STATUS (RPC_ENTRY *pNdrGetUserMarshalInfo)(ULONG *,ULONG,NDR_USER_MARSHAL_INFO *); + + pNdrGetUserMarshalInfo = (void *)GetProcAddress(GetModuleHandle("rpcrt4.dll"), "NdrGetUserMarshalInfo"); + if (!pNdrGetUserMarshalInfo) + { + skip("NdrGetUserMarshalInfo not exported\n"); + return; + } + + /* unmarshall */ + + memset(&rpc_msg, 0xcc, sizeof(rpc_msg)); + rpc_msg.Buffer = buffer; + rpc_msg.BufferLength = 16; + + memset(&stubmsg, 0xcc, sizeof(stubmsg)); + stubmsg.RpcMsg = &rpc_msg; + stubmsg.dwDestContext = MSHCTX_INPROC; + stubmsg.pvDestContext = NULL; + stubmsg.Buffer = buffer + 15; + stubmsg.BufferLength = 0; + stubmsg.BufferEnd = NULL; + stubmsg.pRpcChannelBuffer = rpc_channel_buffer; + stubmsg.StubDesc = NULL; + stubmsg.pfnAllocate = my_alloc; + stubmsg.pfnFree = my_free; + + memset(&umcb, 0xcc, sizeof(umcb)); + umcb.Flags = MAKELONG(MSHCTX_INPROC, NDR_LOCAL_DATA_REPRESENTATION); + umcb.pStubMsg = &stubmsg; + umcb.Signature = USER_MARSHAL_CB_SIGNATURE; + umcb.CBType = USER_MARSHAL_CB_UNMARSHALL; + + memset(&umi, 0xaa, sizeof(umi)); + + status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); + ok( umi.InformationLevel == 1, + "umi.InformationLevel was %u instead of 1\n", + umi.InformationLevel); + ok( U(umi.Level1).Buffer == buffer + 15, + "U(umi.Level1).Buffer was %p instead of %p\n", + U(umi.Level1).Buffer, buffer); + ok( U(umi.Level1).BufferSize == 1, + "U(umi.Level1).BufferSize was %u instead of 1\n", + U(umi.Level1).BufferSize); + ok( U(umi.Level1).pfnAllocate == my_alloc, + "U(umi.Level1).pfnAllocate was %p instead of %p\n", + U(umi.Level1).pfnAllocate, my_alloc); + ok( U(umi.Level1).pfnFree == my_free, + "U(umi.Level1).pfnFree was %p instead of %p\n", + U(umi.Level1).pfnFree, my_free); + ok( U(umi.Level1).pRpcChannelBuffer == rpc_channel_buffer, + "U(umi.Level1).pRpcChannelBuffer was %p instead of %p\n", + U(umi.Level1).pRpcChannelBuffer, rpc_channel_buffer); + + /* buffer size */ + + rpc_msg.Buffer = buffer; + rpc_msg.BufferLength = 16; + + stubmsg.Buffer = buffer; + stubmsg.BufferLength = 16; + stubmsg.BufferEnd = NULL; + + umcb.CBType = USER_MARSHAL_CB_BUFFER_SIZE; + + memset(&umi, 0xaa, sizeof(umi)); + + status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); + ok( umi.InformationLevel == 1, + "umi.InformationLevel was %u instead of 1\n", + umi.InformationLevel); + ok( U(umi.Level1).Buffer == NULL, + "U(umi.Level1).Buffer was %p instead of NULL\n", + U(umi.Level1).Buffer); + ok( U(umi.Level1).BufferSize == 0, + "U(umi.Level1).BufferSize was %u instead of 0\n", + U(umi.Level1).BufferSize); + ok( U(umi.Level1).pfnAllocate == my_alloc, + "U(umi.Level1).pfnAllocate was %p instead of %p\n", + U(umi.Level1).pfnAllocate, my_alloc); + ok( U(umi.Level1).pfnFree == my_free, + "U(umi.Level1).pfnFree was %p instead of %p\n", + U(umi.Level1).pfnFree, my_free); + ok( U(umi.Level1).pRpcChannelBuffer == rpc_channel_buffer, + "U(umi.Level1).pRpcChannelBuffer was %p instead of %p\n", + U(umi.Level1).pRpcChannelBuffer, rpc_channel_buffer); + + /* marshall */ + + rpc_msg.Buffer = buffer; + rpc_msg.BufferLength = 16; + + stubmsg.Buffer = buffer + 15; + stubmsg.BufferLength = 0; + stubmsg.BufferEnd = NULL; + + umcb.CBType = USER_MARSHAL_CB_MARSHALL; + + memset(&umi, 0xaa, sizeof(umi)); + + status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); + ok( umi.InformationLevel == 1, + "umi.InformationLevel was %u instead of 1\n", + umi.InformationLevel); + ok( U(umi.Level1).Buffer == buffer + 15, + "U(umi.Level1).Buffer was %p instead of %p\n", + U(umi.Level1).Buffer, buffer); + ok( U(umi.Level1).BufferSize == 1, + "U(umi.Level1).BufferSize was %u instead of 1\n", + U(umi.Level1).BufferSize); + ok( U(umi.Level1).pfnAllocate == my_alloc, + "U(umi.Level1).pfnAllocate was %p instead of %p\n", + U(umi.Level1).pfnAllocate, my_alloc); + ok( U(umi.Level1).pfnFree == my_free, + "U(umi.Level1).pfnFree was %p instead of %p\n", + U(umi.Level1).pfnFree, my_free); + ok( U(umi.Level1).pRpcChannelBuffer == rpc_channel_buffer, + "U(umi.Level1).pRpcChannelBuffer was %p instead of %p\n", + U(umi.Level1).pRpcChannelBuffer, rpc_channel_buffer); + + /* free */ + + rpc_msg.Buffer = buffer; + rpc_msg.BufferLength = 16; + + stubmsg.Buffer = buffer; + stubmsg.BufferLength = 16; + stubmsg.BufferEnd = NULL; + + umcb.CBType = USER_MARSHAL_CB_FREE; + + memset(&umi, 0xaa, sizeof(umi)); + + status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); + ok( umi.InformationLevel == 1, + "umi.InformationLevel was %u instead of 1\n", + umi.InformationLevel); + ok( U(umi.Level1).Buffer == NULL, + "U(umi.Level1).Buffer was %p instead of NULL\n", + U(umi.Level1).Buffer); + ok( U(umi.Level1).BufferSize == 0, + "U(umi.Level1).BufferSize was %u instead of 0\n", + U(umi.Level1).BufferSize); + ok( U(umi.Level1).pfnAllocate == my_alloc, + "U(umi.Level1).pfnAllocate was %p instead of %p\n", + U(umi.Level1).pfnAllocate, my_alloc); + ok( U(umi.Level1).pfnFree == my_free, + "U(umi.Level1).pfnFree was %p instead of %p\n", + U(umi.Level1).pfnFree, my_free); + ok( U(umi.Level1).pRpcChannelBuffer == rpc_channel_buffer, + "U(umi.Level1).pRpcChannelBuffer was %p instead of %p\n", + U(umi.Level1).pRpcChannelBuffer, rpc_channel_buffer); + + /* boundary test */ + + rpc_msg.Buffer = buffer; + rpc_msg.BufferLength = 15; + + stubmsg.Buffer = buffer + 15; + stubmsg.BufferLength = 0; + stubmsg.BufferEnd = NULL; + + umcb.CBType = USER_MARSHAL_CB_MARSHALL; + + status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); + ok( U(umi.Level1).BufferSize == 0, + "U(umi.Level1).BufferSize was %u instead of 0\n", + U(umi.Level1).BufferSize); + + /* error conditions */ + + rpc_msg.BufferLength = 14; + status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + ok(status == ERROR_INVALID_USER_BUFFER, + "NdrGetUserMarshalInfo should have failed with ERROR_INVALID_USER_BUFFER instead of %d\n", status); + + rpc_msg.BufferLength = 15; + status = pNdrGetUserMarshalInfo(&umcb.Flags, 9999, &umi); + ok(status == RPC_S_INVALID_ARG, + "NdrGetUserMarshalInfo should have failed with RPC_S_INVALID_ARG instead of %d\n", status); + + umcb.CBType = 9999; + status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); + + umcb.CBType = USER_MARSHAL_CB_MARSHALL; + umcb.Signature = 0; + status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + ok(status == RPC_S_INVALID_ARG, + "NdrGetUserMarshalInfo should have failed with RPC_S_INVALID_ARG instead of %d\n", status); +} + START_TEST( ndr_marshall ) { determine_pointer_marshalling_style(); @@ -2073,4 +2280,5 @@ START_TEST( ndr_marshall ) test_conf_complex_struct(); test_ndr_buffer(); test_NdrMapCommAndFaultStatus(); + test_NdrGetUserMarshalInfo(); }

1 0

Rob Shearman : ole32: Fix some tests that fail on NT4 and Win9x.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 9353dff5b3e07f2a2a65983c2311b54dc3792325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9353dff5b3e07f2a2a65983c2… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jan 28 12:48:40 2009 +0000 ole32: Fix some tests that fail on NT4 and Win9x. Round the expected sizes up to the alignment used by HeapSize, which is 4 on Win9x and NT4 but 1 in more recent versions. Additionally fix an IGlobalInterfaceTable test which erroneously succeeds on these older OSs. --- dlls/ole32/tests/marshal.c | 20 ++++++++++++++++++-- dlls/ole32/tests/moniker.c | 25 +++++++++++++++++++------ 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 316bcd4..ff72647 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2040,6 +2040,19 @@ static void test_WM_QUIT_handling(void) } } +static SIZE_T round_heap_size(SIZE_T size) +{ + static SIZE_T heap_size_alignment = -1; + if (heap_size_alignment == -1) + { + void *p = HeapAlloc(GetProcessHeap(), 0, 1); + heap_size_alignment = HeapSize(GetProcessHeap(), 0, p); + HeapFree(GetProcessHeap(), 0, p); + } + + return ((size + heap_size_alignment - 1) & ~(heap_size_alignment - 1)); +} + static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void *ptr, DWORD mshlflags) { HGLOBAL hglobal; @@ -2056,7 +2069,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * if (mshctx == MSHCTX_INPROC) { - DWORD expected_size = 3*sizeof(DWORD) + sizeof(GUID); + DWORD expected_size = round_heap_size(3*sizeof(DWORD) + sizeof(GUID)); ok(size == expected_size, "size should have been %d instead of %d\n", expected_size, size); ok(*(DWORD *)marshal_data == mshlflags, "expected 0x%x, but got 0x%x for mshctx\n", mshlflags, *(DWORD *)marshal_data); @@ -2715,9 +2728,12 @@ static DWORD CALLBACK get_global_interface_proc(LPVOID pv) hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(params->git, params->cookie, &IID_IClassFactory, (void **)&cf); ok(hr == CO_E_NOTINITIALIZED || - hr == E_UNEXPECTED, /* win2k */ + broken(hr == E_UNEXPECTED) /* win2k */ || + broken(hr == S_OK) /* NT 4 */, "IGlobalInterfaceTable_GetInterfaceFromGlobal should have failed with error CO_E_NOTINITIALIZED or E_UNEXPECTED instead of 0x%08x\n", hr); + if (hr == S_OK) + IClassFactory_Release(cf); CoInitialize(NULL); diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index c74fc84..08ef2ee 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -82,6 +82,19 @@ static void UnlockModule(void) InterlockedDecrement(&cLocks); } +static SIZE_T round_heap_size(SIZE_T size) +{ + static SIZE_T heap_size_alignment = -1; + if (heap_size_alignment == -1) + { + void *p = HeapAlloc(GetProcessHeap(), 0, 1); + heap_size_alignment = HeapSize(GetProcessHeap(), 0, p); + HeapFree(GetProcessHeap(), 0, p); + } + + return ((size + heap_size_alignment - 1) & ~(heap_size_alignment - 1)); +} + static HRESULT WINAPI Test_IClassFactory_QueryInterface( LPCLASSFACTORY iface, REFIID riid, @@ -1204,12 +1217,12 @@ static void test_moniker( moniker_data = GlobalLock(hglobal); /* first check we have the right amount of data */ - ok(moniker_size == sizeof_expected_moniker_saved_data, + ok(moniker_size == round_heap_size(sizeof_expected_moniker_saved_data), "%s: Size of saved data differs (expected %d, actual %d)\n", - testname, sizeof_expected_moniker_saved_data, moniker_size); + testname, (DWORD)round_heap_size(sizeof_expected_moniker_saved_data), moniker_size); /* then do a byte-by-byte comparison */ - for (i = 0; i < min(moniker_size, sizeof_expected_moniker_saved_data); i++) + for (i = 0; i < min(moniker_size, round_heap_size(sizeof_expected_moniker_saved_data)); i++) { if (expected_moniker_saved_data[i] != moniker_data[i]) { @@ -1250,14 +1263,14 @@ static void test_moniker( moniker_data = GlobalLock(hglobal); /* first check we have the right amount of data */ - ok(moniker_size == sizeof_expected_moniker_marshal_data, + ok(moniker_size == round_heap_size(sizeof_expected_moniker_marshal_data), "%s: Size of marshaled data differs (expected %d, actual %d)\n", - testname, sizeof_expected_moniker_marshal_data, moniker_size); + testname, (DWORD)round_heap_size(sizeof_expected_moniker_marshal_data), moniker_size); /* then do a byte-by-byte comparison */ if (expected_moniker_marshal_data) { - for (i = 0; i < min(moniker_size, sizeof_expected_moniker_marshal_data); i++) + for (i = 0; i < min(moniker_size, round_heap_size(sizeof_expected_moniker_marshal_data)); i++) { if (expected_moniker_marshal_data[i] != moniker_data[i]) {

1 0

Rob Shearman : rpcrt4: Don' t test for a specific value for fBufferValid in test_client_init.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: b46f1686505c26145ab5f81df432cc83fefee862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46f1686505c26145ab5f81df… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jan 28 12:48:58 2009 +0000 rpcrt4: Don't test for a specific value for fBufferValid in test_client_init. It's not consistent across different Windows versions. --- dlls/rpcrt4/tests/ndr_marshall.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 83a80d9..5356c43 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1196,7 +1196,7 @@ static void test_client_init(void) stubMsg.fIsOut == -1, /* XP-SP3 */ "fIsOut should have been set to 0 or -1 instead of %d\n", stubMsg.fIsOut); TEST_ZERO(fIsOicf, "%d"); - TEST_ZERO(fBufferValid, "%d"); + trace("NdrClientInitializeNew: fBufferValid = %d\n", stubMsg.fBufferValid); ok(stubMsg.fHasMemoryValidateCallback == 0 || stubMsg.fHasMemoryValidateCallback == -1, /* XP-SP3 */ "fHasMemoryValidateCallback should have been set to 0 or -1 instead of %d\n", stubMsg.fHasMemoryValidateCallback); @@ -1313,7 +1313,7 @@ todo_wine stubMsg.fIsOut == -1, /* XP-SP3 */ "fIsOut should have been set to 0 or -1 instead of %d\n", stubMsg.fIsOut); TEST_ZERO(fIsOicf, "%d"); - trace("fBufferValid = %d\n", stubMsg.fBufferValid); + trace("NdrServerInitializeNew: fBufferValid = %d\n", stubMsg.fBufferValid); ok(stubMsg.fHasMemoryValidateCallback == 0 || stubMsg.fHasMemoryValidateCallback == -1, /* XP-SP3 */ "fHasMemoryValidateCallback should have been set to 0 or -1 instead of %d\n", stubMsg.fHasMemoryValidateCallback);

1 0

Rob Shearman : rpcrt4: Implement NdrGetUserMarshalInfo.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 78ac42bb1c75299d2f678f8e84d5af49157b28fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ac42bb1c75299d2f678f8e8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jan 28 12:58:37 2009 +0000 rpcrt4: Implement NdrGetUserMarshalInfo. --- dlls/rpcrt4/ndr_marshall.c | 47 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index d1f231d..e0ff73d 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4338,10 +4338,51 @@ void WINAPI NdrUserMarshalFree(PMIDL_STUB_MESSAGE pStubMsg, /*********************************************************************** * NdrGetUserMarshalInfo [RPCRT4.@] */ -RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo(ULONG *flags, ULONG level, NDR_USER_MARSHAL_INFO *mi) +RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo(ULONG *flags, ULONG level, NDR_USER_MARSHAL_INFO *umi) { - FIXME("(%p,%u,%p)\n", flags, level, mi); - return RPC_X_INVALID_BUFFER; + USER_MARSHAL_CB *umcb = CONTAINING_RECORD(flags, USER_MARSHAL_CB, Flags); + + TRACE("(%p,%u,%p)\n", flags, level, umi); + + if (level != 1) + return RPC_S_INVALID_ARG; + + memset(&umi->Level1, 0, sizeof(umi->Level1)); + umi->InformationLevel = level; + + if (umcb->Signature != USER_MARSHAL_CB_SIGNATURE) + return RPC_S_INVALID_ARG; + + umi->Level1.pfnAllocate = umcb->pStubMsg->pfnAllocate; + umi->Level1.pfnFree = umcb->pStubMsg->pfnFree; + umi->Level1.pRpcChannelBuffer = umcb->pStubMsg->pRpcChannelBuffer; + + switch (umcb->CBType) + { + case USER_MARSHAL_CB_MARSHALL: + case USER_MARSHAL_CB_UNMARSHALL: + { + RPC_MESSAGE *msg = umcb->pStubMsg->RpcMsg; + unsigned char *buffer_start = msg->Buffer; + unsigned char *buffer_end = + (unsigned char *)msg->Buffer + msg->BufferLength; + + if (umcb->pStubMsg->Buffer < buffer_start || + umcb->pStubMsg->Buffer > buffer_end) + return ERROR_INVALID_USER_BUFFER; + + umi->Level1.Buffer = umcb->pStubMsg->Buffer; + umi->Level1.BufferSize = buffer_end - umcb->pStubMsg->Buffer; + break; + } + case USER_MARSHAL_CB_BUFFER_SIZE: + case USER_MARSHAL_CB_FREE: + break; + default: + WARN("unrecognised CBType %d\n", umcb->CBType); + } + + return RPC_S_OK; } /***********************************************************************

1 0

Rob Shearman : ole32: Fix a missing CoUninitialize in test_CoFreeUnusedLibraries.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 0025bdf607ecc76cf43914f2242c109ecd9c32b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0025bdf607ecc76cf43914f22… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jan 28 12:49:49 2009 +0000 ole32: Fix a missing CoUninitialize in test_CoFreeUnusedLibraries. --- dlls/ole32/tests/compobj.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 741584b..a332d27 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -939,6 +939,7 @@ static void test_CoFreeUnusedLibraries(void) if (hr == REGDB_E_CLASSNOTREG) { trace("IE not installed so can't run CoFreeUnusedLibraries test\n"); + CoUninitialize(); return; } ok_ole_success(hr, "CoCreateInstance");

1 0