June 2012 - Wine-commits - list.winehq.org

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 823e214ee832ecd4c3d69764ba3c865714c3d6b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=823e214ee832ecd4c3d69764b… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Jun 27 22:33:11 2012 +0900 po: Update Korean translation. --- po/ko.po | 45 +++++++++++++-------------------------------- 1 files changed, 13 insertions(+), 32 deletions(-) diff --git a/po/ko.po b/po/ko.po index e76d77f..44cb03f 100644 --- a/po/ko.po +++ b/po/ko.po @@ -30,18 +30,13 @@ msgid "&Install..." msgstr "설치(&I)..." #: appwiz.rc:62 -#, fuzzy -#| msgid "" -#| "The following software can be automatically removed. To remove a program " -#| "or to modify its installed components, select it from the list and click " -#| "Change/Remove." msgid "" "The following software can be automatically removed. To remove a program or " "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"이 소프트웨어는 자동으로 삭제되었을 수도 있습니다.설치된 구성요소를 고치거나 " -"프로그램을 지우려면 , 추가/삭제 목록에서 선택하십시오." +"다음 소프트웨어는 자동으로 제거될 것입니다.프로그램을 제거하거나 설치된 구성" +"요소를 변경하려면,목록에서 선택하고 고치기/제거를 클릭하십시오." #: appwiz.rc:64 msgid "&Support Information" @@ -3419,51 +3414,43 @@ msgstr "높음" #: joy.rc:33 msgid "Joysticks" -msgstr "" +msgstr "조이스틱" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" msgstr "사용하지 않음(&D)" #: joy.rc:37 -#, fuzzy -#| msgid "&enable" msgid "&Enable" msgstr "가능(&E)" #: joy.rc:38 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "연결이 끊어짐" +msgstr "연결됨" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "사용하지 않음(&D)" +msgstr "불가능" #: joy.rc:46 msgid "Test Joystick" -msgstr "" +msgstr "조이스틱 시험" #: joy.rc:50 msgid "Buttons" -msgstr "" +msgstr "버튼" #: joy.rc:59 msgid "Test Force Feedback" -msgstr "" +msgstr "강제 피드백 시험" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "컨트롤 만들기" +msgstr "게임 컨트롤러" #: jscript.rc:25 msgid "Error converting object to primitive type" -msgstr "객페를 기본 형식으로 변환하는 중에 오류 발생" +msgstr "객체를 기본 형식으로 변환하는 중에 오류 발생" #: jscript.rc:26 msgid "Invalid procedure call or argument" @@ -13588,22 +13575,16 @@ msgid "Help topics: " msgstr "도움말 목차: " #: wmic.rc:25 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "Error: Command line not supported\n" -msgstr "오류:올바르지 않은 명령라인 매개변수\n" +msgstr "오류: 명령 라인은 지원하지 않음\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" -msgstr "속성 세트를 찾을 수 없습니다.\n" +msgstr "오류: Alias를 찾을 수 없음\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid query\n" -msgstr "오류: 올바르지 않은 키 이름\n" +msgstr "오류: 올바르지 않은 질의\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N"

1 0

André Hentschel : kernel32: Change LCMapStringW to LCMapStringEx and call it from LCMapStringW.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 3cd0834a24f9e7e06f53f18af9dcafd753579929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd0834a24f9e7e06f53f18af… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 26 21:13:06 2012 +0200 kernel32: Change LCMapStringW to LCMapStringEx and call it from LCMapStringW. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 56 ++++++++++++++++++++++++++++++++--------- dlls/kernel32/tests/locale.c | 22 +++++++++++++++- 3 files changed, 64 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bad71a9..76eb207 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -805,6 +805,7 @@ @ stdcall -i386 -private -register K32Thk1632Prolog() krnl386.exe16.K32Thk1632Prolog @ stdcall LCIDToLocaleName(long ptr long long) @ stdcall LCMapStringA(long long str long ptr long) +@ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) @ stdcall LCMapStringW(long long wstr long ptr long) @ stdcall LZClose(long) # @ stub LZCloseFile diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 2970856..e467735 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2493,17 +2493,35 @@ BOOL WINAPI GetStringTypeExA( LCID locale, DWORD type, LPCSTR src, INT count, LP return GetStringTypeA(locale, type, src, count, chartype); } - /************************************************************************* - * LCMapStringW (KERNEL32.@) + * LCMapStringEx (KERNEL32.@) * - * See LCMapStringA. + * Map characters in a locale sensitive string. + * + * PARAMS + * name [I] Locale name for the conversion. + * flags [I] Flags controlling the mapping (LCMAP_ constants from "winnls.h") + * src [I] String to map + * srclen [I] Length of src in chars, or -1 if src is NUL terminated + * dst [O] Destination for mapped string + * dstlen [I] Length of dst in characters + * version [I] reserved, must be NULL + * reserved [I] reserved, must be NULL + * lparam [I] reserved, must be 0 + * + * RETURNS + * Success: The length of the mapped string in dst, including the NUL terminator. + * Failure: 0. Use GetLastError() to determine the cause. */ -INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, - LPWSTR dst, INT dstlen) +INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPWSTR dst, INT dstlen, + LPNLSVERSIONINFO version, LPVOID reserved, LPARAM lparam) { LPWSTR dst_ptr; + if (version) FIXME("unsupported version structure %p\n", version); + if (reserved) FIXME("unsupported reserved pointer %p\n", reserved); + if (lparam) FIXME("unsupported lparam %lx\n", lparam); + if (!src || !srclen || dstlen < 0) { SetLastError(ERROR_INVALID_PARAMETER); @@ -2522,8 +2540,6 @@ INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, if (!dstlen) dst = NULL; - lcid = ConvertDefaultLocale(lcid); - if (flags & LCMAP_SORTKEY) { INT ret; @@ -2535,8 +2551,8 @@ INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, if (srclen < 0) srclen = strlenW(src); - TRACE("(0x%04x,0x%08x,%s,%d,%p,%d)\n", - lcid, flags, debugstr_wn(src, srclen), srclen, dst, dstlen); + TRACE("(%s,0x%08x,%s,%d,%p,%d)\n", + debugstr_w(name), flags, debugstr_wn(src, srclen), srclen, dst, dstlen); ret = wine_get_sortkey(flags, src, srclen, (char *)dst, dstlen); if (ret == 0) @@ -2555,8 +2571,8 @@ INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, if (srclen < 0) srclen = strlenW(src) + 1; - TRACE("(0x%04x,0x%08x,%s,%d,%p,%d)\n", - lcid, flags, debugstr_wn(src, srclen), srclen, dst, dstlen); + TRACE("(%s,0x%08x,%s,%d,%p,%d)\n", + debugstr_w(name), flags, debugstr_wn(src, srclen), srclen, dst, dstlen); if (!dst) /* return required string length */ { @@ -2625,6 +2641,20 @@ INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, } /************************************************************************* + * LCMapStringW (KERNEL32.@) + * + * See LCMapStringA. + */ +INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, + LPWSTR dst, INT dstlen) +{ + TRACE("(0x%04x,0x%08x,%s,%d,%p,%d)\n", + lcid, flags, debugstr_wn(src, srclen), srclen, dst, dstlen); + + return LCMapStringEx(NULL, flags, src, srclen, dst, dstlen, NULL, NULL, 0); +} + +/************************************************************************* * LCMapStringA (KERNEL32.@) * * Map characters in a locale sensitive string. @@ -2693,7 +2723,7 @@ INT WINAPI LCMapStringA(LCID lcid, DWORD flags, LPCSTR src, INT srclen, goto map_string_exit; } - dstlenW = LCMapStringW(lcid, flags, srcW, srclenW, NULL, 0); + dstlenW = LCMapStringEx(NULL, flags, srcW, srclenW, NULL, 0, NULL, NULL, 0); if (!dstlenW) goto map_string_exit; @@ -2704,7 +2734,7 @@ INT WINAPI LCMapStringA(LCID lcid, DWORD flags, LPCSTR src, INT srclen, goto map_string_exit; } - LCMapStringW(lcid, flags, srcW, srclenW, dstW, dstlenW); + LCMapStringEx(NULL, flags, srcW, srclenW, dstW, dstlenW, NULL, NULL, 0); ret = WideCharToMultiByte(locale_cp, 0, dstW, dstlenW, dst, dstlen, NULL, NULL); HeapFree(GetProcessHeap(), 0, dstW); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0114dc5..8079679 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1652,8 +1652,18 @@ static INT LCMapStringW_wrapper(DWORD flags, LPCWSTR src, INT srclen, LPWSTR dst static void test_LCMapStringW(void) { + int ret; + WCHAR buf[256]; + trace("testing LCMapStringW\n"); + SetLastError(0xdeadbeef); + ret = LCMapStringW((LCID)-1, LCMAP_LOWERCASE, upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); + todo_wine { + ok(!ret, "LCMapStringW should fail with bad lcid\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "unexpected error code %d\n", GetLastError()); + } + test_lcmapstring_unicode(LCMapStringW_wrapper, "LCMapStringW:"); } @@ -1665,16 +1675,24 @@ static INT LCMapStringEx_wrapper(DWORD flags, LPCWSTR src, INT srclen, LPWSTR ds static void test_LCMapStringEx(void) { int ret; - WCHAR buf[256]; + WCHAR buf[256], badname[] = {'w', 'i', 'n', 'e', 't', 'e', 's', 't', 0}; if (!pLCMapStringEx) { - skip( "LCMapStringEx not available\n" ); + win_skip( "LCMapStringEx not available\n" ); return; } trace("testing LCMapStringEx\n"); + SetLastError(0xdeadbeef); + ret = pLCMapStringEx(badname, LCMAP_LOWERCASE, + upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR), NULL, NULL, 0); + todo_wine { + ok(!ret, "LCMapStringEx should fail with bad locale name\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "unexpected error code %d\n", GetLastError()); + } + /* test reserved parameters */ ret = pLCMapStringEx(LOCALE_NAME_USER_DEFAULT, LCMAP_LOWERCASE, upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR), NULL, NULL, 1);

1 0

Dmitry Timoshkov : gdiplus: Add a test for image stream refcount.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 55f160db347759b0c23a5d307e5e6b824f6f4345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f160db347759b0c23a5d307… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 27 14:27:04 2012 +0900 gdiplus: Add a test for image stream refcount. --- dlls/gdiplus/tests/image.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b930b99..0285879 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2656,6 +2656,12 @@ static void test_dispose(void) expect(ObjectBusy, stat); } +static LONG obj_refcount(void *obj) +{ + IUnknown_AddRef((IUnknown *)obj); + return IUnknown_Release((IUnknown *)obj); +} + static GpImage *load_image(const BYTE *image_data, UINT image_size) { IStream *stream; @@ -2664,6 +2670,8 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size) HRESULT hr; GpStatus status; GpImage *image = NULL; + ImageType image_type; + LONG refcount; hmem = GlobalAlloc(0, image_size); data = GlobalLock(hmem); @@ -2674,10 +2682,20 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size) ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); if (hr != S_OK) return NULL; + refcount = obj_refcount(stream); + ok(refcount == 1, "expected stream refcount 1, got %d\n", refcount); + status = GdipLoadImageFromStream(stream, &image); ok(status == Ok, "GdipLoadImageFromStream error %d\n", status); - IStream_Release(stream); + status = GdipGetImageType(image, &image_type); + ok(status == Ok, "GdipGetImageType error %d\n", status); + + refcount = IStream_Release(stream); + if (image_type == ImageTypeBitmap) + todo_wine ok(refcount >= 1, "expected stream refcount != 0\n"); + else + ok(refcount == 0, "expected stream refcount 0, got %d\n", refcount); return image; }

1 0

Erich Hoover : hhctrl.ocx: Turn multiple index entries of the same name into a single entry.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 5874d6f1fd82cee01edb0c21c313b96388899c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5874d6f1fd82cee01edb0c21c… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Jun 25 13:46:26 2012 -0600 hhctrl.ocx: Turn multiple index entries of the same name into a single entry. --- dlls/hhctrl.ocx/index.c | 33 ++++++++++++++++++++++++--------- 1 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index 2cc79a6..af1efb8 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -54,6 +54,15 @@ static void fill_index_tree(HWND hwnd, IndexItem *item) } } +static void item_realloc(IndexItem *item, int num_items) +{ + item->nItems = num_items; + item->items = heap_realloc(item->items, sizeof(IndexSubItem)*item->nItems); + item->items[item->nItems-1].name = NULL; + item->items[item->nItems-1].local = NULL; + item->itemFlags = 0x00; +} + /* Parse the attributes correspond to a list item, including sub-topics. * * Each list item has, at minimum, a param of type "keyword" and two @@ -77,13 +86,8 @@ static void parse_index_obj_node_param(IndexItem *item, const char *text, UINT c /* Allocate a new sub-item, either on the first run or whenever a * sub-topic has filled out both the "name" and "local" params. */ - if(item->itemFlags == 0x11 && (!strncasecmp("name", ptr, len) || !strncasecmp("local", ptr, len))) { - item->nItems++; - item->items = heap_realloc(item->items, sizeof(IndexSubItem)*item->nItems); - item->items[item->nItems-1].name = NULL; - item->items[item->nItems-1].local = NULL; - item->itemFlags = 0x00; - } + if(item->itemFlags == 0x11 && (!strncasecmp("name", ptr, len) || !strncasecmp("local", ptr, len))) + item_realloc(item, item->nItems+1); if(!strncasecmp("keyword", ptr, len)) { param = &item->keyword; }else if(!item->keyword && !strncasecmp("name", ptr, len)) { @@ -228,8 +232,19 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item) TRACE("%s\n", node.buf); if(!strcasecmp(node_name.buf, "li")) { - item->next = parse_li(info, &stream); - if(item->next) { + IndexItem *new_item; + + new_item = parse_li(info, &stream); + if(new_item && item->keyword && strcmpW(new_item->keyword, item->keyword) == 0) { + int num_items = item->nItems; + + item_realloc(item, num_items+1); + memcpy(&item->items[num_items], &new_item->items[0], sizeof(IndexSubItem)); + heap_free(new_item->keyword); + heap_free(new_item->items); + heap_free(new_item); + } else if(new_item) { + item->next = new_item; item->next->merge = item->merge; item = item->next; item->indentLevel = indent_level;

1 0

Alexandre Julliard : winex11: Use the GET_DRAWABLE escape to implement wglMakeContextCurrentARB.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: bebf84f7a8bbab92a4dd5261fa53c5c379921798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bebf84f7a8bbab92a4dd5261f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 27 14:07:06 2012 +0200 winex11: Use the GET_DRAWABLE escape to implement wglMakeContextCurrentARB. --- dlls/winex11.drv/opengl.c | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 9ae143e..672d8d0 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1673,14 +1673,14 @@ static BOOL glxdrv_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) */ static BOOL glxdrv_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC hglrc ) { + HDC draw_hdc = draw_dev->hdc; + HDC read_hdc = read_dev->hdc; + Wine_GLContext *ctx = (Wine_GLContext *)hglrc; Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; - struct glx_physdev *draw_physdev = get_glxdrv_dev( draw_dev ); - struct glx_physdev *read_physdev = get_glxdrv_dev( read_dev ); + struct x11drv_escape_get_drawable escape_draw, escape_read; BOOL ret; - TRACE("(%p,%p,%p)\n", draw_dev->hdc, read_dev->hdc, hglrc); - - if (!has_opengl()) return 0; + TRACE("(%p,%p,%p)\n", draw_hdc, read_hdc, hglrc); if (hglrc == NULL) { @@ -1691,7 +1691,18 @@ static BOOL glxdrv_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, wine_tsx11_unlock(); NtCurrentTeb()->glContext = NULL; } - else if (!draw_physdev->pixel_format) + + escape_draw.code = X11DRV_GET_DRAWABLE; + if (!ExtEscape( draw_hdc, X11DRV_ESCAPE, sizeof(escape_draw.code), (LPCSTR)&escape_draw.code, + sizeof(escape_draw), (LPSTR)&escape_draw )) + return FALSE; + + escape_read.code = X11DRV_GET_DRAWABLE; + if (!ExtEscape( read_hdc, X11DRV_ESCAPE, sizeof(escape_read.code), (LPCSTR)&escape_read.code, + sizeof(escape_read), (LPSTR)&escape_read )) + return FALSE; + + if (!escape_draw.pixel_format) { WARN("Trying to use an invalid drawable\n"); SetLastError(ERROR_INVALID_HANDLE); @@ -1699,27 +1710,23 @@ static BOOL glxdrv_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, } else { - Wine_GLContext *ctx = (Wine_GLContext *) hglrc; - Drawable draw_drawable = draw_physdev->drawable; - Drawable read_drawable = read_physdev->drawable; - if (!pglXMakeContextCurrent) return FALSE; - if (draw_physdev->type == DC_GL_BITMAP) draw_drawable = get_context_pixmap( draw_physdev->dev.hdc, ctx ); - if (read_physdev->type == DC_GL_BITMAP) read_drawable = get_context_pixmap( read_physdev->dev.hdc, ctx ); + if (escape_draw.gl_type == DC_GL_BITMAP) escape_draw.drawable = get_context_pixmap( draw_hdc, ctx ); + if (escape_read.gl_type == DC_GL_BITMAP) escape_read.drawable = get_context_pixmap( read_hdc, ctx ); wine_tsx11_lock(); - ret = pglXMakeContextCurrent(gdi_display, draw_drawable, read_drawable, ctx->ctx); + ret = pglXMakeContextCurrent(gdi_display, escape_draw.drawable, escape_read.drawable, ctx->ctx); if (ret) { if (prev_ctx) prev_ctx->tid = 0; ctx->has_been_current = TRUE; ctx->tid = GetCurrentThreadId(); - ctx->hdc = draw_dev->hdc; - ctx->read_hdc = read_dev->hdc; - ctx->drawables[0] = draw_drawable; - ctx->drawables[1] = read_drawable; + ctx->hdc = draw_hdc; + ctx->read_hdc = read_hdc; + ctx->drawables[0] = escape_draw.drawable; + ctx->drawables[1] = escape_read.drawable; ctx->refresh_drawables = FALSE; NtCurrentTeb()->glContext = ctx; }

1 0

Alexandre Julliard : winex11: Export wglMakeCurrent and wglMakeContextCurrentARB as standard extension functions .
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 4a367c57197b93a01c66d167db20420134e1f52c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a367c57197b93a01c66d167d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 27 14:43:36 2012 +0200 winex11: Export wglMakeCurrent and wglMakeContextCurrentARB as standard extension functions. --- dlls/gdi32/gdi32.spec | 3 +- dlls/gdi32/opengl.c | 70 --------------------------------------------- dlls/opengl32/wgl.c | 11 +++++-- dlls/winex11.drv/opengl.c | 22 +++++++------- 4 files changed, 20 insertions(+), 86 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2a7edc3..8fa7fe1 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -499,9 +499,8 @@ ################################################################ # Wine extensions: OpenGL support # -@ stdcall wglCreateContext(long) +@ stdcall -private wglCreateContext(long) @ stdcall -private wglGetProcAddress(str) -@ stdcall wglMakeCurrent(long long) ################################################################ # Wine extensions: Win16 functions that are needed by other dlls diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index d2ab2aa..90c2a87 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -101,74 +101,6 @@ static HGLRC WINAPI wglCreateContextAttribsARB(HDC hdc, HGLRC hShareContext, con return ret; } -/*********************************************************************** - * wglMakeCurrent (OPENGL32.@) - */ -BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) -{ - BOOL ret = FALSE; - DC * dc = NULL; - - /* When the context hglrc is NULL, the HDC is ignored and can be NULL. - * In that case use the global hDC to get access to the driver. */ - if(hglrc == NULL) - { - if (hdc == NULL && !NtCurrentTeb()->glContext) - { - WARN( "Current context is NULL\n"); - SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; - } - dc = OPENGL_GetDefaultDC(); - } - else - dc = get_dc_ptr( hdc ); - - TRACE("hdc: (%p), hglrc: (%p)\n", hdc, hglrc); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pwglMakeCurrent ); - update_dc( dc ); - ret = physdev->funcs->pwglMakeCurrent( physdev, hglrc ); - release_dc_ptr( dc ); - } - return ret; -} - -/*********************************************************************** - * wglMakeContextCurrentARB - */ -static BOOL WINAPI wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc) -{ - BOOL ret = FALSE; - PHYSDEV draw_physdev, read_physdev; - DC *DrawDC; - DC *ReadDC; - - TRACE("hDrawDC: (%p), hReadDC: (%p) hglrc: (%p)\n", hDrawDC, hReadDC, hglrc); - - /* Both hDrawDC and hReadDC need to be valid */ - DrawDC = get_dc_ptr( hDrawDC ); - if (!DrawDC) return FALSE; - - ReadDC = get_dc_ptr( hReadDC ); - if (!ReadDC) { - release_dc_ptr( DrawDC ); - return FALSE; - } - - update_dc( DrawDC ); - update_dc( ReadDC ); - draw_physdev = GET_DC_PHYSDEV( DrawDC, pwglMakeContextCurrentARB ); - read_physdev = GET_DC_PHYSDEV( ReadDC, pwglMakeContextCurrentARB ); - if (draw_physdev->funcs == read_physdev->funcs) - ret = draw_physdev->funcs->pwglMakeContextCurrentARB(draw_physdev, read_physdev, hglrc); - release_dc_ptr( DrawDC ); - release_dc_ptr( ReadDC ); - return ret; -} - /************************************************************************************** * WINE-specific wglSetPixelFormat which can set the iPixelFormat multiple times * @@ -219,8 +151,6 @@ PROC WINAPI wglGetProcAddress(LPCSTR func) */ if(ret && strcmp(func, "wglCreateContextAttribsARB") == 0) return (PROC)wglCreateContextAttribsARB; - else if(ret && strcmp(func, "wglMakeContextCurrentARB") == 0) - return (PROC)wglMakeContextCurrentARB; else if(ret && strcmp(func, "wglSetPixelFormatWINE") == 0) return (PROC)wglSetPixelFormatWINE; diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index d286a2a..e400f2e 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -48,7 +48,6 @@ WINE_DECLARE_DEBUG_CHANNEL(opengl); static struct { PROC (WINAPI *p_wglGetProcAddress)(LPCSTR lpszProc); - BOOL (WINAPI *p_wglMakeCurrent)(HDC hdc, HGLRC hglrc); HGLRC (WINAPI *p_wglCreateContext)(HDC hdc); INT (WINAPI *p_GetPixelFormat)(HDC hdc); @@ -60,6 +59,7 @@ static struct HGLRC (WINAPI *p_wglGetCurrentContext)(void); HDC (WINAPI *p_wglGetCurrentDC)(void); void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params); + BOOL (WINAPI *p_wglMakeCurrent)(HDC hdc, HGLRC hglrc); BOOL (WINAPI *p_wglShareLists)(HGLRC hglrc1, HGLRC hglrc2); } wine_wgl; @@ -126,7 +126,12 @@ BOOL WINAPI wglDeleteContext(HGLRC hglrc) */ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) { - return wine_wgl.p_wglMakeCurrent(hdc, hglrc); + if (!hglrc && !hdc && !NtCurrentTeb()->glContext) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + return wine_wgl.p_wglMakeCurrent(hdc, hglrc); } /*********************************************************************** @@ -1090,7 +1095,6 @@ static BOOL process_attach(void) } wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod_gdi32, "wglGetProcAddress"); - wine_wgl.p_wglMakeCurrent = (void *)GetProcAddress(mod_gdi32, "wglMakeCurrent"); wine_wgl.p_wglCreateContext = (void *)GetProcAddress(mod_gdi32, "wglCreateContext"); wine_wgl.p_GetPixelFormat = (void *)GetProcAddress(mod_gdi32, "GetPixelFormat"); @@ -1102,6 +1106,7 @@ static BOOL process_attach(void) wine_wgl.p_wglGetCurrentContext = (void *)wine_wgl.p_wglGetProcAddress("wglGetCurrentContext"); wine_wgl.p_wglGetCurrentDC = (void *)wine_wgl.p_wglGetProcAddress("wglGetCurrentDC"); wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv"); + wine_wgl.p_wglMakeCurrent = (void *)wine_wgl.p_wglGetProcAddress("wglMakeCurrent"); wine_wgl.p_wglShareLists = (void *)wine_wgl.p_wglGetProcAddress("wglShareLists"); return TRUE; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 672d8d0..b78edc3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1469,6 +1469,8 @@ static HGLRC glxdrv_wglCreateContext(PHYSDEV dev) return (HGLRC) ret; } +static BOOL WINAPI X11DRV_wglMakeCurrent(HDC hdc, HGLRC hglrc); + /** * X11DRV_wglDeleteContext * @@ -1497,7 +1499,7 @@ static BOOL WINAPI X11DRV_wglDeleteContext(HGLRC hglrc) /* WGL makes a context not current if it is active before deletion. GLX waits until the context is not current. */ if (ctx == NtCurrentTeb()->glContext) - wglMakeCurrent(ctx->hdc, NULL); + X11DRV_wglMakeCurrent(ctx->hdc, NULL); wine_tsx11_lock(); list_remove( &ctx->entry ); @@ -1584,13 +1586,12 @@ static GLXPixmap get_context_pixmap( HDC hdc, struct wine_glcontext *ctx ) } /** - * glxdrv_wglMakeCurrent + * X11DRV_wglMakeCurrent * * For OpenGL32 wglMakeCurrent. */ -static BOOL glxdrv_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) +static BOOL WINAPI X11DRV_wglMakeCurrent(HDC hdc, HGLRC hglrc) { - HDC hdc = dev->hdc; BOOL ret; Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; Wine_GLContext *ctx = (Wine_GLContext *) hglrc; @@ -1667,14 +1668,12 @@ static BOOL glxdrv_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) } /** - * glxdrv_wglMakeContextCurrentARB + * X11DRV_wglMakeContextCurrentARB * * For OpenGL32 wglMakeContextCurrentARB */ -static BOOL glxdrv_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC hglrc ) +static BOOL WINAPI X11DRV_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC hglrc ) { - HDC draw_hdc = draw_dev->hdc; - HDC read_hdc = read_dev->hdc; Wine_GLContext *ctx = (Wine_GLContext *)hglrc; Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; struct x11drv_escape_get_drawable escape_draw, escape_read; @@ -3070,6 +3069,7 @@ static const WineGLExtension WGL_internal_functions = { "wglGetCurrentContext", X11DRV_wglGetCurrentContext }, { "wglGetCurrentDC", X11DRV_wglGetCurrentDC }, { "wglGetIntegerv", X11DRV_wglGetIntegerv }, + { "wglMakeCurrent", X11DRV_wglMakeCurrent }, { "wglShareLists", X11DRV_wglShareLists }, } }; @@ -3096,7 +3096,7 @@ static const WineGLExtension WGL_ARB_make_current_read = "WGL_ARB_make_current_read", { { "wglGetCurrentReadDCARB", X11DRV_wglGetCurrentReadDCARB }, - { "wglMakeContextCurrentARB", (void *)1 /* not called directly */ }, + { "wglMakeContextCurrentARB", X11DRV_wglMakeContextCurrentARB }, } }; @@ -3584,8 +3584,8 @@ static const struct gdi_dc_funcs glxdrv_funcs = glxdrv_wglCreateContext, /* pwglCreateContext */ glxdrv_wglCreateContextAttribsARB, /* pwglCreateContextAttribsARB */ glxdrv_wglGetProcAddress, /* pwglGetProcAddress */ - glxdrv_wglMakeContextCurrentARB, /* pwglMakeContextCurrentARB */ - glxdrv_wglMakeCurrent, /* pwglMakeCurrent */ + NULL, /* pwglMakeContextCurrentARB */ + NULL, /* pwglMakeCurrent */ glxdrv_wglSetPixelFormatWINE, /* pwglSetPixelFormatWINE */ GDI_PRIORITY_GRAPHICS_DRV + 20 /* priority */ };

1 0

Piotr Caban : msvcp90: Added partial implementation of locale_ctor_cstr function.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 1f8fcf30f3ef343d557e0e7d8fb6005f7be3f6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8fcf30f3ef343d557e0e7d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:17:16 2012 +0200 msvcp90: Added partial implementation of locale_ctor_cstr function. --- dlls/msvcp90/locale.c | 417 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 391 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f8fcf30f3ef343d557e0…

1 0

Piotr Caban : msvcp90: Sync spec files.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: d1f0fe954f37bcdf529a9f51a8ff165277b21098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f0fe954f37bcdf529a9f51a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:17:42 2012 +0200 msvcp90: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 430 +++++++++++++++++++------------------- dlls/msvcp70/msvcp70.spec | 394 ++++++++++++++++++------------------ dlls/msvcp71/msvcp71.spec | 460 ++++++++++++++++++++-------------------- dlls/msvcp80/msvcp80.spec | 484 +++++++++++++++++++++--------------------- 4 files changed, 884 insertions(+), 884 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1f0fe954f37bcdf529a9…

1 0

Hans Leidekker : wbemprox: Set the row count in fill_processor.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 211469dd06c4354790506ad41e0fd8c00cedc0d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211469dd06c4354790506ad41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 27 11:33:31 2012 +0200 wbemprox: Set the row count in fill_processor. --- dlls/wbemprox/builtin.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index eaffc80..7a4ee56 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -376,6 +376,9 @@ static void fill_processor( struct table *table ) rec->device_id = heap_strdupW( device_id ); offset += sizeof(*rec); } + + TRACE("created %u rows\n", count); + table->num_rows = count; } static void fill_os( struct table *table )

1 0

Hans Leidekker : wbemprox: Store the result index in the class enumerator instead of the view.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: f1f4f1d9d70f9275425f07ddb3848e7a379ab430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f4f1d9d70f9275425f07ddb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 27 11:33:52 2012 +0200 wbemprox: Store the result index in the class enumerator instead of the view. --- dlls/wbemprox/class.c | 19 ++++++++++--------- dlls/wbemprox/query.c | 1 - dlls/wbemprox/wbemprox_private.h | 1 - 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 524ba09..bb2c5e6 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -36,6 +36,7 @@ struct enum_class_object IEnumWbemClassObject IEnumWbemClassObject_iface; LONG refs; struct query *query; + UINT index; }; static inline struct enum_class_object *impl_from_IEnumWbemClassObject( @@ -92,11 +93,10 @@ static HRESULT WINAPI enum_class_object_Reset( IEnumWbemClassObject *iface ) { struct enum_class_object *ec = impl_from_IEnumWbemClassObject( iface ); - struct view *view = ec->query->view; TRACE("%p\n", iface); - view->index = 0; + ec->index = 0; return WBEM_S_NO_ERROR; } @@ -118,14 +118,14 @@ static HRESULT WINAPI enum_class_object_Next( if (lTimeout != WBEM_INFINITE) FIXME("timeout not supported\n"); *puReturned = 0; - if (view->index + uCount > view->count) return WBEM_S_FALSE; + if (ec->index + uCount > view->count) return WBEM_S_FALSE; - hr = WbemClassObject_create( NULL, iface, view->index, (void **)apObjects ); + hr = WbemClassObject_create( NULL, iface, ec->index, (void **)apObjects ); if (hr != S_OK) return hr; - view->index++; + ec->index++; *puReturned = 1; - if (view->index == view->count) return WBEM_S_FALSE; + if (ec->index == view->count) return WBEM_S_FALSE; if (uCount > 1) return WBEM_S_TIMEDOUT; return WBEM_S_NO_ERROR; } @@ -159,12 +159,12 @@ static HRESULT WINAPI enum_class_object_Skip( if (lTimeout != WBEM_INFINITE) FIXME("timeout not supported\n"); - if (view->index + nCount >= view->count) + if (ec->index + nCount >= view->count) { - view->index = view->count - 1; + ec->index = view->count - 1; return WBEM_S_FALSE; } - view->index += nCount; + ec->index += nCount; return WBEM_S_NO_ERROR; } @@ -193,6 +193,7 @@ HRESULT EnumWbemClassObject_create( ec->IEnumWbemClassObject_iface.lpVtbl = &enum_class_object_vtbl; ec->refs = 1; ec->query = query; + ec->index = 0; *ppObj = &ec->IEnumWbemClassObject_iface; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 181549f..35b6a0c 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -172,7 +172,6 @@ HRESULT create_view( const struct property *proplist, const WCHAR *class, view->cond = cond; view->result = NULL; view->count = 0; - view->index = 0; *ret = view; return S_OK; } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 9273744..db3cb3a 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -100,7 +100,6 @@ struct view const struct expr *cond; UINT *result; UINT count; - UINT index; }; struct query

1 0