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

Mike McCormack : wininet: Add a test for basic authentication.
by Alexandre Julliard 30 May '06

30 May '06

Module: wine Branch: refs/heads/master Commit: 8af1faec244ed1ad1ffd25673b9e248ef5d96e93 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8af1faec244ed1ad1ffd256… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue May 30 22:55:16 2006 +0900 wininet: Add a test for basic authentication. --- dlls/wininet/tests/http.c | 227 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 192 insertions(+), 35 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 2cad8a5..4992202 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -808,6 +808,13 @@ static const char okmsg[] = "Server: winetest\r\n" "\r\n"; +static const char proxymsg[] = +"HTTP/1.1 407 Proxy Authentication Required\r\n" +"Server: winetest\r\n" +"Proxy-Connection: close\r\n" +"Proxy-Authenticate: Basic realm=\"placebo\"\r\n" +"\r\n"; + static const char page1[] = "<HTML>\r\n" "<HEAD><TITLE>wininet test page</TITLE></HEAD>\r\n" @@ -822,16 +829,20 @@ struct server_info { static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; - int r, s, c, i; + int r, s, c, i, on; struct sockaddr_in sa; char buffer[0x100]; WSADATA wsaData; + int last_request = 0; WSAStartup(MAKEWORD(1,1), &wsaData); s = socket(AF_INET, SOCK_STREAM, 0); if (s<0) - return FALSE; + return 1; + + on = 1; + setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof on); memset(&sa, 0, sizeof sa); sa.sin_family = AF_INET; @@ -842,59 +853,72 @@ static DWORD CALLBACK server_thread(LPVO if (r<0) return 1; - listen(s, 1); + listen(s, 0); SetEvent(si->hEvent); - c = accept(s, NULL, NULL); - - memset(buffer, 0, sizeof buffer); - for(i=0; i<(sizeof buffer-1); i++) + do { - r = recv(c, &buffer[i], 1, 0); - if (r != 1) - break; - if (i<4) continue; - if (buffer[i-2] == '\n' && buffer[i] == '\n' && - buffer[i-3] == '\r' && buffer[i-1] == '\r') - break; - } + c = accept(s, NULL, NULL); + + memset(buffer, 0, sizeof buffer); + for(i=0; i<(sizeof buffer-1); i++) + { + r = recv(c, &buffer[i], 1, 0); + if (r != 1) + break; + if (i<4) continue; + if (buffer[i-2] == '\n' && buffer[i] == '\n' && + buffer[i-3] == '\r' && buffer[i-1] == '\r') + break; + } + + if (strstr(buffer, "GET /test1")) + { + send(c, okmsg, sizeof okmsg-1, 0); + send(c, page1, sizeof page1-1, 0); + } + + if (strstr(buffer, "/test2")) + { + if (strstr(buffer, "Proxy-Authorization: Basic bWlrZToxMTAx")) + { + send(c, okmsg, sizeof okmsg-1, 0); + send(c, page1, sizeof page1-1, 0); + } + else + send(c, proxymsg, sizeof proxymsg-1, 0); + } + + if (strstr(buffer, "/quit")) + { + send(c, okmsg, sizeof okmsg-1, 0); + send(c, page1, sizeof page1-1, 0); + last_request = 1; + } - send(c, okmsg, sizeof okmsg-1, 0); - send(c, page1, sizeof page1-1, 0); + shutdown(c, 2); + closesocket(c); + } while (!last_request); - closesocket(c); closesocket(s); return 0; } -static void test_http_connection(void) +static void test_basic_request(int port, char *url) { - struct server_info si; HINTERNET hi, hc, hr; - HANDLE hThread; - DWORD id = 0, r, count; + DWORD r, count; char buffer[0x100]; - si.hEvent = CreateEvent(NULL, 0, 0, NULL); - si.port = 7531; - - hThread = CreateThread(NULL, 0, server_thread, (LPVOID) &si, 0, &id); - ok( hThread != NULL, "create thread failed\n"); - - r = WaitForSingleObject(si.hEvent, 3000); - ok (r == WAIT_OBJECT_0, "failed to start wininet test server\n"); - if (r != WAIT_OBJECT_0) - return; - hi = InternetOpen(NULL, 0, NULL, NULL, 0); ok(hi != NULL, "open failed\n"); - hc = InternetConnect(hi, "localhost", si.port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + hc = InternetConnect(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(hc != NULL, "connect failed\n"); - hr = HttpOpenRequest(hc, NULL, "/test", NULL, NULL, NULL, 0, 0); + hr = HttpOpenRequest(hc, NULL, url, NULL, NULL, NULL, 0, 0); ok(hr != NULL, "HttpOpenRequest failed\n"); r = HttpSendRequest(hr, NULL, 0, NULL, 0); @@ -910,6 +934,139 @@ static void test_http_connection(void) InternetCloseHandle(hr); InternetCloseHandle(hc); InternetCloseHandle(hi); +} + +static void test_proxy_indirect(int port) +{ + HINTERNET hi, hc, hr; + DWORD r, sz, val; + char buffer[0x40]; + + hi = InternetOpen(NULL, 0, NULL, NULL, 0); + ok(hi != NULL, "open failed\n"); + + hc = InternetConnect(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(hc != NULL, "connect failed\n"); + + hr = HttpOpenRequest(hc, NULL, "/test2", NULL, NULL, NULL, 0, 0); + ok(hr != NULL, "HttpOpenRequest failed\n"); + + r = HttpSendRequest(hr, NULL, 0, NULL, 0); + ok(r, "HttpSendRequest failed\n"); + + sz = sizeof buffer; + r = HttpQueryInfo(hr, HTTP_QUERY_PROXY_AUTHENTICATE, buffer, &sz, NULL); + ok(r, "HttpQueryInfo failed\n"); + ok(!strcmp(buffer, "Basic realm=\"placebo\""), "proxy auth info wrong\n"); + + sz = sizeof buffer; + r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL); + ok(r, "HttpQueryInfo failed\n"); + ok(!strcmp(buffer, "407"), "proxy code wrong\n"); + + sz = sizeof val; + r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &val, &sz, NULL); + ok(r, "HttpQueryInfo failed\n"); + ok(val == 407, "proxy code wrong\n"); + + sz = sizeof buffer; + r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_TEXT, buffer, &sz, NULL); + ok(r, "HttpQueryInfo failed\n"); + ok(!strcmp(buffer, "Proxy Authentication Required"), "proxy text wrong\n"); + + sz = sizeof buffer; + r = HttpQueryInfo(hr, HTTP_QUERY_VERSION, buffer, &sz, NULL); + ok(r, "HttpQueryInfo failed\n"); + ok(!strcmp(buffer, "HTTP/1.1"), "http version wrong\n"); + + sz = sizeof buffer; + r = HttpQueryInfo(hr, HTTP_QUERY_SERVER, buffer, &sz, NULL); + ok(r, "HttpQueryInfo failed\n"); + ok(!strcmp(buffer, "winetest"), "http server wrong\n"); + + sz = sizeof buffer; + r = HttpQueryInfo(hr, HTTP_QUERY_CONTENT_ENCODING, buffer, &sz, NULL); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "HttpQueryInfo should fail\n"); + ok(r == FALSE, "HttpQueryInfo failed\n"); + + InternetCloseHandle(hr); + InternetCloseHandle(hc); + InternetCloseHandle(hi); +} + +static void test_proxy_direct(int port) +{ + HINTERNET hi, hc, hr; + DWORD r, sz; + char buffer[0x40]; + + sprintf(buffer, "localhost:%d\n", port); + hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_PROXY, buffer, NULL, 0); + ok(hi != NULL, "open failed\n"); + + /* try connect without authorization */ + hc = InternetConnect(hi, "www.winehq.org/", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(hc != NULL, "connect failed\n"); + + hr = HttpOpenRequest(hc, NULL, "/test2", NULL, NULL, NULL, 0, 0); + ok(hr != NULL, "HttpOpenRequest failed\n"); + + r = HttpSendRequest(hr, NULL, 0, NULL, 0); + ok(r, "HttpSendRequest failed\n"); + + sz = sizeof buffer; + r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL); + ok(r, "HttpQueryInfo failed\n"); + ok(!strcmp(buffer, "407"), "proxy code wrong\n"); + + + /* set the user + password then try again */ + todo_wine { + r = InternetSetOption(hr, INTERNET_OPTION_PROXY_USERNAME, "mike", 4); + ok(r, "failed to set user\n"); + + r = InternetSetOption(hr, INTERNET_OPTION_PROXY_PASSWORD, "1101", 4); + ok(r, "failed to set password\n"); + } + + r = HttpSendRequest(hr, NULL, 0, NULL, 0); + ok(r, "HttpSendRequest failed\n"); + sz = sizeof buffer; + r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL); + ok(r, "HttpQueryInfo failed\n"); + todo_wine { + ok(!strcmp(buffer, "200"), "proxy code wrong\n"); + } + + + InternetCloseHandle(hr); + InternetCloseHandle(hc); + InternetCloseHandle(hi); +} + +static void test_http_connection(void) +{ + struct server_info si; + HANDLE hThread; + DWORD id = 0, r; + + si.hEvent = CreateEvent(NULL, 0, 0, NULL); + si.port = 7531; + + hThread = CreateThread(NULL, 0, server_thread, (LPVOID) &si, 0, &id); + ok( hThread != NULL, "create thread failed\n"); + + r = WaitForSingleObject(si.hEvent, 10000); + ok (r == WAIT_OBJECT_0, "failed to start wininet test server\n"); + if (r != WAIT_OBJECT_0) + return; + + test_basic_request(si.port, "/test1"); + test_proxy_indirect(si.port); + test_proxy_direct(si.port); + + /* send the basic request again to shutdown the server thread */ + test_basic_request(si.port, "/quit"); r = WaitForSingleObject(hThread, 3000); ok( r == WAIT_OBJECT_0, "thread wait failed\n");

1 0

Mike McCormack : wininet: Don't crash when querying NULL values.
by Alexandre Julliard 30 May '06

30 May '06

Module: wine Branch: refs/heads/master Commit: 739cd1ea329d1a2bbc37df81052c448fbf22afe9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=739cd1ea329d1a2bbc37df8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue May 30 22:55:42 2006 +0900 wininet: Don't crash when querying NULL values. --- dlls/wininet/http.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cb3c55c..428aa2a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1363,6 +1363,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } case HTTP_QUERY_STATUS_TEXT: + if (lpwhr->lpszStatusText) { DWORD len = strlenW(lpwhr->lpszStatusText); if (len + 1 > *lpdwBufferLength/sizeof(WCHAR)) @@ -1378,7 +1379,9 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } + break; case HTTP_QUERY_VERSION: + if (lpwhr->lpszVersion) { DWORD len = strlenW(lpwhr->lpszVersion); if (len + 1 > *lpdwBufferLength/sizeof(WCHAR)) @@ -1394,6 +1397,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } + break; default: assert (LAST_TABLE_HEADER == (HTTP_QUERY_UNLESS_MODIFIED_SINCE + 1));

1 0

Troy Rollo : wined3d: Add missing GL_VERTEX_SHADER_ARB definition.
by Alexandre Julliard 30 May '06

30 May '06

Module: wine Branch: refs/heads/master Commit: abd8becd0c9ca28bcf19d57f961e3dc64b3c6c41 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=abd8becd0c9ca28bcf19d57… Author: Troy Rollo <wine(a)troy.rollo.name> Date: Mon May 29 16:21:22 2006 +1000 wined3d: Add missing GL_VERTEX_SHADER_ARB definition. --- include/wine/wined3d_gl.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index df5d4c3..50717fc 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -672,6 +672,7 @@ #define GL_MAX_FRAGMENT_UNIFORM_COMPONEN #endif #ifndef GL_ARB_vertex_shader #define GL_ARB_vertex_shader 1 +#define GL_VERTEX_SHADER_ARB 0x8B31 #define GL_PROGRAM_OBJECT_ARB 0x8B40 #define GL_SHADER_OBJECT_ARB 0x8B48 #define GL_OBJECT_TYPE_ARB 0x8B4E

1 0

Mike McCormack : user32: Stub implementations for Win64's Get/ Set LongPtr functions.
by Alexandre Julliard 30 May '06

30 May '06

Module: wine Branch: refs/heads/master Commit: 2e1d2b30f84d26903cfafb9734219b2cc435517f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2e1d2b30f84d26903cfafb9… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue May 30 10:47:52 2006 +0900 user32: Stub implementations for Win64's Get/Set LongPtr functions. --- dlls/user/class.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user/user32.spec | 8 +++++++ dlls/user/win.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 0 deletions(-) diff --git a/dlls/user/class.c b/dlls/user/class.c index 69fb5f7..a08d7b5 100644 --- a/dlls/user/class.c +++ b/dlls/user/class.c @@ -1120,3 +1120,57 @@ BOOL16 WINAPI ClassNext16( CLASSENTRY *p return TRUE; } #endif + +/* 64bit versions */ + +#ifdef GetClassLongPtrA +#undef GetClassLongPtrA +#endif + +#ifdef GetClassLongPtrW +#undef GetClassLongPtrW +#endif + +#ifdef SetClassLongPtrA +#undef SetClassLongPtrA +#endif + +#ifdef SetClassLongPtrW +#undef SetClassLongPtrW +#endif + +/*********************************************************************** + * GetClassLongPtrA (USER32.@) + */ +ULONG_PTR WINAPI GetClassLongPtrA( HWND hwnd, INT offset ) +{ + FIXME("\n"); + return 0; +} + +/*********************************************************************** + * GetClassLongPtrW (USER32.@) + */ +ULONG_PTR WINAPI GetClassLongPtrW( HWND hwnd, INT offset ) +{ + FIXME("\n"); + return 0; +} + +/*********************************************************************** + * SetClassLongPtrW (USER32.@) + */ +ULONG_PTR WINAPI SetClassLongPtrW( HWND hwnd, INT offset, LONG_PTR newval ) +{ + FIXME("\n"); + return 0; +} + +/*********************************************************************** + * SetClassLongPtrA (USER32.@) + */ +ULONG_PTR WINAPI SetClassLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) +{ + FIXME("\n"); + return 0; +} diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec index e373712..817858d 100644 --- a/dlls/user/user32.spec +++ b/dlls/user/user32.spec @@ -256,6 +256,8 @@ # @ stub GetAppCompatFlags2 @ stdcall GetClassInfoW(long wstr ptr) @ stdcall GetClassLongA(long long) @ stdcall GetClassLongW(long long) +@ stdcall GetClassLongPtrA(long long) +@ stdcall GetClassLongPtrW(long long) @ stdcall GetClassNameA(long ptr long) @ stdcall GetClassNameW(long ptr long) @ stdcall GetClassWord(long long) @@ -373,6 +375,8 @@ # @ stub GetWinStationInfo @ stdcall GetWindowDC(long) @ stdcall GetWindowInfo(long ptr) @ stdcall GetWindowLongA(long long) +@ stdcall GetWindowLongPtrA(long long) +@ stdcall GetWindowLongPtrW(long long) @ stdcall GetWindowLongW(long long) # @ stub GetWindowModuleFileName @ stdcall GetWindowModuleFileNameA(long ptr long) @@ -599,6 +603,8 @@ # @ stub ResolveDesktopForWOW @ stdcall SetCaretBlinkTime(long) @ stdcall SetCaretPos(long long) @ stdcall SetClassLongA(long long long) +@ stdcall SetClassLongPtrA(long long long) +@ stdcall SetClassLongPtrW(long long long) @ stdcall SetClassLongW(long long long) @ stdcall SetClassWord(long long long) @ stdcall SetClipboardData(long long) @@ -659,6 +665,8 @@ # @ stub SetDesktopBitmap @ stdcall SetWindowContextHelpId(long long) @ stub SetWindowFullScreenState @ stdcall SetWindowLongA(long long long) +@ stdcall SetWindowLongPtrA(long long long) +@ stdcall SetWindowLongPtrW(long long long) @ stdcall SetWindowLongW(long long long) @ stdcall SetWindowPlacement(long ptr) @ stdcall SetWindowPos(long long long long long long long) diff --git a/dlls/user/win.c b/dlls/user/win.c index 080835c..08c5677 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -3177,3 +3177,57 @@ BOOL WINAPI UpdateLayeredWindow( HWND hw hwnd, hdcDst, pptDst, psize, hdcSrc, pptSrc, crKey, pblend, dwFlags); return 0; } + +/* 64bit versions */ + +#ifdef GetWindowLongPtrW +#undef GetWindowLongPtrW +#endif + +#ifdef GetWindowLongPtrA +#undef GetWindowLongPtrA +#endif + +#ifdef SetWindowLongPtrW +#undef SetWindowLongPtrW +#endif + +#ifdef SetWindowLongPtrA +#undef SetWindowLongPtrA +#endif + +/***************************************************************************** + * GetWindowLongPtrW (USER32.@) + */ +LONG_PTR WINAPI GetWindowLongPtrW( HWND hwnd, INT offset ) +{ + FIXME("\n"); + return 0; +} + +/***************************************************************************** + * GetWindowLongPtrA (USER32.@) + */ +LONG_PTR WINAPI GetWindowLongPtrA( HWND hwnd, INT offset ) +{ + FIXME("\n"); + return 0; +} + +/***************************************************************************** + * SetWindowLongPtrW (USER32.@) + */ +LONG_PTR WINAPI SetWindowLongPtrW( HWND hwnd, INT offset, LONG_PTR newval ) +{ + FIXME("\n"); + return 0; +} + +/***************************************************************************** + * SetWindowLongPtrA (USER32.@) + */ +LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) +{ + FIXME("\n"); + return 0; +}

1 0

Vitaliy Margolen : wined3d: Properly destroy texture object if we failed to create its surfaces.
by Alexandre Julliard 30 May '06

30 May '06

Module: wine Branch: refs/heads/master Commit: 93fd4c12f8834a0c5ca3e166b999388b36bde218 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93fd4c12f8834a0c5ca3e16… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon May 29 14:51:33 2006 -0600 wined3d: Properly destroy texture object if we failed to create its surfaces. --- dlls/wined3d/device.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a9dc6b4..70ac58d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -843,14 +843,10 @@ HRESULT WINAPI IWineD3DDeviceImpl_Creat /* use the callback to create the texture surface */ hr = D3DCB_CreateSurface(This->parent, tmpW, tmpH, Format, Usage, Pool, i, &object->surfaces[i],NULL); if (hr!= WINED3D_OK || ( (IWineD3DSurfaceImpl *) object->surfaces[i])->Flags & SFLAG_OVERSIZE) { - int j; FIXME("Failed to create surface %p\n", object); /* clean up */ - for (j = 0 ; j <= i ; j++) { - if(object->surfaces[j]) IWineD3DSurface_Release(object->surfaces[j]); - } - /* heap free object */ - HeapFree(GetProcessHeap(), 0, object); + object->surfaces[i] = NULL; + IWineD3DTexture_Release((IWineD3DTexture *)object); *ppTexture = NULL; return hr;

1 0

Troy Rollo : comdlg32: Prevent SEGV in FILEOPEN95_OnOpen when a malformed filter is passed.
by Alexandre Julliard 30 May '06

30 May '06

Module: wine Branch: refs/heads/master Commit: f1bd9ae2daa1f3a234b4d9d0c58fd5e45a9390d3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f1bd9ae2daa1f3a234b4d9d… Author: Troy Rollo <wine(a)troy.rollo.name> Date: Tue May 30 16:54:03 2006 +1000 comdlg32: Prevent SEGV in FILEOPEN95_OnOpen when a malformed filter is passed. FILEOPEN95_OnOpen assumes that each item in the filter list returns a non-NULL pointer for CB_GETITEMDATA. --- dlls/comdlg32/filedlg.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 68c2fef..37ce6c2 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2370,8 +2370,6 @@ static HRESULT FILEDLG95_FILETYPE_Init(H CBAddStringW(fodInfos->DlgInfos.hwndFileTypeCB, lpstrDisplay); nFilters++; - /* malformed filters are added anyway... */ - if (!*lpstrPos) break; /* Copy the extensions */ if (!(lpstrExt = MemAlloc((strlenW(lpstrPos)+1)*sizeof(WCHAR)))) return E_FAIL; @@ -2380,6 +2378,9 @@ static HRESULT FILEDLG95_FILETYPE_Init(H /* Add the item at the end of the combo */ CBSetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, nFilters-1, lpstrExt); + + /* malformed filters are added anyway... */ + if (!*lpstrExt) break; } }

1 0

Vitaliy Margolen : d3d9: Add reference to the parent device for surfaces.
by Alexandre Julliard 30 May '06

30 May '06

Module: wine Branch: refs/heads/master Commit: 19d19b2b7955d6e7f6250f5c7e0de7ad0e918846 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19d19b2b7955d6e7f6250f5… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon May 29 15:01:04 2006 -0600 d3d9: Add reference to the parent device for surfaces. Allow some objects to have no parent device. Tighten refcount tests and test refound decrement on Release. --- dlls/d3d9/d3d9_private.h | 2 + dlls/d3d9/device.c | 12 ++++-- dlls/d3d9/directx.c | 10 ++++- dlls/d3d9/surface.c | 1 dlls/d3d9/swapchain.c | 2 - dlls/d3d9/tests/device.c | 97 ++++++++++++++++++++++------------------------ 6 files changed, 67 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=19d19b2b7955d6e7f62…

1 0

Robert Shearman : rpcrt4: Make UserMarshalFlags static.
by Alexandre Julliard 30 May '06

30 May '06

Module: wine Branch: refs/heads/master Commit: 115525f3c471634c0cf9111b0f33f78f21f84490 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=115525f3c471634c0cf9111… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 29 16:34:57 2006 +0100 rpcrt4: Make UserMarshalFlags static. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 09012bc..438d9e5 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2576,7 +2576,7 @@ void WINAPI NdrComplexArrayFree(PMIDL_ST pMemory = ComplexFree(pStubMsg, pMemory, pFormat, NULL); } -unsigned long UserMarshalFlags(PMIDL_STUB_MESSAGE pStubMsg) +static unsigned long UserMarshalFlags(PMIDL_STUB_MESSAGE pStubMsg) { return MAKELONG(pStubMsg->dwDestContext, pStubMsg->RpcMsg->DataRepresentation);

1 0

Robert Shearman : rpcrt4: We should never pass an fMustAlloc value of TRUE into the
by Alexandre Julliard 30 May '06

30 May '06

Module: wine Branch: refs/heads/master Commit: df57b025c69649e6a80cdb7efe088c7a69f64281 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=df57b025c69649e6a80cdb7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 29 16:34:36 2006 +0100 rpcrt4: We should never pass an fMustAlloc value of TRUE into the unmarshaler routines of embedded complexes in complex struct and array unmarshaling. Fixes a regression caused by commit 19fad8e71032707cb036239f69f085e1b0249d01, reported by Ulrich Dobramysl. --- dlls/rpcrt4/ndr_marshall.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3fdfaf5..09012bc 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1698,8 +1698,7 @@ static unsigned char * ComplexMarshall(P static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, - PFORMAT_STRING pPointer, - unsigned char fMustAlloc) + PFORMAT_STRING pPointer) { PFORMAT_STRING desc; NDR_UNMARSHALL m; @@ -1745,7 +1744,7 @@ static unsigned char * ComplexUnmarshall TRACE("embedded complex (size=%ld) => %p\n", size, pMemory); m = NdrUnmarshaller[*desc & NDR_TABLE_MASK]; memset(pMemory, 0, size); /* just in case */ - if (m) m(pStubMsg, &pMemory, desc, fMustAlloc); + if (m) m(pStubMsg, &pMemory, desc, FALSE); else FIXME("no unmarshaller for embedded type %02x\n", *desc); pMemory += size; pFormat += 2; @@ -1991,7 +1990,7 @@ unsigned char * WINAPI NdrComplexStructU if (*(const WORD*)pFormat) pointer_desc = pFormat + *(const WORD*)pFormat; pFormat += 2; - pMemory = ComplexUnmarshall(pStubMsg, *ppMemory, pFormat, pointer_desc, fMustAlloc); + pMemory = ComplexUnmarshall(pStubMsg, *ppMemory, pFormat, pointer_desc); if (conf_array) NdrConformantArrayUnmarshall(pStubMsg, &pMemory, conf_array, fMustAlloc); @@ -2449,7 +2448,7 @@ unsigned char * WINAPI NdrComplexArrayUn pMemory = *ppMemory; count = pStubMsg->ActualCount; for (i = 0; i < count; i++) - pMemory = ComplexUnmarshall(pStubMsg, pMemory, pFormat, NULL, fMustAlloc); + pMemory = ComplexUnmarshall(pStubMsg, pMemory, pFormat, NULL); return NULL; }

1 0

Robert Shearman : rpcrt4: Make sure to set a unique pointer with an id of 0 to NULL when unmarshaling .
by Alexandre Julliard 30 May '06

30 May '06

Module: wine Branch: refs/heads/master Commit: cafd2ab37e849bef2b9e86aada74bcbb36a60e67 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cafd2ab37e849bef2b9e86a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 29 16:28:29 2006 +0100 rpcrt4: Make sure to set a unique pointer with an id of 0 to NULL when unmarshaling. --- dlls/rpcrt4/ndr_marshall.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 8b66899..3fdfaf5 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -833,8 +833,10 @@ static void PointerUnmarshall(PMIDL_STUB TRACE("pointer_id is 0x%08lx\n", pointer_id); if (pointer_id) pointer_needs_unmarshaling = 1; - else + else { + *pPointer = NULL; pointer_needs_unmarshaling = 0; + } break; case RPC_FC_OP: /* object pointer - we must free data before overwriting it */ pointer_id = NDR_LOCAL_UINT32_READ(Buffer);

1 0